summaryrefslogtreecommitdiff
path: root/src/Main.hs
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-01-06 09:54:58 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-01-06 09:54:58 +0000
commitbb8478e4e24b431ca81ee7f669d517eb11a47500 (patch)
tree3dedfbceaf88404e531b81e37f07b8f026f07ebb /src/Main.hs
parent06e6107f535ae921f4b1fec2e7de7dd98b793435 (diff)
Merged changes from 'quotes' branch since r431. Smart typography
is now handled in the Markdown and LaTeX readers, rather than in the writers. The HTML writer has been rewritten to use the prettyprinting library. git-svn-id: https://pandoc.googlecode.com/svn/trunk@436 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'src/Main.hs')
-rw-r--r--src/Main.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Main.hs b/src/Main.hs
index 534d99c95..31de9d6e5 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -190,7 +190,7 @@ options =
, Option "S" ["smart"]
(NoArg
(\opt -> return opt { optSmart = True }))
- "" -- "Use smart quotes, dashes, and ellipses in HTML output"
+ "" -- "Use smart quotes, dashes, and ellipses"
, Option "m" ["asciimathml"]
(NoArg
@@ -423,6 +423,8 @@ main = do
defaultParserState { stateParseRaw = parseRaw,
stateTabStop = tabStop,
stateStandalone = standalone && (not strict),
+ stateSmart = (smart && (not strict)) ||
+ writerName' == "latex",
stateStrict = strict }
let csslink = if (css == "")
then ""
@@ -437,8 +439,6 @@ main = do
(not strict),
writerHeader = header,
writerTitlePrefix = titlePrefix,
- writerSmart = smart &&
- (not strict),
writerTabStop = tabStop,
writerNotes = [],
writerS5 = (writerName=="s5"),