schemata (15mar20)

git-svn-id: svn://tug.org/texlive/trunk@54326 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 6 insertions, 265 deletions

diff --git a/Master/texmf-dist/source/generic/schemata/schemata.dtx b/Master/texmf-dist/source/generic/schemata/schemata.dtx
index 6de7e4a9db6..82b39c2f38b 100644
--- a/Master/texmf-dist/source/generic/schemata/schemata.dtx
+++ b/Master/texmf-dist/source/generic/schemata/schemata.dtx
@@ -202,7 +202,7 @@ Running "make install" installs the files in the local TeX tree.
 %<package>\expandafter\NeedsTeXFormat\expandafter{\schemataLaTeX}
 %<package>\ProvidesPackage{schemata}
 %<*package>
-  [2020/03/13 v1.0 generic package to aid construction of topical categories]
+  [2020/03/14 v1.1 generic package to aid construction of topical categories]
 %</package>
 %<package>\fi
 %<*driver>
@@ -285,6 +285,7 @@ Running "make install" installs the files in the local TeX tree.
 % \changes{v0.6}{2013/03/10}{Added features}
 % \changes{v0.7}{2013/09/23}{Changed contact info}
 % \changes{v0.8}{2016/01/25}{Rewrote manual; moved to dtxgen}
+% \changes{v1.1}{2020/03/14}{Fix issue with dtx guards}
 %
 % \GetFileInfo{\jobname.dtx}
 % \DoNotIndex{\bgroup, \csname, \DeclareOption, \def, \dimen, \egroup, \else, \endcsname, \endinput, \ExecuteOptions, \expandafter, \fi, \futurelet, \gdef, \hbox, \hfil, \if, \ifcsname, \ifdim, \ifmmode, \ifx, \ignorespaces, \index, \let, \newbox, \newcommand, \newdimen, \newif, \next, \PackageWarning, \ProcessOptions, \relax, \RequirePackage, \setbox, \space, \testchar, \vbox, \vcenter, \vfil, \vskip}
@@ -2052,7 +2053,9 @@ Running "make install" installs the files in the local TeX tree.
 %  \newpage\PrintChanges
 %  \newpage\PrintIndex
 %}
-%
+% \iffalse
+%<*package>
+% \fi
 % \section{Implementation}
 %
 % Shorter macros are written in both \LaTeX{} and generic \TeX. Longer macros implement a platform-specific front end and a common back end. The macros default to \LaTeXe{} format. If the format test fails, then generic macros are selected.\medskip
@@ -2064,7 +2067,7 @@ Running "make install" installs the files in the local TeX tree.
 % \leavevmode\llap{\scriptsize 4\ \ }\verb+%<package>\expandafter\NeedsTeXFormat\expandafter{\schemataLaTeX}+
 % \leavevmode\llap{\scriptsize 5\ \ }\verb+%<package>\ProvidesPackage{schemata}+
 %                                  \verb+%<*package>+
-% \leavevmode\llap{\scriptsize 6\ \ }\verb+  [2020/03/13 v1.0 generic package to aid construction of topical categories]+
+% \leavevmode\llap{\scriptsize 6\ \ }\verb+  [2020/03/14 v1.1 generic package to aid construction of topical categories]+
 %                                  \verb+%</package>+
 % \leavevmode\llap{\scriptsize 7\ \ }\verb+%<package>\fi+
 % \egroup
diff --git a/Master/texmf-dist/source/generic/schemata/schemata.ins b/Master/texmf-dist/source/generic/schemata/schemata.ins
index 2c93a5bac7c..a794c81388a 100644
--- a/Master/texmf-dist/source/generic/schemata/schemata.ins
+++ b/Master/texmf-dist/source/generic/schemata/schemata.ins
@@ -54,268 +54,6 @@ Running "make install" installs the files in the local TeX tree.
   \file{\jobname.sty}{\from{\jobname.dtx}{package}}
 }
 \endbatchfile
