Make the code more perspicuous.

jgm · Oct 20, 2023 · 4a4cfb1 · 4a4cfb1
1 parent b70e3e2
commit 4a4cfb1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/src/Text/Pandoc/Writers/Typst.hs b/src/Text/Pandoc/Writers/Typst.hs
@@ -282,24 +282,27 @@ inlineToTypst inline =
                    then mempty
                    else nowrap $ brackets contents
     Image (_,_,kvs) _inlines (src,_tit) -> do
-      opts <-  gets stOptions
-      let height' = lookup "height" kvs
-      width' <- case lookup "width" kvs of
-        Just w -> pure $ Just w
-        Nothing -> catchError
-          (do (bs, _mt) <- fetchItem src
-              case imageSize opts bs of
-                Right x -> pure $ Just $ T.pack $
-                              show (fst (sizeInPoints x)) <> "pt"
-                Left _ -> pure Nothing)
-            (\_ -> pure Nothing)
+      opts <- gets stOptions
+      let mbHeight = lookup "height" kvs
+      let mdWidth = lookup "width" kvs
       let coreImage = "image" <>
               parens (doubleQuoted src <>
-                      maybe mempty (\w -> ", width: " <> literal w) width' <>
-                      maybe mempty (\h -> ", height: " <> literal h) height')
-      case (width', height') of
-        (Nothing, Nothing) -> return $ "#" <> coreImage
-        -- see #9104; we need a box or the image is treated as block-level:
+                 maybe mempty (\w -> ", width: " <> literal w) mdWidth <>
+                 maybe mempty (\h -> ", height: " <> literal h) mbHeight)
+      -- see #9104; we need a box or the image is treated as block-level:
+      case (mdWidth, mbHeight) of
+        (Nothing, Nothing) -> do
+          realWidth <- catchError
+                  (do (bs, _mt) <- fetchItem src
+                      case imageSize opts bs of
+                        Right x -> pure $ Just $ T.pack $
+                                      show (fst (sizeInPoints x)) <> "pt"
+                        Left _ -> pure Nothing)
+                    (\_ -> pure Nothing)
+          case realWidth of
+            Just w -> return $ "#box" <>
+                        parens ("width: " <> literal w <> ", " <> coreImage)
+            Nothing -> return $ "#" <> coreImage
         (Just w, _) -> return $ "#box" <>
                         parens ("width: " <> literal w <> ", " <> coreImage)
         (_, Just h) -> return $ "#box" <>

diff --git a/test/writer.typst b/test/writer.typst
@@ -779,13 +779,13 @@ or here: <http://example.com/>
 <images>
 From "Voyage dans la Lune" by Georges Melies \(1902):
 
-#figure([#box(width: 150.0pt, image("lalune.jpg", width: 150.0pt))],
+#figure([#box(width: 150.0pt, image("lalune.jpg"))],
   caption: [
     lalune
   ]
 )
 
-Here is a movie #box(width: 20.0pt, image("movie.jpg", width: 20.0pt)) icon.
+Here is a movie #box(width: 20.0pt, image("movie.jpg")) icon.
 
 #horizontalrule