From fe73707ab11a054aafad0ef6f1dc0ae54c4f67ad Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 28 Oct 2018 10:41:24 -0700
Subject: Roff tokenizer: better handling of table format strings.

Particularly f and m, which require a space after their
argument. Also, allow space before numerical arguments, as
in his example from stty.1:

```
.TS
center tab(@) box;
cB cB | cB cB | cB cB
lf5 2 l 6 | lf5 2 l 6 | lf5 2 l.
\&^c@Value@^c@Value@^c@Value
```
---
 src/Text/Pandoc/Readers/Roff.hs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/Text/Pandoc')

diff --git a/src/Text/Pandoc/Readers/Roff.hs b/src/Text/Pandoc/Readers/Roff.hs
index 7d9aae8b6..085dfafd8 100644
--- a/src/Text/Pandoc/Readers/Roff.hs
+++ b/src/Text/Pandoc/Readers/Roff.hs
@@ -53,7 +53,7 @@ import Control.Monad (void, mzero, guard, when)
 import Control.Monad.Except (throwError)
 import Text.Pandoc.Class
        (getResourcePath, readFileFromDirs, PandocMonad(..), report)
-import Data.Char (isHexDigit, chr, ord, isAscii, isAlphaNum, isSpace)
+import Data.Char (toLower, isHexDigit, chr, ord, isAscii, isAlphaNum, isSpace)
 import Data.Default (Default)
 import qualified Data.Map as M
 import Data.List (intercalate, isSuffixOf)
@@ -423,15 +423,17 @@ tableColFormat = do
                    $ True <$ (try $ string "|" <* notFollowedBy spacetab)
     c <- oneOf ['a','A','c','C','l','L','n','N','r','R','s','S','^','_','-',
                 '=','|']
-    suffixes <- many $ count 1 digit <|>
+    suffixes <- many $ (try $ skipMany spacetab *> count 1 digit) <|>
       (do x <- oneOf ['b','B','d','D','e','E','f','F','i','I','m','M',
                   'p','P','t','T','u','U','v','V','w','W','x','X', 'z','Z']
-          num <- if x == 'w'
-                    then many1 digit <|>
-                          do char '('
-                             xs <- manyTill anyChar (char ')')
-                             return ("(" ++ xs ++ ")")
-                    else return ""
+          num <- case toLower x of
+                   'w' -> many1 digit <|>
+                           do char '('
+                              xs <- manyTill anyChar (char ')')
+                              return ("(" ++ xs ++ ")")
+                   'f' -> count 1 alphaNum <* skipMany spacetab
+                   'm' -> count 1 alphaNum <* skipMany spacetab
+                   _   -> return ""
           return $ x : num)
     pipeSuffix' <- option False $ True <$ string "|"
     return $ CellFormat
-- 
cgit v1.2.3