Proofreading

Author: michaelhkay

specifications/xquery-40/src/expressions.xml

@@ -15853,7 +15853,8 @@ encountered in finding the effective boolean value of its operand,
             <prodrecap ref="NodeConstructor"/>
          </scrap>
 
-         <p>Constructors are provided for element, attribute, document, text, comment, and processing instruction nodes. 
+         <p>Constructors are provided for element, attribute, document, text, comment, 
+            processing instruction, and namespace nodes. 
             <phrase role="xquery">Two kinds of constructors are provided: <term>direct constructors</term>, 
             which use an XML-like notation that can incorporate enclosed expressions, 
             and <term>computed constructors</term>, which use a notation based on enclosed expressions.</phrase> </p>
@@ -15913,7 +15914,7 @@ encountered in finding the effective boolean value of its operand,
 
                      <item>
                         <p>The <code>type-name</code>, <code>nilled</code>, <code>string-value</code>, <code>typed-value</code>, 
-                           <code>is-id</code>, <code>is-idrefs</code> properties of the copied nodes are preserved.</p>
+                           <code>is-id</code>, and <code>is-idrefs</code> properties of the copied nodes are preserved.</p>
                      </item>
 
                      <item>
@@ -15931,7 +15932,7 @@ encountered in finding the effective boolean value of its operand,
                      </item>
 
                      <item>
-                        <p>When an attribute nodes are copied but its parent element node is not
+                        <p>When an attribute node is copied but its parent element node is not
                                  copied, type error <errorref class="TY" code="0086"/>
                            is raised if the <termref def="dt-typed-value">typed value</termref>
                                  of the copied attribute node is
@@ -17010,9 +17011,8 @@ be created: <code>element</code>, <code>attribute</code>,
             <p>For those kinds of nodes that have names (element, attribute, 
 processing instruction, and namespace nodes), the keyword that specifies the node
 kind is followed by the name of the node to be created. This name may
-be specified either as an literal or as an expression enclosed in
-braces. <termdef term="name expression" id="dt-name-expression"
-                     >When
+be specified either as a literal or as an expression enclosed in
+braces. <termdef term="name expression" id="dt-name-expression">When
 an expression is used to specify the name of a constructed node, that
 expression is called the <term>name expression</term> of the
 constructor.</termdef>
@@ -17033,14 +17033,14 @@ same result as the first example in <specref
   }
 }]]></eg>
 
-            <note><p>In the above examples, <code>#book</code>,<code>#title</code>, and so on
+            <note><p>In the above example, the element names <code>#book</code>,<code>#title</code>, and so on
             are <nt def="QNameLiteral">QNameLiteral</nt>s, which are expanded using the
                   <termref def="dt-constructed-element-namespace-rule"/>.
-            The attribute name <code>#isdn</code>, by contrast, is expanded using the
+            The attribute name <code>#isbn</code>, by contrast, is expanded using the
             <termref def="dt-no-namespace-rule"/>.</p></note>
 
-            <note role="xquery"><p>XQuery 4.0 allows the node name to be written in quotation
-            marks (for example, <code>element "book" {}</code>, and at the same
+            <note role="xquery"><p>XQuery 4.0 allows the node name to be written as a QName literal
+            (for example, <code>element #book {}</code>, and at the same
             time it disallows the use of a defined set of language keywords
             without quotes: for example <code>element div {}</code> was allowed
             in XQuery 3.1 but must now be written <code>element #div {}</code> or
@@ -17826,7 +17826,9 @@ attribute {
                   </item>
                </olist>
                <p>No validation is performed on the constructed document node. The <bibref ref="XML"
-                  /> rules that govern the structure of an XML document (for example, the document node must have exactly one child that is an element node)  are not enforced by the XQuery document node constructor.</p>
+                  /> rules that govern the structure of an XML document (for example, the 
+                  document node must have exactly one child that is an element node)  
+                  are not enforced by the &language; document node constructor.</p>
             </div4>
             <div4 id="id-textConstructors">
                <head>Text Node Constructors</head>
@@ -17870,6 +17872,10 @@ attribute {
                </note>
                <p>The following example illustrates a text node constructor:</p>
                <eg role="parse-test"><![CDATA[text { "Hello" }]]></eg>
+               
+               <note><p>It is possible to construct a text node whose string value is zero-length. The rules 
+                     for constructing element nodes, however, ensure that a zero-length text node will be discarded
+                     if used while forming the content of an element.</p></note>
             </div4>
 
             <div4 id="id-computed-pis">
@@ -18204,27 +18210,19 @@ return comment { concat($homebase, ", we have a problem.") }]]></eg>
                   <item>
                      <p>A computed namespace constructor with a prefix expression:</p>
                      <eg role="parse-test"
-                        ><![CDATA[namespace { "a" } { "http://a.example.com" }]]></eg>
+                        ><![CDATA[namespace { "a" || $i } { "http://example.ns/a" || $i }]]></eg>
                   </item>
 
 
                   <item>
                      <p>A computed namespace constructor with the empty prefix:</p>
                      <eg role="parse-test"
-                        ><![CDATA[namespace {""} { "http://a.example.com" }]]></eg>
+                        ><![CDATA[namespace {""} { "http://example.ns/a0" }]]></eg>
                   </item>
                </ulist>
 
                <p>Computed namespace constructors are generally used to add to the
-<termref def="dt-in-scope-namespaces"/> of elements created with element constructors:</p> 
-               <eg role="xquery"><![CDATA[
-<age xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> {
-  namespace #xs { "http://www.w3.org/2001/XMLSchema" },
-  attribute #xsi:type { "xs:integer" },
-  23
-}</age>
-]]></eg>
-               <p role="xquery">Or:</p>
+<termref def="dt-in-scope-namespaces"/> of elements created using computed element constructors:</p> 
 
                <eg role="parse-test"><![CDATA[
 element #age {
@@ -18235,13 +18233,19 @@ element #age {
 }
 ]]></eg>
 
-               <p role="xquery">In the above example, note that the <code>xsi</code> <termref def="dt-namespace-binding"/> 
-                  is created for the element because it is used in an attribute name. The attribute’s 
-                  content is simply character data, and has no effect on namespace bindings. 
-                  The computed namespace constructor ensures that the <code>xs</code> binding is created.</p>
-
-               <p role="xquery">Computed namespace constructors have no effect on the <termref def="dt-static-namespaces"/>. 
-                  If the prefix a is not already defined in the <termref def="dt-static-namespaces"/>, 
+               <p>In this example, the explicit construction of 
+                  the <code>xsi</code> <termref def="dt-namespace-binding"/> 
+                  is unnecessary; it would be created automatically, because the <code>xsi</code> 
+                  prefix is used in an attribute name. By contrast, the declaration of
+                  the <code>xs</code> <termref def="dt-namespace-binding"/> is needed; the attribute’s 
+                  content is simply character data, and would not trigger automatic creation
+                  of a namespace binding. This would be true even if the attribute is subsequently
+                  validated against a schema that interprets <code>"xs:integer"</code> as a QName,
+                  because such validation relies on the namespace binding already being present.</p>
+
+               <p role="xquery">Computed namespace constructors have no effect on the <termref def="dt-static-namespaces"/>
+                  in the static context. 
+                  If the prefix <code>a</code> is not already defined in the <termref def="dt-static-namespaces"/>, 
                   the following expression results in a static error
 <errorref
                      class="ST" code="0081"/>.</p>
@@ -18252,6 +18256,13 @@ element #age {
 }</a:form>
 ]]></eg>
 
