diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
38 files changed, 237 insertions, 130 deletions
diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdafterpkg.sty b/Master/texmf-dist/tex/latex/eskdx/eskdafterpkg.sty index 59531b76660..566c27c3a34 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdafterpkg.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdafterpkg.sty @@ -23,7 +23,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdafterpkg}[2006/02/23 v0.95 Apply Commands After Package] +\ProvidesPackage{eskdafterpkg}[2006/02/23 v0.96 Apply Commands After Package] \newcommand*\ESKD@after@package[1]{% \expandafter\ifx\csname ver@#1.\@pkgextension\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdappsheet.sty b/Master/texmf-dist/tex/latex/eskdx/eskdappsheet.sty index d30ae55a777..c610aea3e54 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdappsheet.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdappsheet.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdappsheet}[2006/02/23 v0.95 Approving Sheet GOST 2.105] +\ProvidesPackage{eskdappsheet}[2006/02/23 v0.96 Approving Sheet GOST 2.105] \RequirePackage{eskdlang} \RequirePackage{eskdtitle} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdbiblist.sty b/Master/texmf-dist/tex/latex/eskdx/eskdbiblist.sty index 942faaa736b..5f755dd6cf0 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdbiblist.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdbiblist.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdbiblist}[2006/02/24 v0.95 Bibliography List] +\ProvidesPackage{eskdbiblist}[2006/02/24 v0.96 Bibliography List] \renewcommand{\@biblabel}[1]{#1.} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdcap.sty b/Master/texmf-dist/tex/latex/eskdx/eskdcap.sty index 00b6bc59466..9c8986b0bb0 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdcap.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdcap.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdcap}[2006/02/23 v0.95 Captions] +\ProvidesPackage{eskdcap}[2006/02/23 v0.96 Captions] \RequirePackage{caption} \DeclareCaptionLabelSeparator{dash}{ -- } diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdchngsheet.sty b/Master/texmf-dist/tex/latex/eskdx/eskdchngsheet.sty index 54734e2f88f..9b5fc842adf 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdchngsheet.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdchngsheet.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdchngsheet}[2006/03/13 v0.95 Sheet of Changes GOST 2.503-90] +\ProvidesPackage{eskdchngsheet}[2006/03/13 v0.96 Sheet of Changes GOST 2.503-90] \RequirePackage{eskdlang} \RequirePackage{eskdstamp} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskddstu.sty b/Master/texmf-dist/tex/latex/eskdx/eskddstu.sty index 01fec778ecd..41878850f5e 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskddstu.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskddstu.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskddstu}[2006/08/22 v0.95 Ukrainian DSTU implementation] +\ProvidesPackage{eskddstu}[2006/08/22 v0.96 Ukrainian DSTU implementation] \renewcommand{\thefootnote}{\arabic{footnote})} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdexplan.sty b/Master/texmf-dist/tex/latex/eskdx/eskdexplan.sty index df614cb6281..53992c3a2a3 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdexplan.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdexplan.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdexplan}[2006/02/23 v0.95 ESKD Explanation] +\ProvidesPackage{eskdexplan}[2006/02/23 v0.96 ESKD Explanation] \RequirePackage{eskdlang} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdfont.sty b/Master/texmf-dist/tex/latex/eskdx/eskdfont.sty index 2f673dbdd69..9575aef9fcf 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdfont.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdfont.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdfont}[2006/03/13 v0.95 Font Definitions] +\ProvidesPackage{eskdfont}[2006/03/13 v0.96 Font Definitions] \newcommand{\ESKDfontBaseLineStretch}{1} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdfootnote.sty b/Master/texmf-dist/tex/latex/eskdx/eskdfootnote.sty index 1297b18961c..129eaa4a035 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdfootnote.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdfootnote.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdfootnote}[2006/02/24 v0.95 Footnote Settings] +\ProvidesPackage{eskdfootnote}[2006/02/24 v0.96 Footnote Settings] \let\footnotesize\small diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdgraph.cls b/Master/texmf-dist/tex/latex/eskdx/eskdgraph.cls index d3c71c95f24..2cc6ff5e8d6 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdgraph.cls +++ b/Master/texmf-dist/tex/latex/eskdx/eskdgraph.cls @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{eskdgraph}[2006/08/08 v0.95 Graphical Documentation] +\ProvidesClass{eskdgraph}[2006/08/08 v0.96 Graphical Documentation] \DeclareOption{russian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}} \DeclareOption{ukrainian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdhash.sty b/Master/texmf-dist/tex/latex/eskdx/eskdhash.sty index f0c6dc0c68b..9d36ded091d 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdhash.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdhash.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdhash}[2006/02/23 v0.95 Hash Routines] +\ProvidesPackage{eskdhash}[2006/02/23 v0.96 Hash Routines] \newcommand{\ESKD@hash@new}[1]{% \global\expandafter\newcount\csname ESKD@hash@c@#1\endcsname diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdindent.sty b/Master/texmf-dist/tex/latex/eskdx/eskdindent.sty index 6597b2b4ca8..a6c17ca62fd 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdindent.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdindent.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdindent}[2006/02/23 v0.95 Paragraph Indent] +\ProvidesPackage{eskdindent}[2006/02/23 v0.96 Paragraph Indent] \RequirePackage{indentfirst} \setlength{\parindent}{15mm} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdinfo.sty b/Master/texmf-dist/tex/latex/eskdx/eskdinfo.sty index 5092e22ecc7..36ef9e1c4ee 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdinfo.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdinfo.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdinfo}[2006/03/02 v0.95 Document Information] +\ProvidesPackage{eskdinfo}[2006/03/02 v0.96 Document Information] \newcommand{\ESKDtheDepartment}{} \newcommand{\ESKDdepartment}[1]{\renewcommand{\ESKDtheDepartment}{#1}} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdlang.sty b/Master/texmf-dist/tex/latex/eskdx/eskdlang.sty index a4684bb1805..324c3dccae7 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdlang.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdlang.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdlang}[2006/02/23 v0.95 Language] +\ProvidesPackage{eskdlang}[2006/02/23 v0.96 Language] \newcommand{\ESKD@lang}{russian} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdlist.sty b/Master/texmf-dist/tex/latex/eskdx/eskdlist.sty index 0c46f9b362e..3ada55e53db 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdlist.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdlist.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdlist}[2006/02/23 v0.95 List] +\ProvidesPackage{eskdlist}[2006/02/23 v0.96 List] \RequirePackage{calc} \renewcommand{\theenumi}{\asbuk{enumi}} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdpara.sty b/Master/texmf-dist/tex/latex/eskdx/eskdpara.sty index a7999bf3f6f..239e139554d 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdpara.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdpara.sty @@ -21,7 +21,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdpara}[2006/06/02 v0.95 Paragraphs] +\ProvidesPackage{eskdpara}[2006/06/02 v0.96 Paragraphs] \RequirePackage{eskdsect} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdplain.sty b/Master/texmf-dist/tex/latex/eskdx/eskdplain.sty index 06a4ec6a76d..789c3740d9e 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdplain.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdplain.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdplain}[2006/03/13 v0.95 Plain Page Style] +\ProvidesPackage{eskdplain}[2006/03/13 v0.96 Plain Page Style] \RequirePackage{eskdstamp} \RequirePackage{calc} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdrussian.def b/Master/texmf-dist/tex/latex/eskdx/eskdrussian.def index 2c782e27069..6df5cf37534 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdrussian.def +++ b/Master/texmf-dist/tex/latex/eskdx/eskdrussian.def @@ -19,7 +19,7 @@ % This is automaticaly generated file, do not edit it. % -\ProvidesFile{eskdrussian.def}[2006/03/21 v0.95 Language File] +\ProvidesFile{eskdrussian.def}[2006/11/03 v0.96 Language File] \newcommand{\ESKDcolumnIVname}{% \cyr\CYRL\cyri\cyrt.} @@ -155,3 +155,22 @@ \cyrn\cyro\cyrg\cyro\ \cyrd\cyro\cyrk\cyru\cyrm. \cyri\ % \cyrd\cyra\cyrt\cyra} +\def\@Asbuk#1{\ifcase#1\or + \CYRA\or\CYRB\or\CYRV\or\CYRG\or\CYRD\or\CYRE\or\CYRZH\or + \CYRI\or\CYRK\or\CYRL\or\CYRM\or\CYRN\or + \CYRP\or\CYRR\or\CYRS\or\CYRT\or\CYRU\or\CYRF\or\CYRH\or + \CYRC\or\CYRSH\or\CYRSHCH\or\CYREREV\or\CYRYU\or + \CYRYA\else{\@tempcnta \number #1\relax + \advance\@tempcnta -25\relax + \protect\number\@tempcnta} + \fi} +\def\@asbuk#1{\ifcase#1\or + \cyra\or\cyrb\or\cyrv\or\cyrg\or\cyrd\or\cyre\or\cyrzh\or + \cyri\or\cyrk\or\cyrl\or\cyrm\or\cyrn\or + \cyrp\or\cyrr\or\cyrs\or\cyrt\or\cyru\or\cyrf\or\cyrh\or + \cyrc\or\cyrsh\or\cyrshch\or\cyrerev\or\cyryu\or + \cyrya\else{\@tempcnta \number #1\relax + \advance\@tempcnta -25\relax + \protect\number\@tempcnta} + \fi} + diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdsect.sty b/Master/texmf-dist/tex/latex/eskdx/eskdsect.sty index dc31d6385eb..ea6140f92e6 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdsect.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdsect.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdsect}[2006/08/26 v0.95 Sectioning] +\ProvidesPackage{eskdsect}[2006/08/26 v0.96 Sectioning] \newcommand{\ESKD@point@style}{single} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdspec.sty b/Master/texmf-dist/tex/latex/eskdx/eskdspec.sty index 3f490b7457a..d074ec01a11 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdspec.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdspec.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdspec}[2006/03/13 v0.95 Specification GOST 2.106.95] +\ProvidesPackage{eskdspec}[2006/03/13 v0.96 Specification GOST 2.106.95] \RequirePackage{eskdlang} \RequirePackage{eskdstamp} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdspecii.sty b/Master/texmf-dist/tex/latex/eskdx/eskdspecii.sty index a3d0323204e..e88b97329a7 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdspecii.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdspecii.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdspecii}[2006/03/21 v0.95 Specification GOST 2.106.95 Form 2] +\ProvidesPackage{eskdspecii}[2006/03/21 v0.96 Specification GOST 2.106.95 Form 2] \RequirePackage{eskdlang} \RequirePackage{eskdstamp} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty b/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty index 338742d51bd..a6d058bd2c8 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdstamp}[2006/03/20 v0.95 Stamp GOST 2.104-68] +\ProvidesPackage{eskdstamp}[2006/03/20 v0.96 Stamp GOST 2.104-68] \RequirePackage{calc} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdtab.cls b/Master/texmf-dist/tex/latex/eskdx/eskdtab.cls index 34c564c16b4..d20348885fa 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdtab.cls +++ b/Master/texmf-dist/tex/latex/eskdx/eskdtab.cls @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{eskdtab}[2006/08/08 v0.95 Tabular Documentation] +\ProvidesClass{eskdtab}[2006/08/08 v0.96 Tabular Documentation] \DeclareOption{russian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}} \DeclareOption{ukrainian}{\PassOptionsToPackage{\CurrentOption}{eskdlang}} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdtext.cls b/Master/texmf-dist/tex/latex/eskdx/eskdtext.cls index 3be8f09bb4c..bcd28147f73 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdtext.cls +++ b/Master/texmf-dist/tex/latex/eskdx/eskdtext.cls @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{eskdtext}[2006/08/21 v0.95 Textual Documentation] +\ProvidesClass{eskdtext}[2006/08/21 v0.96 Textual Documentation] \newcommand{\ESKD@docfont}{14pt} \newcommand{\ESKD@float@style}{single} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdtitle.sty b/Master/texmf-dist/tex/latex/eskdx/eskdtitle.sty index 1e17fccaa28..31458b82cf5 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdtitle.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdtitle.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdtitle}[2006/02/23 v0.95 Title GOST 2.105] +\ProvidesPackage{eskdtitle}[2006/02/23 v0.96 Title GOST 2.105] \RequirePackage{eskdstamp} \RequirePackage{eskdlang} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdtitlebase.sty b/Master/texmf-dist/tex/latex/eskdx/eskdtitlebase.sty index 761ce68df39..8f900d53460 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdtitlebase.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdtitlebase.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdtitlebase}[2006/03/13 v0.95 Base Title Commands] +\ProvidesPackage{eskdtitlebase}[2006/03/13 v0.96 Base Title Commands] \newcommand{\ESKDtitleApprovedBy}[2]{% \@namedef{ESKD@title@approved@post@1}{#1} diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdukrainian.def b/Master/texmf-dist/tex/latex/eskdx/eskdukrainian.def index 21528d6b3fd..0ba7016ac1f 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdukrainian.def +++ b/Master/texmf-dist/tex/latex/eskdx/eskdukrainian.def @@ -19,7 +19,7 @@ % This is automaticaly generated file, do not edit it. % -\ProvidesFile{eskdukrainian.def}[2006/08/21 v0.95 Language File] +\ProvidesFile{eskdukrainian.def}[2006/11/03 v0.96 Language File] \newcommand{\ESKDcolumnIVname}{% \cyr\CYRL\cyri\cyrt.} @@ -102,7 +102,7 @@ \def\tablename{{\cyr\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrya}}% \def\figurename{{\cyr\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}}% \def\refname{{\cyr\CYRP\cyre\cyrr\cyre\cyrl\cyrii\cyrk\ - \CYRP\cyro\cyrs\cyri\cyrl\cyra\cyrn\cyrsftsn}}} + \cyrp\cyro\cyrs\cyri\cyrl\cyra\cyrn\cyrsftsn}}} \newcommand{\ESKDspecColumnIname}{% \cyr\CYRF\cyro\cyrr\cyrm\cyra\cyrt} @@ -155,3 +155,24 @@ \cyrd\cyro\cyrk\cyru\cyrm. \cyrii\ % \cyrd\cyra\cyrt\cyra} +\def\@Asbuk#1{\ifcase#1\or + \CYRA\or\CYRB\or\CYRV\or\CYRG\or\CYRD\or\CYRE\or + \CYRZH\or\CYRI\or + \CYRK\or\CYRL\or\CYRM\or\CYRN\or\CYRP\or\CYRR\or + \CYRS\or\CYRT\or\CYRU\or\CYRF\or\CYRH\or\CYRC\or + \CYRSH\or\CYRSHCH\or\CYRYU\or + \CYRYA\else{\@tempcnta \number #1\relax + \advance\@tempcnta -24\relax + \protect\number\@tempcnta} + \fi} +\def\@asbuk#1{\ifcase#1\or + \cyra\or\cyrb\or\cyrv\or\cyrg\or\cyrd\or\cyre\or + \cyrzh\or\cyri\or + \cyrk\or\cyrl\or\cyrm\or\cyrn\or\cyrp\or\cyrr\or + \cyrs\or\cyrt\or\cyru\or\cyrf\or\cyrh\or\cyrc\or + \cyrsh\or\cyrshch\or\cyryu\or + \cyrya\else{\@tempcnta \number #1\relax + \advance\@tempcnta -24\relax + \protect\number\@tempcnta} + \fi} + diff --git a/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty b/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty index a7ee5aa5c79..e0e9b779217 100644 --- a/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty +++ b/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty @@ -32,7 +32,7 @@ %% http://dvc.org.uk/gplv2.txt %% %% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+= -\ProvidesPackage{hardmarg}[2006/11/03 v1.518 +\ProvidesPackage{hardmarg}[2006/11/04 v1.521 For use with class screenplay (C)2006 John Pate released under the GNU General Public License] diff --git a/Master/texmf-dist/tex/latex/screenplay/screenplay.cls b/Master/texmf-dist/tex/latex/screenplay/screenplay.cls index 5aea9b6187f..ed23d5c8536 100644 --- a/Master/texmf-dist/tex/latex/screenplay/screenplay.cls +++ b/Master/texmf-dist/tex/latex/screenplay/screenplay.cls @@ -33,13 +33,13 @@ %% %% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+= \NeedsTeXFormat{LaTeX2e}[2003/12/01] -\ProvidesClass{screenplay}[2006/11/03 v1.518 +\ProvidesClass{screenplay}[2006/11/04 v1.521 LaTeX2e Draft Screenplay document class (C)2006 John Pate released under the GNU General Public License] \DeclareOption*{% \PackageError{screenplay}{Unwanted option '\CurrentOption'}% - {There are no options available for class screenplay v1.518}} + {There are no options available for class screenplay v1.521}} \ProcessOptions\relax \RequirePackage{ifthen}[2001/05/26] \LoadClass[12pt,letterpaper,onecolumn,oneside]{article}[2004/02/16] @@ -91,8 +91,8 @@ released under the GNU General Public License] \newcommand{\address}[1]{\renewcommand{\@address}{#1}} \newcommand{\@agent}{~} \newcommand{\agent}[1]{\renewcommand{\@agent}{#1}} -\newlength{\titlesepspace} -\setlength{\titlesepspace}{3.75in plus 0in minus 1.5in} +\newlength{\titskip} +\setlength{\titskip}{3.75in plus 0in minus 1.5in} \newcommand{\coverpage}{ \thispagestyle{empty} \vspace*{2.25in} @@ -102,7 +102,7 @@ by\\ \vspace{\baselineskip} \@author \end{center} -\vspace{\titlesepspace} +\vspace{\titskip} \parbox[t]{2.0in}{\@agent}\hspace{2.0in} \parbox[t]{2.0in}{\@author\\\@address} \newpage\setcounter{page}{1} @@ -129,7 +129,7 @@ by\\ \newcommand{\dialbreak}[2][]{ \\\dialnametab\hbox{\more}% \end{dialogue} -\pagebreak +\newpage \ifthenelse{\not\equal{#1}{}} { \begin{dialogue}[#1]{\MakeUppercase{#2} \contd} @@ -195,7 +195,7 @@ TITLE OVER: \newcommand{\titbreak}{ \\\dialnametab\hbox{\more}% \end{titleover} -\pagebreak +\newpage \begin{titleover}[\contd] } \newcommand{\centretitle}[1]{ diff --git a/Master/texmf-dist/tex/latex/siggraph/siggraph.cls b/Master/texmf-dist/tex/latex/siggraph/siggraph.cls index a2a55dfde94..8ca0ec0ad89 100644 --- a/Master/texmf-dist/tex/latex/siggraph/siggraph.cls +++ b/Master/texmf-dist/tex/latex/siggraph/siggraph.cls @@ -1,21 +1,25 @@ -%% +%% %% This is file `siggraph.cls', %% generated with the docstrip utility. -%% +%% %% The original source files were: -%% +%% %% siggraph.dtx (with options: `class') %% %% IMPORTANT NOTICE: %% %% For the copyright see the source file. %% -%% You are *not* allowed to modify this file. +%% Any modified versions of this file must be renamed +%% with new filenames distinct from siggraph.cls. %% -%% You are *not* allowed to distribute this file. -%% For distribution of the original source see -%% the terms for copying and modification in the file siggraph.dtx. +%% For distribution of the original source see the terms +%% for copying and modification in the file siggraph.dtx. %% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) %% %% Copyright (C) 1996 Daniel Kartch %% Program of Computer Graphics @@ -427,5 +431,5 @@ ***************************************}} {} \endinput -%% +%% %% End of file `siggraph.cls'. diff --git a/Master/texmf-dist/tex/latex/skull/skull.sty b/Master/texmf-dist/tex/latex/skull/skull.sty index e1434a68917..61a19ac6db7 100644 --- a/Master/texmf-dist/tex/latex/skull/skull.sty +++ b/Master/texmf-dist/tex/latex/skull/skull.sty @@ -5,7 +5,7 @@ %% The original source files were: %% %% skull.dtx -%% Pakke til at lave d^^f8dningehoveder. +%% Pakke til at lave dødningehoveder. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{skull} [2002/01/23 v0.1 (c) Henrik Christian Grove <grove@math.ku.dk>] diff --git a/Master/texmf-dist/tex/latex/splitbib/splitbib.sty b/Master/texmf-dist/tex/latex/splitbib/splitbib.sty index fd926d11b57..4ee8d9dbdd2 100644 --- a/Master/texmf-dist/tex/latex/splitbib/splitbib.sty +++ b/Master/texmf-dist/tex/latex/splitbib/splitbib.sty @@ -24,7 +24,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{splitbib} - [2005/02/25 v1.12 Splits bibliography into categories] + [2005/12/22 v1.17 Splits bibliography into categories] \newif\ifNMSB@strict\NMSB@strictfalse \DeclareOption{strict}{\NMSB@stricttrue} \DeclareOption{nonstrict}{\NMSB@strictfalse} @@ -78,49 +78,49 @@ \def\NMSB@penalty{5000} \def\NMSB@halfpenalty{500} \def\NMSB@warnnocateg#1,\end{% - \message{---- SortBib warning ----^^J% + \message{---- Splitbib warning ----^^J% -- The following bib entries have no category: #1^^J}} \def\NMSB@warndblcateg#1,\end{% - \message{---- SortBib warning ----^^J% + \message{---- Splitbib warning ----^^J% -- The following bib entries have several categories: #1^^J% -- The first one will be used.^^J}} \def\NMSB@warnwronglongest{% \expandafter\NMSB@tok\expandafter{\NMSB@reallylongestlabel} - \message{---- SortBib warning ----^^J% + \message{---- Splitbib warning ----^^J% -- The longest label appears to be [\the\NMSB@tok] instead of} \@ifundefined{SBlongestlabel}{}{\message{(forced)}} \expandafter\NMSB@tok\expandafter{\NMSB@longestlabel} \message{[\the\NMSB@tok]^^J}} \def\NMSB@errtoomanycat#1{% - \message{---- SortBib error ----^^J% + \message{---- Splitbib error ----^^J% -- You defined too many level-#1 categories (max = 89).^^J}} \def\NMSB@errtoomanyent{% \setcounter{NMSB@maxent}{\NMSB@initent0} \addtocounter{NMSB@maxent}{-\NMSB@initent} - \message{---- SortBib error ----^^J% + \message{---- Splitbib error ----^^J% -- You defined too many entries in one category % (max = \theNMSB@maxent)^^J}} \def\NMSB@errcattoodeep{% - \message{---- Sortbib error ----^^J + \message{---- Splitbib error ----^^J -- Only two category depth allowed.^^J}} \def\NMSB@errentriesoutsidecat{% - \message{---- Sortbib error ----^^J + \message{---- Splitbib error ----^^J -- \string\SBentries outside category environment.^^J}} \def\NMSB@errentrieswithoptinsidecat{% - \message{----Sortbib error ----^^J + \message{----Splitbib error ----^^J -- \string\SBentries with optional argument inside category env.^^J}} \def\NMSB@erraliasoutsidecat{% - \message{----Sortbib error ----^^J + \message{----Splitbib error ----^^J -- \string\SBalias used outside category environment.^^J}} \def\NMSB@erraliasalreadydef#1{% - \message{----Sortbib error ----^^J + \message{----Splitbib error ----^^J -- Alias #1 multiply defined.^^J}} \def\NMSB@erraliasundefined#1{% - \message{----Sortbib error ----^^J + \message{----Splitbib error ----^^J -- Alias #1 undefined.^^J}} \def\NMSB@errcommentoutsidecat{% - \message{----Sortbib error ----^^J + \message{----Splitbib error ----^^J -- \string\SBcomment used outside category environment.^^J}} \def\SBtitlestyle#1{\gdef\NMSB@titlestyle{#1}} \def\SBsubtitlestyle#1{\gdef\NMSB@subtitlestyle{#1}} @@ -163,7 +163,7 @@ \def\NMSB@stylesimple#1#2{\hskip-\leftmargin% \csname SB\NMSB@level font\endcsname{#1#2} } -\def\category{\@ifnextchar[{\@lNMSBcategory}{\@NMSBcategory}} +\def\category{\@ifnextchar[{\@lNMSBcategory}{\@lNMSBcategory[]}} \def\@lNMSBcategory[#1]#2{% \stepcounter{NMSB@catlevel}% \ifnum\theNMSB@catlevel>2\relax @@ -360,10 +360,6 @@ \expandafter\ifx\csname NMSBcateg@#2\endcsname\relax \expandafter\gdef\csname NMSBcateg@#2\endcsname{9999}% \edef\NMSB@missingcat{\NMSB@missingcat #2,}% - \ifNMSB@ownorder - \expandafter\xdef\csname NMSBcateg@\@citeb\endcsname{% - \csname NMSBcateg@\@citeb\endcsname\theNMSB@maxent}% - \fi \fi \let\@tempa\relax \ifNMSB@ownorder @@ -423,10 +419,6 @@ \def\@bibitem#1#2\par{% \expandafter\ifx\csname NMSBcateg@#1\endcsname\relax \expandafter\gdef\csname NMSBcateg@#1\endcsname{9999}% - \ifNMSB@ownorder - \expandafter\xdef\csname NMSBcateg@\@citeb\endcsname{% - \csname NMSBcateg@\@citeb\endcsname\theNMSB@maxent}% - \fi \edef\NMSB@missingcat{\NMSB@missingcat #1,}% \fi \def\@tempa{}% @@ -654,17 +646,15 @@ \immediate\write\NMSB@catbib{% \string\bibitem}% \expandafter\ifx\expandafter\relax\the\NMSB@currprefixtok - \expandafter\def\expandafter\NMSB@tempentry - \expandafter{\the\value{\@listctr}}% \else \expandafter\expandafter\expandafter\def \expandafter\expandafter\expandafter\NMSB@tempentry \expandafter\expandafter\expandafter{% \expandafter\the\expandafter\NMSB@currprefixtok \the\value{\@listctr}}% + \expandafter\NMSB@writecatbib\expandafter{% + \expandafter[\NMSB@tempentry]}% \fi - \expandafter\NMSB@writecatbib\expandafter{% - \expandafter[\NMSB@tempentry]}% \immediate\write\NMSB@catbib{% {\csname NMSBkey@#5\endcsname}} \expandafter\let\expandafter\NMSB@tempentry diff --git a/Master/texmf-dist/tex/latex/sprite/sprite.sty b/Master/texmf-dist/tex/latex/sprite/sprite.sty index 4229959bc6d..849434fe8a9 100644 --- a/Master/texmf-dist/tex/latex/sprite/sprite.sty +++ b/Master/texmf-dist/tex/latex/sprite/sprite.sty @@ -1,4 +1,3 @@ -%LaTeX style %%%%%%%%%%%%% SPRITE.STY %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% LaTeX style option SPRITE.STY ( Martin Costabel 27-Oct-1987 ) %% Use: \documentstyle[...,sprite,...]{...} diff --git a/Master/texmf-dist/tex/latex/ssqquote/OT1cmssq.fd b/Master/texmf-dist/tex/latex/ssqquote/OT1cmssq.fd index 467683d82ff..690fb1f861c 100644 --- a/Master/texmf-dist/tex/latex/ssqquote/OT1cmssq.fd +++ b/Master/texmf-dist/tex/latex/ssqquote/OT1cmssq.fd @@ -1,21 +1,25 @@ -%% +%% %% This is file `OT1cmssq.fd', %% generated with the docstrip utility. -%% +%% %% The original source files were: -%% +%% %% ssqquote.dtx (with options: `OT1cmssq') %% %% IMPORTANT NOTICE: %% %% For the copyright see the source file. %% -%% You are *not* allowed to modify this file. +%% Any modified versions of this file must be renamed +%% with new filenames distinct from OT1cmssq.fd. %% -%% You are *not* allowed to distribute this file. -%% For distribution of the original source see -%% the terms for copying and modification in the file ssqquote.dtx. +%% For distribution of the original source see the terms +%% for copying and modification in the file ssqquote.dtx. %% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -48,5 +52,5 @@ <-> ssub * cmssq/m/sl }{} \endinput -%% +%% %% End of file `OT1cmssq.fd'. diff --git a/Master/texmf-dist/tex/latex/ssqquote/T1cmssq.fd b/Master/texmf-dist/tex/latex/ssqquote/T1cmssq.fd index c4b99fb2678..03118232a06 100644 --- a/Master/texmf-dist/tex/latex/ssqquote/T1cmssq.fd +++ b/Master/texmf-dist/tex/latex/ssqquote/T1cmssq.fd @@ -1,21 +1,25 @@ -%% +%% %% This is file `T1cmssq.fd', %% generated with the docstrip utility. -%% +%% %% The original source files were: -%% +%% %% ssqquote.dtx (with options: `T1cmssq') %% %% IMPORTANT NOTICE: %% %% For the copyright see the source file. %% -%% You are *not* allowed to modify this file. +%% Any modified versions of this file must be renamed +%% with new filenames distinct from T1cmssq.fd. %% -%% You are *not* allowed to distribute this file. -%% For distribution of the original source see -%% the terms for copying and modification in the file ssqquote.dtx. +%% For distribution of the original source see the terms +%% for copying and modification in the file ssqquote.dtx. %% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -48,5 +52,5 @@ <-> ssub * cmssq/m/sl }{} \endinput -%% +%% %% End of file `T1cmssq.fd'. diff --git a/Master/texmf-dist/tex/latex/ssqquote/ssqquote.sty b/Master/texmf-dist/tex/latex/ssqquote/ssqquote.sty index 946ec385ccc..039fefbaca1 100644 --- a/Master/texmf-dist/tex/latex/ssqquote/ssqquote.sty +++ b/Master/texmf-dist/tex/latex/ssqquote/ssqquote.sty @@ -1,21 +1,25 @@ -%% +%% %% This is file `ssqquote.sty', %% generated with the docstrip utility. -%% +%% %% The original source files were: -%% +%% %% ssqquote.dtx (with options: `package') %% %% IMPORTANT NOTICE: %% %% For the copyright see the source file. %% -%% You are *not* allowed to modify this file. +%% Any modified versions of this file must be renamed +%% with new filenames distinct from ssqquote.sty. %% -%% You are *not* allowed to distribute this file. -%% For distribution of the original source see -%% the terms for copying and modification in the file ssqquote.dtx. +%% For distribution of the original source see the terms +%% for copying and modification in the file ssqquote.dtx. %% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -70,5 +74,5 @@ \endgroup \vfil \pagebreak} \endinput -%% +%% %% End of file `ssqquote.sty'. diff --git a/Master/texmf-dist/tex/latex/stdpage/stdpage.sty b/Master/texmf-dist/tex/latex/stdpage/stdpage.sty index dd6c16f0fed..981afa265ec 100644 --- a/Master/texmf-dist/tex/latex/stdpage/stdpage.sty +++ b/Master/texmf-dist/tex/latex/stdpage/stdpage.sty @@ -22,8 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{stdpage} - [2004/12/20 v0.5 stdpage.sty] - + [2005/03/30 v0.6 stdpage.sty] \RequirePackage{typearea% ,ragged2e% ,ifthen% @@ -31,6 +30,7 @@ ,lineno% }% \RequirePackage[htt]{hyphenat}% + \RequirePackage[rigidchapters]{titlesec}% \renewcommand{\familydefault}{\ttdefault}% \renewcommand{\RaggedRightParindent}{\parindent}% \newlength{\St@ndardLinewidth}% @@ -38,17 +38,20 @@ \newlength{\CharsX}% \newlength{\CharsI}% \newboolean{st@ndardjust}% + \setboolean{st@ndardjust}{false}% \newboolean{st@ndardnoindent}% + \setboolean{st@ndardnoindent}{false}% \newboolean{st@ndardnumbers}% + \setboolean{st@ndardnumbers}{false}% \newboolean{st@ndardhyphen}% \setboolean{st@ndardhyphen}{true}% \newboolean{st@ndardparskip}% \setboolean{st@ndardparskip}{false}% + \newboolean{st@ndardtypewriter}% + \setboolean{st@ndardtypewriter}{false}% \newcommand*{\zeichenzahl}{60}% \newcommand*{\zeilenzahl}{30}% - - -\define@key{stdpage}{block}[true]{%Aus kompatibilitätsgründen auf deutsch +\define@key{stdpage}{block}[true]{%Aus Kompatibilitätsgründen (zu v. 0.4) auf deutsch \setboolean{st@ndardjust}{#1}% }% \define@key{stdpage}{just}[true]{% @@ -69,12 +72,15 @@ \define@key{stdpage}{chars}[60]{% \renewcommand{\zeichenzahl}{#1}% }% -\define@key{stdpage}{lines}[60]{% +\define@key{stdpage}{lines}[30]{% \renewcommand{\zeilenzahl}{#1}% }% -\define@key{stdpage}{baselinestretch}[1]{% +\define@key{stdpage}{baselinestretch}[1.25]{% \renewcommand{\baselinestretch}{#1}% }% +\define@key{stdpage}{typewriter}[true]{% + \setboolean{st@ndardtypewriter}{#1}% +}% \end{macrocode} \def\ProcessOptionsWithKV#1{% \let\@tempc\relax% \let\stdpage@tempa\@empty% @@ -96,19 +102,24 @@ \setlength{\St@ndardLinewidth}{\zeichenzahl\CharsI}% \setlength{\St@ndardTextwidth}{0pt}%\topskip}% \addtolength{\St@ndardTextwidth}{\zeilenzahl\baselineskip}% - \ifthenelse{\boolean{st@ndardjust}}% - {% - \areaset[current]{.976\St@ndardLinewidth}{\St@ndardTextwidth}% - }% - {% - \areaset[current]{\St@ndardLinewidth}{\St@ndardTextwidth}% - }% + \ifthenelse{\boolean{st@ndardparskip}}% + {\setlength{\parskip}{\baselineskip}}{} +%%% \ifthenelse{\boolean{st@ndardjust}}% +%%% {% + \areaset[current]{.976\St@ndardLinewidth}{\St@ndardTextwidth}% +%%% }% +%%% {% +%%% \areaset[current]{\St@ndardLinewidth}{\St@ndardTextwidth}% +%%% }% \ifthenelse{\boolean{st@ndardjust}}% - {}% {% + \spaceskip=1\CharsI plus 1.5pt minus 0pt + }% + {% + \spaceskip=1\CharsI plus 0pt minus 0pt \ifthenelse{\boolean{st@ndardhyphen}}% {% - \setlength{\RaggedRightRightskip}{0em}% plus .5em minus .5em}% + \setlength{\RaggedRightRightskip}{0em minus .75em} \RaggedRight% }% {% @@ -122,9 +133,26 @@ \linenumbers% \pagewiselinenumbers% }{}% -}% + \ifthenelse{\boolean{st@ndardtypewriter}}% + {% + \let\sectfont\normalfont + \renewcommand{\footnotesize}{\normalsize} + \titleformat{\part}{\normalfont\normalsize\bfseries}{\thepart}{1em}{} + \titleformat{\chapter}{\normalfont\normalsize\bfseries}{\thechapter}{1em}{} + \titleformat{\section}{\normalfont\normalsize\bfseries}{\thesection}{1em}{} + \titleformat{\subsection}{\normalfont\normalsize\bfseries}{\thesubsection}{1em}{} + \titleformat{\subsubsection}{\normalfont\normalsize\bfseries}{\thesubsubsection}{1em}{} + \titleformat{\paragraph}{\normalfont\normalsize\bfseries}{\theparagraph}{1em}{} + \titlespacing*{\part}{0pt}{5\baselineskip}{3\baselineskip} + \titlespacing*{\chapter}{0pt}{4\baselineskip}{3\baselineskip} + \titlespacing*{\section}{0pt}{3\baselineskip}{2\baselineskip} + \titlespacing*{\subsection}{0pt}{2\baselineskip}{1\baselineskip} + \titlespacing*{\subsubsection}{0pt}{1\baselineskip}{0pt} + \titlespacing*{\paragraph}{0pt}{1\baselineskip}{0pt} + }{}% \frenchspacing - \emergencystretch=3em% + \emergencystretch=2em% +}% \ProcessOptionsWithKV{stdpage} \AtEndOfPackage{% \let\@unprocessedoptions\relax diff --git a/Master/texmf-dist/tex/latex/substr/substr.sty b/Master/texmf-dist/tex/latex/substr/substr.sty index 1537f872fba..d7c0ca12612 100644 --- a/Master/texmf-dist/tex/latex/substr/substr.sty +++ b/Master/texmf-dist/tex/latex/substr/substr.sty @@ -27,10 +27,18 @@ %% Counts the number of appearances of <substring> in <string> and %% returns it as text. %% -%% \SubStringsToCounter}{counter}{substring}{string} +%% \SubStringsToCounter{counter}{substring}{string} %% Counts the number of appearances of <substring> in <string> and %% sets the counter <counter> to that value. %% +%% \IfBeforeSubStringEmpty{substring}{string}{true part}{false part} +%% Calls <true part> if <substring> is equal to the beginning of <string>. +%% Else call <false part>. +%% +%% \IfBehindSubStringEmpty{substring}{string}{true part}{false part} +%% Calls <true part> if <substring> is equal to the end of <string>. +%% Else call <false part>. +%% %% %% History of this package: %% @@ -45,7 +53,7 @@ %% who improved and rewrote many parts of it. %% %% -%% Copyright 2000 Harald Harders +%% Copyright 2000, 2005 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -53,15 +61,15 @@ %% version 1 of the License, or any later version. %% %% -%% 2000-06-15 +%% 2005-11-29 %% Harald Harders %% h.harders@tu-bs.de %% -\ProvidesPackage{substr}[2000/06/15] +\ProvidesPackage{substr}[2005/11/29 v1.1 Handle substrings] %% % expands the first and second argument with % \protected@edef and calls #3 with them: -\newcommand{\su@ExpandTwoArgs}[3]{% +\newcommand\su@ExpandTwoArgs[3]{% \protected@edef\su@SubString{#1}% \protected@edef\su@String{#2}% \expandafter\expandafter\expandafter#3% @@ -71,11 +79,11 @@ } %% %% tests if #1 in #2. If yes execute #3, else #4 -\newcommand*{\IfSubStringInString}[2]{% +\newcommand*\IfSubStringInString[2]{% \su@ExpandTwoArgs{#1}{#2}\su@IfSubStringInString } %% -\newcommand*{\su@IfSubStringInString}[2]{% +\newcommand*\su@IfSubStringInString[2]{% \def\su@compare##1#1##2\@nil{% \def\su@param{##2}% \ifx\su@param\@empty @@ -92,30 +100,56 @@ \let\IfCharInString\IfSubStringInString %% %% returns the part of the string behind the found substring -\newcommand*{\BehindSubString}[2]{% +\newcommand*\BehindSubString[2]{% \su@ExpandTwoArgs{#1}{#2}\su@BehindSubString } -\newcommand*{\su@BehindSubString}[2]{% +\newcommand*\su@BehindSubString[2]{% \def\su@rest##1#1##2\@nil{##2}% \IfSubStringInString{#1}{#2}{\su@rest#2\@nil}{}% } %% %% returns the part of the string before the found substring -\newcommand*{\BeforeSubString}[2]{% +\newcommand*\BeforeSubString[2]{% \su@ExpandTwoArgs{#1}{#2}\su@BeforeSubString } -\newcommand*{\su@BeforeSubString}[2]{% +\newcommand*\su@BeforeSubString[2]{% \def\su@rest##1#1##2\@nil{##1}% \IfSubStringInString{#1}{#2}{\su@rest#2\@nil}{#2}% } %% +%% calls #3 if part of string before substring is empty, otherwise calls #4. +\newcommand*\IfBeforeSubStringEmpty[2]{% + \su@ExpandTwoArgs{#1}{#2}\su@IfBeforeSubStringEmpty +} +%% +\newcommand*\su@IfBeforeSubStringEmpty[4]{% + \def\su@rest##1#1##2\@nil{##1}% + \IfSubStringInString{#1}{#2}{% + \edef\su@resta{\su@rest#2\@nil}% + \ifx\@empty\su@resta #3\else #4\fi + }{#4}% +} +%% +%% calls #3 if part of string after substring is empty, otherwise calls #4. +\newcommand*\IfBehindSubStringEmpty[2]{% + \su@ExpandTwoArgs{#1}{#2}\su@IfBehindSubStringEmpty +} +%% +\newcommand*\su@IfBehindSubStringEmpty[4]{% + \def\su@rest##1#1##2\@nil{##2}% + \IfSubStringInString{#1}{#2}{% + \edef\su@resta{\su@rest#2\@nil}% + \ifx\@empty\su@resta #3\else #4\fi + }{#4}% +} +%% %% counter for counting appearances \newcounter{su@anzahl} %% % #1: String % #2: Substring % #3: Counter -\newcommand*{\su@StringSubstringCounter}[3]{% +\newcommand*\su@StringSubstringCounter[3]{% \su@IfSubStringInString{#2}{#1}{% \stepcounter{#3}% \def\su@rest##1#2##2\@nil{##2}% @@ -124,10 +158,10 @@ }{}% } %% -\newcommand*{\CountSubStrings}[2]{% +\newcommand*\CountSubStrings[2]{% \su@ExpandTwoArgs{#1}{#2}\su@CountSubStrings } -\newcommand*{\su@CountSubStrings}[2]{% +\newcommand*\su@CountSubStrings[2]{% \setcounter{su@anzahl}{0}% \su@StringSubstringCounter{#2}{#1}{su@anzahl}% \thesu@anzahl @@ -135,13 +169,13 @@ % #1: counter % #2: substring % #3: string -\newcommand*{\SubStringsToCounter}[3]{% +\newcommand*\SubStringsToCounter[3]{% \su@ExpandTwoArgs{#2}{#3}\su@SubStringsToCounter{#1}% } % #1: substring % #2: string % #3: counter -\newcommand*{\su@SubStringsToCounter}[3]{% +\newcommand*\su@SubStringsToCounter[3]{% \setcounter{#3}{0}% \su@StringSubstringCounter{#2}{#1}{#3}% } |