Merge pull request #1152 from michaelhkay/1146-change-log

1146 Inline change log
qt4cg · Apr 16, 2024 · 26f2963 · 26f2963
2 parents 42eaf1f + e0fd6b4
commit 26f2963
Show file tree

Hide file tree

Showing 10 changed files with 469 additions and 1,304 deletions.
diff --git a/schema/xmlspec.dtd b/schema/xmlspec.dtd
@@ -398,6 +398,18 @@
 <!ATTLIST head %common.att;>
 ]]>
 
+<!--   changes: Optional list of changes after head of each section -->
+<!ELEMENT changes (change)*>
+<!ATTLIST changes %common.att;>
+<!ELEMENT change (%p.pcd.mix;)*>
+<!ATTLIST change 
+        %role.att;
+        PR      CDATA  #IMPLIED
+        issue   CDATA  #IMPLIED
+        date    CDATA  #IMPLIED
+>
+
+
 <!-- ............................................................... -->
 <!-- Major specification structure ................................. -->
 <!-- ............................................................... -->
@@ -407,6 +419,7 @@
 #1999-07-02: maler: Added doctype atts and status att.
 #2000-03-07: maler: Added cr, issues, and dispcmts to w3c-doctype.
 #2011-01-20: Jim Melton: Added per and wgnote to w3c-doctype.
+#2024-04-13: Michael Kay: Added optional changes element after head.
 -->
 
 <!ENTITY % spec.element "INCLUDE">
