@@ -39,7 +39,7 @@ import Text.Pandoc.Readers.TeXMath
39import Text.Pandoc.Slides
39import Text.Pandoc.Slides
40import Text.Pandoc.Highlighting ( highlight, styleToCss,
40import Text.Pandoc.Highlighting ( highlight, styleToCss,
41 formatHtmlInline, formatHtmlBlock )
41 formatHtmlInline, formatHtmlBlock )
42−import Text.Pandoc.XML (stripTags, escapeStringForXML, fromEntities)
42+import Text.Pandoc.XML (stripTags, fromEntities)
43import Network.HTTP ( urlEncode )
43import Network.HTTP ( urlEncode )
44import Numeric ( showHex )
44import Numeric ( showHex )
45import Data.Char ( ord, toLower )
45import Data.Char ( ord, toLower )
@@ -60,7 +60,7 @@ import Text.Blaze.Renderer.String (renderHtml)
60import Text.TeXMath
60import Text.TeXMath
61import Text.XML.Light.Output
61import Text.XML.Light.Output
62import System.FilePath (takeExtension)
62import System.FilePath (takeExtension)
63−import Data.Monoid (mempty, mconcat)
63+import Data.Monoid
65data WriterState = WriterState
65data WriterState = WriterState
66 { stNotes :: [Html] -- ^ List of notes
66 { stNotes :: [Html] -- ^ List of notes
@@ -77,8 +77,11 @@ defaultWriterState = WriterState {stNotes= [], stMath = False, stQuotes = False,
77-- Helpers to render HTML with the appropriate function.
77-- Helpers to render HTML with the appropriate function.
79strToHtml :: String -> Html
79strToHtml :: String -> Html
80−strToHtml = preEscapedString . escapeStringForXML
80+strToHtml ('\'':xs) = preEscapedString "\'" `mappend` strToHtml xs
81−-- strToHtml = toHtml
81+strToHtml xs@(_:_) = case break (=='\'') xs of
83+ (ys,zs) -> toHtml ys `mappend` strToHtml zs
83-- | Hard linebreak.
86-- | Hard linebreak.
84nl :: WriterOptions -> Html
87nl :: WriterOptions -> Html