Skip to content

Commit

Permalink
Merge pull request #1178 from michaelhkay/1146b-inline-change-log-for…
Browse files Browse the repository at this point in the history
…-XP/XQ

1146 Add inline change markup in the XPath/XQuery spec
  • Loading branch information
ndw authored Apr 30, 2024
2 parents c583d83 + 3bfa719 commit dd2f7b5
Show file tree
Hide file tree
Showing 6 changed files with 394 additions and 8 deletions.
19 changes: 15 additions & 4 deletions specifications/xquery-40/src/back-matter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,15 @@

</div2>
<div2 id="mapping">
<head>Operator Mapping</head> <p>The operator mapping tables in this section list the
<head>Operator Mapping</head>

<changes>
<change>The operator mapping table has been simplified by removing entries for the operators <code>ne</code>,
<code>le</code>, <code>gt</code>, and <code>ge</code>; these are now defined by reference to the
rules for the operators <code>eq</code> and <code>lt</code>.</change>
</changes>

<p>The operator mapping tables in this section list the
combinations of types for which various operators of &language;
are defined. The operators covered by this appendix are the value comparison
operators <code>eq</code> and <code>lt</code>, and the arithmetic operators
Expand Down Expand Up @@ -1588,7 +1596,10 @@ See

<inform-div1 id="id-revision-log" diff="chg" at="2022-11-16">
<head>Change Log</head>


<?change-log?>
<!--
<p role="xquery">This appendix lists the changes that have been made to this
specification since the publication of the XQuery 3.1 Recommendation.</p>
Expand Down Expand Up @@ -1711,8 +1722,8 @@ specification since the publication of XPath 3.1 Recommendation.</p>
an array.</p></item>
</olist>
</div3>
<div3 id="id-editorial-changes-since-3.1">
<head>Editorial Changes</head>
Expand All @@ -1728,5 +1739,5 @@ specification since the publication of XPath 3.1 Recommendation.</p>
</olist>
</div3>
</div2>
</div2>-->
</inform-div1>
6 changes: 6 additions & 0 deletions specifications/xquery-40/src/conformance.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<div1 id="id-conformance">
<head>Conformance</head>

<changes>
<change issue="205" PR="326" date="2023-02-01">
Support for higher-order functions is now a mandatory feature (in 3.1 it was optional).
</change>
</changes>



Expand Down
6 changes: 6 additions & 0 deletions specifications/xquery-40/src/ebnf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,12 @@
</div2>
<div2 id="lexical-structure">
<head>Lexical structure</head>

<changes>
<change issue="327" PR="519" date="2023-05-30">
The rules for tokenization have been largely rewritten, without any intended change to the actual behavior.
</change>
</changes>
<p diff="del" at="2023-05-22">The terminal symbols assumed by the grammar above are described in this section.</p>
<p diff="del" at="2023-05-22">Quoted strings appearing in production rules are terminal symbols.</p>
<p diff="del" at="2023-05-22">Other terminal symbols are defined in <specref ref="terminal-symbols"/>.</p>
Expand Down
Loading

0 comments on commit dd2f7b5

Please sign in to comment.