@@ -481,7 +494,7 @@
 
 <!ENTITY % div1.element "INCLUDE">
 <![%div1.element;[
-<!ELEMENT div1 (head, (%div.mix;)*, div2*)>
+<!ELEMENT div1 (head, changes?, (%div.mix;)*, div2*)>
 ]]>
 <!ENTITY % div1.attlist "INCLUDE">
 <![%div1.attlist;[
@@ -496,7 +509,7 @@
 <!--    inform-div1: Non-normative division in back matter -->
 <!ENTITY % inform-div1.element "INCLUDE">
 <![%inform-div1.element;[
-<!ELEMENT inform-div1 (head, (%div.mix;)*, div2*)>
+<!ELEMENT inform-div1 (head, changes?, (%div.mix;)*, div2*)>
 ]]>
 <!ENTITY % inform-div1.attlist "INCLUDE">
 <![%inform-div1.attlist;[
@@ -505,7 +518,7 @@
 
 <!ENTITY % div2.element "INCLUDE">
 <![%div2.element;[
-<!ELEMENT div2 (head, (%div.mix;)*, div3*)>
+<!ELEMENT div2 (head, changes?, (%div.mix;)*, div3*)>
 ]]>
 <!ENTITY % div2.attlist "INCLUDE">
 <![%div2.attlist;[
@@ -514,7 +527,7 @@
 
 <!ENTITY % div3.element "INCLUDE">
 <![%div3.element;[
-<!ELEMENT div3 (head, (%div.mix;)*, div4*)>
+<!ELEMENT div3 (head, changes?, (%div.mix;)*, div4*)>
 ]]>
 <!ENTITY % div3.attlist "INCLUDE">
 <![%div3.attlist;[
@@ -523,7 +536,7 @@
 
 <!ENTITY % div4.element "INCLUDE">
 <![%div4.element;[
-<!ELEMENT div4 (head, (%div.mix;)*, div5*)>
+<!ELEMENT div4 (head, changes?, (%div.mix;)*, div5*)>
 ]]>
 <!ENTITY % div4.attlist "INCLUDE">
 <![%div4.attlist;[
@@ -532,7 +545,7 @@
 
 <!ENTITY % div5.element "INCLUDE">
 <![%div5.element;[
-<!ELEMENT div5 (head, (%div.mix;)*)>
+<!ELEMENT div5 (head, changes?, (%div.mix;)*)>
 ]]>
 <!ENTITY % div5.attlist "INCLUDE">
 <![%div5.attlist;[

diff --git a/specifications/css/qtspecs.css b/specifications/css/qtspecs.css
@@ -207,6 +207,20 @@ th.issue-toc-head { border-bottom-color: black;
                     border-bottom-width: 1pt;
 }
 
+div.changes { border-bottom-color: blue;
+              border-bottom-style: solid;
+	           border-bottom-width: 4pt;
+	           border-top-color: blue;
+              border-top-style: solid;
+	           border-top-width: 4pt;
+	           margin-bottom: 20pt;
+	           color: blue;
+}
+
+p.changesHeading { font-weight: bold; color: blue}
+
+span.tocDelta { font-weight: bold; color: blue}
+
 /* ============================================================ */
 
 :root {

diff --git a/specifications/xpath-datamodel-40/src/changelog.xml b/specifications/xpath-datamodel-40/src/changelog.xml
@@ -1,10 +1,12 @@
 <inform-div1 id="ChangeLog" diff="chg" at="2022-11-05">
 <head>Change Log</head>
 
-<p>The following changes have been made to this document since the
+<p>The following substantive changes have been made to this document since the
    <loc href="https://www.w3.org/TR/xpath-datamodel-31/">XPath and XQuery Data Model 3.1 Recommendation of 21 March 2017</loc>.</p>
 
-<div2 id="ChangeLog-Substantive">
+<?change-log?>
+
+<!--<div2 id="ChangeLog-Substantive">
 <head>Substantive changes</head>
 
 <p>No substantive changes have been made.</p>
@@ -28,7 +30,7 @@ the specification.</p>
 
 </ulist>
 
-</div2>
+</div2>-->
 
 </inform-div1>
 
diff --git a/specifications/xpath-datamodel-40/src/xpath-datamodel.xml b/specifications/xpath-datamodel-40/src/xpath-datamodel.xml
@@ -221,6 +221,10 @@ work by the <bibref ref="XSLWG"/> and the <bibref ref="XQWG"/>.</p>
 
 <div1 id="intro">
 <head>Introduction</head>
+  <changes>
+    <change>Use the arrows to browse significant changes since the 3.1 version of this specification.</change>
+    <change>Sections with significant changes are marked Δ in the table of contents.</change>
+  </changes>
 
 <p>This document defines the &language;,
 which is the data model of <bibref ref="xpath-40"/>, <bibref ref="xslt-40"/>, and
@@ -353,6 +357,11 @@ examples as <termref def="dt-instance">instances of the data model</termref>.
 </div2>
   <div2 id="basic-concepts">
     <head>Basic Concepts</head>
+    <changes>
+      <change issue="225" PR="232" date="2022-11-05">
+        Clarified the terminology concerning atomic types and type annotations.
+      </change>
+    </changes>
 
 <p><termdef id="dt-instance" term="instance of the data model">Every
 <term>instance of the data model</term> is a
@@ -955,6 +964,7 @@ size and scope of the processing context.</p>
 
 <div3 id="types-predefined" diff="chg" at="2023-09-28">
 <head>Predefined Types</head>
+
 
   <p>The three atomic types <code>xs:anyAtomicType</code>,
     <code>xs:dayTimeDuration</code>, and
@@ -1006,6 +1016,12 @@ size and scope of the processing context.</p>
 
 <div3 id="xml-and-xsd-versions">
 <head>XML and XSD Versions</head>
+
+  <changes>
+    <change issue="414" PR="546" date="2023-07-25">
+      Relaxed the rules regarding use of non-XML characters in instances of <code>xs:string</code>.
+    </change>
+  </changes>
 
 <p>Some of the types defined in XML Schema have differing definitions
 in XSD 1.0 and XSD 1.1; furthermore, some types are defined by
@@ -1245,6 +1261,11 @@ negative zero or to positive zero in the value space.</imp-def-feature>
 
 <div3 id="function-items">
 <head>Function Items</head>
+  <changes>
+    <change issue="520" PR="525" date="2023-05-30">
+      Introduced the concept of function identity.
+    </change>
+  </changes>
 
 <p>
 <termdef term="function item" id="dt-function-item">
@@ -1492,6 +1513,11 @@ For all positions greater than 0 and less than or equal to the array size,
 </div2>
   <div2 id="id-LabeledItems">
     <head>Labeled Items</head>
+    <changes>
+      <change issue="960" PR="988" date="2024-02-27">
+        Introduced the concept of labeled items.
+      </change>
+    </changes>
     <p><termdef id="dt-labeled-item" term="labeled item">A <term>labeled item</term>
     is a pair (<var>S</var>, <var>L</var>) where <var>S</var> (called the subject)
     is any item, and <var>L</var> (called the label) is a map containing supplementary

diff --git a/specifications/xslt-40/schema/xsltspec.dtd b/specifications/xslt-40/schema/xsltspec.dtd
@@ -49,8 +49,8 @@
 
 <!-- A 'change' element surrounds a sequence of paragraphs with common diff/at attributes -->
 
-<!ELEMENT change (%div.mix;)*>
-<!ATTLIST change %common.att;>
+<!--<!ELEMENT change (%div.mix;)*>
+<!ATTLIST change %common.att;>-->
 
 <!-- Allow a 'code' element to contain a 'var' element for italicised code -->