test: track LaTeX2e 2024-06-01 changes

- Loading packages in a group becomes invalid - xtemplate is integraded thus loading it only loads the stub - A \__mark_id:n {<id>} is prepended to every mark content (remark: a lot of tests are affected!) - All m-type document commands are optimized
CTeX-org · Jun 5, 2024 · 21c189f · 21c189f
1 parent b2d6a6c
commit 21c189f
Show file tree

Hide file tree

Showing 81 changed files with 1,425 additions and 1,412 deletions.
diff --git a/ctex/test/testfiles-contrib/pkuthss.tlg b/ctex/test/testfiles-contrib/pkuthss.tlg
@@ -852,8 +852,8 @@ Completed box being shipped out [1]
 .....\glue(\rightskip) 0.0 plus 1.0fil
 ....\penalty 10000
 ....\glue 18.06749 plus 1.08403
-....\marks1{摘要}
-....\marks2{\prg_do_nothing: }
+....\marks1{\__mark_id:n {1}摘要}
+....\marks2{\__mark_id:n {2}}
 ....\mark{{摘要}{}}
 ....\penalty 10000
 ....\glue(\parskip) 0.0 plus 1.0
@@ -1099,8 +1099,8 @@ Completed box being shipped out [3]
 .....\glue(\rightskip) 0.0 plus 1.0fil
 ....\penalty 10000
 ....\glue 18.06749 plus 1.08403
-....\marks1{ABSTRACT}
-....\marks2{\prg_do_nothing: }
+....\marks1{\__mark_id:n {3}ABSTRACT}
+....\marks2{\__mark_id:n {4}}
 ....\mark{{ABSTRACT}{}}
 ....\penalty 10000
 ....\glue 0.0
@@ -1395,9 +1395,9 @@ Completed box being shipped out [5]
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0
 .....\glue(\rightskip) 0.0 plus 1.0fil
-....\marks1{\MakeUppercase    []{目录}}
-....\marks2{\MakeUppercase    []{目录}}
-....\marks3{\MakeUppercase    []{目录}}
+....\marks1{\__mark_id:n {5}\MakeUppercase    []{目录}}
+....\marks2{\__mark_id:n {6}\MakeUppercase    []{目录}}
+....\marks3{\__mark_id:n {7}\MakeUppercase    []{目录}}
 ....\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ....\penalty 10000
 ....\glue 18.06749 plus 1.08403
@@ -1593,8 +1593,8 @@ Completed box being shipped out [1]
 ....\special{pdf:dest (chapter.1) [@thispage /XYZ @xpos @ypos null]}
 ....\write4{\protect \BOOKMARK [0][-]{chapter.1}{\376\377\136\046\000\040\000E\000n\000g\000l\000i\000s\000h\000\040\166\204\150\007\230\230}{}% 5}
 ....\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {第一章\protect \hspace  {.3em}}带 English 的标题}{\thepage }{chapter.1}\protected@file@percent }}
-....\marks1{\MakeUppercase    []{第一章\hskip 1em\relax 带 English 的标题}}
-....\marks2{\prg_do_nothing: }
+....\marks1{\__mark_id:n {8}\MakeUppercase    []{第一章\hskip 1em\relax 带 English 的标题}}
+....\marks2{\__mark_id:n {9}}
 ....\mark{{\MakeUppercase    []{第一章\hskip 1em\relax 带 English 的标题}}{}}
 ....\write1{\@writefile{lof}{\protect \addvspace {10.0pt}}}
 ....\write1{\@writefile{lot}{\protect \addvspace {10.0pt}}}
@@ -1654,8 +1654,8 @@ Completed box being shipped out [1]
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
-....\marks2{\MakeUppercase    []{1.1\hskip 1em\relax 封面}}
-....\marks3{\MakeUppercase    []{1.1\hskip 1em\relax 封面}}
+....\marks2{\__mark_id:n {10}\MakeUppercase    []{1.1\hskip 1em\relax 封面}}
+....\marks3{\__mark_id:n {11}\MakeUppercase    []{1.1\hskip 1em\relax 封面}}
 ....\mark{{\MakeUppercase    []{第一章\hskip 1em\relax 带 English 的标题}}{\MakeUppercase    []{1.1\hskip 1em\relax 封面}}}
 ....\penalty 10000
 ....\write4{\protect \BOOKMARK [1][-]{section.1.1}{\376\377\134\001\227\142}{chapter.1}% 6}
