From c83f40b9d3c2dfb1ae13104e3522f28a90a77b08 Mon Sep 17 00:00:00 2001 From: Michael Kay Date: Thu, 28 Sep 2023 11:49:57 +0100 Subject: [PATCH] Missing comma; delete dropped entity files --- .../xpath-datamodel-40/src/xdt-datatypes.xml | 89 ------------------- .../xpath-datamodel-40/src/xdt-schema-app.xml | 52 ----------- .../src/xpath-datamodel.xml | 82 +++++++++++------ 3 files changed, 57 insertions(+), 166 deletions(-) delete mode 100644 specifications/xpath-datamodel-40/src/xdt-datatypes.xml delete mode 100644 specifications/xpath-datamodel-40/src/xdt-schema-app.xml diff --git a/specifications/xpath-datamodel-40/src/xdt-datatypes.xml b/specifications/xpath-datamodel-40/src/xdt-datatypes.xml deleted file mode 100644 index d8bb73d89..000000000 --- a/specifications/xpath-datamodel-40/src/xdt-datatypes.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - -

The datatype xs:untyped denotes the dynamic type of -an element node that has not been validated, or has been validated in -skip mode. The properties of xs:untyped -are the same as the properties of xs:anyType except for -the base type and name. The base type of xs:untyped is -xs:anyType. -No predefined types are derived from xs:untyped -and no such derivations are allowed.

- - - - - - -

The datatype xs:untypedAtomic denotes untyped atomic -data, such as text that has not been assigned a more specific type. An -attribute that has been validated in skip mode is represented in the Data -Model by an attribute node with the type xs:untypedAtomic. No -predefined types are derived from xs:untypedAtomic -and no such derivations are allowed. -

- - - - - - -

The datatype xs:anyAtomicType is an atomic type that -includes all atomic values (and no values that are not atomic). Its -base type is xs:anySimpleType, from which all simple -types, including atomic, list, and union types are derived. All -primitive atomic types, such as xs:decimal and -xs:string, have xs:anyAtomicType -as their base type.

-

No type may be derived from xs:anyAtomicType -by restriction, union, or list.

- - - - - - -

The type xs:dayTimeDuration is derived from -xs:duration by restricting its lexical representation to -contain only the days, hours, minutes and seconds components. The -value space of xs:dayTimeDuration is the set of -fractional second values. The components of -xs:dayTimeDuration correspond to the day, hour, minute -and second components defined in Section 5.5.3.2 of &xdt-isoref;. -An xs:dayTimeDuration is -derived from xs:duration as follows:

- - - - - -]]> - - - - - - -

The type xs:yearMonthDuration is derived from -xs:duration by restricting its lexical representation to -contain only the year and month components. The value space of -xs:yearMonthDuration is the set of -xs:integer month values. The year and month components of -xs:yearMonthDuration correspond to the Gregorian year -and month components defined in section 5.5.3.2 of &xdt-isoref;, -respectively.

- -

The type xs:yearMonthDuration is derived from -xs:duration as follows:

- - - - - -]]> - - - diff --git a/specifications/xpath-datamodel-40/src/xdt-schema-app.xml b/specifications/xpath-datamodel-40/src/xdt-schema-app.xml deleted file mode 100644 index c68eb5198..000000000 --- a/specifications/xpath-datamodel-40/src/xdt-schema-app.xml +++ /dev/null @@ -1,52 +0,0 @@ -Schema for the Extended XS Namespace - -

The following schema defines the additional types in the -xs: namespace identified by this document. -

- -

You can retrieve the normative schema document for this namespace from -.

- - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> diff --git a/specifications/xpath-datamodel-40/src/xpath-datamodel.xml b/specifications/xpath-datamodel-40/src/xpath-datamodel.xml index c88803663..573f8110c 100644 --- a/specifications/xpath-datamodel-40/src/xpath-datamodel.xml +++ b/specifications/xpath-datamodel-40/src/xpath-datamodel.xml @@ -67,8 +67,6 @@ - - '> attributes"> @@ -944,7 +942,7 @@ are available.

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.

@@ -956,29 +954,55 @@ size and scope of the processing context.

- + Predefined Types + +

The three atomic types xs:anyAtomicType, + xs:dayTimeDuration, and + xs:yearMonthDuration 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.

+ + +

The types xs:dayTimeDuration, and + xs:yearMonthDuration 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 xs:duration, not on the primitive type xs:duration itself.

+

The datatype xs:anyAtomicType is an atomic type that + includes all atomic values (and no values that are not atomic). Its + base type is xs:anySimpleType, from which all simple + types, including atomic, list, and union types are derived. All + primitive atomic types, such as xs:decimal and + xs:string, have xs:anyAtomicType + as their base type.

+

No type may be derived from xs:anyAtomicType + by restriction, union, or list.

+ + +

The types xs:untyped and xs:untypedAtomic, although + they have names in the XSD namespace, are defined in this XDM specification, and not + in XSD.

+ +

The type xs:untypedAtomic 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 xs:untypedAtomic. No + predefined types are derived from xs:untypedAtomic + and no such derivations are allowed. +

+ +

The datatype xs:untyped 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 xs:untyped + are the same as the properties of xs:anyType except for + the base type and name. The base type of xs:untyped is + xs:anyType. + No predefined types are derived from xs:untyped + and no such derivations are allowed.

-

In addition to the 19 primitive atomic types defined in - -of , the data model defines five - additional atomic types: xs:anyAtomicType, -xs:untyped, xs:untypedAtomic, -xs:dayTimeDuration, and -xs:yearMonthDuration. -These types are defined in the XML Schema namespace with permission -of the XML Schema Working Group; in implementations that support -, the XSD 1.1 definitions of -xs:anyAtomicType, xs:dayTimeDuration, -and xs:yearMonthDuration supersede the definitions in this -specification. -

-&xdt-datatypes; -

A schema for xs:dayTimeDuration and -xs:yearMonthDuration is provided in .

 @@ -1051,6 +1075,17 @@ well-formedness criteria of the selected version of XML.

any nodes or atomic values containing characters that do not satisfy the constraints of the selected version of XML.

+ + +

The lexical space of type xs:duration is defined in XSD 1.1 part 2 (ยง3.3.6.2) + in two different ways: + with a BNF grammar starting with the production durationLexicalRep, 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.

+ @@ -2766,9 +2801,6 @@ Available from: http://www.iso.org/ - -&xdt-schema-app; - Glossary