Update version references etc to 4.0 status

michaelhkay · Oct 19, 2023 · 82dca53 · 82dca53
1 parent 5420e11
commit 82dca53
Show file tree

Hide file tree

Showing 8 changed files with 199 additions and 180 deletions.
diff --git a/schema/xsl-query.dtd b/schema/xsl-query.dtd
@@ -3,13 +3,13 @@
                             | DM11 | FO11 | FS11 | XP21 | XQ11 | XQX11 | SER11
                             | DM30 | FO30 | XP30 | XQ30 | XQX30 | SER30 | XT30
                             | DM31 | FO31 | XP31 | XQ31 | XQX31 | SER31
-                            | DM40 | FO40 | XP40 | XQ40 | XQX40 | SER40 | XT40
+                            | DM40 | FO40 | XP40 | XQ40 | XQX40 | SE40 | XT40
                             | FT | XU | SX
                             | FT30 | XU30 | SX30 
                             | XS1-1 | XS1-2 | XS11-1 | XS11-2">
 
 <!--
-   Note, XS1-1 and XS1-2 are aliases for XS1 and XS2 repsectively (XML
+   Note, XS1-1 and XS1-2 are aliases for XS1 and XS2 respectively (XML
    Schema 1.0).  New references should use XS1-1 and XS1-2.
 -->
 

diff --git a/specifications/xquery-40/src/back-matter.xml b/specifications/xquery-40/src/back-matter.xml
@@ -1092,7 +1092,8 @@ of the declared type).</p></item><item role="xquery"><p>Limits on ranges of valu
 
 </olist>
 
-<note><p>Additional <termref def="dt-implementation-defined">implementation-defined</termref> items are listed in <bibref ref="xpath-datamodel-31"/> and <bibref ref="xpath-functions-40"/>.</p></note></div1>
+<note><p>Additional <termref def="dt-implementation-defined">implementation-defined</termref> 
+  items are listed in <bibref ref="xpath-datamodel-40"/> and <bibref ref="xpath-functions-40"/>.</p></note></div1>
 <div1 id="id-references">
 <head>References</head>
 <div2 id="id-normative-references">
@@ -1172,13 +1173,16 @@ of the declared type).</p></item><item role="xquery"><p>Limits on ranges of valu
       See <loc href="http://www.w3.org/TR/xmlschema11-1/" id="schema1-11">http://www.w3.org/TR/xmlschema11-1/</loc>,
       and <loc href="http://www.w3.org/TR/xmlschema11-2/" id="schema2-11">http://www.w3.org/TR/xmlschema11-2/</loc>.</bibl>
 
-<bibl id="xpath-datamodel-31" key="XQuery and XPath Data Model (XDM) 3.1"/>
+<bibl id="xpath-datamodel-40" key="XQuery and XPath Data Model (XDM) 4.0"/>
 
 <bibl id="xpath-functions-40" key="XQuery and XPath Functions and Operators 4.0"/>
+
+  <bibl id="xpath-40" key="XPath 4.0"/>
+
 
-<bibl id="xslt-xquery-serialization-31" key="XSLT and XQuery Serialization 3.1"/>
+<bibl id="xslt-xquery-serialization-40" key="XSLT and XQuery Serialization 4.0"/>
 
-<bibl id="xquery-update-30" key="XQuery Update Facility 3.0" role="xquery"/>
+<!--<bibl id="xquery-update-30" key="XQuery Update Facility 3.0" role="xquery"/>-->
 
 
 </blist>
@@ -1196,9 +1200,9 @@ of the declared type).</p></item><item role="xquery"><p>Limits on ranges of valu
 
 <bibl id="xquery-semantics" key="XQuery 1.0 and XPath 2.0 Formal Semantics"/>
 
-<bibl id="xqueryx-31" key="XQueryX 3.1" role="xquery"/>
+<!--<bibl id="xqueryx-31" key="XQueryX 3.1" role="xquery"/>-->
 
-<bibl id="xslt-30" key="XSL Transformations (XSLT) Version 3.0"/>
+<bibl id="xslt-40" key="XSL Transformations (XSLT) Version 4.0"/>
 
 <bibl id="DOM" key="Document Object Model" role="xquery">World Wide Web Consortium. <emph>Document Object Model (DOM) Level 3 Core Specification.</emph> W3C Recommendation, April 7, 2004. See <loc href="http://www.w3.org/TR/DOM-Level-3-Core/">http://www.w3.org/TR/DOM-Level-3-Core/</loc>.</bibl>
 

diff --git a/specifications/xquery-40/src/conformance.xml b/specifications/xquery-40/src/conformance.xml
@@ -21,7 +21,7 @@
 
       <p role="xpath">XPath is intended primarily as a component that can be used by
       other specifications. Therefore, XPath relies on specifications that
-      use it (such as <bibref ref="XPTR"/> and <bibref ref="xslt-30"/>) to
+      use it (such as <bibref ref="XPTR"/> and <bibref ref="xslt-40"/>) to
       specify conformance criteria for XPath in their respective
       environments. Specifications that set conformance criteria for their
       use of XPath <termref def="mustnot">MUST NOT</termref> change the
@@ -41,7 +41,7 @@
       conformance to one or more optional features defined in <specref
       ref="id-conform-optional-features"/>.</p>
 
-      <div2 id="id-xpath-static-typing" role="xpath">
+      <div2 id="id-xpath-static-typing" role="xpath" diff="del" at="2023-10-19">
         <head>Static Typing Feature</head>
 
         <p>
@@ -83,7 +83,7 @@
                 </note>
             </item>
             <item>