@@ -1685,8 +1685,8 @@ Completed box being shipped out [1]
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
-....\marks2{\MakeUppercase    []{1.2\hskip 1em\relax 字体}}
-....\marks3{\MakeUppercase    []{1.2\hskip 1em\relax 字体}}
+....\marks2{\__mark_id:n {12}\MakeUppercase    []{1.2\hskip 1em\relax 字体}}
+....\marks3{\__mark_id:n {13}\MakeUppercase    []{1.2\hskip 1em\relax 字体}}
 ....\mark{{\MakeUppercase    []{第一章\hskip 1em\relax 带 English 的标题}}{\MakeUppercase    []{1.2\hskip 1em\relax 字体}}}
 ....\penalty 10000
 ....\write4{\protect \BOOKMARK [1][-]{section.1.2}{\376\377\133\127\117\123}{chapter.1}% 7}
@@ -1882,8 +1882,8 @@ Completed box being shipped out [3]
 ....\special{pdf:dest (chapter.2) [@thispage /XYZ @xpos @ypos null]}
 ....\write4{\protect \BOOKMARK [0][-]{chapter.2}{\376\377\155\113\213\325}{}% 8}
 ....\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {第二章\protect \hspace  {.3em}}测试}{\thepage }{chapter.2}\protected@file@percent }}
-....\marks1{\MakeUppercase    []{第二章\hskip 1em\relax 测试}}
-....\marks2{\prg_do_nothing: }
+....\marks1{\__mark_id:n {14}\MakeUppercase    []{第二章\hskip 1em\relax 测试}}
+....\marks2{\__mark_id:n {15}}
 ....\mark{{\MakeUppercase    []{第二章\hskip 1em\relax 测试}}{}}
 ....\write1{\@writefile{lof}{\protect \addvspace {10.0pt}}}
 ....\write1{\@writefile{lot}{\protect \addvspace {10.0pt}}}
@@ -1940,8 +1940,8 @@ Completed box being shipped out [3]
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
-....\marks2{\MakeUppercase    []{2.1\hskip 1em\relax 交叉引用}}
-....\marks3{\MakeUppercase    []{2.1\hskip 1em\relax 交叉引用}}
+....\marks2{\__mark_id:n {16}\MakeUppercase    []{2.1\hskip 1em\relax 交叉引用}}
+....\marks3{\__mark_id:n {17}\MakeUppercase    []{2.1\hskip 1em\relax 交叉引用}}
 ....\mark{{\MakeUppercase    []{第二章\hskip 1em\relax 测试}}{\MakeUppercase    []{2.1\hskip 1em\relax 交叉引用}}}
 ....\penalty 10000
 ....\write4{\protect \BOOKMARK [1][-]{section.2.1}{\376\377\116\244\123\311\137\025\165\050}{chapter.2}% 9}
@@ -2015,8 +2015,8 @@ Completed box being shipped out [3]
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
-....\marks2{\MakeUppercase    []{2.2\hskip 1em\relax 数学}}
-....\marks3{\MakeUppercase    []{2.2\hskip 1em\relax 数学}}
+....\marks2{\__mark_id:n {18}\MakeUppercase    []{2.2\hskip 1em\relax 数学}}
+....\marks3{\__mark_id:n {19}\MakeUppercase    []{2.2\hskip 1em\relax 数学}}
 ....\mark{{\MakeUppercase    []{第二章\hskip 1em\relax 测试}}{\MakeUppercase    []{2.2\hskip 1em\relax 数学}}}
 ....\write4{\protect \BOOKMARK [1][-]{section.2.2}{\376\377\145\160\133\146}{chapter.2}% 10}
 ....\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2.2}数学}{\thepage }{section.2.2}\protected@file@percent }}

diff --git a/ctex/test/testfiles-contrib/thuthesis.tlg b/ctex/test/testfiles-contrib/thuthesis.tlg
@@ -834,9 +834,9 @@ Completed box being shipped out [1]
 ....\glue(\rightskip) 0.0 plus 1.0fil
 ...\penalty 10000
 ...\glue 27.10124 plus -1.0
