texlive[74590] Master/texmf-dist: datatool-english (12mar25)

commits+karl at tug.org commits+karl at tug.org
Wed Mar 12 20:33:54 CET 2025


Revision: 74590
          https://tug.org/svn/texlive?view=revision&revision=74590
Author:   karl
Date:     2025-03-12 20:33:53 +0100 (Wed, 12 Mar 2025)
Log Message:
-----------
datatool-english (12mar25)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/datatool-english/README.md
    trunk/Master/texmf-dist/doc/latex/datatool-english/datatool-english.pdf
    trunk/Master/texmf-dist/source/latex/datatool-english/datatool-english.dtx
    trunk/Master/texmf-dist/source/latex/datatool-english/datatool-english.ins
    trunk/Master/texmf-dist/tex/latex/datatool-english/databib-english.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Latn-utf8.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Latn.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Runr-utf8.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Runr.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-anglosaxon.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-en-CA.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-en-ZA.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-ascii.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-latin1.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-utf8.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english.ldf
    trunk/Master/texmf-dist/tex/latex/datatool-english/person-english.ldf

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/datatool-english/CHANGES

Added: trunk/Master/texmf-dist/doc/latex/datatool-english/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/datatool-english/CHANGES	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/datatool-english/CHANGES	2025-03-12 19:33:53 UTC (rev 74590)
@@ -0,0 +1,10 @@
+1.1 (pending):
+
+ * Only change punctuation with "other" category code and don't
+   change math shift.
+
+ * Escape punctuation in regular expressions
+
+1.0 (2025-03-01):
+
+ * Initial release

Modified: trunk/Master/texmf-dist/doc/latex/datatool-english/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/datatool-english/README.md	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/doc/latex/datatool-english/README.md	2025-03-12 19:33:53 UTC (rev 74590)
@@ -1,6 +1,6 @@
 # English Language Module for datatool v3.0+ (datatool-english)
 
