diff options
author | Karl Berry <karl@freefriends.org> | 2019-03-20 22:31:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-03-20 22:31:24 +0000 |
commit | 2b006ec0e0cafe12255f874f9c44786ab6f38901 (patch) | |
tree | c40f5796e1b34e3f051abd84d049e092e4ffd0ab /Master/texmf-dist/tex/latex/stex/omtext/omtext.sty | |
parent | 8e508e8b0218f17eb318645073096f2cf645cc78 (diff) |
stex (20mar19)
git-svn-id: svn://tug.org/texlive/trunk@50489 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/stex/omtext/omtext.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/stex/omtext/omtext.sty | 79 |
1 files changed, 63 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/stex/omtext/omtext.sty b/Master/texmf-dist/tex/latex/stex/omtext/omtext.sty index 1215638aeb9..3e9fa337484 100644 --- a/Master/texmf-dist/tex/latex/stex/omtext/omtext.sty +++ b/Master/texmf-dist/tex/latex/stex/omtext/omtext.sty @@ -7,7 +7,7 @@ %% omtext.dtx (with options: `package') %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{omtext}[2016/04/06 v1.1 OMDoc Text Fragments] +\ProvidesPackage{omtext}[2019/03/20 v1.1 OMDoc Text Fragments] \newif\if@omtext@mh@\@omtext@mh@false \DeclareOption{mh}{\@omtext@mh@true \PassOptionsToPackage{\CurrentOption}{modules}} @@ -71,19 +71,21 @@ \def\@@sinlinequote#1#2{\@sinlinequote{#2}~#1} \newcommand\sinlinequote[2][] {\def\@opt{#1}\ifx\@opt\@empty\@sinlinequote{#2}\else\@@sinlinequote\@opt{#2}\fi} -\newcommand\vdec[1]{#1} -\newcommand\vids[2][]{#2} +\newcommand\vdec[2][]{#2} \newcommand\vrest[2][]{#2} +\newcommand\vcond[2][]{#2} +\newcommand\strucdec[2][]{#2} +\newcommand\impdec[2][]{#2} \def\begin@sblockquote{\begin{quote}\sl} \def\end@sblockquote{\end{quote}} \def\begin@@sblockquote#1{\begin@sblockquote} -\def\end@@sblockquote#1{\def\@@lec##1{{\rm ##1}}\@lec{#1}\end@sblockquote} +\def\end@@sblockquote#1{\def\@@lec##1{\textrm{##1}}\@lec{#1}\end@sblockquote} \newenvironment{sblockquote}[1][] {\def\@opt{#1}\ifx\@opt\@empty\begin@sblockquote\else\begin@@sblockquote\@opt\fi} {\ifx\@opt\@empty\end@sblockquote\else\end@@sblockquote\@opt\fi} \newenvironment{sboxquote}[1][] {\def\@@src{#1}\begin{mdframed}[leftmargin=.5cm,rightmargin=.5cm]} -{\@lec{\rm\@@src}\end{mdframed}} +{\@lec{\textrm\@@src}\end{mdframed}} \providecommand{\@@lec}[1]{(#1)} \def\@lec#1{\strut\hfil\strut\null\nobreak\hfill\@@lec{#1}} \def\lec#1{\@lec{#1}\par} @@ -123,24 +125,69 @@ \string\withusedmodules{\@ifundefined{mod@id}\used@modules\mod@id}{#2}!% \string\withusedmodules{\@ifundefined{mod@id}\used@modules\mod@id}{#3}!% \string\withusedmodules{\@ifundefined{mod@id}\used@modules\mod@id}{#4}% -\else #2!#3\fi% loadmodules +\else #2!#3!#4\fi% loadmodules +}{\thepage}}% +\endgroup\@esphack\fi}%ifindex +\newcommand\omdoc@indexiv[5][]{\ifindex% +\metasetkeys{omdoc@index}{#1}% +\@bsphack\begingroup\@sanitize% +\protected@write\@indexfile{}{\string\indexentry% +{\ifx\omdoc@index@at\@empty\else\omdoc@index@at @\fi% +\ifx\omdoc@index@loadmodules\@true% +\string\withusedmodules{\@ifundefined{mod@id}\used@modules\mod@id}{#2}!% +\string\withusedmodules{\@ifundefined{mod@id}\used@modules\mod@id}{#3}!% +\string\withusedmodules{\@ifundefined{mod@id}\used@modules\mod@id}{#4}% +\string\withusedmodules{\@ifundefined{mod@id}\used@modules\mod@id}{#5}% +\else #2!#3!#4!#5\fi% loadmodules }{\thepage}}% \endgroup\@esphack\fi}%ifindex -\newcommand\indexalt[3][]{{#2}\omdoc@indexi[#1]{#3}} % word in text and index -\newcommand\indextoo[2][]{{#2}\omdoc@indexi[#1]{#2}} % word in text and index -\newcommand\@twin[3][]{\omdoc@indexii[#1]{#2}{#3}\omdoc@indexii[#1]{#3}{#2}} -\newcommand\twinalt[4][]{#2\@twin[#1]{#3}{#4}} -\newcommand\twintoo[3][]{{#2 #3}\@twin[#1]{#2}{#3}} % and use the word compound too -\newcommand\@atwin[4][]{\omdoc@indexiii[#1]{#2}{#3}{#4}\omdoc@indexii[#1]{#3}{#2 (#4)}} -\newcommand\atwinalt[5][]{#2\@atwin[#1]{#3}{#4}{#4}} -\newcommand\atwintoo[4][]{{#2 #3 #4}\@atwin[#1]{#2}{#3}{#4}} % and use it too -\newcommand\hateq{\ensuremath{\hat=}\xspace} -\newcommand\hatequiv{\ensuremath{\hat\equiv}\xspace} +\newcommand\aindi[3][]{{#2}\omdoc@indexi[#1]{#3}} +\newcommand\indi[2][]{{#2}\omdoc@indexi[#1]{#2}} +\newcommand\indis[2][]{{#2}\omdoc@indexi[#1]{#2s}} +\newcommand\Indi[2][]{{\captitalize{#2}}\omdoc@indexi[#1]{#2}} +\newcommand\Indis[2][]{{\capitalize{#2}}\omdoc@indexi[#1]{#2s}} + +\newcommand\@indii[3][]{\omdoc@indexii[#1]{#2}{#3}\omdoc@indexii[#1]{#3}{#2}} +\newcommand\aindii[4][]{#2\@indii[#1]{#3}{#4}} +\newcommand\indii[3][]{{#2 #3}\@indii[#1]{#2}{#3}} +\newcommand\indiis[3][]{{#2 #3s}\@indii[#1]{#2}{#3}} +\newcommand\Indii[3][]{{\captitalize{#2 #3}}\@indii[#1]{#2}{#3}} +\newcommand\Indiis[3][]{{\capitalize{#2 #3}}\@indii[#1]{#2}{#3}} + +\newcommand\@indiii[4][]{\omdoc@indexiii[#1]{#2}{#3}{#4}\omdoc@indexii[#1]{#3}{#2 (#4)}} +\newcommand\aindiii[5][]{{#2}\@indiii[#1]{#3}{#4}{#5}} +\newcommand\indiii[4][]{{#2 #3 #4}\@indiii[#1]{#2}{#3}{#4}} +\newcommand\indiiis[4][]{{#2 #3 #4s}\@indiii[#1]{#2}{#3}{#4}} +\newcommand\Indiii[4][]{\captitalize{#2 #3 #4}\@indiii[#1]{#2}{#3}{#4}} +\newcommand\Indiiis[4][]{\capitalize{#2 #3 #4s}\@indiii[#1]{#2}{#3}{#4}} + +\newcommand\@indiv[5][]{\omdoc@indexiv[#1]{#2}{#3}{#4}{#5}} +\newcommand\aindiv[6][]{#2\@indiv[#1]{#3}{#4}{#5}{#6}} +\newcommand\indiv[5][]{{#2 #3 #4 #5}\@indiv[#1]{#2}{#3}{#4}{#5}} +\newcommand\indivs[5][]{{#2 #3 #4 #5s}\@indiv[#1]{#2}{#3}{#4}{#5}} +\newcommand\Indiv[5][]{\capitalize{#2 #3 #4 #5s}\@indiv[#1]{#2}{#3}{#4}{#5}} +\newcommand\Indivs[5][]{\capitalize{#2 #3 #4 #5s}\@indiv[#1]{#2}{#3}{#4}{#5}} +\newcommand\hateq{\ensuremath{\widehat=}\xspace} +\newcommand\hatequiv{\ensuremath{\widehat\equiv}\xspace} \@ifundefined{ergo}% {\newcommand\ergo{\ensuremath{\leadsto}\xspace}}% {\renewcommand\ergo{\ensuremath{\leadsto}\xspace}}% \newcommand{\reflect@squig}[2]{\reflectbox{$\m@th#1\rightsquigarrow$}}% \newcommand\ogre{\ensuremath{\mathrel{\mathpalette\reflect@squig\relax}}\xspace}% +\newcommand\notergo{\ensuremath{\not\leadsto}} +\newcommand\notogre{\ensuremath{\not\mathrel{\mathpalette\reflect@squig\relax}}\xspace}% +\newcommand\indextoo[2][]{\indi[#1]{#2}% +\PackageWarning{omtext}{\protect\indextoo\space is deprecated, use \protect\indi\space instead}} +\newcommand\indexalt[2][]{\aindi[#1]{#2}% +\PackageWarning{omtext}{\protect\indextoo\space is deprecated, use \protect\aindi\space instead}} +\newcommand\twintoo[3][]{\indii[#1]{#2}{#3}% +\PackageWarning{omtext}{\protect\twintoo\space is deprecated, use \protect\indii\space instead}} +\newcommand\twinalt[3][]{\aindii[#1]{#2}{#3}% +\PackageWarning{omtext}{\protect\twinalt\space is deprecated, use \protect\aindii\space instead}} +\newcommand\atwintoo[4][]{\indiii[#1]{#2}{#3}{#4}% +\PackageWarning{omtext}{\protect\atwintoo\space is deprecated, use \protect\indiii\space instead}} +\newcommand\atwinalt[4][]{\aindii[#1]{#2}{#3}{#4}% +\PackageWarning{omtext}{\protect\atwinalt\space is deprecated, use \protect\aindiii\space instead}} \endinput %% %% End of file `omtext.sty'. |