git.iko.soy/typeable/pandoc
on master help sign in
Restore xhtml style self-closed tags in HTML writer.

This requires blaze-html >= 0.4.3.0.

commit5ff7f81b85c8cdf3bed3bd78f60de5eddf6692df authorJohn MacFarlane <fiddlosopher@gmail.com> dateTue 20 Dec 2011, 11:25 (15 years ago) parent8bf890d
2 files changed+11−11
compare with master
unifiedsplit
pandoc.cabal+2−2 src/Text/Pandoc/Writers/HTML.hs+9−9
pandoc.cabal+2−2
@@ -204,7 +204,7 @@ Library
204204 -- BEGIN DUPLICATED SECTION
205205 Build-Depends: containers >= 0.1 && < 0.5,
206206 parsec >= 2.1 && < 3.2,
207− blaze-html >= 0.4 && < 0.5,
207+ blaze-html >= 0.4.3.0 && < 0.5,
208208 mtl >= 1.1 && < 2.1,
209209 network >= 2 && < 2.4,
210210 filepath >= 1.1 && < 1.3,
@@ -292,7 +292,7 @@ Executable pandoc
292292 -- BEGIN DUPLICATED SECTION
293293 Build-Depends: containers >= 0.1 && < 0.5,
294294 parsec >= 2.1 && < 3.2,
295− blaze-html >= 0.4 && < 0.5,
295+ blaze-html >= 0.4.3.0 && < 0.5,
296296 mtl >= 1.1 && < 2.1,
297297 network >= 2 && < 2.4,
298298 filepath >= 1.1 && < 1.3,
src/Text/Pandoc/Writers/HTML.hs+9−9
@@ -45,9 +45,9 @@ import Data.String ( fromString )
4545import Data.Maybe ( catMaybes )
4646import Control.Monad.State
4747import Text.Blaze
48−import qualified Text.Blaze.Html5 as H
49−import qualified Text.Blaze.Html5.Attributes as A
50−import qualified Text.Blaze.Html4.Transitional.Attributes as A4
48+import qualified Text.Blaze.Html5 as H5
49+import qualified Text.Blaze.XHtml1.Transitional as H
50+import qualified Text.Blaze.XHtml1.Transitional.Attributes as A
5151import Text.Blaze.Renderer.String (renderHtml)
5252import Text.TeXMath
5353import Text.XML.Light.Output
@@ -252,7 +252,7 @@ elementToHtml opts (Sec level num id' title' elements) = do
252252 ["level" ++ show level]
253253 let inNl x = mconcat $ nl opts : intersperse (nl opts) x ++ [nl opts]
254254 let secttag = if writerHtml5 opts
255− then H.section ! A.class_ (toValue $ unwords classes)
255+ then H5.section ! A.class_ (toValue $ unwords classes)
256256 else H.div ! A.class_ (toValue $ unwords ("section":classes))
257257 return $ if writerSectionDivs opts || slide
258258 then secttag ! prefixedId opts id' $ inNl stuff
@@ -268,7 +268,7 @@ footnoteSection opts notes =
268268 $ nl opts >> H.hr >> nl opts >>
269269 H.ol (mconcat notes >> nl opts))
270270 where container x = if writerHtml5 opts
271− then H.section ! A.class_ "footnotes" $ x
271+ then H5.section ! A.class_ "footnotes" $ x
272272 else if writerSlideVariant opts /= NoSlides
273273 then H.div ! A.class_ "footnotes slide" $ x
274274 else H.div ! A.class_ "footnotes" $ x
@@ -349,8 +349,8 @@ blockToHtml opts (Para [Image txt (s,tit)]) = do
349349 img <- inlineToHtml opts (Image txt (s,tit))
350350 capt <- inlineListToHtml opts txt
351351 return $ if writerHtml5 opts
352− then H.figure $ mconcat
353− [nl opts, img, H.figcaption capt, nl opts]
352+ then H5.figure $ mconcat
353+ [nl opts, img, H5.figcaption capt, nl opts]
354354 else H.div ! A.class_ "figure" $ mconcat
355355 [nl opts, img, H.p ! A.class_ "caption" $ capt,
356356 nl opts]
@@ -508,7 +508,7 @@ tableItemToHtml opts tag' align' item = do
508508 let alignStr = alignmentToString align'
509509 let attribs = if writerHtml5 opts
510510 then A.style (toValue $ "text-align: " ++ alignStr ++ ";")
511− else A4.align (toValue alignStr)
511+ else A.align (toValue alignStr)
512512 return $ (tag' ! attribs $ contents) >> nl opts
513513
514514toListItems :: WriterOptions -> [Html] -> [Html]
@@ -641,7 +641,7 @@ inlineToHtml opts inline =
641641 (if null tit
642642 then []
643643 else [A.title $ toValue tit])
644− return $ foldl (!) H.embed attributes
644+ return $ foldl (!) H5.embed attributes
645645 -- note: null title included, as in Markdown.pl
646646 (Note contents) -> do
647647 st <- get