summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/stex/modules/modules.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/stex/modules/modules.sty')
-rw-r--r--Master/texmf-dist/tex/latex/stex/modules/modules.sty59
1 files changed, 33 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/stex/modules/modules.sty b/Master/texmf-dist/tex/latex/stex/modules/modules.sty
index 25310cc8cfe..e2b6f5a4467 100644
--- a/Master/texmf-dist/tex/latex/stex/modules/modules.sty
+++ b/Master/texmf-dist/tex/latex/stex/modules/modules.sty
@@ -7,7 +7,7 @@
%% modules.dtx (with options: `package')
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{modules}[2016/04/06 v1.4 Semantic Markup]
+\ProvidesPackage{modules}[2019/03/20 v1.4 Semantic Markup]
\newif\if@modules@mh@\@modules@mh@false
\DeclareOption{mh}{\@modules@mh@true}
\newif\ifmod@show\mod@showfalse
@@ -16,6 +16,8 @@
\DeclareOption{noauxreq}{\aux@reqfalse}
\newif\ifmod@qualified\mod@qualifiedfalse
\DeclareOption{qualifiedimports}{\mod@qualifiedtrue}
+\newif\if@trwarn\@trwarnfalse
+\DeclareOption{trwarn}{\@trwarntrue}
\newif\if@mmt\@mmtfalse
\DeclareOption{mmt}{\@mmttrue}
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{sref}}
@@ -32,6 +34,8 @@
\addmetakey*{module}{creators}
\addmetakey*{module}{contributors}
\addmetakey*{module}{srccite}
+\addmetakey*{module}{align}[WithTheModuleOfTheSameName]
+\addmetakey*{module}{noalign}[true]
\define@key{module}{id}{%
\edef\this@module{%
\expandafter\noexpand\csname module@defs@#1\endcsname%
@@ -45,7 +49,7 @@
\fi%
\def\mod@id{#1}%
}%
-\newcounter{module}[section]%
+\ifdef{\thesection}{\newcounter{module}[section]}{\newcounter{module}}%
\newrobustcmd\module@heading{%
\stepcounter{module}%
\ifmod@show%
@@ -73,12 +77,9 @@
\ifcsundef{module@#1@activated}{\csname module@defs@#1\endcsname}{}%
\@namedef{module@#1@activated}{true}%
}%
-\def\export@defs#1{%
-\@ifundefined{mod@id}{}{%
+\def\export@defs#1{\@ifundefined{mod@id}{}{%
\expandafter\expandafter\expandafter\g@addto@macro%
- \expandafter\this@module\expandafter{\activate@defs{#1}}%
-}%
-}%
+\expandafter\this@module\expandafter{\activate@defs{#1}}}}%
\newif\if@importing\@importingfalse
\newcommand\update@used@modules[1]{%
\ifx\used@modules\@empty%
@@ -111,11 +112,11 @@
\relax% do nothing, it has already been loaded, else signal an error
}{%
\PackageError{modules}
- {{Module Name Clash\MessageBreak
+ {Module Name Clash\MessageBreak
A module with name #2 was already loaded under the path "\@path"\MessageBreak
The imported path "\@load" is probably a different module with the\MessageBreak
same name; this is dangerous -- not importing}%
- {Check whether the Module name is correct}}%
+ {Check whether the Module name is correct}%
}%
}%
\fi}%
@@ -147,6 +148,10 @@
\newif\if@symdeflocal%
\srefaddidkey{symdef}%
\define@key{symdef}{local}[true]{\@symdeflocaltrue}%
+\define@key{symdef}{noverb}[all]{}%
+\define@key{symdef}{align}[WithTheSymbolOfTheSameName]{}%
+\define@key{symdef}{specializes}{}%
+\addmetakey*{symdef}{noalign}[true]
\define@key{symdef}{primary}[true]{}%
\define@key{symdef}{assocarg}{}%
\define@key{symdef}{bvars}{}%
@@ -156,12 +161,8 @@
\addmetakey*{symdef}{description}%
\addmetakey{symdef}{subject}%
\addmetakey*{symdef}{display}%
-\def\symdef{%
- \@ifnextchar[{\@symdef}{\@symdef[]}%
-}%
-\def\@symdef[#1]#2{%
- \@ifnextchar[{\@@symdef[#1]{#2}}{\@@symdef[#1]{#2}[0]}%
-}%
+\def\symdef{\@ifnextchar[{\@symdef}{\@symdef[]}}%
+\def\@symdef[#1]#2{\@ifnextchar[{\@@symdef[#1]{#2}}{\@@symdef[#1]{#2}[0]}}%
\def\@mod@nc#1{\mod@newcommand{#1}[1]}%
\def\ignorespacesandpars{%
\begingroup
@@ -295,19 +296,25 @@
}%
\def\@capitalize#1{\uppercase{#1}}%
\newrobustcmd\capitalize[1]{\expandafter\@capitalize #1}%
-\def\mod@termref#1#2#3{%
- \def\@test{#3}%
+\newcommand\mod@component[1]{}
+\newcommand\mod@termref[3]{\def\@test{#3}%
\@ifundefined{module@defs@#1}{%
\protect\G@refundefinedtrue%
- \@latex@warning{\protect\termref with unidentified cd "#1": the cd key must reference an active module}%
- \def\@label{sref@#2@target}%
- }%
- {\def\@label{sref@#2@#1@target}}%
- \@ifundefined{module@#1@path}% local reference
- {\sref@hlink@ifh{\@label}{\ifx\@test\@empty #2\else #3\fi}}%
- {\def\@uri{\csname module@#1@path\endcsname.pdf\#\@label}%
- \sref@href@ifh{\@uri}{\ifx\@test\@empty #2\else #3\fi}}%
+ \if@trwarn
+ \PackageWarning{modules}{`\protect\termref' with unidentified cd "#1":\MessageBreak
+ the cd key must reference an active module}%
+ \else
+ \PackageError{modules}{`\protect\termref' with unidentified cd "#1"}
+ {the cd key must reference an active module}%
+ \fi}%
+ {\def\@label{sref@#2@#1\mod@component{#1}@target}%
+ \@ifundefined{module@#1@path}% local reference
+ {\sref@hlink@ifh{\@label}{\ifx\@test\@empty #2\else #3\fi}%
+ }%
+ {\def\@uri{\csname module@#1@path\endcsname\mod@component{#1}.pdf\#\@label}%
+ \sref@href@ifh{\@uri}{\ifx\@test\@empty #2\else #3\fi}%
}%
+ }}%
\def\CurrentDir{}%
\newrobustcmd{\@rinput}[2]{%
\@cpath{\CurrentDir#1}%
@@ -342,7 +349,7 @@
\def\requirepackage#1#2{\makeatletter\input{#1.sty}\makeatother}%
\newrobustcmd\sinput[1]{%
\PackageError{modules}%
- {The \protect\sinput macro is deprecated}{use the \protect\input instead!}%
+ {The `\protect\sinput' macro is deprecated}{use the \protect\input instead!}%
}%
\newrobustcmd\sinputref[1]{%
\PackageError{modules}%