From ce8b6b74cc9ee98deab9d161a19b4d50a5c7eea5 Mon Sep 17 00:00:00 2001
From: Daniel Hannon <hello111f@gmail.com>
Date: Sun, 14 Jun 2026 20:31:42 +0100
Subject: [PATCH 1/2] P3658R1 Adjust identifier following new Unicode
 recommendations

---
 source/lex.tex   |  4 ++--
 source/uax31.tex | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/source/lex.tex b/source/lex.tex
index bfd55be51d..6922a30a92 100644
--- a/source/lex.tex
+++ b/source/lex.tex
@@ -901,14 +901,14 @@
 \begin{bnf}
 \nontermdef{identifier-start}\br
     nondigit\br
-    \textnormal{an element of the translation character set with the Unicode property XID_Start}
+    \textnormal{an element of the translation character set with the Unicode property XID_Start or the Unicode property ID_Compat_Math_Start}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{identifier-continue}\br
     digit\br
     nondigit\br
-    \textnormal{an element of the translation character set with the Unicode property XID_Continue}
+    \textnormal{an element of the translation character set with the Unicode property XID_Continue or the Unicode property ID_Compat_Math_Continue}
 \end{bnf}
 
 \begin{bnf}
diff --git a/source/uax31.tex b/source/uax31.tex
index 79f0f7d0e9..9755f97cb7 100644
--- a/source/uax31.tex
+++ b/source/uax31.tex
@@ -30,16 +30,17 @@
 \end{outputblock}
 where \tcode{<Start>} has the XID_Start property,
 \tcode{<Continue>} has the XID_Continue property, and
-\tcode{<Medial>} is a list of characters permitted between continue characters.
+\tcode{<Medial>} is a list of characters permitted between continue characters. \UAX{31}
+also specifies some standard profiles, including the Mathematical Compatability Notation
+profile.
 For \Cpp{} we add the character \unicode{005f}{low line}, or \tcode{_},
-to the set of permitted \tcode{<Start>} characters,
-the \tcode{<Medial>} set is empty, and
-the \tcode{<Continue>} characters are unmodified.
+to the set of permitted \tcode{<Start>} characters.
+The \tcode{<Medial>} set is empty.
 In the grammar used in \UAX{31}, this is
 \begin{outputblock}
 <Identifier> := <Start> <Continue>*
-<Start> := XID_Start + @\textrm{\ucode{005f}}@
-<Continue> := <Start> + XID_Continue
+<Start> := XID_Start + ID_Compat_Math_Start + @\textrm{\ucode{005f}}@
+<Continue> := <Start> + XID_Continue + ID_Compat_Math_Continue
 \end{outputblock}
 
 \pnum

From 4ea8f319c041bf1dd5c99924d307be7c868cacf0 Mon Sep 17 00:00:00 2001
From: Daniel Hannon <hello111f@gmail.com>
Date: Mon, 15 Jun 2026 22:22:26 +0100
Subject: [PATCH 2/2] fixup: Reflow lines in latex document

---
 source/lex.tex   | 6 ++++--
 source/uax31.tex | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/source/lex.tex b/source/lex.tex
index 6922a30a92..3f579a351b 100644
--- a/source/lex.tex
+++ b/source/lex.tex
@@ -901,14 +901,16 @@
 \begin{bnf}
 \nontermdef{identifier-start}\br
     nondigit\br
-    \textnormal{an element of the translation character set with the Unicode property XID_Start or the Unicode property ID_Compat_Math_Start}
+    \textnormal%
+	{an element of the translation character set with the Unicode property XID_Start or the Unicode property ID_Compat_Math_Start}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{identifier-continue}\br
     digit\br
     nondigit\br
-    \textnormal{an element of the translation character set with the Unicode property XID_Continue or the Unicode property ID_Compat_Math_Continue}
+    \textnormal%
+	{an element of the translation character set with the Unicode property XID_Continue or the Unicode property ID_Compat_Math_Continue}
 \end{bnf}
 
 \begin{bnf}
diff --git a/source/uax31.tex b/source/uax31.tex
index 9755f97cb7..6a13e10464 100644
--- a/source/uax31.tex
+++ b/source/uax31.tex
@@ -30,10 +30,11 @@
 \end{outputblock}
 where \tcode{<Start>} has the XID_Start property,
 \tcode{<Continue>} has the XID_Continue property, and
-\tcode{<Medial>} is a list of characters permitted between continue characters. \UAX{31}
-also specifies some standard profiles, including the Mathematical Compatability Notation
-profile.
-For \Cpp{} we add the character \unicode{005f}{low line}, or \tcode{_},
+\tcode{<Medial>} is a list of characters permitted between continue characters.
+\UAX{31} also specifies some standard profiles,
+including the Mathematical Compatability Notation profile.
+For \Cpp{} we apply the Mathematical Compatability Notation profile,
+and we add the character \unicode{005f}{low line}, or \tcode{_},
 to the set of permitted \tcode{<Start>} characters.
 The \tcode{<Medial>} set is empty.
 In the grammar used in \UAX{31}, this is