Use <q> tags for Quoted items for HTML5 output.

The quote style can be changed by modifying the template
or including a css file. A default quote style is included.
This commit is contained in:
John MacFarlane 2012-03-03 08:27:44 -08:00
parent e6a03cdd4b
commit 40133e8a7d
2 changed files with 12 additions and 5 deletions

View file

@ -59,12 +59,14 @@ import Data.Monoid (mempty, mconcat)
data WriterState = WriterState
{ stNotes :: [Html] -- ^ List of notes
, stMath :: Bool -- ^ Math is used in document
, stQuotes :: Bool -- ^ <q> tag is used
, stHighlighting :: Bool -- ^ Syntax highlighting is used
, stSecNum :: [Int] -- ^ Number of current section
}
defaultWriterState :: WriterState
defaultWriterState = WriterState {stNotes= [], stMath = False, stHighlighting = False, stSecNum = []}
defaultWriterState = WriterState {stNotes= [], stMath = False, stQuotes = False,
stHighlighting = False, stSecNum = []}
-- Helpers to render HTML with the appropriate function.
@ -156,7 +158,8 @@ pandocToHtml opts (Pandoc (Meta title' authors' date') blocks) = do
let newvars = [("highlighting-css",
styleToCss $ writerHighlightStyle opts) |
stHighlighting st] ++
[("math", renderHtml math) | stMath st]
[("math", renderHtml math) | stMath st] ++
[("quotes", "yes") | stQuotes st]
return (tit, auths, authsMeta, date, toc, thebody, newvars)
-- | Prepare author for meta tag, converting notes into
@ -581,8 +584,12 @@ inlineToHtml opts inline =
strToHtml "")
DoubleQuote -> (strToHtml "",
strToHtml "")
in do contents <- inlineListToHtml opts lst
return $ leftQuote >> contents >> rightQuote
in if writerHtml5 opts
then do
modify $ \st -> st{ stQuotes = True }
H.q `fmap` inlineListToHtml opts lst
else (\x -> leftQuote >> x >> rightQuote)
`fmap` inlineListToHtml opts lst
(Math t str) -> modify (\st -> st {stMath = True}) >>
(case writerHTMLMathMethod opts of
LaTeXMathML _ ->

@ -1 +1 @@
Subproject commit 4594c7eeaee4e82237d4c52f011441143ad321d8
Subproject commit cc0e845c187fb98ebd2343750cfbacd1ab39fc57