-...\marks1{摘\hskip 1em\relax 要}
-...\marks2{摘\hskip 1em\relax 要}
-...\marks3{摘\hskip 1em\relax 要}
+...\marks1{\__mark_id:n {1}摘\hskip 1em\relax 要}
+...\marks2{\__mark_id:n {2}摘\hskip 1em\relax 要}
+...\marks3{\__mark_id:n {3}摘\hskip 1em\relax 要}
 ...\mark{{摘\hskip 1em\relax 要}{摘\hskip 1em\relax 要}}
 ...\penalty 10000
 ...\glue(\parskip) 0.0 plus 1.0
@@ -1014,9 +1014,9 @@ Completed box being shipped out [2]
 ....\glue(\rightskip) 0.0 plus 1.0fil
 ...\penalty 10000
 ...\glue 27.10124 plus -1.0
-...\marks1{Abstract}
-...\marks2{Abstract}
-...\marks3{Abstract}
+...\marks1{\__mark_id:n {4}Abstract}
+...\marks2{\__mark_id:n {5}Abstract}
+...\marks3{\__mark_id:n {6}Abstract}
 ...\mark{{Abstract}{Abstract}}
 ...\penalty 10000
 ...\glue(\parskip) 0.0 plus 1.0
@@ -1197,9 +1197,9 @@ Completed box being shipped out [3]
 ....\glue(\rightskip) 0.0 plus 1.0fil
 ...\penalty 10000
 ...\glue 27.10124 plus -1.0
-...\marks1{目\hskip 1em\relax 录}
-...\marks2{目\hskip 1em\relax 录}
-...\marks3{目\hskip 1em\relax 录}
+...\marks1{\__mark_id:n {7}目\hskip 1em\relax 录}
+...\marks2{\__mark_id:n {8}目\hskip 1em\relax 录}
+...\marks3{\__mark_id:n {9}目\hskip 1em\relax 录}
 ...\mark{{目\hskip 1em\relax 录}{目\hskip 1em\relax 录}}
 ...\penalty 10000
 ...\glue 0.0 plus 1.0fil
@@ -1390,8 +1390,8 @@ Completed box being shipped out [1]
 ...\write-{}
 ...\write1{\pp@pagectr{footnote}{1}{\theabspage }{\thepage }}
 ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {第1章}带 English 的标题}{\thepage }{}\protected@file@percent }}
-...\marks1{第1章\hskip 1em\relax 带 English 的标题}
-...\marks2{\prg_do_nothing: }
+...\marks1{\__mark_id:n {10}第1章\hskip 1em\relax 带 English 的标题}
+...\marks2{\__mark_id:n {11}}
 ...\mark{{第1章\hskip 1em\relax 带 English 的标题}{}}
 ...\glue(\topskip) 12.0
 ...\rule(0.0+0.0)x*
@@ -1607,8 +1607,8 @@ Completed box being shipped out [2]
 ...\write-{}
 ...\write1{\pp@pagectr{footnote}{2}{\theabspage }{\thepage }}
 ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {第2章}测试}{\thepage }{}\protected@file@percent }}
-...\marks1{第2章\hskip 1em\relax 测试}
-...\marks2{\prg_do_nothing: }
+...\marks1{\__mark_id:n {12}第2章\hskip 1em\relax 测试}
+...\marks2{\__mark_id:n {13}}
 ...\mark{{第2章\hskip 1em\relax 测试}{}}
 ...\glue(\topskip) 12.0
 ...\rule(0.0+0.0)x*
@@ -2180,9 +2180,9 @@ Completed box being shipped out [3]
 ....\glue(\rightskip) 0.0 plus 1.0fil
 ...\penalty 10000
 ...\glue 27.10124 plus -1.0
-...\marks1{声\protect \hspace  {1em}明}
-...\marks2{声\protect \hspace  {1em}明}
-...\marks3{声\protect \hspace  {1em}明}
+...\marks1{\__mark_id:n {14}声\protect \hspace  {1em}明}
+...\marks2{\__mark_id:n {15}声\protect \hspace  {1em}明}
+...\marks3{\__mark_id:n {16}声\protect \hspace  {1em}明}
 ...\mark{{声\protect \hspace  {1em}明}{声\protect \hspace  {1em}明}}
 ...\penalty 10000
 ...\glue(\parskip) 0.0 plus 1.0
@@ -2676,8 +2676,8 @@ Completed box being shipped out [4]
 ...\write-{}
 ...\write1{\pp@pagectr{footnote}{3}{\theabspage }{\thepage }}
 ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {附录 A}单目标规划}{\thepage }{}\protected@file@percent }}
