[latex3-commits] [latex3/latex3] main: Omit 0123456789 from URL escaping (fixes #838) (1e2e56ccd)

[github at latex-project.org]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/1e2e56ccd96c7261e7e29c1759914717a65e5c52

>---------------------------------------------------------------

commit 1e2e56ccd96c7261e7e29c1759914717a65e5c52
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed May 17 22:56:42 2023 +0100

    Omit 0123456789 from URL escaping (fixes #838)


>---------------------------------------------------------------

1e2e56ccd96c7261e7e29c1759914717a65e5c52
 l3kernel/CHANGELOG.md                          | 3 +++
 l3kernel/l3str-convert.dtx                     | 6 +++---
 l3kernel/testfiles/m3str-convert002.luatex.tlg | 2 +-
 l3kernel/testfiles/m3str-convert002.tlg        | 2 +-
 l3kernel/testfiles/m3str-convert002.xetex.tlg  | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index f78f9ed04..be2a4dc45 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -12,6 +12,9 @@ this project uses date-based 'snapshot' version identifiers.
   one argument from up to nine arguments
 - `\int_if_zero:n(TF)`
 
+### Fixed
+- Omit `0123456789` from URL escaping (issue \#838)
+
 ## [2023-05-15]
 
 ### Changed
diff --git a/l3kernel/l3str-convert.dtx b/l3kernel/l3str-convert.dtx
index 5608305e2..e00fb0a0a 100644
--- a/l3kernel/l3str-convert.dtx
+++ b/l3kernel/l3str-convert.dtx
@@ -1717,14 +1717,14 @@
   }
 \prg_new_conditional:Npnn \@@_if_escape_url:n #1 { TF }
   {
-    \if_int_compare:w `#1 < "41 \exp_stop_f:
-      \@@_if_contains_char:nnTF { "-.<> } {#1}
+    \if_int_compare:w `#1 < "30 \exp_stop_f:
+      \@@_if_contains_char:nnTF { "-. } {#1}
         \prg_return_true: \prg_return_false:
     \else:
       \if_int_compare:w `#1 > "7E \exp_stop_f:
         \prg_return_false:
       \else:
-        \@@_if_contains_char:nnTF { [ ] } {#1}
+        \@@_if_contains_char:nnTF { : ; = ? @ [ ] } {#1}
           \prg_return_false: \prg_return_true:
       \fi:
     \fi:
diff --git a/l3kernel/testfiles/m3str-convert002.luatex.tlg b/l3kernel/testfiles/m3str-convert002.luatex.tlg
index a0d3b1478..1090993ad 100644
--- a/l3kernel/testfiles/m3str-convert002.luatex.tlg
+++ b/l3kernel/testfiles/m3str-convert002.luatex.tlg
@@ -120,7 +120,7 @@ TRUE
 TRUE
 %20%21"%23%24%25%26%27%28%29%2A%2B%2C-.%2F
 TRUE
-%30%31%32%33%34%35%36%37%38%39%3A%3B<%3D>%3F
+0123456789%3A%3B<%3D>%3F
 TRUE
 %40ABCDEFGHIJKLMNO
 TRUE
diff --git a/l3kernel/testfiles/m3str-convert002.tlg b/l3kernel/testfiles/m3str-convert002.tlg
index 4f83db46f..5626c1647 100644
--- a/l3kernel/testfiles/m3str-convert002.tlg
+++ b/l3kernel/testfiles/m3str-convert002.tlg
@@ -119,7 +119,7 @@ TRUE
 TRUE
 %20%21"%23%24%25%26%27%28%29%2A%2B%2C-.%2F
 TRUE
-%30%31%32%33%34%35%36%37%38%39%3A%3B<%3D>%3F
+0123456789%3A%3B<%3D>%3F
 TRUE
 %40ABCDEFGHIJKLMNO
 TRUE
diff --git a/l3kernel/testfiles/m3str-convert002.xetex.tlg b/l3kernel/testfiles/m3str-convert002.xetex.tlg
index d50b04c28..8bd8697fc 100644
--- a/l3kernel/testfiles/m3str-convert002.xetex.tlg
+++ b/l3kernel/testfiles/m3str-convert002.xetex.tlg
@@ -119,7 +119,7 @@ TRUE
 TRUE
 %20%21"%23%24%25%26%27%28%29%2A%2B%2C-.%2F
 TRUE
-%30%31%32%33%34%35%36%37%38%39%3A%3B<%3D>%3F
+0123456789%3A%3B<%3D>%3F
 TRUE
 %40ABCDEFGHIJKLMNO
 TRUE