diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2007-01-15 19:52:42 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2007-01-15 19:52:42 +0000 |
| commit | 60989d0637780787fb337b94af212f1ee9e1ae22 (patch) | |
| tree | 95b5caa1e7e304a47739532a9c4d3767ce54435c /src/Main.hs | |
| parent | 4224d913880e4f77a358cda868c9d1ca75820506 (diff) | |
Added support for tables in markdown reader and in LaTeX,
DocBook, and HTML writers. The syntax is documented in
README. Tests have been added to the test suite.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@493 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'src/Main.hs')
| -rw-r--r-- | src/Main.hs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Main.hs b/src/Main.hs index 0ca1e5ca5..f3c70c472 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -48,7 +48,7 @@ import Text.Pandoc.Writers.DefaultHeaders ( defaultHtmlHeader, import Text.Pandoc.Definition import Text.Pandoc.Shared import Text.Regex ( mkRegex, matchRegex ) -import System.Environment ( getArgs, getProgName ) +import System.Environment ( getArgs, getProgName, getEnvironment ) import System.Exit ( exitWith, ExitCode (..) ) import System.Console.GetOpt import System.IO @@ -58,7 +58,7 @@ import Char ( toLower ) import Control.Monad ( (>>=) ) version :: String -version = "0.3" +version = "0.4" copyrightMessage :: String copyrightMessage = "\nCopyright (C) 2006 John MacFarlane\nWeb: http://sophos.berkeley.edu/macfarlane/pandoc\nThis is free software; see the source for copying conditions. There is no\nwarranty, not even for merchantability or fitness for a particular purpose." @@ -426,6 +426,11 @@ main = do then return stdout else openFile outputFile WriteMode + environment <- getEnvironment + let columns = case lookup "COLUMNS" environment of + Just cols -> read cols + Nothing -> stateColumns defaultParserState + let tabFilter = if preserveTabs then id else (tabsToSpaces tabStop) let addBlank str = str ++ "\n\n" let removeCRs str = filter (/= '\r') str -- remove DOS-style line endings @@ -435,6 +440,7 @@ main = do stateTabStop = tabStop, stateStandalone = standalone && (not strict), stateSmart = smart || writerName' == "latex", + stateColumns = columns, stateStrict = strict } let csslink = if (css == "") then "" |