crossley 2002/10/29 21:14:42
Modified: src/webapp/WEB-INF/entities sitemap-v05.rng
Log:
Minor tweaks.
Revision Changes Path
1.2 +12 -4 xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v05.rng
Index: sitemap-v05.rng
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v05.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap-v05.rng 27 Oct 2002 11:43:13 -0000 1.1
+++ sitemap-v05.rng 30 Oct 2002 05:14:42 -0000 1.2
@@ -6,10 +6,10 @@
<!-- ===================================================================
- Apache Cocoon Sitemap Relax NG grammar (Version 0.5)
+ Apache Cocoon Sitemap RELAX NG grammar (Version 0.5)
PURPOSE:
- DRAFT Relax NG grammar for the Cocoon2 sitemap.xmap files.
+ DRAFT RELAX NG grammar for the Cocoon2 sitemap.xmap files.
NOTES:
@@ -21,7 +21,7 @@
A proper design process is still, still required.
* Needed by XML editing tools for creation of reliable documents.
* Can generate WXS from this grammar for the use of XML editors which
- do not support Relax NG.
+ do not support RELAX NG.
* The big questions (still) are:
- What possibilities were missed because they were not included in the
default sitemaps?
@@ -50,9 +50,11 @@
20021017 V0.3 Updated so validation works again (CPA)
20021019 V0.3 Further changes made to cope with all current sitemaps (CPA)
20021021 V0.4 General simplification by adding parameter entities (CPA)
-20021024 V0.4 Relax NG grammar generated from sitemap-v04.dtd using DTDinst (DC)
+20021024 V0.4 RELAX NG grammar generated from sitemap-v04.dtd using DTDinst (DC)
20021025 V0.5 Tightening of grammar rules which was not possible with DTD.
Also added datatypes. (CPA)
+20021030 V0.5 Added some missing bits: selector/browser,
+ label.attr is temporarily string (DC)
====================================================================
-->
@@ -195,7 +197,10 @@
<define name="label.attr">
<optional>
<attribute name="label">
+ <data type="string"/>
+<!-- DC: temporarily changed to "string" to avoid mass of validation errors
<data type="NMTOKEN"/>
+-->
<!-- CPA: must match a component name , use schematron to enforce -->
</attribute>
</optional>
@@ -695,6 +700,9 @@
<define name="map.selector">
<element name="map:selector">
<ref name="map.selector.attlist"/>
+ <zeroOrMore>
+ <ref name="browser"/>
+ </zeroOrMore>
<optional>
<ref name="anyElement"/>
</optional>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
