From: pho Date: Sun, 17 Feb 2008 02:52:24 +0000 (+0900) Subject: clean up rakka-page-1.0.rng X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=8c0fd38bb52a7b7cc69431df81c7736ddbb0faa6;p=Rakka.git clean up rakka-page-1.0.rng darcs-hash:20080217025224-62b54-46dc5e44413d5d9d7d463112c37399b386915d05.gz --- diff --git a/Rakka/Resource/PageEntity.hs b/Rakka/Resource/PageEntity.hs index 09b5ecd..8f4bd9c 100644 --- a/Rakka/Resource/PageEntity.hs +++ b/Rakka/Resource/PageEntity.hs @@ -134,7 +134,7 @@ entityToXHTML env += sattr "xmlns" "http://www.w3.org/1999/xhtml" += ( getXPathTreesInDoc "/page/@lang" `guards` - qattr (QN "xml" "lang" "") + qattr (mkQName "xml" "lang" "") ( getXPathTreesInDoc "/page/@lang/text()" ) ) += ( eelem "head" diff --git a/schemas/rakka-page-1.0.rng b/schemas/rakka-page-1.0.rng index 15894bb..6e4a545 100644 --- a/schemas/rakka-page-1.0.rng +++ b/schemas/rakka-page-1.0.rng @@ -9,17 +9,16 @@ - - + + 0 + - + @@ -32,10 +31,7 @@ - - yes - no - + @@ -49,10 +45,22 @@ + + + yes + no + + + + + + ^[^ a-z|#\[\]][^ |#\[\]]*$ + + + - - + @@ -65,27 +73,21 @@ - + - - yes - no - + - - yes - no - + @@ -101,12 +103,10 @@ - - + - - + @@ -120,10 +120,7 @@ - - +