Re-engineer tokenization 🚿

1 files changed, 4 insertions, 3 deletions

diff --git a/src/library/mod.rs b/src/library/mod.rs
index 013e9962..92c3c948 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -297,9 +297,10 @@ function! {
         parse!(forbidden: body);
 
         if let Some(name) = args.get_pos_opt::<Ident>()? {
-            let flip = args.get_key_opt::<bool>("flip")?
-                .unwrap_or(false);
-            PageSizeFunc::Paper(Paper::from_name(name.as_str())?, flip)
+            let flip = args.get_key_opt::<bool>("flip")?.unwrap_or(false);
+            let paper = Paper::from_name(name.as_str())
+                .ok_or_else(|| error!(@"invalid paper name: `{}`", name))?;
+            PageSizeFunc::Paper(paper, flip)
         } else {
             PageSizeFunc::Custom(ExtentMap::new(&mut args, true)?)
         }