xmlhtml 0.1.7 → 0.2.0

raw patch · 3 files changed

+21/−17 lines, 3 filesdep +blaze-markupdep ~blaze-htmlnew-uploaderPVP ok

version bump matches the API change (PVP)

Dependencies added: blaze-markup

Dependency ranges changed: blaze-html

API changes (from Hackage documentation)

Files

• src/Text/Blaze/Renderer/XmlHtml.hs +8/−5
• test/xmlhtml-testsuite.cabal +10/−10
• xmlhtml.cabal +3/−2

@@ -3,15 +3,14 @@ -- -- Warning: because this renderer doesn't directly create the output, but -- rather an XML tree representation, it is impossible to render pre-escaped--- text. This means that @preEscapedString@ will produce the same output as--- @string@. This also applies to the functions @preEscapedText@,--- @preEscapedTextValue@...+-- text. -- module Text.Blaze.Renderer.XmlHtml (renderHtml, renderHtmlNodes) where  import           Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.Encoding as T+import           Text.Blaze.Html import           Text.Blaze.Internal import           Text.XmlHtml @@ -52,14 +51,18 @@ renderNodes :: Html -> [Node] -> [Node] renderNodes = go []   where-    go :: [(Text, Text)] -> HtmlM b -> [Node] -> [Node]+    go :: [(Text, Text)] -> MarkupM a -> [Node] -> [Node]     go attrs (Parent tag _ _ content) =         (Element (getText tag) attrs (go [] content []) :)+    go attrs (CustomParent tag content) =+        (Element (fromChoiceStringText tag) attrs (go [] content []) :)     go attrs (Leaf tag _ _) =         (Element (getText tag) attrs [] :)+    go attrs (CustomLeaf tag _) =+        (Element (fromChoiceStringText tag) attrs [] :)     go attrs (AddAttribute key _ value content) =         go ((getText key, fromChoiceStringText value) : attrs) content-    go attrs (AddCustomAttribute key _ value content) =+    go attrs (AddCustomAttribute key value content) =         go ((fromChoiceStringText key, fromChoiceStringText value) : attrs)            content     go _ (Content content) = fromChoiceString content

@@ -9,19 +9,19 @@    build-depends:     HUnit                      == 1.2.*,-    directory                  >= 1.0   && < 1.2,+    directory                  >= 1.0      && <1.2,     QuickCheck                 >= 2.3.0.2,     base                       == 4.*,-    blaze-builder              >= 0.2   && < 0.4,-    blaze-html                 >= 0.3.2 && < 0.5,+    blaze-builder              >= 0.2      && <0.4,+    blaze-html                 >= 0.3.2    && <0.5,     bytestring                 == 0.9.*,-    containers                 >= 0.3   && < 0.5,-    parsec                     >= 3.1.2 && < 3.2,-    test-framework             >= 0.3.1 && < 0.5,-    test-framework-hunit       >= 0.2.5 && < 0.3,-    test-framework-quickcheck2 >= 0.2.6 && < 0.3,-    text                       >= 0.11  && < 0.12,-    unordered-containers       >= 0.1.4 && < 0.3+    containers                 >= 0.3      && <0.5,+    parsec                     >= 3.1.2    && <3.2,+    test-framework             >= 0.6      && <0.7,+    test-framework-hunit       >= 0.2.7    && <0.3,+    test-framework-quickcheck2 >= 0.2.12.1 && <0.3,+    text                       >= 0.11     && <0.12,+    unordered-containers       >= 0.1.4    && <0.3    ghc-options: -O2 -Wall -fhpc -fwarn-tabs -funbox-strict-fields -threaded                -fno-warn-unused-do-bind

@@ -1,5 +1,5 @@ Name:                xmlhtml-Version:             0.1.7+Version:             0.2.0 Synopsis:            XML parser and renderer with HTML 5 quirks mode Description:         Contains renderers and parsers for both XML and HTML 5                      document fragments, which share data structures so that@@ -821,7 +821,8 @@    Build-depends:       base                 >= 4     && < 5,                        blaze-builder        >= 0.2   && < 0.4,-                       blaze-html           >= 0.3.2 && < 0.5,+                       blaze-html           >= 0.5   && < 0.6,+                       blaze-markup         >= 0.5   && < 0.6,                        bytestring           >= 0.9   && < 0.10,                        containers           >= 0.3   && < 0.5,                        parsec               >= 3.1.2 && < 3.2,