diff --git a/blaze-html.cabal b/blaze-html.cabal --- a/blaze-html.cabal +++ b/blaze-html.cabal @@ -1,5 +1,5 @@ Name: blaze-html -Version: 0.5.0.0 +Version: 0.5.1.0 Homepage: http://jaspervdj.be/blaze Bug-Reports: http://github.com/jaspervdj/blaze-html/issues License: BSD3 @@ -46,12 +46,14 @@ Text.Blaze.XHtml1.Strict.Attributes Text.Blaze.XHtml1.Transitional Text.Blaze.XHtml1.Transitional.Attributes + Text.Blaze.XHtml5 + Text.Blaze.XHtml5.Attributes Build-depends: base >= 4 && < 5, blaze-builder >= 0.2 && < 0.4, blaze-markup >= 0.5.1 && < 0.6, - bytestring >= 0.9 && < 0.10, + bytestring >= 0.9 && < 0.11, text >= 0.10 && < 0.12 Test-suite blaze-html-tests @@ -76,7 +78,7 @@ base >= 4 && < 5, blaze-builder >= 0.2 && < 0.4, blaze-markup >= 0.5.1 && < 0.6, - bytestring >= 0.9 && < 0.10, + bytestring >= 0.9 && < 0.11, text >= 0.10 && < 0.12 Source-repository head diff --git a/src/Text/Blaze/Html.hs b/src/Text/Blaze/Html.hs --- a/src/Text/Blaze/Html.hs +++ b/src/Text/Blaze/Html.hs @@ -2,11 +2,15 @@ ( module Text.Blaze , Html , toHtml + , preEscapedToHtml ) where import Text.Blaze type Html = Markup -toHtml :: ToMarkup a => a -> Markup +toHtml :: ToMarkup a => a -> Html toHtml = toMarkup + +preEscapedToHtml :: ToMarkup a => a -> Html +preEscapedToHtml = preEscapedToMarkup diff --git a/src/Text/Blaze/XHtml5.hs b/src/Text/Blaze/XHtml5.hs new file mode 100644 --- /dev/null +++ b/src/Text/Blaze/XHtml5.hs @@ -0,0 +1,2005 @@ +-- WARNING: The next block of code was automatically generated by +-- src/Util/GenerateHtmlCombinators.hs:69 +-- +{-# LANGUAGE OverloadedStrings #-} +-- | This module exports HTML combinators used to create documents. +-- +module Text.Blaze.XHtml5 + ( module Text.Blaze.Html + , docType + , docTypeHtml + , a + , abbr + , address + , area + , article + , aside + , audio + , b + , base + , bdo + , blockquote + , body + , br + , button + , canvas + , caption + , cite + , code + , col + , colgroup + , command + , datalist + , dd + , del + , details + , dfn + , div + , dl + , dt + , em + , embed + , fieldset + , figcaption + , figure + , footer + , form + , h1 + , h2 + , h3 + , h4 + , h5 + , h6 + , head + , header + , hgroup + , hr + , html + , i + , iframe + , img + , input + , ins + , kbd + , keygen + , label + , legend + , li + , link + , map + , mark + , menu + , meta + , meter + , nav + , noscript + , object + , ol + , optgroup + , option + , output + , p + , param + , pre + , progress + , q + , rp + , rt + , ruby + , samp + , script + , section + , select + , small + , source + , span + , strong + , style + , sub + , summary + , sup + , table + , tbody + , td + , textarea + , tfoot + , th + , thead + , time + , title + , tr + , ul + , var + , video + ) where + +-- WARNING: The next block of code was automatically generated by +-- src/Util/GenerateHtmlCombinators.hs:77 +-- +import Prelude ((>>), (.)) + +import Text.Blaze +import Text.Blaze.Internal +import Text.Blaze.Html + +-- WARNING: The next block of code was automatically generated by +-- src/Util/GenerateHtmlCombinators.hs:156 +-- +-- | Combinator for the document type. This should be placed at the top +-- of every HTML page. +-- +-- Example: +-- +-- > docType +-- +-- Result: +-- +-- > +-- +docType :: Html -- ^ The document type HTML. +docType = preEscapedText "\n" +{-# INLINE docType #-} + +-- WARNING: The next block of code was automatically generated by +-- src/Util/GenerateHtmlCombinators.hs:177 +-- +-- | Combinator for the @\@ element. This combinator will also +-- insert the correct doctype. +-- +-- Example: +-- +-- > docTypeHtml $ span $ text "foo" +-- +-- Result: +-- +-- > +-- > foo +-- +docTypeHtml :: Html -- ^ Inner HTML. + -> Html -- ^ Resulting HTML. +docTypeHtml inner = docType >> html inner +{-# INLINE docTypeHtml #-} + +-- WARNING: The next block of code was automatically generated by +-- src/Util/GenerateHtmlCombinators.hs:199 +-- +-- | Combinator for the @\@ element. +-- +-- Example: +-- +-- > a $ span $ text "foo" +-- +-- Result: +-- +-- > foo +-- +a :: Html -- ^ Inner HTML. + -> Html -- ^ Resulting HTML. +a = Parent "a" "" +{-# INLINE a #-} + +-- WARNING: The next block of code was automatically generated by +-- src/Util/GenerateHtmlCombinators.hs:199 +-- +-- | Combinator for the @\@ element. +-- +-- Example: +-- +-- > abbr $ span $ text "foo" +-- +-- Result: +-- +-- > foo +-- +abbr :: Html -- ^ Inner HTML. + -> Html -- ^ Resulting HTML. +abbr = Parent "abbr" "" +{-# INLINE abbr #-} + +-- WARNING: The next block of code was automatically generated by +-- src/Util/GenerateHtmlCombinators.hs:199 +-- +-- | Combinator for the @\
@ element. +-- +-- Example: +-- +-- > address $ span $ text "foo" +-- +-- Result: +-- +-- >
foo
+-- +address :: Html -- ^ Inner HTML. + -> Html -- ^ Resulting HTML. +address = Parent "address" "" +{-# INLINE address #-} + +-- WARNING: The next block of code was automatically generated by +-- src/Util/GenerateHtmlCombinators.hs:226 +-- +-- | Combinator for the @\@ element. +-- +-- Example: +-- +-- > area +-- +-- Result: +-- +-- > +-- +area :: Html -- ^ Resulting HTML. +area = Leaf "area" "" +{-# INLINE area #-} + +-- WARNING: The next block of code was automatically generated by +-- src/Util/GenerateHtmlCombinators.hs:199 +-- +-- | Combinator for the @\
@ element. +-- +-- Example: +-- +-- > article $ span $ text "foo" +-- +-- Result: +-- +-- >
foo
+-- +article :: Html -- ^ Inner HTML. + -> Html -- ^ Resulting HTML. +article = Parent "article" "" +{-# INLINE article #-} + +-- WARNING: The next block of code was automatically generated by +-- src/Util/GenerateHtmlCombinators.hs:199 +-- +-- | Combinator for the @\