From ba5ae3bc7f23dfe6145a8761e79600435a2c6ca6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 3 Dec 2020 21:57:41 +0000 Subject: schemata (3dec20) git-svn-id: svn://tug.org/texlive/trunk@57057 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/schemata/schemata.sty | 145 ++++++++++++--------- 1 file changed, 81 insertions(+), 64 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/schemata/schemata.sty b/Master/texmf-dist/tex/generic/schemata/schemata.sty index 2a67b516c8e..ef2473a6d9e 100644 --- a/Master/texmf-dist/tex/generic/schemata/schemata.sty +++ b/Master/texmf-dist/tex/generic/schemata/schemata.sty @@ -20,92 +20,107 @@ %% and version 1.3 or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -{\expandafter}\expandafter\ifx \csname schemataLaTeX\endcsname\relax +\expandafter\ifx \csname schemataLaTeX\endcsname\relax \def\schemataLaTeX{LaTeX2e}\fi \ifx\fmtname\schemataLaTeX \expandafter\NeedsTeXFormat\expandafter{\schemataLaTeX}[2005/12/01] \ProvidesPackage{schemata} - [2020/11/23 1.2 generic package to aid construction of topical categories] -\fi -\ifx\fmtname\schemataLaTeX\else - \catcode`@=11\relax + [2020/12/02 1.3 generic package to aid construction of topical categories] +\else +\catcode`@=11\relax \fi -\newbox\@schemata@rhs -\newbox\@schemata@lhs -\newdimen\@schemata@rheight -\newdimen\@schemata@lheight -\newif\if@schemata@LCBox -\newif\if@schemata@SWBox -\newif\if@schemata@NudgeBox -\ifx\fmtname\schemataLaTeX +\edef\@schemata@LaTeX{\schemataLaTeX} +\newbox\@schemata@rhs% +\newbox\@schemata@lhs% +\newdimen\@schemata@rheight% +\newdimen\@schemata@lheight% +\newdimen\@schemata@one% +\newdimen\@schemata@two% +\newdimen\@schemata@three% +\newif\if@schemata@LCBox% +\newif\if@schemata@SWBox% +\newif\if@schemata@NudgeBox% +\ifx\fmtname\@schemata@LaTeX \DeclareOption{braces}% - {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace} + {\let\@schemata@LD\lbrace% + \let\@schemata@RD\rbrace} \DeclareOption{brackets}% - {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack} + {\let\@schemata@LD\lbrack% + \let\@schemata@RD\rbrack} \DeclareOption{parens}% - {\let\@schemata@LD( \let\@schemata@RD)} + {\let\@schemata@LD(% + \let\@schemata@RD)} \DeclareOption{groups}% - {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup} - \ExecuteOptions{braces} + {\let\@schemata@LD\lgroup% + \let\@schemata@RD\rgroup} + \ExecuteOptions{braces}% \ProcessOptions\relax \else \let\@schemata@LD\lbrace% \let\@schemata@RD\rbrace% \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\DoBraces}% - {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace} + {\let\@schemata@LD\lbrace% + \let\@schemata@RD\rbrace} \else \def\DoBraces% - {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace} + {\let\@schemata@LD\lbrace% + \let\@schemata@RD\rbrace} \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\DoBrackets}% - {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack} + {\let\@schemata@LD\lbrack% + \let\@schemata@RD\rbrack} \else \def\DoBrackets% - {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack} + {\let\@schemata@LD\lbrack% + \let\@schemata@RD\rbrack} \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\DoParens}% - {\let\@schemata@LD( \let\@schemata@RD)} + {\let\@schemata@LD(% + \let\@schemata@RD)} \else \def\DoParens% - {\let\@schemata@LD( \let\@schemata@RD)} + {\let\@schemata@LD(% + \let\@schemata@RD)} \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\DoGroups}% - {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup} + {\let\@schemata@LD\lgroup% + \let\@schemata@RD\rgroup} \else \def\DoGroups% - {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup} + {\let\@schemata@LD\lgroup% + \let\@schemata@RD\rgroup} \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\LCschema}{\@schemata@LCBoxtrue} \else \def\LCschema{\@schemata@LCBoxtrue} \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\UCschema}{\@schemata@LCBoxfalse} \else \def\UCschema{\@schemata@LCBoxfalse} \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\SwitchSB}{\@schemata@SWBoxtrue}% \else \def\SwitchSB{\@schemata@SWBoxtrue} \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\NudgeSB}{\@schemata@NudgeBoxtrue} \else \def\NudgeSB{\@schemata@NudgeBoxtrue} \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand{\SBNudgeFactor}{\kern0.2em} \else \def\SBNudgeFactor{\kern0.2em} \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\schemabox}[2][0pt]{\@schemata@schemabox[#1]{#2}} \else \def\schemabox{\futurelet\@schemata@testchar\@schemata@schemab@x} @@ -150,7 +165,7 @@ \@schemata@SWBoxfalse% \@schemata@NudgeBoxfalse% } -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand{\schema}[3][open]{% \@schemata@schema[#1]{#2}{#3}} \else @@ -186,7 +201,7 @@ \vcenter{#3}$}% \fi } -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand{\Schema}[5][open]{% \@schemata@Schema[#1]{#2}{#3}{#4}{#5}} \else @@ -205,16 +220,16 @@ \long\def\@schemata@Schema[#1]#2#3#4#5{% \def\@schemata@option{#1}% \def\@schemata@open{open}% - \dimen0=#2% + \@schemata@one=#2% \ifx\@schemata@option\@schemata@open - \hbox{$\vcenter{\vskip1.44265\dimen0#4}% + \hbox{$\vcenter{\vskip1.44265\@schemata@one#4}% \@schemata@biglbrace{#2}{#3}\vcenter{#5}$}% \else - \hbox{$\vcenter{\vskip1.44265\dimen0#4}\kern-0.2em% + \hbox{$\vcenter{\vskip1.44265\@schemata@one#4}\kern-0.2em% \@schemata@bigrbrace{#2}{#3}\vcenter{#5}$}% \fi } -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\@schemata@lbrace}[1]{% \ifmmode \left.\vcenter{\vbox to #1{\vfil}}\right\@schemata@LD% @@ -227,7 +242,7 @@ \fi } \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\@schemata@rbrace}[1]{% \ifmmode \left\@schemata@RD\vcenter{\vbox to #1{\vfil}}\right.% @@ -240,7 +255,7 @@ \fi } \fi -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\@schemata@biglbrace}[2]{% \@schemata@@biglbrace{#1}{#2}} \else @@ -248,23 +263,24 @@ \@schemata@@biglbrace{#1}{#2}} \fi \def\@schemata@@biglbrace#1#2{% - \dimen0=#1% - \dimen2=#2% - \dimen4=-\dimen2% - \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi - \ifdim\dimen0<0pt + \@schemata@one=#1% + \@schemata@two=#2% + \@schemata@three=-\@schemata@two% + \ifdim\@schemata@three>\@schemata@two% + \@schemata@two=\@schemata@three\fi + \ifdim\@schemata@one<0pt \ifmmode\vcenter{\hbox{$\left.% - \vbox to 1.44265\dimen2{\vfil}% + \vbox to 1.44265\@schemata@two{\vfil}% \right\@schemata@LD% - \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi + \atop\vbox to -1.44265\@schemata@one{\vfil}$}}\fi \else - \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}% + \ifmmode\vcenter{\hbox{$\vbox to 1.44265\@schemata@one{\vfil}% \atop\left.% - \vbox to 1.44265\dimen2{\vfil}% + \vbox to 1.44265\@schemata@two{\vfil}% \right\@schemata@LD$}}\fi \fi } -\ifx\fmtname\schemataLaTeX +\ifx\fmtname\@schemata@LaTeX \newcommand*{\@schemata@bigrbrace}[2]{% \@schemata@@bigrbrace{#1}{#2}% } @@ -274,23 +290,24 @@ } \fi \def\@schemata@@bigrbrace#1#2{% - \dimen0=#1% - \dimen2=#2% - \dimen4=-\dimen2% - \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi - \ifdim\dimen0<0pt + \@schemata@one=#1% + \@schemata@two=#2% + \@schemata@three=-\@schemata@two% + \ifdim\@schemata@three>\@schemata@two% + \@schemata@two=\@schemata@three\fi + \ifdim\@schemata@one<0pt \ifmmode\vcenter{\hbox{$\left.% - \vbox to 1.44265\dimen2{\vfil}% + \vbox to 1.44265\@schemata@two{\vfil}% \right\@schemata@RD% - \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi + \atop\vbox to -1.44265\@schemata@one{\vfil}$}}\fi \else - \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}% + \ifmmode\vcenter{\hbox{$\vbox to 1.44265\@schemata@one{\vfil}% \atop\left.% - \vbox to 1.44265\dimen2{\vfil}% + \vbox to 1.44265\@schemata@two{\vfil}% \right\@schemata@RD$}}\fi \fi } -\ifx\fmtname\schemataLaTeX\else +\ifx\fmtname\@schemata@LaTeX\else \catcode`@=12\relax \fi \endinput -- cgit v1.2.3