- From: Jirka Kozek via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 08 Oct 2012 15:54:22 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory hutz:/tmp/cvs-serv23597
Modified Files:
its20-attributes.rnc its20-attributes.rng its20-elements.rnc
its20-elements.rng its20.rnc its20.rng
Log Message:
More fixes, schema framework seems working
Few missing categories has to be added though
Index: its20.rnc
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- its20.rnc 8 Oct 2012 15:17:49 -0000 1.3
+++ its20.rnc 8 Oct 2012 15:54:20 -0000 1.4
@@ -195,7 +195,7 @@
## Rule about the Localization Note data category.
element locNoteRule {
its-attribute.selector,
- its-attribute.locNoteType,
+ its-attribute.locNoteType.nons,
(its-locNote | its-attribute.locNotePointer.nons | its-attribute.locNoteRef.nons | its-attribute.locNoteRefPointer.nons )
}
Index: its20-elements.rnc
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-elements.rnc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- its20-elements.rnc 8 Oct 2012 15:07:22 -0000 1.2
+++ its20-elements.rnc 8 Oct 2012 15:54:20 -0000 1.3
@@ -1,3 +1,7 @@
include "its20.rnc"
+## enable all xml:* attributes
+its-local.attributes &= attribute xml:* { text }*
+its-local.nons.attributes &= attribute xml:* { text }*
+
start = its-rules | its-span | its-ruby
\ No newline at end of file
Index: its20-attributes.rnc
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-attributes.rnc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- its20-attributes.rnc 8 Oct 2012 15:07:22 -0000 1.2
+++ its20-attributes.rnc 8 Oct 2012 15:54:20 -0000 1.3
@@ -1,4 +1,3 @@
include "its20.rnc"
-start =
- element * { its-local.attributes?, its-attribute.version? }
+start = its-local.attributes?, its-attribute.version?
Index: its20.rng
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- its20.rng 8 Oct 2012 15:17:49 -0000 1.2
+++ its20.rng 8 Oct 2012 15:54:20 -0000 1.3
@@ -572,7 +572,7 @@
<element name="locNoteRule">
<a:documentation>Rule about the Localization Note data category.</a:documentation>
<ref name="its-attribute.selector"/>
- <ref name="its-attribute.locNoteType"/>
+ <ref name="its-attribute.locNoteType.nons"/>
<choice>
<ref name="its-locNote"/>
<ref name="its-attribute.locNotePointer.nons"/>
Index: its20-elements.rng
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-elements.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- its20-elements.rng 8 Oct 2012 15:07:22 -0000 1.1
+++ its20-elements.rng 8 Oct 2012 15:54:20 -0000 1.2
@@ -1,6 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
<include href="its20.rng"/>
+ <define name="its-local.attributes" combine="interleave">
+ <a:documentation>enable all xml:* attributes</a:documentation>
+ <zeroOrMore>
+ <attribute>
+ <nsName ns="http://www.w3.org/XML/1998/namespace"/>
+ </attribute>
+ </zeroOrMore>
+ </define>
+ <define name="its-local.nons.attributes" combine="interleave">
+ <zeroOrMore>
+ <attribute>
+ <nsName ns="http://www.w3.org/XML/1998/namespace"/>
+ </attribute>
+ </zeroOrMore>
+ </define>
<start>
<choice>
<ref name="its-rules"/>
Index: its20-attributes.rng
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-attributes.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- its20-attributes.rng 8 Oct 2012 15:07:22 -0000 1.1
+++ its20-attributes.rng 8 Oct 2012 15:54:20 -0000 1.2
@@ -2,14 +2,13 @@
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
<include href="its20.rng"/>
<start>
- <element>
- <anyName/>
+ <group>
<optional>
<ref name="its-local.attributes"/>
</optional>
<optional>
<ref name="its-attribute.version"/>
</optional>
- </element>
+ </group>
</start>
</grammar>
Received on Monday, 8 October 2012 15:54:24 UTC