Merge pull request w3c#13 from ndw/cleanup

Cleanup some build errors
rhdunn · Dec 4, 2020 · c4ee248 · c4ee248
2 parents e1abf7b + a33ba2d
commit c4ee248
Show file tree

Hide file tree

Showing 14 changed files with 7,613 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,5 @@
 /specifications/xpath-functions-40/html/
 /specifications/xquery-40/build/
 /specifications/xquery-40/html/
+/specifications/xslt-xquery-serialization-31/html/
+/specifications/xslt-xquery-serialization-31/build/
diff --git a/specifications/xpath-functions-40/style/ns-xpath-functions.xsl b/specifications/xpath-functions-40/style/ns-xpath-functions.xsl
@@ -20,8 +20,8 @@
 
   <xsl:variable name="fando" select="document('xpath-functions-expanded.xml',.)"/>
   <xsl:variable name="fando-functions" select="document('function-catalog.xml',.)"/>
-  <xsl:variable name="xslt" select="document('../../xslt-30/src/xslt.xml',.)"/>
-  <xsl:variable name="xslt-functions" select="document('../../xslt-30/src/function-catalog.xml',.)"/>
+  <xsl:variable name="xslt" select="document('../../xslt-40/src/xslt.xml',.)"/>
+  <xsl:variable name="xslt-functions" select="document('../../xslt-40/src/function-catalog.xml',.)"/>
   <xsl:variable name="protos"
     select="$fando//proto[not(@role)
 				                  or @role != 'example']"/>

diff --git a/specifications/xslt-40/build.xml b/specifications/xslt-40/build.xml
@@ -142,7 +142,7 @@
       out="${merged-spec0.xml}" 
       style="${merge.functions.style}" 
       force="yes" 
-      classpathref="saxon9.classpath">
+      classpathref="saxon10he.classpath">
       <param name="function-catalog" expression="../src/function-catalog.xml"/>
     </xslt>
 

