summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty')
-rw-r--r--Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty16
1 files changed, 9 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty
index 2e20114fe61..144bc21b577 100644
--- a/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty
+++ b/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-complements}[2022/07/13 jlreq-complements]
-\RequirePackage{jlreq-helpers}[2021/08/12]
+\ProvidesPackage{jlreq-complements}[2022/11/28 jlreq-complements]
+\RequirePackage{jlreq-helpers}[2022/11/28]
\RequirePackage{l3keys2e}
\ExplSyntaxOn
@@ -40,7 +40,7 @@
\int_compare_p:n { (\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8) == 3 }
}
}{
- \prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} { \legacy_if_p:n { tdir } }
+ \prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} { \iftdir \prg_return_true: \else \prg_return_false: \fi }
}
\@ifundefined{jlreq@zw}{
@@ -129,7 +129,7 @@
\bool_new:N \g__jlreq_complements_theindex_restorepagestyle_bool
\keys_define:Vn \g__jlreq_complements_setupname_str {
theindex_yoko .bool_gset:N = \g__jlreq_complements_theindex_yoko_bool,
- theindex_twocolumn .bool_gset:N = \g__jlreq_complements_theindex_twcolumn_bool,
+ theindex_twocolumn .bool_gset:N = \g__jlreq_complements_theindex_twocolumn_bool,
}
\keys_set:Vn \g__jlreq_complements_setupname_str {
@@ -146,14 +146,15 @@
{ \keys_set:Vn \g__jlreq_complements_setupname_str { theindex_yoko = false } }
{ \keys_set:Vn \g__jlreq_complements_setupname_str { theindex_yoko = true } }
-
\bool_new:N \l__jlreq_complements_resttate_bool
+\bool_new:N \l__jlreq_complements_theindex_maincolumn_bool
\renewenvironment{theindex}{%
\prop_item:Nn \g__jlreq_complements_theindex_prop { precode }
\bool_set_false:N \l__jlreq_complements_resttate_bool
\bool_if:NT \g__jlreq_complements_theindex_yoko_bool {
\__jlreq_complements_iftdir:T { \clearpage \yoko \bool_set_true:N \l__jlreq_complements_resttate_bool }
}
+ \bool_set:Nn \l__jlreq_complements_theindex_maincolumn_bool { \legacy_if_p:n { @twocolumn } }
\bool_if:NTF \g__jlreq_complements_theindex_twocolumn_bool {
\setlength{\columnseprule}{ \prop_item:Nn \g__jlreq_complements_theindex_prop { column_rule_width } }
\setlength{\columnsep} { \prop_item:Nn \g__jlreq_complements_theindex_prop { column_gap } }
@@ -168,14 +169,15 @@
}
\prop_item:Nn \g__jlreq_complements_theindex_prop { mark }
\tl_set:Nx \l__jlreq_tmpa_tl { \exp_not:N \pagestyle { \prop_item:Nn \g__jlreq_complements_theindex_prop { pagestyle } } }
+ \l__jlreq_tmpa_tl
\parindent\z@
\parskip\z@ \@plus .03\jlreq@zh\relax
\let\item\@idxitem
}{%
\bool_if:NTF \g__jlreq_complements_theindex_twocolumn_bool {
- \legacy_if:nF { @twocolumn } { \onecolumn }
+ \bool_if:NF \l__jlreq_complements_theindex_maincolumn_bool { \onecolumn }
}{
- \legacy_if:nT { @twocolumn } { \twocolumn }
+ \bool_if:NT \l__jlreq_complements_theindex_maincolumn_bool { \twocolumn }
}
\clearpage
\bool_if:NT \l__jlreq_complements_resttate_bool { \tate }