- From: CVS User jkosek <cvsmail@w3.org>
- Date: Tue, 27 Nov 2012 22:35:15 +0000
- To: public-multilingualweb-lt-commits@w3.org
Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas
In directory gil:/tmp/cvs-serv27966
Modified Files:
its20-types.rnc its20-types.rng its20.rnc its20.rng
Log Message:
Updated schemas, loc. quality and precis still missing, also standoff is incomplete.
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/11/27 14:14:03 1.4
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rnc 2012/11/27 22:35:14 1.5
@@ -7,6 +7,7 @@
its-absolute-selector.type = string
its-relative-selector.type = string
+its-xpath-expression.type = string
its-confidence.type = xsd:decimal { minInclusive = "0" maxInclusive = "1" }
@@ -89,9 +90,9 @@
its-disambigIdentRef.type = xsd:anyURI
-its-disambigIdent.type = xsd:string
+its-disambigIdent.type = string
-its-disambigSource.type = xsd:string
+its-disambigSource.type = string
its-disambigIdentPointer.type = its-relative-selector.type
@@ -101,27 +102,27 @@
its-provenanceRecordsRefPointer.type = its-relative-selector.type
-its-person.type = xsd:string
+its-person.type = string
its-personRef.type = xsd:anyURI
-its-org.type = xsd:string
+its-org.type = string
its-orgRef.type = xsd:anyURI
-its-tool.type = xsd:string
+its-tool.type = string
its-toolRef.type = xsd:anyURI
-its-revPerson.type = xsd:string
+its-revPerson.type = string
its-revPersonRef.type = xsd:anyURI
-its-revOrg.type = xsd:string
+its-revOrg.type = string
its-revOrgRef.type = xsd:anyURI
-its-revTool.type = xsd:string
+its-revTool.type = string
its-revToolRef.type = xsd:anyURI
@@ -178,6 +179,8 @@
its-locQualityPrecisProfileRefPointer.type = its-relative-selector.type
+its-mtConfidence.type = its-confidence.type
+
its-allowedCharacters.type = string
its-allowedCharactersPointer.type = its-relative-selector.type
@@ -190,4 +193,6 @@
its-storageEncodingPointer.type = its-relative-selector.type
+its-lineBreakType.type = "cr" | "lr" | "crlf" | "nel"
+
its-toolsRef.type = string
\ No newline at end of file
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rng 2012/10/08 15:07:22 1.1
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20-types.rng 2012/11/27 22:35:14 1.2
@@ -20,6 +20,15 @@
<define name="its-relative-selector.type">
<data type="string" datatypeLibrary=""/>
</define>
+ <define name="its-xpath-expression.type">
+ <data type="string" datatypeLibrary=""/>
+ </define>
+ <define name="its-confidence.type">
+ <data type="decimal">
+ <param name="minInclusive">0</param>
+ <param name="maxInclusive">1</param>
+ </data>
+ </define>
<define name="its-translate.type">
<a:documentation>The Translate data category information to be attached to the current node.</a:documentation>
<choice>
@@ -56,6 +65,9 @@
<a:documentation>The value 'no' means that this is not a term.</a:documentation>
</choice>
</define>
+ <define name="its-termConfidence.type">
+ <ref name="its-confidence.type"/>
+ </define>
<define name="its-dir.type">
<a:documentation>The text direction for the context.</a:documentation>
<choice>
@@ -86,52 +98,85 @@
that case they MUST be delimited by quotation marks.</a:documentation>
<data type="string" datatypeLibrary=""/>
</define>
- <define name="its-entityTypeSourceRef.type">
- <data type="anyURI"/>
- </define>
- <define name="its-entityTypeSourcePointer.type">
- <ref name="its-relative-selector.type"/>
- </define>
- <define name="its-entityTypeSourceRefPointer.type">
- <ref name="its-relative-selector.type"/>
- </define>
- <define name="its-entityTypeRef.type">
- <data type="anyURI"/>
- </define>
- <define name="its-entityTypePointer.type">
- <ref name="its-relative-selector.type"/>
- </define>
- <define name="its-entityTypeRefPointer.type">
- <ref name="its-relative-selector.type"/>
- </define>
- <define name="its-disambigType.type">
+ <define name="its-disambigGranularity.type">
<choice>
<value>lexicalConcept</value>
<value>ontologyConcept</value>
<value>entity</value>
</choice>
</define>
- <define name="its-disambigSourceRef.type">
- <data type="anyURI"/>
+ <define name="its-disambigConfidence.type">
+ <ref name="its-confidence.type"/>
</define>
- <define name="its-disambigSourcePointer.type">
+ <define name="its-disambigClassPointer.type">
<ref name="its-relative-selector.type"/>
</define>
- <define name="its-disambigSourceRefPointer.type">
+ <define name="its-disambigClassRefPointer.type">
<ref name="its-relative-selector.type"/>
</define>
+ <define name="its-disambigClassRef.type">
+ <data type="anyURI"/>
+ </define>
<define name="its-disambigIdentRef.type">
<data type="anyURI"/>
</define>
+ <define name="its-disambigIdent.type">
+ <data type="string" datatypeLibrary=""/>
+ </define>
+ <define name="its-disambigSource.type">
+ <data type="string" datatypeLibrary=""/>
+ </define>
<define name="its-disambigIdentPointer.type">
<ref name="its-relative-selector.type"/>
</define>
- <define name="its-disambigIdentRefPointer">
+ <define name="its-disambigIdentRefPointer.type">
<ref name="its-relative-selector.type"/>
</define>
<define name="its-localeFilterList.type">
<data type="string" datatypeLibrary=""/>
</define>
+ <define name="its-provenanceRecordsRefPointer.type">
+ <ref name="its-relative-selector.type"/>
+ </define>
+ <define name="its-person.type">
+ <data type="string" datatypeLibrary=""/>
+ </define>
+ <define name="its-personRef.type">
+ <data type="anyURI"/>
+ </define>
+ <define name="its-org.type">
+ <data type="string" datatypeLibrary=""/>
+ </define>
+ <define name="its-orgRef.type">
+ <data type="anyURI"/>
+ </define>
+ <define name="its-tool.type">
+ <data type="string" datatypeLibrary=""/>
+ </define>
+ <define name="its-toolRef.type">
+ <data type="anyURI"/>
+ </define>
+ <define name="its-revPerson.type">
+ <data type="string" datatypeLibrary=""/>
+ </define>
+ <define name="its-revPersonRef.type">
+ <data type="anyURI"/>
+ </define>
+ <define name="its-revOrg.type">
+ <data type="string" datatypeLibrary=""/>
+ </define>
+ <define name="its-revOrgRef.type">
+ <data type="anyURI"/>
+ </define>
+ <define name="its-revTool.type">
+ <data type="string" datatypeLibrary=""/>
+ </define>
+ <define name="its-revToolRef.type">
+ <data type="anyURI"/>
+ </define>
+ <define name="its-provRef.type">
+ <data type="anyURI"/>
+ </define>
<define name="its-externalResourceRefPointer.type">
<ref name="its-relative-selector.type"/>
</define>
@@ -234,6 +279,9 @@
<define name="its-locQualityPrecisProfileRefPointer.type">
<ref name="its-relative-selector.type"/>
</define>
+ <define name="its-mtConfidence.type">
+ <ref name="its-confidence.type"/>
+ </define>
<define name="its-allowedCharacters.type">
<data type="string" datatypeLibrary=""/>
</define>
@@ -252,4 +300,15 @@
<define name="its-storageEncodingPointer.type">
<ref name="its-relative-selector.type"/>
</define>
+ <define name="its-lineBreakType.type">
+ <choice>
+ <value>cr</value>
+ <value>lr</value>
+ <value>crlf</value>
+ <value>nel</value>
+ </choice>
+ </define>
+ <define name="its-toolsRef.type">
+ <data type="string" datatypeLibrary=""/>
+ </define>
</grammar>
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/11/27 14:14:03 1.7
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rnc 2012/11/27 22:35:14 1.8
@@ -96,7 +96,6 @@
its-attribute.provenanceRecordsRef = attribute its:provenanceRecordsRef { its-provenanceRecordsRefPointer.type }
its-attribute.provenanceRecordsRef.nons = attribute provenanceRecordsRef { its-provenanceRecordsRefPointer.type }
-
its-attribute.locQualityIssuesRef = attribute its:locQualityIssuesRef { its-locQualityIssuesRef.type }
its-attribute.locQualityIssuesRef.nons = attribute locQualityIssuesRef { its-locQualityIssuesRef.type }
@@ -124,6 +123,9 @@
its-attribute.locQualityPrecisProfileRef = attribute its:locQualityPrecisProfileRef { its-locQualityPrecisProfileRef.type }
its-attribute.locQualityPrecisProfileRef.nons = attribute locQualityPrecisProfileRef { its-locQualityPrecisProfileRef.type }
+its-attribute.mtConfidence = attribute its:mtConfidence { its-mtConfidence.type }
+its-attribute.mtConfidence.nons = attribute mtConfidence { its-mtConfidence.type }
+
its-attribute.allowedCharacters = attribute its:allowedCharacters { its-allowedCharacters.type }
its-attribute.allowedCharacters.nons = attribute allowedCharacters { its-allowedCharacters.type }
@@ -133,7 +135,11 @@
its-attribute.storageEncoding = attribute its:storageEncoding { its-storageEncoding.type }
its-attribute.storageEncoding.nons = attribute storageEncoding { its-storageEncoding.type }
+its-attribute.lineBreakType = attribute its:lineBreakType { its-lineBreakType.type }
+its-attribute.lineBreakType.nons = attribute lineBreakType { its-lineBreakType.type }
+
its-attribute.toolsRef = attribute its:toolsRef { its-toolsRef.type }
+its-attribute.toolsRef.nons = attribute toolsRef { its-toolsRef.type }
its-attribute.version = attribute its:version { its-version.type }
its-attribute.version.nons = attribute version { its-version.type }
@@ -162,6 +168,7 @@
| its-domainRule
| its-disambiguationRule
| its-localeFilterRule
+ | its-mtConfidenceRule
| its-externalResourceRefRule
| its-targetPointerRule
| its-idValueRule
@@ -211,9 +218,10 @@
)
)? &
((its-attribute.locQualityPrecisScore | its-attribute.locQualityPrecisVote), its-attribute.locQualityPrecisThreshold?, its-attribute.locQualityPrecisProfileRef?)? &
+ its-attribute.mtConfidence? &
its-attribute.allowedCharacters? &
- (its-attribute.storageSize, its-attribute.storageEncoding?)? &
- its-attribute.toolsRef
+ (its-attribute.storageSize, its-attribute.storageEncoding?, its-attribute.lineBreakType?)? &
+ its-attribute.toolsRef?
its-local.nons.attributes =
its-attribute.translate.nons? &
@@ -243,8 +251,10 @@
)
)? &
((its-attribute.locQualityPrecisScore.nons | its-attribute.locQualityPrecisVote.nons), its-attribute.locQualityPrecisThreshold.nons?, its-attribute.locQualityPrecisProfileRef.nons?)? &
+ its-attribute.mtConfidence.nons? &
its-attribute.allowedCharacters.nons? &
- (its-attribute.storageSize.nons, its-attribute.storageEncoding.nons?)?
+ (its-attribute.storageSize.nons, its-attribute.storageEncoding.nons, its-attribute.lineBreakType?)? &
+ its-attribute.toolsRef.nons?
its-span =
## Inline element to contain ITS information.
@@ -434,8 +444,6 @@
its-attribute.provenanceRecordsRefPointer.nons = attribute provenanceRecordsRefPointer { its-relative-selector.type }
-# FIXME: TextAnalyisAnnotation
-
its-externalResourceRefRule =
## Rule about the External Resource data category.
element externalResourceRefRule {
@@ -474,7 +482,7 @@
its-attribute.selector,
its-attribute.idValue.nons
-its-attribute.idValue.nons = attribute idValue { its-relative-selector.type }
+its-attribute.idValue.nons = attribute idValue { its-xpath-expression.type }
its-preserveSpaceRule =
## Rule about the Preserve Space data category.
@@ -493,7 +501,16 @@
# FIXME: Localization Quality Précis
-# FIXME: MT Confidence
+its-mtConfidenceRule =
+ ## Rule about the MT Confidence data category.
+ element mtConfidenceRule {
+ its-mtConfidenceRule.content, its-mtConfidenceRule.attributes
+ }
+
+its-mtConfidenceRule.content = empty
+its-mtConfidenceRule.attributes =
+ its-attribute.selector,
+ its-attribute.mtConfidence.nons
its-allowedCharactersRule =
## Rule about the Allowed Characters data category.
@@ -519,7 +536,8 @@
its-storageSizeRule.attributes =
its-attribute.selector,
(its-attribute.storageSize.nons | its-attribute.storageSizePointer.nons),
- (its-attribute.storageEncoding.nons | its-attribute.storageEncodingPointer.nons)?
+ (its-attribute.storageEncoding.nons | its-attribute.storageEncodingPointer.nons)?,
+ its-attribute.lineBreakType.nons?
its-attribute.storageSizePointer.nons = attribute storageSizePointer { its-relative-selector.type }
its-attribute.storageEncodingPointer.nons = attribute storageEncodingPointer { its-relative-selector.type }
--- /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2012/10/09 11:45:27 1.4
+++ /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/schemas/its20.rng 2012/11/27 22:35:15 1.5
@@ -71,6 +71,16 @@
<ref name="its-term.type"/>
</attribute>
</define>
+ <define name="its-attribute.termConfidence">
+ <attribute name="its:termConfidence">
+ <ref name="its-termConfidence.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.termConfidence.nons">
+ <attribute name="termConfidence">
+ <ref name="its-termConfidence.type"/>
+ </attribute>
+ </define>
<define name="its-attribute.withinText">
<attribute name="its:withinText">
<ref name="its-withinText.type"/>
@@ -91,44 +101,44 @@
<ref name="its-domainMapping.type"/>
</attribute>
</define>
- <define name="its-attribute.entityTypeSourceRef">
- <attribute name="its:entityTypeSourceRef">
- <ref name="its-entityTypeSourceRef.type"/>
+ <define name="its-attribute.disambigGranularity">
+ <attribute name="its:disambigGranularity">
+ <ref name="its-disambigGranularity.type"/>
</attribute>
</define>
- <define name="its-attribute.entityTypeSourceRef.nons">
- <attribute name="entityTypeSourceRef">
- <ref name="its-entityTypeSourceRef.type"/>
+ <define name="its-attribute.disambigGranularity.nons">
+ <attribute name="disambigGranularity">
+ <ref name="its-disambigGranularity.type"/>
</attribute>
</define>
- <define name="its-attribute.entityTypeRef">
- <attribute name="its:entityTypeRef">
- <ref name="its-entityTypeRef.type"/>
+ <define name="its-attribute.disambigConfidence">
+ <attribute name="its:disambigConfidence">
+ <ref name="its-disambigConfidence.type"/>
</attribute>
</define>
- <define name="its-attribute.entityTypeRef.nons">
- <attribute name="entityTypeRef">
- <ref name="its-entityTypeRef.type"/>
+ <define name="its-attribute.disambigConfidence.nons">
+ <attribute name="disambigConfidence">
+ <ref name="its-disambigConfidence.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigType">
- <attribute name="its:disambigType">
- <ref name="its-disambigType.type"/>
+ <define name="its-attribute.disambigClassRef">
+ <attribute name="its:disambigClassRef">
+ <ref name="its-disambigClassRef.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigType.nons">
- <attribute name="disambigType">
- <ref name="its-disambigType.type"/>
+ <define name="its-attribute.disambigClassRef.nons">
+ <attribute name="disambigClassRef">
+ <ref name="its-disambigClassRef.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigSourceRef">
- <attribute name="its:disambigSourceRef">
- <ref name="its-disambigSourceRef.type"/>
+ <define name="its-attribute.disambigIdent">
+ <attribute name="its:disambigIdent">
+ <ref name="its-disambigIdent.type"/>
</attribute>
</define>
- <define name="its-attribute.disambigSourceRef.nons">
- <attribute name="disambigSourceRef">
- <ref name="its-disambigSourceRef.type"/>
+ <define name="its-attribute.disambigIdent.nons">
+ <attribute name="disambigIdent">
+ <ref name="its-disambigIdent.type"/>
</attribute>
</define>
<define name="its-attribute.disambigIdentRef">
@@ -141,6 +151,16 @@
<ref name="its-disambigIdentRef.type"/>
</attribute>
</define>
+ <define name="its-attribute.disambigSource">
+ <attribute name="its:disambigSource">
+ <ref name="its-disambigSource.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.disambigSource.nons">
+ <attribute name="disambigSource">
+ <ref name="its-disambigSource.type"/>
+ </attribute>
+ </define>
<define name="its-attribute.localeFilterList">
<attribute name="its:localeFilterList">
<ref name="its-localeFilterList.type"/>
@@ -151,6 +171,146 @@
<ref name="its-localeFilterList.type"/>
</attribute>
</define>
+ <define name="its-attribute.person">
+ <attribute name="its:person">
+ <ref name="its-person.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.person.nons">
+ <attribute name="person">
+ <ref name="its-person.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.personRef">
+ <attribute name="its:personRef">
+ <ref name="its-personRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.personRef.nons">
+ <attribute name="personRef">
+ <ref name="its-personRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.org">
+ <attribute name="its:org">
+ <ref name="its-org.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.org.nons">
+ <attribute name="org">
+ <ref name="its-org.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.orgRef">
+ <attribute name="its:orgRef">
+ <ref name="its-orgRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.orgRef.nons">
+ <attribute name="orgRef">
+ <ref name="its-orgRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.tool">
+ <attribute name="its:tool">
+ <ref name="its-tool.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.tool.nons">
+ <attribute name="tool">
+ <ref name="its-tool.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.toolRef">
+ <attribute name="its:toolRef">
+ <ref name="its-toolRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.toolRef.nons">
+ <attribute name="toolRef">
+ <ref name="its-toolRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revPerson">
+ <attribute name="its:revPerson">
+ <ref name="its-revPerson.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revPerson.nons">
+ <attribute name="revPerson">
+ <ref name="its-revPerson.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revPersonRef">
+ <attribute name="its:revPersonRef">
+ <ref name="its-revPersonRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revPersonRef.nons">
+ <attribute name="revPersonRef">
+ <ref name="its-revPersonRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revOrg">
+ <attribute name="its:revOrg">
+ <ref name="its-revOrg.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revOrg.nons">
+ <attribute name="revOrg">
+ <ref name="its-revOrg.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revOrgRef">
+ <attribute name="its:revOrgRef">
+ <ref name="its-revOrgRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revOrgRef.nons">
+ <attribute name="revOrgRef">
+ <ref name="its-revOrgRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revTool">
+ <attribute name="its:revTool">
+ <ref name="its-revTool.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revTool.nons">
+ <attribute name="revTool">
+ <ref name="its-revTool.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revToolRef">
+ <attribute name="its:revToolRef">
+ <ref name="its-revToolRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.revToolRef.nons">
+ <attribute name="revToolRef">
+ <ref name="its-revToolRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.provRef">
+ <attribute name="its:provRef">
+ <ref name="its-provRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.provRef.nons">
+ <attribute name="provRef">
+ <ref name="its-provRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.provenanceRecordsRef">
+ <attribute name="its:provenanceRecordsRef">
+ <ref name="its-provenanceRecordsRefPointer.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.provenanceRecordsRef.nons">
+ <attribute name="provenanceRecordsRef">
+ <ref name="its-provenanceRecordsRefPointer.type"/>
+ </attribute>
+ </define>
<define name="its-attribute.locQualityIssuesRef">
<attribute name="its:locQualityIssuesRef">
<ref name="its-locQualityIssuesRef.type"/>
@@ -241,6 +401,16 @@
<ref name="its-locQualityPrecisProfileRef.type"/>
</attribute>
</define>
+ <define name="its-attribute.mtConfidence">
+ <attribute name="its:mtConfidence">
+ <ref name="its-mtConfidence.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.mtConfidence.nons">
+ <attribute name="mtConfidence">
+ <ref name="its-mtConfidence.type"/>
+ </attribute>
+ </define>
<define name="its-attribute.allowedCharacters">
<attribute name="its:allowedCharacters">
<ref name="its-allowedCharacters.type"/>
@@ -271,6 +441,26 @@
<ref name="its-storageEncoding.type"/>
</attribute>
</define>
+ <define name="its-attribute.lineBreakType">
+ <attribute name="its:lineBreakType">
+ <ref name="its-lineBreakType.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.lineBreakType.nons">
+ <attribute name="lineBreakType">
+ <ref name="its-lineBreakType.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.toolsRef">
+ <attribute name="its:toolsRef">
+ <ref name="its-toolsRef.type"/>
+ </attribute>
+ </define>
+ <define name="its-attribute.toolsRef.nons">
+ <attribute name="toolsRef">
+ <ref name="its-toolsRef.type"/>
+ </attribute>
+ </define>
<define name="its-attribute.version">
<attribute name="its:version">
<ref name="its-version.type"/>
@@ -329,6 +519,7 @@
<ref name="its-domainRule"/>
<ref name="its-disambiguationRule"/>
<ref name="its-localeFilterRule"/>
+ <ref name="its-mtConfidenceRule"/>
<ref name="its-externalResourceRefRule"/>
<ref name="its-targetPointerRule"/>
<ref name="its-idValueRule"/>
@@ -386,27 +577,79 @@
<optional>
<ref name="its-attribute.termInfoRef"/>
</optional>
+ <optional>
+ <ref name="its-attribute.termConfidence"/>
+ </optional>
</optional>
<optional>
<ref name="its-attribute.withinText"/>
</optional>
<optional>
- <ref name="its-attribute.entityTypeSourceRef"/>
+ <ref name="its-attribute.disambigConfidence"/>
</optional>
<optional>
- <ref name="its-attribute.entityTypeRef"/>
+ <ref name="its-attribute.disambigGranularity"/>
</optional>
<optional>
- <ref name="its-attribute.disambigType"/>
+ <ref name="its-attribute.disambigClassRef"/>
</optional>
<optional>
- <ref name="its-attribute.disambigSourceRef"/>
+ <choice>
+ <group>
+ <ref name="its-attribute.disambigSource"/>
+ <ref name="its-attribute.disambigIdent"/>
+ </group>
+ <ref name="its-attribute.disambigIdentRef"/>
+ </choice>
</optional>
<optional>
- <ref name="its-attribute.disambigIdentRef"/>
+ <ref name="its-attribute.localeFilterList"/>
</optional>
<optional>
- <ref name="its-attribute.localeFilterList"/>
+ <choice>
+ <interleave>
+ <optional>
+ <choice>
+ <ref name="its-attribute.person"/>
+ <ref name="its-attribute.personRef"/>
+ </choice>
+ </optional>
+ <optional>
+ <choice>
+ <ref name="its-attribute.org"/>
+ <ref name="its-attribute.orgRef"/>
+ </choice>
+ </optional>
+ <optional>
+ <choice>
+ <ref name="its-attribute.tool"/>
+ <ref name="its-attribute.toolRef"/>
+ </choice>
+ </optional>
+ <optional>
+ <choice>
+ <ref name="its-attribute.revPerson"/>
+ <ref name="its-attribute.revPersonRef"/>
+ </choice>
+ </optional>
+ <optional>
+ <choice>
+ <ref name="its-attribute.revOrg"/>
+ <ref name="its-attribute.revOrgRef"/>
+ </choice>
+ </optional>
+ <optional>
+ <choice>
+ <ref name="its-attribute.revTool"/>
+ <ref name="its-attribute.revToolRef"/>
+ </choice>
+ </optional>
+ <optional>
+ <ref name="its-attribute.provRef"/>
+ </optional>
+ </interleave>
+ <ref name="its-attribute.provenanceRecordsRef"/>
+ </choice>
</optional>
<optional>
<choice>
@@ -442,6 +685,9 @@
</optional>
</optional>
<optional>
+ <ref name="its-attribute.mtConfidence"/>
+ </optional>
+ <optional>
<ref name="its-attribute.allowedCharacters"/>
</optional>
<optional>
[363 lines skipped]
Received on Tuesday, 27 November 2012 22:35:17 UTC