r16240 by avox - RelaxNG versions of dtd

[scribus-commit]

Author: avox
Date: Mon Jan 10 22:48:50 2011
New Revision: 16240

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16240
Log:
RelaxNG versions of dtd

Added:
    branches/ScribusOIF/dtd/RelaxNG/
    branches/ScribusOIF/dtd/RelaxNG/fromdtd.rnc
    branches/ScribusOIF/dtd/RelaxNG/style.ent.rnc
Modified:
    branches/ScribusOIF/dtd/scribus.dtd
    branches/ScribusOIF/dtd/style.ent

Modified: branches/ScribusOIF/dtd/scribus.dtd
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16240&path=/branches/ScribusOIF/dtd/scribus.dtd
==============================================================================
--- branches/ScribusOIF/dtd/scribus.dtd (original)
+++ branches/ScribusOIF/dtd/scribus.dtd Mon Jan 10 22:48:50 2011
@@ -363,19 +363,18 @@
 <!ATTLIST textframeobj idref IDREF #REQUIRED>
 
 <!-- Abstraction layer for text blocks inside a text frame. -->
-<!ELEMENT textcontent parstyle (p)+>
+<!ELEMENT textcontent (parstyle, p+)>
 <!ATTLIST textcontent id ID #REQUIRED>
 
 <!-- References "textcontent". -->
 <!ELEMENT textcontentobj EMPTY>
 <!ATTLIST textcontentobj idref IDREF #REQUIRED>
 
-<!ELEMENT p parstyle (span)+
+<!ELEMENT p (parstyle, (span)+)>
 <!-- Lowest level block unit of text. Add a mathexpression later when MathML dtd is
 referenced properly. Use "id" values like par0. We need an id for the
 paragraph to make it the atomic unit for change tracking and undo for example. -->
-<!ELEMENT span txtstyle (text|inlineframe|breakline|breakcolumn|breakframe|tab|pagenr)*>
->
+<!ELEMENT span (txtstyle, (text|inlineframe|breakline|breakcolumn|breakframe|tab|pagenr)*)>
 
 
 <!-- Use any printable character for tab alignment -->

Modified: branches/ScribusOIF/dtd/style.ent
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16240&path=/branches/ScribusOIF/dtd/style.ent
==============================================================================
--- branches/ScribusOIF/dtd/style.ent (original)
+++ branches/ScribusOIF/dtd/style.ent Mon Jan 10 22:48:50 2011
@@ -1,8 +1,8 @@
 <!ENTITY % unit  "(pt | px | pica | in | mm | cm | c) 'mm'">
-<!ENTITY % style_attr "id ID #IMPLIED name CDATA #IMPLIED shortcut CDATA #IMPLIED parent IDREF #IMPLIED">
+<!ENTITY % style_attr "id ID #IMPLIED name CDATA #IMPLIED shortcut CDATA #IMPLIED parent IDREF #IMPLIED ">
 <!ELEMENT txt-style EMPTY>
 <!ATTLIST txt-style %style_attr;
-                    font-face CDATA #IMLIED
+                    font-face CDATA #IMPLIED
                     font-family-hint CDATA #IMPLIED
                     font-weight-hint CDATA #IMPLIED
                     font-slant-hint CDATA #IMPLIED
@@ -16,7 +16,7 @@
                     font-leading-mode (proportional|baseline|top-of-caps|custom) #IMPLIED
                     font-leading-mode-amount CDATA #IMPLIED
                     font-baseline-offset CDATA #IMPLIED
-                    font-features #NMTOKENS #IMPLIED
+                    font-features CDATA #IMPLIED
                     text-stroke-color CDATA #IMPLIED
                     text-stroke-shadow CDATA #IMPLIED
                     text-stroke-opacity CDATA #IMPLIED
@@ -37,8 +37,8 @@
 * Use standard ISO codes for "language".
 * "text-direction" is ltr=Left to right; rtl=Right to left -->
 
-<!ELEMENT par-style txt-style tab*>
-<!ATTLIST par-style % style_attr;
+<!ELEMENT par-style (txt-style, tab*)>
+<!ATTLIST par-style %style_attr;
                     par-indent-first CDATA #IMPLIED
                     par-indent-left CDATA #IMPLIED
                     par-indent-right CDATA #IMPLIED