-Version 1.0 (2025-03-01)
+Version 1.1 (2025-03-12)
 
 Author: Nicola L. C. Talbot [dickimaw-books.com](https://www.dickimaw-books.com/)
 

Modified: trunk/Master/texmf-dist/doc/latex/datatool-english/datatool-english.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/datatool-english/datatool-english.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/datatool-english/datatool-english.dtx	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/source/latex/datatool-english/datatool-english.dtx	2025-03-12 19:33:53 UTC (rev 74590)
@@ -1,6 +1,7 @@
 %\iffalse
 % datatool-english.dtx generated using makedtx version 1.2 (c) Nicola Talbot
 % Command line args:
+%   -doc "datatool-english.tex"
 %   -src "(datatool-english\.ldf)\Z=>\1"
 %   -src "(datatool-english-.*\.ldf)\Z=>\1"
 %   -src "(datatool-en-.*\.ldf)\Z=>\1"
@@ -11,10 +12,9 @@
 %   -src "(datatool-ang-Latn-.*\.ldf)\Z=>\1"
 %   -src "(datatool-ang-Runr\.ldf)\Z=>\1"
 %   -src "(datatool-ang-Runr-.*\.ldf)\Z=>\1"
-%   -doc "datatool-english.tex"
 %   -author "Nicola Talbot"
 %   datatool-english
-% Created on 2025/3/2 22:14
+% Created on 2025/3/12 15:32
 %\fi
 %\iffalse
 %<*package>
@@ -61,7 +61,7 @@
 \newfontfamily\runefont{Noto Sans Runic}
 \NewDocumentCommand{\textrune}{m}{{\runefont #1}}
 
-\CheckSum{3245}
+\CheckSum{3379}
 
 \newcommand*{\sty}[1]{\textsf{#1}}
 \newcommand*{\file}[1]{\texorpdfstring{\nolinkurl{#1}}{#1}}
@@ -107,7 +107,7 @@
 
 \title{English and Old English Localisation Support for \sty{datatool} Package}
 \author{Nicola L. C. Talbot}
-\date{2025-03-01 version 1.0}
+\date{2025-03-12 version 1.1}
 
 \begin{document}
 \DocInput{datatool-english.dtx}
@@ -756,7 +756,7 @@
 % NB number group and decimal symbols and currencies should go in
 % region files.
 %    \begin{macrocode}
-\TrackLangProvidesResource{english}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 % Try loading \filemeta{datatool-english-}{encoding}{.ldf}
 %    \begin{macrocode}
@@ -1382,7 +1382,7 @@
 %\subsection{Root English US-ASCII LDF for \sty{datatool-base}
 %(\file{datatool-english-ascii.ldf})}
 %    \begin{macrocode}
-\TrackLangProvidesResource{english-ascii}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english-ascii}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 %Switch on \LaTeX3 syntax.
 %    \begin{macrocode}
@@ -1397,7 +1397,12 @@
 %prefixing them with straight double-quote. This ensures that they
 %will all be placed before any alphabetical characters.
 %    \begin{macrocode}
-  \regex_replace_all:nnN { ([[:punct:]]+) } { \cO"\1 } #1
+  \regex_replace_all:nnN
+%    \end{macrocode}
+%Version 1.1 added category code check.
+%    \begin{macrocode}
+    { \cO([[:punct:]]) } { \cO\" \1 }
+   #1
  }
 %    \end{macrocode}
 %Switch off \LaTeX3 syntax.
@@ -1417,7 +1422,7 @@
 %\subsection{Root English ISO 8859-1 LDF for \sty{datatool-base}
 %(\file{datatool-english-latin1.ldf})}
 %    \begin{macrocode}
-\TrackLangProvidesResource{english-latin1}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english-latin1}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 %Switch on \LaTeX3 syntax.
 %    \begin{macrocode}
@@ -1430,16 +1435,18 @@
   \regex_replace_case_all:nN
   {
     { [ \x{C0} - \x{C5} ] } { A }
-    { \x{C6} } { Ae }
+    { \x{C6} } { AE }
     { \x{C7} } { C }
     { [ \x{C8} - \x{CB} ] } { E }
     { [ \x{CC} - \x{CF} ] } { I }
-    { \x{D0} } { D }
     { \x{D1} } { N }
     { [ \x{D2} - \x{D6} \x{D8} ] } { O }
     { [ \x{D9} - \x{DC} ]} { U }
     { \x{DD} } { Y }
-    { \x{DE} } { Th }
+%    \end{macrocode}
+%Version 1.1: treat eth as thorn
+%    \begin{macrocode}
+    { \x{DE} | \x{D0} } { TH }
     { \x{DF} } { ss }
     { [ \x{E0} - \x{E5} ] } { a }
     { \x{E6} } { ae }
@@ -1446,23 +1453,28 @@
     { \x{E7} } { c }
     { [ \x{E8} - \x{EB} ] } { e }
     { [ \x{EC} - \x{EF} ] } { i }
-    { \x{F0} } { d }
     { \x{F1} } { n }
     { [ \x{F2} - \x{F6} \x{F8} ] } { o }
     { [ \x{F9} - \x{FC} ] } { u }
     { [ \x{FD} \x{FF} ] } { y }
-    { \x{FE} } { th }
 %    \end{macrocode}
+%Version 1.1: treat eth as thorn
+%    \begin{macrocode}
+    { \x{FE} | \x{F0} } { th }
+%    \end{macrocode}
 %Ensure currency symbols are grouped together by prefixing all 
-%currency symbols with \verb|$|.
+%currency symbols with \verb|$| but don't change math shift.
+%Version 1.1 added math shift check.
 %    \begin{macrocode}
-    { (\ur{l_datatool_currencysigns_regex}) } { \cO\x{24}\1 }
+    { \cM(.) } { \1 }
+    { (\ur{l_datatool_currencysigns_regex}) } { \cO\$ \1 }
 %    \end{macrocode}
 %Ensure punctuation characters are grouped together by
 %prefixing them with straight double-quote. This ensures that they
 %will all be placed before any alphabetical characters.
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-    { ([[:punct:]]+) } { \cO"\1 }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
 }
@@ -1484,7 +1496,7 @@
 %\subsection{Root English UTF-8 LDF for \sty{datatool-base}
 %\file{datatool-english-utf8.ldf}}
 %    \begin{macrocode}
-\TrackLangProvidesResource{english-utf8}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english-utf8}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 %Switch on \LaTeX3 syntax.
 %    \begin{macrocode}
@@ -1501,16 +1513,18 @@
   \regex_replace_case_all:nN
   {
     {À|Á|Â|Ã|Ä|Å} {A}
-    {Æ} {Ae}
+    {Æ} {AE}
     {Ç} {C}
     {È|É|Ê|Ë} {E}
     {Ì|Í|Î|Ï} {I}
-    {Ð} {D}
     {Ñ} {N}
     {Ò|Ó|Ô|Õ|Ö|Ø} {O}
     {Ù|Ú|Û|Ü} {U}
     {Ý} {Y}
-    {Þ} {Th}
+%    \end{macrocode}
+%Version 1.1: treat eth as thorn
+%    \begin{macrocode}
+    {Þ|Ð} {TH}
     {ß} {ss}
     {à|á|â|ã|ä|å} {a}
     {æ} {ae}
@@ -1517,26 +1531,30 @@
     {ç} {c}
     {è|é|ê|ë} {e}
     {ì|í|î|ï} {i}
-    {ð} {d}
     {ñ} {n}
     {ò|ó|ô|õ|ö|ø} {o}
     {ù|ú|û|ü} {u}
     {ý|ÿ} {y}
-    {þ} {th}
+%    \end{macrocode}
+%Version 1.1: treat eth as thorn
+%    \begin{macrocode}
+    {þ|ð} {th}
     {ſ} {s}
     {IJ} {Ij}
     {ij} {ij}
     {Ł} {L}
     {ł} {l}
-    {Œ} {Oe}
+    {Œ} {OE}
     {œ} {oe}
     {Ƿ} {W}
     {ƿ} {w}
 %    \end{macrocode}
 %Ensure currency symbols are grouped together by prefixing all 
-%currency symbols with \verb|$|.
+%currency symbols with \verb|$| but don't change math shift.
+%Version 1.1 added math shift check.
 %    \begin{macrocode}
-    { (\ur{l_datatool_currencysigns_regex}) } { \cO\x{24}\1 }
+    { \cM(.) } { \1 }
+    { (\ur{l_datatool_currencysigns_regex}) } { \cO\$ \1 }
 %    \end{macrocode}
 %Ensure common punctuation characters are grouped together by
 %prefixing them with straight double-quote. This ensures that they
@@ -1544,24 +1562,25 @@
 %
 %Treat closing quote the same as straight apostrophe.
 %    \begin{macrocode}
-    { ’ } { \cO"' }
+    { ’ } { \cO\" \cO\' }
 %    \end{macrocode}
 %Treat opening quote the same as backtick.
 %    \begin{macrocode}
-    { ‘ } { \cO"` }
+    { ‘ } { \cO\" \cO\` }
 %    \end{macrocode}
 %Treat opening and closing double quotes the same as straight
 %double-quote.
 %    \begin{macrocode}
-    { (“|”) } { \cO"\cO" }
+    { (“|”) } { \cO\" \cO\" }
 %    \end{macrocode}
 %Treat em-dash and en-dash the same as hyphen/minus.
 %    \begin{macrocode}
-    { (—|–) } { \cO"- }
+    { (—|–) } { \cO\" \cO\- }
 %    \end{macrocode}
-%Any character in the punctuation class:
+%Any character in the punctuation class that has category other:
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-    { ([[:punct:]]+) } { \cO"\1 }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
 }
@@ -1583,7 +1602,7 @@
 %\subsection{Canadian English LDF for \sty{datatool-base}
 %(\file{datatool-en-CA.ldf})}
 %    \begin{macrocode}
-\TrackLangProvidesResource{en-CA}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{en-CA}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 % Load root language file. Note that \sty{datatool-base} should
 % automatically load the region file \file{datatool-CA.ldf} if it is
@@ -1678,7 +1697,7 @@
 %\subsection{South African English LDF for \sty{datatool-base}
 %(\file{datatool-en-ZA.ldf})}
 %    \begin{macrocode}
-\TrackLangProvidesResource{en-ZA}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{en-ZA}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 % Load root language file. Note that \sty{datatool-base} should
 % automatically load the region file \file{datatool-ZA.ldf} if it is
@@ -1777,7 +1796,7 @@
 %\subsection{Root English LDF for \sty{databib}
 %(\file{databib-english.ldf})}
 %    \begin{macrocode}
-\TrackLangProvidesResource{english}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 % \LaTeX3 commands needed:
 %    \begin{macrocode}
@@ -1863,7 +1882,7 @@
 %\subsection{Root English LDF for \sty{person}
 %(\file{person-english.ldf})}
 %    \begin{macrocode}
-\TrackLangProvidesResource{english}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 % If \cs{DTLsetLocaleOptions} options need to be provided, the sub-module should be
 % \qt{person}.  For example, 
@@ -2033,7 +2052,7 @@
 % have been found if installed correctly. This is a fallback
 % to catch an unrecognised script and encoding combination.
 %    \begin{macrocode}
-\TrackLangProvidesResource{anglosaxon}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{anglosaxon}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 % Try loading \filemetameta{datatool-ang-}{script}{-}{encoding}{.ldf}
 %    \begin{macrocode}
@@ -2068,7 +2087,7 @@
 % As such, it doesn't provide any translations (except for \qt{and}) or date/time
 % formatting.
 %    \begin{macrocode}
-\TrackLangProvidesResource{ang-Latn}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{ang-Latn}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 % Try loading \filemeta{datatool-ang-Latn-}{encoding}{.ldf}
 %    \begin{macrocode}
@@ -2177,7 +2196,7 @@
 %\subsection{Root Anglo Saxon Latin Script UTF-8 LDF for \sty{datatool-base}
 %(\file{datatool-ang-Latn-utf8.ldf})}
 %    \begin{macrocode}
-\TrackLangProvidesResource{ang-Latn-utf8}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{ang-Latn-utf8}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 %Switch on \LaTeX3 syntax.
 %    \begin{macrocode}
@@ -2218,10 +2237,10 @@
     {Œ} {OE}
     {Ù|Ú|Û|Ü|Ū} {U}
     {Ý} {Y}
-    {Ƿ|Ꝩ} {\x{5B}}
-    {Ð} {\cL\x{5C}}
-    {Æ|Ǣ|Ǽ|Æ̀|Æ̂} {\cL\x{5D}}
-    {Þ|Ꝥ} {\cL\x{5E}}
+    {Ƿ|Ꝩ} { \cL\[ }
+    {Ð} { \cL\\ }
+    {Æ|Ǣ|Ǽ|Æ̀|Æ̂} { \cL\] }
+    {Þ|Ꝥ} { \cL\^ }
     {à|á|â|ã|ä|ā} {a}
     {ç|ċ} {c}
     {è|é|ê|ë|ē} {e}
@@ -2233,14 +2252,15 @@
     {ß} {ss}
     {ù|ú|û|ü|ū} {u}
     {ý} {y}
-    {ƿ|ꝩ} {\cL\x{7B}}
-    {ð} {\cL\x{7C}}
-    {æ|ǣ|ǽ|æ̀|æ̂} {\cL\x{7D}}
-    {þ|ꝥ} {\cL\x{7E}}
+    {ƿ|ꝩ} { \cL\{ }
+    {ð} { \cL\| }
+    {æ|ǣ|ǽ|æ̀|æ̂} { \cL\} }
+    {þ|ꝥ} { \cL\~ }
 %    \end{macrocode}
-%Any character in the punctuation class:
+%Any character in the punctuation class that has category other:
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-    { ([[:punct:]]+) } { \cO"\1 }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
  }
@@ -2264,9 +2284,9 @@
     {Ꞇ|Ꞇ̃} {T}
     {Ù|Ú|Û|Ü} {U}
     {Ý} {Y}
-    {Ƿ|Ꝩ} {\cL\x{5B}}
-    {Ð} {\cL\x{5C}}
-    {Þ|Ꝥ} {\cL\x{5D}}
+    {Ƿ|Ꝩ} { \cL\[ }
+    {Ð} { \cL\\ }
+    {Þ|Ꝥ} { \cL\] }
     {à|á|â|ã|ä|ą} {a}
     {æ|ǣ|ǽ|æ̀|æ̂} {ae}
     {ç|ċ} {c}
@@ -2278,14 +2298,15 @@
     {ꞇ|ꞇ̃} {t}
     {ù|ú|û|ü} {u}
     {ý} {y}
-    {ƿ|ꝩ} {\cL\x{7B}}
-    {ð} {\cL\x{7C}}
-    {þ|ꝥ} {\cL\x{7D}}
-    {⁊} {\cL\x{7E}}
+    {ƿ|ꝩ} { \cL\{ }
+    {ð} { \cL\| }
+    {þ|ꝥ} { \cL\} }
+    {⁊} { \cL\~ }
 %    \end{macrocode}
-%Any character in the punctuation class:
+%Any character in the punctuation class that has category other:
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-    { ([[:punct:]]+) } { \cO"\1 }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
  }
@@ -2308,9 +2329,9 @@
     {Ꞇ|Ꞇ̃} {T}
     {Ù|Ú|Û|Ü} {U}
     {Ý} {Y}
-    {Ƿ|Ꝩ} {\cL\x{5B}}
-    {Ð} {\cL\x{5D}}
-    {Þ|Ꝥ} {\cL\x{5C}}
+    {Ƿ|Ꝩ} { \cL\[ }
+    {Ð} { \cL\\ }
+    {Þ|Ꝥ} { \cL\] }
     {à|á|â|ã|ä|ą} {a}
     {æ|ǣ|ǽ|æ̀|æ̂} {ae}
     {ç|ċ} {c}
@@ -2322,14 +2343,15 @@
     {ꞇ|ꞇ̃} {t}
     {ù|ú|û|ü} {u}
     {ý} {y}
-    {ƿ|ꝩ} {\cL\x{7B}}
-    {ð} {\cL\x{7D}}
-    {þ|ꝥ} {\cL\x{7C}}
-    {⁊} {\cL\x{7E}}
+    {ƿ|ꝩ} { \cL\{ }
+    {ð} { \cL\| }
+    {þ|ꝥ} { \cL\} }
+    {⁊} { \cL\~ }
 %    \end{macrocode}
-%Any character in the punctuation class:
+%Any character in the punctuation class that has category other:
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-    { ([[:punct:]]+) } { \cO"\1 }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
  }
@@ -2350,12 +2372,12 @@
     {g} {\cL\x{37}}
     {w} {\cL\x{38}}
     {h} {\cL\x{39}}
-    {n} {\cL\x{3A}}
-    {i} {\cL\x{3B}}
-    {j} {\cL\x{3C}}
-    {ï} {\cL\x{3D}}
-    {p} {\cL\x{3E}}
-    {x} {\cL\x{40}}
+    {n} {\cL\:}
+    {i} {\cL\;}
+    {j} {\cL\<}
+    {ï} {\cL\=}
+    {p} {\cL\>}
+    {x} {\cL\@}
     {st} {\cL\x{51}}
     {s} {\cL\x{41}}
     {t} {\cL\x{42}}
@@ -2377,11 +2399,12 @@
     {į} {\cL\x{53}}
     {ī} {\cL\x{54}}
     {c̄|k̄} {\cL\x{55}}
-    {⁊} {\cL\x{7E}}
+    {⁊} {\cL\~}
 %    \end{macrocode}
-%Any character in the punctuation class:
+%Any character in the punctuation class that has category other:
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-    { ([[:punct:]]+) } { \cO"\1 }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
  }
@@ -2501,7 +2524,7 @@
 %\end{important}
 %
 %    \begin{macrocode}
-\TrackLangProvidesResource{ang-Runr}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{ang-Runr}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 % Try loading \filemeta{datatool-ang-Runr-}{encoding}{.ldf}
 %    \begin{macrocode}
@@ -2603,7 +2626,7 @@
 %\subsection{Root Anglo Saxon Runic Script UTF-8 LDF for \sty{datatool-base}
 %(\file{datatool-ang-Runr-utf8.ldf})}
 %    \begin{macrocode}
-\TrackLangProvidesResource{ang-Runr-utf8}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{ang-Runr-utf8}[2025/03/12 v1.1 (NLCT)]
 %    \end{macrocode}
 %Switch on \LaTeX3 syntax.
 %    \begin{macrocode}
@@ -2944,67 +2967,68 @@
 %    \end{macrocode}
 % U+16EE RUNIC ARLAUG SYMBOL
 %    \begin{macrocode}
-      { \x{16EE} } { \cL\x{7D}\x{21} }
+      { \x{16EE} } { \cL\x{7D} \cO\! }
 %    \end{macrocode}
 % U+16EF RUNIC TVIMADUR SYMBOL
 %    \begin{macrocode}
-      { \x{16EF} } { \cL\x{7D}\x{22} }
+      { \x{16EF} } { \cL\x{7D} \cO\" }
 %    \end{macrocode}
 % U+16F0 RUNIC BELGTHOR SYMBOL
 %    \begin{macrocode}
-      { \x{16F0} } { \cL\x{7D}\x{23} }
+      { \x{16F0} } { \cL\x{7D} \cO\# }
 %    \end{macrocode}
 % U+16F1 RUNIC LETTER K
 %    \begin{macrocode}
-      { \x{16F1} } { \cL\x{7D}\x{24} }
+      { \x{16F1} } { \cL\x{7D} \cO\$ }
 %    \end{macrocode}
 % U+16F2 RUNIC LETTER SH
 %    \begin{macrocode}
-      { \x{16F2} } { \cL\x{7D}\x{25} }
+      { \x{16F2} } { \cL\x{7D} \cO\% }
 %    \end{macrocode}
 % U+16F3 RUNIC LETTER OO
 %    \begin{macrocode}
-      { \x{16F3} } { \cL\x{7D}\x{26} }
+      { \x{16F3} } { \cL\x{7D} \cO\& }
 %    \end{macrocode}
 % U+16F4 RUNIC LETTER FRANKS CASKET OS
 %    \begin{macrocode}
-      { \x{16F4} } { \cL\x{7D}\x{27} }
+      { \x{16F4} } { \cL\x{7D} \cO\' }
 %    \end{macrocode}
 % U+16F5 RUNIC LETTER FRANKS CASKET IS
 %    \begin{macrocode}
-      { \x{16F5} } { \cL\x{7D}\x{28} }
+      { \x{16F5} } { \cL\x{7D} \cO\( }
 %    \end{macrocode}
 % U+16F6 RUNIC LETTER FRANKS CASKET EH
 %    \begin{macrocode}
-      { \x{16F6} } { \cL\x{7D}\x{29} }
+      { \x{16F6} } { \cL\x{7D} \cO\) }
 %    \end{macrocode}
 % U+16F7 RUNIC LETTER FRANKS CASKET AC
 %    \begin{macrocode}
-      { \x{16F7} } { \cL\x{7D}\x{2A} }
+      { \x{16F7} } { \cL\x{7D} \cO\* }
 %    \end{macrocode}
 % U+16F8 RUNIC LETTER FRANKS CASKET AESC
 %    \begin{macrocode}
-      { \x{16F8} } { \cL\x{7D}\x{2B} }
+      { \x{16F8} } { \cL\x{7D} \cO\+ }
 %    \end{macrocode}
 % U+16EB RUNIC SINGLE PUNCTUATION
 %    \begin{macrocode}
-      { \x{16EB} } { \cO\x{21}\x{21} }
+      { \x{16EB} } { \cO\! \cO\! }
 %    \end{macrocode}
 % U+16EC RUNIC MULTIPLE PUNCTUATION
 %    \begin{macrocode}
-      { \x{16EC} } { \cO\x{21}\x{22} }
+      { \x{16EC} } { \cO\! \cO\" }
 %    \end{macrocode}
 % U+16ED RUNIC CROSS PUNCTUATION
 %    \begin{macrocode}
-      { \x{16ED} } { \cO\x{21}\x{23} }
+      { \x{16ED} } { \cO\! \cO\# }
 %    \end{macrocode}
 % Tironian et
 %    \begin{macrocode}
       { \x{204A} } { \cL\x{7E} }
 %    \end{macrocode}
-%Any character in the punctuation class:
+%Any character in the punctuation class that has category other:
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-      { ([[:punct:]]+) } { \cO\x{21}\x{24} \1 }
+      { \cO([[:punct:]]) } { \cO\! \cO\$ \1 }
     }
     #1
    }
@@ -3323,67 +3347,68 @@
 %    \end{macrocode}
 % U+16EE RUNIC ARLAUG SYMBOL
 %    \begin{macrocode}
-      { \x{16EE} } { \cL\x{7C}\x{21} }
+      { \x{16EE} } { \cL\x{7C} \cO\! }
 %    \end{macrocode}
 % U+16EF RUNIC TVIMADUR SYMBOL
 %    \begin{macrocode}
-      { \x{16EF} } { \cL\x{7C}\x{22} }
+      { \x{16EF} } { \cL\x{7C} \cO\" }
 %    \end{macrocode}
 % U+16F0 RUNIC BELGTHOR SYMBOL
 %    \begin{macrocode}
-      { \x{16F0} } { \cL\x{7D}\x{23} }
+      { \x{16F0} } { \cL\x{7D} \cO\# }
 %    \end{macrocode}
 % U+16F1 RUNIC LETTER K
 %    \begin{macrocode}
-      { \x{16F1} } { \cL\x{7D}\x{24} }
+      { \x{16F1} } { \cL\x{7D} \cO\$ }
 %    \end{macrocode}
 % U+16F2 RUNIC LETTER SH
 %    \begin{macrocode}
-      { \x{16F2} } { \cL\x{7D}\x{25} }
+      { \x{16F2} } { \cL\x{7D} \cO\% }
 %    \end{macrocode}
 % U+16F3 RUNIC LETTER OO
 %    \begin{macrocode}
-      { \x{16F3} } { \cL\x{7D}\x{26} }
+      { \x{16F3} } { \cL\x{7D} \cO\& }
 %    \end{macrocode}
 % U+16F4 RUNIC LETTER FRANKS CASKET OS
 %    \begin{macrocode}
-      { \x{16F4} } { \cL\x{7D}\x{27} }
+      { \x{16F4} } { \cL\x{7D} \cO\' }
 %    \end{macrocode}
 % U+16F5 RUNIC LETTER FRANKS CASKET IS
 %    \begin{macrocode}
-      { \x{16F5} } { \cL\x{7D}\x{28} }
+      { \x{16F5} } { \cL\x{7D} \cO\( }
 %    \end{macrocode}
 % U+16F6 RUNIC LETTER FRANKS CASKET EH
 %    \begin{macrocode}
-      { \x{16F6} } { \cL\x{7D}\x{29} }
+      { \x{16F6} } { \cL\x{7D} \cO\) }
 %    \end{macrocode}
 % U+16F7 RUNIC LETTER FRANKS CASKET AC
 %    \begin{macrocode}
-      { \x{16F7} } { \cL\x{7D}\x{2A} }
+      { \x{16F7} } { \cL\x{7D} \cO\* }
 %    \end{macrocode}
 % U+16F8 RUNIC LETTER FRANKS CASKET AESC
 %    \begin{macrocode}
-      { \x{16F8} } { \cL\x{7D}\x{2B} }
+      { \x{16F8} } { \cL\x{7D} \cO\+ }
 %    \end{macrocode}
 % U+16EB RUNIC SINGLE PUNCTUATION
 %    \begin{macrocode}
-      { \x{16EB} } { \cO\x{21}\x{21} }
+      { \x{16EB} } { \cO\! \cO\! }
 %    \end{macrocode}
 % U+16EC RUNIC MULTIPLE PUNCTUATION
 %    \begin{macrocode}
-      { \x{16EC} } { \cO\x{21}\x{22} }
+      { \x{16EC} } { \cO\! \cO\" }
 %    \end{macrocode}
 % U+16ED RUNIC CROSS PUNCTUATION
 %    \begin{macrocode}
-      { \x{16ED} } { \cO\x{21}\x{23} }
+      { \x{16ED} } { \cO\! \cO\# }
 %    \end{macrocode}
 % Tironian et
 %    \begin{macrocode}
       { \x{204A} } { \cL\x{7E} }
 %    \end{macrocode}
-%Any character in the punctuation class:
+%Any character in the punctuation class that has category other:
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-      { ([[:punct:]]+) } { \cO\x{21}\x{24} \1 }
+      { \cO([[:punct:]]) } { \cO\! \cO\$ \1 }
     }
     #1
    }
@@ -3701,67 +3726,68 @@
 %    \end{macrocode}
 % U+16EE RUNIC ARLAUG SYMBOL
 %    \begin{macrocode}
-      { \x{16EE} } { \cL\x{7C}\x{21} }
+      { \x{16EE} } { \cL\x{7C} \cO\! }
 %    \end{macrocode}
 % U+16EF RUNIC TVIMADUR SYMBOL
 %    \begin{macrocode}
-      { \x{16EF} } { \cL\x{7C}\x{22} }
+      { \x{16EF} } { \cL\x{7C} \cO\" }
 %    \end{macrocode}
 % U+16F0 RUNIC BELGTHOR SYMBOL
 %    \begin{macrocode}
-      { \x{16F0} } { \cL\x{7D}\x{23} }
+      { \x{16F0} } { \cL\x{7D} \cO\# }
 %    \end{macrocode}
 % U+16F1 RUNIC LETTER K
 %    \begin{macrocode}
-      { \x{16F1} } { \cL\x{7D}\x{24} }
+      { \x{16F1} } { \cL\x{7D} \cO\$ }
 %    \end{macrocode}
 % U+16F2 RUNIC LETTER SH
 %    \begin{macrocode}
-      { \x{16F2} } { \cL\x{7D}\x{25} }
+      { \x{16F2} } { \cL\x{7D} \cO\% }
 %    \end{macrocode}
 % U+16F3 RUNIC LETTER OO
 %    \begin{macrocode}
-      { \x{16F3} } { \cL\x{7D}\x{26} }
+      { \x{16F3} } { \cL\x{7D} \cO\& }
 %    \end{macrocode}
 % U+16F4 RUNIC LETTER FRANKS CASKET OS
 %    \begin{macrocode}
-      { \x{16F4} } { \cL\x{7D}\x{27} }
+      { \x{16F4} } { \cL\x{7D} \cO\' }
 %    \end{macrocode}
 % U+16F5 RUNIC LETTER FRANKS CASKET IS
 %    \begin{macrocode}
-      { \x{16F5} } { \cL\x{7D}\x{28} }
+      { \x{16F5} } { \cL\x{7D} \cO\( }
 %    \end{macrocode}
 % U+16F6 RUNIC LETTER FRANKS CASKET EH
 %    \begin{macrocode}
-      { \x{16F6} } { \cL\x{7D}\x{29} }
+      { \x{16F6} } { \cL\x{7D} \cO\) }
 %    \end{macrocode}
 % U+16F7 RUNIC LETTER FRANKS CASKET AC
 %    \begin{macrocode}
-      { \x{16F7} } { \cL\x{7D}\x{2A} }
+      { \x{16F7} } { \cL\x{7D} \cO\* }
 %    \end{macrocode}
 % U+16F8 RUNIC LETTER FRANKS CASKET AESC
 %    \begin{macrocode}
-      { \x{16F8} } { \cL\x{7D}\x{2B} }
+      { \x{16F8} } { \cL\x{7D} \cO\+ }
 %    \end{macrocode}
 % Tironian et
 %    \begin{macrocode}
-      { \x{204A} } { \cL\x{7D} \x{2C} }
+      { \x{204A} } { \cL\x{7D} \cO\, }
 %    \end{macrocode}
 % U+16EB RUNIC SINGLE PUNCTUATION
 %    \begin{macrocode}
-      { \x{16EB} } { \cO\x{7E}\x{21} }
+      { \x{16EB} } { \cO\x{7E} \cO\! }
 %    \end{macrocode}
 % U+16EC RUNIC MULTIPLE PUNCTUATION
 %    \begin{macrocode}
-      { \x{16EC} } { \cO\x{7E}\x{22} }
+      { \x{16EC} } { \cO\x{7E} \cO\" }
 %    \end{macrocode}
 % U+16ED RUNIC CROSS PUNCTUATION
 %    \begin{macrocode}
-      { \x{16ED} } { \cO\x{7E}\x{23} }
+      { \x{16ED} } { \cO\x{7E} \cO\# }
 %    \end{macrocode}
-%Any character in the punctuation class:
+%Any character in the punctuation class that has category other:
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-      { ([[:punct:]]+) } { \cO\x{7E}\x{24} \1 }
+      { \cO([[:punct:]]) } { \cO\x{7E} \cO\$ \1 }
     }
     #1
    }
@@ -3825,37 +3851,37 @@
 % U+16A9 RUNIC LETTER OS O
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{A9} }
-        { \cL\x{3A} }
+        { \cL\: }
 %    \end{macrocode}
 % U+16AA RUNIC LETTER AC A
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{AA} }
-        { \cL\x{3B} }
+        { \cL\; }
 %    \end{macrocode}
 % U+16AB RUNIC LETTER AESC
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{AB} }
-        { \cL\x{3C} }
+        { \cL\< }
 %    \end{macrocode}
 % U+16AC RUNIC LETTER LONG-BRANCH-OSS O
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{AC} }
-        { \cL\x{3D} }
+        { \cL\= }
 %    \end{macrocode}
 % U+16AD RUNIC LETTER SHORT-TWIG-OSS O
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{AD} }
-        { \cL\x{3E} }
+        { \cL\> }
 %    \end{macrocode}
 % U+16AE RUNIC LETTER O
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{AE} }
-        { \cL\x{3F} }
+        { \cL\? }
 %    \end{macrocode}
 % U+16AF RUNIC LETTER OE
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{AF} }
-        { \cL\x{40} }
+        { \cL\@ }
 %    \end{macrocode}
 % U+16B0 RUNIC LETTER ON
 %    \begin{macrocode}
@@ -3990,32 +4016,32 @@
 % U+16CA RUNIC LETTER SOWILO S
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{8A} }
-       { \cL\x{5B} }
+       { \cL\[ }
 %    \end{macrocode}
 % U+16CB RUNIC LETTER SIGEL LONG-BRANCH-SOL S
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{8B} }
-       { \cL\x{5C} }
+       { \cL\\ }
 %    \end{macrocode}
 % U+16CC RUNIC LETTER SHORT-TWIG-SOL S
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{8C} }
-       { \cL\x{5D} }
+       { \cL\] }
 %    \end{macrocode}
 % U+16CD RUNIC LETTER C
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{8D} }
-       { \cL\x{5E} }
+       { \cL\^ }
 %    \end{macrocode}
 % U+16CE RUNIC LETTER Z
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{8E} }
-       { \cL\x{5F} }
+       { \cL\_ }
 %    \end{macrocode}
 % U+16CF RUNIC LETTER TIWAZ TIR TYR T
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{8F} }
-       { \cL\x{60} }
+       { \cL\` }
 %    \end{macrocode}
 % U+16D0 RUNIC LETTER SHORT-TWIG-TYR T
 %    \begin{macrocode}
@@ -4145,91 +4171,92 @@
 % U+16E9 RUNIC LETTER Q
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{A9} }
-       { \cL\x{7B} }
+       { \cL\{ }
 %    \end{macrocode}
 % U+16EA RUNIC LETTER X
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AA} }
-       { \cL\x{7C} }
+       { \cL\| }
 %    \end{macrocode}
 % U+16EE RUNIC ARLAUG SYMBOL
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AE} }
-       { \cL\x{7D}\x{21} }
+       { \cL\} \cO\! }
 %    \end{macrocode}
 % U+16EF RUNIC TVIMADUR SYMBOL
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AF} }
-       { \cL\x{7D}\x{22} }
+       { \cL\} \cO\" }
 %    \end{macrocode}
 % U+16F0 RUNIC BELGTHOR SYMBOL
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B0} }
-       { \cL\x{7D}\x{23} }
+       { \cL\} \cO\# }
 %    \end{macrocode}
 % U+16F1 RUNIC LETTER K
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B1} }
-       { \cL\x{7D}\x{24} }
+       { \cL\} \cO\$ }
 %    \end{macrocode}
 % U+16F2 RUNIC LETTER SH
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B2} }
-       { \cL\x{7D}\x{25} }
+       { \cL\} \cO\% }
 %    \end{macrocode}
 % U+16F3 RUNIC LETTER OO
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B3} }
-       { \cL\x{7D}\x{26} }
+       { \cL\} \cO\& }
 %    \end{macrocode}
 % U+16F4 RUNIC LETTER FRANKS CASKET OS
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B4} }
-       { \cL\x{7D}\x{27} }
+       { \cL\} \cO\' }
 %    \end{macrocode}
 % U+16F5 RUNIC LETTER FRANKS CASKET IS
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B5} }
-       { \cL\x{7D}\x{28} }
+       { \cL\} \cO\( }
 %    \end{macrocode}
 % U+16F6 RUNIC LETTER FRANKS CASKET EH
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B6} }
-       { \cL\x{7D}\x{29} }
+       { \cL\} \cO\) }
 %    \end{macrocode}
 % U+16F7 RUNIC LETTER FRANKS CASKET AC
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B7} }
-       { \cL\x{7D}\x{2A} }
+       { \cL\} \cO\* }
 %    \end{macrocode}
 % U+16F8 RUNIC LETTER FRANKS CASKET AESC
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B8} }
-       { \cL\x{7D}\x{2B} }
+       { \cL\} \cO\+ }
 %    \end{macrocode}
 % U+16EB RUNIC SINGLE PUNCTUATION
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AB} }
-       { \cO\x{21}\x{21} }
+       { \cO\! \cO\! }
 %    \end{macrocode}
 % U+16EC RUNIC MULTIPLE PUNCTUATION
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AC} }
-       { \cO\x{21}\x{22} }
+       { \cO\! \cO\" }
 %    \end{macrocode}
 % U+16ED RUNIC CROSS PUNCTUATION
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AD} }
-       { \cO\x{21}\x{23} }
+       { \cO\! \cO\# }
 %    \end{macrocode}
 % Tironian et
 %    \begin{macrocode}
       { \x{E2} \x{81} \x{8A} }
-        { \cL\x{7E} }
+        { \cL\~ }
 %    \end{macrocode}
-%Any character in the punctuation class:
+%Any character in the punctuation class that has category other:
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-      { ([[:punct:]]+) } { \cO\x{21}\x{24} \1 }
+      { \cO([[:punct:]]) } { \cO\! \cO\$ \1 }
     }
     #1
    }
@@ -4291,37 +4318,37 @@
 % U+16BE RUNIC LETTER NAUDIZ NYD NAUD N
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{BE} }
-       { \cL\x{3A} }
+       { \cL\: }
 %    \end{macrocode}
 % U+16C1 RUNIC LETTER ISAZ IS ISS I
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{81} }
-       { \cL\x{3B} }
+       { \cL\; }
 %    \end{macrocode}
 % U+16C4 RUNIC LETTER GER
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{84} }
-       { \cL\x{3C} }
+       { \cL\< }
 %    \end{macrocode}
 % U+16C7 RUNIC LETTER IWAZ EOH
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{87} }
-       { \cL\x{3D} }
+       { \cL\= }
 %    \end{macrocode}
 % U+16C8 RUNIC LETTER PERTHO PEORTH P
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{88} }
-       { \cL\x{3E} }
+       { \cL\> }
 %    \end{macrocode}
 % U+16C9 RUNIC LETTER ALGIZ EOLHX
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{89} }
-       { \cL\x{3F} }
+       { \cL\? }
 %    \end{macrocode}
 % U+16CB RUNIC LETTER SIGEL LONG-BRANCH-SOL S
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{8B} }
-       { \cL\x{40} }
+       { \cL\@ }
 %    \end{macrocode}
 % U+16CF RUNIC LETTER TIWAZ TIR TYR T
 %    \begin{macrocode}
@@ -4459,32 +4486,32 @@
 % U+16B6 RUNIC LETTER ENG
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{B6} }
-       { \cL\x{5B} }
+       { \cL\[ }
 %    \end{macrocode}
 % U+16B8 RUNIC LETTER GAR
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{B8} }
-       { \cL\x{5C} }
+       { \cL\\ }
 %    \end{macrocode}
 % U+16BA RUNIC LETTER HAGLAZ H
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{BA} }
-       { \cL\x{5D} }
+       { \cL\] }
 %    \end{macrocode}
 % U+16BC RUNIC LETTER LONG-BRANCH-HAGALL H
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{BC} }
-       { \cL\x{5E} }
+       { \cL\^ }
 %    \end{macrocode}
 % U+16BD RUNIC LETTER SHORT-TWIG-HAGALL H
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{BD} }
-       { \cL\x{5F} }
+       { \cL\_ }
 %    \end{macrocode}
 % U+16BF RUNIC LETTER SHORT-TWIG-NAUD N
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{BF} }
-       { \cL\x{60} }
+       { \cL\` }
 %    \end{macrocode}
 % U+16C0 RUNIC LETTER DOTTED-N
 %    \begin{macrocode}
@@ -4619,87 +4646,88 @@
 % U+16EA RUNIC LETTER X
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AA} }
-       { \cL\x{7B} }
+       { \cL\{ }
 %    \end{macrocode}
 % U+16EE RUNIC ARLAUG SYMBOL
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AE} }
-       { \cL\x{7C}\x{21} }
+       { \cL\| \cO\! }
 %    \end{macrocode}
 % U+16EF RUNIC TVIMADUR SYMBOL
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AF} }
-       { \cL\x{7D}\x{22} }
+       { \cL\} \cO\" }
 %    \end{macrocode}
 % U+16F0 RUNIC BELGTHOR SYMBOL
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B0} }
-       { \cL\x{7D}\x{23} }
+       { \cL\} \cO\# }
 %    \end{macrocode}
 % U+16F1 RUNIC LETTER K
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B1} }
-       { \cL\x{7D}\x{24} }
+       { \cL\} \cO\$ }
 %    \end{macrocode}
 % U+16F2 RUNIC LETTER SH
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B2} }
-       { \cL\x{7D}\x{25} }
+       { \cL\} \cO\% }
 %    \end{macrocode}
 % U+16F3 RUNIC LETTER OO
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B3} }
-       { \cL\x{7D}\x{26} }
+       { \cL\} \cO\& }
 %    \end{macrocode}
 % U+16F4 RUNIC LETTER FRANKS CASKET OS
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B4} }
-       { \cL\x{7D}\x{27} }
+       { \cL\} \cO\' }
 %    \end{macrocode}
 % U+16F5 RUNIC LETTER FRANKS CASKET IS
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B5} }
-       { \cL\x{7D}\x{28} }
+       { \cL\} \cO\( }
 %    \end{macrocode}
 % U+16F6 RUNIC LETTER FRANKS CASKET EH
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B6} }
-       { \cL\x{7D}\x{29} }
+       { \cL\} \cO\) }
 %    \end{macrocode}
 % U+16F7 RUNIC LETTER FRANKS CASKET AC
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B7} }
-       { \cL\x{7D}\x{2A} }
+       { \cL\} \cO\* }
 %    \end{macrocode}
 % U+16F8 RUNIC LETTER FRANKS CASKET AESC
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B8} }
-       { \cL\x{7D}\x{2B} }
+       { \cL\} \cO\+ }
 %    \end{macrocode}
 % U+16EB RUNIC SINGLE PUNCTUATION
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AB} }
-       { \cO\x{21}\x{21} }
+       { \cO\! \cO\! }
 %    \end{macrocode}
 % U+16EC RUNIC MULTIPLE PUNCTUATION
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AC} }
-       { \cO\x{21}\x{22} }
+       { \cO\! \cO\" }
 %    \end{macrocode}
 % U+16ED RUNIC CROSS PUNCTUATION
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AD} }
-       { \cO\x{21}\x{23} }
+       { \cO\! \cO\# }
 %    \end{macrocode}
 % Tironian et
 %    \begin{macrocode}
       { \x{E2} \x{81} \x{8A} }
-        { \cL\x{7E} }
+        { \cL\~ }
 %    \end{macrocode}
 %Any character in the punctuation class (unlikely to occur in Runic
 %but added for completeness):
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-      { ([[:punct:]]+) } { \cO\x{21}\x{24} \1 }
+      { \cO([[:punct:]]) } { \cO\! \cO\$ \1 }
     }
     #1
    }
@@ -4760,37 +4788,37 @@
 % U+16BE RUNIC LETTER NAUDIZ NYD NAUD N
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{BE} }
-       { \cL\x{3A} }
+       { \cL\: }
 %    \end{macrocode}
 % U+16C1 RUNIC LETTER ISAZ IS ISS I
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{81} }
-       { \cL\x{3B} }
+       { \cL\; }
 %    \end{macrocode}
 % U+16C4 RUNIC LETTER GER
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{84} }
-       { \cL\x{3C} }
+       { \cL\< }
 %    \end{macrocode}
 % U+16C7 RUNIC LETTER IWAZ EOH
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{87} }
-       { \cL\x{3D} }
+       { \cL\= }
 %    \end{macrocode}
 % U+16C8 RUNIC LETTER PERTHO PEORTH P
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{88} }
-       { \cL\x{3E} }
+       { \cL\> }
 %    \end{macrocode}
 % U+16C9 RUNIC LETTER ALGIZ EOLHX
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{89} }
-       { \cL\x{3F} }
+       { \cL\? }
 %    \end{macrocode}
 % U+16CB RUNIC LETTER SIGEL LONG-BRANCH-SOL S
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{8B} }
-       { \cL\x{40} }
+       { \cL\@ }
 %    \end{macrocode}
 % U+16CF RUNIC LETTER TIWAZ TIR TYR T
 %    \begin{macrocode}
@@ -4928,32 +4956,32 @@
 % U+16B6 RUNIC LETTER ENG
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{B6} }
-       { \cL\x{5B} }
+       { \cL\[ }
 %    \end{macrocode}
 % U+16B8 RUNIC LETTER GAR
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{B8} }
-       { \cL\x{5C} }
+       { \cL\\ }
 %    \end{macrocode}
 % U+16BA RUNIC LETTER HAGLAZ H
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{BA} }
-       { \cL\x{5D} }
+       { \cL\] }
 %    \end{macrocode}
 % U+16BC RUNIC LETTER LONG-BRANCH-HAGALL H
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{BC} }
-       { \cL\x{5E} }
+       { \cL\^ }
 %    \end{macrocode}
 % U+16BD RUNIC LETTER SHORT-TWIG-HAGALL H
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{BD} }
-       { \cL\x{5F} }
+       { \cL\_ }
 %    \end{macrocode}
 % U+16BF RUNIC LETTER SHORT-TWIG-NAUD N
 %    \begin{macrocode}
       { \x{E1} \x{9A} \x{BF} }
-       { \cL\x{60} }
+       { \cL\` }
 %    \end{macrocode}
 % U+16C0 RUNIC LETTER DOTTED-N
 %    \begin{macrocode}
@@ -5088,87 +5116,88 @@
 % U+16EA RUNIC LETTER X
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AA} }
-       { \cL\x{7B} }
+       { \cL\{ }
 %    \end{macrocode}
 % U+16EE RUNIC ARLAUG SYMBOL
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AE} }
-       { \cL\x{7C}\x{21} }
+       { \cL\| \cO\! }
 %    \end{macrocode}
 % U+16EF RUNIC TVIMADUR SYMBOL
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AF} }
-       { \cL\x{7D}\x{22} }
+       { \cL\} \cO\" }
 %    \end{macrocode}
 % U+16F0 RUNIC BELGTHOR SYMBOL
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B0} }
-       { \cL\x{7D}\x{23} }
+       { \cL\} \cO\# }
 %    \end{macrocode}
 % U+16F1 RUNIC LETTER K
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B1} }
-       { \cL\x{7D}\x{24} }
+       { \cL\} \cO\$ }
 %    \end{macrocode}
 % U+16F2 RUNIC LETTER SH
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B2} }
-       { \cL\x{7D}\x{25} }
+       { \cL\} \cO\% }
 %    \end{macrocode}
 % U+16F3 RUNIC LETTER OO
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B3} }
-       { \cL\x{7D}\x{26} }
+       { \cL\} \cO\& }
 %    \end{macrocode}
 % U+16F4 RUNIC LETTER FRANKS CASKET OS
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B4} }
-       { \cL\x{7D}\x{27} }
+       { \cL\} \cO\' }
 %    \end{macrocode}
 % U+16F5 RUNIC LETTER FRANKS CASKET IS
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B5} }
-       { \cL\x{7D}\x{28} }
+       { \cL\} \cO\( }
 %    \end{macrocode}
 % U+16F6 RUNIC LETTER FRANKS CASKET EH
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B6} }
-       { \cL\x{7D}\x{29} }
+       { \cL\} \cO\) }
 %    \end{macrocode}
 % U+16F7 RUNIC LETTER FRANKS CASKET AC
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B7} }
-       { \cL\x{7D}\x{2A} }
+       { \cL\} \cO\* }
 %    \end{macrocode}
 % U+16F8 RUNIC LETTER FRANKS CASKET AESC
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{B8} }
-       { \cL\x{7D}\x{2B} }
+       { \cL\} \cO\+ }
 %    \end{macrocode}
 % Tironian et
 %    \begin{macrocode}
       { \x{E2} \x{81} \x{8A} }
-        { \cL\x{7D} \x{2C} }
+        { \cL\} \cO\, }
 %    \end{macrocode}
 % U+16EB RUNIC SINGLE PUNCTUATION
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AB} }
-       { \cO\x{7E}\x{21} }
+       { \cO\~ \cO\! }
 %    \end{macrocode}
 % U+16EC RUNIC MULTIPLE PUNCTUATION
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AC} }
-       { \cO\x{7E}\x{22} }
+       { \cO\~ \cO\" }
 %    \end{macrocode}
 % U+16ED RUNIC CROSS PUNCTUATION
 %    \begin{macrocode}
       { \x{E1} \x{9B} \x{AD} }
-       { \cO\x{7E}\x{23} }
+       { \cO\~ \cO\# }
 %    \end{macrocode}
 %Any character in the punctuation class (unlikely to occur in Runic
 %but added for completeness):
+%Version 1.1 added category code check.
 %    \begin{macrocode}
-      { ([[:punct:]]+) } { \cO\x{7E}\x{24} \1 }
+      { \cO([[:punct:]]) } { \cO\~ \cO\$ \1 }
     }
     #1
    }

Modified: trunk/Master/texmf-dist/source/latex/datatool-english/datatool-english.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/datatool-english/datatool-english.ins	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/source/latex/datatool-english/datatool-english.ins	2025-03-12 19:33:53 UTC (rev 74590)
@@ -1,4 +1,4 @@
-% datatool-english.ins generated using makedtx version 1.2 2025/3/2 22:14
+% datatool-english.ins generated using makedtx version 1.2 2025/3/12 15:32
 \input docstrip
 
 \preamble

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/databib-english.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/databib-english.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/databib-english.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{english}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english}[2025/03/12 v1.1 (NLCT)]
 \ExplSyntaxOn
 \cs_new:Nn \databib_en_shortmonthname:n
  {

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Latn-utf8.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Latn-utf8.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Latn-utf8.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{ang-Latn-utf8}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{ang-Latn-utf8}[2025/03/12 v1.1 (NLCT)]
 \ExplSyntaxOn
 \newcommand \DTLangLatnLocaleHandler [ 1 ]
 {
@@ -57,10 +57,10 @@
     {Œ} {OE}
     {Ù|Ú|Û|Ü|Ū} {U}
     {Ý} {Y}
-    {Ƿ|Ꝩ} {\x{5B}}
-    {Ð} {\cL\x{5C}}
-    {Æ|Ǣ|Ǽ|Æ̀|Æ̂} {\cL\x{5D}}
-    {Þ|Ꝥ} {\cL\x{5E}}
+    {Ƿ|Ꝩ} { \cL\[ }
+    {Ð} { \cL\\ }
+    {Æ|Ǣ|Ǽ|Æ̀|Æ̂} { \cL\] }
+    {Þ|Ꝥ} { \cL\^ }
     {à|á|â|ã|ä|ā} {a}
     {ç|ċ} {c}
     {è|é|ê|ë|ē} {e}
@@ -72,11 +72,11 @@
     {ß} {ss}
     {ù|ú|û|ü|ū} {u}
     {ý} {y}
-    {ƿ|ꝩ} {\cL\x{7B}}
-    {ð} {\cL\x{7C}}
-    {æ|ǣ|ǽ|æ̀|æ̂} {\cL\x{7D}}
-    {þ|ꝥ} {\cL\x{7E}}
-    { ([[:punct:]]+) } { \cO"\1 }
+    {ƿ|ꝩ} { \cL\{ }
+    {ð} { \cL\| }
+    {æ|ǣ|ǽ|æ̀|æ̂} { \cL\} }
+    {þ|ꝥ} { \cL\~ }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
  }
@@ -95,9 +95,9 @@
     {Ꞇ|Ꞇ̃} {T}
     {Ù|Ú|Û|Ü} {U}
     {Ý} {Y}
-    {Ƿ|Ꝩ} {\cL\x{5B}}
-    {Ð} {\cL\x{5C}}
-    {Þ|Ꝥ} {\cL\x{5D}}
+    {Ƿ|Ꝩ} { \cL\[ }
+    {Ð} { \cL\\ }
+    {Þ|Ꝥ} { \cL\] }
     {à|á|â|ã|ä|ą} {a}
     {æ|ǣ|ǽ|æ̀|æ̂} {ae}
     {ç|ċ} {c}
@@ -109,11 +109,11 @@
     {ꞇ|ꞇ̃} {t}
     {ù|ú|û|ü} {u}
     {ý} {y}
-    {ƿ|ꝩ} {\cL\x{7B}}
-    {ð} {\cL\x{7C}}
-    {þ|ꝥ} {\cL\x{7D}}
-    {⁊} {\cL\x{7E}}
-    { ([[:punct:]]+) } { \cO"\1 }
+    {ƿ|ꝩ} { \cL\{ }
+    {ð} { \cL\| }
+    {þ|ꝥ} { \cL\} }
+    {⁊} { \cL\~ }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
  }
@@ -132,9 +132,9 @@
     {Ꞇ|Ꞇ̃} {T}
     {Ù|Ú|Û|Ü} {U}
     {Ý} {Y}
-    {Ƿ|Ꝩ} {\cL\x{5B}}
-    {Ð} {\cL\x{5D}}
-    {Þ|Ꝥ} {\cL\x{5C}}
+    {Ƿ|Ꝩ} { \cL\[ }
+    {Ð} { \cL\\ }
+    {Þ|Ꝥ} { \cL\] }
     {à|á|â|ã|ä|ą} {a}
     {æ|ǣ|ǽ|æ̀|æ̂} {ae}
     {ç|ċ} {c}
@@ -146,11 +146,11 @@
     {ꞇ|ꞇ̃} {t}
     {ù|ú|û|ü} {u}
     {ý} {y}
-    {ƿ|ꝩ} {\cL\x{7B}}
-    {ð} {\cL\x{7D}}
-    {þ|ꝥ} {\cL\x{7C}}
-    {⁊} {\cL\x{7E}}
-    { ([[:punct:]]+) } { \cO"\1 }
+    {ƿ|ꝩ} { \cL\{ }
+    {ð} { \cL\| }
+    {þ|ꝥ} { \cL\} }
+    {⁊} { \cL\~ }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
  }
@@ -167,12 +167,12 @@
     {g} {\cL\x{37}}
     {w} {\cL\x{38}}
     {h} {\cL\x{39}}
-    {n} {\cL\x{3A}}
-    {i} {\cL\x{3B}}
-    {j} {\cL\x{3C}}
-    {ï} {\cL\x{3D}}
-    {p} {\cL\x{3E}}
-    {x} {\cL\x{40}}
+    {n} {\cL\:}
+    {i} {\cL\;}
+    {j} {\cL\<}
+    {ï} {\cL\=}
+    {p} {\cL\>}
+    {x} {\cL\@}
     {st} {\cL\x{51}}
     {s} {\cL\x{41}}
     {t} {\cL\x{42}}
@@ -194,8 +194,8 @@
     {į} {\cL\x{53}}
     {ī} {\cL\x{54}}
     {c̄|k̄} {\cL\x{55}}
-    {⁊} {\cL\x{7E}}
-    { ([[:punct:]]+) } { \cO"\1 }
+    {⁊} {\cL\~}
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
  }

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Latn.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Latn.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Latn.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{ang-Latn}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{ang-Latn}[2025/03/12 v1.1 (NLCT)]
 \TrackLangRequestResource{ang-Latn-\TrackLangEncodingName}
 {%
   \csuse{datatool_locale_warn:n}{datatool-ang-Latn}%

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Runr-utf8.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Runr-utf8.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Runr-utf8.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{ang-Runr-utf8}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{ang-Runr-utf8}[2025/03/12 v1.1 (NLCT)]
 \ExplSyntaxOn
 \newcommand \DTLangRunrLocaleHandler [ 1 ] {
   \datatool_angRunr_order_punc_futhorc:n { #1 }
@@ -124,22 +124,22 @@
       { \x{16E8} } { \cL\x{7A} }
       { \x{16E9} } { \cL\x{7B} }
       { \x{16EA} } { \cL\x{7C} }
-      { \x{16EE} } { \cL\x{7D}\x{21} }
-      { \x{16EF} } { \cL\x{7D}\x{22} }
-      { \x{16F0} } { \cL\x{7D}\x{23} }
-      { \x{16F1} } { \cL\x{7D}\x{24} }
-      { \x{16F2} } { \cL\x{7D}\x{25} }
-      { \x{16F3} } { \cL\x{7D}\x{26} }
-      { \x{16F4} } { \cL\x{7D}\x{27} }
-      { \x{16F5} } { \cL\x{7D}\x{28} }
-      { \x{16F6} } { \cL\x{7D}\x{29} }
-      { \x{16F7} } { \cL\x{7D}\x{2A} }
-      { \x{16F8} } { \cL\x{7D}\x{2B} }
-      { \x{16EB} } { \cO\x{21}\x{21} }
-      { \x{16EC} } { \cO\x{21}\x{22} }
-      { \x{16ED} } { \cO\x{21}\x{23} }
+      { \x{16EE} } { \cL\x{7D} \cO\! }
+      { \x{16EF} } { \cL\x{7D} \cO\" }
+      { \x{16F0} } { \cL\x{7D} \cO\# }
+      { \x{16F1} } { \cL\x{7D} \cO\$ }
+      { \x{16F2} } { \cL\x{7D} \cO\% }
+      { \x{16F3} } { \cL\x{7D} \cO\& }
+      { \x{16F4} } { \cL\x{7D} \cO\' }
+      { \x{16F5} } { \cL\x{7D} \cO\( }
+      { \x{16F6} } { \cL\x{7D} \cO\) }
+      { \x{16F7} } { \cL\x{7D} \cO\* }
+      { \x{16F8} } { \cL\x{7D} \cO\+ }
+      { \x{16EB} } { \cO\! \cO\! }
+      { \x{16EC} } { \cO\! \cO\" }
+      { \x{16ED} } { \cO\! \cO\# }
       { \x{204A} } { \cL\x{7E} }
-      { ([[:punct:]]+) } { \cO\x{21}\x{24} \1 }
+      { \cO([[:punct:]]) } { \cO\! \cO\$ \1 }
     }
     #1
    }
@@ -222,22 +222,22 @@
       { \x{16E8} } { \cL\x{79} }
       { \x{16E9} } { \cL\x{7A} }
       { \x{16EA} } { \cL\x{7B} }
-      { \x{16EE} } { \cL\x{7C}\x{21} }
-      { \x{16EF} } { \cL\x{7C}\x{22} }
-      { \x{16F0} } { \cL\x{7D}\x{23} }
-      { \x{16F1} } { \cL\x{7D}\x{24} }
-      { \x{16F2} } { \cL\x{7D}\x{25} }
-      { \x{16F3} } { \cL\x{7D}\x{26} }
-      { \x{16F4} } { \cL\x{7D}\x{27} }
-      { \x{16F5} } { \cL\x{7D}\x{28} }
-      { \x{16F6} } { \cL\x{7D}\x{29} }
-      { \x{16F7} } { \cL\x{7D}\x{2A} }
-      { \x{16F8} } { \cL\x{7D}\x{2B} }
-      { \x{16EB} } { \cO\x{21}\x{21} }
-      { \x{16EC} } { \cO\x{21}\x{22} }
-      { \x{16ED} } { \cO\x{21}\x{23} }
+      { \x{16EE} } { \cL\x{7C} \cO\! }
+      { \x{16EF} } { \cL\x{7C} \cO\" }
+      { \x{16F0} } { \cL\x{7D} \cO\# }
+      { \x{16F1} } { \cL\x{7D} \cO\$ }
+      { \x{16F2} } { \cL\x{7D} \cO\% }
+      { \x{16F3} } { \cL\x{7D} \cO\& }
+      { \x{16F4} } { \cL\x{7D} \cO\' }
+      { \x{16F5} } { \cL\x{7D} \cO\( }
+      { \x{16F6} } { \cL\x{7D} \cO\) }
+      { \x{16F7} } { \cL\x{7D} \cO\* }
+      { \x{16F8} } { \cL\x{7D} \cO\+ }
+      { \x{16EB} } { \cO\! \cO\! }
+      { \x{16EC} } { \cO\! \cO\" }
+      { \x{16ED} } { \cO\! \cO\# }
       { \x{204A} } { \cL\x{7E} }
-      { ([[:punct:]]+) } { \cO\x{21}\x{24} \1 }
+      { \cO([[:punct:]]) } { \cO\! \cO\$ \1 }
     }
     #1
    }
@@ -320,22 +320,22 @@
       { \x{16E8} } { \cL\x{79} }
       { \x{16E9} } { \cL\x{7A} }
       { \x{16EA} } { \cL\x{7B} }
-      { \x{16EE} } { \cL\x{7C}\x{21} }
-      { \x{16EF} } { \cL\x{7C}\x{22} }
-      { \x{16F0} } { \cL\x{7D}\x{23} }
-      { \x{16F1} } { \cL\x{7D}\x{24} }
-      { \x{16F2} } { \cL\x{7D}\x{25} }
-      { \x{16F3} } { \cL\x{7D}\x{26} }
-      { \x{16F4} } { \cL\x{7D}\x{27} }
-      { \x{16F5} } { \cL\x{7D}\x{28} }
-      { \x{16F6} } { \cL\x{7D}\x{29} }
-      { \x{16F7} } { \cL\x{7D}\x{2A} }
-      { \x{16F8} } { \cL\x{7D}\x{2B} }
-      { \x{204A} } { \cL\x{7D} \x{2C} }
-      { \x{16EB} } { \cO\x{7E}\x{21} }
-      { \x{16EC} } { \cO\x{7E}\x{22} }
-      { \x{16ED} } { \cO\x{7E}\x{23} }
-      { ([[:punct:]]+) } { \cO\x{7E}\x{24} \1 }
+      { \x{16EE} } { \cL\x{7C} \cO\! }
+      { \x{16EF} } { \cL\x{7C} \cO\" }
+      { \x{16F0} } { \cL\x{7D} \cO\# }
+      { \x{16F1} } { \cL\x{7D} \cO\$ }
+      { \x{16F2} } { \cL\x{7D} \cO\% }
+      { \x{16F3} } { \cL\x{7D} \cO\& }
+      { \x{16F4} } { \cL\x{7D} \cO\' }
+      { \x{16F5} } { \cL\x{7D} \cO\( }
+      { \x{16F6} } { \cL\x{7D} \cO\) }
+      { \x{16F7} } { \cL\x{7D} \cO\* }
+      { \x{16F8} } { \cL\x{7D} \cO\+ }
+      { \x{204A} } { \cL\x{7D} \cO\, }
+      { \x{16EB} } { \cO\x{7E} \cO\! }
+      { \x{16EC} } { \cO\x{7E} \cO\" }
+      { \x{16ED} } { \cO\x{7E} \cO\# }
+      { \cO([[:punct:]]) } { \cO\x{7E} \cO\$ \1 }
     }
     #1
    }
@@ -364,19 +364,19 @@
       { \x{E1} \x{9A} \x{A8} }
         { \cL\x{39} }
       { \x{E1} \x{9A} \x{A9} }
-        { \cL\x{3A} }
+        { \cL\: }
       { \x{E1} \x{9A} \x{AA} }
-        { \cL\x{3B} }
+        { \cL\; }
       { \x{E1} \x{9A} \x{AB} }
-        { \cL\x{3C} }
+        { \cL\< }
       { \x{E1} \x{9A} \x{AC} }
-        { \cL\x{3D} }
+        { \cL\= }
       { \x{E1} \x{9A} \x{AD} }
-        { \cL\x{3E} }
+        { \cL\> }
       { \x{E1} \x{9A} \x{AE} }
-        { \cL\x{3F} }
+        { \cL\? }
       { \x{E1} \x{9A} \x{AF} }
-        { \cL\x{40} }
+        { \cL\@ }
       { \x{E1} \x{9A} \x{B0} }
         { \cL\x{41} }
       { \x{E1} \x{9A} \x{B1} }
@@ -430,17 +430,17 @@
       { \x{E1} \x{9B} \x{89} }
        { \cL\x{5A} }
       { \x{E1} \x{9B} \x{8A} }
-       { \cL\x{5B} }
+       { \cL\[ }
       { \x{E1} \x{9B} \x{8B} }
-       { \cL\x{5C} }
+       { \cL\\ }
       { \x{E1} \x{9B} \x{8C} }
-       { \cL\x{5D} }
+       { \cL\] }
       { \x{E1} \x{9B} \x{8D} }
-       { \cL\x{5E} }
+       { \cL\^ }
       { \x{E1} \x{9B} \x{8E} }
-       { \cL\x{5F} }
+       { \cL\_ }
       { \x{E1} \x{9B} \x{8F} }
-       { \cL\x{60} }
+       { \cL\` }
       { \x{E1} \x{9B} \x{90} }
        { \cL\x{61} }
       { \x{E1} \x{9B} \x{91} }
@@ -492,40 +492,40 @@
       { \x{E1} \x{9B} \x{A8} }
        { \cL\x{7A} }
       { \x{E1} \x{9B} \x{A9} }
-       { \cL\x{7B} }
+       { \cL\{ }
       { \x{E1} \x{9B} \x{AA} }
-       { \cL\x{7C} }
+       { \cL\| }
       { \x{E1} \x{9B} \x{AE} }
-       { \cL\x{7D}\x{21} }
+       { \cL\} \cO\! }
       { \x{E1} \x{9B} \x{AF} }
-       { \cL\x{7D}\x{22} }
+       { \cL\} \cO\" }
       { \x{E1} \x{9B} \x{B0} }
-       { \cL\x{7D}\x{23} }
+       { \cL\} \cO\# }
       { \x{E1} \x{9B} \x{B1} }
-       { \cL\x{7D}\x{24} }
+       { \cL\} \cO\$ }
       { \x{E1} \x{9B} \x{B2} }
-       { \cL\x{7D}\x{25} }
+       { \cL\} \cO\% }
       { \x{E1} \x{9B} \x{B3} }
-       { \cL\x{7D}\x{26} }
+       { \cL\} \cO\& }
       { \x{E1} \x{9B} \x{B4} }
-       { \cL\x{7D}\x{27} }
+       { \cL\} \cO\' }
       { \x{E1} \x{9B} \x{B5} }
-       { \cL\x{7D}\x{28} }
+       { \cL\} \cO\( }
       { \x{E1} \x{9B} \x{B6} }
-       { \cL\x{7D}\x{29} }
+       { \cL\} \cO\) }
       { \x{E1} \x{9B} \x{B7} }
-       { \cL\x{7D}\x{2A} }
+       { \cL\} \cO\* }
       { \x{E1} \x{9B} \x{B8} }
-       { \cL\x{7D}\x{2B} }
+       { \cL\} \cO\+ }
       { \x{E1} \x{9B} \x{AB} }
-       { \cO\x{21}\x{21} }
+       { \cO\! \cO\! }
       { \x{E1} \x{9B} \x{AC} }
-       { \cO\x{21}\x{22} }
+       { \cO\! \cO\" }
       { \x{E1} \x{9B} \x{AD} }
-       { \cO\x{21}\x{23} }
+       { \cO\! \cO\# }
       { \x{E2} \x{81} \x{8A} }
-        { \cL\x{7E} }
-      { ([[:punct:]]+) } { \cO\x{21}\x{24} \1 }
+        { \cL\~ }
+      { \cO([[:punct:]]) } { \cO\! \cO\$ \1 }
     }
     #1
    }
@@ -552,19 +552,19 @@
       { \x{E1} \x{9A} \x{BB} }
        { \cL\x{39} }
       { \x{E1} \x{9A} \x{BE} }
-       { \cL\x{3A} }
+       { \cL\: }
       { \x{E1} \x{9B} \x{81} }
-       { \cL\x{3B} }
+       { \cL\; }
       { \x{E1} \x{9B} \x{84} }
-       { \cL\x{3C} }
+       { \cL\< }
       { \x{E1} \x{9B} \x{87} }
-       { \cL\x{3D} }
+       { \cL\= }
       { \x{E1} \x{9B} \x{88} }
-       { \cL\x{3E} }
+       { \cL\> }
       { \x{E1} \x{9B} \x{89} }
-       { \cL\x{3F} }
+       { \cL\? }
       { \x{E1} \x{9B} \x{8B} }
-       { \cL\x{40} }
+       { \cL\@ }
       { \x{E1} \x{9B} \x{8F} }
        { \cL\x{41} }
       { \x{E1} \x{9B} \x{92} }
@@ -618,17 +618,17 @@
       { \x{E1} \x{9A} \x{B5} }
        { \cL\x{5A} }
       { \x{E1} \x{9A} \x{B6} }
-       { \cL\x{5B} }
+       { \cL\[ }
       { \x{E1} \x{9A} \x{B8} }
-       { \cL\x{5C} }
+       { \cL\\ }
       { \x{E1} \x{9A} \x{BA} }
-       { \cL\x{5D} }
+       { \cL\] }
       { \x{E1} \x{9A} \x{BC} }
-       { \cL\x{5E} }
+       { \cL\^ }
       { \x{E1} \x{9A} \x{BD} }
-       { \cL\x{5F} }
+       { \cL\_ }
       { \x{E1} \x{9A} \x{BF} }
-       { \cL\x{60} }
+       { \cL\` }
       { \x{E1} \x{9B} \x{80} }
        { \cL\x{61} }
       { \x{E1} \x{9B} \x{82} }
@@ -682,38 +682,38 @@
       { \x{E1} \x{9B} \x{A9} }
        { \cL\x{7A} }
       { \x{E1} \x{9B} \x{AA} }
-       { \cL\x{7B} }
+       { \cL\{ }
       { \x{E1} \x{9B} \x{AE} }
-       { \cL\x{7C}\x{21} }
+       { \cL\| \cO\! }
       { \x{E1} \x{9B} \x{AF} }
-       { \cL\x{7D}\x{22} }
+       { \cL\} \cO\" }
       { \x{E1} \x{9B} \x{B0} }
-       { \cL\x{7D}\x{23} }
+       { \cL\} \cO\# }
       { \x{E1} \x{9B} \x{B1} }
-       { \cL\x{7D}\x{24} }
+       { \cL\} \cO\$ }
       { \x{E1} \x{9B} \x{B2} }
-       { \cL\x{7D}\x{25} }
+       { \cL\} \cO\% }
       { \x{E1} \x{9B} \x{B3} }
-       { \cL\x{7D}\x{26} }
+       { \cL\} \cO\& }
       { \x{E1} \x{9B} \x{B4} }
-       { \cL\x{7D}\x{27} }
+       { \cL\} \cO\' }
       { \x{E1} \x{9B} \x{B5} }
-       { \cL\x{7D}\x{28} }
+       { \cL\} \cO\( }
       { \x{E1} \x{9B} \x{B6} }
-       { \cL\x{7D}\x{29} }
+       { \cL\} \cO\) }
       { \x{E1} \x{9B} \x{B7} }
-       { \cL\x{7D}\x{2A} }
+       { \cL\} \cO\* }
       { \x{E1} \x{9B} \x{B8} }
-       { \cL\x{7D}\x{2B} }
+       { \cL\} \cO\+ }
       { \x{E1} \x{9B} \x{AB} }
-       { \cO\x{21}\x{21} }
+       { \cO\! \cO\! }
       { \x{E1} \x{9B} \x{AC} }
-       { \cO\x{21}\x{22} }
+       { \cO\! \cO\" }
       { \x{E1} \x{9B} \x{AD} }
-       { \cO\x{21}\x{23} }
+       { \cO\! \cO\# }
       { \x{E2} \x{81} \x{8A} }
-        { \cL\x{7E} }
-      { ([[:punct:]]+) } { \cO\x{21}\x{24} \1 }
+        { \cL\~ }
+      { \cO([[:punct:]]) } { \cO\! \cO\$ \1 }
     }
     #1
    }
@@ -740,19 +740,19 @@
       { \x{E1} \x{9A} \x{BB} }
        { \cL\x{39} }
       { \x{E1} \x{9A} \x{BE} }
-       { \cL\x{3A} }
+       { \cL\: }
       { \x{E1} \x{9B} \x{81} }
-       { \cL\x{3B} }
+       { \cL\; }
       { \x{E1} \x{9B} \x{84} }
-       { \cL\x{3C} }
+       { \cL\< }
       { \x{E1} \x{9B} \x{87} }
-       { \cL\x{3D} }
+       { \cL\= }
       { \x{E1} \x{9B} \x{88} }
-       { \cL\x{3E} }
+       { \cL\> }
       { \x{E1} \x{9B} \x{89} }
-       { \cL\x{3F} }
+       { \cL\? }
       { \x{E1} \x{9B} \x{8B} }
-       { \cL\x{40} }
+       { \cL\@ }
       { \x{E1} \x{9B} \x{8F} }
        { \cL\x{41} }
       { \x{E1} \x{9B} \x{92} }
@@ -806,17 +806,17 @@
       { \x{E1} \x{9A} \x{B5} }
        { \cL\x{5A} }
       { \x{E1} \x{9A} \x{B6} }
-       { \cL\x{5B} }
+       { \cL\[ }
       { \x{E1} \x{9A} \x{B8} }
-       { \cL\x{5C} }
+       { \cL\\ }
       { \x{E1} \x{9A} \x{BA} }
-       { \cL\x{5D} }
+       { \cL\] }
       { \x{E1} \x{9A} \x{BC} }
-       { \cL\x{5E} }
+       { \cL\^ }
       { \x{E1} \x{9A} \x{BD} }
-       { \cL\x{5F} }
+       { \cL\_ }
       { \x{E1} \x{9A} \x{BF} }
-       { \cL\x{60} }
+       { \cL\` }
       { \x{E1} \x{9B} \x{80} }
        { \cL\x{61} }
       { \x{E1} \x{9B} \x{82} }
@@ -870,38 +870,38 @@
       { \x{E1} \x{9B} \x{A9} }
        { \cL\x{7A} }
       { \x{E1} \x{9B} \x{AA} }
-       { \cL\x{7B} }
+       { \cL\{ }
       { \x{E1} \x{9B} \x{AE} }
-       { \cL\x{7C}\x{21} }
+       { \cL\| \cO\! }
       { \x{E1} \x{9B} \x{AF} }
-       { \cL\x{7D}\x{22} }
+       { \cL\} \cO\" }
       { \x{E1} \x{9B} \x{B0} }
-       { \cL\x{7D}\x{23} }
+       { \cL\} \cO\# }
       { \x{E1} \x{9B} \x{B1} }
-       { \cL\x{7D}\x{24} }
+       { \cL\} \cO\$ }
       { \x{E1} \x{9B} \x{B2} }
-       { \cL\x{7D}\x{25} }
+       { \cL\} \cO\% }
       { \x{E1} \x{9B} \x{B3} }
-       { \cL\x{7D}\x{26} }
+       { \cL\} \cO\& }
       { \x{E1} \x{9B} \x{B4} }
-       { \cL\x{7D}\x{27} }
+       { \cL\} \cO\' }
       { \x{E1} \x{9B} \x{B5} }
-       { \cL\x{7D}\x{28} }
+       { \cL\} \cO\( }
       { \x{E1} \x{9B} \x{B6} }
-       { \cL\x{7D}\x{29} }
+       { \cL\} \cO\) }
       { \x{E1} \x{9B} \x{B7} }
-       { \cL\x{7D}\x{2A} }
+       { \cL\} \cO\* }
       { \x{E1} \x{9B} \x{B8} }
-       { \cL\x{7D}\x{2B} }
+       { \cL\} \cO\+ }
       { \x{E2} \x{81} \x{8A} }
-        { \cL\x{7D} \x{2C} }
+        { \cL\} \cO\, }
       { \x{E1} \x{9B} \x{AB} }
-       { \cO\x{7E}\x{21} }
+       { \cO\~ \cO\! }
       { \x{E1} \x{9B} \x{AC} }
-       { \cO\x{7E}\x{22} }
+       { \cO\~ \cO\" }
       { \x{E1} \x{9B} \x{AD} }
-       { \cO\x{7E}\x{23} }
-      { ([[:punct:]]+) } { \cO\x{7E}\x{24} \1 }
+       { \cO\~ \cO\# }
+      { \cO([[:punct:]]) } { \cO\~ \cO\$ \1 }
     }
     #1
    }

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Runr.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Runr.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-ang-Runr.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{ang-Runr}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{ang-Runr}[2025/03/12 v1.1 (NLCT)]
 \TrackLangRequestResource{ang-Runr-\TrackLangEncodingName}
 {%
   \csuse{datatool_locale_warn:n}{datatool-ang-Runr}%

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-anglosaxon.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-anglosaxon.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-anglosaxon.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{anglosaxon}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{anglosaxon}[2025/03/12 v1.1 (NLCT)]
 \TrackLangRequestResource{ang-\CurrentTrackedDialectScript-\TrackLangEncodingName}
 {%
   \csuse{datatool_locale_warn:n}{datatool-anglosaxon}%

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-en-CA.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-en-CA.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-en-CA.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{en-CA}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{en-CA}[2025/03/12 v1.1 (NLCT)]
 \TrackLangRequireResource{english}
 \ExplSyntaxOn
 \cs_new:Nn \datatool_en_CA_set_numberchars_official:

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-en-ZA.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-en-ZA.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-en-ZA.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{en-ZA}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{en-ZA}[2025/03/12 v1.1 (NLCT)]
 \TrackLangRequireResource{english}
 \ExplSyntaxOn
 \cs_new:Npn \datatool_en_ZA_set_numberchars_thinspace:

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-ascii.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-ascii.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-ascii.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,11 +38,13 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{english-ascii}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english-ascii}[2025/03/12 v1.1 (NLCT)]
 \ExplSyntaxOn
 \newcommand \DTLenLocaleHandler [ 1 ]
  {
-  \regex_replace_all:nnN { ([[:punct:]]+) } { \cO"\1 } #1
+  \regex_replace_all:nnN
+    { \cO([[:punct:]]) } { \cO\" \1 }
+   #1
  }
 \ExplSyntaxOff
 \endinput

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-latin1.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-latin1.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-latin1.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{english-latin1}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english-latin1}[2025/03/12 v1.1 (NLCT)]
 \ExplSyntaxOn
 \newcommand \DTLenLocaleHandler [ 1 ]
 {
@@ -45,16 +45,15 @@
   \regex_replace_case_all:nN
   {
     { [ \x{C0} - \x{C5} ] } { A }
-    { \x{C6} } { Ae }
+    { \x{C6} } { AE }
     { \x{C7} } { C }
     { [ \x{C8} - \x{CB} ] } { E }
     { [ \x{CC} - \x{CF} ] } { I }
-    { \x{D0} } { D }
     { \x{D1} } { N }
     { [ \x{D2} - \x{D6} \x{D8} ] } { O }
     { [ \x{D9} - \x{DC} ]} { U }
     { \x{DD} } { Y }
-    { \x{DE} } { Th }
+    { \x{DE} | \x{D0} } { TH }
     { \x{DF} } { ss }
     { [ \x{E0} - \x{E5} ] } { a }
     { \x{E6} } { ae }
@@ -61,14 +60,14 @@
     { \x{E7} } { c }
     { [ \x{E8} - \x{EB} ] } { e }
     { [ \x{EC} - \x{EF} ] } { i }
-    { \x{F0} } { d }
     { \x{F1} } { n }
     { [ \x{F2} - \x{F6} \x{F8} ] } { o }
     { [ \x{F9} - \x{FC} ] } { u }
     { [ \x{FD} \x{FF} ] } { y }
-    { \x{FE} } { th }
-    { (\ur{l_datatool_currencysigns_regex}) } { \cO\x{24}\1 }
-    { ([[:punct:]]+) } { \cO"\1 }
+    { \x{FE} | \x{F0} } { th }
+    { \cM(.) } { \1 }
+    { (\ur{l_datatool_currencysigns_regex}) } { \cO\$ \1 }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
 }

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-utf8.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-utf8.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english-utf8.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{english-utf8}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english-utf8}[2025/03/12 v1.1 (NLCT)]
 \ExplSyntaxOn
 \newcommand \DTLenLocaleHandler [ 1 ]
 {
@@ -45,16 +45,15 @@
   \regex_replace_case_all:nN
   {
     {À|Á|Â|Ã|Ä|Å} {A}
-    {Æ} {Ae}
+    {Æ} {AE}
     {Ç} {C}
     {È|É|Ê|Ë} {E}
     {Ì|Í|Î|Ï} {I}
-    {Ð} {D}
     {Ñ} {N}
     {Ò|Ó|Ô|Õ|Ö|Ø} {O}
     {Ù|Ú|Û|Ü} {U}
     {Ý} {Y}
-    {Þ} {Th}
+    {Þ|Ð} {TH}
     {ß} {ss}
     {à|á|â|ã|ä|å} {a}
     {æ} {ae}
@@ -61,27 +60,27 @@
     {ç} {c}
     {è|é|ê|ë} {e}
     {ì|í|î|ï} {i}
-    {ð} {d}
     {ñ} {n}
     {ò|ó|ô|õ|ö|ø} {o}
     {ù|ú|û|ü} {u}
     {ý|ÿ} {y}
-    {þ} {th}
+    {þ|ð} {th}
     {ſ} {s}
     {IJ} {Ij}
     {ij} {ij}
     {Ł} {L}
     {ł} {l}
-    {Œ} {Oe}
+    {Œ} {OE}
     {œ} {oe}
     {Ƿ} {W}
     {ƿ} {w}
-    { (\ur{l_datatool_currencysigns_regex}) } { \cO\x{24}\1 }
-    { ’ } { \cO"' }
-    { ‘ } { \cO"` }
-    { (“|”) } { \cO"\cO" }
-    { (—|–) } { \cO"- }
-    { ([[:punct:]]+) } { \cO"\1 }
+    { \cM(.) } { \1 }
+    { (\ur{l_datatool_currencysigns_regex}) } { \cO\$ \1 }
+    { ’ } { \cO\" \cO\' }
+    { ‘ } { \cO\" \cO\` }
+    { (“|”) } { \cO\" \cO\" }
+    { (—|–) } { \cO\" \cO\- }
+    { \cO([[:punct:]]) } { \cO\" \1 }
   }
   #1
 }

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/datatool-english.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{english}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english}[2025/03/12 v1.1 (NLCT)]
 \TrackLangRequestResource{english-\TrackLangEncodingName}
 {
   \csuse{datatool_locale_warn:nn}{datatool-english}%

Modified: trunk/Master/texmf-dist/tex/latex/datatool-english/person-english.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool-english/person-english.ldf	2025-03-12 19:33:40 UTC (rev 74589)
+++ trunk/Master/texmf-dist/tex/latex/datatool-english/person-english.ldf	2025-03-12 19:33:53 UTC (rev 74590)
@@ -38,7 +38,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\TrackLangProvidesResource{english}[2025/03/01 v1.0 (NLCT)]
+\TrackLangProvidesResource{english}[2025/03/12 v1.1 (NLCT)]
 \newcommand{\DataToolPersonEnglish}{%
   \PersonSetLocalisation{male}{pronoun}{he}%
   \PersonSetLocalisation{female}{pronoun}{she}%



More information about the tex-live-commits mailing list.