- From: Jirka Kozek via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 09 Oct 2012 11:45:29 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory hutz:/tmp/cvs-serv24265
Modified Files:
its20.rnc its20.rng
Log Message:
Schema improvements
Index: its20.rnc
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- its20.rnc 8 Oct 2012 15:54:20 -0000 1.4
+++ its20.rnc 9 Oct 2012 11:45:27 -0000 1.5
@@ -109,9 +109,14 @@
| its-langRule
| its-withinTextRule
| its-domainRule
+ | its-disambiguationRule
| its-localeFilterRule
| its-externalResourceRefRule
- | its-idValueRule)*
+ | its-targetPointerRule
+ | its-idValueRule
+ | its-preserveSpaceRule
+ | its-allowedCharactersRule
+ | its-storageSizeRule)*
its-rules.attributes =
its-attribute.version.nons,
@@ -218,7 +223,7 @@
its-termRule.attributes =
its-attribute.selector,
its-attribute.term.nons,
- (its-attribute.termInfoPointer.nons | its-attribute.termInfoRef.nons | its-attribute.termInfoRefPointer.nons )
+ (its-attribute.termInfoPointer.nons | its-attribute.termInfoRef.nons | its-attribute.termInfoRefPointer.nons )?
its-attribute.termInfoPointer.nons = attribute termInfoPointer { its-relative-selector.type }
@@ -317,7 +322,37 @@
its-attribute.domainPointer.nons = attribute domainPointer { its-relative-selector.type }
-# FIXME: disambiguationRule
+its-disambiguationRule =
+ ## Rule about the Disambiguation data category.
+ element disambiguationRule {
+ its-disambiguationRule.content, its-disambiguationRule.attributes
+ }
+
+its-disambiguationRule.content = empty
+its-disambiguationRule.attributes =
+ its-attribute.selector,
+ its-attribute.entityTypeSourceRef.nons?,
+ its-attribute.entityTypeSourcePointer.nons?,
+ its-attribute.entityTypeSourceRefPointer.nons?,
+ its-attribute.entityTypeRef.nons?,
+ its-attribute.entityTypePointer.nons?,
+ its-attribute.entityTypeRefPointer.nons?,
+ its-attribute.disambigType.nons?,
+ its-attribute.disambigSourceRef.nons?,
+ its-attribute.disambigSourcePointer.nons?,
+ its-attribute.disambigSourceRefPointer.nons?,
+ its-attribute.disambigIdentRef.nons?,
+ its-attribute.disambigIdentPointer.nons?,
+ its-attribute.disambigIdentRefPointer.nons?
+
+its-attribute.entityTypeSourcePointer.nons = attribute entityTypeSourcePointer { its-relative-selector.type }
+its-attribute.entityTypeSourceRefPointer.nons = attribute entityTypeSourceRefPointer { its-relative-selector.type }
+its-attribute.entityTypePointer.nons = attribute entityTypePointer { its-relative-selector.type }
+its-attribute.entityTypeRefPointer.nons = attribute entityTypeRefPointer { its-relative-selector.type }
+its-attribute.disambigSourcePointer.nons = attribute disambigSourcePointer { its-relative-selector.type }
+its-attribute.disambigSourceRefPointer.nons = attribute disambigSourceRefPointer { its-relative-selector.type }
+its-attribute.disambigIdentPointer.nons = attribute disambigIdentPointer { its-relative-selector.type }
+its-attribute.disambigIdentRefPointer.nons = attribute disambigIdentRefPointer { its-relative-selector.type }
its-localeFilterRule =
## Rule about the LocaleFilter data category.
@@ -348,7 +383,18 @@
its-attribute.externalResourceRefPointer.nons = attribute externalResourceRefPointer { its-relative-selector.type }
-# FIXME: targetPointerRule
+its-targetPointerRule =
+ ## Rule about the Target Pointer data category.
+ element targetPointerRule {
+ its-targetPointerRule.content, its-targetPointerRule.attributes
+ }
+
+its-targetPointerRule.content = empty
+its-targetPointerRule.attributes =
+ its-attribute.selector,
+ its-attribute.targetPointer.nons
+
+its-attribute.targetPointer.nons = attribute targetPointer { its-relative-selector.type }
its-idValueRule =
## Rule about the Id Value data category.
@@ -363,7 +409,18 @@
its-attribute.idValue.nons = attribute idValue { its-relative-selector.type }
-# FIXME: preserveSpace
+its-preserveSpaceRule =
+ ## Rule about the Preserve Space data category.
+ element preserveSpaceRule {
+ its-preserveSpaceRule.content, its-preserveSpaceRule.attributes
+ }
+
+its-preserveSpaceRule.content = empty
+its-preserveSpaceRule.attributes =
+ its-attribute.selector,
+ its-attribute.space.nons
+
+its-attribute.space.nons = attribute space { "default" | "preserve" }
# FIXME: Localization Quality Issue
@@ -371,6 +428,31 @@
# FIXME: MT Confidence
-# FIXME: Allowed Characters
+its-allowedCharactersRule =
+ ## Rule about the Allowed Characters data category.
+ element allowedCharactersRule {
+ its-allowedCharactersRule.content, its-allowedCharactersRule.attributes
+ }
+
+its-allowedCharactersRule.content = empty
+its-allowedCharactersRule.attributes =
+ its-attribute.selector,
+ (its-attribute.allowedCharacters.nons | its-attribute.allowedCharactersPointer.nons)
+
+its-attribute.allowedCharactersPointer.nons = attribute allowedCharactersPointer { its-relative-selector.type }
# FIXME: Storage Size
+its-storageSizeRule =
+ ## Rule about the Allowed Characters data category.
+ element storageSizeRule {
+ its-storageSizeRule.content, its-storageSizeRule.attributes
+ }
+
+its-storageSizeRule.content = empty
+its-storageSizeRule.attributes =
+ its-attribute.selector,
+ (its-attribute.storageSize.nons | its-attribute.storageSizePointer.nons),
+ (its-attribute.storageEncoding.nons | its-attribute.storageEncodingPointer.nons)?
+
+its-attribute.storageSizePointer.nons = attribute storageSizePointer { its-relative-selector.type }
+its-attribute.storageEncodingPointer.nons = attribute storageEncodingPointer { its-relative-selector.type }
Index: its20.rng
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- its20.rng 8 Oct 2012 15:54:20 -0000 1.3
+++ its20.rng 9 Oct 2012 11:45:27 -0000 1.4
@@ -327,9 +327,14 @@
<ref name="its-langRule"/>
<ref name="its-withinTextRule"/>
<ref name="its-domainRule"/>
+ <ref name="its-disambiguationRule"/>
<ref name="its-localeFilterRule"/>
<ref name="its-externalResourceRefRule"/>
+ <ref name="its-targetPointerRule"/>
<ref name="its-idValueRule"/>
+ <ref name="its-preserveSpaceRule"/>
+ <ref name="its-allowedCharactersRule"/>
+ <ref name="its-storageSizeRule"/>
</choice>
</zeroOrMore>
</define>
@@ -623,11 +628,13 @@
<define name="its-termRule.attributes">
<ref name="its-attribute.selector"/>
<ref name="its-attribute.term.nons"/>
- <choice>
- <ref name="its-attribute.termInfoPointer.nons"/>
- <ref name="its-attribute.termInfoRef.nons"/>
- <ref name="its-attribute.termInfoRefPointer.nons"/>
- </choice>
+ <optional>
+ <choice>
+ <ref name="its-attribute.termInfoPointer.nons"/>
+ <ref name="its-attribute.termInfoRef.nons"/>
+ <ref name="its-attribute.termInfoRefPointer.nons"/>
+ </choice>
+ </optional>
</define>
<define name="its-attribute.termInfoPointer.nons">
<attribute name="termInfoPointer">
@@ -822,7 +829,98 @@
<ref name="its-relative-selector.type"/>
</attribute>
</define>
- <!-- FIXME: disambiguationRule -->
+ <define name="its-disambiguationRule">
+ <element name="disambiguationRule">
+ <a:documentation>Rule about the Disambiguation data category.</a:documentation>
+ <ref name="its-disambiguationRule.content"/>
+ <ref name="its-disambiguationRule.attributes"/>
+ </element>
+ </define>
+ <define name="its-disambiguationRule.content">
+ <empty/>
+ </define>
+ <define name="its-disambiguationRule.attributes">
+ <ref name="its-attribute.selector"/>
+ <optional>
+ <ref name="its-attribute.entityTypeSourceRef.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.entityTypeSourcePointer.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.entityTypeSourceRefPointer.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.entityTypeRef.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.entityTypePointer.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.entityTypeRefPointer.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.disambigType.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.disambigSourceRef.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.disambigSourcePointer.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.disambigSourceRefPointer.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.disambigIdentRef.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.disambigIdentPointer.nons"/>
+ </optional>
+ <optional>
+ <ref name="its-attribute.disambigIdentRefPointer.nons"/>
+ </optional>
+ </define>
+ <define name="its-attribute.entityTypeSourcePointer.nons">
+ <attribute name="entityTypeSourcePointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.entityTypeSourceRefPointer.nons">
+ <attribute name="entityTypeSourceRefPointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.entityTypePointer.nons">
+ <attribute name="entityTypePointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.entityTypeRefPointer.nons">
+ <attribute name="entityTypeRefPointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.disambigSourcePointer.nons">
+ <attribute name="disambigSourcePointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.disambigSourceRefPointer.nons">
+ <attribute name="disambigSourceRefPointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.disambigIdentPointer.nons">
+ <attribute name="disambigIdentPointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.disambigIdentRefPointer.nons">
+ <attribute name="disambigIdentRefPointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
<define name="its-localeFilterRule">
<element name="localeFilterRule">
<a:documentation>Rule about the LocaleFilter data category.</a:documentation>
@@ -858,7 +956,25 @@
<ref name="its-relative-selector.type"/>
</attribute>
</define>
- <!-- FIXME: targetPointerRule -->
+ <define name="its-targetPointerRule">
+ <element name="targetPointerRule">
+ <a:documentation>Rule about the Target Pointer data category.</a:documentation>
+ <ref name="its-targetPointerRule.content"/>
+ <ref name="its-targetPointerRule.attributes"/>
+ </element>
+ </define>
+ <define name="its-targetPointerRule.content">
+ <empty/>
+ </define>
+ <define name="its-targetPointerRule.attributes">
+ <ref name="its-attribute.selector"/>
+ <ref name="its-attribute.targetPointer.nons"/>
+ </define>
+ <define name="its-attribute.targetPointer.nons">
+ <attribute name="targetPointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
<define name="its-idValueRule">
<element name="idValueRule">
<a:documentation>Rule about the Id Value data category.</a:documentation>
@@ -878,10 +994,85 @@
<ref name="its-relative-selector.type"/>
</attribute>
</define>
+ <define name="its-preserveSpaceRule">
+ <element name="preserveSpaceRule">
+ <a:documentation>Rule about the Preserve Space data category.</a:documentation>
+ <ref name="its-preserveSpaceRule.content"/>
+ <ref name="its-preserveSpaceRule.attributes"/>
+ </element>
+ </define>
+ <define name="its-preserveSpaceRule.content">
+ <empty/>
+ </define>
+ <define name="its-preserveSpaceRule.attributes">
+ <ref name="its-attribute.selector"/>
+ <ref name="its-attribute.space.nons"/>
+ </define>
+ <define name="its-attribute.space.nons">
+ <attribute name="space">
+ <choice>
+ <value>default</value>
+ <value>preserve</value>
+ </choice>
+ </attribute>
+ </define>
+ <!-- FIXME: Localization Quality Issue -->
+ <!-- FIXME: Localization Quality Précis -->
+ <!-- FIXME: MT Confidence -->
+ <define name="its-allowedCharactersRule">
+ <element name="allowedCharactersRule">
+ <a:documentation>Rule about the Allowed Characters data category.</a:documentation>
+ <ref name="its-allowedCharactersRule.content"/>
+ <ref name="its-allowedCharactersRule.attributes"/>
+ </element>
+ </define>
+ <define name="its-allowedCharactersRule.content">
+ <empty/>
+ </define>
+ <define name="its-allowedCharactersRule.attributes">
+ <ref name="its-attribute.selector"/>
+ <choice>
+ <ref name="its-attribute.allowedCharacters.nons"/>
+ <ref name="its-attribute.allowedCharactersPointer.nons"/>
+ </choice>
+ </define>
+ <define name="its-attribute.allowedCharactersPointer.nons">
+ <attribute name="allowedCharactersPointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
+ <!-- FIXME: Storage Size -->
+ <define name="its-storageSizeRule">
+ <element name="storageSizeRule">
+ <a:documentation>Rule about the Allowed Characters data category.</a:documentation>
+ <ref name="its-storageSizeRule.content"/>
+ <ref name="its-storageSizeRule.attributes"/>
+ </element>
+ </define>
+ <define name="its-storageSizeRule.content">
+ <empty/>
+ </define>
+ <define name="its-storageSizeRule.attributes">
+ <ref name="its-attribute.selector"/>
+ <choice>
+ <ref name="its-attribute.storageSize.nons"/>
+ <ref name="its-attribute.storageSizePointer.nons"/>
+ </choice>
+ <optional>
+ <choice>
+ <ref name="its-attribute.storageEncoding.nons"/>
+ <ref name="its-attribute.storageEncodingPointer.nons"/>
+ </choice>
+ </optional>
+ </define>
+ <define name="its-attribute.storageSizePointer.nons">
+ <attribute name="storageSizePointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.storageEncodingPointer.nons">
+ <attribute name="storageEncodingPointer">
+ <ref name="its-relative-selector.type"/>
+ </attribute>
+ </define>
</grammar>
-<!-- FIXME: preserveSpace -->
-<!-- FIXME: Localization Quality Issue -->
-<!-- FIXME: Localization Quality Précis -->
-<!-- FIXME: MT Confidence -->
-<!-- FIXME: Allowed Characters -->
-<!-- FIXME: Storage Size -->
Received on Tuesday, 9 October 2012 11:45:34 UTC