Typeset TF of internal conditionals in current color

Fixes #730
latex3 · Feb 27, 2024 · 27ae326 · 27ae326
1 parent 46c6191
commit 27ae326
Show file tree

Hide file tree

Showing 5 changed files with 1,440 additions and 255 deletions.
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- Typeset `TF` of internal conditionals in current color (issue \#730)
+
 ## [2024-02-20]
 
 ### Changed

diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
@@ -2127,7 +2127,6 @@ and all files in that bundle must be distributed together.
       { \hyperlink { explTF } }
       { \mbox }
       {
-        \color{black}
         \itshape TF
         \makebox[0pt][r]
           {
@@ -3206,18 +3205,22 @@ and all files in that bundle must be distributed together.
         \tl_set:Nn \l_@@_tmpa_tl {#1}
         \tl_replace_all:NnV \l_@@_tmpa_tl
           { ~ } \c_catcode_other_space_tl
-        \@@_macroname_prefix:o \l_@@_tmpa_tl
-        \@@_macroname_suffix:N #2
+        \@@_print_macroname_aux:on
+          \l_@@_tmpa_tl { \bool_if:NT #2 { \@@_typeset_TF: } }
       }
   }
-\cs_new_protected:Npn \@@_macroname_prefix:n #1
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_print_macroname_aux:nn}
+%  |#1| is prefix, |#2| is optional |TF| suffix.
+%    \begin{macrocode}
+\cs_new_protected:Npn \@@_print_macroname_aux:nn #1#2
   {
     \@@_if_macro_internal:nTF {#1}
-      { \@@_typeset_aux:n {#1} } {#1}
+      { \@@_typeset_aux:n { #1 #2 } } { #1 #2 }
   }
-\cs_generate_variant:Nn \@@_macroname_prefix:n { o }
-\cs_new_protected:Npn \@@_macroname_suffix:N #1
-  { \bool_if:NTF #1 { \@@_typeset_TF: } { } }
+\cs_generate_variant:Nn \@@_print_macroname_aux:nn { o }
 %    \end{macrocode}
 % \end{macro}
 %

diff --git a/l3kernel/testfiles-l3doc/github-1398.tlg b/l3kernel/testfiles-l3doc/github-1398.tlg
@@ -114,7 +114,6 @@ Completed box being shipped out [1]
 ............\T1/lmtt/m/n/9 N
 ............\T1/lmtt/m/n/9 N
 ............\hbox(5.39143+1.9999)x9.44998
-.............\pdfcolorstack 0 push {0 g 0 G}
 .............\T1/lmtt/m/it/9 T
 .............\T1/lmtt/m/it/9 F
 .............\hbox(5.39143+1.9999)x0.0, glue set - 8.50493fil
@@ -127,7 +126,6 @@ Completed box being shipped out [1]
 ...............\kern1.19994
 ...............\rule(0.39998+0.0)x*
 ..............\mathoff
-............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fill
 ...........\glue(\tabskip) 0.0
 ...........\hbox(7.69997+3.30003)x0.0
@@ -254,7 +252,6 @@ Completed box being shipped out [1]
 ............\T1/lmtt/m/n/9 N
 ............\T1/lmtt/m/n/9 N
 ............\hbox(5.39143+1.9999)x9.44998
-.............\pdfcolorstack 0 push {0 g 0 G}
 .............\T1/lmtt/m/it/9 T
 .............\T1/lmtt/m/it/9 F
 .............\hbox(5.39143+1.9999)x0.0, glue set - 8.50493fil
@@ -267,7 +264,6 @@ Completed box being shipped out [1]
 ...............\kern1.19994
 ...............\rule(0.39998+0.0)x*
 ..............\mathoff
-............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fill
 ...........\glue(\tabskip) 0.0
 ...........\hbox(7.69997+3.30003)x0.0
@@ -293,7 +289,6 @@ Completed box being shipped out [1]
 ............\T1/lmtt/m/n/9 c
 ............\T1/lmtt/m/n/9 N
 ............\hbox(5.39143+1.9999)x9.44998
-.............\pdfcolorstack 0 push {0 g 0 G}
 .............\T1/lmtt/m/it/9 T
 .............\T1/lmtt/m/it/9 F
 .............\hbox(5.39143+1.9999)x0.0, glue set - 8.50493fil
@@ -306,7 +301,6 @@ Completed box being shipped out [1]
 ...............\kern1.19994
 ...............\rule(0.39998+0.0)x*
 ..............\mathoff
-............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fill
 ...........\glue(\tabskip) 0.0
 ...........\hbox(7.69997+3.30003)x0.0
@@ -445,7 +439,6 @@ Completed box being shipped out [1]
 ............\T1/lmtt/m/n/9 N
 ............\T1/lmtt/m/n/9 N
 ............\hbox(5.39143+1.9999)x9.44998
-.............\pdfcolorstack 0 push {0 g 0 G}
 .............\T1/lmtt/m/it/9 T
 .............\T1/lmtt/m/it/9 F
 .............\hbox(5.39143+1.9999)x0.0, glue set - 8.50493fil
@@ -458,7 +451,6 @@ Completed box being shipped out [1]
 ...............\kern1.19994
 ...............\rule(0.39998+0.0)x*
 ..............\mathoff
-............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fill
 ...........\glue(\tabskip) 0.0
 ...........\hbox(7.69997+3.30003)x0.0
@@ -496,7 +488,6 @@ Completed box being shipped out [1]
 ............\T1/lmr/m/n/9 )
 ............\kern 0.0
 ............\hbox(5.39143+1.9999)x9.44998
-.............\pdfcolorstack 0 push {0 g 0 G}
 .............\T1/lmtt/m/it/9 T
 .............\T1/lmtt/m/it/9 F
 .............\hbox(5.39143+1.9999)x0.0, glue set - 8.50493fil
@@ -509,7 +500,6 @@ Completed box being shipped out [1]
 ...............\kern1.19994
 ...............\rule(0.39998+0.0)x*
 ..............\mathoff
-............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fill
 ...........\glue(\tabskip) 0.0
 ...........\hbox(7.69997+3.30003)x0.0
@@ -586,7 +576,6 @@ Completed box being shipped out [1]
 ............\T1/lmtt/m/n/9 N
 ............\T1/lmtt/m/n/9 N
 ............\hbox(5.39143+1.9999)x9.44998
-.............\pdfcolorstack 0 push {0 g 0 G}
 .............\T1/lmtt/m/it/9 T
 .............\T1/lmtt/m/it/9 F
 .............\hbox(5.39143+1.9999)x0.0, glue set - 8.50493fil
@@ -599,7 +588,6 @@ Completed box being shipped out [1]
 ...............\kern1.19994
 ...............\rule(0.39998+0.0)x*
 ..............\mathoff
-............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fill
 ...........\glue(\tabskip) 0.0
 ...........\hbox(7.69997+3.30003)x0.0
@@ -678,7 +666,6 @@ Completed box being shipped out [1]
 ............\T1/lmtt/m/n/9 N
 ............\T1/lmtt/m/n/9 N
 ............\hbox(5.39143+1.9999)x9.44998
-.............\pdfcolorstack 0 push {0 g 0 G}
 .............\T1/lmtt/m/it/9 T
 .............\T1/lmtt/m/it/9 F
 .............\hbox(5.39143+1.9999)x0.0, glue set - 8.50493fil
@@ -691,7 +678,6 @@ Completed box being shipped out [1]
 ...............\kern1.19994
 ...............\rule(0.39998+0.0)x*
 ..............\mathoff
-............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fill
 ...........\glue(\tabskip) 0.0
 ...........\hbox(7.69997+3.30003)x0.0
@@ -717,7 +703,6 @@ Completed box being shipped out [1]
 ............\T1/lmtt/m/n/9 c
 ............\T1/lmtt/m/n/9 N
 ............\hbox(5.39143+1.9999)x9.44998
-.............\pdfcolorstack 0 push {0 g 0 G}
 .............\T1/lmtt/m/it/9 T
 .............\T1/lmtt/m/it/9 F
 .............\hbox(5.39143+1.9999)x0.0, glue set - 8.50493fil
@@ -730,7 +715,6 @@ Completed box being shipped out [1]
 ...............\kern1.19994
 ...............\rule(0.39998+0.0)x*
 ..............\mathoff
-............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fill
 ...........\glue(\tabskip) 0.0
 ...........\hbox(7.69997+3.30003)x0.0
@@ -809,7 +793,6 @@ Completed box being shipped out [1]
 ............\T1/lmtt/m/n/9 N
 ............\T1/lmtt/m/n/9 N
 ............\hbox(5.39143+1.9999)x9.44998
-.............\pdfcolorstack 0 push {0 g 0 G}
 .............\T1/lmtt/m/it/9 T
 .............\T1/lmtt/m/it/9 F
 .............\hbox(5.39143+1.9999)x0.0, glue set - 8.50493fil
@@ -822,7 +805,6 @@ Completed box being shipped out [1]
 ...............\kern1.19994
 ...............\rule(0.39998+0.0)x*
 ..............\mathoff
-............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fill
 ...........\glue(\tabskip) 0.0
 ...........\hbox(7.69997+3.30003)x0.0
@@ -860,7 +842,6 @@ Completed box being shipped out [1]
 ............\T1/lmr/m/n/9 )
 ............\kern 0.0
 ............\hbox(5.39143+1.9999)x9.44998
-.............\pdfcolorstack 0 push {0 g 0 G}
 .............\T1/lmtt/m/it/9 T
 .............\T1/lmtt/m/it/9 F
 .............\hbox(5.39143+1.9999)x0.0, glue set - 8.50493fil
@@ -873,7 +854,6 @@ Completed box being shipped out [1]
 ...............\kern1.19994
 ...............\rule(0.39998+0.0)x*
 ..............\mathoff
-............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fill
 ...........\glue(\tabskip) 0.0
 ...........\hbox(7.69997+3.30003)x0.0

diff --git a/l3kernel/testfiles-l3doc/test.lvt b/l3kernel/testfiles-l3doc/test.lvt
@@ -6,6 +6,10 @@
 \documentclass{l3doc}
 \CodelineIndex
 \begin{document}
+\ExplSyntaxOn
+\tl_gset:Nn \g__codedoc_module_name_tl {foo}
+\ExplSyntaxOff
+
 \START
 \begin{function}{\foo}
   This is a test.
@@ -19,6 +23,10 @@ And \cs{foo} again.
   Argument \meta{arg}.
 \end{function}
 
+\begin{function}[TF]{\foo_if:n}
+  doc
+\end{function}
+
 \begin{macro}{\foo}
     \begin{macrocode}
 test
@@ -28,6 +36,17 @@ test
 %    \end{macrocode}
 \cs{bar}
 \end{macro}
+
+% #730, https://github.com/latex3/latex3/issues/730
+\begin{macro}[TF]{\foo_if:n, \__foo_if:n}
+    \begin{macrocode}
+\prg_new_conditional:Nnn \foo_if:n { p , T , F , TF }
+  { \prg_return_true: }
+\prg_new_conditional:Nnn \__foo_if:n { p , T , F , TF }
+  { \prg_return_true: }
+%    \end{macrocode}
+\end{macro}
+
 \PrintIndex
 \showoutput
 \clearpage