-\ifx\fmtname\schemataLaTeX\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
-  \DeclareOption{braces}%
-    {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}
-  \DeclareOption{brackets}%
-    {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}
-  \DeclareOption{parens}%
-    {\let\@schemata@LD( \let\@schemata@RD)}
-  \DeclareOption{groups}%
-    {\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
-  \newcommand*{\DoBraces}%
-    {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}
-\else
-  \def\DoBraces%
-    {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\DoBrackets}%
-    {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}
-\else
-  \def\DoBrackets%
-    {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\DoParens}%
-    {\let\@schemata@LD( \let\@schemata@RD)}
-\else
-  \def\DoParens%
-    {\let\@schemata@LD( \let\@schemata@RD)}
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\DoGroups}%
-    {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup}
-\else
-  \def\DoGroups%
-    {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup}
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\LCschema}{\@schemata@LCBoxtrue}
-\else
-  \def\LCschema{\@schemata@LCBoxtrue}
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\UCschema}{\@schemata@LCBoxfalse}
-\else
-  \def\UCschema{\@schemata@LCBoxfalse}
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\SwitchSB}{\@schemata@SWBoxtrue}%
-\else
-  \def\SwitchSB{\@schemata@SWBoxtrue}
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\NudgeSB}{\@schemata@NudgeBoxtrue}
-\else
-  \def\NudgeSB{\@schemata@NudgeBoxtrue}
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand{\SBNudgeFactor}{\kern0.2em}
-\else
-  \def\SBNudgeFactor{\kern0.2em}
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\schemabox}[2][0pt]{\@schemata@schemabox[#1]{#2}}
-\else
-  \def\schemabox{\futurelet\testchar\@schemata@schemab@x}
-  \def\@schemata@schemab@x{%
-    \ifx[\testchar
-      \let\next\@schemata@schemabox%
-    \else
-      \let\next\@schemata@@schemab@x%
-    \fi
-    \next%
-  }%
-  \def\@schemata@@schemab@x#1{\@schemata@schemabox[0pt]{#1}}
-\fi
-\def\@schemata@schemabox[#1]#2{%
-  \ifinner
-    \if@schemata@LCBox
-      \def\@Adj{}%
-      \if@schemata@SWBox\def\@Adj{\strut}\fi
-    \else
-      \def\@Adj{\strut}%
-      \if@schemata@SWBox\def\@Adj{}\fi
-    \fi
-    \if@schemata@NudgeBox
-      \let\@Nudge\SBNudgeFactor%
-    \else
-      \def\@Nudge{}%
-    \fi
-    \ifdim#1<1pt
-      \def\\{\@Nudge\egroup\hbox\bgroup\ignorespaces }%
-      \vbox{\hbox\bgroup\@Adj\ignorespaces #2\@Nudge\egroup}%
-    \else
-      \def\\{\hfil\egroup\hbox to #1\bgroup\ignorespaces }%
-      \vbox{\hbox to #1\bgroup\@Adj\ignorespaces #2\hfil\egroup}%
-    \fi
-  \else
-    #2%
-  \fi
-  \@schemata@SWBoxfalse%
-  \@schemata@NudgeBoxfalse%
-}
-\ifx\fmtname\schemataLaTeX
-  \newcommand{\schema}[3][open]{%
-    \@schemata@schema[#1]{#2}{#3}}
-\else
-  \long\def\schema{\futurelet\testchar\@schemata@schem@}
-  \long\def\@schemata@schem@{%
-    \ifx[\testchar
-      \let\next\@schemata@schema%
-    \else
-      \let\next\@schemata@@schem@%
-    \fi
-    \next%
-  }%
-  \long\def\@schemata@@schem@#1#2{%
-    \@schemata@schema[open]{#1}{#2}}
-\fi
-\long\def\@schemata@schema[#1]#2#3{%
-  \def\@ption{#1}\def\@pen{open}%
-  \ifx\@ption\@pen
-    \setbox\@schemata@rhs=\vbox{#3}%
-    \@schemata@rheight=\ht\@schemata@rhs%
-    \advance\@schemata@rheight\dp\@schemata@rhs%
-    \advance\@schemata@rheight by 1.44265ex%
-    \hbox{$\vcenter{#2}%
-      \@schemata@lbrace{\@schemata@rheight}%
-      \vcenter{#3}$}%
-  \else
-    \setbox\@schemata@lhs=\vbox{#2}%
-    \@schemata@lheight=\ht\@schemata@lhs%
-    \advance\@schemata@lheight\dp\@schemata@lhs%
-    \advance\@schemata@lheight by 1.44265ex%
-    \hbox{$\vcenter{#2}%
-      \kern-0.2em\@schemata@rbrace{\@schemata@lheight}%
-      \vcenter{#3}$}%
-  \fi
-}
-\ifx\fmtname\schemataLaTeX
-  \newcommand{\Schema}[5][open]{%
-    \@schemata@Schema[#1]{#2}{#3}{#4}{#5}}
-\else
-  \long\def\Schema{\futurelet\testchar\@schemata@Schem@}
-  \long\def\@schemata@Schem@{%
-    \ifx[\testchar
-      \let\next\@schemata@Schema%
-    \else
-      \let\next\@schemata@@Schem@%
-    \fi
-    \next%
-  }%
-  \long\def\@schemata@@Schem@#1#2#3#4{%
-    \@schemata@Schema[open]{#1}{#2}{#3}{#4}}
-\fi
-\long\def\@schemata@Schema[#1]#2#3#4#5{%
-  \def\@ption{#1}%
-  \def\@pen{open}%
-  \dimen0=#2%
-  \ifx\@ption\@pen
-    \hbox{$\vcenter{\vskip1.44265\dimen0#4}%
-      \@schemata@biglbrace{#2}{#3}\vcenter{#5}$}%
-  \else
-    \hbox{$\vcenter{\vskip1.44265\dimen0#4}\kern-0.2em%
-      \@schemata@bigrbrace{#2}{#3}\vcenter{#5}$}%
-  \fi
-}
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\@schemata@lbrace}[1]{%
-    \ifmmode
-      \left.\vcenter{\vbox to #1{\vfil}}\right\@schemata@LD%
-    \fi
-  }
-\else
-  \def\@schemata@lbrace#1{%
-    \ifmmode
-      \left.\vcenter{\vbox to #1{\vfil}}\right\@schemata@LD%
-    \fi
-  }
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\@schemata@rbrace}[1]{%
-    \ifmmode
-      \left\@schemata@RD\vcenter{\vbox to #1{\vfil}}\right.%
-    \fi
-  }
-\else
-  \def\@schemata@rbrace#1{%
-    \ifmmode
-      \left\@schemata@RD\vcenter{\vbox to #1{\vfil}}\right.%
-    \fi
-  }
-\fi
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\@schemata@biglbrace}[2]{%
-    \@schemata@@biglbrace{#1}{#2}}
-\else
-  \def\@schemata@biglbrace#1#2{%
-    \@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
-    \ifmmode\vcenter{\hbox{$\left.%
-      \vbox to 1.44265\dimen2{\vfil}%
-      \right\@schemata@LD%
-      \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi
-  \else
-    \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}%
-      \atop\left.%
-      \vbox to 1.44265\dimen2{\vfil}%
-      \right\@schemata@LD$}}\fi
-  \fi
-}
-\ifx\fmtname\schemataLaTeX
-  \newcommand*{\@schemata@bigrbrace}[2]{%
-    \@schemata@@bigrbrace{#1}{#2}%
-  }
-\else
-  \def\@schemata@bigrbrace#1#2{%
-    \@schemata@@bigrbrace{#1}{#2}%
-  }
-\fi
-\def\@schemata@@bigrbrace#1#2{%
-  \dimen0=#1%
-  \dimen2=#2%
-  \dimen4=-\dimen2%
-  \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi
-  \ifdim\dimen0<0pt
-    \ifmmode\vcenter{\hbox{$\left.%
-      \vbox to 1.44265\dimen2{\vfil}%
-      \right\@schemata@RD%
-      \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi
-  \else
-    \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}%
-      \atop\left.%
-      \vbox to 1.44265\dimen2{\vfil}%
-      \right\@schemata@RD$}}\fi
-  \fi
-}
-\ifx\fmtname\schemataLaTeX\else
-  \catcode`@=12\relax
-\fi
 %% 
 %% Copyright (C) 2020 by Charles P. Schaum <charles dot schaum@comcast.net>
 %%