diff --git a/specifications/xslt-xquery-serialization-31/build.xml b/specifications/xslt-xquery-serialization-31/build.xml
diff --git a/specifications/xslt-xquery-serialization-31/src/bibl.xml b/specifications/xslt-xquery-serialization-31/src/bibl.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<div1 id="references">
+<head>References</head>
+<div2 id="normative-references">
+<head>Normative References</head>
+<blist>
+
+<bibl id="charmod-norm"
+      key="Character Model for the World Wide Web 1.0: Normalization"/>
+
+<!--* <bibl id="xpath-datamodel-30" key="XQuery and XPath Data Model (XDM) 3.0"/> *-->
+<bibl id="xpath-datamodel-31" key="XQuery and XPath Data Model (XDM) 3.1"/>
+
+<!--* <bibl id="xpath-functions-30"
+      key="XQuery and XPath Functions and Operators 3.0"/> *-->
+
+<bibl id="xpath-functions-31"
+      key="XQuery and XPath Functions and Operators 3.1"/>
+
+<bibl id="html5" key="HTML5"/>
+
+<bibl id="html401" key="HTML"/>
+
+<bibl id="html-polyglot" key="POLYGLOT"/>
+
+<bibl id="IANA" key="IANA"/>
+
+<bibl id="RFC2046" key="RFC2046"/>
+
+<bibl id="RFC2119" key="RFC2119"/>
+
+<bibl id="RFC2978" key="RFC2978"/>
+
+<bibl id="RFC2854" key="RFC2854"/>
+
+<!-- bibl id="RFC2376" key="RFC2376">E. Whitehead, M. Murata.  <emph>XML
+Media Types</emph>. IETF RFC 2376.
+See <loc href="http://www.ietf.org/rfc/rfc2376.txt"/>.</bibl -->
+
+<!-- bibl id="RFC2396" key="RFC2396">T. Berners-Lee, R. Fielding, and
+L. Masinter.  <emph>Uniform Resource Identifiers (URI): Generic
+Syntax</emph>. IETF RFC 2396.
+See <loc href="http://www.ietf.org/rfc/rfc2396.txt"/>.</bibl -->
+
+<!-- bibl id="RFC3023" key="RFC3023">M. Murata, S. St.Laurent, D. Kohn.  <emph>XML
+Media Types</emph>. IETF RFC 3023.
+See <loc href="http://www.ietf.org/rfc/rfc3023.txt"/>.</bibl -->
+
+<bibl id="RFC3236" key="RFC3236"/>
+
+<bibl id="UNICODE-ENCODING" key="Unicode Encoding">
+<titleref href="http://www.unicode.org/reports/tr17/">Unicode
+Character Encoding Model</titleref>,
+Unicode Consortium.
+Unicode Standard Annex #17.
+</bibl>
+
+<bibl id="UNICODE-NORMALIZATION-FORM"
+      key="UAX #15: Unicode Normalization Forms">
+<titleref href="http://www.unicode.org/reports/tr15/">Unicode
+Normalization Forms</titleref>,
+Unicode Consortium.
+Unicode Standard Annex #15.
+</bibl>
+
+<bibl id="xhtml1" key="XHTML 1.0"/>
+
+<bibl id="xhtml11" key="XHTML 1.1"/>
+
+<bibl id="xml" key="XML10"/>
+
+<bibl id="xml11" key="XML11"/>
+
+<bibl id="xml-names" key="XML Names"/>
+
+<bibl id="xml-names11" key="XML Names 1.1"/>
+
+<bibl id="xmlschema-1" key="XML Schema"/>
+
+<!--* <bibl id="xpath-30" key="XML Path Language (XPath) 3.0"/> *-->
+<bibl id="xpath-31" key="XML Path Language (XPath) 3.1"/>
+
+<!--* <bibl id="xquery-30" key="XQuery 3.0: An XML Query Language"/> *-->
+<bibl id="xquery-31" key="XQuery 3.1: An XML Query Language"/>
+
+<bibl id="xslt-30" key="XSL Transformations (XSLT) Version 3.0"/>
+
+<bibl id="xx-ECMA-404" key="The JSON Data Interchange Format" diff="del" at="2014-09-22">
+<titleref href="http://www.ecma-international.org/publications/standards/Ecma-404.htm">The JSON Data Interchange Format</titleref>,
+ECMA International.
+</bibl>
+
+<bibl id="rfc7159" key="RFC 7159">IETF. 
+<emph>RFC 7159: The Javascript Object Notation (JSON) Data Interchange Format</emph
+><phrase diff="add" at="2014-09-22">,
+T. Bray, Editor.
+Internet Engineering Task Force, March 2014.</phrase>
+Available at:
+<loc href="http://www.rfc-editor.org/rfc/rfc7159.txt">http://www.rfc-editor.org/rfc/rfc7159.txt</loc>
+</bibl>
+
+
+</blist>
+</div2>
+
+<div2 id="informative-references">
+<head>Informative References</head>
+<blist>
+
+<bibl id="ECMA-404" key="The JSON Data Interchange Format" diff="add" at="2014-09-22">
+<titleref href="http://www.ecma-international.org/publications/standards/Ecma-404.htm"
+>The JSON Data Interchange Format</titleref>,
+ECMA International.
+</bibl>
+
+<!-- Added in response to qt-2004Feb0362-16 -->
+<bibl id="xhtml-modularization" key="XHTML Modularization"/>
+
+<!-- bibl id="xhtml-media-types" key="XHTML Media Types W3C Note 1 August 2002">
+  World Wide Web Consortium,
+  <emph>XHTML Media Types W3C Note 1 August 2002</emph>
+  See <loc href="http://www.w3.org/TR/xhtml-media-types/">http://www.w3.org/TR/xhtml-media-types/</loc>.</bibl -->
+
+<bibl id="xpath-datamodel" key="XQuery 1.0 and XPath 2.0 Data Model"/>
+
+   <bibl id="serialization-10-2ed" key="XSLT 2.0 and XQuery 1.0 Serialization (Second Edition)">
+      <titleref href="http://www.w3.org/TR/2010/REC-xslt-xquery-serialization-20101214/"
+		>XSLT 2.0 and XQuery 1.0 Serialization (Second Edition), W3C Recommendation</titleref>, 
+   Henry Zongaro, Norman Walsh, Joanne Tong, <emph>et. al.</emph>, Editors. 
+   World Wide Web Consortium, 14&#xA0; December&#xA0; 2010. 
+   This version is http://www.w3.org/TR/2010/REC-xslt-xquery-serialization-20101214/</bibl>
+
+   <bibl id="serialization-31-fpwd" key="XSLT and XQuery Serialization 3.1 (First Public Working Draft)">
+     <titleref href="http://www.w3.org/TR/2014/WD-xslt-xquery-serialization-31-20140424/">XSLT and XQuery 
+     Serialization, W3C First Public Working Draft</titleref>, 
+     Andrew Coleman, C.&#xA0;M.&#xA0;Sperberg-McQueen, <emph>et. al.</emph>, Editors. 
+   World Wide Web Consortium, 24&#xA0;April&#xA0;2014.</bibl>
+</blist>
+</div2>
+</div1>
diff --git a/specifications/xslt-xquery-serialization-31/src/changes.txt b/specifications/xslt-xquery-serialization-31/src/changes.txt
@@ -0,0 +1,177 @@
+CHANGES.TXT for Serialization 3.0
+
+Items below are not yet incorporated into the editor's drafts unless
+they are marked with 'DONE'. Once completed items have been entered
+into the revision log, they are deleted from this document.
+
+* Backlog
+
+Action items
+------------
+
+** DONE Action A-423-03
+   on all editors of x.1 specs to add list of incompatibilities and major 
+   differences between x.0 and x.1 versions.
+
+   Applied in Serialization Internal Working Draft of 23 March 2010
+
+
+** DONE Action A-439-01
+   Henry to write a full proposal for the serialization option file format
+   and its use from the query prolog. 
+
+** DONE Action A-443-04
+   HZongaro will take all the feedback re output declarations and produce
+   a revised proposal.
+
+
+** DONE Unnumbered action item from July 2010 F2F
+   Henry to fix problems with the schema and add examples that
+   parse against the schema. Henry to change 'ser' prefix to 'output'
+
+** DONE ACTION A-452-01: All editors to review the use of the word "legal"
+      and to replace "legal" with valid, conformant, well-formed, must, "it
+      is an error if...", or any other appropriate term.
+
+
+Serialization 3.0 bugs and enhancements
+---------------------------------------
+
+
+** DONE Bugzilla Bug 14751:  Copy-paste errors in serialization-parameters schema
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=14751
+    Proposal:  15 November 2011
+    Applied editorially in Serialization Internal Working Draft of
+        15 November 2011
+
+
+** DONE Bugzilla Bug 13688:  [Ser30] Incorrect regexp for output:encoding in xslt-xquery-serialization.xsd
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=13688
+    Accepted at joint XQuery/XSLT WG call of 20 September 2011
+    Applied change requested 20 September 2011
+
+
+** DONE Bugzilla Bug 12852:  [SER30] Error in serialization parmeters schema
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=12852
+    Marked editorial:  27 July 2011
+    Applied change requested 27 July 2011
+
+
+** DONE Bugzilla Bug 6535:  Add new serialization option suppress-indentation
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=6535
+    Applied in internal working draft of 04 January 2010
+
+
+** TODO   Bugzilla bug 9302:  How are output declarations processed?
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=9302
+    Proposal:  24 June 2010 <http://lists.w3.org/Archives/Member/w3c-xsl-query/2010Jun/0151.html> and subsequent discussion
+    Revised:  14 July 2010 <http://lists.w3.org/Archives/Member/w3c-xsl-query/2010Jul/0159.html> and subsequent discussion
+    Accepted by XQuery WG at July 2010 F2F, with corrections to schema as described in minutes <http://lists.w3.org/Archives/Member/w3c-xsl-query/2010Jul/0174.html>, plus examples and change "ser" prefix to "output".
+    Applied changes 20 July 2010
+
+    Dependencies:  Need ratification by XSL WG?
+
+
+** DONE Bugzilla Bug 9433:  [SER11] Invalid reference to XSLT 2.1
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=9433
+    Need to update cross-document links to XSLT 2.1
+
+
+** DONE Bugzilla Bug 6808:  Whitespacing rules are too restrictive for the
+       indent parameter
+
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=6808
+    Proposal:  01 February 2010
+    Accepted at joint XQuery/XSL call of 02 February 2010
+    Applied in internal working draft of 23 March 2010
+    Changes requested at XSL WG call of 03 June 2010
+    Proposal:  23 June 2010
+    Accepted at XSL WG call of 24 June 2010
+    Applied in Serialization Internal Last Call Working Draft of 28 June 2010
+    Accepted at XQuery WG call of 29 June 2010
+
+
+
+Serialization 1.0 bug fixes to be applied to 3.0
+------------------------------------------------
+
+** DONE Bugzilla Bug 10176:  What does it mean to output an XML island as XML?
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=10176
+    Proposal:  27 July 2011
+    Revised:  27 July 2011
+    Accepted at joint XQuery/XSL call of 20 September 2011, with direction to
+      avoid using the word "might."
+    Applied in Serialization Internal Working Draft of 15 November 2011
+
+** DONE Bugzilla Bug 11590:  Wrong error description for err:SEPM0010: "xhtml" is missing
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=11590
+    Proposal:  04 January 2011
+    Accepted at joint XQuery/XSL call of 24 May 2011
+    Applied in Serialization Internal Working Draft of 26 May 2011
+
+** DONE Bugzilla Bug 7823:  [SER] Description of escaping rules for script and style elements in HTML mode not clear
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=7823
+    Proposal:  05 April 2010
+    Accepted at joint XQuery/XSL call of 06 April 2010
+    Accepted at XSL call of 3 June 2010
+    Applied in Serialization Internal Last Call Working Draft of 28 June 2010
+
+
+** DONE Bugzilla Bug 8651:  What does it mean to compare without consideration
+       of case?
+
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=8651
+    Proposal:  05 January 2010
+    Accepted at joint XQuery/XSL call of 13 January 2010
+    Accepted at XSL call of 3 June 2010
+    Applied in Serialization Internal Last Call Working Draft of 28 June 2010
+
+
+** DONE Bugzilla Bug 8206:  
+
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=8206
+    Marked as editorial
+    Applied in Serialization Internal Last Call Working Draft of 28 June 2010
+
+
+** DONE Bugzilla Bug 7829:  Serialization of minimized attributes. 
+
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=7829
+    Proposal:  26 November 2009
+    Accepted at joint XQuery/XSL call of 01 December 2009
+    Ratified at XSL WG call of 03 December 2009
+    Applied in Serialization Internal Last Call Working Draft of 28 June 2010
+
+
+** DONE Bugzilla Bug 8245:  Error for characters that are not permitted in HTML omits some control characters
+
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=8245
+    Proposal:  09 November 2009
+    Proposal:  12 November 2009
+    Discussed:  12 November 2009
+    Proposal:  26 November 2009
+    Accepted at joint XQuery/XSL call of 01 December 2009
+    Ratified at XSL WG call of 03 December 2009
+    Applied in Serialization Internal Last Call Working Draft of 28 June 2010
+
+
+** DONE Bugzilla Bug 6723:  No rule about empty <p> elements in HTML
+       serialization
+
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=6723
+    Proposal:  20 August 2009
+    Accepted at joint XQuery/XSL call of 25 August 2009
+    Ratified at XSL WG call of 12 November 2009
+    Applied in Serialization Public Working Draft of 15 December 2009
+
+
+** DONE Bugzilla Bug 6732:  Make clear for which values of version parameter
+       the serialization recommendation provides normative definitions
+
+    http://www.w3.org/Bugs/Public/show_bug.cgi?id=6732
+    Proposal:  24 March 2009
+    Accepted at joint XQuery/XSL call of 14 April 2009
+    Ratified at XSL WG call of 30 April 2009
+    Applied in Serialization Public Working Draft of 15 December 2009
+
+