-...\marks1{附录 A\hskip 1em\relax 单目标规划}
-...\marks2{\prg_do_nothing: }
+...\marks1{\__mark_id:n {17}附录 A\hskip 1em\relax 单目标规划}
+...\marks2{\__mark_id:n {18}}
 ...\mark{{附录 A\hskip 1em\relax 单目标规划}{}}
 ...\glue(\topskip) 12.0
 ...\rule(0.0+0.0)x*

diff --git a/ctex/test/testfiles/ctexhook.lvt b/ctex/test/testfiles/ctexhook.lvt
@@ -14,17 +14,21 @@
 
 \TEST { Package~hook }
   {
+    % close the group opened by \BEGINTEST used in \TEST
+    % loading packages in a group is invalid since LaTeX2e 2024-06-01
+    \group_end:
     \clist_map_inline:nn
       { indentfirst, somedefs, hyperref }
       {
-        \ctex_at_begin_package:nn {#1} { \TYPE { Begin~hook:~#1 } }
-        \ctex_at_end_package:nn {#1} { \TYPE { End~hook:~#1 } }
+        \ctex_at_begin_package:nn {#1} { \LONGTYPEOUT { Begin~hook:~#1 } }
+        \ctex_at_end_package:nn {#1} { \LONGTYPEOUT { End~hook:~#1 } }
       }
     \cs_set_eq:cN { protected@wlog } \use_none:n
     \cs_set_eq:NN \wlog \use_none:n
     \usepackage{somedefs}
     \usepackage{indentfirst}
     \usepackage{xr}
+    \group_begin:
   }
 
 \TEST { Begin~document~hook }

diff --git a/ctex/test/testfiles/files01.tlg b/ctex/test/testfiles/files01.tlg
@@ -18,7 +18,6 @@ size10.clo
 ctex-engine-xetex.def
 xeCJK.sty
 xtemplate.sty
-xtemplate-....-..-...sty
 fontspec.sty
 xparse.sty
 fontspec-xetex.sty

diff --git a/ctex/test/testfiles/files02.tlg b/ctex/test/testfiles/files02.tlg
@@ -17,7 +17,6 @@ ctexopts.cfg
 ctex-engine-xetex.def
 xeCJK.sty
 xtemplate.sty
-xtemplate-....-..-...sty
 fontspec.sty
 xparse.sty
 fontspec-xetex.sty

diff --git a/ctex/test/testfiles/github472-01.luatex.tlg b/ctex/test/testfiles/github472-01.luatex.tlg
@@ -55,9 +55,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0
 ....\glue(\rightskip) 0.0 plus 1.0fil
-...\marks1{\MakeUppercase    []{目录}}
-...\marks2{\MakeUppercase    []{目录}}
-...\marks3{\MakeUppercase    []{目录}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{目录}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{目录}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{目录}}
 ...\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ...\penalty 10000
 ...\glue 40.0

diff --git a/ctex/test/testfiles/github472-01.pdftex.tlg b/ctex/test/testfiles/github472-01.pdftex.tlg
@@ -38,9 +38,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0
 ....\glue(\rightskip) 0.0 plus 1.0fil
-...\marks1{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
-...\marks2{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
-...\marks3{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
 ...\mark{{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}}
 ...\penalty 10000
 ...\glue 40.0

diff --git a/ctex/test/testfiles/github472-01.tlg b/ctex/test/testfiles/github472-01.tlg
@@ -36,9 +36,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0
 ....\glue(\rightskip) 0.0 plus 1.0fil
-...\marks1{\MakeUppercase    []{目录}}
-...\marks2{\MakeUppercase    []{目录}}
-...\marks3{\MakeUppercase    []{目录}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{目录}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{目录}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{目录}}
 ...\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ...\penalty 10000
 ...\glue 40.0

diff --git a/ctex/test/testfiles/github472-01.uptex.tlg b/ctex/test/testfiles/github472-01.uptex.tlg
@@ -33,9 +33,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0
 ....\glue(\rightskip) 0.0 plus 1.0fil
-...\marks1{\MakeUppercase    []{目录}}
-...\marks2{\MakeUppercase    []{目录}}
-...\marks3{\MakeUppercase    []{目录}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{目录}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{目录}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{目录}}
 ...\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ...\penalty 10000
 ...\glue 40.0

diff --git a/ctex/test/testfiles/github472-02.luatex.tlg b/ctex/test/testfiles/github472-02.luatex.tlg
@@ -63,9 +63,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0
 ....\glue(\rightskip) 0.0 plus 1.0fil
-...\marks1{\MakeUppercase    []{目录}}
-...\marks2{\MakeUppercase    []{目录}}
-...\marks3{\MakeUppercase    []{目录}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{目录}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{目录}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{目录}}
 ...\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ...\penalty 10000
 ...\glue 40.0

diff --git a/ctex/test/testfiles/github472-02.pdftex.tlg b/ctex/test/testfiles/github472-02.pdftex.tlg
@@ -38,9 +38,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0
 ....\glue(\rightskip) 0.0 plus 1.0fil
-...\marks1{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
-...\marks2{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
-...\marks3{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
 ...\mark{{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}}
 ...\penalty 10000
 ...\glue 40.0

diff --git a/ctex/test/testfiles/github472-02.tlg b/ctex/test/testfiles/github472-02.tlg
@@ -39,9 +39,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0
 ....\glue(\rightskip) 0.0 plus 1.0fil
-...\marks1{\MakeUppercase    []{目录}}
-...\marks2{\MakeUppercase    []{目录}}
-...\marks3{\MakeUppercase    []{目录}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{目录}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{目录}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{目录}}
 ...\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ...\penalty 10000
 ...\glue 40.0

diff --git a/ctex/test/testfiles/github472-02.uptex.tlg b/ctex/test/testfiles/github472-02.uptex.tlg
@@ -42,9 +42,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0
 ....\glue(\rightskip) 0.0 plus 1.0fil
-...\marks1{\MakeUppercase    []{目录}}
-...\marks2{\MakeUppercase    []{目录}}
-...\marks3{\MakeUppercase    []{目录}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{目录}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{目录}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{目录}}
 ...\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ...\penalty 10000
 ...\glue 40.0

diff --git a/ctex/test/testfiles/github472-03.luatex.tlg b/ctex/test/testfiles/github472-03.luatex.tlg
@@ -54,9 +54,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-...\marks1{\MakeUppercase    []{目录}}
-...\marks2{\MakeUppercase    []{目录}}
-...\marks3{\MakeUppercase    []{目录}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{目录}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{目录}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{目录}}
 ...\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ...\penalty 10000
 ...\glue 10.44768 plus 0.90848

diff --git a/ctex/test/testfiles/github472-03.pdftex.tlg b/ctex/test/testfiles/github472-03.pdftex.tlg
@@ -37,9 +37,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-...\marks1{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
-...\marks2{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
-...\marks3{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}
 ...\mark{{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}{\MakeUppercase    []{^^e7^^9b^^ae^^e5^^bd^^95}}}
 ...\penalty 10000
 ...\glue 10.4369 plus 0.90753

diff --git a/ctex/test/testfiles/github472-03.tlg b/ctex/test/testfiles/github472-03.tlg
@@ -35,9 +35,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-...\marks1{\MakeUppercase    []{目录}}
-...\marks2{\MakeUppercase    []{目录}}
-...\marks3{\MakeUppercase    []{目录}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{目录}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{目录}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{目录}}
 ...\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ...\penalty 10000
 ...\glue 10.44768 plus 0.90848

diff --git a/ctex/test/testfiles/github472-03.uptex.tlg b/ctex/test/testfiles/github472-03.uptex.tlg
@@ -32,9 +32,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-...\marks1{\MakeUppercase    []{目录}}
-...\marks2{\MakeUppercase    []{目录}}
-...\marks3{\MakeUppercase    []{目录}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{目录}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{目录}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{目录}}
 ...\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ...\penalty 10000
 ...\glue 10.4369 plus 0.90753

diff --git a/ctex/test/testfiles/github472-04.luatex.tlg b/ctex/test/testfiles/github472-04.luatex.tlg
@@ -61,9 +61,9 @@ Completed box being shipped out [2]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-...\marks1{\MakeUppercase    []{目录}}
-...\marks2{\MakeUppercase    []{目录}}
-...\marks3{\MakeUppercase    []{目录}}
+...\marks1{\__mark_id:n {1}\MakeUppercase    []{目录}}
+...\marks2{\__mark_id:n {2}\MakeUppercase    []{目录}}
+...\marks3{\__mark_id:n {3}\MakeUppercase    []{目录}}
 ...\mark{{\MakeUppercase    []{目录}}{\MakeUppercase    []{目录}}}
 ...\penalty 10000
 ...\glue 10.44768 plus 0.90848