@@ -53,7 +53,7 @@ import Control.Monad (void, mzero, guard, when)
53import Control.Monad.Except (throwError)
53import Control.Monad.Except (throwError)
54import Text.Pandoc.Class
54import Text.Pandoc.Class
55 (getResourcePath, readFileFromDirs, PandocMonad(..), report)
55 (getResourcePath, readFileFromDirs, PandocMonad(..), report)
56−import Data.Char (isHexDigit, chr, ord, isAscii, isAlphaNum, isSpace)
56+import Data.Char (toLower, isHexDigit, chr, ord, isAscii, isAlphaNum, isSpace)
57import Data.Default (Default)
57import Data.Default (Default)
58import qualified Data.Map as M
58import qualified Data.Map as M
59import Data.List (intercalate, isSuffixOf)
59import Data.List (intercalate, isSuffixOf)
@@ -423,15 +423,17 @@ tableColFormat = do
423 $ True <$ (try $ string "|" <* notFollowedBy spacetab)
423 $ True <$ (try $ string "|" <* notFollowedBy spacetab)
424 c <- oneOf ['a','A','c','C','l','L','n','N','r','R','s','S','^','_','-',
424 c <- oneOf ['a','A','c','C','l','L','n','N','r','R','s','S','^','_','-',
426− suffixes <- many $ count 1 digit <|>
426+ suffixes <- many $ (try $ skipMany spacetab *> count 1 digit) <|>
427 (do x <- oneOf ['b','B','d','D','e','E','f','F','i','I','m','M',
427 (do x <- oneOf ['b','B','d','D','e','E','f','F','i','I','m','M',
428 'p','P','t','T','u','U','v','V','w','W','x','X', 'z','Z']
428 'p','P','t','T','u','U','v','V','w','W','x','X', 'z','Z']
429− num <- if x == 'w'
429+ num <- case toLower x of
430− then many1 digit <|>
430+ 'w' -> many1 digit <|>
431− do char '('
431+ do char '('
432− xs <- manyTill anyChar (char ')')
432+ xs <- manyTill anyChar (char ')')
433− return ("(" ++ xs ++ ")")
433+ return ("(" ++ xs ++ ")")
434+ 'f' -> count 1 alphaNum <* skipMany spacetab
435+ 'm' -> count 1 alphaNum <* skipMany spacetab
434− else return ""
436+ _ -> return ""
435 return $ x : num)
437 return $ x : num)
436 pipeSuffix' <- option False $ True <$ string "|"
438 pipeSuffix' <- option False $ True <$ string "|"
437 return $ CellFormat
439 return $ CellFormat