git.iko.soy/typeable/pandoc
on master help sign in
LaTeX reader: Fix negative numbers in siunitx commands.
734b4c2John MacFarlane
src/Text/Pandoc/Readers/LaTeX/SIunitx.hs+4−2
@@ -58,7 +58,7 @@ doSInumlist = do
58 text ", & " <> last xs
58 text ", & " <> last xs
59
59
60parseNum :: Parser Text () Inlines
60parseNum :: Parser Text () Inlines
61−parseNum = mconcat <$> many parseNumPart
61+parseNum = (mconcat <$> many parseNumPart) <* eof
62
62
63parseNumPart :: Parser Text () Inlines
63parseNumPart :: Parser Text () Inlines
64parseNumPart =
64parseNumPart =
@@ -71,7 +71,9 @@ parseNumPart =
71 parseSpace
71 parseSpace
72 where
72 where
73 parseDecimalNum = do
73 parseDecimalNum = do
74+ pref <- option mempty $ (mempty <$ char '+') <|> ("-" <$ char '-')
75+ basenum <- (pref <>) . T.pack
74− basenum <- T.pack <$> many1 (satisfy (\c -> isDigit c || c == '.'))
76+ <$> many1 (satisfy (\c -> isDigit c || c == '.'))
75 uncertainty <- option mempty $ T.pack <$> parseParens
77 uncertainty <- option mempty $ T.pack <$> parseParens
76 if T.null uncertainty
78 if T.null uncertainty
77 then return $ str basenum
79 then return $ str basenum
test/command/siunitx-negative-numbers.mdnew file+15
@@ -0,0 +1,15 @@
1+```
2+% pandoc -f latex
3+\SI{+33.3}{\m}
4+
5+\num{+5}
6+
7+\SI{-33.3}{\m}
8+
9+\num{-33}
10+^D
11+<p>33.3 m</p>
12+<p>5</p>
13+<p>-33.3 m</p>
14+<p>-33</p>
15+```