diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-12-18 22:02:39 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-12-18 22:02:39 +0000 |
| commit | a8bbd950e526abb69262fb7186ced583885c6ac8 (patch) | |
| tree | 30e4e5b365faee64c3475290475da9a687428d8f /src/Text | |
| parent | cd4a035a7539edc12165d35e2d166f15ddc3f7d4 (diff) | |
| download | pandoc-a8bbd950e526abb69262fb7186ced583885c6ac8.tar.gz | |
Changed '--smartypants' to '--smart' and adjusted documentation
and symbols accordingly.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@224 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc/Shared.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/HTML.hs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs index b2686d941..b3261f02e 100644 --- a/src/Text/Pandoc/Shared.hs +++ b/src/Text/Pandoc/Shared.hs @@ -276,7 +276,7 @@ data WriterOptions = WriterOptions , writerHeader :: String -- ^ Header for the document , writerIncludeBefore :: String -- ^ String to include before the document body , writerIncludeAfter :: String -- ^ String to include after the document body - , writerSmartypants :: Bool -- ^ If @True@, use smart quotes, dashes, and ellipses + , writerSmart :: Bool -- ^ If @True@, use smart quotes, dashes, and ellipses , writerS5 :: Bool -- ^ @True@ if we're writing S5 instead of normal HTML , writerIncremental :: Bool -- ^ If @True@, display S5 lists incrementally , writerNumberSections :: Bool -- ^ If @True@, number sections in LaTeX diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index 1f1258753..d99b70bee 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -51,7 +51,7 @@ obfuscateChar char = let num = ord char in stringToHtml :: String -> String stringToHtml str = escapePreservingRegex stringToHtmlString (mkRegex "\"|(&[[:alnum:]]*;)") str --- | Escape string as in 'stringToHtml' but add smartypants filter. +-- | Escape string as in 'stringToHtml' but add smart typography filter. stringToSmartHtml :: String -> String stringToSmartHtml = let escapeDoubleQuotes = @@ -157,7 +157,7 @@ listItemToHtml options list = "<li>" ++ (concatMap (blockToHtml options) list) + inlineListToHtml :: WriterOptions -> [Inline] -> String inlineListToHtml options lst = -- consolidate adjacent Str and Space elements for more intelligent - -- smartypants filtering + -- smart typography filtering let lst' = consolidateList lst in concatMap (inlineToHtml options) lst' @@ -166,7 +166,7 @@ inlineToHtml :: WriterOptions -> Inline -> String inlineToHtml options (Emph lst) = "<em>" ++ (inlineListToHtml options lst) ++ "</em>" inlineToHtml options (Strong lst) = "<strong>" ++ (inlineListToHtml options lst) ++ "</strong>" inlineToHtml options (Code str) = "<code>" ++ (codeStringToHtml str) ++ "</code>" -inlineToHtml options (Str str) = if (writerSmartypants options) then +inlineToHtml options (Str str) = if (writerSmart options) then stringToSmartHtml str else stringToHtml str |