git.iko.soy/typeable/pandoc
on master help sign in
Use takeP in LaTeX reader.
770e0ccJohn MacFarlane
src/Text/Pandoc/Readers/LaTeX.hs+4−4
@@ -214,7 +214,7 @@ rawLaTeXBlock = do
214 res <- runParserT rawblock lstate "source" toks
214 res <- runParserT rawblock lstate "source" toks
215 case res of
215 case res of
216 Left _ -> mzero
216 Left _ -> mzero
217− Right raw -> count (T.length (untokenize raw)) anyChar
217+ Right raw -> takeP (T.length (untokenize raw))
218
218
219macro :: (PandocMonad m, HasMacros s, HasReaderOptions s)
219macro :: (PandocMonad m, HasMacros s, HasReaderOptions s)
220 => ParserT String s m Blocks
220 => ParserT String s m Blocks
@@ -236,7 +236,7 @@ macro = do
236 Left _ -> mzero
236 Left _ -> mzero
237 Right (raw, st) -> do
237 Right (raw, st) -> do
238 updateState (updateMacros (const $ sMacros st))
238 updateState (updateMacros (const $ sMacros st))
239− mempty <$ count (T.length (untokenize raw)) anyChar
239+ mempty <$ takeP (T.length (untokenize raw))
240
240
241applyMacros :: (PandocMonad m, HasMacros s, HasReaderOptions s)
241applyMacros :: (PandocMonad m, HasMacros s, HasReaderOptions s)
242 => String -> ParserT String s m String
242 => String -> ParserT String s m String
@@ -269,7 +269,7 @@ rawLaTeXInline = do
269 Left _ -> mzero
269 Left _ -> mzero
270 Right (raw, s) -> do
270 Right (raw, s) -> do
271 updateState $ updateMacros (const $ sMacros s)
271 updateState $ updateMacros (const $ sMacros s)
272− count (T.length (untokenize raw)) anyChar
272+ takeP (T.length (untokenize raw))
273
273
274inlineCommand :: PandocMonad m => ParserT String ParserState m Inlines
274inlineCommand :: PandocMonad m => ParserT String ParserState m Inlines
275inlineCommand = do
275inlineCommand = do
@@ -288,7 +288,7 @@ inlineCommand = do
288 Left _ -> mzero
288 Left _ -> mzero
289 Right (il, raw, s) -> do
289 Right (il, raw, s) -> do
290 updateState $ updateMacros (const $ sMacros s)
290 updateState $ updateMacros (const $ sMacros s)
291− count (T.length (untokenize raw)) anyChar
291+ takeP (T.length (untokenize raw))
292 return il
292 return il
293
293
294tokenize :: Text -> [Tok]
294tokenize :: Text -> [Tok]