[latex3-commits] [git/LaTeX3-latex3-latex3] main: Make \peek_analysis_map_inline:n alignment-safe (95823cff8)
PhelypeOleinik
phelype.oleinik at latex-project.org
Wed Jun 15 05:52:04 CEST 2022
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/95823cff80dec8de1e5d5a590264081e2b745c84
>---------------------------------------------------------------
commit 95823cff80dec8de1e5d5a590264081e2b745c84
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date: Wed Jun 15 00:52:04 2022 -0300
Make \peek_analysis_map_inline:n alignment-safe
fixes #1090
>---------------------------------------------------------------
95823cff80dec8de1e5d5a590264081e2b745c84
l3kernel/CHANGELOG.md | 3 +++
l3kernel/l3tl-analysis.dtx | 4 +++-
l3kernel/testfiles/m3tl-analysis002.lvt | 17 +++++++++++++++++
l3kernel/testfiles/m3tl-analysis002.tlg | 8 ++++++++
4 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index af84da5d9..c3f280158 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+### Fixed
+- Made `\peek_analysis_map_inline:n` alignment-safe (gh/1090)
+
## [2022-06-02]
### Changed
diff --git a/l3kernel/l3tl-analysis.dtx b/l3kernel/l3tl-analysis.dtx
index d1e581352..67a6b4450 100644
--- a/l3kernel/l3tl-analysis.dtx
+++ b/l3kernel/l3tl-analysis.dtx
@@ -1192,6 +1192,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \peek_analysis_map_inline:n #1
{
+ \group_align_safe_begin:
\int_gincr:N \g__kernel_prg_map_int
\cs_set_protected:cpn
{ @@_analysis_map_ \int_use:N \g__kernel_prg_map_int :nnN }
@@ -1200,7 +1201,8 @@
\group_end:
#1
\@@_peek_analysis_loop:NNn
- \prg_break_point:Nn \peek_analysis_map_break: { }
+ \prg_break_point:Nn \peek_analysis_map_break:
+ { \group_align_safe_end: }
}
\@@_peek_analysis_loop:NNn ? ? ?
}
diff --git a/l3kernel/testfiles/m3tl-analysis002.lvt b/l3kernel/testfiles/m3tl-analysis002.lvt
index 0c934af75..eceb3f41f 100644
--- a/l3kernel/testfiles/m3tl-analysis002.lvt
+++ b/l3kernel/testfiles/m3tl-analysis002.lvt
@@ -48,4 +48,21 @@
}
}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\TEST { peek_analysis_map_inline~in~alignments }
+ {
+ \cs_set:Npn \test:w
+ {
+ \peek_analysis_map_inline:n
+ {
+ \int_compare:nNnTF {##2} = { `Z }
+ { \peek_analysis_map_break: }
+ { \iow_term:x {##1} }
+ }
+ }
+ \hbox_set:Nn \l_tmpa_box { \test:w XYZ }
+ \hbox_set:Nn \l_tmpa_box
+ { \tex_valign:D { # \cr \test:w XYZ \cr } }
+ }
+
\END
diff --git a/l3kernel/testfiles/m3tl-analysis002.tlg b/l3kernel/testfiles/m3tl-analysis002.tlg
index 405af406e..7602de50d 100644
--- a/l3kernel/testfiles/m3tl-analysis002.tlg
+++ b/l3kernel/testfiles/m3tl-analysis002.tlg
@@ -26,3 +26,11 @@ TEST 2: tl_analysis_map_inline nesting
|b z d|
|b c c|
============================================================
+============================================================
+TEST 3: peek_analysis_map_inline in alignments
+============================================================
+X
+Y
+X
+Y
+============================================================
More information about the latex3-commits
mailing list.