diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2023-12-14 12:28:04 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2023-12-14 12:28:04 -0800 |
| commit | fd73880a87231e0bd92b5033c0eaac6e36ae6587 (patch) | |
| tree | 781f9905f1883e594602a2f091777a9ab88e7c46 /src | |
| parent | 272117f112adc823b5509457716c04661e1806d3 (diff) | |
Typst writer: emit `;` after typst code...
unless followed by space. Otherwise there's the potential
that the typst code will swallow up a following character.
Closes #9252.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/Writers/Typst.hs | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Writers/Typst.hs b/src/Text/Pandoc/Writers/Typst.hs index 0a598cb37..5847f411e 100644 --- a/src/Text/Pandoc/Writers/Typst.hs +++ b/src/Text/Pandoc/Writers/Typst.hs @@ -243,8 +243,9 @@ inlineToTypst inline = Code (_,cls,_) code -> return $ case cls of (lang:_) -> "#raw(lang:" <> doubleQuoted lang <> - ", " <> doubleQuoted code <> ")" + ", " <> doubleQuoted code <> ")" <> endCode _ | T.any (=='`') code -> "#raw(" <> doubleQuoted code <> ")" + <> endCode | otherwise -> "`" <> literal code <> "`" RawInline fmt str -> case fmt of @@ -273,6 +274,7 @@ inlineToTypst inline = [] -> pure mempty suff -> brackets <$> inlinesToTypst suff pure $ "#cite" <> parens (toLabel (citationId cite)) <> suppl + <> endCode if isEnabled Ext_citations opts -- Note: this loses prefix then mconcat <$> mapM toCite citations @@ -283,9 +285,9 @@ inlineToTypst inline = Just ('#', ident) -> "<" <> literal ident <> ">" _ -> doubleQuoted src return $ "#link" <> parens dest <> - if inlines == [Str src] - then mempty - else nowrap $ brackets contents + (if inlines == [Str src] + then mempty + else nowrap $ brackets contents) <> endCode Image (_,_,kvs) _inlines (src,_tit) -> do opts <- gets stOptions let mbHeight = lookup "height" kvs @@ -304,17 +306,21 @@ inlineToTypst inline = case realWidth of Just w -> return $ "#box" <> parens ("width: " <> literal w <> ", " <> coreImage) - Nothing -> return $ "#" <> coreImage + <> endCode + Nothing -> return $ "#" <> coreImage <> endCode (Just w, _) -> return $ "#box" <> parens ("width: " <> literal w <> ", " <> coreImage) + <> endCode (_, Just h) -> return $ "#box" <> parens ("height: " <> literal h <> ", " <> coreImage) + <> endCode Note blocks -> do contents <- blocksToTypst blocks - return $ "#footnote" <> brackets (chomp contents) + return $ "#footnote" <> brackets (chomp contents) <> endCode textstyle :: PandocMonad m => Doc Text -> [Inline] -> TW m (Doc Text) -textstyle s inlines = (s <>) . brackets <$> inlinesToTypst inlines +textstyle s inlines = + (<> endCode) . (s <>) . brackets <$> inlinesToTypst inlines escapeTypst :: EscapeContext -> Text -> Text escapeTypst context t = @@ -360,3 +366,6 @@ doubleQuoted = doubleQuotes . literal . escape escapeChar '\\' = "\\\\" escapeChar '"' = "\\\"" escapeChar c = T.singleton c + +endCode :: Doc Text +endCode = beforeNonBlank ";" |