git.iko.soy/typeable/pandoc
on master help sign in
position calculations
commit4f3dd3b1af7217214287ab886147c5e33a54774d authorYan Pas <yanp.bugz@gmail.com> dateSun 7 Oct 2018, 17:53 (8 years ago) parentc2ae72a
1 file changed+5−5
src/Text/Pandoc/Readers/Man.hs+5−5
src/Text/Pandoc/Readers/Man.hs+5−5
@@ -225,9 +225,9 @@ lexMacro = do
225225 macroName <- many1 (letter <|> oneOf ['\\', '"'])
226226 args <- lexArgs
227227 let joinedArgs = unwords $ fst <$> args
228− let knownMacro mkind = MMacro mkind args
228+ knownMacro mkind = MMacro mkind args
229229
230− let tok = case macroName of
230+ tok = case macroName of
231231 x | x `elem` ["\\\"", "\\#"] -> MComment joinedArgs
232232 "TH" -> knownMacro KTitle
233233 "IP" -> knownMacro KTab
@@ -320,7 +320,7 @@ msatisfy :: (Show t, Stream s m t) => (t -> Bool) -> ParserT s st m t
320320msatisfy predic = tokenPrim show nextPos testTok
321321 where
322322 testTok t = if predic t then Just t else Nothing
323− nextPos pos x _xs = updatePosString (setSourceLine pos $ sourceLine pos + (if predic x then 1 else 0)) (show x)
323+ nextPos pos _x _xs = updatePosString (setSourceColumn (setSourceLine pos $ sourceLine pos + 1) 1) ("")
324324
325325mstr :: PandocMonad m => ManParser m ManToken
326326mstr = msatisfy isMStr where
@@ -509,9 +509,9 @@ parseList = do
509509 paras = do
510510 (MMacro _ args) <- mmacro KTab
511511 let lbuilderOpt = listKind args
512− let lbuilder = fromMaybe BulletList lbuilderOpt
512+ lbuilder = fromMaybe BulletList lbuilderOpt
513+ macroinl = macroIPInl args
513514 inls <- parseInlines
514− let macroinl = macroIPInl args
515515 let parainls = if isNothing lbuilderOpt then macroinl ++ inls else inls
516516 subls <- many sublist
517517 return $ (lbuilder, (Plain parainls) : subls)