diff --git a/moe.cabal b/moe.cabal
--- a/moe.cabal
+++ b/moe.cabal
@@ -1,5 +1,5 @@
Name: moe
-Version: 2011.6.11
+Version: 2011.6.14
Build-type: Simple
Synopsis: html with style
Description:
@@ -13,12 +13,12 @@
Build-Depends: base
Cabal-version: >= 1.2
category: Web
-homepage: http://github.com/nfjinjing/moe
+homepage: https://github.com/nfjinjing/moe
data-files: readme.md, changelog.md, known-issues.md, Nemesis, src/test.hs
library
- ghc-options: -Wall -fno-warn-orphans
- build-depends: base >= 4 && < 5, mtl, air >= 2011.6.11, data-default, bytestring, utf8-string, dlist
+
+ build-depends: base >= 4 && < 5, mtl, air >= 2011.6.18, data-default, bytestring, utf8-string, dlist
hs-source-dirs: src/
exposed-modules:
Text.HTML.Moe
@@ -32,10 +32,6 @@
Text.HTML.Moe.Backend.ByteString
Text.HTML.Moe2
-
- other-modules:
- Text.HTML.Moe.Backend.DList
-
Text.HTML.Moe2.Attribute
Text.HTML.Moe2.Element
Text.HTML.Moe2.DSL.Markdown
@@ -46,4 +42,9 @@
Text.HTML.Moe2.Type
Text.HTML.Moe2.Utils
+
+
+ other-modules:
+ Text.HTML.Moe.Backend.DList
+
diff --git a/readme.md b/readme.md
--- a/readme.md
+++ b/readme.md
@@ -14,7 +14,7 @@
test_page = render -
html - do
head - do
- meta ! [http_equiv "Content-Type", content "text/html; charset-utf-8"] - (/)
+ 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"] - (/)
@@ -37,7 +37,7 @@
-
+
my title
diff --git a/src/Text/HTML/Moe2/Element.hs b/src/Text/HTML/Moe2/Element.hs
--- a/src/Text/HTML/Moe2/Element.hs
+++ b/src/Text/HTML/Moe2/Element.hs
@@ -59,6 +59,10 @@
str, raw, _pre, prim :: String -> MoeUnit
+no_escape_no_indent_str, escape_no_indent_str, no_escape_indent_str :: String -> MoeUnit
+no_escape_no_indent_str = raw
+escape_no_indent_str = _pre
+no_escape_indent_str = prim
str x = tell - singleton - Data (pack - escape x)
raw x = tell - singleton - Raw (pack x)
diff --git a/src/test.hs b/src/test.hs
--- a/src/test.hs
+++ b/src/test.hs
@@ -6,7 +6,7 @@
test_page = render -
html - do
head - do
- meta ! [http_equiv "Content-Type", content "text/html; charset-utf-8"] - (/)
+ 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"] - (/)