-                <p>An implementation of <bibref ref="xpath-datamodel-31"/>, as specified in <specref
+                <p>An implementation of <bibref ref="xpath-datamodel-40"/>, as specified in <specref
                         ref="id-data-model-conformance"/>, and a definition of every item specified
                     to be <termref def="dt-implementation-defined">implementation-defined</termref>,
                     unless that item is part of an optional feature that is not provided by the
@@ -156,7 +156,7 @@
             </olist>
         </div3>
 
-        <div3 id="id-static-typing-feature">
+        <div3 id="id-static-typing-feature" diff="del" at="2023-10-19">
             <head>Static Typing Feature</head>
             <p>
                 <termdef id="dt-static-typing-feature" term="static
@@ -213,15 +213,15 @@
             <p>The means by which serialization is invoked is <termref
                     def="dt-implementation-defined">implementation-defined</termref>.</p>
             <p>If an error is raised during the serialization process as specified in <bibref
-                    ref="xslt-xquery-serialization-31"/>, an implementation <termref def="must"
+                    ref="xslt-xquery-serialization-40"/>, an implementation <termref def="must"
                     >MUST</termref> report the error to the calling environment.</p>
 
             <p>An implementation that does not provide the Serialization Feature <termref def="must"
                     >MUST NOT</termref> raise errors when reading an <termref
                     def="dt-output-declaration">output declaration</termref>, and <termref
                     def="must">MUST</termref> implement <code>fn:serialize</code>; it <termref
                     def="may">MAY</termref>, however, raise an error when <code>fn:serialize</code>
-                is invoked, as specified in <xspecref spec="FO31" ref="func-serialize"/>. An
+                is invoked, as specified in <xspecref spec="FO40" ref="func-serialize"/>. An
                 implementation that does not provide the Serialization Feature <termref def="may"
                     >MAY</termref> provide results of a query using a vendor-defined
                 serialization.</p>
@@ -256,7 +256,7 @@
                 a function.</p>
 
             <p>If an implementation provides the Higher-Order Function Feature, then it <termref def="must">MUST</termref> provide
-                    all <xtermref spec="FO31" ref="dt-higher-order"/> functions defined in <bibref ref="xpath-functions-40"/>.
+                    all <xtermref spec="FO40" ref="dt-higher-order"/> functions defined in <bibref ref="xpath-functions-40"/>.
                 If an implementation does not provide the Higher
                 Order Function Feature, a <termref def="dt-static-error">static error</termref> is
                 raised <errorref class="ST" code="0017"/> if any of these functions is present in a
@@ -270,7 +270,7 @@
     <div2 id="id-data-model-conformance" role="xquery">
         <head>Data Model Conformance</head>
         <p>All XQuery implementations process data represented in the <termref def="dt-datamodel"
-                >data model</termref> as specified in <bibref ref="xpath-datamodel-31"/>. The data
+                >data model</termref> as specified in <bibref ref="xpath-datamodel-40"/>. The data
             model specification relies on languages such as XQuery to specify conformance criteria
             for the data model in their respective environments, and suggests that the following
             issues should be considered:</p>
@@ -279,22 +279,22 @@
                 <p>
                     <emph>Support for normative construction from an infoset.</emph> An
                     implementation <termref def="may">MAY</termref> choose to claim conformance to
-                        <xspecref spec="DM31" ref="const-infoset"/>, which defines a normative way
+                        <xspecref spec="DM40" ref="const-infoset"/>, which defines a normative way
                     to construct an <termref def="dt-data-model-instance">XDM instance</termref>
                     from an XML document that is merely well-formed or is governed by a DTD.</p>
             </item>
             <item>
                 <p>
                     <emph>Support for normative construction from a PSVI.</emph> An implementation
                         <termref def="may">MAY</termref> choose to claim conformance to <xspecref
-                        spec="DM31" ref="const-psvi"/>, which defines a normative way to construct
+                        spec="DM40" ref="const-psvi"/>, which defines a normative way to construct
                     an <termref def="dt-data-model-instance">XDM instance</termref> from an XML
                     document that is governed by a W3C XML Schema.</p>
             </item>
             <item>
                 <p>
                     <emph>Support for versions of XML and XSD.</emph> As stated in <bibref
-                        ref="xpath-datamodel-31"/>, the
+                        ref="xpath-datamodel-40"/>, the
                     definitions of primitives such as strings, characters, and names <termref def="should">SHOULD</termref> be taken
                     from the latest applicable version of the base specifications in which they are
                     defined; it is implementation-defined which definitions are used in cases where

diff --git a/specifications/xquery-40/src/errors.xml b/specifications/xquery-40/src/errors.xml
@@ -7,15 +7,15 @@
          <p> It is a <termref def="dt-static-error">static error</termref> if analysis of an
             expression relies on some component of the <termref def="dt-static-context">static
                context</termref> that <phrase diff="del">has not been assigned a
-               value</phrase><phrase diff="add">is <xtermref spec="DM31" ref="dt-absent"
+               value</phrase><phrase diff="add">is <xtermref spec="DM40" ref="dt-absent"
             /></phrase>.</p>
       </error>
 
       <error spec="XP" code="0002" class="DY" type="dynamic">
          <p>It is a <termref def="dt-dynamic-error">dynamic error</termref> if evaluation of an
             expression relies on some part of the <termref def="dt-dynamic-context">dynamic
                context</termref> that <phrase diff="del">has not been assigned a
-               value</phrase><phrase diff="add">is <xtermref spec="DM31" ref="dt-absent"
+               value</phrase><phrase diff="add">is <xtermref spec="DM40" ref="dt-absent"
             /></phrase>.</p>
       </error>