git.iko.soy/typeable/pandoc
on master help sign in
Man reader: Fix spacing requirement for macro arguments.

This is allowed: .BR "hello"x"hello".

commit07a083582417c57f40a6780740f0bb2de5f83d16 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 21 Oct 2018, 22:53 (8 years ago) parent8448eb3
1 file changed+20−18
src/Text/Pandoc/Readers/Man.hs+20−18
src/Text/Pandoc/Readers/Man.hs+20−18
@@ -352,7 +352,6 @@ lexArgs = do
352352
353353 oneArg :: PandocMonad m => ManLexer m [LinePart]
354354 oneArg = do
355− many1 spacetab
356355 skipMany $ try $ string "\\\n" -- continuation line
357356 try quotedArg <|> plainArg
358357 -- try, because there are some erroneous files, e.g. linux/bpf.2
@@ -360,27 +359,30 @@ lexArgs = do
360359 plainArg :: PandocMonad m => ManLexer m [LinePart]
361360 plainArg = do
362361 skipMany spacetab
363− mconcat <$>
364− many (macroArg <|> esc <|> regularText <|> unescapedQuote <|> escStar)
365− where unescapedQuote = do
366− char '"'
367− fonts <- currentFont
368− return [RoffStr ("\"", fonts)]
362+ mconcat <$> many1
363+ (macroArg <|> esc <|> regularText <|> unescapedQuote <|> escStar)
364+ where
365+ unescapedQuote = do
366+ char '"'
367+ fonts <- currentFont
368+ return [RoffStr ("\"", fonts)]
369369
370370
371371 quotedArg :: PandocMonad m => ManLexer m [LinePart]
372372 quotedArg = do
373− char '"'
374− xs <- mconcat <$>
375− many (macroArg <|> esc <|> escStar <|> regularText
376− <|> spaceTabChar <|> escapedQuote)
377− char '"'
378− return xs
379− where escapedQuote = try $ do
380− char '"'
381− char '"'
382− fonts <- currentFont
383− return [RoffStr ("\"", fonts)]
373+ skipMany spacetab
374+ char '"'
375+ xs <- mconcat <$>
376+ many (macroArg <|> esc <|> escStar <|> regularText
377+ <|> spaceTabChar <|> escapedQuote)
378+ char '"'
379+ return xs
380+ where
381+ escapedQuote = try $ do
382+ char '"'
383+ char '"'
384+ fonts <- currentFont
385+ return [RoffStr ("\"", fonts)]
384386
385387escStar :: PandocMonad m => ManLexer m [LinePart]
386388escStar = try $ do