diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,10 @@ +2010.9.29 +--------- + +### Feature + +* new syntax for Moe2 + 2009.9.16 --------- diff --git a/moe.cabal b/moe.cabal --- a/moe.cabal +++ b/moe.cabal @@ -1,5 +1,5 @@ Name: moe -Version: 2009.11.3 +Version: 2010.9.29 Build-type: Simple Synopsis: html with style Description: @@ -8,8 +8,8 @@ License: BSD3 License-file: LICENSE -Author: Wang, Jinjing -Maintainer: Wang, Jinjing +Author: Jinjing Wang +Maintainer: Jinjing Wang Build-Depends: base Cabal-version: >= 1.2 category: Web diff --git a/readme.md b/readme.md --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # Moe: html with style -# Example +## Example first page @@ -8,18 +8,18 @@ import Prelude hiding ((/), (-), head, (>), (.), div) import MPS.Light ((-)) - import Text.HTML.Moe + import Text.HTML.Moe2 test_page :: String test_page = render - - html' - do - head' - do - meta [http_equiv "Content-Type", content "text/html; charset-utf-8"] - title' - str "my title" - link [rel "icon", _type "image/png", href "panda_icon.png"] + html - do + head - do + meta ! [http_equiv "Content-Type", content "text/html; charset-utf-8"] - (/) + title - str "my title" + link ! [rel "icon", _type "image/png", href "panda_icon.png"] - (/) - body' - do - div [_class "container"] - do + body - do + div ! [_class "container"] - do str "hello world" main :: IO () @@ -37,11 +37,11 @@ - + my title - +
@@ -49,4 +49,7 @@
+ +
+![luba](http://github.com/nfjinjing/moe/raw/master/luba.jpg) 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 @@ -23,8 +23,6 @@ import Data.DList (toList) import Data.List (intersperse) -(/) :: MoeUnit -(/) = return () render :: MoeUnit -> String render = render' > B.unpack diff --git a/src/Text/HTML/Moe/Element.hs b/src/Text/HTML/Moe/Element.hs --- a/src/Text/HTML/Moe/Element.hs +++ b/src/Text/HTML/Moe/Element.hs @@ -8,7 +8,6 @@ import MPS.Light ((-)) import Data.DList (singleton, toList) - element :: String -> MoeCombinator element x xs u = tell - singleton - def @@ -252,3 +251,7 @@ raw x = tell - singleton - Raw (pack x) _pre x = tell - singleton - Pre (pack - escape x) prim x = tell - singleton - Prim (pack x) + + +raw_bytestring x = tell - singleton - Raw x +prim_bytestring x = tell - singleton - Prim x diff --git a/src/test.hs b/src/test.hs --- a/src/test.hs +++ b/src/test.hs @@ -1,17 +1,17 @@ import Prelude hiding ((/), (-), head, (>), (.), div) import MPS.Light ((-)) -import Text.HTML.Moe +import Text.HTML.Moe2 test_page :: String test_page = render - - html' - do - head' - do - meta [http_equiv "Content-Type", content "text/html; charset-utf-8"] - title' - str "my title" - link [rel "icon", _type "image/png", href "panda_icon.png"] + html - do + head - do + meta ! [http_equiv "Content-Type", content "text/html; charset-utf-8"] - (/) + title - str "my title" + link ! [rel "icon", _type "image/png", href "panda_icon.png"] - (/) - body' - do - div [_class "container"] - do + body - do + div ! [_class "container"] - do str "hello world" main :: IO ()