+              <note>
+                 <p>It is not possible to use a computed namespace constructor to
+                    generate a namespace undeclaration such as <code>xmlns=""</code>
+                 or (with XML Namespaces 1.1) <code>xmlns:p=""</code>. A namespace undeclaration in lexical XML
+                 is represented in the XDM model by the absence of a <termref def="dt-namespace-binding"/> that
+                 would otherwise be present.</p>
+              </note>
 
             </div4>
 
@@ -18388,7 +18399,7 @@ element #p:a {
 }  
 </eg>
 
-            <p>the <termref def="dt-in-scope-namespaces"/> of the resulting <code>p:a</code> element comprise 
+            <p>The <termref def="dt-in-scope-namespaces"/> of the resulting <code>p:a</code> element comprise 
                the following <termref def="dt-namespace-binding">namespace bindings</termref>:</p>
 
             <slist>
@@ -18399,22 +18410,22 @@ element #p:a {
             </slist>
 
 
-            <p role="xquery">The <termref def="dt-namespace-binding">namespace bindings</termref> for <code>p</code> and <code>q</code> 
+            <p>The <termref def="dt-namespace-binding">namespace bindings</termref> for <code>p</code> and <code>q</code> 
                are added to the result element because their respective namespaces
 are used in the names of the element and its attributes. The namespace binding <code>r="http://example.com/ns/r"</code> is added to the in-scope namespaces of the constructed
 element because it is defined by a <termref
                   def="dt-namespace-decl-attr"
                >namespace declaration attribute</termref>, even though it is not used in a name.</p>
 
-            <p role="xquery">No <termref def="dt-namespace-binding"/> corresponding to <code>f="http://example.com/ns/f"</code> is created, 
+            <p>No <termref def="dt-namespace-binding"/> corresponding to <code>f="http://example.com/ns/f"</code> is created, 
                because the namespace prefix <code>f</code> appears only in the query prolog and is not used in an element 
                or attribute name of the constructed node. This namespace binding does not appear in the query result, 
                even though it is present in the <termref def="dt-static-namespaces"/> and is available for use 
                during processing of the query.</p>
 
             <p role="xquery">Note that the following constructed element, if nested within a <code>validate</code> expression, cannot be validated:
 </p>
-            <eg role="xquery parse-test">&lt;p xsi:type="xs:integer"&gt;3&lt;/p&gt;</eg>
+            <eg role="xquery">&lt;p xsi:type="xs:integer"&gt;3&lt;/p&gt;</eg>
 
             <p role="xquery">The constructed element will have <termref def="dt-namespace-binding">namespace bindings</termref> 
                for the prefixes <code>xsi</code> 
@@ -18426,7 +18437,7 @@ element because it is defined by a <termref
                   def="dt-namespace-decl-attr"
                >namespace declaration attribute</termref>, as in the following example:</p>
 
-            <eg role="xquery parse-test">&lt;p xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:integer"&gt;3&lt;/p&gt;</eg>
+            <eg role="xquery">&lt;p xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:integer"&gt;3&lt;/p&gt;</eg>
          </div3>
       </div2>