@@ -646,18 +646,17 @@ dimenarg :: PandocMonad m => LP m Text
646dimenarg = try $ do
646dimenarg = try $ do
647 optional sp
647 optional sp
648 ch <- option False $ True <$ symbol '='
648 ch <- option False $ True <$ symbol '='
649+ minus <- option "" $ "-" <$ symbol '-'
649 Tok _ _ s1 <- satisfyTok isWordTok
650 Tok _ _ s1 <- satisfyTok isWordTok
650 s2 <- option "" $ try $ do
651 s2 <- option "" $ try $ do
651 symbol '.'
652 symbol '.'
652 Tok _ _ t <- satisfyTok isWordTok
653 Tok _ _ t <- satisfyTok isWordTok
653 return ("." <> t)
654 return ("." <> t)
654 let s = s1 <> s2
655 let s = s1 <> s2
655− guard $ T.takeEnd 2 s `elem`
656+ let (num, rest) = T.span (\c -> isDigit c || c == '.') s
656− ["pt","pc","in","bp","cm","mm","dd","cc","sp"]
657− let num = T.dropEnd 2 s
658 guard $ T.length num > 0
657 guard $ T.length num > 0
659− guard $ T.all (\c -> isDigit c || c == '.') num
658+ guard $ rest `elem` ["", "pt","pc","in","bp","cm","mm","dd","cc","sp"]
660− return $ T.pack ['=' | ch] <> s
659+ return $ T.pack ['=' | ch] <> minus <> s
662ignore :: (Monoid a, PandocMonad m) => String -> ParserT s u m a
661ignore :: (Monoid a, PandocMonad m) => String -> ParserT s u m a
663ignore raw = do
662ignore raw = do