From 024fa7407938be7f825b0518601eaa36d7057b3f Mon Sep 17 00:00:00 2001
From: Michael Kay <mike@saxonica.com>
Date: Tue, 26 Nov 2024 18:40:33 +0000
Subject: [PATCH] csv-to-xml returns document node

---
 .../src/function-catalog.xml                  | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/specifications/xpath-functions-40/src/function-catalog.xml b/specifications/xpath-functions-40/src/function-catalog.xml
index 19666dac7..506105993 100644
--- a/specifications/xpath-functions-40/src/function-catalog.xml
+++ b/specifications/xpath-functions-40/src/function-catalog.xml
@@ -26484,7 +26484,7 @@ return csv-to-arrays(
 
    <fos:function name="csv-to-xml" prefix="fn">
       <fos:signatures>
-         <fos:proto name="csv-to-xml" return-type="element(fn:csv)?">
+         <fos:proto name="csv-to-xml" return-type="document-node(fn:csv)?">
             <fos:arg name="value" type="xs:string?"/>
             <fos:arg name="options" type="map(*)?" usage="inspection" default="{}"/>
          </fos:proto>
@@ -26510,23 +26510,25 @@ return csv-to-arrays(
          
          <eg><![CDATA[let $parsedCSV := parse-csv($value, $options)
 let $colNames := $parsedCSV?columns
-return <csv xmlns="http://www.w3.org/2005/xpath-functions"> {
-  if (exists($colNames)) {
-    <columns>{ $colNames ! <column>{ . }</column> }</columns>
-  },
-  <rows>{
-    for $row in $parsedCSV?rows
-    return <row>{
-      for member $field at $col in $row
-      return <field>{
-        if ($colnames[$col]) {
-          attribute column { $colnames[$col] }
-        },
-        $field
-      }</field>
-    }</row>
-  }</rows> 
-}</csv>]]></eg>
+return document {
+   <csv xmlns="http://www.w3.org/2005/xpath-functions"> {
+     if (exists($colNames)) {
+       <columns>{ $colNames ! <column>{ . }</column> }</columns>
+     },
+     <rows>{
+       for $row in $parsedCSV?rows
+       return <row>{
+         for member $field at $col in $row
+         return <field>{
+           if ($colnames[$col]) {
+             attribute column { $colnames[$col] }
+           },
+           $field
+         }</field>
+       }</row>
+     }</rows> 
+   }</csv> 
+}]]></eg>
          
          <p>The namespace prefix used in the names of elements (or its absence) is 
             <termref def="implementation-dependent"/>.</p>
@@ -26539,7 +26541,7 @@ return <csv xmlns="http://www.w3.org/2005/xpath-functions"> {
          <p>The base URI of the element nodes in the result is <termref
             def="implementation-dependent"/>.</p>
          
-         <p>A schema is defined for the structure of the returned element: see <specref
+         <p>A schema is defined for the structure of the returned document: see <specref
             ref="schema-for-csv"/>.</p>
          
          <p>The result of the function will always be such that validation against this schema would succeed.
@@ -26548,7 +26550,6 @@ return <csv xmlns="http://www.w3.org/2005/xpath-functions"> {
             that is, whether the elements and attributes in the returned tree have type annotations that reflect
             the result of validating against this schema.</p>
          
-         <p>The returned element node has no parent node.</p>
          
  
       </fos:rules>
@@ -26833,7 +26834,7 @@ return <csv xmlns="http://www.w3.org/2005/xpath-functions"> {
          </fos:example>
       </fos:examples>
       <fos:changes>
-         <fos:change PR="533 719 834 1066" issue="413 1052"><p>New in 4.0</p></fos:change>
+         <fos:change PR="533 719 834 1066 1605" issue="413 1052"><p>New in 4.0</p></fos:change>
       </fos:changes>
    </fos:function>