Missing comma; delete dropped entity files

michaelhkay · Oct 18, 2023 · 15f193b · 15f193b
1 parent 10fa451
commit 15f193b
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 166 deletions.
diff --git a/specifications/xpath-datamodel-40/src/xdt-datatypes.xml b/specifications/xpath-datamodel-40/src/xdt-datatypes.xml
diff --git a/specifications/xpath-datamodel-40/src/xdt-schema-app.xml b/specifications/xpath-datamodel-40/src/xdt-schema-app.xml
diff --git a/specifications/xpath-datamodel-40/src/xpath-datamodel.xml b/specifications/xpath-datamodel-40/src/xpath-datamodel.xml
@@ -67,8 +67,6 @@
 <!ENTITY dm-example.xml SYSTEM "dm-example.xml.cdata">
 <!ENTITY dm-example.xsd SYSTEM "dm-example.xsd.cdata">
 <!ENTITY dm-example.tbl SYSTEM "dm-example.tbl.xml">
-<!ENTITY xdt-schema-app SYSTEM "xdt-schema-app.xml">
-<!ENTITY xdt-datatypes  SYSTEM "xdt-datatypes.xml">
 <!ENTITY xdt-isoref     '<bibref ref="ISO8601"/>'>
 
 <!ENTITY dm.prop.attributes   "<emph role='dm-node-property'>attributes</emph>">
@@ -944,7 +942,7 @@ are available.
 </imp-dep-feature>
 
 <p>The scope over which the names of anonymous types must be
-meaningful and distinct is depends on the processing context.
+meaningful and distinct depends on the processing context.
 It is the responsibility of the host language to define the
 size and scope of the processing context.</p>
 
@@ -956,29 +954,55 @@ size and scope of the processing context.</p>
 
 </div3>
 
-<div3 id="types-predefined">
+<div3 id="types-predefined" diff="chg" at="2023-09-28">
 <head>Predefined Types</head>
+
+  <p>The three atomic types <code>xs:anyAtomicType</code>,
+    <code>xs:dayTimeDuration</code>, and
+    <code>xs:yearMonthDuration</code> were first introduced in the 2.0 version of this specification,
+  and were subsequently adopted by XSD 1.1. These types are always present in the XDM data model,
+  with the definitions as given in XSD 1.1, whether or not the processor actually supports XSD 1.1.</p>
+
+  <note>
+    <p>The types <code>xs:dayTimeDuration</code>, and
+      <code>xs:yearMonthDuration</code> have a special status in these specifications because many
+    arithmetic operations (such as comparing two durations) are available in XPath only on these
+    subtypes of <code>xs:duration</code>, not on the primitive type <code>xs:duration</code> itself.</p>
+    <p>The datatype <code>xs:anyAtomicType</code> is an atomic type that
+      includes all atomic values (and no values that are not atomic). Its
+      base type is <code>xs:anySimpleType</code>, from which all simple
+      types, including atomic, list, and union types are derived. All
+      primitive atomic types, such as <code>xs:decimal</code> and
+      <code>xs:string</code>, have <code>xs:anyAtomicType</code>
+      as their base type.</p>
+    <p>No type may be derived from <code>xs:anyAtomicType</code>
+      by restriction, union, or list.</p>
+  </note>
+
+  <p>The types <code>xs:untyped</code> and <code>xs:untypedAtomic</code>, although
+  they have names in the XSD namespace, are defined in this XDM specification, and not
+  in XSD.</p>
+
+  <p>The type <term>xs:untypedAtomic</term> denotes untyped atomic
+    data, such as text that has not been assigned a more specific type. It is
+    classified as an atomic type. An attribute that has not been validated 
+    (or that has been validated in skip mode) is represented in the data
+    model by an attribute node with the type annotation <code>xs:untypedAtomic</code>. No
+    predefined types are derived from <code>xs:untypedAtomic</code>
+    <phrase>and no such derivations are allowed</phrase>.
+  </p>
+
+  <p>The datatype <term>xs:untyped</term> is used as the type annotation of
+    an element node that has not been validated, or that has been validated in
+    skip mode. It is a classified as a complex type. The properties of <code>xs:untyped</code>
+    are the same as the properties of <code>xs:anyType</code> except for
+    the base type and name. The base type of <code>xs:untyped</code> is
+    <code>xs:anyType</code>.
+    No predefined types are derived from <code>xs:untyped</code>
+    <phrase>and no such derivations are allowed</phrase>.</p>
 
-<p>In addition to the 19 <phrase diff="add" at="2022-11-05">primitive atomic</phrase> types defined in
-<xspecref spec="XS2" ref="built-in-primitive-datatypes"/>
-of <bibref ref="xmlschema-2"/>, the data model defines five
-  additional <phrase diff="add" at="2022-11-05">atomic</phrase> types: <code>xs:anyAtomicType</code>,
-<code>xs:untyped</code>, <code>xs:untypedAtomic</code>,
-<code>xs:dayTimeDuration</code>, and
-<code>xs:yearMonthDuration</code>.
-These types are defined in the XML Schema namespace with permission
-of the XML Schema Working Group; in implementations that support
-<bibref ref="xmlschema11-2"/>, the XSD 1.1 definitions of
-<code>xs:anyAtomicType</code>, <code>xs:dayTimeDuration</code>,
-and <code>xs:yearMonthDuration</code> supersede the definitions in this
-specification.
-</p>
 
-&xdt-datatypes;
 
-<p>A schema for <code>xs:dayTimeDuration</code> and
-<code>xs:yearMonthDuration</code> is provided in <specref
-ref="xdtschema"/>.</p>
 </div3>
 
 <div3 id="xml-and-xsd-versions">
@@ -1051,6 +1075,17 @@ well-formedness criteria of the selected version of XML.</p>
 any nodes or atomic values containing characters that do not satisfy the
 constraints of the selected version of XML.</p></item>
 </olist>
+
+  <note diff="add" at="2023-09-28">
+    <p>The lexical space of type <code>xs:duration</code> is defined in XSD 1.1 part 2 (§3.3.6.2) 
+      in two different ways:
+    with a BNF grammar starting with the production <code>durationLexicalRep</code>, and with a regular 
+    expression. The two definitions are inconsistent: the BNF allows a decimal point at the start or end
+    of the seconds component, while the regular expression requires any decimal point to be preceded and followed
+    by a digit. For the purposes of this specification, the regular expression is considered to be 
+    correct, and the BNF incorrect; this makes the representation identical to that in XSD 1.0, 
+    and is compatible with ISO 8601.</p>
+  </note>
 </div3>
 
 </div2>
@@ -2766,9 +2801,6 @@ Available from: <loc href="http://www.iso.org/">http://www.iso.org/</loc>
 </div2>
 </div1>
 
-<div1 id="xdtschema">
-&xdt-schema-app;
-</div1>
 
 <inform-div1 id="glossary">
 <head>Glossary</head>