diff --git a/specifications/xpath-functions-40/src/function-catalog.xml b/specifications/xpath-functions-40/src/function-catalog.xml
index 171236f78..0071e05b4 100644
--- a/specifications/xpath-functions-40/src/function-catalog.xml
+++ b/specifications/xpath-functions-40/src/function-catalog.xml
@@ -4577,9 +4577,9 @@ translate(value := '٢٠٢٣', replace := '٠١٢٣٤٥٦٧٨٩', with := '01234
          <p diff="chg" at="B">If <code>$x</code> is negative, then:</p>
          <ulist diff="chg" at="B">
             <item><p>If <code>$y</code> is positive, then the value of <code>atan2($y, $x)</code> is 
-               <code>atan($y div $x) + </code><var>π</var>.</p></item>
+               <code>atan($y div $x) + <var>π</var></code>.</p></item>
             <item><p>If <code>$y</code> is negative, then the value of <code>atan2($y, $x)</code> is 
-               <code>atan($y div $x) - </code><var>π</var>.</p></item>
+               <code>atan($y div $x) - <var>π</var></code>.</p></item>
          </ulist>
          <p>Some results for special values of the arguments are shown in the examples below.</p>
 
@@ -31393,16 +31393,16 @@ return every($dl/*, fn($elem, $pos) {
                at <loc href="https://html.spec.whatwg.org/multipage/named-characters.html">https://html.spec.whatwg.org/multipage/named-characters.html</loc>. The name is
                written with no leading ampersand and no trailing semicolon.
                For example <code>fn:char("pi")</code> represents the character
-               <code>π</code> (<code>x3C0</code>) and <code>fn:char("nbsp")</code> returns the
-               non-breaking space character, <code>xA0</code>.</p>
+               <char>U+03C0</char> and <code>fn:char("nbsp")</code> returns 
+               <char>U+00A0</char>.</p>
                <p>A processor <rfc2119>may</rfc2119> recognize additional character reference names defined in
                   other versions of HTML. Character reference names are case-sensitive.</p>
                <p>In the event that the HTML5 character reference name identifies a string
                comprising multiple codepoints, that string is returned.</p>
                <p>[TODO: add a proper bibliographic reference.]</p></item>
-            <item><p>A backslash-escape sequence from the set <code>\n</code> (newline, <code>x0A</code>), 
-               <code>\r</code> (carriage return, <code>x0D</code>),
-               or <code>\t</code> (tab, <code>x09</code>).</p></item>
+            <item><p>A backslash-escape sequence from the set <code>\n</code> (<char>U+000A</char>), 
+               <code>\r</code> (<char>U+000D</char>),
+               or <code>\t</code> (<char>U+0009</char>).</p></item>
             
             
          </olist>
@@ -33318,7 +33318,7 @@ path with an explicit <code>file:</code> scheme.</p>
            the map, then the path is constructed from the segments. To
            construct the path, the possibly encoded segments are
            concatentated together, separated by
-           <code>/</code> (solidus) characters.</p>
+           <char>U+002F</char> characters.</p>
 
            <p>The rules for encoding the path segments are different
            for hierarchical and non-hierarchical URIs. If the URI is
@@ -33326,11 +33326,11 @@ path with an explicit <code>file:</code> scheme.</p>
            encoding is performed on the segments. Otherwise,
            each segment is encoded by replacing any control characters (codepoints less than 0x20)
            and exclusively the following characters with their
-           percent-escaped forms: <code> </code> (space) <code>%</code> (percent
-           sign), <code>/</code> (solidus), <code>?</code> (question mark),
-           <code>#</code> (number sign), <code>+</code> (plus sign),
-           <code>[</code> (left square bracket), and <code>]</code> (right
-           square bracket). That is “<code>[#0-#20%/\?\#\+\[\]]</code>”.</p>
+           percent-escaped forms: <char>U+0020</char>, <char>U+0025</char>, 
+              <char>U+002F</char>, <char>U+003F</char>,
+           <char>U+0023</char>, <char>U+002B</char>,
+           <char>U+005B</char>, and <char>U+005D</char>. 
+              That is “<code>[#0-#20%/\?\#\+\[\]]</code>”.</p>
 
            <note>
               <p>Encoding is performed unless the URI is known to be non-hierarchical;
@@ -33339,7 +33339,7 @@ path with an explicit <code>file:</code> scheme.</p>
               <code>fn:parse-uri()</code>. (For example,
               <code>fn:parse-uri('a+b/c') => fn:build-uri()</code> will return 
               <code>a+b/c</code>.)</p>
-              <p>It’s necessary to avoid encoding non-hierarchical schemes because there is more
+              <p>It is necessary to avoid encoding non-hierarchical schemes because there is more
               variation in them (for example, the <code>tel:</code> scheme
               uses a “<code>+</code>” that must not be encoded). Users working with
               non-hierarchical schemes may need to address the encoding issue directly
@@ -33363,13 +33363,12 @@ path with an explicit <code>file:</code> scheme.</p>
         is encoded.
         The encoding performed replaces any control characters (codepoints less than 0x20)
         and exclusively the following characters with their
-        percent-escaped forms: <code> </code> (space) <code>%</code> (percent
-        sign), <code>=</code> (equals sign), <code>&amp;</code> (ampersand),
-        <code>#</code> (number sign), <code>+</code> (plus sign),
-        <code>[</code> (left square bracket), and <code>]</code> (right
-        square bracket). That is “<code>[#0-#20%=&amp;\#\+\[\]]</code>”.
-        (This differs from the path encoding in that it excludes <code>/</code>
-        and <code>?</code> but includes <code>=</code> and <code>&amp;</code>.)
+        percent-escaped forms: <char>U+0020</char>, <char>U+0025</char>, <char>U+003D</char>,
+        <char>U+0026</char>,
+        <char>U+0023</char>, <char>U+002B</char>,
+        <char>U+005B</char>, and <char>U+005D</char>. That is “<code>[#0-#20%=&amp;\#\+\[\]]</code>”.
+        (This differs from the path encoding in that it excludes <char>U+002F</char>
+        and <char>U+003F</char> but includes <char>U+003D</char> and <char>U+0026</char>.)
         For each <emph>key</emph> and each <emph>value</emph> associated with
         that key in turn:</p>
 
@@ -33377,7 +33376,7 @@ path with an explicit <code>file:</code> scheme.</p>
            <item><p>If the <emph>key</emph> is the empty string, the string constructed
            is the encoded <emph>value</emph>.</p></item>
            <item><p>Otherwise, the string constructed is the value of the
-           <emph>key</emph>, encoded, followed by an equal sign (<code>=</code>),
+           <emph>key</emph>, encoded, followed by an equal sign (<char>U+003D</char>),
            followed by the <emph>value</emph>, encoded.</p></item>
         </ulist>
 
@@ -33387,21 +33386,19 @@ path with an explicit <code>file:</code> scheme.</p>
         the <code>query</code> key does, then the query is the value of the
         <code>query</code> key.</p>
         <p>If there is a query, it is added to the URI with
-        a preceding <code>?</code> (question mark).</p>
+        a preceding <char>U+003F</char>.</p>
 
         <p>If the <code>fragment</code> key exists in the map, then
         the value of that key is encoded and added to the URI with a
-        preceding hash mark (<code>#</code>).
+        preceding <char>U+0023</char>.
 
         The encoding performed replaces any control characters (codepoints less than 0x20)
         and exclusively the following characters with their
-        percent-escaped forms: <code> </code> (space) <code>%</code> (percent
-        sign),
-        <code>#</code> (number sign), <code>+</code> (plus sign),
-        <code>[</code> (left square bracket), and <code>]</code> (right
-        square bracket). That is “<code>[#0-#20%\#\+\[\]]</code>”.
-        (This differs from the path encoding in that it excludes <code>/</code>
-        and <code>?</code>.)</p>
+        percent-escaped forms: <char>U+0020</char>, <char>U+0025</char>,
+        <char>U+0023</char>, <char>U+002B</char>,
+        <char>U+005B</char>, and <char>U+005D</char>. That is “<code>[#0-#20%\#\+\[\]]</code>”.
+        (This differs from the path encoding in that it excludes <char>U+002F</char>
+        and <char>U+003F</char>.)</p>
 
         <p>The resulting URI is returned.</p>
       </fos:rules>
diff --git a/specifications/xpath-functions-40/src/xpath-functions.xml b/specifications/xpath-functions-40/src/xpath-functions.xml
index 1e20deba4..82c7f8028 100644
--- a/specifications/xpath-functions-40/src/xpath-functions.xml
+++ b/specifications/xpath-functions-40/src/xpath-functions.xml
@@ -1173,7 +1173,7 @@ This includes all the built-in datatypes defined in <bibref ref="xmlschema-2"/>.
                   is not <termref def="dt-focus-dependent">focus-dependent</termref> is called
                   <term>focus-independent</term>.</termdef></p>
 
-               <notes>
+           
                <note diff="add" at="2023-03-12">
                   <p>Some functions depend on aspects of the dynamic context that remain invariant
                   within an <termref def="execution-scope"/>, such as the implicit timezone.
@@ -1199,7 +1199,6 @@ This includes all the built-in datatypes defined in <bibref ref="xmlschema-2"/>.
                   may be either <termref def="dt-focus-dependent">focus-dependent</termref> or
                      <termref def="dt-focus-independent">focus-independent</termref>.</p>
                </note>
-               </notes>
                
 
                
diff --git a/style/character-names.json b/style/character-names.json
index 9fa08abe2..03e9223c0 100644
--- a/style/character-names.json
+++ b/style/character-names.json
@@ -15,7 +15,9 @@
    "U+0022": "QUOTATION MARK",
    "U+0023": "NUMBER SIGN",
    "U+0025": "PERCENT SIGN",
+   "U+0026": "AMPERSAND",
    "U+0027": "APOSTROPHE",
+   "U+002B": "PLUS",
    "U+002C": "COMMA",
    "U+002D": "HYPHEN-MINUS",
    "U+002E": "FULL STOP, PERIOD",
@@ -31,7 +33,9 @@
    "U+003F": "QUESTION MARK",
    "U+0041": "LATIN CAPITAL LETTER A",
    "U+005A": "LATIN CAPITAL LETTER Z",
+   "U+005B": "LEFT SQUARE BRACKET",
    "U+005C": "REVERSE SOLIDUS, BACKSLASH",
+   "U+005D": "RIGHT SQUARE BRACKET",
    "U+0060": "GRAVE ACCENT, BACKTICK",
    "U+0061": "LATIN SMALL LETTER A",
    "U+0065": "LATIN SMALL LETTER E",
@@ -42,12 +46,14 @@
    "U+007F": "DELETE",
    "U+0085": "NEXT LINE, NEL",
    "U+009F": "APC",
+   "U+00A0": "NON-BREAKING SPACE, NBSP",
    "U+00E9": "LATIN SMALL LETTER E WITH ACUTE",
    "U+0130": "LATIN CAPITAL LETTER I WITH DOT ABOVE",
    "U+0131": "LATIN SMALL LETTER DOTLESS I",
    "U+0308": "COMBINING DIAERESIS",
    "U+0338": "COMBINING LONG SOLIDUS OVERLAY",
    "U+03A3": "GREEK CAPITAL LETTER SIGMA",
+   "U+03C0": "GREEK SMALL LETTER PI",
    "U+03C2": "GREEK SMALL LETTER FINAL SIGMA",
    "U+03C3": "GREEK SMALL LETTER SIGMA",
    "U+03C4": "GREEK SMALL LETTER TAU",