Moved stateColumns to readerColumns in ReaderOptions.

src/Text/Pandoc/Options.hs

@@ -55,6 +55,7 @@ data ReaderOptions = ReaderOptions{
        , readerSmart          :: Bool  -- ^ Smart punctuation
        , readerStrict         :: Bool  -- ^ FOR TRANSITION ONLY
        , readerParseRaw       :: Bool  -- ^ Parse raw HTML, LaTeX
+       , readerColumns        :: Int   -- ^ Number of columns in terminal
        } deriving (Show, Read)
 
 instance Default ReaderOptions
@@ -63,4 +64,5 @@ instance Default ReaderOptions
                , readerSmart         = False
                , readerStrict        = False
                , readerParseRaw      = False
+               , readerColumns       = 80
                }

src/Text/Pandoc/Parsing.hs

@@ -545,7 +545,7 @@ tableWith headerParser rowParser lineParser footerParser = try $ do
     lines' <- rowParser indices `sepEndBy1` lineParser
     footerParser
     state <- getState
-    let numColumns = stateColumns state
+    numColumns <- getOption readerColumns
     let widths = if (indices == [])
                     then replicate (length aligns) 0.0
                     else widthsFromIndices numColumns indices
@@ -705,7 +705,6 @@ data ParserState = ParserState
                                              --   in parsing dashes; -- is em-dash;
                                              --   before numeral is en-dash
       stateLiterateHaskell :: Bool,          -- ^ Treat input as literate haskell
-      stateColumns         :: Int,           -- ^ Number of columns in terminal
       stateHeaderTable     :: [HeaderType],  -- ^ Ordered list of header types used
       stateIndentedCodeClasses :: [String],  -- ^ Classes to use for indented code blocks
       stateNextExample     :: Int,           -- ^ Number of next example
@@ -737,7 +736,6 @@ defaultParserState =
                   stateDate            = [],
                   stateOldDashes       = False,
                   stateLiterateHaskell = False,
-                  stateColumns         = 80,
                   stateHeaderTable     = [],
                   stateIndentedCodeClasses = [],
                   stateNextExample     = 1,

src/pandoc.hs

@@ -942,12 +942,12 @@ main = do
                               stateStandalone      = standalone',
                               stateCitations       = map CSL.refId refs,
                               stateOldDashes       = oldDashes,
-                              stateColumns         = columns,
                               stateOptions         = def{
                                    readerStrict = strict
                                  , readerSmart = smart || (texLigatures &&
                                      (laTeXOutput || writerName' == "context"))
                                  , readerParseRaw = parseRaw
+                                 , readerColumns = columns
                                  },
                               stateIndentedCodeClasses = codeBlockClasses,
                               stateApplyMacros     = not laTeXOutput