git.iko.soy/typeable/pandoc
on master help sign in
Roff tokenizer: better handling of font inlines `\f`....
commitdc7f41bb64e4e9a375f8aac4aaee083da643c2b3 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 26 Oct 2018, 22:46 (8 years ago) parent9defc25
1 file changed+4−7
src/Text/Pandoc/Readers/Roff.hs+4−7
src/Text/Pandoc/Readers/Roff.hs+4−7
@@ -271,9 +271,7 @@ escFontSize = do
271271escFont :: PandocMonad m => RoffLexer m [LinePart]
272272escFont = do
273273 font <- choice
274− [ char 'S' >> return defaultFontSpec
275− , digit >> return defaultFontSpec
276− , char '(' >> anyChar >> anyChar >> return defaultFontSpec
274+ [ digit >> return defaultFontSpec
277275 , digit >> return defaultFontSpec
278276 , ($ defaultFontSpec) <$> letterFontKind
279277 , lettersFont
@@ -284,10 +282,8 @@ escFont = do
284282
285283lettersFont :: PandocMonad m => RoffLexer m FontSpec
286284lettersFont = try $ do
287− char '['
288− fs <- many letterFontKind
289− skipMany letter
290− char ']'
285+ fs <- (char '[' *> many letterFontKind <* char ']')
286+ <|> (char '(' *> count 2 letterFontKind)
291287 if null fs
292288 then prevFont <$> getState
293289 else return $ foldr ($) defaultFontSpec fs
@@ -298,6 +294,7 @@ letterFontKind = choice [
298294 , oneOf ['I','i'] >> return (\fs -> fs { fontItalic = True })
299295 , oneOf ['C','c'] >> return (\fs -> fs { fontMonospace = True })
300296 , oneOf ['P','p','R','r'] >> return id
297+ , letter >> return id -- L, S, etc.
301298 ]
302299
303300