diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,31 @@ Copyright (c) 2009, Jinjing Wang + All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of the nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Jinjing Wang nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/moe.cabal b/moe.cabal --- a/moe.cabal +++ b/moe.cabal @@ -1,5 +1,5 @@ Name: moe -Version: 2009.9.16 +Version: 2009.11.3 Build-type: Simple Synopsis: html with style Description: @@ -18,7 +18,7 @@ library ghc-options: -Wall -fno-warn-orphans - build-depends: base >= 4 && < 5, mtl, mps >= 2009.8.18.1, data-default, bytestring, utf8-string, dlist + build-depends: base >= 4 && < 5, mtl, mps >= 2009.9.18, data-default, bytestring, utf8-string, dlist hs-source-dirs: src/ exposed-modules: Text.HTML.Moe @@ -26,6 +26,7 @@ Text.HTML.Moe.Element Text.HTML.Moe.DSL.Markdown Text.HTML.Moe.DSL.Kawaii + Text.HTML.Moe.DSL.HTML5 Text.HTML.Moe.Type Text.HTML.Moe.Utils Text.HTML.Moe.Backend.ByteString diff --git a/src/Text/HTML/Moe.hs b/src/Text/HTML/Moe.hs --- a/src/Text/HTML/Moe.hs +++ b/src/Text/HTML/Moe.hs @@ -21,6 +21,7 @@ import Text.HTML.Moe.Utils import qualified Data.ByteString.Char8 as B import Data.DList (toList) +import Data.List (intersperse) (/) :: MoeUnit (/) = return () @@ -46,8 +47,8 @@ render_element' :: Int -> Element -> Internal render_element' _ (Raw x) = x render_element' _ (Pre x) = x -render_element' n (Prim x) = _indent n + x + new_line -render_element' n (Data x) = _indent n + x + new_line +render_element' n (Prim x) = _indent n + x +render_element' n (Data x) = _indent n + x render_element' n x | x.self_close = @@ -56,28 +57,37 @@ , x.T.name , x.attributes.map render_attribute. join_attribute , " />".pack - , new_line ] .concat | otherwise = - [ _indent n + [ self_indent , "<".pack , x.T.name , x.attributes.map render_attribute. join_attribute , ">".pack - , new_line - , x.elements.map (render_element' (n P.+ 1)) .concat - , _indent n + , inner_elements , "".pack - , new_line ] .concat where + self_indent = if x.indent then _indent n else "".pack join_attribute xs = xs.map (pack " " `append`) .concat + inner_elements = + if x.elements.null + then "".pack + else + [ new_line + , x.elements.map (render_element' (n P.+ 1)) .intersperse new_line .concat + , new_line + , self_indent + ] + .concat + + diff --git a/src/Text/HTML/Moe/DSL/HTML5.hs b/src/Text/HTML/Moe/DSL/HTML5.hs new file mode 100644 --- /dev/null +++ b/src/Text/HTML/Moe/DSL/HTML5.hs @@ -0,0 +1,113 @@ +module Text.HTML.Moe.DSL.HTML5 where + +import Text.HTML.Moe.Element +import Text.HTML.Moe.Type + +article :: MoeCombinator +aside :: MoeCombinator +audio :: MoeCombinator +canvas :: MoeCombinator +command :: MoeCombinator +datagrid :: MoeCombinator +datalist :: MoeCombinator +datatemplate :: MoeCombinator +details :: MoeCombinator +dialog :: MoeCombinator +event_source :: MoeCombinator +figure :: MoeCombinator +footer :: MoeCombinator +header :: MoeCombinator +mark :: MoeCombinator +meter :: MoeCombinator +nav :: MoeCombinator +nest :: MoeCombinator +output :: MoeCombinator +progress :: MoeCombinator +rule :: MoeCombinator +section :: MoeCombinator +source :: MoeCombinator +time :: MoeCombinator +video :: MoeCombinator + +article' :: MoeCombinator' +aside' :: MoeCombinator' +audio' :: MoeCombinator' +canvas' :: MoeCombinator' +command' :: MoeCombinator' +datagrid' :: MoeCombinator' +datalist' :: MoeCombinator' +datatemplate' :: MoeCombinator' +details' :: MoeCombinator' +dialog' :: MoeCombinator' +event_source' :: MoeCombinator' +figure' :: MoeCombinator' +footer' :: MoeCombinator' +header' :: MoeCombinator' +mark' :: MoeCombinator' +meter' :: MoeCombinator' +nav' :: MoeCombinator' +nest' :: MoeCombinator' +output' :: MoeCombinator' +progress' :: MoeCombinator' +rule' :: MoeCombinator' +section' :: MoeCombinator' +source' :: MoeCombinator' +time' :: MoeCombinator' +video' :: MoeCombinator' + + + + +article = element "article" +aside = element "aside" +audio = element "audio" +canvas = element "canvas" +command = element "command" +datagrid = element "datagrid" +datalist = element "datalist" +datatemplate = element "datatemplate" +details = element "details" +dialog = element "dialog" +event_source = element "event_source" +figure = element "figure" +footer = element "footer" +header = element "header" +mark = element "mark" +meter = element "meter" +nav = element "nav" +nest = element "nest" +output = element "output" +progress = element "progress" +rule = element "rule" +section = element "section" +source = element "source" +time = element "time" +video = element "video" + +article' = article [] +aside' = aside [] +audio' = audio [] +canvas' = canvas [] +command' = command [] +datagrid' = datagrid [] +datalist' = datalist [] +datatemplate' = datatemplate [] +details' = details [] +dialog' = dialog [] +event_source' = event_source [] +figure' = figure [] +footer' = footer [] +header' = header [] +mark' = mark [] +meter' = meter [] +nav' = nav [] +nest' = nest [] +output' = output [] +progress' = progress [] +rule' = rule [] +section' = section [] +source' = source [] +time' = time [] +video' = video [] + +