remove makeXmlElementNoEnd

Author: jeffreyrosenbluth

README.md

@@ -16,8 +16,8 @@ svg content =
 
 contents :: Element
 contents =
-     rect_   [ Width <<- "100%", Height <<- "100%", "red" ->> Fill] nil
-  <> circle_ [ Cx <<- "150", Cy <<- "100", R <<- "80", Fill <<- "green"] nil
+     rect_   [ Width <<- "100%", Height <<- "100%", "red" ->> Fill]
+  <> circle_ [ Cx <<- "150", Cy <<- "100", R <<- "80", Fill <<- "green"]
   <> text_   [ X <<- "150", Y <<- "125", Font_size <<- "60"
              , Text_anchor <<- "middle", Fill <<- "white"] "SVG"
 

examples/path.hs

@@ -6,7 +6,7 @@ import Data.Text.Lazy as T
 
 svg :: Element -> Element
 svg content =
-      doctype_
+      doctype
    <> with (svg11_ content) [Width <<- "325", Height <<- "325"]
 
 contents :: Element
@@ -15,7 +15,7 @@ contents =
     [ D <<- (mA 10 80 <> qA 52.5 10 95 80 <> tA 180 80 <> z)
     , Stroke <<- "blue"
     , Fill <<- "orange"
-    ] nil
+    ]
 
 main :: IO ()
 main = do

examples/simple.hs

@@ -4,7 +4,7 @@ import Lucid.Svg
 
 svg :: Element -> Element
 svg content =
-     doctype_
+     doctype
   <> with (svg11_ content) [Version <<- "1.1", Width <<- "300", Height <<- "200"]
 
 contents :: Element

src/Lucid/Svg.hs

@@ -79,7 +79,7 @@ prettyText svg = B.toLazyText $ LT.foldr go mempty text Nothing (-1)
 -- <text>Hello</text><text>SVG</text>
 --
 -- Attributes are set by providing an argument list. Each argument is set
--- using the 'bindAttr' function or operators, ' <<-' and '-->'.
+-- using the 'bindAttr' function or operators, ' <<-' and '->>'.
 --
 -- >>> rect_ [Width  <<- "100%", Height  <<- "100%", "red" ->> Fill] nil
 -- <rect height="100%" width="100%" fill="red"></rect>
@@ -102,13 +102,13 @@ prettyText svg = B.toLazyText $ LT.foldr go mempty text Nothing (-1)
 -- >
 -- > svg :: Element -> Element
 -- > svg content =
--- >      doctype_
--- >   <> with (svg11_ content) [version_ "1.1", width_ "300" , height_ "200"]
+-- >      doctype
+-- >   <> with (svg11_ content) [Version <<- "1.1", Width <<- "300" , Height <<- "200"]
 -- >
 -- > contents :: Element
 -- > contents =
--- >      rect_ [Width  <<- "100%", Height  <<- "100%", Fill  <<- "red"] nil
--- >   <> circle_ [Cx  <<- "150", Cy  <<- "100", R  <<- "80", Fill  <<- "green"] nil
+-- >      rect_ [Width  <<- "100%", Height  <<- "100%", Fill  <<- "red"]
+-- >   <> circle_ [Cx  <<- "150", Cy  <<- "100", R  <<- "80", Fill  <<- "green"]
 -- >   <> text_ [ X  <<- "150", Y  <<- "125", FontSize  <<- "60"
 -- >            , TextAnchor  <<- "middle", Fill  <<- "white" ] "SVG"
 -- >

src/Lucid/Svg/Core.hs

@@ -21,8 +21,8 @@ module Lucid.Svg.Core
   -- * Combinators
 , makeAttribute
 , makeElement
+, makeElementDoctype
 , makeElementNoEnd
-, makeXmlElementNoEnd
 , with
   -- * Rendering
 , renderBS
@@ -78,14 +78,14 @@ instance ToElement LT.Text where
 
 -- | Used to make specific SVG element builders.
 class Term result where
-  -- | Used for constructing elements e.g. @term "p"@ yields 'Lucid.Html5.p_'.
+  -- | Used for constructing elements e.g. @term "circle"@ yields 'circle_'.
   term :: Text -> [Attribute] -> result
 
 instance (e ~ Element) => Term (e -> Element) where
   term name attrs e = with (makeElement name e) attrs
 
 instance Term Element where
-  term name attrs = with (makeXmlElementNoEnd name) attrs
+  term name attrs = with (makeElementNoEnd name) attrs
 
 --------------------------------------------------------------------------------
 -- Combinators
@@ -117,17 +117,17 @@ makeElement name (Element c) = Element $ \a -> go c a
       <> children mempty
       <> s2b "</" <> BB.fromText name <> s2b ">"
 
--- | Make an SVG element builder with no end tag.
-makeElementNoEnd :: Text -> Element
-makeElementNoEnd name = Element $ \a -> go a
+-- | Make an SVG element builder with no end tag,.
+makeElementDoctype :: Text -> Element
+makeElementDoctype name = Element $ \a -> go a
   where
     go attrs =
          s2b "<" <> BB.fromText name
       <> foldlMapWithKey buildAttr attrs <> s2b ">"
 
 -- | Make an XML element with no end tag.
-makeXmlElementNoEnd :: Text -> Element
-makeXmlElementNoEnd name = Element $ \a -> go a
+makeElementNoEnd :: Text -> Element
+makeElementNoEnd name = Element $ \a -> go a
   where
     go attrs =
          s2b "<" <> BB.fromText name

src/Lucid/Svg/Elements.hs

@@ -17,8 +17,8 @@ module Lucid.Svg.Elements where
 import Lucid.Svg.Core
 
 -- | @DOCTYPE@ element
-doctype_ :: Element
-doctype_ = makeElementNoEnd "?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"\n    \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\""
+doctype :: Element
+doctype = makeElementDoctype "?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"\n    \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\""
 
 -- | @svg@ element + svg 1.1 Attribute
 svg11_:: Element -> Element
@@ -200,11 +200,11 @@ fontFace_ = term "font-face"
 
 -- | @fontFaceFormat@ element
 fontFaceFormat_ :: [Attribute] -> Element
-fontFaceFormat_ = with $ makeXmlElementNoEnd "font-face-format"
+fontFaceFormat_ = with $ makeElementNoEnd "font-face-format"
 
 -- | @fontFaceName@ element
 fontFaceName_ :: [Attribute] -> Element
-fontFaceName_ = with $ makeXmlElementNoEnd "font-face-name"
+fontFaceName_ = with $ makeElementNoEnd "font-face-name"
 
 -- | @fontFaceSrc@ element
 fontFaceSrc_ :: Term result => [Attribute] -> result
@@ -228,11 +228,11 @@ glyph_ = term "glyph"
 
 -- | @glyphref@ element
 glyphRef_ :: [Attribute] -> Element
-glyphRef_ = with $ makeXmlElementNoEnd "glyphRef"
+glyphRef_ = with $ makeElementNoEnd "glyphRef"
 
 -- | @hkern@ element
 hkern_ :: [Attribute] -> Element
-hkern_ = with $ makeXmlElementNoEnd "hkern"
+hkern_ = with $ makeElementNoEnd "hkern"
 
 -- | @image@ element
 image_ :: Term result => [Attribute] -> result
@@ -348,4 +348,4 @@ view_ = term "view"
 
 -- | @vkern@ element
 vkern_ :: [Attribute] -> Element
-vkern_ = with $ makeXmlElementNoEnd "vkern"
+vkern_ = with $ makeElementNoEnd "vkern"