git.iko.soy/typeable/pandoc
on master help sign in
Allow beamer-style <...> options in raw LaTeX (also in Markdown).
8d7ecc2John MacFarlane
src/Text/Pandoc/Readers/LaTeX.hs+13−1
compare with master
unifiedsplit
@@ -423,7 +423,8 @@ inlineCommand = try $ do
423 star <- option "" (string "*")
423 star <- option "" (string "*")
424 let name' = name ++ star
424 let name' = name ++ star
425 let raw = do
425 let raw = do
426+ rawargs <- withRaw
426− rawargs <- withRaw (skipopts *> option "" dimenarg *> many braced)
427+ (skipangles *> skipopts *> option "" dimenarg *> many braced)
427 let rawcommand = '\\' : name ++ star ++ snd rawargs
428 let rawcommand = '\\' : name ++ star ++ snd rawargs
428 transformed <- applyMacros' rawcommand
429 transformed <- applyMacros' rawcommand
429 if transformed /= rawcommand
430 if transformed /= rawcommand
@@ -886,6 +887,17 @@ rawopt = do
886skipopts :: LP ()
887skipopts :: LP ()
887skipopts = skipMany rawopt
888skipopts = skipMany rawopt
888
889
890+-- opts in angle brackets are used in beamer
891+rawangle :: LP ()
892+rawangle = try $ do
893+ char '<'
894+ skipMany (noneOf ">")
895+ char '>'
896+ return ()
897+
898+skipangles :: LP ()
899+skipangles = skipMany rawangle
900+
889inlineText :: LP Inlines
901inlineText :: LP Inlines
890inlineText = str <$> many1 inlineChar
902inlineText = str <$> many1 inlineChar
891
903