diff options
author | Karl Berry <karl@freefriends.org> | 2023-02-08 20:58:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-02-08 20:58:33 +0000 |
commit | 9e86954496699c983a17856998b6c1d504fec39a (patch) | |
tree | c1e90ac75d86d0e07b6c8c4a2525294c4bc2de1e | |
parent | 68106ee50bc19f6c0945c3cf1e8788c1c42be8c0 (diff) |
cascade (8feb23)
git-svn-id: svn://tug.org/texlive/trunk@65757 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/cascade/README.md | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/cascade/cascade-french.pdf | bin | 70833 -> 71128 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/cascade/cascade.pdf | bin | 119231 -> 100503 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/cascade/cascade.dtx | 74 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/cascade/cascade.ins | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/cascade/cascade.sty | 22 |
6 files changed, 46 insertions, 58 deletions
diff --git a/Master/texmf-dist/doc/latex/cascade/README.md b/Master/texmf-dist/doc/latex/cascade/README.md index 051fe2c0a7f..224e45aa075 100644 --- a/Master/texmf-dist/doc/latex/cascade/README.md +++ b/Master/texmf-dist/doc/latex/cascade/README.md @@ -2,7 +2,7 @@ Author: F. Pantigny (`fpantigny@wanadoo.fr`). -CTAN page: `https://ctan.org/pkg/nicematrix` +CTAN page: `https://ctan.org/pkg/cascade` ## License The LaTeX extension `cascade` is distributed under the LPPL 1.3 license. @@ -20,7 +20,7 @@ The package `cascade` is present in the distributions MiKTeX, TeXLive and MacTeX For a manual installation: * put the files `cascade.ins` and `cascade.dtx` in the same directory; -* run `latex cascade.ins`. +* run `latex cascade.ins` in that directory. The file `cascade.sty` will be generated. diff --git a/Master/texmf-dist/doc/latex/cascade/cascade-french.pdf b/Master/texmf-dist/doc/latex/cascade/cascade-french.pdf Binary files differindex 964587adc6a..e220f409407 100644 --- a/Master/texmf-dist/doc/latex/cascade/cascade-french.pdf +++ b/Master/texmf-dist/doc/latex/cascade/cascade-french.pdf diff --git a/Master/texmf-dist/doc/latex/cascade/cascade.pdf b/Master/texmf-dist/doc/latex/cascade/cascade.pdf Binary files differindex 98e5437c284..c4be38ff5c8 100644 --- a/Master/texmf-dist/doc/latex/cascade/cascade.pdf +++ b/Master/texmf-dist/doc/latex/cascade/cascade.pdf diff --git a/Master/texmf-dist/source/latex/cascade/cascade.dtx b/Master/texmf-dist/source/latex/cascade/cascade.dtx index 3112dab3142..8ccc24de98d 100644 --- a/Master/texmf-dist/source/latex/cascade/cascade.dtx +++ b/Master/texmf-dist/source/latex/cascade/cascade.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2018-2021 by F. Pantigny +% Copyright (C) 2018-2023 by F. Pantigny % ----------------------------------- % % This file may be distributed and/or modified under the @@ -15,8 +15,8 @@ % % \fi % \iffalse -\def\myfileversion{1.2} -\def\myfiledate{2021/08/23} +\def\myfileversion{1.2a} +\def\myfiledate{2023/02/08} % % %<*batchfile> @@ -26,7 +26,7 @@ \usedir{tex/latex/cascade} \preamble -Copyright (C) 2018-2021 by F. Pantigny +Copyright (C) 2018-2023 by F. Pantigny ----------------------------------- This file may be distributed and/or modified under the @@ -62,35 +62,6 @@ version 2005/12/01 or later. \skip\footins = 2\bigskipamount -\EnableCrossrefs -\makeatletter -\ExplSyntaxOn -\DoNotIndex{\begin,\end} -\DoNotIndex{\c@iRow,\c@jCol,\theiRow,\thejCol} -\DoNotIndex{\pgfpicture,\endpgfpicture,\tikzpicture,\endtikzpicture} -\DoNotIndex{\pgfpoint,\pgfnode,\pgfnodealias,\pgfcoordinate} -\DoNotIndex{\pgf@x,\pgf@y} -\DoNotIndex{\int_add:Nn,\int_case:nnTF,\int_compare:nNnTF,\int_compare:nTF, - \int_compare_p:nNn,\int_decr:N,\int_eval:n,\int_add:Nn,\int_gdecr:N,\int_gincr:N - \int_gset:Nn,\int_gset_eq:NN,\int_gzero:N,\int_gzero_new:N,\int_if_odd:nTF, - \int_max:nn,\int_new:N,\int_set:Nn,\int_set_eq:NN,\int_step_inline:nnn, - \int_step_variable:nNn,\int_step_variable:nnNn,\int_sub:Nn,\int_use:N,\int_zero:N, - \int_zero_new:N,\g_tmpa_int,\l_tmpa_int,\l_tmpb_int -} -\DoNotIndex{\dim_abs:n,\dim_add:Nn,\dim_compare:nNnTF,\dim_compare_p:nNn, -\dim_const:Nn,\dim_eval:n,\dim_gadd:Nn,\dim_gset:Nn,\dim_gset_eq:NN, -\dim_gset:Nn,\dim_gset_eq:NN,\dim_gsub:Nn,\dim_gzero_new:N,\dim_max:nn, -\dim_min:nn,\dim_new:N,\dim_ration:nn,\dim_set:Nn,\dim_set_eq:NN,\dim_sub:Nn, -\dim_use:N,\dim_zero:N,\dim_zero_new:N,\g_tmpa_dim,\l_tmpa_dim,\l_tmpb_dim, -\c_zero_dim} -\DoNotIndex{\cs_new_protected:Npn,\cs_new:Npn,\cs_set_eq:NN, -\cs_set_protected:Npn} -\DoNotIndex{\bool_if:NTF,\bool_new:N,\bool_set_false:N,\bool_set_true:N,\l_tmpa_bool} -\DoNotIndex{\group_begin:,\group_end:,\c_math_toggle_token} -\DoNotIndex{\tl_set:Nn,\l_tmpa_tl} -\ExplSyntaxOff -\makeatother - \begin{document} \DocInput{cascade.dtx} @@ -157,7 +128,7 @@ version 2005/12/01 or later. % \end{center} % % \interitem -% For the lisibility of such constructions, a simplified version of |\Cascade| +% For the legibility of such constructions, a simplified version of |\Cascade| % is available, named |\ShortCascade|. % % The code |\ShortCascade{X}{Y}| is merely a shortcut for the code @@ -522,7 +493,7 @@ version 2005/12/01 or later. % % \iffalse %% -%% The command \Cascade is defined with \NewDocumentCommand of xparse +%% The command \Cascade is defined with \NewDocumentCommand of L3. % \fi % \interitem % \DescribeMacro{\Cascade} @@ -548,6 +519,11 @@ version 2005/12/01 or later. \spread@equation \dim_set_eq:NN \l_@@_interline_dim \l_@@_interline_all_dim \keys_set:nn { cascade / command } { #1 } + \tl_if_empty:nF { #6 } + { + \bool_if:NF \l_@@_t_bool + { \msg_error:nn { cascade } { angular~argument~without~t } } + } \@@_initialisation: \hbox_set:Nn \l_@@_box_one { @@ -608,12 +584,7 @@ version 2005/12/01 or later. % \begin{macrocode} \bool_if:NT \l_@@_first_argument_bool { -% \end{macrocode} -% Here, you should use |\box_ht_plus_dp:N| when TeXLive 2021 will be available -% on Overleaf. -% \begin{macrocode} - \dim_set:Nn \l_tmpa_dim - { \box_ht:N \l_tmpb_box + \box_dp:N \l_tmpb_box } + \dim_set:Nn \l_tmpa_dim { \box_ht_plus_dp:N \l_tmpb_box } \l_tmpa_dim = 0.5\l_tmpa_dim \dim_add:Nn \l_tmpa_dim { \the \fontdimen 22 \textfont2 } \dim_sub:Nn \l_tmpa_dim @@ -660,7 +631,7 @@ version 2005/12/01 or later. % \end{macrocode} % % \bigskip -% The following macro is only for the lisibility of the code. +% The following macro is only for the legibility of the code. % \begin{macrocode} \cs_new_protected:Npn \@@_the_vcenter:nn #1 #2 { @@ -802,6 +773,15 @@ version 2005/12/01 or later. ignored. } % \end{macrocode} +% +% \begin{macrocode} +\msg_new:nnn { cascade } { angular~argument~without~t } + { + You~can't~use~the~argument~between~angular~brackets~because~ + you~have~not~used~the~key~'t'. The~argument~between~angular~brackets~ + will~be~ignored. + } +% \end{macrocode} % % \bigskip % \DescribeMacro{\ShortCascade} @@ -824,16 +804,14 @@ version 2005/12/01 or later. % \vspace{1cm} % \section{History} % +% \subsection*{Changes between versions 1.1 and 1.2} +% +% New commands |\Edacsac| and |\ShortEdacsac|. +% % \subsection*{Changes between versions 1.0 and 1.1} % % New option |t|. % -% \subsection*{Changes between versions 1.0 and 1.1} -% -% New commands |\Edacsac| and |\ShortEdacsac|. -% -% -% \PrintIndex % \tableofcontents % % \end{document} diff --git a/Master/texmf-dist/source/latex/cascade/cascade.ins b/Master/texmf-dist/source/latex/cascade/cascade.ins index db89312250c..230215337d7 100644 --- a/Master/texmf-dist/source/latex/cascade/cascade.ins +++ b/Master/texmf-dist/source/latex/cascade/cascade.ins @@ -1,5 +1,5 @@ %% -%% Copyright (C) 2018-2021 by F. Pantigny +%% Copyright (C) 2018-2023 by F. Pantigny %% %% %% This file may be distributed and/or modified under the @@ -17,7 +17,7 @@ \usedir{tex/latex/cascade} \preamble -Copyright (C) 2018-2021 by F. Pantigny +Copyright (C) 2018-2023 by F. Pantigny This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either diff --git a/Master/texmf-dist/tex/latex/cascade/cascade.sty b/Master/texmf-dist/tex/latex/cascade/cascade.sty index 2af9af477d3..293f0991940 100644 --- a/Master/texmf-dist/tex/latex/cascade/cascade.sty +++ b/Master/texmf-dist/tex/latex/cascade/cascade.sty @@ -6,7 +6,7 @@ %% %% cascade.dtx (with options: `package') %% -%% Copyright (C) 2018-2021 by F. Pantigny +%% Copyright (C) 2018-2023 by F. Pantigny %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -18,8 +18,8 @@ %% and version 1.3 or later is part of all distributions of %% LaTeX version 2005/12/01 or later. %% -\def\myfileversion{1.2} -\def\myfiledate{2021/08/23} +\def\myfileversion{1.2a} +\def\myfiledate{2023/02/08} \RequirePackage{l3keys2e} \ProvidesExplPackage {cascade} @@ -87,7 +87,7 @@ \NewDocumentCommand \CascadeOptions { m } { \keys_set:nn { cascade / global } { #1 } } %% -%% The command \Cascade is defined with \NewDocumentCommand of xparse +%% The command \Cascade is defined with \NewDocumentCommand of L3. \NewDocumentCommand \Cascade { O { } m m m m D < > { } } { \if_mode_math: @@ -104,6 +104,11 @@ \spread@equation \dim_set_eq:NN \l__cascade_interline_dim \l__cascade_interline_all_dim \keys_set:nn { cascade / command } { #1 } + \tl_if_empty:nF { #6 } + { + \bool_if:NF \l__cascade_t_bool + { \msg_error:nn { cascade } { angular~argument~without~t } } + } \__cascade_initialisation: \hbox_set:Nn \l__cascade_box_one { @@ -141,8 +146,7 @@ \__cascade_the_vcenter:nn { #2 } { #4 } \bool_if:NT \l__cascade_first_argument_bool { - \dim_set:Nn \l_tmpa_dim - { \box_ht:N \l_tmpb_box + \box_dp:N \l_tmpb_box } + \dim_set:Nn \l_tmpa_dim { \box_ht_plus_dp:N \l_tmpb_box } \l_tmpa_dim = 0.5\l_tmpa_dim \dim_add:Nn \l_tmpa_dim { \the \fontdimen 22 \textfont2 } \dim_sub:Nn \l_tmpa_dim @@ -304,6 +308,12 @@ in~an~encompassing~command.~If~you~go~on,~this~key~will~be~ ignored. } +\msg_new:nnn { cascade } { angular~argument~without~t } + { + You~can't~use~the~argument~between~angular~brackets~because~ + you~have~not~used~the~key~'t'. The~argument~between~angular~brackets~ + will~be~ignored. + } \NewDocumentCommand \ShortCascade { O { } m m } { \Cascade [ #1 ] { } { #2 } { } { #3 } } \NewDocumentCommand \ShortEdacsac { O { } m m } |