Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Restore xhtml style self-closed tags in HTML writer.

Browse source 
This requires blaze-html >= 0.4.3.0.
This commit is contained in:
John MacFarlane 2011-12-20 11:25:26 -08:00
parent 8bf890d7e4
commit 5ff7f81b85
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandoc.cabal
View file

@ -204,7 +204,7 @@ Library
-- BEGIN DUPLICATED SECTION -- BEGIN DUPLICATED SECTION
Build-Depends: containers >= 0.1 && < 0.5, Build-Depends: containers >= 0.1 && < 0.5,
parsec >= 2.1 && < 3.2, parsec >= 2.1 && < 3.2,
blaze-html >= 0.4 && < 0.5, blaze-html >= 0.4.3.0 && < 0.5,
mtl >= 1.1 && < 2.1, mtl >= 1.1 && < 2.1,
network >= 2 && < 2.4, network >= 2 && < 2.4,
filepath >= 1.1 && < 1.3, filepath >= 1.1 && < 1.3,
@ -292,7 +292,7 @@ Executable pandoc
-- BEGIN DUPLICATED SECTION -- BEGIN DUPLICATED SECTION
Build-Depends: containers >= 0.1 && < 0.5, Build-Depends: containers >= 0.1 && < 0.5,
parsec >= 2.1 && < 3.2, parsec >= 2.1 && < 3.2,
blaze-html >= 0.4 && < 0.5, blaze-html >= 0.4.3.0 && < 0.5,
mtl >= 1.1 && < 2.1, mtl >= 1.1 && < 2.1,
network >= 2 && < 2.4, network >= 2 && < 2.4,
filepath >= 1.1 && < 1.3, filepath >= 1.1 && < 1.3,

18
src/Text/Pandoc/Writers/HTML.hs
View file

@ -45,9 +45,9 @@ import Data.String ( fromString )
import Data.Maybe ( catMaybes ) import Data.Maybe ( catMaybes )
import Control.Monad.State import Control.Monad.State
import Text.Blaze import Text.Blaze
import qualified Text.Blaze.Html5 as H import qualified Text.Blaze.Html5 as H5
import qualified Text.Blaze.Html5.Attributes as A import qualified Text.Blaze.XHtml1.Transitional as H
import qualified Text.Blaze.Html4.Transitional.Attributes as A4 import qualified Text.Blaze.XHtml1.Transitional.Attributes as A
import Text.Blaze.Renderer.String (renderHtml) import Text.Blaze.Renderer.String (renderHtml)
import Text.TeXMath import Text.TeXMath
import Text.XML.Light.Output import Text.XML.Light.Output
@ -252,7 +252,7 @@ elementToHtml opts (Sec level num id' title' elements) = do
["level" ++ show level] ["level" ++ show level]
let inNl x = mconcat $ nl opts : intersperse (nl opts) x ++ [nl opts] let inNl x = mconcat $ nl opts : intersperse (nl opts) x ++ [nl opts]
let secttag = if writerHtml5 opts let secttag = if writerHtml5 opts
then H.section ! A.class_ (toValue $ unwords classes) then H5.section ! A.class_ (toValue $ unwords classes)
else H.div ! A.class_ (toValue $ unwords ("section":classes)) else H.div ! A.class_ (toValue $ unwords ("section":classes))
return $ if writerSectionDivs opts || slide return $ if writerSectionDivs opts || slide
then secttag ! prefixedId opts id' $ inNl stuff then secttag ! prefixedId opts id' $ inNl stuff
@ -268,7 +268,7 @@ footnoteSection opts notes =
$ nl opts >> H.hr >> nl opts >> $ nl opts >> H.hr >> nl opts >>
H.ol (mconcat notes >> nl opts)) H.ol (mconcat notes >> nl opts))
where container x = if writerHtml5 opts where container x = if writerHtml5 opts
then H.section ! A.class_ "footnotes" $ x then H5.section ! A.class_ "footnotes" $ x
else if writerSlideVariant opts /= NoSlides else if writerSlideVariant opts /= NoSlides
then H.div ! A.class_ "footnotes slide" $ x then H.div ! A.class_ "footnotes slide" $ x
else H.div ! A.class_ "footnotes" $ x else H.div ! A.class_ "footnotes" $ x
@ -349,8 +349,8 @@ blockToHtml opts (Para [Image txt (s,tit)]) = do
img <- inlineToHtml opts (Image txt (s,tit)) img <- inlineToHtml opts (Image txt (s,tit))
capt <- inlineListToHtml opts txt capt <- inlineListToHtml opts txt
return $ if writerHtml5 opts return $ if writerHtml5 opts
then H.figure $ mconcat then H5.figure $ mconcat
[nl opts, img, H.figcaption capt, nl opts] [nl opts, img, H5.figcaption capt, nl opts]
else H.div ! A.class_ "figure" $ mconcat else H.div ! A.class_ "figure" $ mconcat
[nl opts, img, H.p ! A.class_ "caption" $ capt, [nl opts, img, H.p ! A.class_ "caption" $ capt,
nl opts] nl opts]
@ -508,7 +508,7 @@ tableItemToHtml opts tag' align' item = do
let alignStr = alignmentToString align' let alignStr = alignmentToString align'
let attribs = if writerHtml5 opts let attribs = if writerHtml5 opts
then A.style (toValue $ "text-align: " ++ alignStr ++ ";") then A.style (toValue $ "text-align: " ++ alignStr ++ ";")
else A4.align (toValue alignStr) else A.align (toValue alignStr)
return $ (tag' ! attribs $ contents) >> nl opts return $ (tag' ! attribs $ contents) >> nl opts
toListItems :: WriterOptions -> [Html] -> [Html] toListItems :: WriterOptions -> [Html] -> [Html]
@ -641,7 +641,7 @@ inlineToHtml opts inline =
(if null tit (if null tit
then [] then []
else [A.title $ toValue tit]) else [A.title $ toValue tit])
return $ foldl (!) H.embed attributes return $ foldl (!) H5.embed attributes
-- note: null title included, as in Markdown.pl -- note: null title included, as in Markdown.pl
(Note contents) -> do (Note contents) -> do
st <- get st <- get