diff options
| author | Norbert Preining <preining@logic.at> | 2006-10-04 08:43:01 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2006-10-04 08:43:01 +0000 |
| commit | ba9472aebfed07843bc4faa00c7b96bc86194691 (patch) | |
| tree | 4a952a012e2f1663beaac6384dec265fb50dd361 /Master/texmf-dist/tex/latex | |
| parent | a88bdfe70c672cfced299babf0a54881a916bcca (diff) | |
Fix ctan2tds for pgf installation
comment powerdot-doc-vn in tpm-ctan-check, it always breaks
Update of the following packages:
labelcas pstricks-add sectionbox ltxmisc frenchle flowfram verse emulateapj
pst-pdf poemscol babelbib dk-bib breakurl screenplay ncctools xkeyval bibleref
muthesis pst-labo pgf ncclatex active-conf xcolor commath lineno dottex makeplo
git-svn-id: svn://tug.org/texlive/trunk@2240 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
70 files changed, 3961 insertions, 2009 deletions
diff --git a/Master/texmf-dist/tex/latex/babelbib/afrikaans.bdf b/Master/texmf-dist/tex/latex/babelbib/afrikaans.bdf index 17e0353a516..6fc1fedcd63 100644 --- a/Master/texmf-dist/tex/latex/babelbib/afrikaans.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/afrikaans.bdf @@ -18,9 +18,9 @@ %% h.harders@tu-bs.de %% %% Language definitions for Afrikaans by -%% Danie Els, dnjels@sun.ac.za +%% Danie Els <dnjels@sun.ac.za> \ProvidesFile{afrikaans.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsafrikaans[1][afrikaans]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{et~al##1{}}}% @@ -100,8 +100,12 @@ \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Tegniese Verslag}}% \def\btxurldatecomment##1{\PackageError{babelbib}{Comment for urldate in Afrikaans undefined. Please send the translation for - 'visited on' to harald.harders@tu-bs.de}{}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + 'visited on' to harald.harders@tu-bs.de}{} [##1]}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameafrikaans{\protect\foreignlanguage{#1}{afrikaans}}% \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{engels}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/babelbib.sty b/Master/texmf-dist/tex/latex/babelbib/babelbib.sty index 0c851985047..6d64cca4038 100644 --- a/Master/texmf-dist/tex/latex/babelbib/babelbib.sty +++ b/Master/texmf-dist/tex/latex/babelbib/babelbib.sty @@ -19,11 +19,22 @@ %% \NeedsTeXFormat{LaTeX2e}[1998/06/01] \ProvidesPackage{babelbib} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newif\ifbbbbfixlanguage \DeclareOption{fixlanguage}{\bbbbfixlanguagetrue} +\DeclareOption{varlanguage}{\bbbbfixlanguagefalse} \newif\ifbbbblanguagenames +\DeclareOption{nolanguagenames}{\bbbblanguagenamesfalse} \DeclareOption{languagenames}{\bbbblanguagenamestrue} +\newif\ifbbbbannotations +\DeclareOption{annote}{\bbbbannotationstrue} +\DeclareOption{noannote}{\bbbbannotationsfalse} +\newif\ifbtx@printISBN +\newif\ifbtx@printISSN +\DeclareOption{isbn}{\btx@printISBNtrue} +\DeclareOption{noisbn}{\btx@printISBNfalse} +\DeclareOption{issn}{\btx@printISSNtrue} +\DeclareOption{noissn}{\btx@printISSNfalse} \DeclareOption*{% \InputIfFileExists{\CurrentOption.bdf}{% \expandafter\def\csname bbbb\CurrentOption loaded\endcsname{\@empty}% @@ -33,6 +44,7 @@ Maybe you misspelled the language option?}% }% } +\ExecuteOptions{varlanguage,nolanguagenames,noannote,isbn,issn} \ProcessOptions* \newcommand*{\bbbbifundefined}[1]{% \begingroup\expandafter\expandafter\expandafter\endgroup @@ -233,6 +245,8 @@ \let\btxlastnamefont=\@empty \newcommand\btxtitlefont{} \let\btxtitlefont=\@empty +\newcommand\btxjtitlefont{} +\let\btxjtitlefont=\@empty \newcommand\btxetalfont{} \let\btxetalfont=\@empty \newcommand\btxjournalfont{} @@ -247,6 +261,8 @@ \let\btxurlfont=\@empty \newcommand\btxurldatefont{} \let\btxurldatefont=\@empty +\newcommand\btxnumeralfont{} +\let\btxnumeralfont=\@empty \newcommand\btxauthorcolon{:} \newcommand\btxISBN{ISBN} \newcommand\btxISSN{ISSN} @@ -254,10 +270,77 @@ \DeclareRobustCommand\ifbtxprintISSN[1]{\ifbtx@printISSN #1\fi} \newcommand*\btxprintISBN[1]{\csname btx@printISBN#1\endcsname} \newcommand*\btxprintISSN[1]{\csname btx@printISSN#1\endcsname} -\newif\ifbtx@printISBN -\newif\ifbtx@printISSN -\btxprintISBN{true} -\btxprintISSN{true} +\ifbbbbannotations + \DeclareRobustCommand\btxannotation[1]{% + \begin{quotation}% + \noindent + #1% + \end{quotation}% + } +\else + \DeclareRobustCommand\btxannotation[1]{}% +\fi +\providecommand\ifnumber[3]{% + \begingroup\@tempswafalse\let\scr@next\test@number + \expandafter\scr@next#1\scr@next + \if@tempswa\endgroup#2\else\endgroup#3\fi +} +\providecommand*\test@number[1]{% + \ifx \scr@next#1% + \let\scr@next\relax + \else + \@tempcnta=\expandafter\expandafter\expandafter\number + \expandafter`#1\relax + \ifnum \@tempcnta>47\relax + \ifnum \@tempcnta<58\relax + \@tempswatrue + \else\@tempswafalse\fi + \else\@tempswafalse\fi + \if@tempswa\else\let\scr@next\gobble@till@next\fi\fi + \scr@next +} +\def\gobble@till@next#1\scr@next{} +\def\btx@parsenum#1#2#3\@empty{% + #1% + \edef\btx@digitb{#3}% + \ifx\@empty\btx@digitb + #2% + \edef\btx@digita{#1}% + \edef\btx@digitb{#2}% + \else + \expandafter\btx@parsenum#2#3\@empty + \fi +} +\DeclareRobustCommand\btxnumeralfallback[2]{% + \foreignlanguage{#1}{% + \ifnumber{#2}{% + \PackageWarning{babelbib}{Handling of numerical editions not + handled\MessageBreak by language #1 for edition `#2'}% + }{}% + #2% + }% +}% +\DeclareRobustCommand\btxnumeraldot[2]{% + \foreignlanguage{#1}{\ifnumber{#2}{#2.}{#2}}% +} +\DeclareRobustCommand\btxnumeralenglish[2]{% + \foreignlanguage{#1}{% + \ifnumber{#2}{% + \expandafter\btx@parsenum#2\@empty\@empty\@empty + \btxnumeralfont{% + \ifx\btx@digitb\@empty + \ifcase\btx@digita th\or st\or nd\or rd\else th\fi + \else + \ifnum\btx@digita=1 + th% + \else + \ifcase\btx@digitb th\or st\or nd\or rd\else th\fi + \fi + \fi + }% + }{#2}% + }% +} \AtBeginDocument{% \providecommand\url[1]{% \PackageError{babelbib}{No \string\url\space command defined but @@ -290,6 +373,7 @@ \inputbdf{frenchb}{french} \inputbdf{german}{german} \inputbdf{germanb}{german} + \inputbdf{greek}{greek} \inputbdf{italian}{italian} \inputbdf{norsk}{norsk} \inputbdf{mexican}{spanish} diff --git a/Master/texmf-dist/tex/latex/babelbib/catalan.bdf b/Master/texmf-dist/tex/latex/babelbib/catalan.bdf index 7ccc8eb2a57..47a207a4ff3 100644 --- a/Master/texmf-dist/tex/latex/babelbib/catalan.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/catalan.bdf @@ -18,9 +18,9 @@ %% h.harders@tu-bs.de %% %% Language definitions for Catalan by -%% Robert Fuster, rfuster@imm.upv.es +%% Robert Fuster <rfuster@imm.upv.es> \ProvidesFile{catalan.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibscatalan[1][catalan]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{i~al##1{}}}% @@ -97,11 +97,12 @@ \def\Btxpageslong##1{\protect\foreignlanguage{#1}{P\`agines}}% \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Rep. t\`ecnic}}% \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Report t\`ecnic}}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{visitada el}}% - \def\btxurldatecomment##1{\PackageError{babelbib}{Comment for - urldate in Catalan undefined. Please send the translation for - 'visited on' to harald.harders@tu-bs.de}{}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, visitada el ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{angl\`es}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{alem\`any}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/danish.bdf b/Master/texmf-dist/tex/latex/babelbib/danish.bdf index e5046467fef..b3f20409dee 100644 --- a/Master/texmf-dist/tex/latex/babelbib/danish.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/danish.bdf @@ -18,7 +18,7 @@ %% h.harders@tu-bs.de %% \ProvidesFile{danish.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsdanish[1][danish]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{et~al##1{}}}% @@ -96,8 +96,12 @@ \def\Btxpageslong##1{\protect\foreignlanguage{#1}{Sider}}% \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Tekn.\ rap##1{}}}% \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Teknisk rapport}}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{bes\o gt den}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, bes\o gt den ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{engelsk}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{tysk}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/dutch.bdf b/Master/texmf-dist/tex/latex/babelbib/dutch.bdf index 855cd90c4c7..0401a265a11 100644 --- a/Master/texmf-dist/tex/latex/babelbib/dutch.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/dutch.bdf @@ -18,7 +18,7 @@ %% h.harders@tu-bs.de %% \ProvidesFile{dutch.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsdutch[1][dutch]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{et~al##1{}}}% @@ -96,8 +96,12 @@ \def\Btxpageslong##1{\protect\foreignlanguage{#1}{Pagina's}}% \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Tech.\ Rapp##1{}}}% \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Technisch Rapport}}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{bezocht op}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, bezocht op ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{engels}}% % \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{german}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/english.bdf b/Master/texmf-dist/tex/latex/babelbib/english.bdf index 2f8f37fa176..00e626551e5 100644 --- a/Master/texmf-dist/tex/latex/babelbib/english.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/english.bdf @@ -18,7 +18,7 @@ %% h.harders@tu-bs.de %% \ProvidesFile{english.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \makeatletter \@ifpackageloaded{french}{}{\newcommand\bibsenglish{}} \makeatother @@ -99,8 +99,12 @@ \def\Btxpageslong##1{\protect\foreignlanguage{#1}{Pages}}% \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Tech.\ Rep##1{}}}% \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Technical Report}}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{visited on}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, visited on ##1}}% + \def\btxfnamespaceshort{}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralenglish{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralenglish{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{english}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{german}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/esperanto.bdf b/Master/texmf-dist/tex/latex/babelbib/esperanto.bdf index 307d0f73e92..93c8a413ac3 100644 --- a/Master/texmf-dist/tex/latex/babelbib/esperanto.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/esperanto.bdf @@ -18,9 +18,9 @@ %% h.harders@tu-bs.de %% %% Language definitions for Esperanto by -%% Taneli Huuskonen, huuskone@cc.helsinki.fi +%% Taneli Huuskonen <huuskone@cc.helsinki.fi> \ProvidesFile{esperanto.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsesperanto[1][esperanto]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{k~al##1{}}}% @@ -100,8 +100,12 @@ \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Teknika Raporto}}% \def\btxurldatecomment##1{\PackageError{babelbib}{Comment for urldate in Esperanto undefined. Please send the translation for - 'visited on' to harald.harders@tu-bs.de}{}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + 'visited on' to harald.harders@tu-bs.de}{} [##1]}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{angla}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{germana}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/finnish.bdf b/Master/texmf-dist/tex/latex/babelbib/finnish.bdf index dac3a7658fe..c529d814737 100644 --- a/Master/texmf-dist/tex/latex/babelbib/finnish.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/finnish.bdf @@ -18,9 +18,9 @@ %% h.harders@tu-bs.de %% %% Language definitions for Finnish by -%% Taneli Huuskonen, huuskone@cc.helsinki.fi +%% Taneli Huuskonen <huuskone@cc.helsinki.fi> \ProvidesFile{finnish.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsfinnish[1][finnish]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{et~al##1{}}}% @@ -98,8 +98,12 @@ \def\Btxpageslong##1{\protect\foreignlanguage{#1}{Sivut}}% \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Tekn.\ rap##1{}}}% \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Tekninen raportti}}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{vierailtu}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, vierailtu ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{englanti}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{saksa}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/french.bdf b/Master/texmf-dist/tex/latex/babelbib/french.bdf index 9b6af75ddcf..59825934f46 100644 --- a/Master/texmf-dist/tex/latex/babelbib/french.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/french.bdf @@ -18,7 +18,7 @@ %% h.harders@tu-bs.de %% \ProvidesFile{french.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \makeatletter \@ifpackageloaded{french}{}{\newcommand\bibsfrench{}} \makeatother @@ -101,8 +101,13 @@ \def\Btxpageslong##1{\protect\foreignlanguage{#1}{Pages}}% \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Rap. tech##1{}}}% \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Rapport technique}}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{visit\'e le}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, visit\'e le ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\protect\foreignlanguage{#1}{% + \ifnumber{##1}{##1"a}{##1}}}% + \def\btxnumerallong##1{\btxnumeralshort{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{anglais}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{allemand}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/german.bdf b/Master/texmf-dist/tex/latex/babelbib/german.bdf index 5eb1baa2246..6ad9822f5a5 100644 --- a/Master/texmf-dist/tex/latex/babelbib/german.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/german.bdf @@ -18,7 +18,7 @@ %% h.harders@tu-bs.de %% \ProvidesFile{german.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsgerman[1][german]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{et~al##1{}}}% @@ -98,8 +98,12 @@ \def\Btxpageslong{\btxpageslong}% \def\Btxtechrepshort{\btxtechrepshort}% \def\Btxtechreplong{\btxtechreplong}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{besucht:}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, besucht: ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeraldot{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeraldot{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{englisch}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{deutsch}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/greek.bdf b/Master/texmf-dist/tex/latex/babelbib/greek.bdf new file mode 100644 index 00000000000..c55db833157 --- /dev/null +++ b/Master/texmf-dist/tex/latex/babelbib/greek.bdf @@ -0,0 +1,167 @@ +%% +%% This is file `greek.bdf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% babelbib.dtx (with options: `latex,greek') +%% +%% babelbib package +%% +%% Copyright 2003--2005 Harald Harders +%% +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License Distributed from CTAN +%% archives in directory macros/latex/base/lppl.txt; either +%% version 1 of the License, or any later version. +%% +%% h.harders@tu-bs.de +%% +\ProvidesFile{greek.bdf} +%% Language definitions for Greek by +%% Prokopis Prokopidis <prokopis@ilsp.gr> + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] +\newcommand\bibsgreek[1][greek]{% + \def\biblanguagename{#1}% + \def\btxetalshort##1{\protect\foreignlanguage{#1}{k.'a##1{}}}% + \def\btxetallong##1{\protect\foreignlanguage{#1}{kai 'alloi}}% + \def\btxandshort##1{\protect\foreignlanguage{#1}{kai}}% + \def\btxandlong##1{\protect\foreignlanguage{#1}{kai}}% + \def\btxandcomma##1{,}% + \def\btxinlong##1{\protect\foreignlanguage{#1}{sto}}% + \def\btxinshort##1{\protect\foreignlanguage{#1}{sto}}% + \def\btxofseriesshort##1{\protect\foreignlanguage{#1}{tou}}% + \def\btxinseriesshort##1{\protect\foreignlanguage{#1}{sto}}% + \def\btxofserieslong##1{\protect\foreignlanguage{#1}{tou}}% + \def\btxinserieslong##1{\protect\foreignlanguage{#1}{sto}}% + \def\btxeditorshort##1{\protect\foreignlanguage{#1}{epim##1{}}}% + \def\btxeditorlong##1{\protect\foreignlanguage{#1}{epimelht'hc}}% + \def\btxeditorsshort##1{\protect\foreignlanguage{#1}{epim##1{}}}% + \def\btxeditorslong##1{\protect\foreignlanguage{#1}{epimelht'ec}}% + \def\btxvolumeshort##1{\protect\foreignlanguage{#1}{t'om##1{}}}% + \def\btxvolumelong##1{\protect\foreignlanguage{#1}{t'omoc}}% + \def\btxnumbershort##1{\protect\foreignlanguage{#1}{ar##1{}}}% + \def\btxnumberlong##1{\protect\foreignlanguage{#1}{arijm'oc}}% + \def\btxeditionshort##1{\protect\foreignlanguage{#1}{'ekd##1{}}}% + \def\btxeditionlong##1{\protect\foreignlanguage{#1}{'ekdosh}}% + \def\btxchaptershort##1{\protect\foreignlanguage{#1}{kef##1{}}}% + \def\btxchapterlong##1{\protect\foreignlanguage{#1}{kef'alaio}}% + \def\btxpageshort##1{\protect\foreignlanguage{#1}{sel##1{}}}% + \def\btxpagelong##1{\protect\foreignlanguage{#1}{sel'ida}}% + \def\btxpagesshort##1{\protect\foreignlanguage{#1}{sel##1{}}}% + \def\btxpageslong##1{\protect\foreignlanguage{#1}{sel'idec}}% + \def\btxmastthesis##1{\protect\foreignlanguage{#1}{Metaptuqiak'h ergas'ia}}% + \def\btxphdthesis##1{\protect\foreignlanguage{#1}{Didaktorik'h diatrib'h}}% + \def\btxtechrepshort##1{\protect\foreignlanguage{#1}{Teqn.\ anaf##1{}}}% + \def\btxtechreplong##1{\protect\foreignlanguage{#1}{Teqnik'h anafor'a}}% + \def\btxmonjanlong##1{\protect\foreignlanguage{#1}{Ianou'arioc}}% + \def\btxmonfeblong##1{\protect\foreignlanguage{#1}{Febrou'arioc}}% + \def\btxmonmarlong##1{\protect\foreignlanguage{#1}{M'artioc}}% + \def\btxmonaprlong##1{\protect\foreignlanguage{#1}{Apr'ilioc}}% + \def\btxmonmaylong##1{\protect\foreignlanguage{#1}{M'aioc}}% + \def\btxmonjunlong##1{\protect\foreignlanguage{#1}{Io'unioc}}% + \def\btxmonjullong##1{\protect\foreignlanguage{#1}{Io'ulioc}}% + \def\btxmonauglong##1{\protect\foreignlanguage{#1}{A'ugoustoc}}% + \def\btxmonseplong##1{\protect\foreignlanguage{#1}{Sept'embrioc}}% + \def\btxmonoctlong##1{\protect\foreignlanguage{#1}{Okt'wbrioc}}% + \def\btxmonnovlong##1{\protect\foreignlanguage{#1}{No'embrioc}}% + \def\btxmondeclong##1{\protect\foreignlanguage{#1}{Dek'embrioc}}% + \def\btxmonjanshort##1{\protect\foreignlanguage{#1}{Ian##1{}}}% + \def\btxmonfebshort##1{\protect\foreignlanguage{#1}{Feb##1{}}}% + \def\btxmonmarshort##1{\protect\foreignlanguage{#1}{M'ar##1{}}}% + \def\btxmonaprshort##1{\protect\foreignlanguage{#1}{Apr##1{}}}% + \def\btxmonmayshort##1{\protect\foreignlanguage{#1}{M'ai}}% + \def\btxmonjunshort##1{\protect\foreignlanguage{#1}{Io'un##1{}}}% + \def\btxmonjulshort##1{\protect\foreignlanguage{#1}{Io'ul##1{}}}% + \def\btxmonaugshort##1{\protect\foreignlanguage{#1}{A'ug##1{}}}% + \def\btxmonsepshort##1{\protect\foreignlanguage{#1}{Sept##1{}}}% + \def\btxmonoctshort##1{\protect\foreignlanguage{#1}{Okt##1{}}}% + \def\btxmonnovshort##1{\protect\foreignlanguage{#1}{No'e##1{}}}% + \def\btxmondecshort##1{\protect\foreignlanguage{#1}{Dek##1{}}}% + \def\Btxinlong##1{\protect\foreignlanguage{#1}{Sto}}% + \def\Btxinshort##1{\protect\foreignlanguage{#1}{Sto}}% + \def\Btxeditorshort##1{\protect\foreignlanguage{#1}{Epim##1{}}}% + \def\Btxeditorlong##1{\protect\foreignlanguage{#1}{Epimelht'hc}}% + \def\Btxeditorsshort##1{\protect\foreignlanguage{#1}{Epim##1{}}}% + \def\Btxeditorslong##1{\protect\foreignlanguage{#1}{Epimelht'ec}}% + \def\Btxvolumeshort##1{\protect\foreignlanguage{#1}{T'om##1{}}}% + \def\Btxvolumelong##1{\protect\foreignlanguage{#1}{T'omoc}}% + \def\Btxnumbershort##1{\protect\foreignlanguage{#1}{Ar##1{}}}% + \def\Btxnumberlong##1{\protect\foreignlanguage{#1}{Arijm'oc}}% + \def\Btxeditionshort##1{\protect\foreignlanguage{#1}{'Ekd##1{}}}% + \def\Btxeditionlong##1{\protect\foreignlanguage{#1}{'Ekdosh}}% + \def\Btxchaptershort##1{\protect\foreignlanguage{#1}{Kef##1{}}}% + \def\Btxchapterlong##1{\protect\foreignlanguage{#1}{Kef'alaio}}% + \def\Btxpageshort##1{\protect\foreignlanguage{#1}{Sel##1{}}}% + \def\Btxpagelong##1{\protect\foreignlanguage{#1}{Sel'ida}}% + \def\Btxpagesshort##1{\protect\foreignlanguage{#1}{Sel##1{}}}% + \def\Btxpageslong##1{\protect\foreignlanguage{#1}{Sel'idec}}% + \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Teqn.\ Anaf##1{}}}% + \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Teqnik'h Anafor'a}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, ep'iskeyh thn ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\protect\foreignlanguage{#1}{% + \ifnumber{##1}{##1h}{##1}}}% + \def\btxnumerallong##1{\protect\foreignlanguage{#1}{\ifnumber{##1}{% + \ifcase##1 ##1h\or pr'wth\or de'uterh\or tr'ith\or t'etarth% + \or p'empth\or 'ekth\or 'ebdomh\or 'ogdoh\or 'enath\else ##1h\fi + }{##1}}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% + \ifbbbblanguagenames + \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{agglik'a}}% + \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{germanik'a}}% + \def\btxlanguagenamebrazil{\protect\foreignlanguage{#1}{portogalik'a}}% + \def\btxlanguagenamebrazilian{\protect\foreignlanguage{#1}{portogalik'a}}% + \def\btxlanguagenamebritish{\protect\foreignlanguage{#1}{agglik'a}}% + \def\btxlanguagenamebulgarian{\protect\foreignlanguage{#1}{boulgarik'a}}% + \def\btxlanguagenamecanadian{\protect\foreignlanguage{#1}{agglik'a}}% + \def\btxlanguagenamecanadien{\protect\foreignlanguage{#1}{gallik'a}}% + \def\btxlanguagenamecatalan{\protect\foreignlanguage{#1}{katalanik'a}}% + \def\btxlanguagenamecroatian{\protect\foreignlanguage{#1}{kroatik'a}}% + \def\btxlanguagenameczech{\protect\foreignlanguage{#1}{tseqik'a}}% + \def\btxlanguagenamedanish{\protect\foreignlanguage{#1}{danik'a}}% + \def\btxlanguagenamedutch{\protect\foreignlanguage{#1}{ollandik'a}}% + \def\btxlanguagenameenglish{\protect\foreignlanguage{#1}{agglik'a}}% + \def\btxlanguagenameesperanto{\protect\foreignlanguage{#1}{esperanto}}% + \def\btxlanguagenamefinnish{\protect\foreignlanguage{#1}{finlandik'a}}% + \def\btxlanguagenamefrancais{\protect\foreignlanguage{#1}{gallik'a}}% + \def\btxlanguagenamefrench{\protect\foreignlanguage{#1}{gallik'a}}% + \def\btxlanguagenamefrenchb{\protect\foreignlanguage{#1}{gallik'a}}% + \def\btxlanguagenamegerman{\protect\foreignlanguage{#1}{germanik'a}}% + \def\btxlanguagenamegermanb{\protect\foreignlanguage{#1}{germanik'a}}% + \def\btxlanguagenamegreek{\protect\foreignlanguage{#1}{ellhnik'a}}% + \def\btxlanguagenamehebrew{\protect\foreignlanguage{#1}{ebra"ik'a}}% + \def\btxlanguagenamehungarian{\protect\foreignlanguage{#1}{ouggrik'a}}% + \def\btxlanguagenameicelandic{\protect\foreignlanguage{#1}{islandik'a}}% + \def\btxlanguagenameirish{\protect\foreignlanguage{#1}{irlandik'a}}% + \def\btxlanguagenameitalian{\protect\foreignlanguage{#1}{italik'a}}% + \def\btxlanguagenamelatin{\protect\foreignlanguage{#1}{latinik'a}}% + \def\btxlanguagenamenaustrian{\protect\foreignlanguage{#1}{germanik'a}}% + \def\btxlanguagenamengerman{\protect\foreignlanguage{#1}{germanik'a}}% + \def\btxlanguagenamenorsk{\protect\foreignlanguage{#1}{norbhgik'a}}% + \def\btxlanguagenamenynorsk{\protect\foreignlanguage{#1}{n'ea norbhgik'a}}% + \def\btxlanguagenamepolish{\protect\foreignlanguage{#1}{polwnik'a}}% + \def\btxlanguagenameportuges{\protect\foreignlanguage{#1}{portogalik'a}}% + \def\btxlanguagenameportuguese{\protect\foreignlanguage{#1}{portogalik'a}}% + \def\btxlanguagenamerussian{\protect\foreignlanguage{#1}{rwsik'a}}% + \def\btxlanguagenamescottish{\protect\foreignlanguage{#1}{skwts'ezika}}% + \def\btxlanguagenameserbian{\protect\foreignlanguage{#1}{serbik'a}}% + \def\btxlanguagenamespanish{\protect\foreignlanguage{#1}{ispanik'a}}% + \def\btxlanguagenameswedish{\protect\foreignlanguage{#1}{souhdik'a}}% + \def\btxlanguagenameturkish{\protect\foreignlanguage{#1}{tourkik'a}}% + \def\btxlanguagenameUKenglish{\protect\foreignlanguage{#1}{agglik'a}}% + \def\btxlanguagenameUSenglish{\protect\foreignlanguage{#1}{agglik'a}}% + \fi +} +\AtBeginDocument{% + \ifbbbbfixlanguage + \else + \bbbbaddto{greek}{bibsgreek} + \fi + \bbbbaddto{greek}{btxifchangecaseoff} +} + +\endinput +%% +%% End of file `greek.bdf'. diff --git a/Master/texmf-dist/tex/latex/babelbib/italian.bdf b/Master/texmf-dist/tex/latex/babelbib/italian.bdf index 1522fba03de..ac13b1a6cbd 100644 --- a/Master/texmf-dist/tex/latex/babelbib/italian.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/italian.bdf @@ -18,7 +18,7 @@ %% h.harders@tu-bs.de %% \ProvidesFile{italian.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsitalian[1][italian]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{et~al##1{}}}% @@ -78,10 +78,10 @@ \def\btxmondecshort##1{\protect\foreignlanguage{#1}{dic##1{}}}% \def\Btxinlong##1{\protect\foreignlanguage{#1}{Nel}}% \def\Btxinshort##1{\protect\foreignlanguage{#1}{Nel}}% - \def\Btxeditorshort##1{\protect\foreignlanguage{#1}{Ed##1{}}}% - \def\Btxeditorlong##1{\protect\foreignlanguage{#1}{Editore}}% - \def\Btxeditorsshort##1{\protect\foreignlanguage{#1}{Ed##1{}}}% - \def\Btxeditorslong##1{\protect\foreignlanguage{#1}{Editori}}% + \def\Btxeditorshort##1{\protect\foreignlanguage{#1}{Cur##1{}}}% + \def\Btxeditorlong##1{\protect\foreignlanguage{#1}{Curatore}}% + \def\Btxeditorsshort##1{\protect\foreignlanguage{#1}{Cur##1{}}}% + \def\Btxeditorslong##1{\protect\foreignlanguage{#1}{Curatori}}% \def\Btxvolumeshort##1{\protect\foreignlanguage{#1}{Vol##1{}}}% \def\Btxvolumelong##1{\protect\foreignlanguage{#1}{Volume}}% \def\Btxnumbershort##1{\protect\foreignlanguage{#1}{No##1{}}}% @@ -96,8 +96,12 @@ \def\Btxpageslong##1{\protect\foreignlanguage{#1}{Pagine}}% \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Rap.\ Tecnico}}% \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Rapporto Tecnico}}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{accesso a}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, accesso a ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{inglese}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{tedesco}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/norsk.bdf b/Master/texmf-dist/tex/latex/babelbib/norsk.bdf index e2d62a96c3e..fd4e321b344 100644 --- a/Master/texmf-dist/tex/latex/babelbib/norsk.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/norsk.bdf @@ -20,7 +20,7 @@ %% Language definitions for Norwegian by %% Hans Fredrik Nordhaug <hansfn@mi.uib.no> \ProvidesFile{norsk.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsnorsk[1][norsk]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{et~al##1{}}}% @@ -98,8 +98,12 @@ \def\Btxpageslong##1{\protect\foreignlanguage{#1}{Sider}}% \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Tekn.\ rap##1{}}}% \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Teknisk rapport}}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{sjekket:}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, sjekket: ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{engelsk}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{tysk}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/portuguese.bdf b/Master/texmf-dist/tex/latex/babelbib/portuguese.bdf index 58051955f2a..ee864c11629 100644 --- a/Master/texmf-dist/tex/latex/babelbib/portuguese.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/portuguese.bdf @@ -18,9 +18,9 @@ %% h.harders@tu-bs.de %% %% Language definitions for Portuguese by -%% Jos\'e Carlos Santos, jcsantos@fc.up.pt +%% Jos\'e Carlos Santos <jcsantos@fc.up.pt> \ProvidesFile{portuguese.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsportuguese[1][portuguese]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{et~al##1{}}}% @@ -100,8 +100,12 @@ \def\Btxpageslong##1{\protect\foreignlanguage{#1}{P\'aginas}}% \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Rel.\ T\'ec##1{}}}% \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Relat\'orio T\'ecnico}}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{acedido em}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, acedido em ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{ingl\^es}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{alem\~ao}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/spanish.bdf b/Master/texmf-dist/tex/latex/babelbib/spanish.bdf index 90534b913c7..c2cc161edb9 100644 --- a/Master/texmf-dist/tex/latex/babelbib/spanish.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/spanish.bdf @@ -18,9 +18,9 @@ %% h.harders@tu-bs.de %% %% Language definitions for spanish by -%% V{\'\i}ctor Lua{\~n}a, victor@fluor.quimica.uniovi.es +%% V{\'\i}ctor Lua{\~n}a <victor@fluor.quimica.uniovi.es> \ProvidesFile{spanish.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsspanish[1][spanish]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{y~cols##1{}}}% @@ -100,8 +100,13 @@ \def\Btxpageslong##1{\protect\foreignlanguage{#1}{P\'aginas}}% \def\Btxtechrepshort##1{\protect\foreignlanguage{#1}{Informe t\'ecnico}}% \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Informe t\'ecnico}}% - \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{visitado el}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, visitado el ##1}}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\ifnumber{##1}{\protect\foreignlanguage{#1}{% + ##1\ifcase##1 \ieme\or \iere\else \ieme\fi}}{##1}}% + \def\btxnumerallong##1{\btxnumeralshort{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{ingl\'es}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{alem\'an}}% diff --git a/Master/texmf-dist/tex/latex/babelbib/swedish.bdf b/Master/texmf-dist/tex/latex/babelbib/swedish.bdf index c29bdaa7797..ce27b6ee025 100644 --- a/Master/texmf-dist/tex/latex/babelbib/swedish.bdf +++ b/Master/texmf-dist/tex/latex/babelbib/swedish.bdf @@ -20,7 +20,7 @@ %% Language definitions for Swedish by %% Hans Fredrik Nordhaug <hansfn@mi.uib.no> \ProvidesFile{swedish.bdf} - [2005/09/01 v1.15 babelbib: multilingual bibliographies (HH)] + [2005/11/13 v1.20 babelbib: multilingual bibliographies (HH)] \newcommand\bibsswedish[1][swedish]{% \def\biblanguagename{#1}% \def\btxetalshort##1{\protect\foreignlanguage{#1}{et~al##1{}}}% @@ -100,8 +100,12 @@ \def\Btxtechreplong##1{\protect\foreignlanguage{#1}{Technisch Rapport}}% \def\btxurldatecomment##1{\PackageError{babelbib}{Comment for urldate in Swedish undefined. Please send the translation for - 'visited on' to harald.harders@tu-bs.de}{}}% - \def\btxkeywordlanguage##1{\protect\foreignlanguage{#1}{##1}}% + 'visited on' to harald.harders@tu-bs.de}{} [##1]}% + \def\btxfnamespaceshort{\,}% + \def\btxfnamespacelong{ }% + \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% + \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{engelska}}% \def\btxlanguagenameaustrian{\protect\foreignlanguage{#1}{tyska}}% diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty index cfccc0d5b7e..c9c3d7ee263 100644 --- a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty +++ b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty @@ -5,7 +5,7 @@ %% The original source files were: %% %% bibleref.dtx (with options: `bibleref.sty,package') -%% Copyright (C) 2005 Nicola Talbot, all rights reserved. +%% Copyright (C) 2006 Nicola Talbot, all rights reserved. %% If you modify this file, you must change its name first. %% You are NOT ALLOWED to distribute this file alone. You are NOT %% ALLOWED to take money for the distribution or use of either this @@ -27,7 +27,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2005/09/28 1.02 (NLCT)] +\ProvidesPackage{bibleref}[2006/07/30 1.06 (NLCT)] \RequirePackage{ifthen} \RequirePackage{fmtcount} \newcommand*{\BRbooknumberstyle}[1]{#1 } @@ -108,7 +108,7 @@ \def\br@IThessalonians{\BRepistlenumberstyle{1}\BRepistletothe Thessalonians}% \def\br@IIThessalonians{\BRepistlenumberstyle{2}\BRepistletothe Thessalonians}% \def\br@ITimothy{\BRepistlenumberstyle{1}\BRepistleto Timothy}% -\def\br@IITimothy{\BRepistlenumberstyle{2}\BRepistletoTimothy}% +\def\br@IITimothy{\BRepistlenumberstyle{2}\BRepistleto Timothy}% \def\br@Titus{\BRepistleto Titus}% \def\br@Philemon{\BRepistleto Philemon}% \def\br@Hebrews{\BRepistletothe Hebrews}% @@ -122,7 +122,7 @@ \def\br@Revelation{\BRbookof Revelation}} \brfullname \newcommand{\brabbrvname}{% -\def\br@Gensis{Gn\BRperiod}% +\def\br@Genesis{Gn\BRperiod}% \def\br@Exodus{Ex\BRperiod}% \def\br@Leviticus{Lv\BRperiod}% \def\br@Numbers{Nb\BRperiod}% @@ -196,7 +196,7 @@ \def\br@Jude{Jude}% \def\br@Revelation{Rv\BRperiod}} \newcommand{\braltabbrvname}{% -\def\br@Gensis{Gen\BRperiod}% +\def\br@Genesis{Gen\BRperiod}% \def\br@Exodus{Exod\BRperiod}% \def\br@Leviticus{Lev\BRperiod}% \def\br@Numbers{Num\BRperiod}% @@ -589,37 +589,77 @@ Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}} \def\@@br@vrsty#1-#2\end{% \@do@verses#1,\relax\end -\ifx#2\@nil +\ifx\@nil#2\relax \else -\BRvrsep +\@bv@do{\BRvrsep}% \@@br@vrsty#2\end% \fi} \def\@do@verses#1,#2\end{% -\ifthenelse{\equal{#1}{}}{}{\BRversestyle{#1}}% -\ifx\relax#2% +\ifthenelse{\equal{#1}{}}{}{\@bv@do{\BRversestyle{#1}}}% +\ifx\relax#2\@empty \else -\BRvsep +\@bv@do{\BRvsep}% \@do@verses#2\end \fi } \newcommand{\bibleverse}[1]{% \@ifundefined{br@#1}{\PackageError{bibleref}{Unknown book '#1'}{% -}}{\BRbooktitlestyle{\csname br@#1\endcsname}}% -\@ifnextchar({\BRbkchsep \@bibleverse}\relax +}}{\@bv@idxsort{\csname br@#1\endcsname}% +\def\@bv@chidxsort{}% +\@bv@do{\BRbooktitlestyle{\csname br@#1\endcsname}}}% +\@ifnextchar({\BRbkchsep\@bv@addtoidx{!}\@bibleverse}{\@end@@bibleverse}% } \def\@bibleverse(#1:{% \ifthenelse{\equal{#1}{}}{}{% -\BRchapterstyle{#1}}% +\ifthenelse{\equal{\@bv@chidxsort}{}}{% +\def\@bvchidxsort{#1}\@bv@addtoidx{#1@}}{}% +\@bv@do{\BRchapterstyle{#1}}}% \@@bibleverse} \def\@bibleverser-(#1:{% \ifthenelse{\equal{#1}{}}{}{% -\BRchapterstyle{#1}}% +\@bv@do{\BRchapterstyle{#1}}}% \@@bibleverse} \def\@@bibleverse#1){% -\ifthenelse{\equal{#1}{}}{}{\BRchvsep\@br@vrsty{#1}}% -\@ifnextchar({\BRchsep\@bibleverse}% -{\@ifnextchar-{\BRvrsep\@bibleverser}\relax}} +\ifthenelse{\equal{#1}{}}{}{\@bv@do{\BRchvsep}\@br@vrsty{#1}}% +\@ifnextchar({\@bv@do{\BRchsep}\@bibleverse}% +{\@ifnextchar-{\@bv@do{\BRvrsep}\@bibleverser}{\@end@@bibleverse}}} +\newcommand{\@end@@bibleverse}{% +\if@bv@idx +\index{\@@bv@idxsort\relax @\@bv@idxentry|\@bv@idxpgformat}% +\@bv@idxfalse +\fi +} +\newcommand{\@bv@do}[1]{#1\@bv@addtoidx{#1}} +\toksdef\@bv@tmpa=0 +\toksdef\@bv@tmpb=2 +\newcommand{\@bv@addtoidx}[1]{% +\if@bv@idx +\@bv@tmpa={#1}% +\@bv@tmpb=\expandafter{\@bv@idxentry}% +\edef\@bv@idxentry{\the\@bv@tmpb\the\@bv@tmpa}% +\fi} +\newcommand{\@bv@addtoidxsort}[1]{% +\if@bv@idx +\@bv@tmpa={#1}% +\@bv@tmpb=\expandafter{\@@bv@idxsort}% +\edef\@@bv@idxsort{\the\@bv@tmpb\the\@bv@tmpa}% +\fi} +\newif\if@bv@idx +\@bv@idxfalse +\newcommand{\@bv@idxsort}[1]{% +\if@bv@idx +{\def\BRbooknumberstyle##1##2\relax{##2##1}% +\def\BRepistlenumberstyle##1##2\relax{##2##1}% +\def\BRgospel{}\def\BRbookof{}\def\BRepistleto{}% +\def\BRepistletothe{}\def\BRepistleof{}% +\xdef\@@bv@idxsort{#1\relax}% +}% +\fi} +\newcommand{\ibibleverse}[1][\bvidxpgformat]{% +\def\@bv@idxpgformat{#1}% +\@bv@idxtrue\def\@bv@idxentry{}\bibleverse} +\newcommand{\bvidxpgformat}{textrm} \endinput %% %% End of file `bibleref.sty'. diff --git a/Master/texmf-dist/tex/latex/breakurl/breakurl.sty b/Master/texmf-dist/tex/latex/breakurl/breakurl.sty index 868070f55df..f3ac9267e27 100644 --- a/Master/texmf-dist/tex/latex/breakurl/breakurl.sty +++ b/Master/texmf-dist/tex/latex/breakurl/breakurl.sty @@ -29,7 +29,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{breakurl} - [2005/09/23 v1.10 Breakable hyperref URLs] + [2006/08/26 v1.20 Breakable hyperref URLs] \@ifpackageloaded{hyperref}{}{% @@ -187,7 +187,7 @@ \burl@toks{}% \let\burl@UrlRight=\UrlRight \let\UrlRight=\empty - \Hy@colorlink{\@ifundefined{@urlcolor}{\@linkcolor}{\@urlcolor}}% + \@ifundefined{@urlcolor}{\Hy@colorlink\@linkcolor}{\Hy@colorlink\@urlcolor}% \@burl@breakablefalse \expandafter\@tfor\expandafter\@nextchar\expandafter:\expandafter=% \burl@urltext\do{% diff --git a/Master/texmf-dist/tex/latex/commath/commath.sty b/Master/texmf-dist/tex/latex/commath/commath.sty index 19b5875fe47..76a60c9e9e7 100644 --- a/Master/texmf-dist/tex/latex/commath/commath.sty +++ b/Master/texmf-dist/tex/latex/commath/commath.sty @@ -1,18 +1,16 @@ %%% ==================================================================== %%% @LaTeX-file{ %%% filename = "commath.sty", -%%% version = "0.2", -%%% date = "2005", -%%% checksum = "", +%%% version = "0.3", +%%% date = "2006", %%% author = "Wolfgang Putschögl", %%% address = "Johann Radon Institute for Computational and Applied Mathematics (RICAM) %%% Austrian Academy of Sciences -%%% Altenbergerstraße 54 +%%% Altenbergerstraße 69 %%% A-4040 Linz, Austria", %%% email = "Wolfgang.Putschoegl@oeaw.ac.at", %%% codetable = "Western European, iso 8859-15", %%% keywords = "LaTeX", -%%% abstract = "", %%% } %%% ==================================================================== \NeedsTeXFormat{LaTeX2e} % LaTeX 2.09 can't be used (nor non-LaTeX) @@ -23,6 +21,8 @@ % Differential (upface d) \DeclareMathOperator{\dif}{d \!} +% Derivative (upface D) +\DeclareMathOperator{\Dif}{D \!} % Command for partial derivatives. The first argument denotes the function and the second argument denotes the variable with respect to which the derivative is taken. The optional argument denotes the order of differentiation. The style (text style/display style) is determined automatically \providecommand{\pd}[3][]{\ensuremath{ @@ -44,8 +44,30 @@ \dfrac{\partial{^{#1}}#2}{\partial{#3^{#1}}} }}} -% normal derivative - analogous to the partial derivative command -\providecommand{\nd}[3][]{\ensuremath{ +% mixed derivative - analogous to the partial derivative command +% \md{f}{5}{x}{2}{y}{3} +\providecommand{\md}[6]{\ensuremath{ +\ifinner +\tfrac{\partial{^{#2}}#1}{\partial{#3^{#4}}\partial{#5^{#6}}} +\else +\dfrac{\partial{^{#2}}#1}{\partial{#3^{#4}}\partial{#5^{#6}}} +\fi +}} + +% \tpd[2]{f}{k} denotes the second partial derivative of f with respect to k +% The first letter t means "text style" +\providecommand{\tmd}[6]{\ensuremath{\mathinner{ +\tfrac{\partial{^{#2}}#1}{\partial{#3^{#4}}\partial{#5^{#6}}} +}}} +% \dpd[2]{f}{k} denotes the second partial derivative of f with respect to k +% The first letter d means "display style" +\providecommand{\dmd}[6]{\ensuremath{\mathinner{ +\dfrac{\partial{^{#2}}#1}{\partial{#3^{#4}}\partial{#5^{#6}}} +}}} + + +% ordinary derivative - analogous to the partial derivative command +\providecommand{\od}[3][]{\ensuremath{ \ifinner \tfrac{\dif{^{#1}}#2}{\dif{#3^{#1}}} \else @@ -53,13 +75,15 @@ \fi }} -\providecommand{\tnd}[3][]{\ensuremath{\mathinner{ +\providecommand{\tod}[3][]{\ensuremath{\mathinner{ \tfrac{\dif{^{#1}}#2}{\dif{#3^{#1}}} }}} -\providecommand{\dnd}[3][]{\ensuremath{\mathinner{ +\providecommand{\dod}[3][]{\ensuremath{\mathinner{ \dfrac{\dif{^{#1}}#2}{\dif{#3^{#1}}} }}} + + \providecommand{\thmref}[1]{Theorem~\ref{#1}} \providecommand{\exref}[1]{Example~\ref{#1}} \providecommand{\defnref}[1]{Definition~\ref{#1}} diff --git a/Master/texmf-dist/tex/latex/dk-bib/dk-apali.sty b/Master/texmf-dist/tex/latex/dk-bib/dk-apali.sty new file mode 100644 index 00000000000..dfd4b5549cb --- /dev/null +++ b/Master/texmf-dist/tex/latex/dk-bib/dk-apali.sty @@ -0,0 +1,37 @@ +% This file is based on BibTeX's original apalike.sty + +% This is dk-bib, Version 0.6 ($Id: dk-apali.sty 92 2006-05-21 21:18:10Z arne $) + +\def\@cite#1#2{(#1\if@tempswa , #2\fi)} +\def\@biblabel#1{} + +\newlength{\bibhang} +\setlength{\bibhang}{2em} + +% In case babel is not used we provide \refname and \bibname here +\providecommand{\refname}{References} +\providecommand{\bibname}{Bibliography} + +\@ifundefined{chapter}{\def\thebibliography#1{\section*{\refname\@mkboth + {\refname}{\refname}}\list + {\relax}{\setlength{\labelsep}{0em} + \setlength{\itemindent}{-\bibhang} + \setlength{\leftmargin}{\bibhang}} + \def\newblock{\hskip .11em plus .33em minus .07em} + \sloppy\clubpenalty4000\widowpenalty4000 + \sfcode`\.=1000\relax}}% +{\def\thebibliography#1{\chapter*{\bibname\@mkboth + {\MakeUppercase\bibname}{\MakeUppercase\bibname}}\list + {\relax}{\setlength{\labelsep}{0em} + \setlength{\itemindent}{-\bibhang} + \setlength{\leftmargin}{\bibhang}} + \def\newblock{\hskip .11em plus .33em minus .07em} + \sloppy\clubpenalty4000\widowpenalty4000 + \sfcode`\.=1000\relax}} + +\def\@citex[#1]#2{\if@filesw\immediate\write\@auxout{\string\citation{#2}}\fi + \def\@citea{}\@cite{\@for\@citeb:=#2\do + {\@citea\def\@citea{; }\@ifundefined + {b@\@citeb}{{\bf ?}\@warning + {Citation `\@citeb' on page \thepage \space undefined}}% +{\csname b@\@citeb\endcsname}}}{#1}} diff --git a/Master/texmf-dist/tex/latex/dk-bib/dk-bib.sty b/Master/texmf-dist/tex/latex/dk-bib/dk-bib.sty index edc6583abfa..b5d61f468fb 100644 --- a/Master/texmf-dist/tex/latex/dk-bib/dk-bib.sty +++ b/Master/texmf-dist/tex/latex/dk-bib/dk-bib.sty @@ -1,4 +1,4 @@ -% Copyright 2004, 2005 Arne Jorgensen +% Copyright (C) 2004, 2005, 2006 Arne Jorgensen % This file is free software; you can redistribute it and/or modify it % under the terms of the GNU General Public License as published by @@ -11,9 +11,8 @@ % General Public License for more details. % You should have received a copy of the GNU General Public License -% along with GNU Emacs; see the file COPYING. If not, write to the -% Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -% Boston, MA 02110-1301, USA. +% along with this file; if not, write to the Free Software Foundation, +% Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. \NeedsTeXFormat{LaTeX2e}[1995/12/01] @@ -22,8 +21,8 @@ \def\dkbib@sty@revision{#3} \def\dkbib@sty@date{#4/#5/#6} } -\dkbib@svn $Id: dk-bib.sty 82 2005-10-02 16:26:11Z arne $ -\def\dkbib@version{0.5} +\dkbib@svn $Id: dk-bib.sty 92 2006-05-21 21:18:10Z arne $ +\def\dkbib@version{0.6} \ProvidesPackage{dk-bib}[\dkbib@sty@date\space v\dkbib@version\space(r\dkbib@sty@revision) Danish variants of the standard BibTeX styles] @@ -132,7 +131,7 @@ {\relax}% %%% apalike \ifdkbib@apalike% - \RequirePackage{apalike}% + \RequirePackage{dk-apali}% \fi% %%% url \ifdkbib@url% diff --git a/Master/texmf-dist/tex/latex/dottex/dottex.sty b/Master/texmf-dist/tex/latex/dottex/dottex.sty index 878f5065a2b..2465f7e2c75 100644 --- a/Master/texmf-dist/tex/latex/dottex/dottex.sty +++ b/Master/texmf-dist/tex/latex/dottex/dottex.sty @@ -41,21 +41,23 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{dottex} - [2005/08/13 v0.2 dot/neato graphs in LaTeX] -\RequirePackage{graphicx,moreverb} + [2006/04/02 v0.5 dot/neato graphs in LaTeX] +\RequirePackage{graphicx,moreverb,keyval} \newif\ifShellEscape \newif\ifmiktex \miktexfalse +\newif\ifpdf \pdffalse \DeclareOption{shell}{\ShellEscapetrue} \DeclareOption{noshell}{\ShellEscapefalse} \DeclareOption{miktex}{\global\miktextrue} +\DeclareOption{pdf}{\pdftrue} \ExecuteOptions{shell} \ProcessOptions\relax %% test if shell escape really works \ifShellEscape \def\tmpfile{/tmp/w18-test-\the\year\the\month\the\day\the\time} - \ifmiktex% + \ifmiktex \immediate\write18{rem >"\tmpfile"} \else \immediate\write18{touch \tmpfile} @@ -69,15 +71,14 @@ \ifShellEscape \PackageInfo{dottex} - {Automatically converting dot/neato files to ps} + {Automatically converting dot/neato files} \else \PackageWarningNoLine{dottex} {Shell escape not enabled.\MessageBreak - You'll need to convert the graphs yourself} + You'll need to convert the graphs yourself.} \fi \newcounter{fignum} -\gdef\dotwidth{\textwidth} -\def\figname{\jobname-fig\thefignum} +\def\figname{\jobname-dottex-fig\thefignum} \def\dotverbatimwrite#1{% \def\BeforeStream @@ -116,52 +117,144 @@ \immediate\write\verbatim@out{/*{*/}} \immediate\closeout\verbatim@out \@esphack} -\newenvironment{dotpic}{\stepcounter{fignum}% +\define@key{pic}{width}{\def\dotwidth{#1}} +\define@key{pic}{height}{\def\dotheight{#1}} +\newenvironment{dotpic}[1][]{\stepcounter{fignum}% +\let\dotwidth\undefined +\let\dotheight\undefined +\setkeys{pic}{#1} \xdef\dotCutFile{\figname.dot} \dotverbatimwrite{\dotCutFile}} {\enddotverbatimwrite% \dotgraphicsinclude} -\newenvironment{neatopic}{\stepcounter{fignum}% +\newenvironment{neatopic}[1][]{\stepcounter{fignum}% +\let\dotwidth\undefined +\let\dotheight\undefined +\setkeys{pic}{#1} \xdef\neatoCutFile{\figname.neato} \neatoverbatimwrite{\neatoCutFile}} {\endneatoverbatimwrite% \neatographicsinclude} \long\gdef\dotgraphicsprocess{% \ifShellEscape - \IfFileExists{\figname.dot}{% - \immediate\write18{dot -Tps -o \figname.ps \figname.dot} - \IfFileExists{\figname.ps}{% - \PackageInfo{dottex} - {\figname.dot converted}} - {\PackageWarningNoLine{dottex} - {Conversion of \figname.dot failed.}}}{} - \fi} +\IfFileExists{\figname.dot}{% +\immediate\write18{dot -Tps -o \figname.ps \figname.dot} +\IfFileExists{\figname.ps}{% +\ifpdf +\immediate\write18{ps2epsi \figname.ps \figname.eps} +\immediate\write18{epstopdf \figname.eps} +\IfFileExists{\figname.pdf}{% +\PackageInfo{dottex} +{\figname.dot converted}} +{\PackageWarningNoLine{dottex} +{Conversion of \figname.dot failed.}} +\else +\PackageInfo{dottex} +{\figname.dot converted} +\fi} +{\PackageWarningNoLine{dottex} +{Conversion of \figname.dot failed.}}}{} +\fi} \long\gdef\neatographicsprocess{% \ifShellEscape \IfFileExists{\figname.neato}{% \immediate\write18{neato -Tps -o \figname.ps \figname.neato} \IfFileExists{\figname.ps}{% - \PackageInfo{dottex} - {\figname.neato converted}} +\ifpdf +\immediate\write18{ps2epsi \figname.ps \figname.eps} +\immediate\write18{epstopdf \figname.eps} +\IfFileExists{\figname.pdf}{% +\PackageInfo{dottex} +{\figname.dot converted}} +{\PackageWarningNoLine{dottex} +{Conversion of \figname.dot failed.}} +\else +\PackageInfo{dottex} +{\figname.neato converted} +\fi} {\PackageWarningNoLine{dottex} {Conversion of \figname.neato failed.}}}{} - \fi} +\fi} \long\gdef\dotgraphicsinclude{\dotgraphicsprocess% - \IfFileExists{\figname.ps}{% - \includegraphics[width=\dotwidth]{\figname} - } - {\PackageWarningNoLine{dottex} - {Please convert \figname.dot manually}} +\ifpdf +\IfFileExists{\figname.pdf}{% +\ifx\dotwidth\undefined +\ifx\dotheight\undefined +\includegraphics{\figname} +\else +\includegraphics[height=\dotheight]{\figname} +\fi +\else +\ifx\dotheight\undefined +\includegraphics[width=\dotwidth]{\figname} +\else +\includegraphics[width=\dotwidth,height=\dotheight]{\figname} +\fi +\fi +} +{\PackageWarningNoLine{dottex} +{Please convert \figname.dot manually}} +\else +\IfFileExists{\figname.ps}{% +\ifx\dotwidth\undefined +\ifx\dotheight\undefined +\includegraphics{\figname} +\else +\includegraphics[height=\dotheight]{\figname} +\fi +\else +\ifx\dotheight\undefined +\includegraphics[width=\dotwidth]{\figname} +\else +\includegraphics[width=\dotwidth,height=\dotheight]{\figname} +\fi +\fi +} +{\PackageWarningNoLine{dottex} +{Please convert \figname.dot manually}} +\fi } \long\gdef\neatographicsinclude{\neatographicsprocess% - \IfFileExists{\figname.ps}{% - \includegraphics[width=\dotwidth]{\figname} - } - {\PackageWarningNoLine{dottex} - {Please convert \figname.neato manually}} +\ifpdf +\IfFileExists{\figname.pdf}{% +\ifx\dotwidth\undefined +\ifx\dotheight\undefined +\includegraphics{\figname} +\else +\includegraphics[height=\dotheight]{\figname} +\fi +\else +\ifx\dotheight\undefined +\includegraphics[width=\dotwidth]{\figname} +\else +\includegraphics[width=\dotwidth,height=\dotheight]{\figname} +\fi +\fi +} +{\PackageWarningNoLine{dottex} +{Please convert \figname.neato manually}} +\else +\IfFileExists{\figname.ps}{% +\ifx\dotwidth\undefined +\ifx\dotheight\undefined +\includegraphics{\figname} +\else +\includegraphics[height=\dotheight]{\figname} +\fi +\else +\ifx\dotheight\undefined +\includegraphics[width=\dotwidth]{\figname} +\else +\includegraphics[width=\dotwidth,height=\dotheight]{\figname} +\fi +\fi +} +{\PackageWarningNoLine{dottex} +{Please convert \figname.neato manually}} +\fi } \endinput %% diff --git a/Master/texmf-dist/tex/latex/emulateapj/emulateapj.cls b/Master/texmf-dist/tex/latex/emulateapj/emulateapj.cls index 921ed00e880..b9eb196d3fd 100644 --- a/Master/texmf-dist/tex/latex/emulateapj/emulateapj.cls +++ b/Master/texmf-dist/tex/latex/emulateapj/emulateapj.cls @@ -1,4 +1,4 @@ -%% This is emulateapj.cls, version May 4, 2006 +%% This is emulateapj.cls, version August 13, 2006 %% For the latest version check http://hea-www.harvard.edu/~alexey/emulateapj %% %% 2/9/03: MAJOR CHANGE: This is a complete rewrite of emulateapj. It adds @@ -238,6 +238,10 @@ %% 05/04/6: redefine \tableline as \hrule; otherwise it weirdly interact %% with my implementation of deluxetable %% +%% 08/13/6: Collect altaffiltext into token and issue \altaffiliation +%% only once. This overcomes the problem with 2**n processing +%% time for long affiliation lists. +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Copyright 2000-2006 Alexey Vikhlinin %% @@ -252,7 +256,7 @@ %% %% Alexey Vikhlinin <alexey@head.cfa.harvard.edu> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\emulapj@ver{05/04/06} +\def\emulapj@ver{08/13/06} \ProvidesClass{emulateapj} @@ -571,7 +575,29 @@ }% \let\affil=\affiliation \def\altaffilmark#1{\textsuperscript{#1}} -\def\altaffiltext#1#2{\altaffiliation{\hspace*{3mm}\textsuperscript{#1}\hspace*{0.7mm}#2}\stepcounter{front@matter@foot@note}} + +% Fight poor revtex algorithm for altaffiliation: +\def\@alt@affil@kill@next@symbol#1{\relax} +\newtoks\alt@affil@toks \alt@affil@toks{\@alt@affil@kill@next@symbol} +\newtoks\alt@affil@toks@count \alt@affil@toks@count{} + +\def\altaffiltext#1#2{% +\global\alt@affil@toks\expandafter{\the\alt@affil@toks\\\hspace*{3mm}\textsuperscript{#1}\hspace*{0.7mm}#2}% +\global\alt@affil@toks@count\expandafter{\the\alt@affil@toks@count\stepcounter{front@matter@foot@note}}% +} +\let\@author@finish@revtex=\@author@finish +\def\@author@finish{% +\if!\the\alt@affil@toks@count!% +\relax +\else +\altaffiliation{\the\alt@affil@toks}\the\alt@affil@toks@count +\fi +\@author@finish@revtex +} + +%\def\altaffiltext#1#2{\altaffiliation{\hspace*{3mm}\textsuperscript{#1}\hspace*{0.7mm}#2}\stepcounter{front@matter@foot@note}} + +%% end altaffiliation \let\old@foot@note@mark=\footnotemark \let\old@foot@note@text=\footnotetext diff --git a/Master/texmf-dist/tex/latex/flowfram/flowfram.sty b/Master/texmf-dist/tex/latex/flowfram/flowfram.sty index 68accc2af27..06a2a252751 100644 --- a/Master/texmf-dist/tex/latex/flowfram/flowfram.sty +++ b/Master/texmf-dist/tex/latex/flowfram/flowfram.sty @@ -27,7 +27,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{flowfram}[2005/07/23 v1.0] +\ProvidesPackage{flowfram}[2005/11/24 v1.02] \RequirePackage{ifthen} \RequirePackage{keyval} \RequirePackage{graphics} @@ -64,6 +64,11 @@ \@ttb@rotatetrue \DeclareOption{rotate}{\@ttb@rotatetrue} \DeclareOption{norotate}{\@ttb@rotatefalse} +\newcommand{\rotateframe}[2]{\if@ttb@rotate +\rotatebox{#1}{#2}% +\else +#2\relax +\fi} \newif\if@ttb@num \newif\if@ttb@title \@ttb@numfalse @@ -217,6 +222,7 @@ \expandafter\gdef\csname @ff@backcol@\romannumeral\c@maxflow\endcsname{{none}} \expandafter\gdef\csname @ff@pages@\romannumeral\c@maxflow\endcsname{#1} \expandafter\gdef\csname @ff@offset@\romannumeral\c@maxflow\endcsname{compute} +\expandafter\gdef\csname @ff@angle@\romannumeral\c@maxflow\endcsname{0}% \expandafter\gdef\csname @ff@margin@\romannumeral\c@maxflow\endcsname{right} \ifnum\c@thisframe=0\relax \ifthenelse{\equal{#1}{all}\TE@or\equal{#1}{odd}}{% @@ -314,6 +320,8 @@ for flow frame \number\@colN}}{}% Invalid value for key 'offset'}{% 'offset' can either be 'compute' (to compute it according to certain pre-defined rules) or a length}}{}} +\define@key{flowframe}{angle}{\def\ff@angle{#1}% +} \define@key{flowframe}{margin}{% \ifthenelse{\equal{#1}{left} \or \equal{#1}{right} \or \equal{#1}{inner} \or \equal{#1}{outer}}{% @@ -363,7 +371,7 @@ boolean}{You can only specify the values 'true' or 'false'}}} \def\ff@x{}\def\ff@y{}\def\ff@frametype{}\def\ff@col{}\def\ff@style{}% \def\ff@txtcol{}\def\ff@clear{}\def\ff@offset{}\def\ff@pages{}% \def\ff@label{}\def\ff@backcol{}\def\ff@evenx{}\def\ff@eveny{}% -\def\ff@oddx{}\def\ff@oddy{}% +\def\ff@oddx{}\def\ff@oddy{}\def\ff@angle{}% \setkeys{flowframe}{#2}% \ifthenelse{\equal{\ff@frame}{}}{}{% \setboolean{columnframe\romannumeral#1}{\ff@frame}}% @@ -415,6 +423,9 @@ boolean}{You can only specify the values 'true' or 'false'}}} \ifthenelse{\equal{\ff@offset}{}}{}{% \expandafter\xdef\csname @ff@offset@\romannumeral#1\endcsname {\ff@offset}}% +\ifthenelse{\equal{\ff@angle}{}}{}{% +\expandafter\xdef\csname @ff@angle@\romannumeral#1\endcsname +{\ff@angle}}% \ifthenelse{\equal{\ff@clear}{}}{}{% \PackageError{flowfram}% {Key 'clear' not available for flow frames}{}}% @@ -537,6 +548,8 @@ boolean}{You can only specify the values 'true' or 'false'}}} \gdef\csname @sf@offset@\romannumeral\c@maxstatic\endcsname{% compute}% \expandafter +\gdef\csname @sf@angle@\romannumeral\c@maxstatic\endcsname{0}% +\expandafter \def\csname @sf@frametype@\romannumeral\c@maxstatic\endcsname{% fbox}% \newboolean{@sf@clear@\romannumeral\c@maxstatic}% @@ -613,7 +626,7 @@ id '#1'}{}\fi} \newcommand{\@@setstaticframe}[2]{% \expandafter\expandafter\expandafter \@ff@getstaticpos\csname @sf@dim@\romannumeral#1\endcsname -\def\ff@frame{}\edef\ff@width{\the\@ff@tmp@x}% +\def\ff@frame{}\edef\ff@width{\the\@ff@tmp@x}\def\ff@angle{}% \edef\ff@height{\the\@ff@tmp@y}\def\ff@style{}\def\ff@frametype{}% \def\ff@x{}\def\ff@y{}\def\ff@col{}\def\ff@txtcol{}\def\ff@backcol{}% \def\ff@clear{}\def\ff@margin{}\def\ff@offset{}\def\ff@pages{}% @@ -669,6 +682,9 @@ id '#1'}{}\fi} \ifthenelse{\equal{\ff@offset}{}}{}{% \expandafter \xdef\csname @sf@offset@\romannumeral#1\endcsname{\ff@offset}}% +\ifthenelse{\equal{\ff@angle}{}}{}{% +\expandafter +\xdef\csname @sf@angle@\romannumeral#1\endcsname{\ff@angle}}% \ifthenelse{\equal{\ff@pages}{}}{}{% \expandafter \xdef\csname @sf@pages@\romannumeral#1\endcsname{\ff@pages}}% @@ -804,6 +820,8 @@ fbox}% \gdef\csname @df@style@\romannumeral\c@maxdynamic\endcsname{relax}% \expandafter \gdef\csname @df@offset@\romannumeral\c@maxdynamic\endcsname{compute}% +\expandafter +\gdef\csname @df@angle@\romannumeral\c@maxdynamic\endcsname{0}% \newboolean{@df@clear@\romannumeral\c@maxdynamic}% \setboolean{@df@clear@\romannumeral\c@maxdynamic}{false}% \@ifnextchar[{\@s@tdynamicframeid{\c@maxdynamic}}% @@ -881,7 +899,8 @@ id '#1'}{}\fi} \edef\ff@height{\the\@ff@tmp@y}\def\ff@style{}\def\ff@frametype{}% \def\ff@x{}\def\ff@y{}\def\ff@col{}\def\ff@txtcol{}\def\ff@backcol{}% \def\ff@clear{}\def\ff@margin{}\def\ff@offset{}\def\ff@pages{}% -\def\ff@label{}\def\ff@evenx{}\def\ff@eveny{}\def\ff@oddx{}\def\ff@oddy{}% +\def\ff@label{}\def\ff@evenx{}\def\ff@eveny{}% +\def\ff@oddx{}\def\ff@oddy{}\def\ff@angle{}% \setkeys{flowframe}{#2}% \ifthenelse{\equal{\ff@frame}{}}{}{% \setboolean{dynamicframe\romannumeral#1}{\ff@frame}}% @@ -924,6 +943,9 @@ id '#1'}{}\fi} \ifthenelse{\equal{\ff@offset}{}}{}{% \expandafter \xdef\csname @df@offset@\romannumeral#1\endcsname{\ff@offset}}% +\ifthenelse{\equal{\ff@angle}{}}{}{% +\expandafter +\xdef\csname @df@angle@\romannumeral#1\endcsname{\ff@angle}}% \ifthenelse{\equal{\ff@pages}{}}{}{% \expandafter\xdef\csname @df@pages@\romannumeral#1\endcsname{% \ff@pages}}% @@ -1024,7 +1046,8 @@ but there are only \csname colwidth\romannumeral\c@thisframe\endcsname}} \newif\if@setfr@mes \@setfr@mesfalse -\newcommand{\setframes}{\ifnum\c@thisframe=0\relax +\newcommand{\setframes}{% +\ifnum\c@thisframe=0\relax \PackageWarning{flowfram}{Can't find a flow frame on page 1. \MessageBreak Attempting to find the first page with a flow frame}% @@ -1041,7 +1064,8 @@ Attempting to find the first page with a flow frame}% \@setfr@mestrue \edef\ff@txtcol{% \csname @ff@txtcol@\romannumeral\c@thisframe\endcsname}% -\@s@tfftextcol} +\@s@tfftextcol +} \newcommand{\emulatetwocolumn}[1][]{% \finishthispage \setallflowframes{pages=none}% @@ -1086,8 +1110,12 @@ Attempting to find the first page with a flow frame}% \@onecolumn \fi \setframes -\let\onecolumn\emulateonecolumn -\let\twocolumn\emulatetwocolumn +\renewcommand{\onecolumn}[1][]{\PackageWarning{flowfram}{% +Ignoring \string\onecolumn\space found in document environment. +Frames must be defined in the preamble}#1}% +\renewcommand{\twocolumn}[1][]{\PackageWarning{flowfram}{% +Ignoring \string\twocolumn\space found in document environment. +Frames must be defined in the preamble}#1}% } \AtEndDocument{\finishthispage} \newcommand{\@setcol}[1]{% @@ -1289,7 +1317,7 @@ or text might not appear correctly}% } \newcount\c@ffrangenum \newcommand{\@ff@getrange}[1]{% -\expandafter\@ff@@getrange#1-\@nil\end} +\expandafter\@ff@@getrange#1-\relax\end} \def\@ff@@getrange#1#2\end{% \ifx#1<% \@ff@getrangeless#1#2\end @@ -1301,24 +1329,25 @@ or text might not appear correctly}% \fi \fi } -\def\@ff@getrangeless<#1-\@nil\end{% +\def\@ff@getrangeless<#1-\relax\end{% \c@ffrangenum=#1\relax \advance\c@ffrangenum by -1\relax \def\@ff@numstart{0}% \edef\@ff@numend{\number\c@ffrangenum}} -\def\@ff@getrangegreater>#1-\@nil\end{% +\def\@ff@getrangegreater>#1-\relax\end{% \c@ffrangenum=#1\relax \advance\c@ffrangenum by 1\relax \edef\@ff@numstart{\number\c@ffrangenum}% \def\@ff@numend{10000}} \def\@@ff@getrange#1-#2\end{% -\ifx#2\@nil +\ifx\relax#2 \def\@ff@numstart{#1}\def\@ff@numend{#1}% \else -\def\@ff@numstart{#1}\@@@ff@getrange#2\end +\def\@ff@numstart{#1}% +\@@@ff@getrange#2\end \fi } -\def\@@@ff@getrange#1-\@nil\end{% +\def\@@@ff@getrange#1-\relax\end{% \def\@ff@numend{#1}} \newif\if@notthiscol \newif\if@ff@nwpg @@ -1386,6 +1415,7 @@ adding new one}% \edef\ff@txtcol{\csname @ff@txtcol@\romannumeral#1\endcsname}% \edef\ff@backcol{\csname @ff@backcol@\romannumeral#1\endcsname}% \@ff@setoffset{#1}% +\rotateframe{\csname @ff@angle@\romannumeral#1\endcsname}{ \ifthenelse{\boolean{columnframe\romannumeral#1}}{% \@ff@fbox{\csname colwidth\romannumeral#1\endcsname}% {\csname colheight\romannumeral#1\endcsname}{% @@ -1395,7 +1425,7 @@ adding new one}% \@ff@box{\csname colwidth\romannumeral#1\endcsname}% {\csname colheight\romannumeral#1\endcsname}{% \expandafter\box\csname column\romannumeral#1\endcsname}% -}} +}}} \newcommand{\@docolbbox}[1]{% \@ff@setoffset{#1}% \def\ff@col{}\def\ff@txtcol{}% @@ -1589,7 +1619,8 @@ adding new one}% }{}% }% \raise\@ff@tmp@y -\hb@xt@\z@{\expandafter\kern\@ff@tmp@x +\hb@xt@\z@{% +\expandafter\kern\@ff@tmp@x \@fr@meifdraft{\@ff@box{\marginparwidth}% {\csname colheight\romannumeral#1\endcsname}{}}% {M:\number#1}\hss}\fi @@ -1611,6 +1642,7 @@ adding new one}% \@sf@setoffset{#1}% \expandafter\expandafter\expandafter \@ff@getstaticpos\csname @sf@dim@\romannumeral#1\endcsname +\rotateframe{\csname @sf@angle@\romannumeral#1\endcsname}{% \ifthenelse{\boolean{staticframe\romannumeral#1}}{% \@ff@fbox{\@ff@tmp@x}{\@ff@tmp@y}{% \expandafter\usebox\csname @staticframe@\romannumeral#1\endcsname} @@ -1618,7 +1650,7 @@ adding new one}% }{% \@ff@box{\@ff@tmp@x}{\@ff@tmp@y}% {\expandafter\usebox\csname @staticframe@\romannumeral#1\endcsname}% -}} +}}} \newcommand{\@dostaticbbox}[1]{% \edef\ff@col{}% \@sf@setoffset{#1}% @@ -1697,6 +1729,7 @@ adding new one}% \@df@setoffset{#1}% \expandafter\expandafter\expandafter \@ff@getstaticpos\csname @df@dim@\romannumeral#1\endcsname +\rotateframe{\csname @df@angle@\romannumeral#1\endcsname}{% \ifthenelse{\boolean{dynamicframe\romannumeral#1}}{% \@ff@fbox{\@ff@tmp@x}{\@ff@tmp@y}% {\expandafter\expandafter\expandafter @@ -1708,7 +1741,7 @@ adding new one}% \expandafter\expandafter\expandafter \parbox\csname @df@dim@\romannumeral#1\endcsname {\csname \ff@style\endcsname{\ff@contents}}}% -}} +}}} \newcommand{\@dodynamicbbox}[1]{% \edef\ff@col{}% \@df@setoffset{#1}% diff --git a/Master/texmf-dist/tex/latex/frenchle/frenchle.sty b/Master/texmf-dist/tex/latex/frenchle/frenchle.sty index 49628f013bc..82eef30daa1 100644 --- a/Master/texmf-dist/tex/latex/frenchle/frenchle.sty +++ b/Master/texmf-dist/tex/latex/frenchle/frenchle.sty @@ -47,11 +47,11 @@ \ifx\@unexpandable@protect\undefined\let\protect\empty% \else\let\protect\@unexpandable@protect% \fi% - \xdef\FSfd{4 juillet 2006}% - \xdef\FSfv{V5,998}% + \xdef\FSfd{25 ao\^ut 2006}% + \xdef\FSfv{V5,999}% \xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}% }}% - \edef\FSfd{2006/07/04 }% + \edef\FSfd{2006/08/25 }% \NeedsTeXFormat{LaTeX2e}[1996/12/01]% \let\auxWARNINGi=\@gobble% \def\@txt@msg#1{#1}% @@ -767,9 +767,22 @@ \def\@citex[##1][##2]##3{\@ifFTYfalse% \let\mbox\mboxORI% \@cxORI[##1][##2]{##3}\aftergroup\@ifFTYback}% -\@gG{fc}{fullcite}{1}{1}% \@gG{cin}{citation}{/}{1}% -\def\@lbibitem[##1]##2{\protected@edef\jb@key{##2}\def\jb@tempb{##1}}% + \ifx\ifjb@index@bib\undefined\let\ifjb@index@bib\iffalse\fi% + \ifx\jb@lbibitem\undefined\else% + % + % + \def\jb@lbibitem[##1]##2{% + \gdef\jb@tempb{##1}% + \protected@xdef\jb@key{##2}% + \ifjb@index@bib% + \jb@call@index{aut}{##2}% + \jb@call@index{ed}{##2}% + \jb@call@index{org}{##2}% + \fi% + \endgroup}% + \@gG{fc}{fullcite}{1}{1}% + \fi% \fi% \ifx\nocite\undefined\else\@gG{nc}{nocite}{/}{1}\fi% \ifx\backcite\undefined\else\@gG{bkc}{backcite}{//}{2}\fi% @@ -858,7 +871,7 @@ \fi% }% \def\@w@s##1{\ifFTSW\f@issue% - \@fw{-58- \@txt@msg{valeur de \string##1 ignor\'ee}% + \@fw{-58- \@txt@msg{valeur de ##1 ignor\'ee}% }[##1]\fi}% \def\org@seps{\let\topsep\@topsepORI% \let\partopsep\@partopsepORI% diff --git a/Master/texmf-dist/tex/latex/labelcas/labelcas.sty b/Master/texmf-dist/tex/latex/labelcas/labelcas.sty index 71dc998e541..dc542bd871d 100644 --- a/Master/texmf-dist/tex/latex/labelcas/labelcas.sty +++ b/Master/texmf-dist/tex/latex/labelcas/labelcas.sty @@ -20,12 +20,12 @@ %% and version 1.3 or later is part of all distributions of LaTeX version %% 2003/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{labelcas} - [2006/04/27 v1.07 check label-existence and fork accordingly] + [2006/08/14 v1.12 check label-existence and fork accordingly] +\begingroup \DeclareOption{DefineLabelcase}% {\global\let\DefineLabelcase\DefineLabelcase}% -\begingroup \newcommand\DefineLabelcase[4]{% \expandafter\@ifdefinable\csname#3lc@remtrailspace\endcsname{% \expandafter\long @@ -40,7 +40,17 @@ \else \expandafter\@secondoftwo \fi - {\csname#3lc@remleadspace\endcsname#2##1#1#2#2}% + {% + {\toks@{##1}\edef\@tempa{\the\toks@}% + \toks@{#2}\edef\@tempb{\the\toks@}% + \expandafter}% + \ifx\@tempa\@tempb + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {\csname#3lc@remleadspace\endcsname#2##1#1#2#2}% + }% {\csname#3lc@remtrailspace\endcsname##1#2#1#2#2#1}% }% }% @@ -65,31 +75,20 @@ \expandafter\long \expandafter\def \csname#3lc@iterate\endcsname##1#2{% - \toks@{#1}% \begingroup - \long\def\@tempa#2####1#2{\toks@{####1}\edef\@tempa{\the\toks@}}% - \csname#3lc@remleadspace\endcsname#2##1#2#1#2#2% \toks@{##1}% - \edef\@tempb{\the\toks@}% + \edef\@tempa{\the\toks@}% \toks@{#1\@nil}% - \edef\@tempc{\the\toks@}% - \toks@{\csname#3lc@remtrailspace\endcsname##1#2#1#2#2#1}% - \edef\@tempd{\the\toks@}% - \ifx\@tempb\@tempc - \expandafter\endgroup + \edef\@tempb{\the\toks@}% + \expandafter\endgroup\ifx\@tempa\@tempb + \expandafter\@gobble \else - \ifx\@tempa\@empty - \expandafter\endgroup - \else - \expandafter\expandafter - \expandafter \endgroup - \expandafter\@tempd - \fi - \csname#3lc@iterate\expandafter\expandafter - \expandafter\endcsname - \expandafter\the - \expandafter\toks@ + \expandafter\@firstofone \fi + {% + \csname#3lc@remtrailspace\endcsname##1#2#1#2#2#1% + \csname#3lc@iterate\endcsname#1% + }% }% }% \expandafter\@ifdefinable\csname#3eachlabelcase\endcsname{% @@ -189,29 +188,27 @@ \ifx\@tempa\@empty \else \@temptokena\expandafter{% - \expandafter\begingroup - \expandafter\toks@ - \expandafter\expandafter - \expandafter {% - \expandafter\expandafter - \expandafter \@temptokena - \expandafter\expandafter - \expandafter {% - \expandafter\the - \expandafter\@temptokena - \expandafter}% - \expandafter}% - \expandafter\@temptokena - \expandafter{% - \expandafter\@temptokena - \expandafter{% - \the\@temptokena}% - \@ifdefinable#1{\edef#1{\the\@temptokena}}}% - \expandafter\expandafter - \expandafter \endgroup - \expandafter\the - \expandafter\@temptokena - \the\toks@ + \expandafter\begingroup + \expandafter\toks@ + \expandafter\expandafter + \expandafter {% + \expandafter\expandafter + \expandafter \@temptokena + \expandafter\expandafter + \expandafter {% + \expandafter\the + \expandafter\@temptokena + \expandafter}% + \expandafter}% + \expandafter\@temptokena + \expandafter{% + \expandafter\@temptokena + \expandafter{% + \the\@temptokena}% + \@ifdefinable#1{\edef#1{\the\@temptokena}}}% + \expandafter\endgroup + \the\expandafter\@temptokena + \the\toks@ }% \fi }% diff --git a/Master/texmf-dist/tex/latex/lineno/lineno.sty b/Master/texmf-dist/tex/latex/lineno/lineno.sty index f9cd1db616a..53a7b5242ab 100644 --- a/Master/texmf-dist/tex/latex/lineno/lineno.sty +++ b/Master/texmf-dist/tex/latex/lineno/lineno.sty @@ -3,7 +3,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \fi -\def\fileversion{v4.32} \def\filedate{2005/10/17} %VERSION +\def\fileversion{v4.41} \def\filedate{2005/11/02} %VERSION %%% Copyright 1995--2003 Stephan I. B"ottcher <boettcher@physik.uni-kiel.de>; %%% Copyright 2002--2005 Uwe L"uck, http://www.contact-ednotes.sty.de.vu @@ -380,6 +380,17 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. %% linenomath environment is not needed. %% v4.32ab /10/15 UL: Observe \if@nobreak with support for \addvspace. %% v4.32 2005/10/17 UL: Just made it official and sent it to CTAN. +%% v4.33b /10/23 UL: \if@nobreak\nobreak\fi -> \nobreak . +%% v4.33ab /10/24 UL: \LineNoLaTeXOutput without \@tempswafalse; +%% undid v4.22: \[unv]box\@outputbox (space is OK, +%% \unvbox pushes short columns down); \@LN@kern@z@ . +%% v4.4b 2005/10/24 UL: Another tidying-up of the discussion of +%% \stepcounter{linenumber}; \@LN@screenoff@pen +%% replaces \@LN@kern@z@, \@LN@depthbox . +%% v4.4 2005/10/27 UL: Just made official for CTAN. +%% v4.4a 2005/10/29 UL: Undid change of discussion of +%% \stepcounter{linenumber} (confusion again). +%% v4.41 2005/11/02 UL: Raised \CheckCommand*. %% %% Acknowledgements: %% v3.06: Donald Arseneau, pointed to mparhack.sty. @@ -392,6 +403,11 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. %% v4.3: `displaymath' default by Erik Luijten's suggestion. %% v4.31: \modulolinenumbers* is an idea of Hillel Chayim Yisraeli's. %% v4.32: Support for \addvspace due to Saravanan M.'s observation. +%% v4.33: Different support for \addvspace due to bug reports by +%% Saravanan M.'s and David Josef Dev. +%% v4.4: David Josef Dev points out that \kern\z@ after a paragraph +%% tends to place its final baseline wrongly. +% % % \section{% % Put the line numbers to the lines @@ -424,7 +440,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \newcount\linenopenalty\linenopenalty=-100000 -%% TODO v4.3+: +%% TODO v4.4+: % (UL) Hm. It is never needed below % that this is a counter. ~\def\linenopenalty{-100000\relax}~ % would do. (I guess this consumes more memory, but it @@ -482,7 +498,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % (New v4.00) Two further complications are added. %% %% TODO v4.3+: Or three, ~\@nobreakfalse~ after ~\MakeLineNo~ -%% for getting rid of ~\my@nopagebreak~. +%% for getting rid of ~\@LN@nopagebreak~. % \begin{itemize}\item % [(i)] Problems with footnotes formerly resulted from % \LaTeX's ~\@reinserts~ in ~\@specialoutput~ which Stephan's @@ -601,7 +617,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \let\@@par\@@@par \ifnum\interlinepenalty<-\linenopenaltypar \advance\interlinepenalty-\linenopenalty - \my@nobreaktrue + \@LN@nobreaktrue \fi \@tempswatrue \ifnum\outputpenalty>-\linenopenaltypar\else @@ -611,12 +627,12 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \fi } -\def\my@nobreaktrue{\let\if@nobreak\iftrue} +\def\@LN@nobreaktrue{\let\if@nobreak\iftrue} % renamed v4.33 -% (UL) I would prefer ~\@LN@nobreaktrue~.---I thought here were +% (UL) I thought here were % another case of the save stack problem explained in \TeX book, % p._301, namely through both local and global changing -% ~\if@nobreak~. However, ~\my@nobreak~ is called during +% ~\if@nobreak~. However, ~\@LN@nobreak~ is called during % ~\@LN@output~ only, while ~\@nobreaktrue~ is called by \LaTeX's % ~\@startsection~ only. The latter never happens during % ~\@LN@output~. So there is no local value of ~\if@nobreak~ on @@ -643,7 +659,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % (See there for expanding on the problem.) % This requires returning the special absolute value of % ~\holdinginserts~ that ~lineno.sty~ finds at the end of a newly -% typeset paragraph---now done in subsection_\ref{ss:CtrlLN} +% typeset paragraph---now done in subsection_\ref{ss:calls} % (~\linenumberpar~). % The former ~\LineNoHoldInsertsTest~ has been filled into here. %% ---`3' is replaced by ~\thr@@~ for a while. ~\thr@@~ is @@ -656,22 +672,20 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % for cooperating with other packages that use ~\holdinginserts~. \def\LineNoLaTeXOutput{% - \ifnum \holdinginserts=\thr@@ \@tempswafalse \fi -%% <- Previous ~\LineNoHoldInsertsTest~. - \if@tempswa + \ifnum \holdinginserts=\thr@@ % v4.33 without \@tempswafalse + \global\holdinginserts-\thr@@ + \unvbox\@cclv + \ifnum \outputpenalty=\@M \else \penalty\outputpenalty \fi + \else \if@twocolumn \let\@makecol\@LN@makecol \fi \the\@LN@output % finally following David Kastrup's advice. \ifnum \holdinginserts=-\thr@@ \global\holdinginserts\thr@@ \fi - \else - \global\holdinginserts-\thr@@ - \unvbox\@cclv - \ifnum \outputpenalty=\@M \else \penalty\outputpenalty \fi \fi } % \textit{More on dealing with output routines from other -% packages:} +% packages:} % Since ~lineno.sty~'s output routine is called at least once % for each output line, I think it should be in \TeX's % original ~\output~, while output routines dealing with @@ -773,8 +787,10 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % advantage of the difference between our mechanism and the % original one that the user here can actually override low % penalties by ~\nopagebreak~, which may be what a lay \LaTeX\ -% user would expect.---Zero glue would do instead of zero -% penalty! This could make things easier. Maybe next time. %% TODO v4.3+ +% user would expect. +%% ---Zero glue would do instead of zero +%% penalty! This could make things easier. Maybe next time. +%% <- v4.4: No, problem with column depth. % (/UL, /New v4.00) \def\MakeLineNo{% @@ -807,14 +823,16 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. %% \stepLineNumber %% -% (/New v4.00) +% (New v4.4) Now %% - \dp\@tempboxa=\@tempdima\ht\@tempboxa=\z@ - \nointerlineskip\kern-\@tempdima\box\@tempboxa + \ht\@tempboxa\z@ \@LN@depthbox %% -% (New v4.00) -% The line number has now been placed (it may be invisible -% depending on the modulo feature), so we can insert the +% appends the box containing the line number without changing +% ~\prevdepth~---see end of section. +% Now is the time for inserting the $\dots$ (/New v4.4) +%% The line number has now been placed (it may be invisible +%% depending on the modulo feature), so +%% we can insert the % ~\vadjust~ items. We cannot do this much later, because % their right place is above the artificial interline % penalty which Stephan's code will soon insert @@ -844,12 +862,13 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % effect---but this will make a difference after headings only, % where nobody should place such a thing anyway. %% - \xdef\@LN@parpgbrk{\penalty\the\count@ - \gdef\noexpand\@LN@parpgbrk{\kern\z@}}% -%% %% TODO v4.3+: Stephan's advice -%% -- but this happens rarely. + \xdef\@LN@parpgbrk{% + \penalty\the\count@ + \global\let\noexpand\@LN@parpgbrk + \noexpand\@LN@screenoff@pen}% v4.4 +%% % That penalty will replace former ~\kern\z@~ in -% ~\linenumberpar~, see subsection_\ref{ss:CtrlLN}.---A +% ~\linenumberpar~, see subsection_\ref{ss:calls}.---A % few days earlier, I tried to send just a penalty value. % However, the ~\kern\z@~ in ~\linenumberpar~ is crucial, % as I then found out. See below.---The final penalty is @@ -893,14 +912,24 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \newcommand\stepLineNumber{\stepcounter{linenumber}} % For reason, see use above. (/New v4.00) -%% %% TODO v4.3+: ~\newcommand~ more often!? +%% %% TODO v4.4+: ~\newcommand~ more often!? +% +% (New v4.4) The depth preserving trick is drawn here from +% ~\MakeLineNo~ because it will be used again in +% section_\ref{ss:calls}. + +\def\@LN@depthbox{% + \dp\@tempboxa=\@tempdima + \nointerlineskip \kern-\@tempdima \box\@tempboxa} + +% (/New v4.4) % % \section{% % Control line numbering % \unskip} % \subsection{% -% Basic code %% own subsec. v4.2. -% \unskip}\label{ss:CtrlLN} +% Inserting \scs{output} calls %% own subsec. v4.4. +% \unskip}\label{ss:calls} % The line numbering is controlled via ~\par~. \LaTeX\ % saved the \TeX-primitive ~\par~ in ~\@@par~. We push it % one level further out, and redefine ~\@@par~ to insert @@ -927,27 +956,18 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % somewhat slow. I think I will use ~\mathchardef~ next time. % Or has any user used ~\linenoprevgraf~? (/UL) -\def\linenumberpar{\ifvmode\@@@par\else\ifinner\@@@par\else - \xdef\@LN@outer@holdins{\the\holdinginserts}% v4.2 - \advance\interlinepenalty \linenopenalty - \linenoprevgraf\prevgraf - \global\holdinginserts\thr@@ - \@@@par -%% -% (New v4.32) -% A ~\belowdisplayskip~ may be here when the paragraph ends on a -% display-math; or there may be a ~\topsep~ from a list, etc. -% ~\addvspace~ couldn't take account for it unless we move that -% skip down: -%% - \skip@\lastskip - \if@nobreak \nobreak \fi \vskip-\skip@ -%% -% (/New v4.32) -%% - \ifnum\prevgraf>\linenoprevgraf - \penalty-\linenopenaltypar - \fi +%% v4.33: changed code alignment for better understanding. +\def\linenumberpar{% + \ifvmode \@@@par \else + \ifinner \@@@par \else + \xdef\@LN@outer@holdins{\the\holdinginserts}% v4.2 + \advance \interlinepenalty \linenopenalty + \linenoprevgraf \prevgraf + \global \holdinginserts \thr@@ + \@@@par + \ifnum\prevgraf>\linenoprevgraf + \penalty-\linenopenaltypar + \fi %% % (New v4.00) % \begin{old}\begin{verbatim} @@ -959,7 +979,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % interline penalty is changed into 10000. At the end of a % paragraph, the ~\parskip~ would follow that penalty of 10000, % so there could be a page break neither at the -% ~\parskip~ nor at the ~\baselineskip~ (\TeX book p. 110)---so +% ~\parskip~ nor at the ~\baselineskip~ (\TeX book p._110)---so % there could never be a page break between two paragraphs. % So something must screen off the 10000 penalty. % Indeed, the ~\kern~ is a place to break. @@ -972,26 +992,47 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % \end{old} % ---but this allows a page break after heading. So: %% - \@LN@parpgbrk - \if@nobreak \nobreak \fi \vskip\skip@ % v4.32 + \@LN@parpgbrk %% -% After heading, ~\kern\z@~ resulting from previous line -% (see below) is followed by ~\write~ or ~\penalty10000~, -% so causes no page break. +%% After heading, ~\kern\z@~ resulting from previous line +%% (see below) is followed by ~\write~ or ~\penalty10000~, +%% so causes no page break. % % These and similar changes were formerly done by ~linenox1.sty~. % (/New v4.00) -%% - \global\holdinginserts\@LN@outer@holdins % v4.2 - \advance\interlinepenalty -\linenopenalty - \fi\fi} - -% (New v4.00) Initialize ~\@LN@parpgbrk~: - -\gdef\@LN@parpgbrk{\kern\z@} - -% (/New v4.00) % +% (New v4.4) +% A ~\belowdisplayskip~ may precede the previous when the paragraph +% ends on a display-math; or there may be a ~\topsep~ from a list, etc. +% ~\addvspace~ couldn't take account for it with ~\kern\z@~ +% here. v4.32 therefore moved the space down -- with at least two +% bad consequences. +% Moreover, David Josef Dev observes that ~\kern\z@~ may +% inappropriately yield column depth 0pt. +% For these reasons, we introduce ~\@LN@screenoff@pen~ below. +% (/New v4.4) +%% + \global\holdinginserts\@LN@outer@holdins % v4.2 + \advance\interlinepenalty -\linenopenalty + \fi % from \ifinner ... \else + \fi} % from \ifvmode ... \else + +% (New v4.00, v4.4) Initialize ~\@LN@parpgbrk~, accounting +% for earlier space and for appropriate columndepth. +% We use former ~\MakeLineNo~'s depth-preverving trick +% ~\@LN@depthbox~ again: + +\def\@LN@screenoff@pen{% + \ifdim\lastskip=\z@ + \@tempdima\prevdepth \setbox\@tempboxa\null + \@LN@depthbox \fi} + +\global\let\@LN@parpgbrk\@LN@screenoff@pen + +% (/New v4.4, v4.00) +% \subsection{% +% Turning on/off %% own subsec. v4.4. +% \unskip}\label{ss:OnOff} % The basic commands to enable and disable line numbers. % ~\@par~ and ~\par~ are only touched, when they are ~\let~ % to ~\@@@par~/~\linenumberpar~. The line number may be @@ -1012,7 +1053,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. %% % (New v4.3) Just noticed: Such tricks have been % disallowed with v4.11, see subsections_\ref{ss:LL} -% and_\ref{ss:CtrlLN}.---Moreover, the switching between +% and_\ref{ss:OnOff}.---Moreover, the switching between % meanings of ~\linelabel~ for a possible error message % as of v4.11 is removed. Speed is difficult to esteem % and also depends on applications. Just use the most @@ -1079,7 +1120,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % of environments, including the suppression of the % following paragraph's indentation. % -%% TODO: v4.3+: +%% TODO: v4.4+: % (UL) I am drawing the following % private thoughts of Stephan's to publicity so that others may % think about them---or to remind myself of them in an efficient @@ -1333,7 +1374,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % \end{verbatim} % \end{old} % This trick is better not allowed---see subsections_\ref{ss:LL} -% and_\ref{ss:CtrlLN}. +% and_\ref{ss:OnOff}. % (/New v4.11) % % ~\linelabel~ @@ -1594,7 +1635,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % (v4.22: I had made much fuss about resetting subordinate % counters here---removed, somewhat postponed.) % -%% TODO v4.3+: +%% TODO v4.4+: %% \newcommand*\resetlinenumber[1][\@ne]{% %% \ifx\c@linenumber\c@runninglinenumber %% \global\c@linenumber#1\relax @@ -1942,7 +1983,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % file. \AtBeginDocument{% v4.2, revtex4.cls (e.g.). - % <- TODO v4.3+: Or better in \LineNoLaTeXOutput!? + % <- TODO v4.4+: Or better in \LineNoLaTeXOutput!? \let\@LN@orig@makecol\@makecol} \def\@LN@makecol{% \@LN@orig@makecol @@ -1951,7 +1992,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \protected@write\@auxout{}{% \string\@LN@col{\if@firstcolumn1\else2\fi}% }% - \unvbox\@outputbox % v4.22, was \box + \box\@outputbox }% \vbox } %% TODO cf. revtexln.sty. @@ -2024,7 +2065,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % \end{old} % (UL) This was somewhat slow. This arithmetic % happens at every line. This time I tend to declare an extra -%% TODO v4.3+ +%% TODO v4.4+ % line counter (as opposed to my usual recommendations to use % counters as rarely as possible) which is stepped every line. % It could be incremented in the same way as ~\c@LN@truepage~ @@ -2034,7 +2075,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % and ~\thelinenumber~ is executed.---It gets much slower by my % support of controlling the first line number below. I should % improve this.---On -%% %% TODO v4.3+--pagewise!? +%% %% TODO v4.4+--pagewise!? % the other hand, time expense means very little nowadays, % while the number of \TeX\ counters still is limited. % @@ -2046,7 +2087,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. %% %% I wonder about Stephan's group. Its only effect is that %% ~\@tempcnta~ is restored after using it. What for is this? -%% I tend to remove the group braces. %% TODO v4.3+ +%% I tend to remove the group braces. %% TODO v4.4+ % (/UL) % % Here is the new code. It is very near to my ~lnopatch.sty~ @@ -2695,7 +2736,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \advance\c@internallinenumbers\m@ne \expandafter\makeinternalLinenumbers\fi } - % TODO v4.3+: star: line numbers right!? cf. lnocapt.sty + % TODO v4.4+: star: line numbers right!? cf. lnocapt.sty % % \subsection{% @@ -2747,7 +2788,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \newcommand*\@linerefadd[2]{\c@linenumber=#1\@@linerefadd\relax \thelinenumber} -%% TODO v4.3+: Insert `LN' in internal command names? +%% TODO v4.4+: Insert `LN' in internal command names? % % \subsection{% % Numbered quotation environments @@ -2764,7 +2805,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % Default is to count from one. % % (v4.22: A local version using ~\c@internallinenumber~ -% might be useful, see subsection_\ref{ss:ILN}.) %% TODO v4.3+ +% might be useful, see subsection_\ref{ss:ILN}.) %% TODO v4.4+ \newcommand\quotelinenumbers {\@ifstar\linenumbers{\@ifnextchar[\linenumbers{\linenumbers*}}} @@ -2846,17 +2887,17 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % This section completes reviving ~\pagebreak~, ~\nopagebreak~, % ~\vspace~, and the star and optional form of ~\\~. This was % started in section_\ref{ss:output} and resumed in -% section_\ref{ss:MLN} and subsection_\ref{ss:CtrlLN}. +% section_\ref{ss:MLN} and subsection_\ref{ss:calls}. % The problem was explained in section_\ref{ss:output}: % ~\vadjust~ items come out at a bad position, and the % \LaTeX\ commands named before work with ~\vadjust~ indeed. % Our solution was sketched there as well. % -% According to the caveat in subsection_\ref{ss:CtrlLN} concerning +% According to the caveat in subsection_\ref{ss:OnOff} concerning % ~\ifLineNumbers~, the \LaTeX\ commands enumerated may go % wrong if you switch line numbering inside or at the end of % a paragraph. -%% %% TODO v4.3+ +%% %% TODO v4.4+ % % \subsection{% % Redefining \scs{vadjust} @@ -2933,11 +2974,11 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % coming from a \LaTeX\ command should be ~\PostponeVadjust~. % ~\marginpar~s and floats seem to be the only cases which % are not explicitly dealt with in the present section. -% This would be a way to avoid ~\my@nobreaktrue~! +% This would be a way to avoid ~\@LN@nobreaktrue~! % Of course, the ~\vadjust~s that the present package uses % then must be replaced by ~\@LN@@vadjust~.---Maybe % next time. (/UL) -%% %% TODO v4.3+ +%% %% TODO v4.4+ % % The next command and something else will be added to the % \LaTeX\ commands we are concerned with here. @@ -2949,13 +2990,17 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. } % (UL) What about math mode? Math display? Warn? (/UL) -%% %% TODO v4.3+ +%% %% TODO v4.4+ % % ~\@tempa~ will now become a two place macro which adds first % argument (single token), enclosed by ~\ifLineNumbers~\,\dots % ~\fi~ to the left of second argument. As long as we need it, % we can't use the star form of ~\DeclareRobustCommand~ or % the like, because AMS-\LaTeX\ uses ~\@tempa~ for ~\@ifstar~. +% (New v4.41) And for the same reason, that ~\CheckCommand*~ +% had to be raised! (/New v4.41) + +\CheckCommand*\@parboxrestore{\@arrayparboxrestore\let\\\@normalcr} \def\@tempa#1#2{% \expandafter \def \expandafter#2\expandafter{\expandafter @@ -2977,10 +3022,8 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \@tempa\nolinenumbers\@arrayparboxrestore % We hope this suffices $\dots$ let's check one thing -% at least: - -\CheckCommand*\@parboxrestore{\@arrayparboxrestore\let\\\@normalcr} - +% at least: [(New v4.41) see ~\CheckCommand~ above (/New v4.41)] +% % Now for the main theme of the section. % The next lines assume that ~\vspace~, ~\pagebreak~, and % ~\nopagebreak~ use ~\vadjust~ whenever they occur outside @@ -2999,7 +3042,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % (and we use ~\@ifstar~!). %% %% \@ifstar reimplemented 1995/10/16, but seems to be much older. -%% TODO v4.3+: +%% TODO v4.4+: %% \def\@LN@cr{% %% \@ifnextchar*{\@LN@changevadjust\@normalcr}% %% {\@ifnextchar[{\@LN@changevadjust\@normalcr}\@normalcr}% @@ -3008,7 +3051,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. %% % (Using a copy of ~\\~ would be safer, but an ugly repetition % of ~\protect~.) -%% %% TODO v4.3+ +%% %% TODO v4.4+ \DeclareRobustCommand\\{% \ifLineNumbers @@ -3153,7 +3196,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % retained. <number>=1 turns this off without changing % ~linenumbermodulo~. The counter is initialized to 5. %% -%% %% TODO v4.3+: `counter', he says. Cf._above. +%% %% TODO v4.4+: `counter', he says. Cf._above. %% %% (New v4.31) % \item @@ -3237,13 +3280,13 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % ~\\[~<space>~]~---cf._section_\ref{s:MVadj}. % % The same care should be applied to the ``wizard'' devices -% ~\ifLineNumbers~ (subsection_\ref{ss:CtrlLN}) and +% ~\ifLineNumbers~ (subsection_\ref{ss:OnOff}) and % ~\PostponeVadjust~ (section_\ref{ss:PVadj}). % (/New v4.00) % % (New v4.11) Oh, and the commands and environments of % section_{s:Xt} are missing. Sorry, I am in a hurry now. -% May be next time.% %% TODO v4.3+ +% May be next time.% %% TODO v4.4+ % ---And the environments ~{linenomath}~ and ~{linenomath*}~should % get an own paragraph. In short, each math display, equation, % or ~{eqnarray}~ should be ``wrapped'' in one of ~{linenomath}~ @@ -3323,10 +3366,10 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % \end{document}%D ------------------------------------------------------------------------------ %SSTOPP -%% TODO v4.3+: Check for unwanted comment marks in new comments +%% TODO v4.4+: Check for unwanted comment marks in new comments %% (resulting from manual aligning): search `New v4.2' %% and/or ` % '! -%% TODO v4.3+: Check for missing comment marks where a paragraph +%% TODO v4.4+: Check for missing comment marks where a paragraph %% should end/start. Also to prevent empty "code" lines. %% Especially, new comments at section ends must be %% followed by comment mark lines. @@ -3334,20 +3377,20 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. %% See `visual space' above. %% For proper appearance in lineno.tex, note that a comment %% in a final code line changes behaviour. -%% TODO v4.3+: Require README for redistribution? -%% TODO v4.3+: Since discussions of code have increased so much, it +%% TODO v4.4+: Require README for redistribution? +%% TODO v4.4+: Since discussions of code have increased so much, it %% would be appropriate not to give to this file %% extension `.sty' (e.g., `dty'!??). ?? Is quickly read though! %% A .sty extraction may be possible even if the present %% file is neither a .doc nor a .dtx. (!???) %% Use awk line below (etc.) for .doc at least; + .ins or so. %% ^ must not be caps! To escape awk. -%% TODO v4.3+: Underfull lines!? (due to long code quotations) -%% TODO v4.3+: Sometimes paragraph indents may be appropriate. +%% TODO v4.4+: Underfull lines!? (due to long code quotations) +%% TODO v4.4+: Sometimes paragraph indents may be appropriate. %% TODO Swap first line (`\iffalse...') with corresponding below. Or do *not* swap, maybe nawk is more reliable. -%% TODO v4.3+: Ponder Stephan's mail from 2004/09/02. -%% TODO v4.3+: +%% TODO v4.4+: Ponder Stephan's mail from 2004/09/02. +%% TODO v4.4+: %% use \@ET@makeLineNumber. %% plus almost all `(UL)' %% plus lots of bad boxes messages diff --git a/Master/texmf-dist/tex/latex/ltxmisc/chappg.sty b/Master/texmf-dist/tex/latex/ltxmisc/chappg.sty deleted file mode 100644 index 943cf041424..00000000000 --- a/Master/texmf-dist/tex/latex/ltxmisc/chappg.sty +++ /dev/null @@ -1,191 +0,0 @@ -% Define \thepage to output chapter-page (such as 1-3, 5-2, etc.) -% and have each chapter's page number begin on 1. -% -% Largely reimplemented for use as a LaTeX2e package, taking account -% of \mainmatter, etc., and providing various extra capabilities, -% Robin Fairbairns <rf@cl.cam.ac.uk>, from an original by -% Max Hailperin <max@nic.gac.edu>, who asserted that the original -% source was TeXMaG Vol. 5, No. 3 (part 1) -% -% See documentation after \endinput -% -% This program may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.1 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.1 or later is part of all distributions of LaTeX -% version 1999/06/01 or later. -% -% This program consists of the file chappg.sty - -\NeedsTeXFormat{LaTeX2e}% Seems to work with any version -\ProvidesPackage{chappg}[2000/05/24 v2.0d page numbering by chapter] - -% -% reset page number when chapter number is stepped -\@addtoreset{page}{chapter} - -\renewcommand\pagenumbering[2][\@chappg@thechapter]{% - \global\c@page\@ne - \protected@xdef\thepage{% - \expandafter\noexpand\csname @#2\endcsname - \noexpand\c@page - }% - \gdef\@chappg@prefix{#1}% -} - -% This is the command used by \pagenumbering{bychapter} to actually -% create the page number -\newcommand\@bychapter[1]{% - \@chappg@prefix\chappgsep\@arabic#1% - \ifx\@chappg@prefix\@chappg@surprise - \if@chappgsurprised\else - \xdef\@chappg@surprise@line{\the\inputlineno}% - \global\@chappgsurprisedtrue - \fi - \fi -} - -% output a chapter number if there have been any chapters; otherwise -% gobble the following thing, which will be \chappgsep -\def\@chappg@thechapter{% - \ifnum\c@chapter=0 - \expandafter\@gobble - \else - \thechapter - \fi -} - -% separator in the above -\providecommand\chappgsep{-} - -% -% select default: this will be hacked by \frontmatter if the author -% uses it -\pagenumbering{bychapter} - -% -% Hack at \mainmatter so that it restores bychapter numbering if -% there's been a \frontmatter command -\let\@@mainmatter\mainmatter -\def\mainmatter{\@@mainmatter - \pagenumbering{bychapter}% -} - -% -% Hack at \backmatter so that it warns the user of possibly surprising -% results if \pagenumbering[whatever]{bychapter} hasn't been used -\let\@@backmatter\backmatter -\def\backmatter{\@@backmatter - \let\@chappg@prefix\@chappg@surprise -} -\def\@chappg@surprise{\textbf{??}} -\newif\if@chappgsurprised \@chappgsurprisedfalse - -\AtEndDocument{\if@chappgsurprised - \PackageWarningNoLine{chappg}{Possibly surprising page numbering in - \string\backmatter - \MessageBreak - Use \string\pagenumbering[prefix]{bychapter}% - \MessageBreak - to select alternative before line \@chappg@surprise@line - } - \fi -} - -%% -%% command to hack at an environment to cause it to behave prettily -%% #1->environment name, #2->prefix for page numbers -%\newcommand\bychapterenv[2]{% -% \@ifundefined{@@#1}{% -% \expandafter\let\csname @@#1\expandafter\endcsname -% \csname#1\endcsname -% }{}% -% \expandafter\edef\csname#1\endcsname{% -% \expandafter\noexpand\csname @@#1\endcsname -% \global\let\noexpand\@@bychapter\noexpand\@bychapter -% \noexpand\pagenumbering[\noexpand#2]{bychapter}% -% }% -% \@ifundefined{@@end#1}{% -% \expandafter\let\csname @@end#1\expandafter\endcsname -% \csname end#1\endcsname -% }{}% -% \expandafter\edef\csname end#1\endcsname{% -% \expandafter\noexpand\csname @@end#1\endcsname -% \global\let\noexpand\@bychapter\noexpand\@@bychapter -% }% -%} -% -%% -%% Specific cases: set up for dealing with bibliography, index, and (if -%% it's defined) glossary -%\bychapterenv{thebibliography}\bibname -%\bychapterenv{theindex}\indexname -%\@ifundefined{theglossary}{}{% -% \bychapterenv{theglossary}{Glossary}% -%} - -% -% The next magic makes the page counter be reset to one rather than zero -\renewcommand\@stpelt[1]{% - \global\csname c@#1\endcsname - \expandafter\ifx \csname c@#1\endcsname \c@page - \@ne - \else - \z@ - \fi -} -\endinput - -chappg.sty: number pages by chapter - -Basic operation of the package is to redefine \thepage to be -\thechapter-\arabic{page}, and to cause the page number to be reset -(to 1) at the start of each chapter. So the pages of chapter 3 will -be numbered 3-1, 3-2, ..., and the pages of appendix B will be -numbered B-1, B-2, ... - -The package assumes the environment of the standard report or book -classes (or classes derived from them by inclusion or copying). - -The package's effect is achieved by defining a new \pagenumbering -style `bychapter', and using it. The package changes \pagenumbering -to take an optional argument, which is the `prefix' to the page -number. Ordinarily, this will be the chapter number, but a user may -care to say (for example): - - \chapter*{Preface} - \pagenumbering[Preface]{bychapter} - -in her document somewhere, and the pages of the preface will be -numbered Preface-1, Preface-2, ... - -The separator between the chapter and page numbers (hyphen above, but -I can imagine people wanting it to be an en-dash) is \chappgsep, which -en-dash-lovers may redefine (after loading the package); for example: - - \renewcommand{\chappgsep}{--}% - -Havoc is wreaked with this structure in the LaTeX \frontmatter and -\mainmatter commands (which both explicitly use \pagenumbering and -therefore destroy the changed definition of \thepage - -My design decision was to assume that \frontmatter is indeed to be in -\pagenumbering{roman}, and to restore the chapter-numbering in -\mainmatter. Chapters in the frontmatter can not be numbered `by' -their chapters, since the chapters don't actually have numbers. If -the author wishes to have some special treatment of part of the -frontmatter, the analogue of the above is - - \chapter{Preface} - \pagenumbering[Preface]{bychapter} - -The conception breaks down again in \backmatter; again, the \chapter -commands don't number the chapters, so that the pages will all be -numbered as if they were `within' the last real chapter. Therefore, -if by-chapter page numbering is still enabled while in the backmatter, -and the user hasn't issued a new \pagenumbering[prefix]{bychapter} -since the \backmatter command, the package rewrites the prefix as -{\bf??}, and produces a warning at the end of the document. - diff --git a/Master/texmf-dist/tex/latex/ltxmisc/perpage.sty b/Master/texmf-dist/tex/latex/ltxmisc/perpage.sty deleted file mode 100644 index a9412b77c17..00000000000 --- a/Master/texmf-dist/tex/latex/ltxmisc/perpage.sty +++ /dev/null @@ -1,33 +0,0 @@ -% $Id: perpage.sty,v 1.2 2002/12/20 19:25:34 dak Exp $ -% The following package adds the ability to reset counters per page. -% Usage example: -% \MakePerPage[2]{footnote} -% will start footnote numbers with 2 on each page (the optional -% argument defaults to 1). 2 might be a strange number, unless -% you have \renewcommand\thefootnote{\fnsymbol{footnote}} and -% want to start off with a dagger. This may need multiple passes -% to work: LaTeX will complain about changed labels if you need -% another pass. -% Copyright 2002 David Kastrup, <David.Kastrup@t-online.de> -% distributable under the LPPL - -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{perpage}[2002/12/20 v1.0 Reset counters per page] -\newcommand*\MakePerPage[2][\@ne]{% - \expandafter\def\csname c@pchk@#2\endcsname{\c@pchk@{#2}{#1}}% - \newcounter{pcabs@#2}% - \@addtoreset{pchk@#2}{#2}} - -\def\new@pagectr#1{\@newl@bel{pchk@#1}} - -\def\c@pchk@#1#2{\z@=\z@ - \begingroup - \expandafter\let\expandafter\next\csname pchk@#1@\arabic{pcabs@#1}\endcsname - \addtocounter{pcabs@#1}\@ne - \expandafter\ifx\csname pchk@#1@\arabic{pcabs@#1}\endcsname\next - \else \setcounter{#1}{#2}\fi - \protected@edef\next{% - \string\new@pagectr{#1}{\arabic{pcabs@#1}}{\noexpand\thepage}}% - \protected@write\@auxout{}{\next}% - \endgroup\global\z@} -\endinput diff --git a/Master/texmf-dist/tex/latex/ltxmisc/statex.sty b/Master/texmf-dist/tex/latex/ltxmisc/statex.sty index f0be39a5145..a8f3f6f7d19 100644 --- a/Master/texmf-dist/tex/latex/ltxmisc/statex.sty +++ b/Master/texmf-dist/tex/latex/ltxmisc/statex.sty @@ -1,7 +1,7 @@ %% %% This is file `statex.sty'. %% -%% Copyright (C) 2002-2004 by Rodney A Sparapani <rsparapa@mcw.edu> +%% Copyright (C) 2002-2006 by Rodney A Sparapani <rsparapa@mcw.edu> %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.2 @@ -14,12 +14,13 @@ %% version 1999/12/01 or later. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{statex}[2004/04/03 v1.5 a statistics style for latex] +\ProvidesPackage{statex}[2006/05/17 v1.6 a statistics style for latex] \RequirePackage{ifthen} \RequirePackage{amsmath} \RequirePackage{amssymb} \RequirePackage{bm} -\RequirePackage[dvipsnames, usenames]{color} +\RequirePackage{color} +%\RequirePackage[dvipsnames,usenames]{color} %begin: borrowed from upgreek; thanks to Walter Schmidt <was@VR-Web.de> %use Adobe Symbol for upright pi (constant) @@ -46,39 +47,53 @@ \newcommand*{\chisq}{\relax\ifmmode\chi^2\else$\chi^2$\fi} %\newcommand*{\e}[1]{\mathrm{e}\ifthenelse{\equal{#1}{}}{}{^{#1}}} \newcommand*{\e}[1]{\mathrm{e}^{#1}} -\newcommand*{\E}[2][]{\text{E}\ifthenelse{\equal{#1}{}}{}{_{#1}} \lb #2 \rb} +%\newcommand*{\exp}[1]{\mathrm{e}^{#1}} +\newcommand*{\E}[2][]{\text{E}\ifthenelse{\equal{#1}{}}{}{_{#1}} \wrap{#2}} \newcommand*{\ha}{{\frac{\alpha}{2}}} -\newcommand*{\I}[2][]{\text{I}\ifthenelse{\equal{#1}{}}{}{_{#1}} \lb #2 \rb} +\newcommand*{\I}[2][]{\text{I}\ifthenelse{\equal{#1}{}}{}{_{#1}} \wrap[()]{#2}} +\newcommand*{\IBeta}[2]{\frac{\Gamma[#1+#2]}{\Gamma[#1]\Gamma[#2]}} \newcommand*{\If}{\;\text{if}\;\;} -\newcommand*{\iid}{\;\text{iid}\;} -\newcommand*{\ij}{{i,j}} +%\newcommand*{\ij}{{i,j}} \newcommand*{\im}{\mathrm{i}} -\newcommand*{\lb}{\left[} -\newcommand*{\lp}{\left(} -\newcommand*{\lr}[1][]{\left[ #1 \right]} +%\newcommand*{\lb}{\left[} +%\newcommand*{\lp}{\left(} +%\newcommand*{\lr}[1][]{\left[ #1 \right]} \newcommand*{\ol}{\overline} \newcommand*{\ow}{\;\text{otherwise}\;\;} \newcommand*{\rb}{\right]} \newcommand*{\rp}{\right)} \newcommand*{\sd}{\sigma} \newcommand*{\ul}{\underline} -\newcommand*{\V}[2][]{\text{V}\ifthenelse{\equal{#1}{}}{}{_{#1}} \lb #2 \rb} -\newcommand*{\where}{\;\text{where}\;\;} +\newcommand*{\V}[2][]{\text{V}\ifthenelse{\equal{#1}{}}{}{_{#1}} \wrap{#2}} +\newcommand*{\where}{\;\;\text{where}\;\;} +\newcommand*{\wrap}[2][]% +{\ifthenelse{\equal{#1}{}}{\left[ #2 \right]}% +{\ifthenelse{\equal{#1}{()}}{\left( #2 \right)}% +{\ifthenelse{\equal{#1}{\{\}}}{\left\{ #2 \right\}}% +%{\ifthenelse{\equal{#1}{(.}}{\left( #2 \right.}% +%{\ifthenelse{\equal{#1}{[.}}{\left[ #2 \right.}% +{\ifthenelse{\equal{#1}{\{.}}{\left\{ #2 \right.}{}}}}} \newcommand*{\xy}{{xy}} \newcommand*{\XY}{{XY}} %\newcommand*{\n}[1][]{_{n #1}} -\def\bp(#1){\left(#1\right)} -\newcommand*{\bb}[1][]{\left[ #1 \right]} +%\def\bp(#1){\left(#1\right)} +%\newcommand*{\bb}[1][]{\left[ #1 \right]} %re-definitions %\def~{\relax\ifmmode\sim\else\nobreakspace{}\fi} \renewcommand*{~}{\relax\ifmmode\sim\else\nobreakspace{}\fi} +\newcommand*{\iid}{\;\stackrel{\text{iid}}{~}\;} +\newcommand*{\ind}{\;\stackrel{\text{ind}}{~}\;} +\newcommand*{\indpr}{\;\stackrel{\text{ind}}{\stackrel{\text{prior}}{~}}\;} +\newcommand*{\post}{\;\stackrel{\text{post}}{~}\;} +\newcommand*{\prior}{\;\stackrel{\text{prior}}{~}\;} + %\let\STATEXi=\i %\renewcommand*{\i}[1][]{\ifthenelse{\equal{#1}{}}{\STATEXi}{_{i #1}}} \let\STATEXGamma=\Gamma -\renewcommand*{\Gamma}[1][]{\STATEXGamma\ifthenelse{\equal{#1}{}}{}{\lp #1 \rp}} +\renewcommand*{\Gamma}[1][]{\STATEXGamma\ifthenelse{\equal{#1}{}}{}{\wrap[()]{#1}}} \let\STATEXand=\and \renewcommand*{\and}{\relax\ifmmode\expandafter\;\;\text{and}\;\;\else\expandafter\STATEXand\fi} @@ -88,20 +103,20 @@ \let\STATEXP=\P \renewcommand*{\P}[2][]{\ifthenelse{\equal{#2}{}}{\STATEXP}% -{\ifthenelse{\equal{#1}{}}{\text{P} \lb #2 \rb}{\text{P}_{#1} \lb #2 \rb}}} +{\text{P}\ifthenelse{\equal{#1}{}}{}{_{#1}}\wrap{#2}}} \renewcommand*{\|}{\relax\ifmmode\expandafter\mid\else\expandafter$\mid$\fi} %%Discrete distributions %declarations -\newcommand*{\B}[1]{\mathrm{B}\lp #1 \rp} -\newcommand*{\BB}[1]{\mathrm{Beta\!-\!Bin}\lp #1 \rp} -\newcommand*{\Bin}[1]{\mathrm{Bin}\lp #1 \rp} -\newcommand*{\Dir}[1]{\mathrm{Dirichlet}\lp #1 \rp} -\newcommand*{\HG}[1]{\mathrm{Hypergeometric}\lp #1 \rp} -\newcommand*{\M}[1]{\mathrm{Multinomial}\lp #1 \rp} -\newcommand*{\NB}[1]{\mathrm{Neg\!-\!Bin}\lp #1 \rp} -\newcommand*{\Poi}[1]{\mathrm{Poisson}\lp #1 \rp} +\newcommand*{\B}[1]{\mathrm{B}\wrap[()]{#1}} +\newcommand*{\BB}[1]{\mathrm{Beta\!-\!Bin}\wrap[()]{#1}} +\newcommand*{\Bin}[1]{\mathrm{Bin}\wrap[()]{#1}} +\newcommand*{\Dir}[1]{\mathrm{Dirichlet}\wrap[()]{#1}} +\newcommand*{\HG}[1]{\mathrm{Hypergeometric}\wrap[()]{#1}} +\newcommand*{\M}[1]{\mathrm{Multinomial}\wrap[()]{#1}} +\newcommand*{\NB}[1]{\mathrm{Neg\!-\!Bin}\wrap[()]{#1}} +\newcommand*{\Poi}[1]{\mathrm{Poisson}\wrap[()]{#1}} \let\Poisson=\Poi %probability mass functions \newcommand*{\pBB}[4][x]{\frac{\Gamma[#2+1]\Gamma[#3+#1]\Gamma[#2+#4-#1]\Gamma[#3+#4]}% @@ -111,54 +126,54 @@ %\frac{\Gamma[#3+#1]\Gamma[#2+#4-#1]}{\Gamma[#2+#3+#4]}% %\frac{\Gamma[#3+#4]}{\Gamma[#3]\Gamma[#4]}\I[#1]{\{0, 1,\., #2\}},% %\where #3>0,\; #4>0 \and n=1, 2,\.} -\newcommand*{\pBin}[3][x]{\binom{#2}{#1}#3^#1 \lp 1-#3 \rp^{#2-#1}% -\I[#1]{\{0,1,\.,#2\}}, \where p \in \lp0, 1\rp \and n=1, 2,\.} +\newcommand*{\pBin}[3][x]{\binom{#2}{#1}#3^#1 \wrap[()]{1-#3}^{#2-#1}% +\I[#1]{\{0,1,\.,#2\}}, \where p \in \wrap[()]{0, 1} \and n=1, 2,\.} \newcommand*{\pPoi}[2][x]{\frac{1}{#1!}#2^{#1}\e{-#2}\I[#1]{\{0, 1,\.\}}, \where #2>0} %%Continuous distributions %declarations -\newcommand*{\Cau}[1]{\mathrm{Cauchy}\lp #1 \rp} +\newcommand*{\Cau}[1]{\mathrm{Cauchy}\wrap[()]{#1}} \let\Cauchy=\Cau -\newcommand*{\Chi}[1]{\mathrm{\chi^2}\lp #1 \rp} +\newcommand*{\Chi}[1]{\mathrm{\chi^2}\wrap[()]{#1}} \let\Chisq=\Chi -\newcommand*{\Bet}[1]{\mathrm{Beta}\lp #1 \rp} +\newcommand*{\Bet}[1]{\mathrm{Beta}\wrap[()]{#1}} \let\Beta=\Bet -\newcommand*{\Exp}[1]{\mathrm{Exp}\lp #1 \rp} -\newcommand*{\F}[1]{\mathrm{F}\lp #1 \rp} -\newcommand*{\Gam}[1]{\mathrm{Gamma}\lp #1 \rp} -\newcommand*{\IC}[1]{\mathrm{\chi^{-2}}\lp #1 \rp} -\newcommand*{\IG}[1]{\mathrm{Gamma^{-1}}\lp #1 \rp} -\newcommand*{\IW}[1]{\mathrm{Wishart^{-1}}\lp #1 \rp} -\newcommand*{\Log}[1]{\mathrm{Logistic}\lp #1 \rp} -\newcommand*{\LogN}[1]{\mathrm{Log\!-\!N}\lp #1 \rp} -\newcommand*{\N}[2][]{\mathrm{N}\ifthenelse{\equal{#1}{}}{}{_{#1}}\lp #2 \rp} -\newcommand*{\Par}[1]{\mathrm{Pareto}\lp #1 \rp} +\newcommand*{\Exp}[1]{\mathrm{Exp}\wrap[()]{#1}} +\newcommand*{\F}[1]{\mathrm{F}\wrap[()]{#1}} +\newcommand*{\Gam}[1]{\mathrm{Gamma}\wrap[()]{#1}} +\newcommand*{\IC}[1]{\mathrm{\chi^{-2}}\wrap[()]{#1}} +\newcommand*{\IG}[1]{\mathrm{Gamma^{-1}}\wrap[()]{#1}} +\newcommand*{\IW}[1]{\mathrm{Wishart^{-1}}\wrap[()]{#1}} +\newcommand*{\Log}[1]{\mathrm{Logistic}\wrap[()]{#1}} +\newcommand*{\LogN}[1]{\mathrm{Log\!-\!N}\wrap[()]{#1}} +\newcommand*{\N}[3][]{\mathrm{N}\ifthenelse{\equal{#1}{}}{}{_{#1}}\wrap[()]{#2,\ #3}} +\newcommand*{\Par}[1]{\mathrm{Pareto}\wrap[()]{#1}} \let\Pareto=\Par -\newcommand*{\Tsq}[1]{\mathrm{T^2}\lp #1 \rp} -\newcommand*{\U}[1]{\mathrm{U}\lp #1 \rp} -\newcommand*{\W}[1]{\mathrm{Wishart}\lp #1 \rp} +\newcommand*{\Tsq}[1]{\mathrm{T^2}\wrap[()]{#1}} +\newcommand*{\U}[1]{\mathrm{U}\wrap[()]{#1}} +\newcommand*{\W}[1]{\mathrm{Wishart}\wrap[()]{#1}} \let\STATEXt=\t -\renewcommand*{\t}[1]{\relax\ifmmode\expandafter\mathrm{t}\lp #1 \rp% +\renewcommand*{\t}[1]{\relax\ifmmode\expandafter\mathrm{t}\wrap[()]{#1}% \else\expandafter\STATEXt{#1}\fi} %probability density functions -\newcommand*{\pBet}[3][x]{\frac{\Gamma[#2+#3]}{\Gamma[#2]\Gamma[#3]}% -#1^{#2-1}\lp1-#1\rp^{#3-1}\I[#1]\lb0,1\rb, \where #2>0 \and #3>0} -\newcommand*{\pCau}[3][x]{\ifthenelse{\equal{#2, #3}{0, 1}}{\frac{1}{\cpi\lp1+#1\rp^2}}% -{\frac{1}{#3\cpi\left\{1+\lb\lp x-#2\rp/#3\rb^2\right\}}, \where #3>0}} +\newcommand*{\pBet}[3][x]{\IBeta{#2}{#3}% +#1^{#2-1}\wrap[()]{1-#1}^{#3-1}\I[#1]{0,\ 1}, \where #2>0 \and #3>0} +\newcommand*{\pCau}[3][x]{\ifthenelse{\equal{#2, #3}{0, 1}}{\frac{1}{\cpi\wrap[()]{1+#1}^2}}% +{\frac{1}{#3\cpi\left\{1+\wrap{\wrap[()]{x-#2}/#3}^2\right\}}, \where #3>0}} \newcommand*{\pChi}[2][x]{\frac{2^{-#2/2}}{\Gamma[#2/2]}#1^{#2/2-1}\e{-#1/2}% -\I[#1]\lp0,\infty\rp, \where #2>0} -\newcommand*{\pExp}[2][x]{\frac{1}{#2}\e{-#1/#2}\I[#1]\lp0,\infty\rp,% +\I[#1]{0,\infty}, \where #2>0} +\newcommand*{\pExp}[2][x]{\frac{1}{#2}\e{-#1/#2}\I[#1]{0,\infty},% \where #2>0} \newcommand*{\pGam}[3][x]{\frac{#3^{#2}}{\Gamma[#2]}#1^{#2-1}\e{-#3#1}% -\I[#1]\lp0,\infty\rp, \where #2>0 \and #3>0} +\I[#1]{0,\infty}, \where #2>0 \and #3>0} \newcommand*{\pN}[3][x]{\ifthenelse{\equal{#2, #3}{0, 1}}% {\frac{1}{\sqrt{2\cpi}}\e{-#1^2/2}}% -{\frac{1}{\sqrt{2\cpi#3}}\e{-\lp#1-#2\rp^2/2#3}}} -\newcommand*{\pPar}[3][x]{\frac{#3}{#2\lp1+#1/#2\rp^{#3+1}}\I[#1]\lp0,\infty\rp,% +{\frac{1}{\sqrt{2\cpi#3}}\e{-\wrap[()]{#1-#2}^2/2#3}}} +\newcommand*{\pPar}[3][x]{\frac{#3}{#2\wrap[()]{1+#1/#2}^{#3+1}}\I[#1]{0,\infty},% \where #2>0 \and #3>0} -\newcommand*{\pU}[3][x]{\ifthenelse{\equal{#2, #3}{0, 1}}{\I[#1]\lb0, 1\rb}% -{\frac{1}{#3-#2}\I[#1]\lb#2,#3\rb, \where #2<#3}} +\newcommand*{\pU}[3][x]{\ifthenelse{\equal{#2, #3}{0, 1}}{\I[#1]{0,\ 1}}% +{\frac{1}{#3-#2}\I[#1]{#2,\ #3}, \where #2<#3}} %re-define other accents \let\STATEXequal=\= @@ -168,7 +183,7 @@ \let\STATEXtilde=\~ \renewcommand*{\~}{\relax\ifmmode\expandafter\widetilde\else\expandafter\STATEXtilde\fi} \let\STATEXsinglequote=\' -\renewcommand*{\'}[1]{\relax\ifmmode\expandafter{\lp{#1}\rp}\else\expandafter\STATEXsinglequote{#1}\fi} +\renewcommand*{\'}[1]{\relax\ifmmode\expandafter{\wrap[()]{#1}}\else\expandafter\STATEXsinglequote{#1}\fi} \let\STATEXb=\b \renewcommand*{\b}{\relax\ifmmode\expandafter\bar\else\expandafter\STATEXb\fi} \let\STATEXc=\c @@ -212,180 +227,181 @@ \endinput -\documentclass{report} +\documentclass[dvipsnames,usenames]{report} \usepackage{statex} \usepackage{shortvrb} -\MakeShortVerb{!} +\MakeShortVerb{@} % Examples \begin{document} Many accents have been re-defined -$$ c \c{c} \pi \cpi$$ %upright constants like the speed of light and 3.14159... +@ c \c{c} \pi \cpi@ $$ c \c{c} \pi \cpi$$ %upright constants like the speed of light and 3.14159... -$$\int \e{\im x} \d{x}$$ %\d{x}; also note new commands \e and \im +@int \e{\im x} \d{x}@ $$\int \e{\im x} \d{x}$$ %\d{x}; also note new commands \e and \im -$$\^{\beta_1}=b_1$$ +@\^{\beta_1}=b_1@ $$\^{\beta_1}=b_1$$ -$$\=x=\frac{1}{n}\sum x_i$$ %also, \b{x}, but see \ol{x} below +@\=x=\frac{1}{n}\sum x_i@ $$\=x=\frac{1}{n}\sum x_i$$ %also, \b{x}, but see \ol{x} below -$$\b{x} = \frac{1}{n} \lp x_1 +\.+ x_n \rp$$ +@\b{x} = \frac{1}{n} \wrap[()]{x_1 +\.+ x_n}@ $$\b{x} = \frac{1}{n} \wrap[()]{x_1 +\.+ x_n}$$ -Sometimes overline is better: $$\b{x}\ vs.\ \ol{x}$$ +Sometimes overline is better: @\b{x}\ vs.\ \ol{x}@ $$\b{x}\ vs.\ \ol{x}$$ -And, underlines are nice too: $$\ul{x}$$ +And, underlines are nice too: @\ul{x}@ $$\ul{x}$$ A few other nice-to-haves: -$$\binom{n}{x}$$ %provided by amsmath package +@\Gamma[n+1]=n!@ $$\Gamma[n+1]=n!$$ -$$\e$$ +@\binom{n}{x}@ $$\binom{n}{x}$$ %provided by amsmath package -$\H_0: \mu_\ij=0$ vs. $\H_1: \mu_\ij \neq 0$ %\ijk too +@\e{x}@ $$\e{x}$$ -$$\logit \lb p \rb = \log \lb \frac{p}{1-p} \rb$$ +%$\H_0: \mu_\ij=0$ vs. $\H_1: \mu_\ij \neq 0$ %\ijk too +@\logit \wrap{p} = \log \wrap{\frac{p}{1-p}}@ $$\logit \wrap{p} = \log \wrap{\frac{p}{1-p}}$$ +\pagebreak Common distributions along with other features follows: Normal Distribution -$$Z ~ \N{0, 1}, \where \E{Z}=0 \and \V{Z}=1$$ +@Z ~ \N{0}{1}, \where \E{Z}=0 \and \V{Z}=1@ $$Z ~ \N{0}{1}, \where \E{Z}=0 \and \V{Z}=1$$ -$$\P{|Z|>z_\ha}=\alpha$$ +@\P{|Z|>z_\ha}=\alpha@ $$\P{|Z|>z_\ha}=\alpha$$ -$$\pN[z]{0}{1}$$ +@\pN[z]{0}{1}@ $$\pN[z]{0}{1}$$ or, in general -$$\pN[z]{\mu}{\sd^2}$$ +@\pN[z]{\mu}{\sd^2}@ $$\pN[z]{\mu}{\sd^2}$$ Sometimes, we subscript the following operations: -$$\E[z]{Z}=0, \V[z]{Z}=1, \and \P[z]{|Z|>z_\ha}=\alpha$$ +@\E[z]{Z}=0, \V[z]{Z}=1, \and \P[z]{|Z|>z_\ha}=\alpha@ $$\E[z]{Z}=0, \V[z]{Z}=1, \and \P[z]{|Z|>z_\ha}=\alpha$$ Multivariate Normal Distribution -$$\bm{X} ~ \N[p]{\bm{\mu}, \sfsl{\Sigma}}$$ %\bm provided by the bm package +@\bm{X} ~ \N[p]{\bm{\mu}}{\sfsl{\Sigma}}@ $$\bm{X} ~ \N[p]{\bm{\mu}}{\sfsl{\Sigma}}$$ %\bm provided by the bm package Chi-square Distribution -$$Z_i \iid \N{0, 1}, \where i=1 ,\., n$$ +@Z_i \iid \N{0}{1}, \where i=1 ,\., n@ $$Z_i \iid \N{0}{1}, \where i=1 ,\., n$$ -$$\chisq = \sum_i Z_i^2 ~ \Chi{n}$$ +@\chisq = \sum_i Z_i^2 ~ \Chi{n}@ $$\chisq = \sum_i Z_i^2 ~ \Chi{n}$$ -$$\pChi[z]{n}$$ +@\pChi[z]{n}@ $$\pChi[z]{n}$$ t Distribution -$$\frac{\b{Z}}{\sqrt{\frac{\chisq}{n}}} ~ \t{n}$$ - +@\frac{\N{0}{1}}{\sqrt{\frac{\Chisq{n}}{n}}} ~ \t{n}@ $$\frac{\N{0}{1}}{\sqrt{\frac{\Chisq{n}}{n}}} ~ \t{n}$$ +\pagebreak F Distribution -$$X_i, Y_i \iid \N{0, 1}, \where i=1 ,\., n, \V{X_i, Y_{\~i}}=\sd_\xy=0, - \and \~i=1 ,\., n$$ %\XY too +@X_i, Y_{\~i} \iid \N{0}{1} \where i=1 ,\., n; \~i=1 ,\., m \and \V{X_i, Y_{\~i}}=\sd_\xy=0@ $$X_i, Y_{\~i} \iid \N{0}{1} \where i=1 ,\., n; \~i=1 ,\., m \and \V{X_i, Y_{\~i}}=\sd_\xy=0$$%\XY too -$$\chisq_x = \sum_i X_i^2 ~ \Chi{n}$$ +@\chisq_x = \sum_i X_i^2 ~ \Chi{n}@ $$\chisq_x = \sum_i X_i^2 ~ \Chi{n}$$ -$$\chisq_y = \sum_i Y_i^2 ~ \Chi{n}$$ +@\chisq_y = \sum_{\~i} Y_{\~i}^2 ~ \Chi{m}@ $$\chisq_y = \sum_{\~i} Y_{\~i}^2 ~ \Chi{m}$$ -$$\frac{\chisq_x}{\chisq_y} ~ \F{n, n}$$ +@\frac{\chisq_x}{\chisq_y} ~ \F{n, m}@ $$\frac{\chisq_x}{\chisq_y} ~ \F{n, m}$$ Beta Distribution -$$B=\frac{F}{1+F} ~ \Bet{\frac{n}{2}, \frac{n}{2}}$$ +@B=\frac{\frac{n}{m}F}{1+\frac{n}{m}F} ~ \Bet{\frac{n}{2}, \frac{m}{2}}@ $$B=\frac{\frac{n}{m}F}{1+\frac{n}{m}F} ~ \Bet{\frac{n}{2}, \frac{m}{2}}$$ -$$\pBet{\alpha}{\beta}$$ +@\pBet{\alpha}{\beta}@ $$\pBet{\alpha}{\beta}$$ Gamma Distribution -$$G ~ \Gam{\alpha, \beta}$$ +@G ~ \Gam{\alpha, \beta}@ $$G ~ \Gam{\alpha, \beta}$$ -$$\pGam{\alpha}{\beta}$$ +@\pGam{\alpha}{\beta}@ $$\pGam{\alpha}{\beta}$$ Cauchy Distribution -$$C ~ \Cau{\theta, \nu}$$ +@C ~ \Cau{\theta, \nu}@ $$C ~ \Cau{\theta, \nu}$$ -$$\pCau{\theta}{\nu}$$ +@\pCau{\theta}{\nu}@ $$\pCau{\theta}{\nu}$$ Uniform Distribution -$$X ~ \U{0, 1}$$ +@X ~ \U{0, 1}@ $$X ~ \U{0, 1}$$ -$$\pU{0}{1}$$ +@\pU{0}{1}@ $$\pU{0}{1}$$ or, in general -$$\pU{a}{b}$$ +@\pU{a}{b}@ $$\pU{a}{b}$$ Exponential Distribution -$$X ~ \Exp{\lambda}$$ +@X ~ \Exp{\lambda}@ $$X ~ \Exp{\lambda}$$ -$$\pExp{\lambda}$$ +@\pExp{\lambda}@ $$\pExp{\lambda}$$ Hotelling's $T^2$ Distribution -$$X ~ \Tsq{\nu_1, \nu_2}$$ +@X ~ \Tsq{\nu_1, \nu_2}@ $$X ~ \Tsq{\nu_1, \nu_2}$$ Inverse Chi-square Distribution -$$X ~ \IC{\nu}$$ +@X ~ \IC{\nu}@ $$X ~ \IC{\nu}$$ Inverse Gamma Distribution -$$X ~ \IG{\alpha, \beta}$$ +@X ~ \IG{\alpha, \beta}@ $$X ~ \IG{\alpha, \beta}$$ Pareto Distribution -$$X ~ \Par{\alpha, \beta}$$ +@X ~ \Par{\alpha, \beta}@ $$X ~ \Par{\alpha, \beta}$$ -$$\pPar{\alpha}{\beta}$$ +@\pPar{\alpha}{\beta}@ $$\pPar{\alpha}{\beta}$$ Wishart Distribution -$$\sfsl{X} ~ \W{\nu, \sfsl{S}}$$ +@\sfsl{X} ~ \W{\nu, \sfsl{S}}@ $$\sfsl{X} ~ \W{\nu, \sfsl{S}}$$ Inverse Wishart Distribution -$$\sfsl{X} ~ \IW{\nu, \sfsl{S^{-1}}}$$ +@\sfsl{X} ~ \IW{\nu, \sfsl{S^{-1}}}@ $$\sfsl{X} ~ \IW{\nu, \sfsl{S^{-1}}}$$ Binomial Distribution -$$X ~ \Bin{n, p}$$ +@X ~ \Bin{n, p}@ $$X ~ \Bin{n, p}$$ -$$\pBin{n}{p}$$ +@\pBin{n}{p}@ $$\pBin{n}{p}$$ Bernoulli Distribution -$$X ~ \B{p}$$ +@X ~ \B{p}@ $$X ~ \B{p}$$ Beta-Binomial Distribution -$$X ~ \BB{p}$$ +@X ~ \BB{p}@ $$X ~ \BB{p}$$ -$$\pBB{n}{\alpha}{\beta}$$ +@\pBB{n}{\alpha}{\beta}@ $$\pBB{n}{\alpha}{\beta}$$ Negative-Binomial Distribution -$$X ~ \NB{n, p}$$ +@X ~ \NB{n, p}@ $$X ~ \NB{n, p}$$ Hypergeometric Distribution -$$X ~ \HG{n, M, N}$$ +@X ~ \HG{n, M, N}@ $$X ~ \HG{n, M, N}$$ Poisson Distribution -$$X ~ \Poi{\mu}$$ +@X ~ \Poi{\mu}@ $$X ~ \Poi{\mu}$$ -$$\pPoi{\mu}$$ +@\pPoi{\mu}@ $$\pPoi{\mu}$$ Dirichlet Distribution -$$\bm{X} ~ \Dir{\alpha_1 \. \alpha_k}$$ +@\bm{X} ~ \Dir{\alpha_1 \. \alpha_k}@ $$\bm{X} ~ \Dir{\alpha_1 \. \alpha_k}$$ Multinomial Distribution -$$\bm{X} ~ \M{n, \alpha_1 \. \alpha_k}$$ +@\bm{X} ~ \M{n, \alpha_1 \. \alpha_k}@ $$\bm{X} ~ \M{n, \alpha_1 \. \alpha_k}$$ \pagebreak @@ -394,32 +410,32 @@ NCRIT program for your TI-83 (or equivalent) calculator. At each step, the calculator display is shown, followed by what you should do (\Rect\ is the cursor):\\ \Rect\\ -\Prgm\to!NEW!\to!1:Create New!\\ -!Name=!\Rect\\ +\Prgm\to@NEW@\to@1:Create New@\\ +@Name=@\Rect\\ NCRIT\Enter\\ -!:!\Rect\\ -\Prgm\to!I/O!\to!2:Prompt!\\ -!:Prompt! \Rect\\ +@:@\Rect\\ +\Prgm\to@I/O@\to@2:Prompt@\\ +@:Prompt@ \Rect\\ \Alpha[A],\Alpha[T]\Enter\\ -!:!\Rect\\ -\Distr\to!DISTR!\to!3:invNorm(!\\ -!:invNorm(!\Rect\\ +@:@\Rect\\ +\Distr\to@DISTR@\to@3:invNorm(@\\ +@:invNorm(@\Rect\\ 1-(\Alpha[A]$\div$\Alpha[T]))\Sto\Alpha[C]\Enter\\ -!:!\Rect\\ -\Prgm\to!I/O!\to!3:Disp!\\ -!:Disp! \Rect\\ +@:@\Rect\\ +\Prgm\to@I/O@\to@3:Disp@\\ +@:Disp@ \Rect\\ \Alpha[C]\Enter\\ -!:!\Rect\\ +@:@\Rect\\ \Quit\\ -Suppose !A! is $\alpha$ and !T! is the number of tails. To run the program:\\ +Suppose @A@ is $\alpha$ and @T@ is the number of tails. To run the program:\\ \Rect\\ -\Prgm\to!EXEC!\to!NCRIT!\\ -!prgmNCRIT!\Rect\\ +\Prgm\to@EXEC@\to@NCRIT@\\ +@prgmNCRIT@\Rect\\ \Enter\\ -!A=?!\Rect\\ +@A=?@\Rect\\ 0.05\Enter\\ -!T=?!\Rect\\ +@T=?@\Rect\\ 2\Enter\\ -!1.959963986! +@1.959963986@ \end{document} diff --git a/Master/texmf-dist/tex/latex/ltxmisc/underscore.sty b/Master/texmf-dist/tex/latex/ltxmisc/underscore.sty index a274b39e521..f0cfb895d19 100644 --- a/Master/texmf-dist/tex/latex/ltxmisc/underscore.sty +++ b/Master/texmf-dist/tex/latex/ltxmisc/underscore.sty @@ -1,13 +1,14 @@ -% underscore.sty 12-Oct-2001 Donald Arseneau asnd@triumf.ca +% underscore.sty 21-Sep-2005 Donald Arseneau asnd@triumf.ca % Make the "_" character print as "\textunderscore" in text. -% Copyright 1998,2001 Donald Arseneau; Distribute freely if unchanged. +% Copyright 1998,2001,2005,2006 Donald Arseneau; +% License: LPPL version 1.2 or later. % Instructions follow after the definitions. -\ProvidesPackage{underscore}[2001/10/12] +\ProvidesPackage{underscore}[2006/09/13] \begingroup \catcode`\_=\active - \gdef_{% \relax % No relax gives a small vulnerability in alignments + \gdef _{% \relax % No relax gives a small vulnerability in alignments \ifx\if@safe@actives\iftrue % must be outermost test! \string_% \else @@ -18,13 +19,20 @@ \else \protect_% \fi\fi \fi} + \global\let\ActiveUnderscore=_ + \gdef\normalUnderscoreDef{\let_\ActiveUnderscore} \endgroup % At begin: set catcode; fix \long \ttdefault so I can use it in comparisons; +% reapply definition of active _ in output routine (\@firstofone to strip +% away braces, so avoiding deeper nesting). \AtBeginDocument{% {\immediate\write\@auxout{\catcode\number\string`\_ \string\active}}% \catcode\string`\_\string=\active \edef\ttdefault{\ttdefault}% + \output=\expandafter\expandafter\expandafter + {\expandafter\expandafter\expandafter\normalUnderscoreDef + \expandafter\@firstofone\the\output}% } \newcommand{\BreakableUnderscore}{\leavevmode\nobreak\hskip\z@skip @@ -34,6 +42,7 @@ \DeclareRobustCommand{\_}{% \ifmmode \nfss@text{\textunderscore}\else \BreakableUnderscore \fi} + \let\usc@dischyph\@dischyph \DeclareOption{nohyphen}{\def\usc@dischyph{\discretionary{}{}{}}} \DeclareOption{strings}{\catcode`\_=\active} @@ -50,6 +59,7 @@ \do\@input \do\@iinput \do\InputIfFileExists \do\ref \do\pageref \do\newlabel \do\bibitem \do\@bibitem \do\cite \do\nocite \do\bibcite + \do\Ginclude@graphics \do\@setckpt } % Macro to redefine a macro to pre-process its string argument @@ -91,23 +101,24 @@ \endinput -underscore.sty 12-Oct-2001 Donald Arseneau +underscore.sty 13-Sep-2006 Donald Arseneau Features: ~~~~~~~~~ -\_ prints an underscore so that the hyphenation of constituent words -is not affected and hyphenation is permitted after the underscore. -For example, "compound\_fracture" hyphenates as com- pound_- frac- ture. +The "\_" command (which normally prints an underscore character or +facsimile) is altered so that the hyphenation of constituent words +is not affected, and hyphenation is permitted after the underscore. +For example, "compound\_fracture" hyphenates as com- pound\_- frac- ture. If you prefer the underscore to break without a hyphen (but still with the same rules for explicit hyphen-breaks) then use the [nohyphen] package option. -A simple _ acts just like \_ in text mode, but makes a subscript in -math mode: activation_energy $E_a$ +A simple "_" acts just like "\_" in text mode, but makes a subscript +in math mode: activation_energy $E_a$ Both forms use an underscore character if the font encoding contains one (e.g., "\usepackage[T1]{fontenc}" or typewriter fonts in any encoding), -but they use a rule if the there is no proper character. +but they use a rule if there is no proper character. Deficiencies: ~~~~~~~~~~~~~ @@ -127,22 +138,23 @@ Option: [strings] The default operation is quite simple and needs no customization; but you must avoid using "_" in any place where LaTeX uses an argument as a string of characters for some control function or as a name. These -include the tags for \cite and \ref, file names for \input, \include, -and \includegraphics, environment names, counter names, and placement -parameters (like "[t]"). The problem with these contexts is that they -are `moving arguments' but LaTeX does not `switch on' the \protect -mechanism for them. +include the tags for "\cite" and "\ref", file names for "\input", +"\include", and "\includegraphics", environment names, counter names, +and placement parameters (like "[t]"). The problem with these contexts +is that they are `moving arguments' but LaTeX does not `switch on' the +"\protect" mechanism for them. If you need to use the underscore character in these places, the package -option [strings] is provided to redefine commands taking a string argument -so that the argument is protected (with \protect -> \string). The list -of commands is given in "\UnderscoreCommands", with "\do" before each, -covering \cite, \ref, \input, and their variants. Not included are many -commands regarding font names, everything with counter names, environment -names, page styles, and versions of \ref and \cite defined by external -packages (e.g. \vref and \citeyear). - -You can add to the list of supported commands by defining \UnderscoreCommands +option [strings] is provided to redefine commands that take such a string +argument so that protection is applied (with "\protect" being "\string"). +The list of commands is given in "\UnderscoreCommands", with "\do" before +each; plus several others covering "\input", "\includegraphics, "\cite", +"\ref", and their variants. Not included are many commands regarding font +names, everything with counter names, environment names, page styles, and +versions of "\ref" and "\cite" defined by external packages (e.g., "\vref" +and "\citeyear"). + +You can add to the list of supported commands by defining "\UnderscoreCommands" before loading this package; e.g. \usepackage{chicago} @@ -155,19 +167,17 @@ before loading this package; e.g. Not all commands can be supported this way! Only commands that take a string argument *first* can be protected. One optional argument before -the string argument is also permitted, as exemplified by \cite: both -\cite{tags} and \cite[text]{tags} are allowed. A command like -\@addtoreset which takes two counter names as arguments could not -be protected by adding it to \UnderscoreCommands. +the string argument is also permitted, as exemplified by "\cite": both +"\cite{tags}" and "\cite[text]{tags}" are allowed. A command like +"\@addtoreset" which takes two counter names as arguments could not +be protected by listing it in "\UnderscoreCommands". -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! When you use the [strings] option, you must load this package !! -!! last (or nearly last). !! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +*When you use the [strings] option, you must load this package +last* (or nearly last). There are two reasons: 1) The redefinitions done for protection must come after other packages define their customized versions of those commands. -2) The [strings] option requires the _ character to be activated immediately +2) The [strings] option requires the "_" character to be activated immediately in order for the cite and ref tags to be read properly from the .aux file as plain strings, and this catcode setting might disrupt other packages. @@ -176,56 +186,62 @@ and will be a complete fix for most documents without the [strings] option. Many add-on packages are compatible with babel, so they will get the strings protection also. However, there are several commands that are not covered by babel, but can easily be supported by the [strings] and -\UnderscoreCommands mechanism. Beware that using both [strings] and babel -may lead to conflicts, but does appear to work (load babel last). +"\UnderscoreCommands" mechanism. Beware that using both [strings] and +babel might lead to conflicts, but none are seen yet (load babel last). Implementation Notes: ~~~~~~~~~~~~~~~~~~~~~ The first setting of "_" to be an active character is performed in a local group so as to not interfere with other packages. The catcode setting -is repeated with \AtBeginDocument so the definition is in effect for the +is repeated with "\AtBeginDocument" so the definition is in effect for the text. However, the catcode setting is repeated immediately when the [strings] option is detected. The definition of the active "_" is essentially: + \ifmmode \sb \else \BreakableUnderscore \fi + where "\sb" retains the normal subscript meaning of "_" and where "\BreakableUnderscore" is essentially "\_". The rest of the definition -handles the "\protect"ion without causing \relax to be inserted before +handles the "\protect"ion without causing "\relax" to be inserted before the character. -\BreakableUnderscore uses "\nobreak\hskip\z@skip" to separate the +"\BreakableUnderscore" uses "\nobreak\hskip\z@skip" to separate the underscore from surrounding words, thus allowing TeX to hyphenate them, but preventing free breaks around the underscore. Next, it checks the current font family, and uses the underscore character from tt fonts or -otherwise \textunderscore (which is a character or rule depending on +otherwise "\textunderscore" (which is a character or rule depending on the font encoding). After the underscore, it inserts a discretionary hyphenation point as "\usc@dischyph", which is usually just "\-" except that it still works in the tabbing environment, although it will give "\discretionary{}{}{}" under the [nohyphen] option. After that, another piece of non-breaking interword glue is inserted. Ordinarily, the comparison "\ifx\f@family\ttdefault" will always fail -because \ttdefault is `long' where \f@family is not (boooo hisss), but -\ttdefault is redefined to be non-long by "\AtBeginDocument". +because "\ttdefault" is `long' whereas "\f@family" is not (boooo hisss), +but "\ttdefault" is redefined to be non-long by "\AtBeginDocument". The "\_" command is then defined to use "\BreakableUnderscore". If the [strings] option is not given, then that is all! Under the [strings] option, the list of special commands is processed to: -- retain the original command as \US_command (\US_ref) -- redefine the command as \US@prot\US_command for ordinary commands - (\ref -> \US@prot\US_ref) or as \US@protopt\US_command when an optional - argument is possible (\bibitem -> \US@protopt\US_bibitem). -- self-protecting commands (\cite) retain their self-protection. + + - retain the original command as "\US_"*command* (e.g., "\US_ref") + - redefine the command as "\US@prot\US_command" for ordinary commands + ("\US@prot\US_ref") or as "\US@protopt\US_command" when an optional + argument is possible (e.g., "\US@protopt\US_bibitem"). + - self-protecting commands ("\cite") retain their self-protection. + Diagnosing the state of the pre-existing command is done by painful -contortions involving \meaning. +contortions involving "\meaning". -\US@prot and \US@protopt read the argument, process it with \protect -enabled, then invoke the saved \US_command. +"\US@prot" and "\US@protopt" read the argument, process it with +"\protect" enabled, then invoke the saved "\US_command". Modifications: ~~~~~~~~~~~~~~ +13-Sep-2006 Reassert my definition in the output routine (listings). +21-Sep-2005 \includegraphics safe. 12-Oct-2001 Babel (safe@actives) compatibility and [nohyphen] option. Test file integrity: ASCII 32-57, 58-126: !"#$%&'()*+,-./0123456789 diff --git a/Master/texmf-dist/tex/latex/makeplot/makeplot.sty b/Master/texmf-dist/tex/latex/makeplot/makeplot.sty index bc67dc5f99a..a9b45792196 100644 --- a/Master/texmf-dist/tex/latex/makeplot/makeplot.sty +++ b/Master/texmf-dist/tex/latex/makeplot/makeplot.sty @@ -40,8 +40,8 @@ %% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{makeplot}[2005/09/22 % - v1.0 % +\ProvidesPackage{makeplot}[2005/12/20 % + v1.0.5 % Plots utility from Jose-Emilio Vila-Forcen]% \RequirePackage[nomessages]{fp}% \RequirePackage{pst-plot}% @@ -52,14 +52,21 @@ \DeclareOption{color}{% \MP@colortrue% \typeout{ ------}% - \typeout{ ------ startPlot package working in color}% + \typeout{ ------ makePlot package working in color}% \typeout{ ------}}% \newif\ifMP@drawmargins% \MP@drawmarginsfalse% \DeclareOption{drawmargins}{% \MP@drawmarginstrue% \typeout{ ------}% - \typeout{ ------ startPlot package drawing the margins}% + \typeout{ ------ makePlot package drawing the margins}% + \typeout{ ------}}% +\newif\ifMP@big% +\MP@bigfalse% +\DeclareOption{big}{% +\MP@bigtrue + \typeout{ ------}% + \typeout{ ------ makePlot package in big size}% \typeout{ ------}}% \DeclareOption*{% \PackageWarning{startPlot}{% @@ -150,12 +157,16 @@ \define@key[psset]{makeplot}{orgY}% {\def\orgYmakeplot{#1}} % \pst@addfams{makeplot}% -\psset{linewidth=0.5pt, Dx=1, Dy=1,% +\psset{Dx=1, Dy=1,% width=50, heightFactor=1, startX=0, endX=1, startY=0, endY=1,% showorigin=true, axesstyle=frame, ticks=all, labels=all, % factorBoundaryX=1, factorBoundaryY=1, captionY=100, captionX=100, % -xsubticks=0, subticksize=1, tickwidth=0.2pt, subtickwidth=0.2pt, % -subtickcolor=black}% +xsubticks=0, subticksize=1, subtickcolor=black}% +\ifMP@big% + \psset{tickwidth=0.5pt, subtickwidth=0.5pt, linewidth=1pt}% +\else% + \psset{tickwidth=0.2pt, subtickwidth=0.2pt, linewidth=0.5pt}% +\fi% \psset{tickyplot=all}% \psset{changeEndXsize=0, changeEndXpos=no}% \ifMP@drawmargins% @@ -274,41 +285,50 @@ subtickcolor=black}% \ifnum \ticky=0% \psaxes[Ox=\xa,Oy=\ya,Dx=\gridDx,Dy=\gridDy, #1,% ticksize=-4pt 4pt, subticks=0, subticksize=0,% - tickwidth=0.5pt, linewidth=0pt, labels=none,% - axesstyle=axes, linecolor=white, #1, ticks=all]% + tickwidth=0.5pt, linewidth=0pt,% + axesstyle=axes, linecolor=white, #1, ticks=all, labels=none]% {-}(\xa,\ya)(\xa,\ya)(\xz,\yz)% \fi% \ifnum \ticky=1% \psaxes[Ox=\xa,Oy=\ya,Dx=\gridDx,Dy=\gridDy, #1,% ticksize=-4pt 4pt, subticks=0, subticksize=0,% - tickwidth=0.5pt, linewidth=0pt, labels=none,% - axesstyle=axes, linecolor=white, #1, ticks=x]% + tickwidth=0.5pt, linewidth=0pt,% + axesstyle=axes, linecolor=white, #1, ticks=x, labels=none]% {-}(\xa,\ya)(\xa,\ya)(\xz,\yz)% \fi% \ifnum \ticky=2% \psaxes[Ox=\xa,Oy=\ya,Dx=\gridDx,Dy=\gridDy, #1,% ticksize=-4pt 4pt, subticks=0, subticksize=0,% - tickwidth=0.5pt, linewidth=0pt, labels=none,% - axesstyle=axes, linecolor=white, #1, ticks=y]% + tickwidth=0.5pt, linewidth=0pt,% + axesstyle=axes, linecolor=white, #1, ticks=y, labels=none]% {-}(\xa,\ya)(\xa,\ya)(\xz,\yz)% \fi% \ifnum \ticky=3% - \psset{ticks=none}% \fi% % % Put the main axes and the grid - \psaxes[xticksize=0pt \tickHerex mm, yticksize=0pt \tickHerey mm,% + \FPround\tickHerex{\tickHerex}{10}% + \FPround\tickHerey{\tickHerey}{10}% + \psaxes[xticksize=0mm \tickHerex mm, yticksize=0mm \tickHerey mm,% Ox=\xa,Oy=\ya,Dx=\gridDx,Dy=\gridDy, #1]% {-}(\xaOrigin,\yaOrigin)(\xa,\ya)(\xz,\yz)% +\def\MP@xa{\xaOrigin}% +\def\MP@ya{\yaOrigin}% +\def\MP@xz{\xz}% +\def\MP@yz{\yz}% % % Write the legend of the plot \rput(\xaa,\ymid){\rotateleft{\fonttitleY #2}}% \rput(\xmid,\yaa){\fonttitleX #3}% - \psset{linewidth=1pt}% + \ifMP@big% + \psset{linewidth=2pt}% + \else% + \psset{linewidth=1pt}% + \fi% }% \def\plotFile{\@ifnextchar[\@plotFile{\@plotFile[]}}% \def\@plotFile[#1]#2{% - \readdata{\data}{#2}\dataplot[#1]{\data}}% + \readdata[#1]{\data}{#2}\listplot[#1]{\data}}% \def\plotFileA{\@ifnextchar[\@plotFileA{\@plotFileA[]}}% \def\@plotFileA[#1]#2{% \styleoflineA% @@ -463,14 +483,14 @@ subtickcolor=black}% \whiteBG[#1]{\leftX}{\lowY}{\rightX}{\highY}}% \def\legendUL{\@ifnextchar[\@legendUL{\@legendUL[]}}% \def\@legendUL[#1]#2#3{% - \FPmul\xUL\xa{1}% - \FPmul\yUL\yz{1}% + \FPmul\xUL\MP@xa{1}% + \FPmul\yUL\MP@yz{1}% \legendXY[#1](\xUL,\yUL){#2}{#3}}% % \def\legendUR{\@ifnextchar[\@legendUR{\@legendUR[]}}% \def\@legendUR[#1]#2#3{% - \FPmul\xUR\xz{1}% - \FPmul\yUR\yz{1}% + \FPmul\xUR\MP@xz{1}% + \FPmul\yUR\MP@yz{1}% \def\sep{0.5}% \FPdiv\xp\sep\unitX% To separate \sep mm the legend from the axe \FPmul\xp\xp{2}% @@ -484,10 +504,10 @@ subtickcolor=black}% \psset{#1}% \def\sepY{\sepYlegendXY}% \def\sepTx{\sepTxlegendXY}% - \FPmul\xzDL\xz{1}% - \FPmul\xaDL\xa{1}% - \FPmul\yzDL\yz{1}% - \FPmul\yaDL\ya{1}% + \FPmul\xzDL\MP@xz{1}% + \FPmul\xaDL\MP@xa{1}% + \FPmul\yzDL\MP@yz{1}% + \FPmul\yaDL\MP@ya{1}% \FPdiv\sep\sepY{8}% \FPdiv\sep\sepY{8}% \FPdiv\sepYy\sepY{1.33} % @@ -515,10 +535,10 @@ subtickcolor=black}% \psset{#1}% \def\sepY{\sepYlegendXY}% \def\sepTx{\sepTxlegendXY}% - \FPmul\xzDR\xz{1}% - \FPmul\xaDR\xa{1}% - \FPmul\yzDR\yz{1}% - \FPmul\yaDR\ya{1}% + \FPmul\xzDR\MP@xz{1}% + \FPmul\xaDR\MP@xa{1}% + \FPmul\yzDR\MP@yz{1}% + \FPmul\yaDR\MP@ya{1}% \FPdiv\sep\sepY{8}% \FPdiv\sepYy\sepY{1.33} % \FPdiv\x\sep\unitX% To separate \sep mm the legend from the axe diff --git a/Master/texmf-dist/tex/latex/muthesis/muthesis.cls b/Master/texmf-dist/tex/latex/muthesis/muthesis.cls index 7cb09c40d84..4cfbfbc7ed8 100644 --- a/Master/texmf-dist/tex/latex/muthesis/muthesis.cls +++ b/Master/texmf-dist/tex/latex/muthesis/muthesis.cls @@ -1,7 +1,7 @@ %% muthesis Class for LaTeX2e. %% -%% Time-stamp: <2006-07-10 11:01:48 graham> +%% Time-stamp: <2006-07-11 12:47:39 graham> %% %% @@ -26,8 +26,11 @@ %% %% The \school command can be used to define a school other than %% Computer Science, -%% e.g \school{Applied Basket Weaving} +%% e.g \school{School of Applied Basket Weaving} %% but no support is provided for users outside the School of C.Sc. +%% The \faculty command can be used to define a faculty other than +%% EPS, +%% e.g \faculty{Other Stuff} %% %% Note that this makes no attempt to deal with multi-volume thesis - %% if you do one that long you deserve everything you get. @@ -197,6 +200,8 @@ Documentation: \author{author's name} \school{author's school} - School of Computer Science if omitted + \faculty{author's faculty} + - Engineering and Physical Sciences if omitted \principaladviser{the principal advisor's name} (or \principaladvisor, if you prefer advisor spelled with o) \firstreader{the first reader's name} @@ -262,6 +267,7 @@ Documentation: %% \def\dept#1{\gdef\@dept{#1}} \def\school#1{\gdef\@dept{#1}} +\def\faculty#1{\gdef\@faculty{#1}} \def\principaladviser#1{\gdef\@principaladviser{#1}} \def\advis@r{Advisor} % default spelling---we are English! %% Obviously, we could add a \supervisor macro @@ -270,7 +276,9 @@ Documentation: \def\secondreader#1{\gdef\@secondreader{#1}} \def\submitdate#1{\gdef\@submitdate{#1}} \def\copyrightyear#1{\gdef\@copyrightyear{#1}} % \author, \title in report -\def\@title{}\def\@author{}\def\@dept{School of Computer Science} +\def\@title{}\def\@author{} +\def\@dept{School of Computer Science} +\def\@faculty{Engineering and Physical Sciences} \def\@principaladviser{}\def\@firstreader{}\def\@secondreader{} %\def\@submitdate{\ifcase\the\month\or % January\or February\or March\or April\or May\or June\or @@ -299,7 +307,7 @@ Documentation: \begin{center} \textsc{A thesis submitted to the University of Manchester\\ for the degree of \degreetitle\\ - in the Faculty of Engineering and Physical Sciences} + in the Faculty of \@faculty} \end{center} \vfill \begin{center} diff --git a/Master/texmf-dist/tex/latex/ncclatex/cp1251-light.def b/Master/texmf-dist/tex/latex/ncclatex/cp1251-light.def index e02b64a5398..8fb2c361dc2 100644 --- a/Master/texmf-dist/tex/latex/ncclatex/cp1251-light.def +++ b/Master/texmf-dist/tex/latex/ncclatex/cp1251-light.def @@ -1,9 +1,10 @@ \ProvidesFile{cp1251-light.def} - [2005/01/08 v1.1 Light input encoding file] + [2005/12/24 v1.2 Light input encoding file] % % \changes{v1.0}{2004/09/23}{This version was uploaded to CTAN} % \changes{v1.1}{2005/01/09}{Replace \textrm{\normalfont...} to \textnormal} % \changes{v1.1}{2005/01/09}{More comprehensive test of font encoding} +% \changes{v1.2}{2005/12/24}{Test the \cyrillicencoding to be \undefined} % % Using of cyrillic input encodings has two major disadvantages: % @@ -26,9 +27,11 @@ % Test the font encoding to have a valid type % \makeatletter -\@ifundefined{cyrillicencoding}% - {\let\@tempa\encodingdefault}% - {\let\@tempa\cyrillicencoding} +\ifx\cyrillicencoding\undefined + \let\@tempa\encodingdefault% +\else + \let\@tempa\cyrillicencoding +\fi \expandafter\in@\expandafter{\@tempa}{T2A,T2B,T2C,X2} \ifin@ \else \PackageWarning{inputenc}% diff --git a/Master/texmf-dist/tex/latex/ncclatex/ncc.cls b/Master/texmf-dist/tex/latex/ncclatex/ncc.cls index 3548b61f54e..ffc2a048e20 100644 --- a/Master/texmf-dist/tex/latex/ncclatex/ncc.cls +++ b/Master/texmf-dist/tex/latex/ncclatex/ncc.cls @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{ncc} - [2005/07/02 v1.08 NCC-LaTeX document class (NCC)] + [2006/01/17 v1.10 NCC-LaTeX document class (NCC)] % % \changes{v1.01}{2002/03/24}{This version is uploaded to CTAN} % \changes{v1.02}{2002/04/03}{Bug in loading book class fixed} @@ -18,25 +18,20 @@ % \changes{v1.07}{2005/05/20}{Move \StartFromHeaderArea to the nccsect package} % \changes{v1.08}{2005/06/18}{Add titlepage*, \ExpandTextArea, \RestoreTextArea} % \changes{v1.08}{2005/07/02}{Improve \ExpandTextArea command} +% \changes{v1.09}{2005/12/24}{Move biblist to a separate package} +% \changes{v1.09}{2005/12/24}{Unify toc-headers using topsection package} +% \changes{v1.09}{2005/12/26}{Move titlepage and text area controls to separate packages} +% \changes{v1.09}{2005/12/26}{Loading ncctitle package instead of ncctitle.clo} +% \changes{v1.09}{2005/12/28}{Code revision and minor changes} +% \changes{v1.09}{2005/12/28}{More minor changes} +% \changes{v1.09}{2006/01/05}{The \SetTOCStyle was removed from here} +% \changes{v1.10}{2006/01/17}{addtopackage -> afterpackage} % -\newcommand*\partmark[1]{} \newcommand\@ptsize{} \newif\if@restonecol -\newdimen\bibindent -\setlength\bibindent{1.5em} -\let\@openbib@code\@empty -% -% \openrightorany clears page or double page depending on openright -% mode selected. -% \newif\if@openright -\newcommand{\openrightorany}{\clearpage\relax - \if@openright \if@twoside - \begingroup\let\leftmark\relax \cleardoublepage\endgroup - \fi\fi -} % -% What goes first in title: author or title +% What goes first in title: author or title? % \newif\ifNCC@authorbeforetitle \newcommand{\AuthorBeforeTitle}{\NCC@authorbeforetitletrue} @@ -44,12 +39,6 @@ \@onlypreamble\AuthorBeforeTitle \@onlypreamble\TitleBeforeAuthor % -% \SetTOCStyle{STYLE} sets a TOC style -% -\newcommand*{\SetTOCStyle}[1]{\def\NCC@tocstyle{#1}} -\SetTOCStyle{} -\@onlypreamble\SetTOCStyle -% % Paper size options % \DeclareOption{a4paper} @@ -107,19 +96,12 @@ \itemindent -\bibindent \listparindent \itemindent \parsep \z@ - }% - \renewcommand\newblock{\par}}% + } + \renewcommand\newblock{\par} + }% } % -% Display math options are defined in nccmath. We need not define them here, -% because they ar passed to nccmath as global options. -% -%\DeclareOption{fleqn}{\PassOptionsToPackage{\CurrentOption}{nccmath}} -%\DeclareOption{leqno}{\PassOptionsToPackage{\CurrentOption}{nccmath}} -% -% Small headings in sections option is also not necessary here. -% -%\DeclareOption{small}{\PassOptionsToPackage{\CurrentOption}{ncclatex}} +% \setyear{year} command defines \theyear % \newcommand*{\setyear}[1]{\gdef\theyear{#1}} \newcommand\theyear{\number\year} @@ -154,10 +136,15 @@ \def\NCC@clsload{% \AuthorBeforeTitle \input{nccart.clo}% - \let\maketitle\relax % Remove these commands to allow creating - \let\abstract\relax % them with \newcommand. - \let\endabstract\relax % - \input{ncctitle.clo}% + \RequirePackage{ncctitle}% + \RequirePackage{afterpackage} + \newcommand\preprintname{Preprint} + \AfterPackage{babel}{% + \addto\captionsrussian{% + \def\preprintname{% + {\cyr\CYRP\cyrr\cyre\cyrp\cyrr\cyri\cyrn\cyrt}}% + } + } \newcommand*{\preprint}[1]{% \def\thepreprint{##1}% \ifx\thepreprint\@empty @@ -176,8 +163,8 @@ \DeclareOption{book}{% \def\NCC@clsload{% \AuthorBeforeTitle - \input{nccbook.clo} - \input{ncctitle.clo}% + \input{nccbook.clo}% + \RequirePackage{ncctitle}% \let\bookeditor\titlecomment \pagestyle{headings}% \countstyle{chapter}% @@ -187,10 +174,6 @@ } % was loaded \DeclareOption{report}{\ExecuteOptions{book,oneside}} % -% The russian option is also removed because it is passed as global one. -% -%\DeclareOption{russian}{\PassOptionsToPackage{\CurrentOption}{ncclatex}} -% % We set tbtags as the default tags positioning in split environment % \def\NCC@temp{\PassOptionsToPackage{tbtags}{nccmath}} @@ -337,7 +320,7 @@ \newenvironment{table}{\@float{table}}{\end@float} \newenvironment{table*}{\@dblfloat{table}}{\end@dblfloat} % -% Names of english captions +% Names of standard english captions % \newcommand\prefacename{Preface} \newcommand\contentsname{Contents} @@ -353,7 +336,6 @@ \newcommand\chaptername{Chapter} \newcommand\appendixname{Appendix} \newcommand\abstractname{Abstract} -\newcommand\preprintname{Preprint} % % English version of \today % @@ -369,10 +351,21 @@ % % Load remaining packages % -\RequirePackage{watermark} \RequirePackage{ncclatex} +\RequirePackage{topsection} +\RequirePackage{watermark} +\RequirePackage{ncctitlepage} +\RequirePackage{nccheadings} \RequirePackage{nccold} -\ifNCC@rus \frenchspacing \fi % French spacing in russian typesetting +% +% Define the bibliography +% +\newdimen\bibindent +\setlength\bibindent{1.5em} +\let\@openbib@code\@empty +\newcommand\newblock{\hskip .11em\@plus .33em\@minus .07em} +\RequirePackage{nccbiblist} +\def\NCC@biblisthook{\itemsep\parsep} % % noeqbreak supresses page breaks before display equations % alloweqbreak[number] allows page breaks before display equations @@ -411,143 +404,7 @@ \list{}{\rightmargin\leftmargin}\item\relax }{\endlist} % -% The titlepage environment. Sets the empty page style at the top-level -% title page. We suppose that a title page can contain many pages and many -% title pages inside. The page counter is restored to its -% original value after leaving a top-level title page. -% -\newif\ifNCC@intitle \NCC@intitlefalse -\newenvironment{titlepage}{% - \clearpage - \if@twocolumn \@restonecoltrue \onecolumn \else \@restonecolfalse \fi - \ifNCC@intitle - \let\NCC@restorepagecount\@empty - \else - \pagestyle{empty} - \edef\NCC@restorepagecount{% - \noexpand\global\noexpand\c@page \@arabic\c@page\relax}% - \setcounter{page}\z@ - \c@footnote\z@ \def\thefootnote{\@fnsymbol\c@footnote}% - \NCC@intitletrue - \fi - \let\NCC@restoretextarea\@empty -}{% - \clearpage - \NCC@restoretextarea - \if@restonecol\twocolumn \fi - \NCC@restorepagecount -} -% -% The star-form of the titlepage environment works as an inner one, -% i.e. it does not change the page counter. -\newenvironment{titlepage*}{\NCC@intitletrue - \clearpage\pagestyle{empty}\titlepage -}{\endtitlepage} -% -% A text area can be expanded on the header, footer, and margins if -% the \ExpandTextArea[hfm] command is used at the beginning of a page -% in one-column mode. -% The letters in optional argument mean the following: h (header), -% f (footer), and m (margins). If an optional argument is omitted, or equal to -% [*] the temporary expansion to the header is applied with the -% \StartFromHeaderArea command. -\newcommand*\RestoreTextArea{} -\newcommand*\ExpandTextArea[1][*]{% - \if@twocolumn - \ClassError{ncc}{The \string\ExpandTextArea\space command\MessageBreak - cannot work in two-column mode}{}% - \else - \def\@tempa{*}\edef\@tempb{#1}% - \ifx\@tempa\@tempb - \StartFromHeaderArea - \else - \ifx\RestoreTextArea\@empty - \let\NCC@h\@empty \global\let\NCC@restore@h\@empty - \let\NCC@f\@empty \global\let\NCC@restore@f\@empty - \let\NCC@m\@empty \global\let\NCC@restore@m\@empty - \expandafter\@tfor\expandafter\@tempa\expandafter:\expandafter=#1\do{% - \if h\@tempa - \def\NCC@h{\NCC@adjusttoheader{}}% - \gdef\NCC@restore@h{\NCC@adjusttoheader-}% - \else - \if f\@tempa - \def\NCC@f{\NCC@adjusttofooter{}}% - \gdef\NCC@restore@f{\NCC@adjusttofooter-}% - \else - \if m\@tempa - \if@reversemargin \@tempcnta\@ne \else \@tempcnta\tw@ \fi - \edef\NCC@m{\noexpand\NCC@adjusttomargin{}{\the\@tempcnta}}% - \xdef\NCC@restore@m{\noexpand\NCC@adjusttomargin-{\the\@tempcnta}}% - \fi - \fi - \fi - }% - \NCC@h\NCC@f\NCC@m - \StartFromTextArea - \gdef\RestoreTextArea{% - \NCC@restore@h\NCC@restore@f\NCC@restore@m - \global\let\RestoreTextArea\@empty - }% - \def\NCC@restoretextarea{\RestoreTextArea}% - \fi - \fi - \fi -} -\def\NCC@adjusttoheader#1{% - \@tempdima #1\headheight - \advance\@tempdima #1\headsep - \global\advance\textheight\@tempdima - \global\advance\topmargin-\@tempdima - \global\@colht\textheight - \global\@colroom\textheight - \global\vsize\textheight -} -\def\NCC@adjusttofooter#1{% - \global\advance\textheight#1\footskip - \global\@colht\textheight - \global\@colroom\textheight - \global\vsize\textheight -} -\def\NCC@adjusttomargin#1#2{% - \@tempdima #1\marginparwidth - \advance\@tempdima #1\marginparsep - \@tempcnta#2% - \ifodd\@tempcnta - \global\advance\oddsidemargin -\@tempdima - \else - \global\advance\evensidemargin -\@tempdima - \fi - \global\advance\textwidth\@tempdima - \global\columnwidth\textwidth - \global\linewidth\textwidth - \global\hsize\textwidth -} -% -% Bibliography without header. It is possible to set starting number -% for bibliography counter. -% -% \begin{biblist}[start number]{prototype} ... \end{biblist} -% -\newcommand{\bibliststyle}{\small} -\newenvironment*{biblist}[2][0]{ - \bibliststyle - \list{\@biblabel{\@arabic\c@enumiv}}{% - \settowidth\labelwidth{\@biblabel{#2}}% - \leftmargin\labelwidth \advance\leftmargin\labelsep \itemsep\parsep - \@openbib@code - \usecounter{enumiv}\let\p@enumiv\@empty - \renewcommand\theenumiv{\@arabic\c@enumiv}% - }% - \setcounter{enumiv}{#1}% - \sloppy \widowpenalty 4000 - \clubpenalty 4000 \@clubpenalty \clubpenalty - \sfcode`\.\@m -}{\def\@noitemerr{\@latex@warning{Empty `biblist' environment}}% - \endlist -} -\newcommand{\newblock}{\hskip .11em\@plus .33em\@minus .07em} -% -% Footnote make commands. +% Footnote making commands % \renewcommand{\footnoterule}{% \kern-3\p@ \hrule\@width .4\columnwidth \kern2.6\p@ @@ -558,28 +415,20 @@ % % \tableofcontents, \listoffigures, \listoftables % -% They use the \NCC@tochead{header} command defined later in subclasses -% \newcommand{\tableofcontents}{\NCC@toc\contentsname{toc}} \newcommand{\listoffigures}{\NCC@toc\listfigurename{lof}} \newcommand{\listoftables}{\NCC@toc\listtablename{lot}} -\def\NCC@toc#1#2{% - \NCC@tochead{#1}% - \begingroup - \normalfont \NCC@tocstyle\NCC@setpnum - \@starttoc{#2}% - \endgroup -} +\def\NCC@toc#1{\skipwritingtoaux\topsection{#1}\@starttoc} % -% theindex and theglossary. They are based on \NCC@idxhead{header} -% defined later in subclasses +% theindex and theglossary % \newenvironment{theindex}{\NCC@index\indexname}{\endNCC@index} \newenvironment{theglossary}{\NCC@index\glossaryname}{\endNCC@index} \newenvironment*{NCC@index}[1]{% \if@twocolumn \@restonecolfalse \else \@restonecoltrue \fi \columnseprule \z@ \columnsep 35\p@ - \NCC@idxhead{#1}% + \@iftopchapter{\twocolumn \topsection{#1}}% + {\twocolumn[\topsection{#1}]\thispageheading{}}% \parindent\z@ \parskip\z@ \@plus .3\p@ \let\item\@idxitem \small }{\if@restonecol\onecolumn \else \clearpage\fi} @@ -588,28 +437,11 @@ \newcommand\subsubitem{\@idxitem \hspace*{4em}} \newcommand\indexspace{\par \addvspace{4ex \@plus 1ex \@minus .5ex}} % -% NCC page style with headings -% -\def\NCC@setpsheading{% - \let\@oddfoot\@empty\let\@evenfoot\@empty - \def\@evenhead{% - \thepage\hfil - {\small\itshape\ignorespaces\leftmark\unskip}\hfil - }% - \def\@oddhead{% - \hfil{\small\itshape\ignorespaces\rightmark\unskip}\hfil - \thepage - }% - \reset@font -} -\def\NCC@firstmark#1{\markboth{#1}{#1}} -\def\NCC@secondmark#1{\markright{#1}} -% % Final actions % \pagenumbering{arabic} \NCC@clsload % load specified subclass -\@onlypreamble\NCC@clsload +\let\NCC@clsload\relax \if@twocolumn \twocolumn \sloppy \flushbottom \else diff --git a/Master/texmf-dist/tex/latex/ncclatex/nccart.clo b/Master/texmf-dist/tex/latex/ncclatex/nccart.clo index 37c29edabac..95abb246ed7 100644 --- a/Master/texmf-dist/tex/latex/ncclatex/nccart.clo +++ b/Master/texmf-dist/tex/latex/ncclatex/nccart.clo @@ -1,5 +1,5 @@ \ProvidesFile{nccart.clo} - [2005/03/23 v1.05 Article subclass (NCC)] + [2005/12/27 v1.06 Article subclass (NCC)] % % \changes{v1.01}{2002/02/19}{This version is uploaded to CTAN} % \changes{v1.02}{2002/05/17}{Bug in abstract fixed. Extra space removed.} @@ -7,33 +7,12 @@ % \changes{v1.04}{2004/12/06}{Replace \NCC@null with \StartFromTextArea} % \changes{v1.04}{2004/12/16}{Replace \NCC@gempty with \@empty} % \changes{v1.05}{2005/03/23}{Remove \skipwritingtoaux in index head} +% \changes{v1.06}{2005/12/24}{Definition of |thebibliography| removed} +% \changes{v1.06}{2005/12/24}{Remove \NCC@tochead, \NCC@idxhead macros} +% \changes{v1.06}{2005/12/27}{Remove headings support} % \setcounter{tocdepth}{3} \setcounter{secnumdepth}{3} -\def\NCC@tochead#1{\noheadingtag\skipwritingtoaux\section{#1}} -\def\NCC@idxhead#1{% - \twocolumn[\noheadingtag\section{#1}]% - \thispageheading{}% -} -% -% \ps@headings, \ps@myheadings -% -\def\ps@headings{\NCC@setpsheading - \def\partmark##1{% - \NCC@firstmark{\ifnum \c@secnumdepth>\m@ne\thepart.\enskip \fi - \ignorespaces##1}}% - \def\sectionmark##1{% - \NCC@firstmark{\ifnum \c@secnumdepth>\z@\thesection.\enskip \fi - \ignorespaces##1}}% - \def\subsectionmark##1{% - \NCC@secondmark{\ifnum\c@secnumdepth>\@ne\thesubsection.\enskip\fi - \ignorespaces##1}}% -} -\def\ps@myheadings{\NCC@setpsheading - \let\partmark \@gobble - \let\sectionmark \@gobble - \let\subsectionmark\@gobble -} % % \maketitle % @@ -79,10 +58,4 @@ \setcounter{section}{-1}\stepcounter{section}% \gdef\thesection{\@Alph\c@section}% } -% -% thebibliography -% -\newenvironment{thebibliography}{% - \noheadingtag \section{\refname}\biblist[0]% -}{\endbiblist} \endinput diff --git a/Master/texmf-dist/tex/latex/ncclatex/nccbiblist.sty b/Master/texmf-dist/tex/latex/ncclatex/nccbiblist.sty new file mode 100644 index 00000000000..758293992a7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ncclatex/nccbiblist.sty @@ -0,0 +1,50 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{nccbiblist} + [2005/12/24 v1.00 Bibliography list (NCC)] +% +% \changes{v1.00}{2005/12/24}{This version is uploaded to CTAN} +% +\RequirePackage{topsection} +% +% Bibliography without header. It is possible to set starting number +% for the bibliography counter. If starting number is less that zero, +% the numbering will be continued from the previous biblist. +% +% \begin{biblist}[starting number]{prototype} ... \end{biblist} +% +% The biblist style is specified in the \bibliststyle macro. +% It is equal to \small by default. +% +\newcommand{\bibliststyle}{\small} +\providecommand*\@openbib@code{} +\def\NCC@bibliststart{0} +\def\NCC@biblisthook{} +\newenvironment*{biblist}[2][0]{ + \bibliststyle + \list{\@biblabel{\@arabic\c@enumiv}}{% + \settowidth\labelwidth{\@biblabel{#2}}% + \leftmargin\labelwidth \advance\leftmargin\labelsep + \@openbib@code + \usecounter{enumiv}\let\p@enumiv\@empty + \renewcommand\theenumiv{\@arabic\c@enumiv}% + \NCC@biblisthook + }% + \setcounter{enumiv}{#1}% + \ifnum \c@enumiv <\z@ \setcounter{enumiv}{\NCC@bibliststart}\fi + \sloppy \widowpenalty 4000 + \clubpenalty 4000 \@clubpenalty \clubpenalty + \sfcode`\.\@m +}{\def\@noitemerr{\@latex@warning{Empty `biblist' environment}}% + \xdef\NCC@bibliststart{\the\c@enumiv} + \endlist +} +% +% We also redefine |thebibliography| environment to be based on the +% biblist environment. +% +\def\thebibliography{% + \@iftopchapter{\topsection{\bibname}}{\topsection{\refname}}% + \biblist[0]% +} +\let\endthebibliography=\endbiblist +\endinput diff --git a/Master/texmf-dist/tex/latex/ncclatex/nccbook.clo b/Master/texmf-dist/tex/latex/ncclatex/nccbook.clo index d3c98ad83fc..dbc04243375 100644 --- a/Master/texmf-dist/tex/latex/ncclatex/nccbook.clo +++ b/Master/texmf-dist/tex/latex/ncclatex/nccbook.clo @@ -1,5 +1,5 @@ \ProvidesFile{nccbook.clo} - [2005/06/19 v1.05 Book subclass (NCC)] + [2005/12/29 v1.06 Book subclass (NCC)] % % \changes{v1.00}{2002/03/24}{This version is uploaded to CTAN} % \changes{v1.01}{2003/01/12}{Bug in \ChapterPrefixStyle{toc} fixed} @@ -10,163 +10,22 @@ % \changes{v1.04}{2005/06/08}{Introduce the \DeclareTOCPart command} % \changes{v1.05}{2005/06/19}{Page break after \l@part is forbidden} % \changes{v1.05}{2005/06/19}{New optional parameter in \DeclareTOCPart} +% \changes{v1.06}{2005/12/24}{Definition of |thebibliography| removed} +% \changes{v1.06}{2005/12/24}{Remove \NCC@tochead, \NCC@idxhead macros} +% \changes{v1.06}{2005/12/27}{Move \ChapterPrefixStyle to nccdefaults} +% \changes{v1.06}{2005/12/27}{Remove headings support} +% \changes{v1.06}{2005/12/29}{Remove part declaration commands} % \@addtoreset{footnote}{chapter} \setcounter{tocdepth}{2} \setcounter{secnumdepth}{2} -\def\NCC@tochead#1{\noheadingtag\skipwritingtoaux\chapter{#1}} -\def\NCC@idxhead#1{% - \twocolumn \noheadingtag\chapter{#1}% -} -% -% \frontmatter, \mainmatter, \backmatter -% -\newif\if@mainmatter \@mainmattertrue -\newcommand\frontmatter{% - \@mainmatterfalse\pagenumbering{roman}% -} -\newcommand\mainmatter{% - {\@openrighttrue\openrightorany}% - \@mainmattertrue - \pagenumbering{arabic}% -} -\newcommand\backmatter{% - \openrightorany \@mainmatterfalse -} -% -% Control of appearance chapter name in header and toc: -% -% \ChapterPrefixStyle{header,toc} -% -% The parameter list can contain two words: header and/or toc. -% Using them you set prefix style for header and/or toc respectively. -% -\newcommand{\@chapapp}{\chaptername} -\newcommand*{\ChapterPrefixStyle}[1]{% - \def\NCC@thetocchapter{\thechapter}% - \def\NCC@theheadchapter{\thechapter}% - \@for\@tempa:=#1\do - {\csname NCC@chapin@\@tempa\endcsname}% -} -\def\NCC@chapin@toc{\def\NCC@thetocchapter{\@chapapp\ \thechapter}} -\def\NCC@chapin@header{\def\NCC@theheadchapter{\@chapapp\ \thechapter}} -\@onlypreamble\ChapterPrefixStyle -\@onlypreamble\NCC@chapin@toc -\@onlypreamble\NCC@chapin@header -\ChapterPrefixStyle{} % no prefix by default -% -% \ps@headings, \ps@myheadings -% -\def\ps@headings{\NCC@setpsheading - \def\partmark##1{% - \NCC@firstmark{\ifnum \c@secnumdepth>-2\relax - \partname\ \thepart.\enskip \fi - \ignorespaces##1}}% - \def\chaptermark##1{% - \NCC@firstmark{\ifnum \c@secnumdepth>\m@ne - \if@mainmatter \NCC@theheadchapter.\enskip \fi \fi - \ignorespaces##1}}% - \def\sectionmark##1{% - \NCC@secondmark{\ifnum\c@secnumdepth>\z@\thesection.\enskip\fi - \ignorespaces##1}}% -} -\def\ps@myheadings{\NCC@setpsheading - \let\partmark \@gobble - \let\chaptermark\@gobble - \let\sectionmark\@gobble -} % % \appendix % +\newcommand\@chapapp{\chaptername} \newcommand{\appendix}{\par \setcounter{chapter}{-1}\stepcounter{chapter}% \gdef\@chapapp{\appendixname}% \gdef\thechapter{\@Alph\c@chapter}% } -% -% thebibliography -% -\newenvironment{thebibliography}{% - \noheadingtag \chapter{\bibname}\biblist[0]% -}{\endbiblist} -% -% Redefine start chapter hook -% -\def\NCC@startchap{% - \openrightorany - \thispageheading{}% - \global\@topnum\z@ -} -% -% \DeclarePart{BEFORE}{AFTER}{PREFIX}{STYLE} -% -\newcommand\DeclarePart[4]{% - \def\part{% - \openrightorany - \thispageheading{}% - \def\NCC@makesectag####1{\leavevmode#3\partname\nobreakspace####1}% - \secdef\@part\@spart - }% - \def\NCC@makepart##1##2{% - \if@twocolumn \onecolumn \@tempswatrue \else \@tempswafalse \fi - \begingroup\normalfont - #1% - \ifx\@svsec\@empty \else {\@svsec\par}\nobreak \fi - \interlinepenalty \@M - #4{##1}\par - \endgroup - ##2#2% - \if@tempswa \twocolumn \fi - } -} -\@onlypreamble\DeclarePart -\def\@spart#1{% - \let\@svsec\@empty - \NCC@makepart{#1}{}% - \NCC@sec@reset@controls - \NCC@defaultsectag -} -\def\@part[#1]#2{% - \def\NCC@make{\NCC@makepart{#2}}% - \NCC@makesection{part}{\m@ne}{#1}{% - \addcontentsline{toc}{part}{% - \ifnum \c@secnumdepth>-2 - \protect\numberline{\partname\ \thepart}\fi - #1% - }% - }% - \NCC@defaultsectag -} -% -% \DeclareTOCPart{ACTION}[AFTERSKIP]{PREFIX}{PROTOTYPE}{STYLE} -% -\newcommand*\DeclareTOCPart[1]{% - \@ifnextchar[{\NCC@dtocpart{#1}}{\NCC@dtocpart{#1}[\NCC@runskip]}% -} -\def\NCC@dtocpart#1[#2]#3#4#5{% - \def\l@part##1##2{% - \NCC@tocentry{-1}{% - \setlength\@tempdimb\@tocrmarg - \edef\@tocrmarg{\the\@tempdimb plus 1fil}% - \addpenalty{-\@highpenalty}#1% - }{#3}{#4}{#5}{##1}{\hss##2}% - \nobreak \vskip #2\relax - \@nobreaktrue - \everypar{\@nobreakfalse\everypar{}}% - }% -} -\@onlypreamble\DeclareTOCPart -\@onlypreamble\NCC@dtocpart -% -% Defaults -% -\ifNCC@small - \DeclarePart{\StartFromTextArea\vspace{\stretch{.5}}\centering} - {\vfill\newpage}{\vspace{1.5em}\Large\bff}{\huge\bff} -\else - \DeclarePart{\StartFromTextArea\vspace{\stretch{.5}}\centering} - {\vfill\newpage}{\vspace{2em}\LARGE\bff}{\Huge\bff} -\fi -\DeclareTOCPart{\NCC@secskip{4ex \@plus .2ex}\def\@dotsep{1000}} - {}{\partname\ II}{\large\bff} \endinput diff --git a/Master/texmf-dist/tex/latex/ncclatex/nccdefaults.sty b/Master/texmf-dist/tex/latex/ncclatex/nccdefaults.sty new file mode 100644 index 00000000000..1ac2ebdb1e2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ncclatex/nccdefaults.sty @@ -0,0 +1,131 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{nccdefaults} + [2006/01/17 v1.03 NCC-LaTeX default settings (NCC)] +% +% \changes{v1.01}{2006/01/05}{This version is uploaded to CTAN} +% \changes{v1.02}{2006/01/06}{Remove \SetTOCStyle and \ChapterPrefixStyle} +% \changes{v1.03}{2006/01/17}{addtopackage -> afterpackage} +% +% The package specifies default settings to be applied to some packages +% from ncctools collection when they will be loaded. All this technique +% is based on the `afterpackage' package from ncctools. +% +\RequirePackage{afterpackage} +% +% Declare the equation counter to be dynamic and specify the default +% count style depending on class in use. +% +\AfterPackage{dcounter}{% + \DeclareDynamicCounter{equation} + \@ifundefined{chapter}{\countstyle{}}{\countstyle{chapter}} +} +% +% The default style of table headers is \scriptsize +% +\AfterPackage{nccboxes}{\renewcommand{\cboxstyle}{\scriptsize}} +% +% Change defaults for the nccsect package +% +\AfterPackage{nccsect}{% +% +% Specify section, toc, and caption syffices and default section style. +% + \SectionTagSuffix{.\hskip .6em} + \CaptionTagSuffix{.\hskip .6em \@plus .2em \@minus .1em} + \NumberlineSuffix{.\hskip .6em}{.\hskip .4em} + \sectionstyle{hangindent*} +% +% \openrightorany clears page or double page depending on openright +% mode selected. +% + \@ifundefined{if@openright}{% + \newcommand\openrightorany{\clearpage}% + }{% + \newcommand\openrightorany{\clearpage + \if@openright \if@twoside + \begingroup\let\leftmark\relax \cleardoublepage\endgroup + \fi\fi + }% + } + \@ifundefined{chapter}{}{% +% +% The following hooks are specified in books and reports only. +% +% Redefine the start-part and start-chapter hooks: +% + \RequirePackage{watermark} + \def\NCC@startpart{\openrightorany\thispageheading{}} + \def\NCC@startchap{\openrightorany\thispageheading{}% + \global\@topnum\z@ + } +% +% Specify the appearance of part and chapter prefices +% + \def\NCC@thetocpart{\partname\ \thepart} + \ChapterPrefixStyle{}% no prefix by default +% +% Provide \frontmatter, \mainmatter, and \backmatter commands +% + \@ifundefined{if@mainmatter}{% + \newif\if@mainmatter \@mainmattertrue + }{} + \providecommand\frontmatter{% + \@mainmatterfalse\pagenumbering{roman}% + } + \providecommand\mainmatter{% + {\@openrighttrue\openrightorany}% + \@mainmattertrue + \pagenumbering{arabic}% + } + \providecommand\backmatter{% + \openrightorany \@mainmatterfalse + } + } +} +% +% Specify default styles for theorems +% +\AfterPackage{nccthm}{% + \renewtheoremtype{remark}{\bfseries}{}{} + \TheoremCommentDelimiters{}{} + \AfterTheoremHeaderChar{.} + \AfterTheoremHeaderSkip{\hskip .7em \@plus .2em \@minus .1em} + \AparStyleParameters{\bfseries\mathversion{bold}}% + {\bfseries\mathversion{bold}}{.\enskip} + \ProofStyleParameters{\bfseries\mathversion{bold}}{\proofname} + \newcommand\proofname{Proof} + \AfterPackage{babel}{% + \addto\captionsrussian{% + \def\proofname{% + {\cyr\CYRD\cyro\cyrk\cyra\cyrz\cyra\cyrt\cyre\cyrl\cyrsftsn% + \cyrs\cyrt\cyrv\cyro}}% + } + } +} +% +% Patch to the russian style of babel +% +\AfterPackage{babel}{% + \ifx\cyrillicencoding\undefined \else +% +% Add a small kern to German left double quote shorthand +% + \declare@shorthand{russian}{"`}{\glqq\nobreak\hskip.0166667em } +% +% Remove last Babel's ``improvements'' to \flqq and \frqq commands. +% The result of these improvements is that russian corner quotes +% are taken from another font encoding than T2 and look very bad. +% + \DeclareRobustCommand{\flqq}{% + \textormath{\guillemotleft}{\mbox{\guillemotleft}}} + \DeclareRobustCommand{\frqq}{% + \textormath{\guillemotright}{\mbox{\guillemotright}}} +% +% Redefine the numero sign to work in any encoding +% + \DeclareRobustCommand{\No}{% + \ifmmode{\nfss@text{\textnumero}}\else{\cyr\textnumero}\fi + } + \fi +} +\endinput diff --git a/Master/texmf-dist/tex/latex/ncclatex/ncchdr.sty b/Master/texmf-dist/tex/latex/ncclatex/ncchdr.sty index f05c47adc2f..49d03ba041a 100644 --- a/Master/texmf-dist/tex/latex/ncclatex/ncchdr.sty +++ b/Master/texmf-dist/tex/latex/ncclatex/ncchdr.sty @@ -1,39 +1,32 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{ncchdr} - [2005/01/12 v1.02 Fancy headers for NCC class (NCC)] + [2005/12/27 v1.04 Fancy headers for NCC class (NCC)] % % \changes{v1.01}{2002/02/14}{This version is uploaded to CTAN} % \changes{v1.02}{2002/04/25}{Bug in left header fixed} % \changes{v1.03}{2005/01/12}{Bug in \PassOptionsToPackage command fixed} +% \changes{v1.04}{2005/12/27}{It is based now on the nccheadings package} % % This package redefines NCC page styles to fancy styles % and defines the fancy `title' page style if the `title' option is used. % This style has three header marks: % \lefttitlemark, \titlemark (in center), and \righttitlemark. % -% If NCC class is not loaded, the package transfers redifinition of -% styles to the nccfancyhdr package in assumption that one of standard -% LaTeX classes is loaded. -% -\@ifundefined{NCC@setpsheading}{% - \def\NCC@temp{\PassOptionsToPackage{\CurrentOption}{nccfancyhdr}}% -}{% - \def\NCC@temp{% - \def\NCC@setpsheading{\ps@fancy - \fancyhead[CO]{% - \fancycenter{}% - {\small\itshape\ignorespaces\rightmark\unskip}% - {\thepage}% - }% - \fancyhead[CE]{% - \fancycenter{\thepage}% - {\small\itshape\ignorespaces\leftmark\unskip}% - {}% - }% +\RequirePackage{nccheadings} +\def\NCC@temp{% + \def\NCC@setpsheading{\ps@fancy + \fancyhead[CO]{% + \fancycenter{}% + {\small\itshape\ignorespaces\rightmark\unskip}% + {\thepage}% + }% + \fancyhead[CE]{% + \fancycenter{\thepage}% + {\small\itshape\ignorespaces\leftmark\unskip}% + {}% }% }% -} -% +}% \DeclareOption{empty}{% \PassOptionsToPackage{\CurrentOption}{nccfancyhdr}% \AtEndOfPackage{\pagestyle{empty}}% diff --git a/Master/texmf-dist/tex/latex/ncclatex/nccheadings.sty b/Master/texmf-dist/tex/latex/ncclatex/nccheadings.sty new file mode 100644 index 00000000000..c97e7deb60c --- /dev/null +++ b/Master/texmf-dist/tex/latex/ncclatex/nccheadings.sty @@ -0,0 +1,74 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{nccheadings} + [2005/12/28 v1.00 Headings in ncc-style (NCC)] +% +% \changes{v1.00}{2005/12/28}{This version is uploaded to CTAN} +% +% NCC page style with headings support +% +\def\NCC@setpsheading{% + \let\@oddfoot\@empty\let\@evenfoot\@empty + \def\@evenhead{% + \thepage\hfil + {\small\itshape\ignorespaces\leftmark\unskip}\hfil + }% + \def\@oddhead{% + \hfil{\small\itshape\ignorespaces\rightmark\unskip}\hfil + \thepage + }% + \reset@font +} +\def\NCC@firstmark#1{\markboth{#1}{#1}} +\def\NCC@secondmark#1{\markright{#1}} +% +% Specify `headings' and `myheadings' page styles +% +\@ifundefined{chapter}{% +% +% Styles for article-like classes +% + \def\ps@headings{\NCC@setpsheading + \def\partmark##1{% + \NCC@firstmark{\ifnum \c@secnumdepth>\m@ne\thepart.\enskip \fi + \ignorespaces##1}}% + \def\sectionmark##1{% + \NCC@firstmark{\ifnum \c@secnumdepth>\z@\thesection.\enskip \fi + \ignorespaces##1}}% + \def\subsectionmark##1{% + \NCC@secondmark{\ifnum\c@secnumdepth>\@ne\thesubsection.\enskip\fi + \ignorespaces##1}}% + } + \def\ps@myheadings{\NCC@setpsheading + \let\partmark \@gobble + \let\sectionmark \@gobble + \let\subsectionmark\@gobble + } + \ps@myheadings +}{% +% +% Styles for book-like classes +% + \@ifundefined{if@mainmatter}{% + \newif\if@mainmatter \@mainmattertrue + } + \def\ps@headings{\NCC@setpsheading + \def\partmark##1{% + \NCC@firstmark{\ifnum \c@secnumdepth>-2\relax + \partname\ \thepart.\enskip \fi + \ignorespaces##1}}% + \def\chaptermark##1{% + \NCC@firstmark{\ifnum \c@secnumdepth>\m@ne + \if@mainmatter \@chapapp\ \thechapter.\enskip \fi \fi + \ignorespaces##1}}% + \def\sectionmark##1{% + \NCC@secondmark{\ifnum\c@secnumdepth>\z@\thesection.\enskip\fi + \ignorespaces##1}}% + } + \def\ps@myheadings{\NCC@setpsheading + \let\partmark \@gobble + \let\chaptermark\@gobble + \let\sectionmark\@gobble + } + \ps@headings +} +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/ncclatex/nccindex.sty b/Master/texmf-dist/tex/latex/ncclatex/nccindex.sty index b0cfa2438b7..551ec196333 100644 --- a/Master/texmf-dist/tex/latex/ncclatex/nccindex.sty +++ b/Master/texmf-dist/tex/latex/ncclatex/nccindex.sty @@ -1,24 +1,25 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nccindex} - [2005/03/24 v1.00 Multicolumn index for NCC class (NCC)] + [2005/12/24 v1.01 Multicolumn index for NCC class (NCC)] % % \changes{v1.00}{2005/03/24}{This version is uploaded to CTAN} +% \changes{v1.01}{2005/12/24}{Do package independent on ncc class} % -% The package redefines index-preparing commands on the base of multicol +% The package redefines index on the base of multicol % package. Some index control commands are specified here. % -\@ifundefined{NCC@index}{% - \PackageError{nccindex}{The package is used with the ncc class only}{}}{} +\RequirePackage{topsection} \RequirePackage{multicol} -\renewenvironment*{NCC@index}[1]{% +\def\NCC@index#1{% \if@twocolumn \onecolumn \fi - \noheadingtag - \@ifundefined{chapter}{\section{#1}}{\chapter{#1}}% + \topsection{#1}% \columnseprule\z@ \columnsep 2em \parindent\z@ \parskip\z@ \@plus .3\p@ \NCC@index@ \NCC@indexstart -}{\end{multicols}} +} +\def\endNCC@index{\end{multicols}} +\renewenvironment{theindex}{\NCC@index\indexname}{\endNCC@index} % % \indexparameters{columns}{indexspace}{margin1}{margin2}{margin3}{style} % diff --git a/Master/texmf-dist/tex/latex/ncclatex/ncclatex.sty b/Master/texmf-dist/tex/latex/ncclatex/ncclatex.sty index 42965e9966a..dc7903bfa55 100644 --- a/Master/texmf-dist/tex/latex/ncclatex/ncclatex.sty +++ b/Master/texmf-dist/tex/latex/ncclatex/ncclatex.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{ncclatex} - [2005/05/20 v1.05 NCC-LaTeX Extension Package (NCC)] + [2006/01/17 v1.07 NCC-LaTeX Extension Package (NCC)] % % \changes{v1.00}{2002/03/16}{This version is uploaded to CTAN} % \changes{v1.01}{2002/05/17}{Package extdash is loaded with cyremdash} @@ -14,19 +14,21 @@ % \changes{v1.05}{2005/03/23}{Add \NCC logo} % \changes{v1.05}{2005/04/25}{Declare equation counter as dynamic one} % \changes{v1.05}{2005/05/20}{Change nccsect package date to 2005/05/20} +% \changes{v1.06}{2005/12/27}{Reorganize the package!!!} +% \changes{v1.06}{2005/12/27}{The `minimize' option is introduced} +% \changes{v1.06}{2005/12/29}{Add defaults for parts in books} +% \changes{v1.06}{2006/01/01}{Minor changes} +% \changes{v1.07}{2006/01/17}{addtopackage -> afterpackage} % -% Define headers for theorem-like environments and acknowledgements. +% Load basic packages % -\newcommand{\theoremname}{Theorem} -\newcommand{\lemmaname}{Lemma} -\newcommand{\propositionname}{Proposition} -\newcommand{\corollaryname}{Corollary} -\newcommand{\definitionname}{Definition} -\newcommand{\statementname}{Statement} -\newcommand{\examplename}{Example} -\newcommand{\remarkname}{Remark} -\newcommand{\proofname}{Proof} -\newcommand{\acknowname}{Acknowledgements} +\RequirePackage{nccdefaults} +\RequirePackage{dcounter}[2005/04/25] +\RequirePackage{desclist} +\RequirePackage[shortcuts,cyremdash]{extdash} +\RequirePackage{nccmath} +\def\maketag@@@#1{\hbox{$\m@th\mathrm{#1}$}} +\RequirePackage{nccsect}[2005/05/20] % % Russian headings (Babel needed) % @@ -36,26 +38,45 @@ \DeclareOption{T2B}{\def\NCC@cyrenc{T2B}} \DeclareOption{T2A}{\def\NCC@cyrenc{T2A}} % -% Smaller headings of sections +% Smaller section titles % \newif\ifNCC@small \NCC@smallfalse \DeclareOption{small}{\NCC@smalltrue} +% +% The `minimize' option does not load the optional packages: +% +\def\NCC@temp{% + \RequirePackage{ncctheorems} + \RequirePackage{nccthm} + \RequirePackage{nccboxes} + \RequirePackage{nccfoots} + \RequirePackage{nccpic} + \RequirePackage{nccfloats} +} +\DeclareOption{minimize}{\let\NCC@temp\relax} +% +% Process options +% \ExecuteOptions{T2A} \ProcessOptions\relax +\NCC@temp \let\NCC@temp\relax % -% Load packages +% \acknow starts acknowledgements +% +\newcommand\acknowname{Acknowledgements} +\AfterPackage{babel}{% + \addto\captionsrussian{% + \def\acknowname{% + {\cyr\CYRB\cyrl\cyra\cyrg\cyro\cyrd\cyra\cyrr\cyrn\cyro\cyrs\cyrt\cyri}}% + } +} +\newcommand{\acknow}{% + \NCC@secskip{\NCC@runskip}\@nobreakfalse + \noindent\normalfont\textit\acknowname.\enskip +} +% +% Language specific actions % -\RequirePackage{dcounter}[2005/04/25] -\RequirePackage{desclist} -\RequirePackage[shortcuts,cyremdash]{extdash} -\RequirePackage{nccboxes} -\RequirePackage{nccfoots} -\RequirePackage{nccmath} -\def\maketag@@@#1{\hbox{$\m@th\mathrm{#1}$}} -\RequirePackage{nccpic} -\RequirePackage{nccthm} -\RequirePackage{nccsect}[2005/05/20] -\RequirePackage{nccfloats} \ifNCC@rus \RequirePackage[\NCC@cyrenc]{fontenc} \RequirePackage[russian]{nccltrus} @@ -68,71 +89,21 @@ \fi \let\NCC@cyrenc\relax % -% Declare the equation counter in the dynamic style. -% -\DeclareDynamicCounter{equation} -% % \cref{label} is cite without square brackets % \newcommand*{\cref}[1]{{\def\@cite##1##2{##1}\cite{#1}}} % -% Prepare theorem-like environments -% -\newtheorem{theorem}{\theoremname} -\newtheorem{lemma}{\lemmaname} -\newtheorem{proposition}{\propositionname} -\newtheorem{corollary}{\corollaryname} -\newtheorem{statement}{\statementname}[remark] -\newtheorem{definition}{\definitionname}[remark] -\newtheorem{example}{\examplename}[remark] -\newtheorem{remark}{\remarkname}[remark] -% -% Prepare APAR theorem-like environments -% -\newtheorem*{atheorem}{\theoremname} -\newtheorem*{alemma}{\lemmaname} -\newtheorem*{aproposition}{\propositionname} -\newtheorem*{acorollary}{\corollaryname} -\newtheorem*{astatement}{\statementname}[remark] -\newtheorem*{adefinition}{\definitionname}[remark] -\newtheorem*{anexample}{\examplename}[remark] -\newtheorem*{aremark}{\remarkname}[remark] -% -% Prepare manual theorem-like environments -% -\newenvironment{Theorem}{\liketheorem{\theoremname}}{\qef} -\newenvironment{Lemma}{\liketheorem{\lemmaname}}{\qef} -\newenvironment{Proposition}{\liketheorem{\propositionname}}{\qef} -\newenvironment{Corollary}{\liketheorem{\corollaryname}}{\qef} -\newenvironment{Statement}{\likeremark{\statementname}}{\qef} -\newenvironment{Definition}{\likeremark{\definitionname}}{\qef} -\newenvironment{Example}{\likeremark{\examplename}}{\qef} -\newenvironment{Remark}{\likeremark{\remarkname}}{\qef} -% -% Change default settings for theorems -% -\renewtheoremtype{remark}{\bfseries}{}{} -\TheoremCommentDelimiters{}{} -\AfterTheoremHeaderChar{.} -\AfterTheoremHeaderSkip{\hskip .7em \@plus .2em \@minus .1em} -\AparStyleParameters{\bff}{\bff}{.\enskip} -\ProofStyleParameters{\bff}{\proofname} -% -% \acknow starts acknowledgements. -% -\newcommand{\acknow}{\likeremark{\normalfont\itshape\acknowname}{}} -% % \mop{FOO} is equivalent to \operatorname{FOO} % \newcommand{\mop}{\operatorname} % -% NCC logo: +% Define NCC logo % \DeclareRobustCommand{\NCC}{{\protect\AmSfont N\kern-.05em\lower.5ex\hbox{C}\kern.05emC}% } % -% Customize sections and captions. +% Customize sections and captions % \def\NCC@runskip{2.3ex \@plus 1ex \@minus .2ex} \DeclareSection{-2}{table}{\bfseries}{\z@}{1.3ex}{\small} @@ -143,6 +114,8 @@ {4ex \@plus 1ex \@minus .2ex}% {2.8ex \@plus .2ex}{\LARGE\bff} }{% + \DeclarePart{\StartFromTextArea\vspace{\stretch{.5}}\centering}% + {\vfill\newpage}{\vspace{1.5em}\Large\bff}{\huge\bff} \DeclareSection*0{chapter}{\vspace{1.5ex}\large\bff}{\z@}% {6ex \@plus .2ex}{\LARGE\bff} } @@ -161,6 +134,8 @@ {5ex \@plus 1ex \@minus .2ex}% {3.8ex \@plus .2ex}{\huge\bff} }{% + \DeclarePart{\StartFromTextArea\vspace{\stretch{.5}}\centering}% + {\vfill\newpage}{\vspace{2em}\LARGE\bff}{\Huge\bff} \DeclareSection*0{chapter}{\vspace{2ex}\Large\bff}{\z@}% {8ex \@plus .2ex}{\huge\bff} } @@ -178,13 +153,8 @@ {-.6em \@plus -.2em \@minus -.1em}{\normalsize\bff} \DeclareSection5{subparagraph}[\parindent]{}{\NCC@runskip}% {-.6em \@plus -.2em \@minus -.1em}{\normalsize\bff} -\SectionTagSuffix{.\hskip .6em} -\CaptionTagSuffix{.\hskip .6em \@plus .2em \@minus .1em} -\NumberlineSuffix{.\hskip .6em}{.\hskip .4em} -\sectionstyle{hangindent*} % -% Millimeters are default units in NCC-LaTeX. +% Millimeters are default units in NCC-LaTeX % \unitlength=1mm -\renewcommand{\cboxstyle}{\scriptsize} \endinput diff --git a/Master/texmf-dist/tex/latex/ncclatex/nccltrus.sty b/Master/texmf-dist/tex/latex/ncclatex/nccltrus.sty index 5480b6eede6..490693a0ae7 100644 --- a/Master/texmf-dist/tex/latex/ncclatex/nccltrus.sty +++ b/Master/texmf-dist/tex/latex/ncclatex/nccltrus.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nccltrus} - [2005/07/02 v1.06 Russian specifics (NCC)] + [2005/12/27 v1.07 Russian specifics (NCC)] % % \changes{v1.01}{2002/03/24}{This version is uploaded to CTAN} % \changes{v1.02}{2004/04/08}{All options are passed to babel} @@ -11,6 +11,8 @@ % \changes{v1.05}{2005/01/09}{Improve definition of \No command} % \changes{v1.05}{2005/04/13}{Add a small kern to \glqq shorthand} % \changes{v1.06}{2005/07/02}{Change kern with nonbreakable hspace in \glqq} +% \changes{v1.07}{2005/12/24}{Undo Babel's ``improvements'' to \flqq, \frqq} +% \changes{v1.07}{2005/12/27}{Move Babel's customization to other packages} % % The trick with temporary definition of \ver@inputenc.sty command % removes a warning from the [russian] option of the Babel package about @@ -28,17 +30,6 @@ \expandafter\let\csname ver@inputenc.sty\endcsname\NCC@tempa \ifx\cyrillicencoding\undefined \endinput\fi % -% Add a small kern to German left double quote shorthand -% -\declare@shorthand{russian}{"`}{\glqq\nobreak\hskip.0166667em } -% -% Redefine the numero sign to work in any encoding. -% -\let\No\relax -\DeclareRobustCommand{\No}{% - \ifmmode{\nfss@text{\textnumero}}\else{\cyr\textnumero}\fi -} -% % Load cp1251-light input encoding at the beginning of document % if no encoding was loaded at all % @@ -60,29 +51,4 @@ \let\@Alphlatin\@Alph \newcommand*\Alphlatin[1]{\expandafter\@Alphlatin\csname c@#1\endcsname} \def\@Alph#1{\text{\cyr\@Asbuk{#1}}} -% -% Redefine theorem-like headers for russian -% -\addto\captionsrussian{% - \def\theoremname{{\cyr\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyra}}% - \def\lemmaname{{\cyr\CYRL\cyre\cyrm\cyrm\cyra}}% - \def\propositionname{% - {\cyr\CYRP\cyrr\cyre\cyrd\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}}% - \def\corollaryname{% - {\cyr\CYRS\cyrl\cyre\cyrd\cyrs\cyrt\cyrv\cyri\cyre}}% - \def\definitionname{% - {\cyr\CYRO\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyre}}% - \def\statementname{% - {\cyr\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyre}}% - \def\examplename{{\cyr\CYRP\cyrr\cyri\cyrm\cyre\cyrr}}% - \def\remarkname{% - {\cyr\CYRZ\cyra\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyre}}% - \def\proofname{% - {\cyr\CYRD\cyro\cyrk\cyra\cyrz\cyra\cyrt\cyre\cyrl\cyrsftsn% - \cyrs\cyrt\cyrv\cyro}}% - \def\acknowname{% - {\cyr\CYRB\cyrl\cyra\cyrg\cyro\cyrd\cyra\cyrr\cyrn\cyro\cyrs\cyrt\cyri}}% - \def\preprintname{% - {\cyr\CYRP\cyrr\cyre\cyrp\cyrr\cyri\cyrn\cyrt}}% -} \endinput diff --git a/Master/texmf-dist/tex/latex/ncclatex/nccproc.cls b/Master/texmf-dist/tex/latex/ncclatex/nccproc.cls index 7a41334f7f8..bb0e94ba270 100644 --- a/Master/texmf-dist/tex/latex/ncclatex/nccproc.cls +++ b/Master/texmf-dist/tex/latex/ncclatex/nccproc.cls @@ -1,10 +1,11 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{nccproc} - [2005/01/14 v1.2 Generic Proceedings Class (NCC)] + [2005/12/27 v1.3 Generic Proceedings Class (NCC)] % % \changes{v1.0}{2004/04/08}{This version was uploaded to CTAN} % \changes{v1.1}{2004/09/18}{Documentation was corrected} % \changes{v1.2}{2005/01/14}{Remove small, fleqn, and leqno options} +% \changes{v1.3}{2005/12/27}{11pt option is allowed now} % % The base class for NCC Proceedings. It supports bilingual % (Russian and English) proceedings. @@ -16,7 +17,6 @@ \DeclareOption{legalpaper}{\OptionNotUsed} \DeclareOption{executivepaper}{\OptionNotUsed} \DeclareOption{fittopage}{\OptionNotUsed} -\DeclareOption{11pt}{\OptionNotUsed} \DeclareOption{12pt}{\OptionNotUsed} \DeclareOption{14pt}{\OptionNotUsed} \DeclareOption{oneside}{\OptionNotUsed} diff --git a/Master/texmf-dist/tex/latex/ncclatex/nccsections.sty b/Master/texmf-dist/tex/latex/ncclatex/nccsections.sty new file mode 100644 index 00000000000..0b1021b938c --- /dev/null +++ b/Master/texmf-dist/tex/latex/ncclatex/nccsections.sty @@ -0,0 +1,220 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{nccsections} + [2006/01/19 v1.01 Custom sectioning styles (NCC)] +% +% \changes{v1.00}{2006/01/01}{This version is uploaded to CTAN} +% \changes{v1.01}{2006/01/17}{addtopackage -> afterpackage} +% \changes{v1.01}{2006/01/19}{Add modification of \NCC@secflush hook} +% +\RequirePackage{afterpackage} +\RequirePackage{nccsect}[2006/01/19] +% +% The style parameter in section declaration commands is applied +% to the section text only +% +\DeclareOption{newsecstyle}{% + \def\NCC@preparesectag#1#2{\def\NCC@makesectag##1{#1{#2##1\NCC@asecnum}}} + \def\NCC@secttitle#1#2#3{#2#1{#3}} + \let\NCC@secptitle\NCC@secttitle + \let\NCC@secxtitle\NCC@secttitle + \DeclareSection*1{section}{\Large\bff}% + {3.5ex \@plus 1ex \@minus .2ex}% + {2.3ex \@plus .2ex}{\Large\bff} + \DeclareSection*2{subsection}{\large\bff}% + {3.25ex \@plus 1ex \@minus .2ex}% + {1.5ex \@plus .2ex}{\large\bff} + \DeclareSection*3{subsubsection}{\normalsize\bff}% + {3ex \@plus 1ex \@minus .2ex}% + {1.5ex \@plus .2ex}{\normalsize\bff} + \DeclareSection4{paragraph}{\normalsize\bff}% + {\NCC@runskip}{-1em}{\normalsize\bff} + \DeclareSection5{subparagraph}[\parindent]{\normalsize\bff}% + {\NCC@runskip}{-1em}{\normalsize\bff} + \AfterPackage{ncclatex}{% + \ifNCC@small + \DeclareSection*1{section}{\large\bff}% + {3.1ex \@plus 1ex \@minus .2ex}% + {1.5ex \@plus .2ex}{\large\bff} + \DeclareSection*2{subsection}{\normalsize\bff}% + {2.7ex \@plus 1ex \@minus .2ex}% + {1.5ex \@plus .2ex}{\normalsize\bff} + \DeclareSection*3{subsubsection}{\normalsize\bff\itshape}% + {\NCC@runskip}% + {1.5ex \@plus .2ex}{\normalsize\bff\itshape} + \else + \DeclareSection*1{section}{\Large\bff}% + {3.5ex \@plus 1ex \@minus .2ex}% + {2.3ex \@plus .2ex}{\Large\bff} + \DeclareSection*2{subsection}{\large\bff}% + {3.1ex \@plus 1ex \@minus .2ex}% + {1.5ex \@plus .2ex}{\large\bff} + \DeclareSection*3{subsubsection}{\normalsize\bff}% + {2.7ex \@plus 1ex \@minus .2ex}% + {1.5ex \@plus .2ex}{\normalsize\bff} + \fi + \DeclareSection4{paragraph}{\normalsize\bff}{\NCC@runskip}% + {-.6em \@plus -.2em \@minus -.1em}{\normalsize\bff} + \DeclareSection5{subparagraph}[\parindent]{\normalsize\bff}{\NCC@runskip}% + {-.6em \@plus -.2em \@minus -.1em}{\normalsize\bff} + } +} +% +% The style parameter in toc-entry declaration commands is applied +% to the toc-entry text only +% +\DeclareOption{newtocstyle}{% + \let\NCC@tocnumprototype\@secondoftwo + \def\NCC@nexttocnum#1#2{#1{#2\NCC@atocnum}} + \def\NCC@preparetocnum#1#2{\def\NCC@maketocnum##1{#2{##1\NCC@atocnum}}} + \def\NCC@tocentrytitle#1#2{% + \def\@tempa##1{#1{\ignorespaces##1}}% + \NCC@parsetocnum#2\NCC@do + } + \def\NCC@parsetocnum{\futurelet\@tempb\NCC@testtocnum} + \def\NCC@testtocnum{% + \ifx\@tempb\numberline + \expandafter\NCC@gettocnum + \else + \expandafter\NCC@gettoctext + \fi + } + \def\NCC@gettocnum#1#2{#1{#2}\NCC@gettoctext} + \def\NCC@gettoctext#1\NCC@do{\@tempa{#1}} + \@ifundefined{chapter}{% + \DeclareTOCEntry0{\runinsectionskip\def\@dotsep{1000}}% + {\bff}{III}{\bff}[] + }{% + \DeclareTOCPart{\NCC@secskip{4ex \@plus .2ex}\def\@dotsep{1000}}% + {\large\bff}{II}{\large\bff} + \DeclareTOCEntry0{\runinsectionskip\def\@dotsep{1000}% + \aftergroup\penalty\aftergroup\@highpenalty}% + {\bff}{9}{\bff} + } +} +% +% A chapter tag goes inline with title +% +\DeclareOption{chapterinline}{% + \@ifundefined{chapter}{\NCC@secoptionerror}{% + \let\NCC@chap@@gobble\@empty + \def\NCC@secflush{\NCC@secsave} + \@ifpackagewith{nccsections}{newsecstyle}{% + \def\NCC@makechaptitle#1#2#3{\NCC@chap@@gobble + \ifx\NCC@sec@@main\@empty #1\@svsec \else \NCC@sec{\@svsec}#1\fi + \interlinepenalty \@M #2{#3\@@par}% + } + }{% + \def\NCC@makechaptitle#1#2#3{\NCC@chap@@gobble + \ifx\NCC@sec@@main\@empty \def\NCC@sec@@main{#1\@svsec}\else + \def\NCC@sec@@main{\protect\NCC@sec{\@svsec}#1}\fi + #2{\NCC@sec@@main\interlinepenalty \@M #3\@@par}% + } + } + \DeclareSection*0{chapter}{\huge\bff}{10ex}% + {8ex \@plus .2ex}{\huge\bff} + \AfterPackage{ncclatex}{% + \ifNCC@small + \DeclareSection*0{chapter}{\Large\bff}{\z@}% + {6ex \@plus .2ex}{\Large\bff} + \else + \DeclareSection*0{chapter}{\LARGE\bff}{\z@}% + {8ex \@plus .2ex}{\LARGE\bff} + \fi + } + } +} +% +% Chapter like a section +% +\DeclareOption{chaptersection}{% + \@ifundefined{chapter}{\NCC@secoptionerror}{% + \@ifpackagewith{nccsections}{chapterinline}{}{% + \ExecuteOptions{chapterinline}% + } + \def\NCC@chap@@gobble{\let\@chapapp\@gobble} + \AtBeginDocument{% + \def\NCC@thetocchapter{\thechapter} + \let\NCC@makechapfinal\NCC@makechapfinalgobble + } + } +} +% +% A part tag goes inline with title +% +\DeclareOption{partinline}{% + \let\NCC@part@@gobble\@empty + \@ifundefined{chapter}{% + \def\NCC@secflush{\NCC@secsave} + \@ifpackagewith{nccsections}{newsecstyle}{% + \def\NCC@makeparttitle#1#2#3{\NCC@part@@gobble + \ifx\NCC@sec@@main\@empty #1\@svsec \else \NCC@sec{\@svsec}#1\fi + \interlinepenalty \@M #2{#3\@@par}% + } + }{% + \def\NCC@makeparttitle#1#2#3{\NCC@part@@gobble + \ifx\NCC@sec@@main\@empty \def\NCC@sec@@main{#1\@svsec}\else + \def\NCC@sec@@main{\protect\NCC@sec{\@svsec}#1}\fi + #2{\NCC@sec@@main\interlinepenalty \@M #3\@@par}% + } + } + \DeclareSection*0{part}{\LARGE\bff}% + {5ex \@plus 1ex \@minus .2ex}% + {4ex \@plus .2ex}{\LARGE\bff} + \AfterPackage{ncclatex}{% + \ifNCC@small + \DeclareSection*0{part}{\Large\bff}% + {4ex \@plus 1ex \@minus .2ex}% + {2.8ex \@plus .2ex}{\Large\bff} + \else + \DeclareSection*0{part}{\LARGE\bff}% + {5ex \@plus 1ex \@minus .2ex}% + {3.8ex \@plus .2ex}{\LARGE\bff} + \fi + } + }{% + \@ifpackagewith{nccsections}{newsecstyle}{% + \def\NCC@makeparttitle#1#2#3{#1\NCC@part@@gobble + \@svsec\interlinepenalty \@M #2{#3\@@par}% + } + }{% + \def\NCC@makeparttitle#1#2#3{#1\NCC@part@@gobble + #2{\@svsec\interlinepenalty \@M #3\@@par}% + } + } + \DeclarePart{\StartFromTextArea\vfil\centering}% + {\vfil\newpage \if@twoside\if@openright + \mbox{}\thispagestyle{empty}\newpage\fi\fi}% + {\huge\bff}{\huge\bff} + \AfterPackage{ncclatex}{% + \ifNCC@small + \DeclarePart{\StartFromTextArea\vspace{\stretch{.5}}\centering} + {\vfill\newpage}{\LARGE\bff}{\LARGE\bff} + \else + \DeclarePart{\StartFromTextArea\vspace{\stretch{.5}}\centering} + {\vfill\newpage}{\huge\bff}{\huge\bff} + \fi + } + } +} +% +% Part like a section +% +\DeclareOption{partsection}{% + \@ifpackagewith{nccsections}{partinline}{}{% + \ExecuteOptions{partinline}% + } + \def\NCC@part@@gobble{\let\partname\@gobble} + \@ifundefined{chapter}{}{% + \AtBeginDocument{% + \def\NCC@thetocpart{\thepart} + \let\NCC@makepartfinal\NCC@makepartfinalgobble + } + } +} +\def\NCC@secoptionerror{% + \PackageError{nccsections}% + {Option `\CurrentOption' useful in book-like classes only}{}% +} +\@onlypreamble\NCC@secoptionerror +\ProcessOptions\relax +\endinput diff --git a/Master/texmf-dist/tex/latex/ncclatex/ncctheorems.sty b/Master/texmf-dist/tex/latex/ncclatex/ncctheorems.sty new file mode 100644 index 00000000000..adda7572826 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ncclatex/ncctheorems.sty @@ -0,0 +1,82 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{ncctheorems} + [2006/01/17 v1.01 NCC-LaTeX default theorems (NCC)] +% +% \changes{v1.00}{2005/12/27}{This version is uploaded to CTAN} +% \changes{v1.01}{2006/01/17}{addtopackage -> afterpackage} +% +% The package specifies theorem-like environments to be defined when the +% nccthm package will be loaded. It extends the default settings from +% the nccdefaults package. +% +\RequirePackage{nccdefaults} +% +% Customize nccthm package +% +\AfterPackage{nccthm}{% +% +% Define headers for theorem-like environments. +% + \newcommand{\theoremname}{Theorem} + \newcommand{\lemmaname}{Lemma} + \newcommand{\propositionname}{Proposition} + \newcommand{\corollaryname}{Corollary} + \newcommand{\definitionname}{Definition} + \newcommand{\statementname}{Statement} + \newcommand{\examplename}{Example} + \newcommand{\remarkname}{Remark} +% +% Prepare theorem-like environments +% + \newtheorem{theorem}{\theoremname} + \newtheorem{lemma}{\lemmaname} + \newtheorem{proposition}{\propositionname} + \newtheorem{corollary}{\corollaryname} + \newtheorem{statement}{\statementname}[remark] + \newtheorem{definition}{\definitionname}[remark] + \newtheorem{example}{\examplename}[remark] + \newtheorem{remark}{\remarkname}[remark] +% +% Prepare APAR theorem-like environments +% + \newtheorem*{atheorem}{\theoremname} + \newtheorem*{alemma}{\lemmaname} + \newtheorem*{aproposition}{\propositionname} + \newtheorem*{acorollary}{\corollaryname} + \newtheorem*{astatement}{\statementname}[remark] + \newtheorem*{adefinition}{\definitionname}[remark] + \newtheorem*{anexample}{\examplename}[remark] + \newtheorem*{aremark}{\remarkname}[remark] +% +% Prepare manual theorem-like environments +% + \newenvironment{Theorem}{\liketheorem{\theoremname}}{\qef} + \newenvironment{Lemma}{\liketheorem{\lemmaname}}{\qef} + \newenvironment{Proposition}{\liketheorem{\propositionname}}{\qef} + \newenvironment{Corollary}{\liketheorem{\corollaryname}}{\qef} + \newenvironment{Statement}{\likeremark{\statementname}}{\qef} + \newenvironment{Definition}{\likeremark{\definitionname}}{\qef} + \newenvironment{Example}{\likeremark{\examplename}}{\qef} + \newenvironment{Remark}{\likeremark{\remarkname}}{\qef} +} +% +% Specify russian versions of theorem-like titles. +% +\AfterPackage{babel}{% + \addto\captionsrussian{% + \def\theoremname{{\cyr\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyra}}% + \def\lemmaname{{\cyr\CYRL\cyre\cyrm\cyrm\cyra}}% + \def\propositionname{% + {\cyr\CYRP\cyrr\cyre\cyrd\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}}% + \def\corollaryname{% + {\cyr\CYRS\cyrl\cyre\cyrd\cyrs\cyrt\cyrv\cyri\cyre}}% + \def\definitionname{% + {\cyr\CYRO\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyre}}% + \def\statementname{% + {\cyr\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyre}}% + \def\examplename{{\cyr\CYRP\cyrr\cyri\cyrm\cyre\cyrr}}% + \def\remarkname{% + {\cyr\CYRZ\cyra\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyre}}% + } +} +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/ncclatex/ncctitle.clo b/Master/texmf-dist/tex/latex/ncclatex/ncctitle.clo index 719f1a8de92..3117a064d49 100644 --- a/Master/texmf-dist/tex/latex/ncclatex/ncctitle.clo +++ b/Master/texmf-dist/tex/latex/ncclatex/ncctitle.clo @@ -1,5 +1,5 @@ \ProvidesFile{ncctitle.clo} - [2005/07/24 v1.05 Title page (NCC)] + [2005/12/26 v1.06 Title page (NCC)] % % \changes{v1.00}{2002/02/19}{This version is uploaded to CTAN} % \changes{v1.01}{2004/11/30}{Add the \NCC@titlestyle hook} @@ -13,206 +13,7 @@ % \changes{v1.04}{2005/06/18}{Use \ExpandTextArea in title pages} % \changes{v1.04}{2005/06/18}{Introduce \titleareadefault} % \changes{v1.05}{2005/07/24}{Replace \vfil to \vfill in the \endabstract} +% \changes{v1.06}{2005/12/26}{This class option is obsolete now} % -% This file provides a title, an abstract, and a last page prepared -% on separate title pages. -% -% The expansion of the text area on these pages is specified with the -% \titleareadefault macro. -% -\newcommand\titleareadefault{*} -% -% The \maketitle uses the following hooks: -% -% \NCC@titlestyle a style applied to the title -% \NCC@titlebegin typed out at the beginning of title -% \@maketitle prepares a title -% \NCC@titlecomment typed out right after the title -% \NCC@titleend typed out at the end of title -% -% We do not delete title specific commands because the \@maketitle -% command can be used for preparing other special pages also. -% -\newcommand{\maketitle}{% - \begin{titlepage}% - \NCC@titlestyle - \ExpandTextArea[\titleareadefault]% - \let\footnoterule\relax - \renewcommand\thefootnote{\@fnsymbol\c@footnote}% - \begingroup - \def\@makefnmark{\@textsuperscript{\normalfont\@thefnmark}}% - \NCC@titlebegin - \@maketitle - \NCC@titlecomment - \NCC@titleend - \endgroup - \@thanks\setcounter{footnote}{0}\gdef\@thanks{}% - \end{titlepage}% -} -\let\NCC@titlecomment\@empty -% -% \@maketitle makes the title itself. The \@date useless in NCC titles -% -\def\@maketitle{% - \ifx\@author\@empty {\huge\bff \@title \par}% - \else - \ifNCC@authorbeforetitle \else - {\huge\bff \@title \par}\vskip 3em - \fi - {\Large\bfseries \lineskip .75em \@author \par}% - \ifNCC@authorbeforetitle - \vskip 2em {\huge\bff \@title \par}% - \fi - \fi -} -% -% Service hooks for the title: -% -% \titlestretch{value} -% \titlestyle{A style} -% \titlehead{A text at the top of title} -% \titlesign{A sign of Publishing House} -% \titlefoot{A text at the bottom of title} -% \titlecomment{A comment below title} -% -% The \titlecomment is also applied to the last page -% -\newcommand*\titlestretch[1]{\def\NCC@titlestretch{#1}} -\newcommand*\titlestyle[1]{\def\NCC@titlestyle{#1}} -\newcommand\titlehead[1]{\def\NCC@titlebegin{{#1\par}\vfill}} -\newcommand\titlesign[1]{\def\NCC@titlesign{#1}} -\newcommand\titlefoot[1]{% - \def\NCC@titleend{% - \vspace{\stretch{\NCC@titlestretch}}% - {\NCC@titlesign\par}% - \vspace{\stretch{\NCC@titlestretch}}% - {#1\par}% - }% -} -\newcommand\titlecomment[1]{% - \def\@tempa{#1}% - \ifx\@tempa\@empty - \let\NCC@titlecomment\@empty - \else - \def\NCC@titlecomment{\vskip 1.5em {\large#1\par}}% - \fi -} -% -% The abstract environment uses the following hooks: -% -% \NCC@abstractstyle a style applied to the abstract -% \NCC@abstractbegin typed out at the beginning of abstract -% \NCC@abstractend typed out at the end of abstract -% -% The area of the abstract page is specified with \TitleAreaDefault macro. -% -\newenvironment{abstract}{% - \titlepage - \NCC@abstractstyle - \ExpandTextArea[\titleareadefault]% - \NCC@abstractbegin - \begingroup -}{ - \par\endgroup - \vfill - \NCC@abstractend - \endtitlepage -} -% -% Service hooks for the abstract: -% -% \abstractstyle{A style for main part of abstract} -% \bibindex[style]{A bibliography index of the document} -% \copyrighttable[style]{ISBN}{\item copyright\\ \item copyright ...} -% -% \fulltitle[style]{authors}{full title} this command is used inside -% the abstract. -% -% In the \bibindex and \copyrighttable, the default style is \footnotesize. -% In the \fulltitle, the default style is \normalsize. -% -\newcommand*\abstractstyle[1]{% - \def\NCC@abstractstyle{#1\def\qef{\par\addvspace{2.5ex \@minus .5ex}}}% -} -\newcommand\bibindex[2][\footnotesize]{% - \if!#2!% - \let\NCC@abstractbegin\@empty - \else - \def\NCC@abstractbegin{{\noindent#1\ignorespaces#2\par}\qef}% - \fi -} -\newcommand*\copyrighttable[3][\footnotesize]{% - \def\NCC@abstractend{#1\noindent - \pbox[lb]{#2}\hfill - \def\item{\llap{\copyright\ }}% - \pbox[lb]{#3}% - \par - } -} -\newcommand*\fulltitle[3][\normalsize]{% - {\par#1\normalfont{\bfseries#2} #3\par}% - \qef% -} -% -% The \makelastpage uses the following hooks: -% -% \NCC@lastpagestyle a style applied to the last page -% \NCC@lastpagebegin typed out at the beginning of the last page -% \@maketitle prepares a title -% \NCC@titlecomment typed out right after the title on the last page -% \NCC@lastpageend typed out at the end of the last page -% -% The area of the last page is specified with \TitleAreaDefault macro. -% -\newcommand{\makelastpage}{% - \begin{titlepage}% - \NCC@lastpagestyle - \ExpandTextArea[\titleareadefault]% - \NCC@lastpagebegin - \@maketitle - \NCC@titlecomment - \NCC@lastpageend - \end{titlepage}% -} -% -% Service hooks for the last page: -% -% \lastpagestretch{value} -% \lastpagestyle{A style} -% \lastpagehead{A text at the top of the last page} -% \lastpageinfo[style]{Designers}{Publishing attributes}{Publisher} -% -\newcommand*\lastpagestretch[1]{\def\NCC@lastpagestretch{#1}} -\newcommand*\lastpagestyle[1]{\def\NCC@lastpagestyle{#1}} -\newcommand\lastpagehead[1]{\def\NCC@lastpagebegin{{#1\par}\vfill}% -} -\newcommand\lastpageinfo[4][\small]{% - \def\NCC@lastpageend{#1% - \vspace{\stretch{\NCC@lastpagestretch}}% - {#2\par}\bigskip - \hrule \@height .6pt\@width\linewidth - {\Strut/.5/\ignorespaces#3\unskip\Strut/-.5/\par}% - \hrule \@height .6pt\@width\linewidth - \bigskip{#4\par}% - }% -} -% -% Defaults -% -\titlestretch{1} -\titlestyle{\centering} -\titlehead{} -\titlesign{} -\titlefoot{} -\titlecomment{} -% -\abstractstyle{\small} -\bibindex{} -\def\NCC@abstractend{} -% -\lastpagestretch{1} -\lastpagestyle{\centering} -\lastpagehead{} -\def\NCC@lastpageend{\vspace{\stretch{\NCC@lastpagestretch}}} -% +\@latex@warning{Obsolete option ncctitle.clo. Use ncctitle package instead.} \endinput diff --git a/Master/texmf-dist/tex/latex/ncclatex/ncctitle.sty b/Master/texmf-dist/tex/latex/ncclatex/ncctitle.sty new file mode 100644 index 00000000000..5a38762aae6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ncclatex/ncctitle.sty @@ -0,0 +1,233 @@ +\ProvidesPackage{ncctitle} + [2005/12/26 v1.06 Title page (NCC)] +% +% \changes{v1.00}{2002/02/19}{This version is uploaded to CTAN} +% \changes{v1.01}{2004/11/30}{Add the \NCC@titlestyle hook} +% \changes{v1.01}{2004/11/30}{Add the \StartFromHeaderArea command +% at the beginning of title and abstract} +% \changes{v1.01}{2004/11/30}{Service title management commands added} +% \changes{v1.02}{2004/12/07}{Add the \NCC@abstractstyle hook} +% \changes{v1.02}{2004/12/07}{Introduce \makelastpage command} +% \changes{v1.02}{2004/12/07}{Add services for the abstract and last page} +% \changes{v1.03}{2004/12/16}{Replace \NCC@gempty with \@empty} +% \changes{v1.04}{2005/06/18}{Use \ExpandTextArea in title pages} +% \changes{v1.04}{2005/06/18}{Introduce \titleareadefault} +% \changes{v1.05}{2005/07/24}{Replace \vfil to \vfill in the \endabstract} +% \changes{v1.06}{2005/12/26}{Change extension from .clo to .sty} +% +% This package provides a title, an abstract, and a last page prepared +% on separate title pages. +% +\RequirePackage{ncctitlepage} +% +% The expansion of the text area on these pages is specified with the +% \titleareadefault macro. +% +\newcommand\titleareadefault{*} +% +% The \maketitle uses the following hooks: +% +% \NCC@titlestyle a style applied to the title +% \NCC@titlebegin typed out at the beginning of title +% \@maketitle prepares a title +% \NCC@titlecomment typed out right after the title +% \NCC@titleend typed out at the end of title +% +% We do not delete title specific commands because the \@maketitle +% command can be used for preparing other special pages also. +% +\def\maketitle{% + \begin{titlepage}% + \NCC@titlestyle + \ExpandTextArea[\titleareadefault]% + \let\footnoterule\relax + \renewcommand\thefootnote{\@fnsymbol\c@footnote}% + \begingroup + \def\@makefnmark{\@textsuperscript{\normalfont\@thefnmark}}% + \NCC@titlebegin + \@maketitle + \NCC@titlecomment + \NCC@titleend + \endgroup + \@thanks\setcounter{footnote}{0}\gdef\@thanks{}% + \end{titlepage}% +} +\let\NCC@titlecomment\@empty +% +% What goes first in title: author or title? +% +\@ifundefined{ifNCC@authorbeforetitle}{% + \newif\ifNCC@authorbeforetitle + \newcommand{\AuthorBeforeTitle}{\NCC@authorbeforetitletrue} + \newcommand{\TitleBeforeAuthor}{\NCC@authorbeforetitlefalse} + \@onlypreamble\AuthorBeforeTitle + \@onlypreamble\TitleBeforeAuthor + \AuthorBeforeTitle +} +% +% \@maketitle makes the title itself. The \@date useless in NCC titles +% +\def\@maketitle{% + \ifx\@author\@empty {\huge\bff \@title \par}% + \else + \ifNCC@authorbeforetitle \else + {\huge\bff \@title \par}\vskip 3em + \fi + {\Large\bfseries \lineskip .75em \@author \par}% + \ifNCC@authorbeforetitle + \vskip 2em {\huge\bff \@title \par}% + \fi + \fi +} +% +% Service hooks for the title: +% +% \titlestretch{value} +% \titlestyle{A style} +% \titlehead{A text at the top of title} +% \titlesign{A sign of Publishing House} +% \titlefoot{A text at the bottom of title} +% \titlecomment{A comment below title} +% +% The \titlecomment is also applied to the last page +% +\newcommand*\titlestretch[1]{\def\NCC@titlestretch{#1}} +\newcommand*\titlestyle[1]{\def\NCC@titlestyle{#1}} +\newcommand\titlehead[1]{\def\NCC@titlebegin{{#1\par}\vfill}} +\newcommand\titlesign[1]{\def\NCC@titlesign{#1}} +\newcommand\titlefoot[1]{% + \def\NCC@titleend{% + \vspace{\stretch{\NCC@titlestretch}}% + {\NCC@titlesign\par}% + \vspace{\stretch{\NCC@titlestretch}}% + {#1\par}% + }% +} +\newcommand\titlecomment[1]{% + \def\@tempa{#1}% + \ifx\@tempa\@empty + \let\NCC@titlecomment\@empty + \else + \def\NCC@titlecomment{\vskip 1.5em {\large#1\par}}% + \fi +} +% +% The abstract environment uses the following hooks: +% +% \NCC@abstractstyle a style applied to the abstract +% \NCC@abstractbegin typed out at the beginning of abstract +% \NCC@abstractend typed out at the end of abstract +% +% The area of the abstract page is specified with \TitleAreaDefault macro. +% +\def\abstract{% + \titlepage + \NCC@abstractstyle + \ExpandTextArea[\titleareadefault]% + \NCC@abstractbegin + \begingroup +} +\def\endabstract{ + \par\endgroup + \vfill + \NCC@abstractend + \endtitlepage +} +% +% Service hooks for the abstract: +% +% \abstractstyle{A style for main part of abstract} +% \bibindex[style]{A bibliography index of the document} +% \copyrighttable[style]{ISBN}{\item copyright\\ \item copyright ...} +% +% \fulltitle[style]{authors}{full title} this command is used inside +% the abstract. +% +% In the \bibindex and \copyrighttable, the default style is \footnotesize. +% In the \fulltitle, the default style is \normalsize. +% +\newcommand*\abstractstyle[1]{% + \def\NCC@abstractstyle{#1\def\qef{\par\addvspace{2.5ex \@minus .5ex}}}% +} +\newcommand\bibindex[2][\footnotesize]{% + \if!#2!% + \let\NCC@abstractbegin\@empty + \else + \def\NCC@abstractbegin{{\noindent#1\ignorespaces#2\par}\qef}% + \fi +} +\newcommand*\copyrighttable[3][\footnotesize]{% + \def\NCC@abstractend{#1\noindent + \pbox[lb]{#2}\hfill + \def\item{\llap{\copyright\ }}% + \pbox[lb]{#3}% + \par + } +} +\newcommand*\fulltitle[3][\normalsize]{% + {\par#1\normalfont{\bfseries#2} #3\par}% + \qef% +} +% +% The \makelastpage uses the following hooks: +% +% \NCC@lastpagestyle a style applied to the last page +% \NCC@lastpagebegin typed out at the beginning of the last page +% \@maketitle prepares a title +% \NCC@titlecomment typed out right after the title on the last page +% \NCC@lastpageend typed out at the end of the last page +% +% The area of the last page is specified with \TitleAreaDefault macro. +% +\newcommand{\makelastpage}{% + \begin{titlepage}% + \NCC@lastpagestyle + \ExpandTextArea[\titleareadefault]% + \NCC@lastpagebegin + \@maketitle + \NCC@titlecomment + \NCC@lastpageend + \end{titlepage}% +} +% +% Service hooks for the last page: +% +% \lastpagestretch{value} +% \lastpagestyle{A style} +% \lastpagehead{A text at the top of the last page} +% \lastpageinfo[style]{Designers}{Publishing attributes}{Publisher} +% +\newcommand*\lastpagestretch[1]{\def\NCC@lastpagestretch{#1}} +\newcommand*\lastpagestyle[1]{\def\NCC@lastpagestyle{#1}} +\newcommand\lastpagehead[1]{\def\NCC@lastpagebegin{{#1\par}\vfill}% +} +\newcommand\lastpageinfo[4][\small]{% + \def\NCC@lastpageend{#1% + \vspace{\stretch{\NCC@lastpagestretch}}% + {#2\par}\bigskip + \hrule \@height .6pt\@width\linewidth + {\Strut/.5/\ignorespaces#3\unskip\Strut/-.5/\par}% + \hrule \@height .6pt\@width\linewidth + \bigskip{#4\par}% + }% +} +% +% Defaults +% +\titlestretch{1} +\titlestyle{\centering} +\titlehead{} +\titlesign{} +\titlefoot{} +\titlecomment{} +% +\abstractstyle{\small} +\bibindex{} +\def\NCC@abstractend{} +% +\lastpagestretch{1} +\lastpagestyle{\centering} +\lastpagehead{} +\def\NCC@lastpageend{\vspace{\stretch{\NCC@lastpagestretch}}} +% +\endinput diff --git a/Master/texmf-dist/tex/latex/ncclatex/ncctitlepage.sty b/Master/texmf-dist/tex/latex/ncclatex/ncctitlepage.sty new file mode 100644 index 00000000000..bbcfb0a8b0f --- /dev/null +++ b/Master/texmf-dist/tex/latex/ncclatex/ncctitlepage.sty @@ -0,0 +1,44 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{ncctitlepage} + [2005/12/26 v1.00 The titlepage environment (NCC)] +% +% \changes{v1.00}{2005/12/26}{This version is uploaded to CTAN} +% +\RequirePackage{textarea} +\@ifundefined{if@restonecol}{\newif\if@restonecol} +% +% The titlepage environment. Sets the empty page style at the top-level +% title page. We suppose that a title page can contain many pages and many +% title pages inside. The page counter is restored to its +% original value after leaving a top-level title page. +% +\newif\ifNCC@intitle \NCC@intitlefalse +\def\titlepage{% + \clearpage + \if@twocolumn \@restonecoltrue \onecolumn \else \@restonecolfalse \fi + \ifNCC@intitle + \let\NCC@restorepagecount\@empty + \else + \pagestyle{empty} + \edef\NCC@restorepagecount{% + \noexpand\global\noexpand\c@page \@arabic\c@page\relax}% + \setcounter{page}\z@ + \c@footnote\z@ \def\thefootnote{\@fnsymbol\c@footnote}% + \NCC@intitletrue + \fi + \let\NCC@restoretextarea\@empty +} +\def\endtitlepage{% + \clearpage + \NCC@restoretextarea + \if@restonecol\twocolumn \fi + \NCC@restorepagecount +} +% +% The star-form of the titlepage environment works as an inner one, +% i.e. it does not change the page counter. +\newenvironment{titlepage*}{\NCC@intitletrue + \clearpage\pagestyle{empty}\titlepage +}{\endtitlepage} + +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/ncctools/afterpackage.sty b/Master/texmf-dist/tex/latex/ncctools/afterpackage.sty new file mode 100644 index 00000000000..459f0664d12 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ncctools/afterpackage.sty @@ -0,0 +1,60 @@ +%% +%% This is file `afterpackage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% afterpackage.dtx (with options: `package') +%% +%% IMPORTANT NOTICE: +%% +%% This file is a generated file from the sources of the `ncctools' +%% bundle. +%% +%% You are not allowed to modify this file. +%% +%% You are allowed to distribute this file if and only if +%% it is distributed with the corresponding source files in +%% the `ncctools' bundle. +%% +%% For the copying and distribution conditions of the source files, +%% see the README file distributed with the ncctools bundle. +%% +%% File: afterpackage.dtx Copyright (C) 2005, 2006 by Alexander I. Rozhenko +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{afterpackage} + [2006/01/17 v1.1 Apply Commands After Package (NCC)] +\newcommand*\AfterPackage[1]{% + \expandafter\ifx\csname ver@#1.\@pkgextension\endcsname\relax + \@ifundefined{#1.\@pkgextension-@dd}{% + \expandafter\let\csname#1.\@pkgextension-@dd\endcsname\@empty + \expandafter\@onlypreamble\csname#1.\@pkgextension-@dd\endcsname + }{}% + \wlog{After Package Info: Collect commands for #1\on@line}% + \def\@tempa{% + \expandafter\g@addto@macro\csname#1.\@pkgextension-@dd\endcsname}% + \else + \ATP@apply@info{#1}% + \let\@tempa\@firstofone + \fi + \@tempa +} +\@onlypreamble\AfterPackage +\let\ATP@popfilename\@popfilename +\@onlypreamble\ATP@popfilename +\def\@popfilename{% + \@ifundefined{\@currname.\@currext-@dd}{}{% + \ATP@apply@info{\@currname}% + \csname\@currname.\@currext-@dd\endcsname + \expandafter\let\csname\@currname.\@currext-@dd\endcsname\relax + }% + \ATP@popfilename +} +\def\ATP@apply@info#1{% + \wlog{After Package Info: Apply commands to #1\on@line}% +} +\@onlypreamble\ATP@apply@info +\endinput +%% +%% End of file `afterpackage.sty'. diff --git a/Master/texmf-dist/tex/latex/ncctools/nccfloats.sty b/Master/texmf-dist/tex/latex/ncctools/nccfloats.sty index 0f32a39859e..039bf65aa9a 100644 --- a/Master/texmf-dist/tex/latex/ncctools/nccfloats.sty +++ b/Master/texmf-dist/tex/latex/ncctools/nccfloats.sty @@ -20,23 +20,32 @@ %% For the copying and distribution conditions of the source files, %% see the README file distributed with the ncctools bundle. %% -%% File: nccfloats.dtx Copyright (C) 2002--2004 by Alexander I. Rozhenko +%% File: nccfloats.dtx Copyright (C) 2002--2006 by Alexander I. Rozhenko %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nccfloats} - [2004/12/05 v1.1 More Float Management (NCC)] + [2006/01/07 v1.2 More Float Management (NCC)] \RequirePackage{nccboxes}[2002/03/20] -\newcommand*{\FloatStyle}[1]{\def\NCC@fltstyle{#1}} +\newcommand*{\FloatStyle}[2][]{% + \expandafter\def\csname NCC@fltstyle@#1\endcsname{#2}} \@onlypreamble\FloatStyle -\newcommand{\minifig}{\begingroup\def\@captype{figure}\NCC@minifloat} -\newcommand{\minitabl}{\begingroup\def\@captype{table}\NCC@minifloat} +\def\NCC@setfltstyle#1{% + \edef\@tempa{NCC@fltstyle@#1\@captype}% + \@ifundefined{\@tempa}{\NCC@fltstyle@}{\csname\@tempa\endcsname}% +} +\g@addto@macro\@floatboxreset{\NCC@setfltstyle{}} +\newcommand\normalfloatstyle{% + \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip + \parfillskip\@flushglue \let\\\@normalcr + \reset@font \normalsize +} \newcommand*\NCC@minifloat[1][c]{% \@ifnextchar[{\NCC@mflt{#1}}{\NCC@@mflt{#1}\relax[s]}} \def\NCC@mflt#1[#2]{% \@ifnextchar[{\NCC@@mflt{#1}{#2}}{\NCC@mflt{#1}{#2}[#1]}} \long\def\NCC@@mflt#1#2[#3]#4#5{% - \@iiiminipage{#1}{#2}[#3]{#4}\normalfont - \NCC@fltstyle #5\endminipage\endgroup + \@iiiminipage{#1}{#2}[#3]{#4}\normalfloatstyle + \NCC@setfltstyle{mini}#5\endminipage\endgroup } \def\NCC@pair#1#2#3#4{\setlength\@tempdimc{#3}% \@ifstar{\NCC@pair@{#2}{#4}}{\NCC@pair@{#1}{#4}}} @@ -45,10 +54,7 @@ \@ifnextchar({\NCC@pair@@@}{\NCC@@pair()()}} \def\NCC@pair@@@(#1){\@ifnextchar({\NCC@@pair(#1)}{\NCC@@pair(#1)()}} \def\NCC@@pair(#1)(#2){\@tempa{#1}{#2}} -\def\NCC@setwidth#1#2{% - \afterassignment\NCC@setwidth@#1#2\unitlength\relax -} -\def\NCC@setwidth@#1\relax{} +\def\NCC@setwidth#1#2{\@defaultunits#1#2\unitlength\relax\@nnil} \def\NCC@wcalc#1#2{% \if!#1!\@tempdima .5\linewidth \advance\@tempdima -.5\@tempdimc \else \NCC@setwidth\@tempdima{#1}% @@ -68,8 +74,6 @@ \expandafter\@secondoftwo \fi } -\newcommand{\sidefig}{\NCC@sidemfloat{\minifig}} -\newcommand{\sidetabl}{\NCC@sidemfloat{\minitabl}} \def\NCC@sidemfloat#1{% \NCC@smfltleftfalse \if@twocolumn \else @@ -115,29 +119,45 @@ \@tempdima\ht\@tempboxa \advance\@tempdima -\ht\strutbox \noindent \raise-\@tempdima\box\@tempboxa } -\newcommand{\fig}{\NCC@float{figure}} -\newcommand{\tabl}{\NCC@float{table}} -\def\NCC@float#1{\@ifstar{\NCC@flt{#1*}}{\NCC@flt{#1}}} -\def\NCC@flt#1{\@ifnextchar[{\NCC@flt@{#1}}{\NCC@flt@{#1}[ht]}} -\def\NCC@flt@#1[#2]{\begin{#1}[#2]\centering +\def\NCC@float#1#2{\@ifstar{\NCC@flt{#1*}{#2}}{\NCC@flt{#1}{#2}}} +\def\NCC@flt#1#2{\@ifnextchar[{\NCC@flt@{#1}}{\NCC@flt@{#1}[#2]}} +\def\NCC@flt@#1[#2]{\begin{#1}[#2]\normalfloatstyle\centering \@ifnextchar({\NCC@@flt{#1}}{\NCC@@flt{#1}()}} \long\def\NCC@@flt#1(#2)#3{% \if!#2!\@tempdima\linewidth \else \NCC@setwidth\@tempdima{#2}\fi \begingroup\NCC@minifloat[c]\@tempdima{#3}% \end{#1}% } -\newcommand{\figs}{\NCC@floats{figure}b} -\newcommand{\tabls}{\NCC@floats{table}t} -\def\NCC@floats#1#2{% - \NCC@pair{\NCC@@flts{#1}{#2}}{\NCC@@flts{#1*}{#2}}{1em}{ht}} +\def\NCC@floats#1#2#3{% + \NCC@pair{\NCC@@flts{#1}{#2}}{\NCC@@flts{#1*}{#2}}{1em}{#3}} \long\def\NCC@@flts#1#2#3#4#5#6#7{% - \begin{#1}[#3]\NCC@wcalc{#4}{#5}% + \begin{#1}[#3]\normalfloatstyle\NCC@wcalc{#4}{#5}% \begingroup\NCC@minifloat[#2]\@tempdima{#6}% \nobreak\hskip\@tempdimc \begingroup\NCC@minifloat[#2]\@tempdimb{#7}% \end{#1}% } -\FloatStyle{\footnotesize\centering} +\newcommand*\newminifloat[4]{% + \edef\@tempa{% + \noexpand\newcommand\expandafter\noexpand\csname mini#1\endcsname{% + \noexpand\begingroup\noexpand\def\noexpand\@captype{#2}% + \noexpand\NCC@minifloat}% + \noexpand\newcommand\expandafter\noexpand\csname side#1\endcsname{% + \noexpand\NCC@sidemfloat{% + \expandafter\noexpand\csname mini#1\endcsname}}% + \noexpand\newcommand\expandafter\noexpand\csname #1\endcsname{% + \noexpand\NCC@float{#2}{#3}}% + \noexpand\newcommand\expandafter\noexpand\csname #1s\endcsname{% + \noexpand\NCC@floats{#2}{#4}{#3}}% + }% + \@tempa +} +\@onlypreamble\newminifloat +\newminifloat{fig}{figure}{ht}{b} +\newminifloat{tabl}{table}{ht}{t} +\FloatStyle{} +\FloatStyle[minifigure]{\footnotesize\centering} +\FloatStyle[minitable]{\footnotesize\centering} \endinput %% %% End of file `nccfloats.sty'. diff --git a/Master/texmf-dist/tex/latex/ncctools/nccsect.sty b/Master/texmf-dist/tex/latex/ncctools/nccsect.sty index bc8c6349896..413a5394627 100644 --- a/Master/texmf-dist/tex/latex/ncctools/nccsect.sty +++ b/Master/texmf-dist/tex/latex/ncctools/nccsect.sty @@ -20,11 +20,12 @@ %% For the copying and distribution conditions of the source files, %% see the README file distributed with the ncctools bundle. %% -%% File: nccsect.dtx Copyright (C) 2002--2005 by Alexander I. Rozhenko +%% File: nccsect.dtx Copyright (C) 2002--2006 by Alexander I. Rozhenko %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nccsect} - [2005/06/15 v1.3 Extended Section, Caption, and TOC Handling (NCC)] + [2006/01/19 v1.5 Extended Section, Caption, and TOC Handling (NCC)] +\RequirePackage{afterpackage} \@ifpackageloaded{nccthm}{}{% \def\NCC@secskip#1{% \if@noskipsec \leavevmode \fi \par @@ -114,138 +115,234 @@ \newcommand{\noindentaftersection}{\@afterindentfalse} \newcommand*{\SectionTagSuffix}[1]{\def\NCC@asecnum{#1}} \@onlypreamble\SectionTagSuffix -\def\NCC@makesectag@default#1{#1\NCC@asecnum} -\def\NCC@defaultsectag{\let\NCC@makesectag\NCC@makesectag@default} -\NCC@defaultsectag +\newcommand*\sectiontagsuffix[2][]{% + \expandafter\def\csname NCC@asecnum@#1\endcsname{\def\NCC@asecnum{#2}}% +} +\let\NCC@asecnum@\@empty +\def\NCC@setsectionsuffix#1{% + \edef\@tempa{NCC@asecnum@\NCC@secname{#1}}% + \@ifundefined{\@tempa}{% + \let\NCC@asecnumset\NCC@asecnum@ + }{% + \expandafter\let\expandafter\NCC@asecnumset\csname\@tempa\endcsname + }% +} +\newcommand*{\RunningSectionSuffix}[1]{\def\NCC@asectitle{\unskip#1}} +\@onlypreamble\RunningSectionSuffix +\def\NCC@preparesectag#1#2{\def\NCC@makesectag##1{#1#2##1\NCC@asecnum}} \def\NCC@secname#1{% - \ifcase#1\relax \or section\or subsection\or subsubsection\or + \ifcase#1main\or section\or subsection\or subsubsection\or paragraph\or subparagraph\else section@\romannumeral#1\fi } -\def\@startsection#1#2#3#4#5#6{% +\def\NCC@startsection#1#2#3#4#5#6{% \@tempskipa #4\relax \ifdim \@tempskipa <\z@ \@temskipa -\@tempskipa \fi \NCC@secskip \@tempskipa - \secdef{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}{\@ssect{#3}{#4}{#5}{#6}}% + \secdef{\NCC@sect{#1}{#2}{#3}{#4}{#5}{#6}}{\NCC@ssect{#3}{#4}{#5}{#6}}% } -\def\@ssect#1#2#3#4#5{% +\def\NCC@ssect#1#2#3#4#5{% \let\@svsec\@empty \NCC@makesec{#1}{#4}{#5}{#3}{}% \NCC@sec@reset@controls - \let\NCC@makesec\NCC@makesect - \NCC@defaultsectag } -\def\@sect#1#2#3#4#5#6[#7]#8{% +\def\NCC@sect#1#2#3#4#5#6[#7]#8{% \def\NCC@make{\NCC@makesec{#3}{#6}{#8}{#5}}% \NCC@makesection{#1}{#2}{#7}{% \addcontentsline{toc}{\NCC@secname{#2}}{% \ifnum #2>\c@secnumdepth \else - \protect\numberline{\csname the#1\endcsname}% + \numberline{\csname the#1\endcsname}% \fi #7% }% }% - \let\NCC@makesec\NCC@makesect - \NCC@defaultsectag } \def\NCC@makesect#1#2#3#4#5{% \@tempskipa #4\relax \ifdim \@tempskipa>\z@ \begingroup \normalfont - #2{\@hangfrom{\hskip #1\relax\@svsec}% - \interlinepenalty \@M\ignorespaces #3\@@par}% + \NCC@asecnumset + \NCC@secttitle{#2}{\NCC@hangfrom{\hskip #1\relax\@svsec}}% + {\interlinepenalty \@M\ignorespaces #3\@@par} \endgroup #5% \else - \def\@svsechd{{\normalfont #2{\hskip #1\relax - \@svsec\ignorespaces #3}}#5}% + \def\@svsechd{{\normalfont + \NCC@asecnumset + \def\norunningsuffix{\protect\NCC@nosecsuffix}% + \NCC@secptitle{#2}{\hskip #1\relax{\@svsec}}% + {\ignorespaces #3\NCC@asectitle}#5}}% \fi \@xsect{#4}% } -\let\NCC@makesec\NCC@makesect -\newcommand*{\sectionstyle}[1]{% - \@ifundefined{NCC@sec@#1}% - {\PackageError{nccsect}{Unknown section style `#1'}{}}% - {\csname NCC@sec@#1\endcsname}% +\def\NCC@secttitle#1#2#3{#1{#2#3}} +\def\NCC@secptitle#1#2#3{#1{#2#3}} +\newcommand*\norunningsuffix{} +\def\NCC@nosecsuffix{\let\NCC@asectitle\@empty} +\def\NCC@hangfrom{% + \NCC@setsecmargins{\z@skip}{\z@skip}\NCC@hangsecstyle{\z@}{}% +} +\def\NCC@setsecmargins#1#2{% + \leftskip\z@skip \rightskip\z@skip + \parfillskip\@flushglue + \let\\\@normalcr + \NCC@adjsecmargins{#1}{#2}% + \NCC@secmarginshook +} +\def\NCC@adjsecmargins#1#2{% + \setlength\@tempskipa{#1}\advance\leftskip\@tempskipa + \setlength\@tempskipb{#2}\advance\rightskip\@tempskipb + \advance\@tempskipa -1\@tempskipa \advance\@tempskipb -1\@tempskipb + \advance\@tempskipa -\@tempskipb \advance\parfillskip\@tempskipa +} +\def\NCC@hangsecstyle#1#2#3{% + \setlength\@tempdima{#1}% + \setbox\@tempboxa\hbox{#3}% + \ifdim \wd\@tempboxa > \@tempdima + \hangindent\wd\@tempboxa \noindent \box\@tempboxa + \else + \hangindent\@tempdima + \noindent \makebox[\@tempdima][#2]{\unhbox\@tempboxa}% + \fi +} +\newcommand*\adjustsectionmargins[2]{% + \NCC@global\def\NCC@secmarginshook{\NCC@adjsecmargins{#1}{#2}} } -\def\NCC@sec@hangindent{\def\NCC@sec##1{\@hangfrom{##1}}} -\@namedef{NCC@sec@hangindent*}{% - \def\NCC@sec##1{\@hangfrom{##1}\rightskip\@flushglue}% +\g@addto@macro\NCC@sec@reset@controls{% + \NCC@global\let\NCC@secmarginshook\@empty } -\def\NCC@sec@parindent{\def\NCC@sec##1{\@hangfrom\indent##1}} -\@namedef{NCC@sec@parindent*}{% - \def\NCC@sec##1{\@hangfrom\indent\rightskip\@flushglue##1}% +\let\NCC@secmarginshook\@empty +\newcommand*\newplainsectionstyle[2]{% + \@ifnextchar[{\NCC@newplainsec{#1}{#2}}{\NCC@newplainsec{#1}{#2}[l]}% +} +\def\NCC@newplainsec#1#2[#3]#4#5{% + \def\@tempa{#3}\def\@tempb{c}% + \ifx\@tempa\@tempb + \expandafter\newcommand\csname NCC@sec@#1\endcsname + {\def\NCC@sec{\NCC@setsecmargins{#4}{#5}% + \let\\\@centercr \advance\parfillskip -\@flushglue + \setlength\parindent{#2}}}% + \else + \def\@tempb{r}% + \ifx\@tempa\@tempb + \expandafter\newcommand\csname NCC@sec@#1\endcsname + {\def\NCC@sec{\NCC@setsecmargins{#4}{#5}% + \let\\\@centercr \advance\parfillskip -\@flushglue + \advance\parfillskip -\@flushglue + \setlength\parindent{#2}}}% + \else + \expandafter\newcommand\csname NCC@sec@#1\endcsname + {\def\NCC@sec{\NCC@setsecmargins{#4}{#5}\setlength\parindent{#2}}}% + \fi + \fi +} +\@onlypreamble\newplainsectionstyle +\@onlypreamble\NCC@newplainsec +\newcommand*\newhangsectionstyle[2]{% + \@ifnextchar[{\NCC@newhangsec{#1}{#2}}{\NCC@newhangsec{#1}{#2}[l]}% +} +\def\NCC@newhangsec#1#2[#3]#4#5{% + \expandafter\newcommand\csname NCC@sec@#1\endcsname + {\def\NCC@sec{\NCC@setsecmargins{#4}{#5}\NCC@hangsecstyle{#2}{#3}}}% +} +\@onlypreamble\newhangsectionstyle +\@onlypreamble\NCC@newhangsec +\newhangsectionstyle{hangindent}{\z@}{\z@skip}{\z@skip} +\newhangsectionstyle{hangindent*}{\z@}{\z@skip}{\@flushglue} +\newhangsectionstyle{hangparindent}{\z@}{\parindent}{\z@skip} +\newhangsectionstyle{hangparindent*}{\z@}{\parindent}{\@flushglue} +\newplainsectionstyle{parindent}{\z@}{\parindent}{\z@skip} +\newplainsectionstyle{parindent*}{\z@}{\parindent}{\@flushglue} +\newplainsectionstyle{center}{\z@}[c]{\@flushglue}{\@flushglue} +\newplainsectionstyle{centerlast}{\z@}[c]{\@flushglue}{-\@flushglue} +\newcommand*{\sectionstyle}[2][]{% + \@ifundefined{NCC@sec@#2}{% + \PackageError{nccsect}{Unknown section style `#2'}{}% + }{% + \expandafter\def\csname NCC@secstyle@#1\endcsname{% + \csname NCC@sec@#2\endcsname + }% + }% +} +\def\NCC@setsectionstyle#1{% + \edef\@tempa{NCC@secstyle@\NCC@secname{#1}}% + \@ifundefined{\@tempa}{\NCC@secstyle@}{\csname\@tempa\endcsname}% } -\def\NCC@sec@center{\def\NCC@sec##1{\centering##1}} \def\NCC@makesecx#1#2#3#4#5{% \begingroup\normalfont - #2{\NCC@sec{\@svsec}\interlinepenalty \@M\ignorespaces #3\@@par}% + \NCC@asecnumset + \NCC@secxtitle{#2}{\protect\NCC@sec{\@svsec}} + {\interlinepenalty \@M\ignorespaces #3\@@par}% \endgroup #5% \par \nobreak \vskip #4\relax \@afterheading \ignorespaces } +\def\NCC@secxtitle#1#2#3{#1{#2#3}} +\providecommand*\partmark[1]{\markboth{}{}} \@ifundefined{chapter}{% \def\NCC@startmainsec#1#2#3#4#5{% - \def\NCC@makesectag##1{\leavevmode#2\partname\nobreakspace##1}% + \NCC@preparesectag{\leavevmode#2}{\partname\nobreakspace}% \NCC@secskip{#3}% - \secdef{\@part{#1}{#4}{#5}}{\@spart{#1}{#4}{#5}}% + \secdef{\NCC@part{#1}{#4}{#5}}{\NCC@spart{#1}{#4}{#5}}% } - \def\@spart#1#2#3#4{% + \def\NCC@spart#1#2#3#4{% \let\@svsec\@empty \NCC@makepart{#1}{#3}{#4}{#2}{}% \NCC@sec@reset@controls - \NCC@defaultsectag } - \def\@part#1#2#3[#4]#5{% + \def\NCC@part#1#2#3[#4]#5{% \def\NCC@make{\NCC@makepart{#1}{#3}{#5}{#2}}% \NCC@makesection{part}{\z@}{#4}{% \addcontentsline{toc}{part}{% - \ifnum \c@secnumdepth>\m@ne \protect\numberline{\thepart}\fi + \ifnum \c@secnumdepth>\m@ne \numberline{\thepart}\fi #4% }% }% - \NCC@defaultsectag } \def\NCC@makepart#1#2#3#4#5{% \begingroup \normalfont - \ifx\@svsec\@empty \else #1{\@svsec\@@par}\nobreak \fi - \interlinepenalty \@M #1{#2{#3}\@@par}% + \NCC@asecnumset + \NCC@makeparttitle{#1}{#2}{#3}% \endgroup #5% \par\nobreak \vskip #4\relax \@afterheading \ignorespaces } - \providecommand*\partmark[1]{\markboth{}{}} + \def\NCC@makeparttitle#1#2#3{% + \ifx\@svsec\@empty \else + \NCC@secmain#1{\let\NCC@asecnum\@empty\@svsec\@@par}\nobreak + \fi + \interlinepenalty \@M \NCC@secmain#1{#2{#3\@@par}}% + } + \def\NCC@partsection{\NCC@mainsection} }{ \def\NCC@startmainsec#1#2#3#4#5{% \NCC@startchap - \def\NCC@makesectag##1{\leavevmode#2\@chapapp\nobreakspace##1}% - \secdef{\@chapter{#1}{#3}{#4}{#5}}{\@schapter{#1}{#3}{#4}{#5}}% + \NCC@preparesectag{\leavevmode#2}{\@chapapp\nobreakspace}% + \secdef{\NCC@chapter{#1}{#3}{#4}{#5}}{\NCC@schapter{#1}{#3}{#4}{#5}}% } - \newcommand\beforechapter[1]{\gdef\NCC@beforechapter{#1}} - \beforechapter{} - \def\@schapter#1#2#3#4#5{% + \def\NCC@startchap{% + \if@openright\cleardoublepage\else\clearpage\fi + \thispagestyle{plain}\global\@topnum\z@ + } + \def\NCC@schapter#1#2#3#4#5{% \let\@svsec\@empty \NCC@makechapter{#1}{#2}{#4}{#5}{#3}{}% \NCC@sec@reset@controls - \NCC@defaultsectag } - \def\@chapter#1#2#3#4[#5]#6{% + \def\NCC@chapter#1#2#3#4[#5]#6{% \@ifundefined{if@mainmatter}{}{\if@mainmatter\else\noheadingtag\fi}% \def\NCC@make{\NCC@makechapter{#1}{#2}{#4}{#6}{#3}}% \NCC@makesection{chapter}{\z@}{#5}{% \typeout{\@chapapp\space\thechapter.}% \addcontentsline{toc}{chapter}{% \ifnum \c@secnumdepth>\m@ne - \protect\numberline{\NCC@thetocchapter}\fi + \numberline{\NCC@thetocchapter}\fi #5% }% \NCC@infloats{\addtocontents{\@nameuse{ext@\@captype}}% {\protect\runinsectionskip}}% }% - \NCC@defaultsectag - } - \def\NCC@startchap{% - \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{plain}\global\@topnum\z@ } + \newcommand\beforechapter[1]{\gdef\NCC@beforechapter{#1}} + \beforechapter{} \def\NCC@thetocchapter{\thechapter} \def\NCC@makechapter#1#2#3#4#5#6{% \if@twocolumn @@ -253,13 +350,25 @@ \else \NCC@makechaphead{#1}{#2}{#3}{#4}{#5}% \fi - #6% + \NCC@makechapfinal{#6}% \@afterheading \ignorespaces } + \let\NCC@makechapfinal\@firstofone + \def\NCC@makechapfinalgobble#1{% + \let\NCC@makechapmark\NCC@makemark + \def\NCC@makemark{% + \let\NCC@temp\@chapapp + \let\@chapapp\@gobble + \NCC@makechapmark + \let\@chapapp\NCC@temp + }% + #1% + } + \@onlypreamble\NCC@makechapfinalgobble \def\NCC@makechaphead#1#2#3#4#5{% \ifx\NCC@beforechapter\@empty - \StartFromTextArea \vspace{#2}% + \StartFromTextArea \vskip #2% \else \begingroup \@twocolumnfalse @@ -270,11 +379,17 @@ \beforechapter{}% \fi \begingroup \normalfont - \ifx\@svsec\@empty \else #1{\@svsec\@@par}\fi - \interlinepenalty \@M #1{#3{#4}\@@par}% + \NCC@asecnumset + \NCC@makechaptitle{#1}{#3}{#4}% \endgroup \par\nobreak \vskip #5\relax } + \def\NCC@makechaptitle#1#2#3{% + \ifx\@svsec\@empty \else + \NCC@secmain#1{\let\NCC@asecnum\@empty\@svsec\@@par}% + \fi + \interlinepenalty \@M \NCC@secmain#1{#2{#3\@@par}}% + } \newcommand*\epigraph[1][\NCC@epigraphwidth]{\NCC@epigraph{#1}} \newcommand*\epigraphparameters[5]{% \def\NCC@epigraphwidth{#2}% @@ -298,9 +413,60 @@ \leavevmode\box\@tempboxa \@end@tempboxa } + \def\NCC@startpart{% + \if@openright\cleardoublepage\else\clearpage\fi + \thispagestyle{plain}% + } + \def\NCC@spart#1#2#3#4{% + \let\@svsec\@empty + \NCC@makepart{#1}{#3}{#4}{#2}{}% + \NCC@sec@reset@controls + } + \def\NCC@part#1#2#3[#4]#5{% + \def\NCC@make{\NCC@makepart{#1}{#3}{#5}{#2}}% + \NCC@makesection{part}{\m@ne}{#4}{% + \addcontentsline{toc}{part}{% + \ifnum \c@secnumdepth>-2 + \numberline{\NCC@thetocpart}\fi + #4% + }% + }% + } + \def\NCC@thetocpart{\thepart} + \def\NCC@makepart#1#2#3#4#5{% + \if@twocolumn \onecolumn \@tempswatrue \else \@tempswafalse \fi + \begingroup\normalfont + \NCC@asecnum@ + \NCC@makeparttitle{#1}{#2}{#3}% + \endgroup + \NCC@makepartfinal{#5}#4% + \if@tempswa \twocolumn \fi + } + \let\NCC@makepartfinal\@firstofone + \def\NCC@makepartfinalgobble#1{% + \let\NCC@makepartmark\NCC@makemark + \def\NCC@makemark{% + \let\NCC@temp\partname + \let\partname\@gobble + \NCC@makepartmark + \let\partname\NCC@temp + }% + #1% + } + \@onlypreamble\NCC@makepartfinalgobble + \def\NCC@makeparttitle#1#2#3{#1% + \ifx\@svsec\@empty \else + {\let\NCC@asecnum\@empty\@svsec\@@par}\nobreak \fi + \interlinepenalty \@M #2{#3\@@par} + } } \newcommand*{\CaptionTagSuffix}[1]{\def\NCC@acapnum{#1}} \@onlypreamble\CaptionTagSuffix +\newcommand*\captiontagsuffix[2][]{% + \NCC@prepare@capkey{suffix}{#1}{\def\NCC@acapnum{#2}}% +} +\let\NCC@capsuffix@\@empty + \newcommand*\captionstyle[1][]{% \NCC@set@capkey{style}{style}{#1}% } @@ -308,7 +474,7 @@ \NCC@set@capkey{tag}{tag style}{#1}% } \newcommand*\captionwidth[2][]{% - \NCC@prepare@capkey{width}{#1}{\setlength{\hsize}{#2}}% + \NCC@prepare@capkey{width}{#1}{\setlength{\@tempdima}{#2}}% } \def\NCC@set@capkey#1#2#3#4{% \@ifundefined{NCC@makecap#1@#4} @@ -340,7 +506,6 @@ \let\@svsec\@empty \NCC@makecaption{#3}{#1}{#4}{#2}{}% \NCC@sec@reset@controls - \NCC@defaultsectag } \long\def\NCC@caption#1#2#3[#4]#5{% \def\NCC@make{\NCC@makecaption{#3}{#1}{#5}{#2}}% @@ -349,12 +514,11 @@ \let\centering\@empty \addcontentsline{\@nameuse{ext@\@captype}}{\@captype}{% \ifnum \c@secnumdepth>\m@ne - \protect\numberline{\@nameuse{the\@captype}}\fi + \numberline{\@nameuse{the\@captype}}\fi #4% }% \endgroup }% - \NCC@defaultsectag } \long\def\NCC@makecaption#1#2#3#4#5{% \begingroup\par\normalfont @@ -363,14 +527,37 @@ \def\@tempa{#3}% \ifx\@tempa\@empty \else \advance\@tempcnta\tw@ \fi \ifnum\@tempcnta=\z@ \else - \vtop{\NCC@apply@cap{width}\@parboxrestore - \NCC@apply@cap{tag}{#3}\@@par}\par + \NCC@apply@cap{suffix}% + \NCC@apply@cap{width}% + \NCC@vtopcap{\@parboxrestore\NCC@apply@cap{tag}{#3}\@@par}\par \setlength\@tempskipa{#4}% \ifdim\@tempskipa=\z@ \else \vskip \@tempskipa\fi \fi \endgroup #5% } +\def\NCC@vtopcap#1{% + \ifdim\@tempdima>\linewidth + \@tempskipa \leftskip \advance\@tempskipa -1\@tempskipa + \@tempskipb \rightskip \advance\@tempskipb \parfillskip + \advance\@tempskipb -1\@tempskipb + \vtop{\hb@xt@\linewidth{% + \NCC@ifzeroskip\@tempskipa{}{\hss}% + \vtop{\hsize\@tempdima#1}% + \NCC@ifzeroskip\@tempskipb{}{\hss}% + }}% + \else + \vtop{\hsize\@tempdima#1}% + \fi +} +\def\NCC@ifzeroskip#1{% + \edef\@tempa{\the#1}\edef\@tempb{\the\z@skip}% + \ifx\@tempa\@tempb + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi +} \long\def\NCC@makecaptag@para#1{% \ifnum\@tempcnta<\thr@@ \let\NCC@acapnum\@empty\fi \NCC@apply@cap{style}{{\@svsec}\ignorespaces#1}% @@ -397,8 +584,7 @@ \long\def\NCC@makecapstyle@right#1{\raggedleft#1} \long\def\NCC@makecapstyle@center#1{\centering#1} \long\def\NCC@makecapstyle@centerlast#1{% - \leftskip\z@\@plus 1fil% - \rightskip\z@\@plus -1fil% + \leftskip\@flushglue \rightskip -\@flushglue \parfillskip\z@\@plus 2fil\relax#1% } \newcommand*{\RegisterFloatType}[1]{% @@ -423,13 +609,18 @@ \def\NCC@dsect#1#2[#3]#4#5#6#7{% \ifnum#1>\z@ \expandafter\def\csname NCC@section\romannumeral#1\endcsname{% - \def\NCC@makesectag####1{#4####1\NCC@asecnum}% + \NCC@setsectionsuffix{#1}% + \NCC@preparesectag{#4}{}% \let\NCC@makesec\NCC@makesect - \@startsection{#2}{#1}{#3}{#5}{#6}{#7}}% + \NCC@startsection{#2}{#1}{#3}{#5}{#6}{#7}}% \else \ifnum#1=\z@ \def\NCC@mainsection{% - \NCC@startmainsec{\@hangfrom{\hskip #3}\rightskip\@flushglue}% + \NCC@setsectionsuffix\z@ + \let\NCC@secmain\@empty + \NCC@startmainsec{% + \NCC@hangfrom{\hskip #3}\NCC@adjsecmargins{}\@flushglue + \ignorespaces}% {#4}{#5}{#6}{#7}% }% \else @@ -441,14 +632,19 @@ \def\NCC@dsecx#1#2#3#4#5#6{% \ifnum#1>\z@ \expandafter\def\csname NCC@section\romannumeral#1\endcsname{% - \def\NCC@makesectag####1{#3####1\NCC@asecnum}% + \NCC@setsectionsuffix{#1}% + \NCC@setsectionstyle{#1}% + \NCC@preparesectag{#3}{}% \let\NCC@makesec\NCC@makesecx - \@startsection{#2}{#1}{\z@}{#4}{#5}{#6}}% + \NCC@startsection{#2}{#1}{\z@}{#4}{#5}{#6}}% \else \ifnum#1=\z@ \def\NCC@mainsection{% - \NCC@startmainsec{\NCC@sec{}\rightskip\@flushglue}% - {#3}{#4}{#5}{#6}% + \NCC@setsectionsuffix\z@ + \NCC@setsectionstyle\z@ + \let\NCC@secsave\NCC@sec \let\NCC@sec\NCC@secflush + \def\NCC@secmain{\protect\NCC@sec{}}% + \NCC@startmainsec{}{#3}{#4}{#5}{#6}% }% \else \NCC@dsecf{#2}{#3}{#4}{#5}{#6}% @@ -456,6 +652,17 @@ \fi } \@onlypreamble\NCC@dsecx +\def\NCC@secflush#1{\NCC@secsave{#1}% + \@tempskipa\leftskip \advance\@tempskipa\rightskip + \advance\@tempskipa -1\@tempskipa + \NCC@ifzeroskip\@tempskipa{% + \@tempskipa 1\rightskip \advance\@tempskipa -\rightskip + \advance\@tempskipa \@flushglue + \advance\rightskip \@tempskipa + \advance\parfillskip -\@tempskipa + }{}% + \ignorespaces +} \def\NCC@dsecf#1#2#3#4#5{% \expandafter\def\csname NCC@cap@#1\endcsname{% \def\NCC@makesectag####1{#2{\csname #1name\endcsname}% @@ -464,6 +671,16 @@ }% } \@onlypreamble\NCC@dsectf +\@ifundefined{chapter}{}{% + \newcommand\DeclarePart[4]{% + \def\NCC@partsection{% + \NCC@startpart + \NCC@preparesectag{\leavevmode#3}{\partname\nobreakspace}% + \secdef{\NCC@part{#1}{#2}{#4}}{\NCC@spart{#1}{#2}{#4}}% + }% + } + \@onlypreamble\DeclarePart +} \long\def\@makecaption#1#2{% \begingroup \skipwritingtoaux @@ -471,32 +688,44 @@ \csname NCC@cap@\@captype\endcsname[]{#2}% \endgroup } -\AtBeginDocument{% - \@ifpackageloaded{supertabular}{% - \long\def\ST@caption#1[#2]#3{\par% - \addcontentsline{\csname ext@#1\endcsname}{#1}% - {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}% +\AfterPackage{supertabular}{% + \long\def\ST@caption#1[#2]#3{\par% + \addcontentsline{\csname ext@#1\endcsname}{#1}% + {\numberline{\csname the#1\endcsname}{\ignorespaces #2}}% + \begingroup\centering \def\@captype{#1}% \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par - }% - }{}% - \@ifpackageloaded{longtable}{% - \def\LT@makecaption#1#2#3{% - \LT@mcol\LT@cols c{\hbox to\z@{\hss - \parbox[t]\LTcapwidth{\def\@captype{table}% - \ifx#1\@gobble \NCC@cap@table*{#3}% - \else \@makecaption{\fnum@table}{#3}% - \fi - }% - \hss - }}% - }% - }{}% + \endgroup + } +} +\AfterPackage{xtab}{% + \long\def\ST@caption#1[#2]#3{\par% + \@initisotab + \addcontentsline{\csname ext@#1\endcsname}{#1}% + {\numberline{\csname the#1\endcsname}{\ignorespaces #2}}% + \begingroup\centering + \def\@captype{#1}% + \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par + \endgroup + \global\advance\ST@pageleft -\PWSTcapht + \ST@trace\tw@{Added caption. Space left for xtabular: \the\ST@pageleft}% + } +} +\AfterPackage{longtable}{% + \def\LT@makecaption#1#2#3{% + \LT@mcol\LT@cols c{\hbox to\z@{\hss + \parbox[t]\LTcapwidth{\centering\def\@captype{table}% + \ifx#1\@gobble \NCC@cap@table*{#3}% + \else \@makecaption{\fnum@table}{#3}% + \fi + }% + \hss + }}% + } } \newcommand*{\DeclareTOCEntry}[5]{% \@ifnextchar[{\NCC@dtoc{#1}{#2}{#3}{#4}{#5}}% - {\NCC@dtoc{#1}{#2}{#3}{#4}{#5}% - [{#3#4\let\NCC@do\@firstoftwo\NCC@atocnum}]}% + {\NCC@dtoc{#1}{#2}{#3}{#4}{#5}[\NCC@nexttocnum{#3}{#4}]}% } \def\NCC@dtoc#1#2#3#4#5[#6]{% \ifnum#1<\z@ @@ -512,7 +741,7 @@ \if@tempswa \@tempcnta#1\relax \@tempcnta -\@tempcnta - \PackageError{nccsect} + \PackageError{nccsect}% {Float type registration number \the\@tempcnta\space is out of range}{}% \fi @@ -527,11 +756,35 @@ \@tempa{\NCC@tocentry{#1}{#2}{#3}{#4}{#5}}% \@tempcnta #1\relax \advance\@tempcnta\@ne \expandafter\def\csname l@tocskip@\romannumeral\@tempcnta - \endcsname{\NCC@tocadj{#5{#6}}}% + \endcsname{\NCC@tocadj{\NCC@tocnumprototype{#5}{#6}}}% \fi } \@onlypreamble\DeclareTOCEntry \@onlypreamble\NCC@dtoc +\def\NCC@nexttocnum#1#2{#1#2\NCC@atocnum} +\def\NCC@tocnumprototype#1#2{\let\applystyle\@firstoftwo#1{#2}} +\def\NCC@tocadj#1{% + \settowidth\@tempdima{\let\NCC@atocdo\@firstoftwo#1}% + \advance\@tempdimb\@tempdima +} +\@ifundefined{chapter}{}{% + \newcommand*\DeclareTOCPart[1]{% + \@ifnextchar[{\NCC@dtocpart{#1}}{\NCC@dtocpart{#1}[\NCC@runskip]}% + } + \def\NCC@dtocpart#1[#2]#3#4#5{% + \def\l@part##1##2{% + \NCC@tocentry{-1}{% + \TOCMarginDrift{1fil}% + \addpenalty{-\@highpenalty}#1% + }{#3}{#4}{#5}{##1}{\hss##2}% + \nobreak \vskip #2\relax + \@nobreaktrue + \everypar{\@nobreakfalse\everypar{}}% + }% + } + \@onlypreamble\DeclareTOCPart + \@onlypreamble\NCC@dtocpart +} \def\NCC@tocentry#1#2#3#4#5#6#7{% \ifnum #1>\c@tocdepth \else \par\begingroup\normalfont #2% @@ -540,17 +793,20 @@ \@whilenum \@tempcnta >\z@\do {\@nameuse{l@tocskip@\romannumeral \@tempcnta}% \advance\@tempcnta\m@ne}% - \def\NCC@maketocnum##1{\NCC@do{#5}{}{#3##1\NCC@atocnum}}% - \settowidth\@tempdima{\let\NCC@do\@firstoftwo\NCC@maketocnum{#4}}% + \NCC@preparetocnum{#5}{#3}% + \settowidth\@tempdima{\let\NCC@atocdo\@firstoftwo\NCC@maketocnum{#4}}% \@dottedtocline{#1}{\@tempdimb}{\@tempdima}% - {\let\NCC@do\@secondoftwo#5{\ignorespaces#6\unskip}}% + {\let\NCC@atocdo\@secondoftwo\NCC@tocentrytitle{#5}{#6\unskip}}% {\let\applystyle\@secondoftwo#5{#7}}% \@nobreakfalse \endgroup \fi } -\def\NCC@tocadj#1{\settowidth\@tempdima{#1}\advance\@tempdimb\@tempdima} -\def\numberline#1{% +\def\NCC@preparetocnum#1#2{% + \def\NCC@maketocnum##1{\NCC@atocdo{#1}{}{#2##1\NCC@atocnum}}% +} +\def\NCC@tocentrytitle#1#2{#1{\ignorespaces#2}} +\DeclareRobustCommand*\numberline[1]{% \setbox\@tempboxa\hbox{\NCC@maketocnum{#1}}% \ifdim \wd\@tempboxa > \@tempdima \box\@tempboxa @@ -559,15 +815,15 @@ \fi \ignorespaces } -\def\NCC@maketocnum#1{#1\let\NCC@do\@secondoftwo\NCC@atocnum} -\newcommand*{\NumberlineSuffix}[2]{\def\NCC@atocnum{\NCC@do{#1}{#2}}} +\def\NCC@maketocnum#1{#1\NCC@atocnum} +\let\NCC@atocdo\@secondoftwo +\newcommand*{\NumberlineSuffix}[2]{\def\NCC@atocnum{\NCC@atocdo{#1}{#2}}} \@onlypreamble\NumberlineSuffix \newcommand*\TOCMarginDrift[1]{% \def\@tempa{#1}% \ifx\@tempa\@empty \let\NCC@tocdrift\@empty \else \def\NCC@tocdrift{\@plus #1\relax}\fi } -\TOCMarginDrift{} \newcommand*{\PnumPrototype}[1]{\def\NCC@pnum{#1}\NCC@setpnum} \@onlypreamble\PnumPrototype \def\NCC@setpnum{% @@ -576,14 +832,30 @@ \advance\@tempdima 1em \edef\@tocrmarg{\the\@tempdima \noexpand\NCC@tocdrift}% } -\newcommand\StartFromTextArea{\par - {\parskip\z@ \strut\par}\vskip -\baselineskip +\newcommand*{\SetTOCStyle}[1]{\def\NCC@tocstyle{#1}} +\@onlypreamble\SetTOCStyle +\let\NCC@latexstarttoc\@starttoc +\def\@starttoc#1{% + \begingroup + \normalfont \NCC@tocstyle \NCC@setpnum + \NCC@latexstarttoc{#1}% + \endgroup } -\newcommand\StartFromHeaderArea{% - \StartFromTextArea - \vskip -\headsep \vskip -\ht\strutbox +\@ifpackageloaded{textarea}{}{% + \newcommand\StartFromTextArea{\par + {\parskip\z@ \strut\par}\vskip -\baselineskip + } + \newcommand\StartFromHeaderArea{% + \StartFromTextArea + \vskip -\headsep \vskip -\ht\strutbox + } } \newcommand{\bff}{\normalfont\bfseries\mathversion{bold}} +\newcommand*\aftersectionvspace[1]{% + \ifvmode \if@nobreak + \vskip -\lastskip \vskip #1\relax + \fi \fi +} \newcommand*{\startsection}[1]{% \ifnum#1>\z@ \def\@tempa{\csname NCC@section\romannumeral#1\endcsname}% @@ -591,11 +863,12 @@ \ifnum#1=\z@ \def\@tempa{\NCC@mainsection}% \else - \def\@tempa{\part}% + \def\@tempa{\NCC@partsection}% \fi \fi \@tempa } +\def\part{\startsection\m@ne} \def\section{\startsection\@ne} \def\subsection{\startsection\tw@} \def\subsubsection{\startsection\thr@@} @@ -634,7 +907,6 @@ \DeclareSection5{subparagraph}[\parindent]{}% {\NCC@runskip}{-1em}{\normalsize\bff} \@ifundefined{chapter}{ - \def\part{\startsection\z@} \DeclareSection*0{part}{\Large\bff}% {5ex \@plus 1ex \@minus .2ex}% {4ex \@plus .2ex}{\huge\bff} @@ -645,11 +917,32 @@ \DeclareTOCEntry2{}{}{9.9}{} \DeclareTOCEntry3{}{}{9.9.9}{} }{ + \newcommand*{\ChapterPrefixStyle}[1]{% + \def\NCC@thetocchapter{\thechapter}% + \let\NCC@makechapfinal\NCC@makechapfinalgobble + \@for\@tempa:=#1\do{% + \@ifundefined{NCC@chapin@\@tempa}{% + \PackageError{nccsect}{Unknown style `\@tempa'\MessageBreak + Only the `toc' and `header' styles are allowed}{}% + }{\csname NCC@chapin@\@tempa\endcsname}% + }% + } + \def\NCC@chapin@toc{\def\NCC@thetocchapter{\@chapapp\ \thechapter}} + \def\NCC@chapin@header{\let\NCC@makechapfinal\@firstofone} + \@onlypreamble\ChapterPrefixStyle + \@onlypreamble\NCC@chapin@toc + \@onlypreamble\NCC@chapin@header \def\chapter{\startsection\z@} + \DeclarePart{\StartFromTextArea\vfil\centering}% + {\vfil\newpage \if@twoside\if@openright + \mbox{}\thispagestyle{empty}\newpage\fi\fi}% + {\vspace{4ex}\huge\bff}{\Huge\bff} \DeclareSection*0{chapter}{\vspace{3ex}\huge\bff}{10ex}% {8ex \@plus .2ex}{\Huge\bff} \DeclareTOCEntry{-2}{}{}{9.9}{}% table \DeclareTOCEntry{-1}{}{}{9.9}{}% figure + \DeclareTOCPart{\NCC@secskip{4ex \@plus .2ex}\def\@dotsep{1000}} + {}{II}{\large\bff} \DeclareTOCEntry0{\runinsectionskip\def\@dotsep{1000}% \aftergroup\penalty\aftergroup\@highpenalty}{}{9}{\bff} \DeclareTOCEntry1{}{}{9.9}{}[9.9] @@ -664,12 +957,15 @@ \noindentaftersection \sectionstyle{hangindent} \SectionTagSuffix{\quad} +\RunningSectionSuffix{} \captionwidth{\linewidth} \captionstyle{default} \captiontagstyle{para} \CaptionTagSuffix{:\hskip .7em \@plus .2em \@minus .1em} \NumberlineSuffix{\quad}{\enskip} \PnumPrototype{99} +\TOCMarginDrift{} +\SetTOCStyle{} \endinput %% %% End of file `nccsect.sty'. diff --git a/Master/texmf-dist/tex/latex/ncctools/textarea.sty b/Master/texmf-dist/tex/latex/ncctools/textarea.sty new file mode 100644 index 00000000000..18ce2ae91c8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ncctools/textarea.sty @@ -0,0 +1,112 @@ +%% +%% This is file `textarea.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% textarea.dtx (with options: `package') +%% +%% IMPORTANT NOTICE: +%% +%% This file is a generated file from the sources of the `ncctools' +%% bundle. +%% +%% You are not allowed to modify this file. +%% +%% You are allowed to distribute this file if and only if +%% it is distributed with the corresponding source files in +%% the `ncctools' bundle. +%% +%% For the copying and distribution conditions of the source files, +%% see the README file distributed with the ncctools bundle. +%% +%% File: textarea.dtx Copyright (C) 2005 by Alexander I. Rozhenko +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{textarea} + [2005/12/26 v1.0 Text area control (NCC)] +\@ifpackageloaded{nccsect}{}{% + \newcommand\StartFromTextArea{\par + {\parskip\z@ \strut\par}\vskip -\baselineskip + } + \newcommand\StartFromHeaderArea{% + \StartFromTextArea + \vskip -\headsep \vskip -\ht\strutbox + } +} +\newcommand*\RestoreTextArea{} +\newcommand*\ExpandTextArea[1][*]{% + \if@twocolumn + \PackageError{textarea}% + {The \string\ExpandTextArea\space command\MessageBreak + cannot work in two-column mode}{}% + \else + \def\@tempa{*}\edef\@tempb{#1}% + \ifx\@tempa\@tempb + \StartFromHeaderArea + \else + \ifx\RestoreTextArea\@empty + \let\NCC@h\@empty \global\let\NCC@restore@h\@empty + \let\NCC@f\@empty \global\let\NCC@restore@f\@empty + \let\NCC@m\@empty \global\let\NCC@restore@m\@empty + \expandafter\@tfor\expandafter\@tempa\expandafter:\expandafter=#1\do{% + \if h\@tempa + \def\NCC@h{\NCC@adjusttoheader{}}% + \gdef\NCC@restore@h{\NCC@adjusttoheader-}% + \else + \if f\@tempa + \def\NCC@f{\NCC@adjusttofooter{}}% + \gdef\NCC@restore@f{\NCC@adjusttofooter-}% + \else + \if m\@tempa + \if@reversemargin \@tempcnta\@ne \else \@tempcnta\tw@ \fi + \edef\NCC@m{\noexpand\NCC@adjusttomargin{}{\the\@tempcnta}}% + \xdef\NCC@restore@m{\noexpand\NCC@adjusttomargin-{\the\@tempcnta}}% + \fi + \fi + \fi + }% + \NCC@h\NCC@f\NCC@m + \StartFromTextArea + \gdef\RestoreTextArea{% + \NCC@restore@h\NCC@restore@f\NCC@restore@m + \global\let\RestoreTextArea\@empty + }% + \def\NCC@restoretextarea{\RestoreTextArea}% + \fi + \fi + \fi +} +\def\NCC@adjusttoheader#1{% + \@tempdima #1\headheight + \advance\@tempdima #1\headsep + \global\advance\textheight\@tempdima + \global\advance\topmargin-\@tempdima + \global\@colht\textheight + \global\@colroom\textheight + \global\vsize\textheight +} +\def\NCC@adjusttofooter#1{% + \global\advance\textheight#1\footskip + \global\@colht\textheight + \global\@colroom\textheight + \global\vsize\textheight +} +\def\NCC@adjusttomargin#1#2{% + \@tempdima #1\marginparwidth + \advance\@tempdima #1\marginparsep + \@tempcnta#2% + \ifodd\@tempcnta + \global\advance\oddsidemargin -\@tempdima + \else + \global\advance\evensidemargin -\@tempdima + \fi + \global\advance\textwidth\@tempdima + \global\columnwidth\textwidth + \global\linewidth\textwidth + \global\hsize\textwidth +} +\let\NCC@restoretextarea\@empty +\endinput +%% +%% End of file `textarea.sty'. diff --git a/Master/texmf-dist/tex/latex/ncctools/topsection.sty b/Master/texmf-dist/tex/latex/ncctools/topsection.sty new file mode 100644 index 00000000000..5f041ab50f1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ncctools/topsection.sty @@ -0,0 +1,58 @@ +%% +%% This is file `topsection.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% topsection.dtx (with options: `package') +%% +%% IMPORTANT NOTICE: +%% +%% This file is a generated file from the sources of the `ncctools' +%% bundle. +%% +%% You are not allowed to modify this file. +%% +%% You are allowed to distribute this file if and only if +%% it is distributed with the corresponding source files in +%% the `ncctools' bundle. +%% +%% For the copying and distribution conditions of the source files, +%% see the README file distributed with the ncctools bundle. +%% +%% File: topsection.dtx Copyright (C) 2005 by Alexander I. Rozhenko +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{topsection} + [2005/12/24 v1.0 Top section definition (NCC)] +\providecommand\@mkboth[2]{} +\newcommand\@iftopchapter[2]{} +\@ifundefined{chapter}{% + \def\NCC@topsection{\section}% + \let\@iftopchapter\@secondoftwo +}{% + \def\NCC@topsection{\chapter}% + \let\@iftopchapter\@firstoftwo +} +\newcommand*\topsection[1]{} +\AtBeginDocument{% + \@ifpackageloaded{nccsect}{% + \renewcommand*\topsection[1]{% + \ifx\@mkboth\@gobbletwo + \noheadingtag \NCC@topsection{#1}% + \else + \norunninghead + \noheadingtag \NCC@topsection{#1}% + \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}% + \fi + }% + }{% + \renewcommand*\topsection[1]{% + \NCC@topsection*{#1}% + \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}% + }% + }% +} +\endinput +%% +%% End of file `topsection.sty'. diff --git a/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty b/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty index 7f2608fad07..e4d04f2d231 100644 --- a/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty +++ b/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty @@ -5,12 +5,12 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/basiclayer/pgf.sty,v 1.4 2005/09/05 13:23:04 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/basiclayer/pgf.sty,v 1.5 2005/10/25 08:18:14 tantau Exp $ \def\pgf@draft{} \DeclareOption{draft}{\def\pgf@draft{\pgf@draftmodetrue}} -\def\pgf@obsolete{\RequirePackage{pgfcompatibility-version-0-65}} +\def\pgf@obsolete{\RequirePackage{pgfcomp-version-0-65}} \DeclareOption{version=0.65}{} \DeclareOption{version=0.96}{\def\pgf@obsolete{}} diff --git a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcompatibility-version-0-65.sty b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-0-65.sty index f084c7ec3e8..52122b16a8f 100644 --- a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcompatibility-version-0-65.sty +++ b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-0-65.sty @@ -1,6 +1,6 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfcompatibility-version-0-65.sty,v 1.4 2005/07/18 14:37:48 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfcomp-version-0-65.sty,v 1.3 2005/11/14 16:43:25 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % @@ -375,8 +375,8 @@ \addtolength\pgf@y{#6}% \addtolength\pgf@y{#6}% \edef\pgf@boxsize{\noexpand\pgf@x=\the\pgf@x\noexpand\pgf@y=\the\pgf@y}% - \csname pgf@haligncenter\endcsname% - \csname pgf@valigncenter\endcsname% + \csname pgf@haligncompcenter\endcsname% + \csname pgf@valigncompcenter\endcsname% \wd\pgf@hbox=0pt% \pgfputat{#3}{% \pgfsys@hbox\pgf@hbox}% @@ -688,13 +688,22 @@ \long\def\pgfbox[#1,#2]#3{% \pgf@makehbox{#3}% - \csname pgf@halign#1\endcsname% - \csname pgf@valign#2\endcsname% + \csname pgf@haligncomp#1\endcsname% + \csname pgf@valigncomp#2\endcsname% \wd\pgf@hbox=0pt% \ht\pgf@hbox=0pt% \dp\pgf@hbox=0pt% \pgfqbox{\pgf@hbox}% \ignorespaces} +\def\pgf@haligncompleft{}% do nothing +\def\pgf@haligncompcenter{\setbox\pgf@hbox=\hbox{\hskip-.5\wd\pgf@hbox\box\pgf@hbox}} +\def\pgf@haligncompright{\setbox\pgf@hbox=\hbox{\hskip-\wd\pgf@hbox\box\pgf@hbox}} +\def\pgf@valigncompbase{}% do nothing +\def\pgf@valigncompbottom{\setbox\pgf@hbox=\hbox{\raise\dp\pgf@hbox\box\pgf@hbox}} +\def\pgf@valigncompcenter{% + \setbox\pgf@hbox=\hbox{\raise.5\dp\pgf@hbox\hbox{\lower.5\ht\pgf@hbox\box\pgf@hbox}}}% +\def\pgf@valigncomptop{\setbox\pgf@hbox=\hbox{\lower\ht\pgf@hbox\box\pgf@hbox}} + \endinput diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty b/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty index 19023c2efd0..36784a3c968 100644 --- a/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty +++ b/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty @@ -796,7 +796,7 @@ \pgflowlevel{\pgftransformshift{\pgfpoint{-.5\@tempdima}{-.5\@tempdimb}}}% \expandafter\ifx\csname pgfpages@p@\the\pgf@cpn @bordercode\endcsname\relax% \else% - \pgfpathmoveto{\pgfpathorigin}% + \pgfpathmoveto{\pgfpointorigin}% \pgfpathlineto{\pgfpoint{\wd0}{0pt}}% \pgfpathlineto{\pgfpoint{\wd0}{\ht0}}% \pgfpathlineto{\pgfpoint{0pt}{\ht0}}% @@ -808,7 +808,7 @@ { \expandafter\@tempdima\csname pgfpages@p@\the\pgf@cpn @cornerwidth\endcsname\relax% \color{black} - \pgfpathrectangle{\pgfpathorigin}{\pgfpoint{\@tempdima}{\@tempdima}}% + \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\@tempdima}{\@tempdima}}% \pgfpathrectangle{\pgfpoint{0pt}{\ht0-\@tempdima}}{\pgfpoint{\@tempdima}{\@tempdima}}% \pgfpathrectangle{\pgfpoint{\wd0-\@tempdima}{0pt}}{\pgfpoint{\@tempdima}{\@tempdima}}% \pgfpathrectangle{\pgfpoint{\wd0-\@tempdima}{\ht0-\@tempdima}}{\pgfpoint{\@tempdima}{\@tempdima}}% @@ -824,7 +824,7 @@ \pgfpathclose \pgfusepath{clip} \color{white} - \pgfpathrectangle{\pgfpathorigin}{\pgfpoint{\wd0}{\ht0}} + \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\wd0}{\ht0}} \pgfusepath{fill} } \fi% diff --git a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty index 9f3c6111f71..654fd1dbf20 100644 --- a/Master/texmf-dist/tex/latex/poemscol/poemscol.sty +++ b/Master/texmf-dist/tex/latex/poemscol/poemscol.sty @@ -22,7 +22,8 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{poemscol} - [2006/04/25 v2.49 poemscol file] + [2006/05/19 v2.51 poemscol file] + @@ -268,10 +269,16 @@ \newcommand{\resetpagestyle}{\pagestyle{main} } \newcommand{\clearemptydoublepage}{\newpage{\pagestyle{empty}\cleardoublepage}} +\newtoks{\singlepageabbrev} +\singlepageabbrev={p.} +\newcommand{\changesinglepageabbrev}[1]{\singlepageabbrev={#1}} +\newtoks{\multiplepageabbrev} +\newcommand{\changemultiplepageabbrev}[1]{\multiplepageabbrev={#1}} +\multiplepageabbrev{pp.} \newcommand{\mymarks}{% \ifthenelse{\equal{\firstmark}{\botmark}}% - {\unskip to p.~\firstmark}% if equal - {\unskip to pp.~\firstmark--\botmark}}%if not equal + {\unskip ~\the\singlepageabbrev~\firstmark}% if equal + {\unskip ~\the\multiplepageabbrev~\firstmark--\botmark}}%if not equal \newcommand{\poemdotfill}{\dotfill} \newenvironment{stanza}{\penalty-100\instanzatrue\mark{\nostanzaatbottomvalue\ }} {\nobreak\mark{\stanzaatbottomvalue\ }\nobreak\ifspeciallinelock% @@ -430,7 +437,6 @@ \setlength{\marginparwidth}{10pt}% \numbersswitchfalse\numbersrightfalse} \newcommand{\verselinenumberstoright}{% - % \setlength{\marginparsep}{-18pt}% \setlength{\marginparsep}{18pt}% \setlength{\marginparwidth}{10pt}% \numbersswitchfalse\numbersrighttrue} @@ -543,6 +549,14 @@ {\string\newlabel{#1}{{\theverselinenumber}{\thepage}}}% \@esphack } +\newtoks{\contentsname} +\contentsname={CONTENTS} +\newtoks{\contentsheadername} +\contentsheadername={Contents} +\newcommand{\changecontentsname}[1]{% +\contentsname={#1}} +\newcommand{\changecontentsheader}[1]{% +\contentsheadername={#1}} \newcommand{\makepoemcontents}[1][5]{\global\poemcontentsontrue \newwrite\poemcontents \immediate\openout\poemcontents=\jobname.ctn @@ -552,16 +566,24 @@ \pagenumbering{roman} \setcounter{page}{#1} \fancyhead[RO,LE]{{\small\textrm{\thepage}}} -\fancyhead[CO]{{\small{\em Contents}}} -\fancyhead[CE]{{\small{\em Contents}}} +\fancyhead[CO]{{\small{\em \the\contentsheadername}}} +\fancyhead[CE]{{\small{\em \the\contentsheadername}}} \fancyfoot{} \backmattersink \begin{center}{\normalfont \backmatterheaderfont -CONTENTS}\end{center} +\the\contentsname}\end{center} \lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0} \literalcontents{ \relax}} - +\newtoks{\notesname} +\notesname={TEXTUAL NOTES} +\newcommand{\changenotesname}[1]{\notesname={#1}} +\newtoks{\notesheadername} +\notesheadername={Textual Notes to} +\newcommand{\changenotesheader}[1]{\notesheadername={#1}} +\newtoks{\textnotescontentsname} +\textnotescontentsname={Textual Notes} +\newcommand{\changetextnotescontentsname}[1]{\textnotescontentsname={#1}} \newcommand{\maketextnotes}{\global\textnotesontrue \global\verselinenumberstrue \newwrite\textnotes @@ -572,17 +594,27 @@ CONTENTS}\end{center} \fancyhead{} \fancyfoot{} \fancyhead[RO,LE]{{\small\textrm{\thepage}}} -\fancyhead[CO]{{\small{\em Textual Notes~\mymarks}}} -\fancyhead[CE]{{\small{\em Textual Notes~\mymarks}}} +\fancyhead[CO]{{\small{\em \the\notesheadername~\mymarks}}} +\fancyhead[CE]{{\small{\em \the\notesheadername~\mymarks}}} \fancyfoot[C]{} \mark{3} \backmattersink -\begin{center}{\normalfont \backmatterheaderfont TEXTUAL NOTES}\end{center} +\begin{center}{\normalfont \backmatterheaderfont \the\notesname}\end{center} \label{textualnotes} \lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0 \normalfont \backmattertextfont} } +\newtoks{\emendationsname} +\emendationsname={EMENDATIONS} +\newcommand{\changeemendationsname}[1]{\emendationsname={#1}} +\newtoks{\emendationsheadername} +\emendationsheadername={Emendations to} +\newcommand{\changeemendationsheader}[1]{\emendationsheadername={#1}} +\newtoks{\emendationscontentsname} +\emendationscontentsname={Emendations} +\newcommand{\changeemendationscontentsname}[1]{% +\emendationscontentsname={#1}} \newcommand{\makeemendations}{\global\emendationsontrue \newwrite\emendations \global\verselinenumberstrue @@ -592,18 +624,28 @@ CONTENTS}\end{center} \thispagestyle{volumetitlestyle}} \fancyhead{} \fancyhead[RO,LE]{{\small\textrm{\thepage}}} -\fancyhead[CO]{{\small{\em Emendations~\mymarks}}} -\fancyhead[CE]{{\small{\em Emendations~\mymarks}}} +\fancyhead[CO]{{\small{\em \the\emendationsheadername~\mymarks}}} +\fancyhead[CE]{{\small{\em \the\emendationsheadername~\mymarks}}} \fancyfoot{} \mark{3} \backmattersink \begin{center}{\normalfont \backmatterheaderfont -EMENDATIONS}\end{center} +\the\emendationsname}\end{center} \label{emendationnotes} \lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0 \normalfont \backmattertextfont} } +\newtoks{\explanationsname} +\explanationsname={EXPLANATORY NOTES} +\newcommand{\changeexplanationsname}[1]{\explanationsname={#1}} +\newtoks{\explanationsheadername} +\explanationsheadername={Explanatory Notes to} +\newcommand{\changeexplanationsheader}[1]{\explanationsheadername={#1}} +\newtoks{\explanationscontentsname} +\explanationscontentsname={Explanatory Notes} +\newcommand{\changeexplanationscontentsname}[1]{% +\explanationscontentsname={#1}} \newcommand{\makeexplanatorynotes}{\global\explanontrue \global\verselinenumberstrue \newwrite\explanations @@ -612,13 +654,13 @@ EMENDATIONS}\end{center} {\pagestyle{volumetitlestyle}\cleardoublepage} \thispagestyle{volumetitlestyle}} \fancyhead[RO,LE]{{\small\textrm{\thepage}}} -\fancyhead[CO]{{\small{\em Explanatory Notes~\mymarks}}} -\fancyhead[CE]{{\small{\em Explanatory Notes~\mymarks}}} +\fancyhead[CO]{{\small{\em \the\explanationsheadername~\mymarks}}} +\fancyhead[CE]{{\small{\em \the\explanationsheadername~\mymarks}}} \fancyfoot{} \mark{3} \backmattersink \begin{center}{\normalfont \backmatterheaderfont -EXPLANATORY NOTES}\end{center} +\the\explanationsname}\end{center} \label{explanatorynotes} \lefthyphenmin=2\backmatterafterheadersink\tolerance=500\language=0 \normalfont \backmattertextfont } @@ -626,12 +668,12 @@ EXPLANATORY NOTES}\end{center} \newcommand{\@pagemarktotextnotes}[1]{% \immediate\write\textnotes{\string\setcounterfrompageref\string{notepageholdertitle\string}% -\string{#1\string}}% -\immediate\write\textnotes{\string\mark +\string{#1\string}\string\unskip}% +\immediate\write\textnotes{\string\mark% \string{\string\thenotepageholdertitle\string}}% } \newcommand{\@poempagetotextnotes}[1]{% - \immediate\write\textnotes{\string\par\string\argpageref\string{#1\string}}% +\immediate\write\textnotes{\string\par\string\argpageref\string{#1\string}\string\unskip}% \@pagemarktotextnotes{#1}} \newcommand{\@poemtitletotextnotes}[1]{\literaltextnote{\textbf{#1}}} @@ -791,7 +833,6 @@ EXPLANATORY NOTES}\end{center} \@poemtitletotextnotes{#1}% \fi\fi } - \newcommand{\poemtitle}[1]{% \set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}% {\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}% @@ -799,6 +840,15 @@ EXPLANATORY NOTES}\end{center} {\contentsindenttwoamount}% \t@xtnotesinfo{#1}% } +\newcommand{\poemtitlenocontents}[1]{% +\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}% +{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}% +\t@xtnotesinfo{#1}% +} +\newcommand{\poemtitlebaretitle}[1]{% +\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}% +{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}% +} \newcommand{\poemtitleitalic}[2]{% \poemtitle{#1}} \newcommand{\firstlinesettings}{\singlelinetitlefalse @@ -1177,6 +1227,7 @@ EXPLANATORY NOTES}\end{center} \c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}% {\contentsindenttwoamount}% \t@xtnotesinfo{#1}% +\sources{\label{#2}}% } \newcommand{\set@margp@emtitle}[7]{\setlength{\titleentryoverrun}{#6}% {#2}% @@ -1187,10 +1238,25 @@ EXPLANATORY NOTES}\end{center} \m@ken@teholder{#1}% \setlength{\titleentryoverrun}{\z@}} \newcommand{\JHpoemtitle}[2]{% -\setmargpoemtitle{#1}{\JHlabel{#2}}% +\set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}% +{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}% +{\JHlabel{#2}}% +\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}% +{\contentsindenttwoamount}% +\t@xtnotesinfo{#1}% +\sources{\label{#2}}% +} +\newcommand{\JHprosesectiontitle}[2]{% +\set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}% +{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}% +{\JHlabel{#2}}% +\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}% +{\contentsindenttwoamount}% +\t@xtnotesinfo{#1}% +\sources{\label{#2}}% } \newcommand{\JHlabel}[1]{% -\marginpar{{\scriptsize{\dag~p.~\pageref{#1}}}}} +\marginpar{{\scriptsize{\the\margrefmarker~p.~\pageref{#1}}}}} \newcommand{\JHsequencetitle}[2]{% \set@margp@emtitle{#1}{\sequencetitlepenalty}{\sequencetitlefont}% {\relax}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}% @@ -1200,6 +1266,7 @@ EXPLANATORY NOTES}\end{center} {\contentsindenttwoamount}% \putpagenumberincontentstrue% \t@xtnotesinfo{#1}% +\sources{\label{#2}}% } \newcommand{\JHsequencesectiontitle}[2]{% \set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}% @@ -1208,6 +1275,7 @@ EXPLANATORY NOTES}\end{center} \c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}% {\contentsindentthreeamount}% \t@xtnotesinfo{#1}% +\sources{\label{#2}}% } \newcommand{\JHsequencefirstsectiontitle}[2]{% \set@margp@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}% @@ -1216,6 +1284,66 @@ EXPLANATORY NOTES}\end{center} \c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}% {\contentsindentthreeamount}% \t@xtnotesinfo{#1}% +\sources{\label{#2}}% +} +\newcommand{\JHpoemsectiontitle}[2]{% +\set@margp@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}% +{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}% +{\titleindentamount}{\JHlabel{#2}}% +\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}% +{\contentsindentthreeamount}% +\t@xtnotesinfo{#1}% +\sources{\label{#2}}% +} +\newcommand{\JHpoemfirstsectiontitle}[2]{% +\set@margp@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}% +{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}% +{\titleindentamount}{\JHlabel{#2}}% +\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}% +{\contentsindentthreeamount}% +\t@xtnotesinfo{#1}% +\sources{\label{#2}}% +} +\newcommand{\JHsequencesectionsubtitle}[2]{% +\set@margp@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}% +{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}% +{\titleindentamount}{\JHlabel{#2}}% +\sources{\label{#2}}% +} +\newcommand{\JHpoemsubtitle}[2]{\JHsequencesectionsubtitle{#1}{#2} +} +\newcommand{\JHdedication}[2]{\nopagebreak\afterpoemtitleskip\begin{epigraphquote}% +\emph{#1}\JHlabel{#2}\end{epigraphquote}% +\sources{\label{#2}}\afterpoemtitleskip\nopagebreak} +\newcommand{\JHepigraph}[2]{\nopagebreak\afterpoemtitleskip\begin{epigraphquote}% +\emph{#1}\JHlabel{#2}\end{epigraphquote}% +\sources{\label{#2}}\afterpoemtitleskip\nopagebreak} +\newcounter{margrefnumber} +\setcounter{margrefnumber}{1} +\newtoks{\margrefmarker} +\margrefmarker={\dag} +\newcommand{\setmargrefmarker}[1]{\margrefmarker={#1}} +\newcommand{\makemargreflabel}{\string\label\string{margref\themargrefnumber\string}} +\newcommand{\setmargref} +{\marginpar{\scriptsize {\the\margrefmarker~p.~\pageref{margref\themargrefnumber}}} +} +\newcommand{\margreftextnote}{% +\iftextnoteson\addtocounter{margrefnumber}{1}% +\immediate\write\textnotes{\makemargreflabel}% +\setmargref\else\relax\fi% +} +\newcommand{\margrefexplanatory}{% +\ifexplanon\addtocounter{margrefnumber}{1}% +\immediate\write\explanations{\makemargreflabel}% +\setmargref\else\relax\fi% +} +\newcommand{\margrefemendation}{% +\ifemendationson\addtocounter{margrefnumber}{1}% +\immediate\write\emendations{\makemargreflabel}% +\setmargref\else\relax\fi% +} +\newcommand{\margrefspecial}[1]{% +\marginpar{\scriptsize {\the\margrefmarker~p.~\pageref{#1}}} } \newcommand{\epigraph}[1]{\nopagebreak\afterpoemtitleskip\begin{epigraphquote} \emph{#1}\end{epigraphquote}\afterpoemtitleskip\nopagebreak} @@ -1410,7 +1538,7 @@ EXPLANATORY NOTES}\end{center} \xdef#1{\the\toks@}% \endgroup} \makeatother -\newcommand{\definenewnotetype}[4]{% +\newcommand{\definenewnotetype}[5]{% \expandafter\newif\csname if#1son\endcsname \global\csname #1sontrue\endcsname \expandafter\newif\csname ifno#1yet\endcsname @@ -1494,11 +1622,17 @@ EXPLANATORY NOTES}\end{center} \immediate\expandafter\closeout\csname #1s\endcsname \expandafter\input \jobname.#2 \ifpoemcontentson - \immediate\write\poemcontents{\string\contentspoemtitlefont\ #3} - \immediate\write\poemcontents{\string~ / \string~\ \string\pageref{#1notes} \string\par} + \immediate\write\poemcontents{\string\contentspoemtitlefont\ #5} + \immediate\write\poemcontents{\string~ \string\contentsleaders + \string~\ \string\pageref{#1notes} \string\par} \immediate\write\poemcontents{\string\par \string\smallskip} \fi } +\expandafter\newcommand\csname margref#1\endcsname{% +\addtocounter{margrefnumber}{1} +\immediate\write\expandafter\csname #1s\endcsname{\makemargreflabel}% +\setmargref +} } \newcounter{proselinenumber} \setcounter{proselinenumber}{1} @@ -1508,11 +1642,14 @@ EXPLANATORY NOTES}\end{center} \newcommand{\setprosemodulo}[1]{\modulolinenumbers[#1]} \newcommand{\prosesectiontitle}[1]{\poemtitle{#1}} \newcommand{\prosesectiontitlenotitle}[1]{\poemtitlenotitle{#1}} -\newenvironment{prosesection} -{\resetlinenumber\begin{linenumbers}% \setcounter{prosemodulo}{\value{lineindexrepeat}}% \addtocounter{prosemodulo}{1}% -\modulolinenumbers[\value{prosemodulo}]% +\ifx\modulolinenumbers\undefined% + \relax\else +\modulolinenumbers[\value{prosemodulo}]% if lineno is called +\fi +\newenvironment{prosesection} +{\resetlinenumber\begin{linenumbers}% \renewcommand{\linenumberfont}{\scriptsize}% \ifnumbersright\rightlinenumbers*\setlength{\linenumbersep}{-\marginparsep}% \else\ifnumbersswitch\rightlinenumbers*\setlength{\linenumbersep}{-\marginparsep}% @@ -1525,10 +1662,13 @@ EXPLANATORY NOTES}\end{center} {\end{linenumbers}} \newenvironment{prosesectionnoreset} {\begin{linenumbers}% -\setcounter{prosemodulo}{\value{lineindexrepeat}}% -\addtocounter{prosemodulo}{1}% -\modulolinenumbers[\value{prosemodulo}]% -\renewcommand{\linenumberfont}{\scriptsize}}{\end{linenumbers}} +\renewcommand{\linenumberfont}{\scriptsize} +\ifnumbersright\rightlinenumbers*\setlength{\linenumbersep}{-\marginparsep}% +\else\ifnumbersswitch\rightlinenumbers*\setlength{\linenumbersep}{-\marginparsep}% +\else\leftlinenumbers*\setlength{\linenumbersep}{\marginparsep}% +\addtolength{\linenumbersep}{5pt}% seems about right +\fi\fi +}{\end{linenumbers}} \makeatletter \newcommand*{\ifrefundefined}[1]{% \expandafter\ifx\csname r@#1\endcsname\relax @@ -2007,16 +2147,18 @@ r@#2\endcsname{}{}\@nil } \newcommand{\bibleverse}{\pmsentence} \newcommand{\biblechapter}{\pmpara} -\newcommand{\quotedversecorrectiontextnote} -{\iftextnoteson\immediate\write -\textnotes{\string\par\string\noindent\string\kern-\parindent}\fi}% a bad kludge -\newcommand{\quotedversecorrectionemendation} -{\ifemendationson\immediate\write -\emendations{\string\par\string\noindent\string\kern-\parindent}\fi}% a bad kludge -\newcommand{\quotedversecorrectionexplanatory} -{\ifexplanon\immediate\write -\explanations{\string\par\string\noindent\string\kern-\parindent}\fi}% a bad kludge - +\newcommand{\quotedversecorrectiontextnote}[1][0pt] +{\iftextnoteson% +\immediate\write\textnotes{\string\noindent\string\kern-#1}% +\fi} +\newcommand{\quotedversecorrectionemendation}[1][0pt] +{\ifemendationson% +\immediate\write\emendations{\string\noindent\string\kern-#1}% +\fi} +\newcommand{\quotedversecorrectionexplanatory}[1][0pt] +{\ifexplanon% +\immediate\write\explanations{\string\noindent\string\kern-#1}% +\fi} \newcommand{\stanzaatbottom}[1]{\global\edef\stanzaatbottomvalue{#1}} \stanzaatbottom{*} @@ -2137,7 +2279,6 @@ r@#2\endcsname{}{}\@nil \inpoemfalse\mark{\relax} \goodbreak\afterpoemskip%\bigskip \fi\fi } - \renewenvironment{stanza}{\penalty-100\instanzatrue\mark{\nostanzaatbottomvalue\ }} {\ifversostanzastillopen \relax @@ -2317,27 +2458,29 @@ r@#2\endcsname{}{}\@nil \fi \ifpoemcontentson \ifemendationson - \immediate\write\poemcontents{\string\contentspoemtitlefont\ Emendations} + \immediate\write\poemcontents{\string\contentspoemtitlefont\ + \the\emendationscontentsname} \immediate\write \poemcontents{\string~ / \string~\ \string\pageref{emendationnotes} \string\par} \immediate\write\poemcontents{\string\par \string\smallskip} \fi \iftextnoteson - \immediate\write\poemcontents{\string\contentspoemtitlefont\ Textual Notes} + \immediate\write\poemcontents{\string\contentspoemtitlefont\ + \the\textnotescontentsname} \immediate\write \poemcontents{\string~ / \string~\ \string\pageref{textualnotes} \string\par} \immediate\write\poemcontents{\string\par \string\smallskip} \fi \ifexplanon \immediate\write -\poemcontents{\string\contentspoemtitlefont\ Explanatory Notes} +\poemcontents{\string\contentspoemtitlefont\ \the\explanationscontentsname} \immediate\write \poemcontents{\string~ / \string~\ \string\pageref{explanatorynotes}} \fi \ifindexingon \immediate\write\poemcontents{\string\par \string\smallskip} \immediate\write -\poemcontents{\string\contentspoemtitlefont\ Index of Titles and First Lines} +\poemcontents{\string\contentspoemtitlefont\ \the\poemindexcontentsname} \immediate\write \poemcontents{\string~ / \string~\ \string\pageref{indexpage}\string\par} \fi @@ -2380,9 +2523,10 @@ wherever such spaces are lost in pagination. \input \jobname.emd \ifpoemcontentson \ifemendationson -\immediate\write\poemcontents{\string\contentspoemtitlefont\ Emendations} +\immediate\write\poemcontents{\string\contentspoemtitlefont\ \the\emendationscontentsname} \immediate\write - \poemcontents{\string~ / \string~\ \string\pageref{emendationnotes} \string\par} + \poemcontents{\string~ \string\contentsleaders \string~\ + \string\pageref{emendationnotes} \string\par} \immediate\write\poemcontents{\string\par \string\smallskip} \fi \fi @@ -2397,9 +2541,10 @@ wherever such spaces are lost in pagination. \input \jobname.enx \ifpoemcontentson \ifexplanon -\immediate\write\poemcontents{\string\contentspoemtitlefont\ Explanatory Notes} +\immediate\write\poemcontents{\string\contentspoemtitlefont\ \the\explanationscontentsname} \immediate\write - \poemcontents{\string~ / \string~\ \string\pageref{explanatorynotes} \string\par} + \poemcontents{\string~ \string\contentsleaders \string~\ + \string\pageref{explanatorynotes} \string\par} \immediate\write\poemcontents{\string\par \string\smallskip} \fi \fi @@ -2414,26 +2559,62 @@ wherever such spaces are lost in pagination. \input \jobname.ent \ifpoemcontentson \iftextnoteson -\immediate\write\poemcontents{\string\contentspoemtitlefont\ Textual Notes} +\immediate\write\poemcontents{\string\contentspoemtitlefont\ \the\textnotescontentsname} \immediate\write - \poemcontents{\string~ / \string~\ \string\pageref{textualnotes} \string\par} + \poemcontents{\string~ \string\contentsleaders \string~\ + \string\pageref{textualnotes} \string\par} \immediate\write\poemcontents{\string\par \string\smallskip} \fi \fi \else \relax \fi} +\newtoks{\poemindexname} +\poemindexname={Index of Titles and First Lines} +\newcommand{\changepoemindexname}[1]{\poemindexname={#1}} +\newtoks{\poemindexheadername} +\poemindexheadername={Index of Titles and First Lines} +\newcommand{\changepoemindexheader}[1]{\poemindexheadername={#1}} +\newtoks{\poemindexcontentsname} +\poemindexcontentsname={Index of Titles and First Lines} +\newcommand{\changepoemindexcontentsname}[1]{\poemindexcontentsname={#1}} \newcommand{\putpoemindex}{\ifindexingon \printindex \fi \ifpoemcontentson\ifindexingon \immediate\write\poemcontents{\string\par \string\smallskip} \immediate\write -\poemcontents{\string\contentspoemtitlefont\ Index of Titles and First Lines} +\poemcontents{\string\contentspoemtitlefont\ \the\poemindexcontentsname} \immediate\write -\poemcontents{\string~ / \string~\ \string\pageref{indexpage}\string\par} +\poemcontents{\string~\string\contentsleaders \string~\ \string\pageref{indexpage}\string\par} \fi\fi} +\newcommand{\putmultiplepoemindex}[4]{% +\ifindexingon +\poemindexname={#2} +\poemindexheadername={#3} +\poemindexcontentsname={#4} +\poemindexlabelname={#4} +\printindex[#1][#2] +\fi +\ifpoemcontentson\ifindexingon + \immediate\write\poemcontents{\string\par \string\smallskip} + \immediate\write +\poemcontents{\string\contentspoemtitlefont\ \the\poemindexcontentsname} + \immediate\write +\poemcontents{\string~ \string\contentsleaders \string~\ +\string\pageref{\the\poemindexlabelname}\string\par} + \fi\fi +} +\newcommand{\noteaboutstanzamarkpage}{\begin{volumetitlepage} +\vspace{106pt} +\begin{center} +{\poemtitlefont Note} +\end{center} +\noindent The symbol \stanzaatbottomvalue\ is used to indicate +a space between sections of a poem +wherever such spaces are lost in pagination. +\end{volumetitlepage}} \newcommand{\longpage}{\enlargethispage{\baselineskip}} \newcommand{\shortpage}{\enlargethispage{-\baselineskip}} @@ -2455,22 +2636,25 @@ wherever such spaces are lost in pagination. \item[] } {\endlist} +\newtoks{\poemindexlabelname} +\poemindexlabelname={indexpage} +\newcommand{\changepoemindexlabelname}[1]{\poemindexlabelname={#1}} \renewenvironment{theindex} {{\par\clearpage{\pagestyle{volumetitlestyle}\cleardoublepage} \thispagestyle{volumetitlestyle}} \makeatletter \def\pmclidxitem{\par\hangindent 1em} \fancyhead[RO,LE]{{\small\textrm{\thepage}}} -\fancyhead[CO]{{\small{\em Index of Titles and First Lines}}} -\fancyhead[CE]{{\small{\em Index of Titles and First Lines}}} +\fancyhead[CO]{{\small{\em \the\poemindexheadername}}} +\fancyhead[CE]{{\small{\em \the\poemindexheadername}}} \fancyfoot{} - \label{indexpage} + \label{\the\poemindexlabelname} \lefthyphenmin=2\tolerance=500\language=0 \normalfont \backmattertextfont \raggedright \begin{multicols} {2}[\backmattersink\begin{center}{\normalfont -\backmatterheaderfont INDEX OF TITLES AND FIRST LINES}\end{center} +\backmatterheaderfont \the\poemindexname}\end{center} \backmatterafterheadersink]% \let\item\pmclidxitem} {\end{multicols}\clearpage} diff --git a/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty b/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty index 0764fd6395c..8601ac17fba 100644 --- a/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty +++ b/Master/texmf-dist/tex/latex/pst-osci/pst-osci.sty @@ -1,3 +1,7 @@ -\ProvidesPackage{pst-osci}[1999/09/12 package wrapper for PSTricks pst-osci.tex] -\input pst-osci.tex +\RequirePackage{pstricks} +\ProvidesPackage{pst-osci}[2005/10/10 package wrapper for `pst-osci.tex'] +% +\input{pst-osci.tex} +\ProvidesFile{pst-osci.tex} + [\filedate\space v\fileversion\space `pst-osci' (ML,CJ)] \endinput diff --git a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty index 1e4406c07f1..a0dc10e074a 100644 --- a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty +++ b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty @@ -22,12 +22,12 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{pst-pdf} - [2006/07/14 v1.1n PS graphics for pdfLaTeX (RN,HjG)] + [2006/08/31 v1.1o PS graphics for pdfLaTeX (RN,HjG)] \newcommand*\ppf@TeX@mode{-1} \newcommand*\ppf@draft{false} \newif\if@ppf@PST@used\@ppf@PST@usedtrue \newif\if@ppf@tightpage \@ppf@tightpagetrue -\DeclareOption{active}{\def\ppf@TeX@mode{0}} +\DeclareOption{active}{\OptionNotUsed} \DeclareOption{inactive}{\def\ppf@TeX@mode{9}} \DeclareOption{ignore}{\def\ppf@TeX@mode{999}} \DeclareOption{pstricks}{\@ppf@PST@usedtrue} @@ -183,6 +183,9 @@ \@ifundefined{pfx@includegraphicx}{}{% \PreviewMacro[{{}{}}]{\pfx@includegraphicx}}% }% + \def\Gscale@@box#1#2#3{% + \toks@{\mbox}% + } \def\Ginclude@graphics#1{% \ifpr@outer \ppf@is@pdfTeX@graphic{#1}{\ppf@other@extensions}{\Gin@extensions}% diff --git a/Master/texmf-dist/tex/latex/screenplay/screenplay.cls b/Master/texmf-dist/tex/latex/screenplay/screenplay.cls index ad0e778436e..ba53ae09407 100644 --- a/Master/texmf-dist/tex/latex/screenplay/screenplay.cls +++ b/Master/texmf-dist/tex/latex/screenplay/screenplay.cls @@ -33,20 +33,20 @@ %% %% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+= \NeedsTeXFormat{LaTeX2e}[2003/12/01] -\ProvidesClass{screenplay}[2006/09/27 v1.487 +\ProvidesClass{screenplay}[2006/09/30 v1.496 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.487}} + {There are no options available for class screenplay v1.496}} \ProcessOptions\relax -\RequirePackage{ifthen} +\RequirePackage{ifthen}[2001/05/26] \LoadClass[12pt,letterpaper,onecolumn,oneside]{article}[2004/02/16] -\RequirePackage[dvips,letterpaper]{geometry} +\RequirePackage[dvips,letterpaper]{geometry}[2002/07/08] \setlength{\paperheight}{11in} \setlength{\paperwidth}{8.5in} -\RequirePackage{courier} +\RequirePackage{courier}[2004/09/15] \renewcommand*\familydefault{\ttdefault} \raggedright \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/latex/verse/verse.sty b/Master/texmf-dist/tex/latex/verse/verse.sty index 97720bca8bf..0f8648c9893 100644 --- a/Master/texmf-dist/tex/latex/verse/verse.sty +++ b/Master/texmf-dist/tex/latex/verse/verse.sty @@ -9,7 +9,7 @@ %% ----------------------------------------------------------------- %% Author: Peter Wilson (herries dot press at earthlink dot net) %% Herries Press -%% Copyright 2001--2005 Peter R. Wilson +%% Copyright 2001--2006 Peter R. Wilson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -43,18 +43,22 @@ } \poemlines{0} -\newcommand{\getmodulo@vs}{{\@tempcnta\c@poemline +\newcommand*{\verselinenumfont}[1]{\def\vlnumfont{#1}} +\verselinenumfont{\rmfamily} + +\newcommand{\getmodulo@vs}{\bgroup + \@tempcnta\c@poemline \ifnum\c@modulo@vs<\@ne % no line numbers \else \ifnum\c@modulo@vs<\tw@ % number every line - \thepoemline + \vlnumfont\thepoemline \else \divide\@tempcnta\c@modulo@vs \multiply\@tempcnta\c@modulo@vs - \ifnum\@tempcnta=\c@poemline\thepoemline\fi + \ifnum\@tempcnta=\c@poemline\vlnumfont\thepoemline\fi \fi \fi -}} +\egroup} \newif\ifaltindent \altindentfalse @@ -77,8 +81,7 @@ \newcommand{\flagverse}[1]{\hskip-\vleftskip\llap{#1}\hskip\vleftskip\ignorespaces} -\newcommand{\verselinebreak}[1][\z@]{\newline\hspace*{#1}% extra verseindent -} +\newcommand*{\verselinebreak}[1][\z@]{\newline\hspace*{#1}\ignorespaces} \newcommand{\incr@vsline}{% \refstepcounter{poemline}% \stepcounter{vslineno}} @@ -86,9 +89,18 @@ \newcommand{\@vsifbang}[1]{\@ifnextchar !{\@firstoftwo{#1}}} \newcommand{\@vsifgt}[1]{\@ifnextchar >{\@firstoftwo{#1}}} +\newcommand*{\@vstypelinenumright}{% + \hfill\rlap{\kern\vrightskip\kern\rightmargin\getmodulo@vs}} +\newcommand*{\@vstypelinenumleft}{% + \hfill\rlap{\kern-\textwidth\kern-\vrightskip\getmodulo@vs}} +\newcommand*{\verselinenumbersright}{\def\@vstypelinenum{\@vstypelinenumright}} +\newcommand*{\verselinenumbersleft}{\def\@vstypelinenum{\@vstypelinenumleft}} +\verselinenumbersright + \newcommand{\@vscentercr}{% \ifhmode \unskip\else \@nolnerr\fi - \hfill\rlap{\kern\vrightskip\kern\rightmargin\getmodulo@vs}% + \@vstypelinenum% +%%%% \hfill\rlap{\kern\vrightskip\kern\rightmargin\getmodulo@vs}% \@vsifgt{\verselinebreak}{% \incr@vsline \par\@ifstar{\nobreak\@vsxcentercr}{% diff --git a/Master/texmf-dist/tex/latex/xcolor/svgnam.def b/Master/texmf-dist/tex/latex/xcolor/svgnam.def index 666d0db4eb2..0d748d91124 100644 --- a/Master/texmf-dist/tex/latex/xcolor/svgnam.def +++ b/Master/texmf-dist/tex/latex/xcolor/svgnam.def @@ -22,7 +22,7 @@ %% in the same archive or directory.) %% \ProvidesFile{svgnam.def} - [2005/10/15 v2.06 Predefined colors according to SVG 1.1 (UK)] + [2005/12/21 v2.09 Predefined colors according to SVG 1.1 (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2005 by Dr. Uwe Kern <xcolor at ukern dot de> @@ -84,9 +84,9 @@ GhostWhite,.972,.972,1;% Gold,1,.844,0;% Goldenrod,.855,.648,.125;% Gray,.5,.5,.5;% -Grey,.5,.5,.5;% Green,0,.5,0;% GreenYellow,.68,1,.185;% +Grey,.5,.5,.5;% Honeydew,.94,1,.94;% HotPink,1,.41,.705;% IndianRed,.804,.36,.36;% @@ -100,6 +100,7 @@ LemonChiffon,1,.98,.804;% LightBlue,.68,.848,.9;% LightCoral,.94,.5,.5;% LightCyan,.88,1,1;% +LightGoldenrod,.933,.867,.51;% LightGoldenrodYellow,.98,.98,.824;% LightGray,.828,.828,.828;% LightGreen,.565,.932,.565;% @@ -108,6 +109,7 @@ LightPink,1,.712,.756;% LightSalmon,1,.628,.48;% LightSeaGreen,.125,.698,.668;% LightSkyBlue,.53,.808,.98;% +LightSlateBlue,.518,.44,1;% LightSlateGray,.468,.532,.6;% LightSlateGrey,.468,.532,.6;% LightSteelBlue,.69,.77,.87;% @@ -132,6 +134,7 @@ MistyRose,1,.894,.884;% Moccasin,1,.894,.71;% NavajoWhite,1,.87,.68;% Navy,0,0,.5;% +NavyBlue,0,0,.5;% OldLace,.992,.96,.9;% Olive,.5,.5,0;% OliveDrab,.42,.556,.136;% @@ -172,6 +175,7 @@ Thistle,.848,.75,.848;% Tomato,1,.39,.28;% Turquoise,.25,.88,.815;% Violet,.932,.51,.932;% +VioletRed,.816,.125,.565;% Wheat,.96,.87,.7;% White,1,1,1;% WhiteSmoke,.96,.96,.96;% diff --git a/Master/texmf-dist/tex/latex/xcolor/x11nam.def b/Master/texmf-dist/tex/latex/xcolor/x11nam.def new file mode 100644 index 00000000000..ff738862c86 --- /dev/null +++ b/Master/texmf-dist/tex/latex/xcolor/x11nam.def @@ -0,0 +1,352 @@ +%% +%% This is file `x11nam.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% xcolor.dtx (with options: `x11names') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from x11nam.def. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file xcolor.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.) +%% +\ProvidesFile{x11nam.def} + [2005/12/21 v2.09 Predefined colors according to Unix/X11 (UK)] +%% +%% ---------------------------------------------------------------- +%% Copyright (C) 2003-2005 by Dr. Uwe Kern <xcolor at ukern dot de> +%% ---------------------------------------------------------------- +%% +\def\colornameprefix{XC@} +\preparecolorset{rgb}{}{}{% +AntiqueWhite1,1,.936,.86;% +AntiqueWhite2,.932,.875,.8;% +AntiqueWhite3,.804,.752,.69;% +AntiqueWhite4,.545,.512,.47;% +Aquamarine1,.498,1,.83;% +Aquamarine2,.464,.932,.776;% +Aquamarine3,.4,.804,.668;% +Aquamarine4,.27,.545,.455;% +Azure1,.94,1,1;% +Azure2,.88,.932,.932;% +Azure3,.756,.804,.804;% +Azure4,.512,.545,.545;% +Bisque1,1,.894,.77;% +Bisque2,.932,.835,.716;% +Bisque3,.804,.716,.62;% +Bisque4,.545,.49,.42;% +Blue1,0,0,1;% +Blue2,0,0,.932;% +Blue3,0,0,.804;% +Blue4,0,0,.545;% +Brown1,1,.25,.25;% +Brown2,.932,.23,.23;% +Brown3,.804,.2,.2;% +Brown4,.545,.136,.136;% +Burlywood1,1,.828,.608;% +Burlywood2,.932,.772,.57;% +Burlywood3,.804,.668,.49;% +Burlywood4,.545,.45,.332;% +CadetBlue1,.596,.96,1;% +CadetBlue2,.556,.898,.932;% +CadetBlue3,.48,.772,.804;% +CadetBlue4,.325,.525,.545;% +Chartreuse1,.498,1,0;% +Chartreuse2,.464,.932,0;% +Chartreuse3,.4,.804,0;% +Chartreuse4,.27,.545,0;% +Chocolate1,1,.498,.14;% +Chocolate2,.932,.464,.13;% +Chocolate3,.804,.4,.112;% +Chocolate4,.545,.27,.075;% +Coral1,1,.448,.336;% +Coral2,.932,.415,.312;% +Coral3,.804,.356,.27;% +Coral4,.545,.244,.185;% +Cornsilk1,1,.972,.864;% +Cornsilk2,.932,.91,.804;% +Cornsilk3,.804,.785,.694;% +Cornsilk4,.545,.532,.47;% +Cyan1,0,1,1;% +Cyan2,0,.932,.932;% +Cyan3,0,.804,.804;% +Cyan4,0,.545,.545;% +DarkGoldenrod1,1,.725,.06;% +DarkGoldenrod2,.932,.68,.055;% +DarkGoldenrod3,.804,.585,.048;% +DarkGoldenrod4,.545,.396,.03;% +DarkOliveGreen1,.792,1,.44;% +DarkOliveGreen2,.736,.932,.408;% +DarkOliveGreen3,.635,.804,.352;% +DarkOliveGreen4,.43,.545,.24;% +DarkOrange1,1,.498,0;% +DarkOrange2,.932,.464,0;% +DarkOrange3,.804,.4,0;% +DarkOrange4,.545,.27,0;% +DarkOrchid1,.75,.244,1;% +DarkOrchid2,.698,.228,.932;% +DarkOrchid3,.604,.196,.804;% +DarkOrchid4,.408,.132,.545;% +DarkSeaGreen1,.756,1,.756;% +DarkSeaGreen2,.705,.932,.705;% +DarkSeaGreen3,.608,.804,.608;% +DarkSeaGreen4,.41,.545,.41;% +DarkSlateGray1,.592,1,1;% +DarkSlateGray2,.552,.932,.932;% +DarkSlateGray3,.475,.804,.804;% +DarkSlateGray4,.32,.545,.545;% +DeepPink1,1,.08,.576;% +DeepPink2,.932,.07,.536;% +DeepPink3,.804,.064,.464;% +DeepPink4,.545,.04,.312;% +DeepSkyBlue1,0,.75,1;% +DeepSkyBlue2,0,.698,.932;% +DeepSkyBlue3,0,.604,.804;% +DeepSkyBlue4,0,.408,.545;% +DodgerBlue1,.116,.565,1;% +DodgerBlue2,.11,.525,.932;% +DodgerBlue3,.094,.455,.804;% +DodgerBlue4,.064,.305,.545;% +Firebrick1,1,.19,.19;% +Firebrick2,.932,.172,.172;% +Firebrick3,.804,.15,.15;% +Firebrick4,.545,.1,.1;% +Gold1,1,.844,0;% +Gold2,.932,.79,0;% +Gold3,.804,.68,0;% +Gold4,.545,.46,0;% +Goldenrod1,1,.756,.145;% +Goldenrod2,.932,.705,.132;% +Goldenrod3,.804,.608,.112;% +Goldenrod4,.545,.41,.08;% +Green1,0,1,0;% +Green2,0,.932,0;% +Green3,0,.804,0;% +Green4,0,.545,0;% +Honeydew1,.94,1,.94;% +Honeydew2,.88,.932,.88;% +Honeydew3,.756,.804,.756;% +Honeydew4,.512,.545,.512;% +HotPink1,1,.43,.705;% +HotPink2,.932,.415,.655;% +HotPink3,.804,.376,.565;% +HotPink4,.545,.228,.385;% +IndianRed1,1,.415,.415;% +IndianRed2,.932,.39,.39;% +IndianRed3,.804,.332,.332;% +IndianRed4,.545,.228,.228;% +Ivory1,1,1,.94;% +Ivory2,.932,.932,.88;% +Ivory3,.804,.804,.756;% +Ivory4,.545,.545,.512;% +Khaki1,1,.965,.56;% +Khaki2,.932,.9,.52;% +Khaki3,.804,.776,.45;% +Khaki4,.545,.525,.305;% +LavenderBlush1,1,.94,.96;% +LavenderBlush2,.932,.88,.898;% +LavenderBlush3,.804,.756,.772;% +LavenderBlush4,.545,.512,.525;% +LemonChiffon1,1,.98,.804;% +LemonChiffon2,.932,.912,.75;% +LemonChiffon3,.804,.79,.648;% +LemonChiffon4,.545,.536,.44;% +LightBlue1,.75,.936,1;% +LightBlue2,.698,.875,.932;% +LightBlue3,.604,.752,.804;% +LightBlue4,.408,.512,.545;% +LightCyan1,.88,1,1;% +LightCyan2,.82,.932,.932;% +LightCyan3,.705,.804,.804;% +LightCyan4,.48,.545,.545;% +LightGoldenrod1,1,.925,.545;% +LightGoldenrod2,.932,.864,.51;% +LightGoldenrod3,.804,.745,.44;% +LightGoldenrod4,.545,.505,.298;% +LightPink1,1,.684,.725;% +LightPink2,.932,.635,.68;% +LightPink3,.804,.55,.585;% +LightPink4,.545,.372,.396;% +LightSalmon1,1,.628,.48;% +LightSalmon2,.932,.585,.448;% +LightSalmon3,.804,.505,.385;% +LightSalmon4,.545,.34,.26;% +LightSkyBlue1,.69,.888,1;% +LightSkyBlue2,.644,.828,.932;% +LightSkyBlue3,.552,.712,.804;% +LightSkyBlue4,.376,.484,.545;% +LightSteelBlue1,.792,.884,1;% +LightSteelBlue2,.736,.824,.932;% +LightSteelBlue3,.635,.71,.804;% +LightSteelBlue4,.43,.484,.545;% +LightYellow1,1,1,.88;% +LightYellow2,.932,.932,.82;% +LightYellow3,.804,.804,.705;% +LightYellow4,.545,.545,.48;% +Magenta1,1,0,1;% +Magenta2,.932,0,.932;% +Magenta3,.804,0,.804;% +Magenta4,.545,0,.545;% +Maroon1,1,.204,.7;% +Maroon2,.932,.19,.655;% +Maroon3,.804,.16,.565;% +Maroon4,.545,.11,.385;% +MediumOrchid1,.88,.4,1;% +MediumOrchid2,.82,.372,.932;% +MediumOrchid3,.705,.32,.804;% +MediumOrchid4,.48,.215,.545;% +MediumPurple1,.67,.51,1;% +MediumPurple2,.624,.475,.932;% +MediumPurple3,.536,.408,.804;% +MediumPurple4,.365,.28,.545;% +MistyRose1,1,.894,.884;% +MistyRose2,.932,.835,.824;% +MistyRose3,.804,.716,.71;% +MistyRose4,.545,.49,.484;% +NavajoWhite1,1,.87,.68;% +NavajoWhite2,.932,.81,.63;% +NavajoWhite3,.804,.7,.545;% +NavajoWhite4,.545,.475,.37;% +OliveDrab1,.752,1,.244;% +OliveDrab2,.7,.932,.228;% +OliveDrab3,.604,.804,.196;% +OliveDrab4,.41,.545,.132;% +Orange1,1,.648,0;% +Orange2,.932,.604,0;% +Orange3,.804,.52,0;% +Orange4,.545,.352,0;% +OrangeRed1,1,.27,0;% +OrangeRed2,.932,.25,0;% +OrangeRed3,.804,.215,0;% +OrangeRed4,.545,.145,0;% +Orchid1,1,.512,.98;% +Orchid2,.932,.48,.912;% +Orchid3,.804,.41,.79;% +Orchid4,.545,.28,.536;% +PaleGreen1,.604,1,.604;% +PaleGreen2,.565,.932,.565;% +PaleGreen3,.488,.804,.488;% +PaleGreen4,.33,.545,.33;% +PaleTurquoise1,.732,1,1;% +PaleTurquoise2,.684,.932,.932;% +PaleTurquoise3,.59,.804,.804;% +PaleTurquoise4,.4,.545,.545;% +PaleVioletRed1,1,.51,.67;% +PaleVioletRed2,.932,.475,.624;% +PaleVioletRed3,.804,.408,.536;% +PaleVioletRed4,.545,.28,.365;% +PeachPuff1,1,.855,.725;% +PeachPuff2,.932,.796,.68;% +PeachPuff3,.804,.688,.585;% +PeachPuff4,.545,.468,.396;% +Pink1,1,.71,.772;% +Pink2,.932,.664,.72;% +Pink3,.804,.57,.62;% +Pink4,.545,.39,.424;% +Plum1,1,.732,1;% +Plum2,.932,.684,.932;% +Plum3,.804,.59,.804;% +Plum4,.545,.4,.545;% +Purple1,.608,.19,1;% +Purple2,.57,.172,.932;% +Purple3,.49,.15,.804;% +Purple4,.332,.1,.545;% +Red1,1,0,0;% +Red2,.932,0,0;% +Red3,.804,0,0;% +Red4,.545,0,0;% +RosyBrown1,1,.756,.756;% +RosyBrown2,.932,.705,.705;% +RosyBrown3,.804,.608,.608;% +RosyBrown4,.545,.41,.41;% +RoyalBlue1,.284,.464,1;% +RoyalBlue2,.264,.43,.932;% +RoyalBlue3,.228,.372,.804;% +RoyalBlue4,.152,.25,.545;% +Salmon1,1,.55,.41;% +Salmon2,.932,.51,.385;% +Salmon3,.804,.44,.33;% +Salmon4,.545,.298,.224;% +SeaGreen1,.33,1,.624;% +SeaGreen2,.305,.932,.58;% +SeaGreen3,.264,.804,.5;% +SeaGreen4,.18,.545,.34;% +Seashell1,1,.96,.932;% +Seashell2,.932,.898,.87;% +Seashell3,.804,.772,.75;% +Seashell4,.545,.525,.51;% +Sienna1,1,.51,.28;% +Sienna2,.932,.475,.26;% +Sienna3,.804,.408,.224;% +Sienna4,.545,.28,.15;% +SkyBlue1,.53,.808,1;% +SkyBlue2,.494,.752,.932;% +SkyBlue3,.424,.65,.804;% +SkyBlue4,.29,.44,.545;% +SlateBlue1,.512,.435,1;% +SlateBlue2,.48,.404,.932;% +SlateBlue3,.41,.35,.804;% +SlateBlue4,.28,.235,.545;% +SlateGray1,.776,.888,1;% +SlateGray2,.725,.828,.932;% +SlateGray3,.624,.712,.804;% +SlateGray4,.424,.484,.545;% +Snow1,1,.98,.98;% +Snow2,.932,.912,.912;% +Snow3,.804,.79,.79;% +Snow4,.545,.536,.536;% +SpringGreen1,0,1,.498;% +SpringGreen2,0,.932,.464;% +SpringGreen3,0,.804,.4;% +SpringGreen4,0,.545,.27;% +SteelBlue1,.39,.72,1;% +SteelBlue2,.36,.675,.932;% +SteelBlue3,.31,.58,.804;% +SteelBlue4,.21,.392,.545;% +Tan1,1,.648,.31;% +Tan2,.932,.604,.288;% +Tan3,.804,.52,.248;% +Tan4,.545,.352,.17;% +Thistle1,1,.884,1;% +Thistle2,.932,.824,.932;% +Thistle3,.804,.71,.804;% +Thistle4,.545,.484,.545;% +Tomato1,1,.39,.28;% +Tomato2,.932,.36,.26;% +Tomato3,.804,.31,.224;% +Tomato4,.545,.21,.15;% +Turquoise1,0,.96,1;% +Turquoise2,0,.898,.932;% +Turquoise3,0,.772,.804;% +Turquoise4,0,.525,.545;% +VioletRed1,1,.244,.59;% +VioletRed2,.932,.228,.55;% +VioletRed3,.804,.196,.47;% +VioletRed4,.545,.132,.32;% +Wheat1,1,.905,.73;% +Wheat2,.932,.848,.684;% +Wheat3,.804,.73,.59;% +Wheat4,.545,.494,.4;% +Yellow1,1,1,0;% +Yellow2,.932,.932,0;% +Yellow3,.804,.804,0;% +Yellow4,.545,.545,0;% +Gray0,.745,.745,.745;% +Green0,0,1,0;% +Grey0,.745,.745,.745;% +Maroon0,.69,.19,.376;% +Purple0,.628,.125,.94} +\endinput +%% +%% End of file `x11nam.def'. diff --git a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty index 46ae9595952..23d6d617cac 100644 --- a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty +++ b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) %% \ProvidesPackage{xcolor} - [2005/10/15 v2.06 LaTeX color extensions (UK)] + [2005/12/21 v2.09 LaTeX color extensions (UK)] %% %% ---------------------------------------------------------------- %% Copyright (C) 2003-2005 by Dr. Uwe Kern <xcolor at ukern dot de> @@ -48,6 +48,7 @@ \catcode`\noexpand\;\the\catcode`\;\relax \catcode`\noexpand\/\the\catcode`\/\relax \catcode`\noexpand\"\the\catcode`\"\relax + \catcode`\noexpand\>\the\catcode`\>\relax \catcode`\noexpand\^^A\the\catcode`\^^A\relax} \catcode`\@=11 \catcode`\!=12 @@ -57,6 +58,7 @@ \catcode`\;=12 \catcode`\/=12 \catcode`\"=12 +\catcode`\>=12 \catcode`\^^A=\catcode`\% \edef\XC@@{\expandafter\noexpand\csname\string\XC@@\endcsname} \newif\ifcolors@ \colors@true @@ -67,7 +69,7 @@ \newif\ifconvertcolorsU \newif\ifblendcolors \newif\ifmaskcolors -\newif\ifXC@@xcp +\newif\ifXC@@fbox \XC@@fboxtrue \newif\ifXC@@tst \def\c@lor@error#1% {\ifcolorerrors@\PackageError{xcolor}{Undefined color #1}\@ehc @@ -75,22 +77,18 @@ \def\XC@append#1#2% {\ifx#1\@undefined\def#1{#2}\else\ifx#1\relax\def#1{#2}\else \toks@\expandafter{#1#2}\edef#1{\the\toks@}\fi\fi} -\def\XC@let@cc#1% - {\expandafter\XC@let@Nc\csname#1\endcsname} -\providecommand*\@namelet[1]% - {\expandafter\XC@let@Nc\csname#1\endcsname} -\def\XC@let@Nc#1#2% - {\expandafter\let\expandafter#1\csname#2\endcsname} -\def\XC@let@cN#1% - {\expandafter\let\csname#1\endcsname} +\def\XC@let@cc#1{\expandafter\XC@let@Nc\csname#1\endcsname} +\providecommand*\@namelet[1]{\expandafter\XC@let@Nc\csname#1\endcsname} +\def\XC@let@Nc#1#2{\expandafter\let\expandafter#1\csname#2\endcsname} +\def\XC@let@cN#1{\expandafter\let\csname#1\endcsname} \def\@namexdef#1{\expandafter\xdef\csname #1\endcsname} \def\aftergroupdef#1#2% {\expandafter\endgroup\expandafter\def\expandafter#1\expandafter{#2}} \def\aftergroupedef#1#2% - {\edef\@@tmp{\noexpand\def\noexpand#1{#2}}\expandafter\endgroup\@@tmp} + {\edef\@@tmp{\def\noexpand#1{#2}}\expandafter\endgroup\@@tmp} \begingroup \catcode`\!=13 \catcode`\:=13 \catcode`\-=13 \catcode`\+=13 -\catcode`\;=13 \catcode`\/=13 \catcode`\"=13 +\catcode`\;=13 \catcode`\/=13 \catcode`\"=13 \catcode`\>=13 \gdef\XC@edef#1#2% {\begingroup \ifnum\catcode`\!=13 \edef!{\string!}\fi @@ -99,13 +97,29 @@ \ifnum\catcode`\+=13 \edef+{\string+}\fi \ifnum\catcode`\;=13 \edef;{\string;}\fi \ifnum\catcode`\"=13 \edef"{\string"}\fi + \ifnum\catcode`\>=13 \edef>{\string>}\fi \edef#1{#2}\@onelevel@sanitize#1\aftergroupdef#1#1} \gdef\XC@mdef#1#2% {\begingroup \ifnum\catcode`\/=13 \edef/{\string/}\fi + \ifnum\catcode`\:=13 \edef:{\string:}\fi \edef#1{#2}\@onelevel@sanitize#1\aftergroupdef#1#1} \endgroup \def\XC@sdef#1#2{\edef#1{#2}\@onelevel@sanitize#1} +\def\@ifxempty#1{\@@ifxempty#1\@@ifxempty\XC@@} +\def\@@ifxempty#1#2\XC@@ + {\ifx#1\@@ifxempty + \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\long\def\XC@ifxcase#1#2#3% + {\long\def\@@tmp##1##2% + {\ifx#1##1% + \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\@@tmp\fi}% + \@@tmp#2#1{#3}\@nnil\the\toks@} +\long\def\XC@ifcase#1#2#3% + {\long\def\@@tmp##1##2% + {\@expandtwoargs\in@{,#1,}{,##1,}\ifin@ + \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\@@tmp\fi}% + \@@tmp#2{#1}{#3}\@nnil\the\toks@} \def\XC@@opt{,} \def\@ifXCopt#1% {\@expandtwoargs\in@{,#1,}{\XC@@opt}% @@ -124,7 +138,7 @@ \else \edef\XC@tgt@mod##1{#1}\convertcolorsDtrue\convertcolorsUtrue \fi\fi}} -\@tfor\@@tmp:={ignore}{named}{ps}{wave}\do +\@tfor\@@tmp:={Hsb}{tHsb}{ignore}{named}{ps}{wave}\do {\expandafter\XC@sdef\csname XC@mod@\@@tmp\endcsname{\@@tmp}} \@tfor\@@tmp:={natural}{rgb}{cmy}{cmyk}{hsb}{gray}{RGB}{HTML}{HSB}{Gray}\do {\expandafter\XC@sdef\csname XC@mod@\@@tmp\endcsname{\@@tmp}% @@ -151,6 +165,7 @@ \let\colornameprefix\XC@@nameprefix}}} \XC@declarenames{dvipsnames}{dvipsnam}{\let\colornameprefix\@empty} \XC@declarenames{svgnames}{svgnam}{} +\XC@declarenames{x11names}{x11nam}{} \XC@declarenames{hksnames}% {hks\ifcase\paperquality k\or n\or k\or z\else n\fi nam}{} \XC@declarenames{pmsnames}{pmsnam}{} @@ -174,17 +189,22 @@ {emtex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}% {tcidvi}{textures}{truetex}{vtex}{xetex}\do {\edef\@@tmp{\noexpand\DeclareOption{\@@tmp}% - {\noexpand\def\noexpand\Gin@driver{\@@tmp.def}}}% + {\def\noexpand\Gin@driver{\@@tmp.def}}}% \@@tmp} \DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}} \DeclareOption{oztex}{\ExecuteOptions{dvips}} \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}} -\DeclareOption{prologue}{\XC@@xcptrue} +\DeclareOption{xcdraw}{\def\XC@@xcd@{1}} +\DeclareOption{noxcdraw}{\def\XC@@xcd@{-1}} +\DeclareOption{prologue}{\def\XC@@xcp@{1}} +\DeclareOption{kernelfbox}{\XC@@fboxfalse} \DeclareOption{showerrors}{\colorerrors@true} \DeclareOption{hideerrors}{\colorerrors@false} \DeclareOption{debugshow}{\catcode`\^^A=9 \let\GDebug\typeout} \DeclareOption*% {\PackageInfo{xcolor}{Package option `\CurrentOption' ignored}} +\def\XC@@xcd@{-1} +\def\XC@@xcp@{-1} \ExecuteOptions{natural,showerrors} \InputIfFileExists{color.cfg}{}{} \let\@declareoption\XC@declareoption @@ -202,32 +222,36 @@ \def\@@tmp#1.def{\def\XC@@drv{#1}} \expandafter\@@tmp\Gin@driver \fi -\def\XC@@drv@{-1} -\@tfor\@@tmp:={dvips}{pctex32}\do - {\ifx\@@tmp\XC@@drv\def\XC@@drv@{0}\@break@tfor\fi} -\ifXC@@xcp\ifcase\XC@@drv@ - \AtBeginDvi{\special{header=xcolor.pro}\special{header=\jobname.xcp}} - \newwrite\XC@@xcp\immediate\openout\XC@@xcp=\jobname.xcp - \immediate\write\XC@@xcp{\@percentchar!} - \immediate\write\XC@@xcp{TeXDict begin} - \AtEndDocument - {\immediate\write\XC@@xcp{end}\immediate\closeout\XC@@xcp} -\fi\fi +\count@\XC@@xcd@ \advance\count@\XC@@xcp@\relax +\ifnum\count@>-2 + \XC@ifcase\XC@@drv + {{dvips,pctex32}% + {\def\@tempa{0} + \def\XC@special#1{\special{ps:XC!b}\special{"#1}\special{ps:XC!e}}}% + {pdftex}% + {\def\@tempa{1} + \def\XC@special#1{\pdfliteral{ q #1 Q }}}% + {dvipdfm}% + {\def\@tempa{1} + \def\XC@special#1{\special{pdf: content #1}}}% + }{\def\@tempa{-1}} + \ifnum\XC@@xcd@>\m@ne\let\XC@@xcd@\@tempa\fi + \ifnum\XC@@xcp@>\m@ne\let\XC@@xcp@\@tempa\fi + \ifnum\@tempa=0 \AtBeginDvi{\special{header=xcolor.pro}}\fi + \ifcase\XC@@xcp@ + \AtBeginDvi{\special{header=\jobname.xcp}} + \newwrite\XC@@xcp\immediate\openout\XC@@xcp=\jobname.xcp + \immediate\write\XC@@xcp{\@percentchar!} + \immediate\write\XC@@xcp{TeXDict begin} + \AtEndDocument + {\immediate\write\XC@@xcp{end}\immediate\closeout\XC@@xcp} + \fi +\fi \@nameuse{XC@pst} \@namedef{ver@color.sty}{1999/02/16} \XC@@pkg \long\def\@secondoffive#1#2#3#4#5{#2} \long\def\@thirdoffive#1#2#3#4#5{#3} -\def\@ifxempty#1{\@@ifxempty#1\@@ifxempty\XC@@} -\def\@@ifxempty#1#2\XC@@ - {\ifx#1\@@ifxempty - \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} -\long\def\XC@ifxcase#1#2#3% - {\long\def\XC@ifxc@se##1##2% - {\ifx#1##1% - \toks@{##2}\expandafter\remove@to@nnil\else - \expandafter\XC@ifxc@se\fi}% - \XC@ifxc@se#2#1{#3}\@nnil\the\toks@} \def\xglobal{\xglobal@stop\begingroup\futurelet\@@tok\xglobal@test} \def\xglobal@test {\expandafter\@tfor\expandafter\@@tmp @@ -255,6 +279,20 @@ {\ifx,#2% #1\expandafter\remove@to@nnil\else#1 \expandafter\XC@strip@comma\fi #2} +{\catcode`Q=3 + \gdef\XC@replace#1#2#3% + {\begingroup + \def\XC@repl@ce##1#2##2Q##3% + {\@ifxempty{##2}{\XC@r@pl@ce##1Q}{\XC@repl@ce##1##3##2Q{##3}}}% + \def\XC@r@pl@ce##1\@empty Q% + {\expandafter\endgroup\expandafter\def\expandafter#1\expandafter{##1}}% + \expandafter\XC@repl@ce\expandafter\@empty #1\@empty#2Q{#3}} +} +\def\XC@clean#1% + {\edef#1{ #1 }\edef#1{\expandafter\XC@strip@comma#1,,\@nnil}% + \edef#1{\expandafter\XC@cle@n#1\@empty}% + \edef#1{\expandafter\@gobbletwo#1}} +\def\XC@cle@n#1 #2{,#1\ifx#2\@empty\else\expandafter\XC@cle@n\fi#2} \def\rdivide#1#2% {\begingroup\toks@{#1}\edef\@@tmp{\noexpand\@tempdima\the#1}% \@defaultunits\@tempdimb=#2pt\relax\@nnil \@@tmp\relax @@ -350,8 +388,9 @@ \def\XC@calcC#1#2% {\llshiftset\dimen@{-#1}\advance\dimen@100\p@ \rrshift\dimen@ \XC@calcN{\strip@pt\dimen@}#2} -\def\XC@calcD#1#2% - {\dimen@#1\p@ \rdivide\dimen@\@@scl \edef#2{\strip@pt\dimen@}} +\def\XC@calcD{\XC@c@lcD\@@scl{}} +\def\XC@c@lcD#1#2#3#4% + {\dimen@#3\p@ \rdivide\dimen@{#1}\edef#4{\strip@pt\dimen@#2}} \def\XC@calcF#1#2% {\edef#2{#1}\expandafter\XC@c@lcF#2.0.:#2} \def\XC@c@lcF#1.#2.#3:#4% @@ -375,9 +414,13 @@ {\ifnum#10>0 1.00000\else 0.\ifnum#11<0 00000\else \XC@c@@cR#200000:\fi\fi} \def\XC@c@@cR#1#2#3#4#5#6:{#1#2#3#4#5} -\def\XC@calcS#1#2% - {\lshiftset\dimen@{#1}\dimen@\lshiftnum\@@scl\dimen@ \rrshift\dimen@ - \edef#2{\strip@pt\dimen@}} +\def\XC@calcS{\XC@c@lcS\@@scl{}} +\def\XC@c@lcS#1#2#3#4% + {\lshiftset\dimen@{#3}% + \ifdim#1\p@<100\p@ + \dimen@\lshiftnum#1\dimen@ \rrshift\dimen@ \else + \dimen@#1\dimen@ \rshift\dimen@ \fi + \edef#4{\strip@pt\dimen@#2}} \def\XC@calcT#1#2% {\lshiftset\dimen@{#1}\advance\dimen@\lshiftnum\@@arg\p@ \rshift\dimen@ \edef#2% @@ -386,13 +429,15 @@ {\dimen@#1\p@ \ifdim\dimen@=\p@\else \afterassignment\dimen@\count@=\the\dimen@ - \ifnum\count@<\z@ - \lshift\dimen@ \dimen@-\dimen@ \advance\dimen@10\p@ \rshift\dimen@ + \relax\ifdim\dimen@=\z@\else + \ifdim#1\p@<\z@ \dimen@-\dimen@ \advance\dimen@\p@ \fi \fi \fi \edef#2{\strip@pt\dimen@}} \providecommand*\rangeRGB{255} \providecommand*\rangeHSB{240} +\providecommand*\rangeHsb{360} +\providecommand*\rangetHsb{60,30;120,60;180,120;210,180;240,240} \providecommand*\rangeGray{15} \providecommand*\adjustUCRBG{1,1,1,1} \providecommand*\paperquality{1} @@ -413,10 +458,7 @@ {\begingroup \XC@sdef\@@cls{#1}\XC@edef\@@nam{#2}\edef\colornameprefix{#3}% \XC@logdef\@@nam - \ifXC@@getmod\XC@getmod{#4}\XC@@pos\@@mod\fi - \XC@getclr{#5}\XC@@pos\@@clr - \@ifundefined{color@\@@mod}% - {\c@lor@error{model `\@@mod'}\let\@@tmp\relax}% + \XC@getmodclr02{#4}{#5}{\let\@@tmp\relax}% {\ifx\@@mod\XC@mod@named \XC@c@l@rlet\@@nam\@@clr \else @@ -431,11 +473,11 @@ \XC@coremodel\@@mod\@@clr \csname color@\@@mod\expandafter\endcsname \expandafter\@@drv\expandafter{\@@clr}% - \ifXC@@xcp\ifcase\XC@@drv@ + \ifcase\XC@@xcp@ \immediate\write\XC@@xcp{/\colornameprefix\@@nam{\expandafter \XC@strip@comma\@@clr,,\@nnil}XC\@@mod}% \let\@@cls\XC@mod@named - \fi\fi + \fi \ifx\@@cls\@empty\else \let\@@tmp\@@cls \@nameuse{define@color@\@@cls}\@@nam\@@drv @@ -450,27 +492,41 @@ {\noexpand\xcolor@{\@@cls}{\the\toks@}{\@@mod}{\@@clr}}}% \fi}% \expandafter\endgroup\@@tmp\xglobal@stop} -\def\XC@getmod#1#2#3% - {\def\XC@getm@d##1/##2/##3/##4/##5/##6/##7/##8/##9:% - {\XC@g@tm@d0{##1}\XC@g@tm@d1{##2}\XC@g@tm@d2{##3}\XC@g@tm@d3{##4}% - \XC@g@tm@d4{##5}\XC@g@tm@d5{##6}\XC@g@tm@d6{##7}\XC@g@tm@d7{##8}% - \def#2{0}\def#3{##1}\@gobble\@nnil}% - \def\XC@g@tm@d##1##2% - {\edef#2{##2}\XC@sdef#3{\XC@tgt@mod#2}% - \ifx#2#3\def#2{##1}\expandafter\remove@to@nnil\fi}% - \XC@mdef#3{#1}\expandafter\XC@getm@d#3////////:} +\def\XC@getmodclr#1#2#3#4% + {\ifnum\ifcase#1 \ifXC@@getmod1\else0 \fi \or1 \fi>0 + \XC@mdef\@@mod{#3}\expandafter\XC@getmod\@@mod////////\XC@@ + \@ifundefinedmodel\@@Mod{\let\@@Mod\XC@mod@ignore}{}\fi + \@ifundefined{XC@mod@\@@mod}% + {\c@lor@error{model `\@@mod'}\@firstoftwo}% + {\ifcase#2\else + \XC@mdef\@@clr{#4}% + \edef\@@clr{\expandafter\XC@getclr\@@clr////////\XC@@}% + \ifx\@@cls\XC@mod@ps\else\XC@clean\@@clr\fi + \ifx\@@Mod\XC@mod@ignore\else + \convertcolorspec\@@mod\@@clr\@@Mod\@@clr + \ifnum#2>1 \let\@@mod\@@Mod\fi + \fi + \fi \@secondoftwo}} +\def\XC@getmod#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@ + {\XC@g@tm@d0#1::\XC@@ \XC@getm@d1{#2}\XC@getm@d2{#3}% + \XC@getm@d3{#4}\XC@getm@d4{#5}\XC@getm@d5{#6}\XC@getm@d6{#7}% + \XC@getm@d7{#8}\def\XC@@pos{0}\def\@@mod{#1}\@gobble\@nnil}% +\def\XC@getm@d#1#2% + {\edef\XC@@pos{#2}\XC@sdef\@@mod{\XC@tgt@mod\XC@@pos}% + \ifx\XC@@pos\@@mod\def\XC@@pos{#1}\expandafter\remove@to@nnil\fi}% +\def\XC@g@tm@d#1#2:#3:#4\XC@@ + {\@ifxempty{#3}{\let\@@Mod\XC@mod@ignore\XC@getm@d0{#2}}% + {\def\@@Mod{#2}\XC@getm@d0{#3}}}% +\def\XC@getclr#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@ + {\ifcase\XC@@pos\space #1\or#2\or#3\or#4\or#5\or#6\or#7\or#8\fi} \newif\ifXC@@getmod \XC@@getmodtrue -\def\XC@getclr#1#2#3% - {\def\XC@getc@r##1/##2/##3/##4/##5/##6/##7/##8/##9:% - {\ifcase#2 ##1\or##2\or##3\or##4\or##5\or##6\or##7\or##8\fi}% - \XC@mdef#3{#1}\edef#3{\expandafter\XC@getc@r#3////////:}} \let\xdefinecolor\definecolor \def\providecolor{\@testopt{\XC@providecolor}{}} \def\XC@providecolor[#1]#2% {\@testopt{\XC@providec@lor[#1]{#2}}\colornameprefix} \def\XC@providec@lor[#1]#2[#3]% {\XC@edef\XC@@tmp{#2}% - \@ifundefined{\string\color@\XC@@tmp}{\XC@definecolor[#1]{#2}[#3]}% + \@ifundefinedcolor\XC@@tmp{\XC@definecolor[#1]{#2}[#3]}% {\ifnum\XC@tracing>0 \PackageInfo{xcolor}{Ignoring color definition `\XC@@tmp'}\fi \@gobbletwo}} @@ -502,7 +558,7 @@ \fi \expandafter\endgroup\@@tmp\xglobal@stop} \def\XC@c@l@rlet#1#2% - {\@ifundefined{\string\color@#2}% + {\@ifundefinedcolor{#2}% {\c@lor@error{`#2'}\let\@@tmp\@empty}% {\edef\@@tmp {\ifglobalcolors\global\else\xglobal@\fi @@ -513,14 +569,11 @@ \def\XC@preparecolor[#1]#2% {\@testopt{\XC@preparec@lor[#1]{#2}}\colornameprefix} \def\XC@preparec@lor[#1]#2[#3]#4#5% - {\XC@edef\@@nam{#2}% - \ifXC@@getmod\XC@getmod{#4}\XC@@pos\@@mod\fi - \XC@getclr{#5}\XC@@pos\@@clr - \@ifundefined{XC@mod@\@@mod}% - {\c@lor@error{model `\@@mod'}}% + {\XC@sdef\@@cls{#1}\XC@edef\@@nam{#2}% + \XC@getmodclr01{#4}{#5}{}% {\xdef\XC@@stack - {\ifx\XC@@stack\@empty\else\XC@@stack,\fi - {#1}{\@@nam}{#3}{\@@mod}{\@@clr}}}} + {\ifx\XC@@stack\@empty\else\XC@@stack,\fi{#1}{\@@nam}{#3}% + {\ifx\@@Mod\XC@mod@ignore\@@mod\else\@@Mod\fi}{\@@clr}}}} \let\XC@@stack\@empty \def\definecolors#1% {\let\XC@@cmd\definecolor\let\XC@@glb\xglobal@ @@ -544,13 +597,13 @@ \def\definecolorset {\let\XC@@cmd\definecolor\@testopt{\XC@definecolorset}{}} \def\XC@definecolorset[#1]#2#3#4#5% - {\XC@getmod{#2}\XC@@pos\@@mod\XC@@getmodfalse\XC@edef\XC@@tmp{#5}% - \let\XC@@glb\xglobal@ - \def\XC@definec@lorset##1,##2;% - {\@ifxempty{##1}{}% - {\let\xglobal@\XC@@glb - \XC@@cmd[#1]{#3##1#4}{\@@mod}{##2}\XC@definec@lorset}}% - \expandafter\XC@definec@lorset\XC@@tmp;,;\XC@@getmodtrue} + {\XC@getmodclr10{#2}{}{}% + {\XC@@getmodfalse\XC@edef\XC@@tmp{#5}\let\XC@@glb\xglobal@ + \def\XC@definec@lorset##1,##2;% + {\@ifxempty{##1}{}% + {\let\xglobal@\XC@@glb + \XC@@cmd[#1]{#3##1#4}{\@@mod}{##2}\XC@definec@lorset}}% + \expandafter\XC@definec@lorset\XC@@tmp;,;\XC@@getmodtrue}} \def\providecolorset {\let\XC@@cmd\providecolor\@testopt{\XC@definecolorset}{}} \def\preparecolorset @@ -605,8 +658,7 @@ {\edef\@@tmp{\@nameuse{\string\colorB@#1}}% \expandafter\XC@st@p\@@tmp{#1}% \edef\@@tmp - {\noexpand\def\noexpand\@@mod{\@@mod}% - \noexpand\def\noexpand\@@clr{\@@tmp}}} + {\def\noexpand\@@mod{\@@mod}\def\noexpand\@@clr{\@@tmp}}} \def\blendcolors{\@ifstar{\XC@blendcolors\colorblend}{\XC@blendcolors{}}} \def\XC@blendcolors#1#2% {\edef\colorblend{#1}\XC@edef\XC@@tmp{#2}% @@ -641,34 +693,35 @@ {\@ifnextchar[\@undeclaredcolor\@declaredcolor} \def\@undeclaredcolor[#1]#2% {\begingroup - \XC@sdef\@@mod{#1}\XC@edef\@@clr{#2}% - \ifblendcolors - \ifx\colorblend\@empty\else - \edef\@@mix{\expandafter\@gobble\colorblend}\@tempswafalse - \XC@coremodel\@@mod\@@clr\@xcolor@{}{}\@@mod\@@clr + \let\@@cls\@empty + \XC@getmodclr12{#1}{#2}{}% + {\ifblendcolors + \ifx\colorblend\@empty\else + \edef\@@mix{\expandafter\@gobble\colorblend}\@tempswafalse + \XC@coremodel\@@mod\@@clr\@xcolor@{}{}\@@mod\@@clr + \fi \fi - \fi - \ifconvertcolorsU - \edef\@@tmp{\XC@tgt@mod{\@@mod}}% - \convertcolorspec\@@mod\@@clr\@@tmp\@@clr \let\@@mod\@@tmp - \fi - \ifmaskcolors - \convertcolorspec\@@mod\@@clr\XC@mmod\@@clr - \let\@@mod\XC@mmod - \XC@inflate\@@mod\XC@mclr\@@clr\@@tmp - \expandafter\XC@mul\@@tmp,\@@clr - \fi - \edef\@@tmp{\noexpand\XC@undeclaredcolor{\@@mod}{\@@clr}}% - \expandafter\endgroup\@@tmp} + \ifconvertcolorsU + \edef\@@tmp{\XC@tgt@mod{\@@mod}}% + \convertcolorspec\@@mod\@@clr\@@tmp\@@clr \let\@@mod\@@tmp + \fi + \ifmaskcolors + \convertcolorspec\@@mod\@@clr\XC@mmod\@@clr + \let\@@mod\XC@mmod + \XC@inflate\@@mod\XC@mclr\@@clr\@@tmp + \expandafter\XC@mul\@@tmp,\@@clr + \fi + \edef\@@tmp{\noexpand\XC@undeclaredcolor{\@@mod}{\@@clr}}% + \expandafter\endgroup\@@tmp}} \def\XC@undeclaredcolor#1#2% - {\@ifundefined{color@#1}% + {\@ifundefinedmodel{#1}% {\c@lor@error{model `#1'}}% {\@nameuse{color@#1}\current@color{#2}% \edef\XC@current@color{\noexpand\xcolor@{}{\current@color}{#1}{#2}}% \XC@display}} \def\@declaredcolor#1% {\XC@edef\XC@@tmp{#1}\XC@@tstfalse - \ifcase\XC@type{\XC@@tmp}\relax \XC@@tsttrue\or \relax\else + \ifcase\XC@type\XC@@tmp\relax \XC@@tsttrue\or \relax\else \ifblendcolors\XC@@tsttrue\fi \ifmaskcolors\XC@@tsttrue\fi \ifconvertcolorsU\XC@@tsttrue\fi \fi @@ -683,6 +736,96 @@ {\XC@let@Nc\XC@current@color{\string\color@\XC@@tmp}% \edef\current@color{\XC@current@color}% \XC@display} +\def\textcolor#1#{\@textcolor{#1}} +\def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}} +\def\pagecolor + {\begingroup + \let\ignorespaces\endgroup \let\set@color\set@page@color + \color} +\def\colorbox#1#{\color@box{#1}} +\def\color@box#1#2{\color@b@x\relax{\color#1{#2}}} +\def\fcolorbox#1#{\color@fbox{#1}} +\def\color@fbox#1#2#3#{\color@fb@x{#1}{#2}{#3}} +\def\color@fb@x#1#2#3#4% + {\color@b@x{\fboxsep\z@\color#1{#2}\XC@fbox}% + {\@ifxempty{#3}{\color#1}{\color#3}{#4}}} +\long\def\color@b@x#1#2#3% + {\leavevmode + \setbox\z@\hbox{\kern\fboxsep{\set@color#3}\kern\fboxsep}% + \dimen@\ht\z@\advance\dimen@\fboxsep\ht\z@\dimen@ + \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@ + {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}} +\def\XC@frameb@x#1% + {\hbox + {\@tempdima\fboxrule \advance\@tempdima\fboxsep + \advance\@tempdima\dp\@tempboxa + \setbox\@tempboxa\hbox + {\lower\@tempdima\hbox + {\vbox + {\kern\fboxrule + \hbox + {\kern\fboxrule#1% + \vbox{\kern\fboxsep\box\@tempboxa\kern\fboxsep}% + #1\kern\fboxrule}% + \kern\fboxrule}}}% + \@tempdima\wd\@tempboxa + \edef\@tempa{{\the\@tempdima}{\the\ht\@tempboxa}{\the\dp\@tempboxa}}% + \box\@tempboxa\kern-\@tempdima\expandafter\boxframe\@tempa}} +\ifXC@@fbox + \let\@frameb@x\XC@frameb@x \let\XC@fbox\fbox +\else + \def\XC@fbox{\let\@frameb@x\XC@frameb@x\fbox} +\fi + +\ifnum\XC@@xcd@>\m@ne +\def\XC@boxframe#1#2#3#4% + {\hbox{\sbox\z@{\ifdim\fboxrule>\z@ #4\fi}% + \wd\z@#1\relax\ht\z@#2\relax\dp\z@#3\relax\box\z@}} +\fi +\ifcase\XC@@xcd@ +\providecommand*\color@block[3]% + {{\set@color\hbox + {\dimen@#3\edef\@tempa{ \number\dimen@\space}% + \dimen@#2\edef\@tempa{ \number\dimen@\@tempa}% + \dimen@#1\relax + \XC@special{\number\dimen@\@tempa XCcolorblock}}}} +\providecommand*\boxframe[3]% + {\XC@boxframe{#1}{#2}{#3}% + {\dimen@#3\edef\@tempa{ \number\dimen@\space}% + \dimen@#2\edef\@tempa{ \number\dimen@\@tempa}% + \dimen@#1\relax + \XC@special{\number\fboxrule\space\number\dimen@\@tempa XCboxframe}}} +\or +\providecommand*\boxframe[3]% + {\XC@boxframe{#1}{#2}{#3}% + {\dimen@#3\edef\@tempa{ 0 -\strip@pt\dimen@\space}% + \edef\@tempb{\advance\dimen@\the\dimen@}% + \dimen@#2\advance\dimen@-\fboxrule\@tempb + \edef\@tempb{ \strip@pt\dimen@\space re s}% + \dimen@#1\advance\dimen@-\fboxrule + \edef\@tempb{ cm\@tempa\strip@pt\dimen@\@tempb}% + \dimen@.5\fboxrule\edef\@tempa{ \strip@pt\dimen@}% + \XC@special + {0.996264 0 0 0.996264 0 0 cm + \strip@pt\fboxrule\space w [] 0 d 2 J 0 j 4 M + 1 0 0 1\@tempa\@tempa\@tempb}}} +\fi +\providecommand*\color@block[3]% + {{\set@color\rlap{\ifcolors@\vrule\@width#1\@height#2\@depth#3\fi}}} +\providecommand*\boxframe[3]% + {\hbox + {\dimen@#2\advance\dimen@#3\relax + \lower#3\vbox + {\hrule\@height\fboxrule + \@tempdima-0.5\fboxrule \ifodd\fboxrule\advance\@tempdima\m@ne sp\fi + \kern\@tempdima + \hbox + {\advance\dimen@-\fboxrule + \vrule\@width\fboxrule\@height\dimen@\@depth\z@ + \@tempdima#1\advance\@tempdima-\tw@\fboxrule \kern\@tempdima + \vrule\@width\fboxrule\@height\dimen@\@depth\z@}% + \kern-0.5\fboxrule + \hrule\@height\fboxrule}}} \def\@xcolor@#1#2#3#4% {\edef\@@mod{#3}\edef\@@clr{#4}% \ifx\@@mix\@empty\else\expandafter\@xcolor@@\@@mix!!!!\@nil\fi @@ -720,22 +863,24 @@ {\@ifxempty{#4}{}{\@xcolor@@!#4!#5\@nil}}% {\@xcolor@@#3!#4!#5\@nil}} \def\XC@split#1% - {\begingroup\XC@edef\@@tmp{#1}\expandafter\XC@split@i\@@tmp:\@nil} -\def\XC@split@i#1:#2\@nil - {\@ifxempty{#2}{\XC@split@v}{\XC@split@ii#1,,:#2}} -\def\XC@split@ii#1,#2,#3:#4:% + {\begingroup\XC@edef\@@tmp{#1}\expandafter\XC@split@i\@@tmp>>\@nnil} +\def\XC@split@i#1>% + {\def\@@tmp{#1}\XC@split@ii#1:\@nil \XC@func} +\def\XC@split@ii#1:#2\@nil + {\@ifxempty{#2}{\XC@split@vi}{\XC@split@iii#1,,:#2}} +\def\XC@split@iii#1,#2,#3:#4:% {\edef\XC@@mod{#1}\let\@tempa\@empty \ifx,#2,\XC@@tsttrue\@tempdima\z@\else\XC@@tstfalse\@tempdima#2\p@\fi - \XC@split@iii#4;,;} -\def\XC@split@iii#1,#2;% + \XC@split@iv#4;,;} +\def\XC@split@iv#1,#2;% {\@ifxempty{#1}% {\let\XC@@clr\@empty \@tempa \expandafter\XC@calc@\XC@@clr,,,,:U% \let\@@mod\XC@@mod \let\@@clr\@@tmp} - {\XC@append\@tempa{\XC@split@iv{#1}{#2}}% + {\XC@append\@tempa{\XC@split@v{#1}{#2}}% \ifXC@@tst\advance\@tempdima#2\p@\fi - \XC@split@iii}} -\def\XC@split@iv#1#2% - {\def\@@tmp{#1}\XC@split@v + \XC@split@iv}} +\def\XC@split@v#1#2% + {\def\@@tmp{#1}\XC@split@vi \ifx\@@mod\XC@@mod\else \convertcolorspec\@@mod\@@clr\XC@@mod\@@clr \fi @@ -746,14 +891,14 @@ \XC@inflate\XC@@mod\XC@@clr\@@tmp\@@tmp \expandafter\XC@add\@@tmp,\XC@@clr \fi} -\def\XC@split@v{\count@\z@ \expandafter\XC@split@vi\@@tmp!\@nil} -\def\XC@split@vi#1% - {\ifx#1-\advance\count@\@ne\expandafter\XC@split@vi - \else\expandafter\XC@split@vii\expandafter#1\fi} -\def\XC@split@vii#1!#2\@nil +\def\XC@split@vi{\count@\z@ \expandafter\XC@split@vii\@@tmp!\@nil} +\def\XC@split@vii#1% + {\ifx#1-\advance\count@\@ne\expandafter\XC@split@vii + \else\expandafter\XC@split@viii\expandafter#1\fi} +\def\XC@split@viii#1!#2\@nil {\edef\@@nam{#1}\edef\@@mix{#2}% \ifodd\count@\@tempswatrue\else\@tempswafalse\fi - \@ifundefined{\string\color@\@@nam}% + \@ifundefinedcolor\@@nam {\c@lor@error{`\@@nam'}\def\@@nam{black}}{}% \let\xcolor@\@xcolor@\@nameuse{\string\color@\@@nam}} \def\XC@postfix#1#2]#3\relax @@ -767,41 +912,40 @@ \ifnum\@tempcnta=\z@\relax\else\XC@step\@@nam\fi \let\@@tmp\@empty \fi\expandafter\endgroup\@@tmp} +\def\XC@func#1>{\@ifxempty{#1}{\remove@to@nnil}{\XC@fun@#1,>\XC@func}} +\def\XC@fun@#1,#2>{\@nameuse{XC@func@#1}#2,,>} +\def\XC@func@wheel#1,#2,#3>{\XC@func@wh@el{#1}{#2}0} +\def\XC@func@twheel#1,#2,#3>{\XC@func@wh@el{#1}{#2}1} +\def\XC@func@wh@el#1#2#3% + {\convertcolorspec\@@mod\@@clr + {\ifcase#3 \XC@mod@Hsb\or\XC@mod@tHsb\fi}\@@clr + \expandafter\XC@extract@hue\@@clr:\@@hue \dimen@#1\p@ + \@ifxempty{#2}{}% + {\rdivide\dimen@{#2}\lshift\dimen@ + \dimen@\rangeHsb\dimen@\rshift\dimen@}% + \advance\dimen@\@@hue\p@ \rdivide\dimen@\rangeHsb + \edef\@@hue{\strip@pt\dimen@}\XC@calcU\@@hue\@@hue + \ifcase#3 + \expandafter\XC@replace@hue\@@clr:\@@hue,\@@clr + \or + \XC@c@lcS\rangeHsb{}\@@hue\@@hue + \expandafter\XC@replace@hue\@@clr:\@@hue,\@@clr + \convertcolorspec\XC@mod@tHsb\@@clr\XC@mod@hsb\@@clr + \fi + \let\@@mod\XC@mod@hsb} \def\XC@display {\XC@bcolor\XC@let@cN{\string\color@.}\XC@current@color \ifnum\XC@type{.}=1 - \PackageWarning{xcolor}{Incompatible color definition}% - \else - \ifnum\XC@tracing>2 - \begingroup \let\xcolor@\@empty \def\@nil{\string\@nil}% - \PackageInfo{xcolor}{Setting color `\XC@current@color'}% - \endgroup - \fi - \fi + \PackageWarning{xcolor}{Incompatible color definition}\else + \ifnum\XC@tracing>2 + \begingroup \let\xcolor@\@empty \def\@nil{\string\@nil}% + \PackageInfo{xcolor}{Setting color `\XC@current@color'}% + \endgroup + \fi\fi \XC@mcolor\set@color\XC@ecolor\ignorespaces} \let\XC@bcolor\relax \let\XC@mcolor\relax \let\XC@ecolor\relax -\def\textcolor#1#{\@textcolor{#1}} -\def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}} -\def\color@block#1#2#3{% - {\set@color\rlap{\ifcolors@\vrule\@width#1\@height#2\@depth#3\fi}}} -\def\colorbox#1#{\color@box{#1}} -\def\color@box#1#2{\color@b@x\relax{\color#1{#2}}} -\def\fcolorbox#1#{\color@fbox{#1}} -\def\color@fbox#1#2#3{% - \color@b@x{\fboxsep\z@\color#1{#2}\fbox}{\color#1{#3}}} -\long\def\color@b@x#1#2#3{% - \leavevmode - \setbox\z@\hbox{\kern\fboxsep{\set@color#3}\kern\fboxsep}% - \dimen@\ht\z@\advance\dimen@\fboxsep\ht\z@\dimen@ - \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@ - {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}% - \box\z@}}} -\def\pagecolor - {\begingroup - \let\ignorespaces\endgroup \let\set@color\set@page@color - \color} \def\XC@bordercolor#1#2% {\extractcolorspec{#2}\XC@@tmp \expandafter\convertcolorspec\XC@@tmp\XC@mod@rgb\XC@@tmp @@ -846,7 +990,7 @@ \@norowcolor \newif\if@rowcolors \newif\if@rowcmd - \ifx\rownum\@undefined\newcount\rownum\fi + \@ifundefined{rownum}{\newcount\rownum}{} \def\CT@extract#1\columncolor#2#3\@nil {\if!#2% \let\CT@column@color\@empty @@ -868,6 +1012,9 @@ \edef#2{\expandafter\@firstoftwo#3}% \edef#3{\expandafter\@secondoftwo#3}} \def\XC@extract@hue#1,#2:#3{\edef#3{#1}} +\def\XC@replace@hue#1,#2:#3,#4{\edef#4{#3,#2}} +\def\@ifundefinedcolor#1{\@ifundefined{\string\color@#1}} +\def\@ifundefinedmodel#1{\@ifundefined{color@#1}} \def\XC@type#1% {\expandafter\expandafter\expandafter\XC@typ@ \csname\string\color@#1\endcsname\@empty\@empty\@empty\XC@@} @@ -881,16 +1028,17 @@ \fi} \def\XC@info#1#2% {\XC@edef#2{#1}% - \if.#2\def#2{0}\else\expandafter\in@\expandafter:\expandafter{#2}% + \if.#2\def#2{0}\else\expandafter\in@\expandafter>\expandafter{#2}% + \ifin@\def#2{4}\else\expandafter\in@\expandafter:\expandafter{#2}% \ifin@\def#2{3}\else\expandafter\in@\expandafter!\expandafter{#2}% \ifin@\def#2{2}\else\edef#2{\noexpand\in@{/-}{/#2}}#2% - \edef#2{\ifin@2\else1\fi}\fi\fi\fi} + \edef#2{\ifin@2\else1\fi}\fi\fi\fi\fi} \def\tracingcolors{\begingroup\afterassignment\XC@tracingcolors\count@} \def\XC@tracingcolors{\aftergroupdef\XC@tracing{\the\count@}} \tracingcolors=0 \def\XC@logdef#1% {\ifnum\XC@tracing>1 - \@ifundefined{\string\color@#1}% + \@ifundefinedcolor{#1}% {\ifnum\XC@tracing>2 \PackageInfo{xcolor}{Defining color `#1'}% \fi}% @@ -902,12 +1050,20 @@ {\advance\count@\@ne \XC@sdef\@@tmp{\@@tmp}\edef\@@nam{\@@nam{\@@tmp}}}% \edef\@@num{\the\count@}% + \def\XC@@gt{\textgreater}\def\@@tmp{OT1}% + \ifx\f@encoding\@@tmp + \@expandtwoargs\in@{,\f@family,}{,cmtt,pcr,}% + \ifin@\def\XC@@gt{>}\fi + \fi + \def\XC@@xcp@{-1}\ifnum\XC@tracing>1 \def\XC@tracing{1}\fi \def\testcolor{\@testopt{\@testcolor}{}}% \def\@testcolor[##1]##2% - {\@ifxempty{##1}% - {\def\@@arg{##2&}\def\@@clr{##2}}% - {\def\@@arg{[##1]{##2}&}\definecolor{*}{##1}{##2}\def\@@clr{*}}% - \extractcolorspecs\@@clr\@@mod\@@clr + {\XC@mdef\@@mod{##1}\XC@edef\@@clr{##2}% + \ifx\@@mod\@empty + \let\@@arg\@@clr\XC@replace\@@arg>\XC@@gt\else + \edef\@@arg{[\@@mod]{\@@clr}}\XC@definecolor[]{*}\@@mod\@@clr + \def\@@clr{*}\fi + \XC@append\@@arg{&}\extractcolorspecs\@@clr\@@mod\@@clr \@testc@lor}% \def\@testc@lor {\count@\z@ @@ -946,6 +1102,8 @@ {\XC@ifxcase#1% {\XC@mod@RGB {\convertcolorspec#1#2\XC@mod@rgb#2\let#1\XC@mod@rgb}% \XC@mod@HTML{\convertcolorspec#1#2\XC@mod@rgb#2\let#1\XC@mod@rgb}% + \XC@mod@Hsb {\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}% + \XC@mod@tHsb{\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}% \XC@mod@HSB {\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}% \XC@mod@Gray{\convertcolorspec#1#2\XC@mod@gray#2\let#1\XC@mod@gray}% \XC@mod@wave{\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}% @@ -957,17 +1115,15 @@ {\XC@mod@cmy {\XC@calc@#1,#2,#3,,:C}% \XC@mod@cmyk {\XC@calc@#1,#2,#3,,:C\expandafter\XC@cnv@cmy@cmyk\@@tmp,}% - \XC@mod@hsb {\XC@cnv@rgb@hsb#1,#2,#3,}% - \XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,}% \XC@mod@RGB {\edef\@@scl{\rangeRGB}\XC@calc@#1,#2,#3,,:M}% \XC@mod@HTML{\edef\@@scl{\@cclv}\XC@calc@#1,#2,#3,,:M% \expandafter\XC@calc@\@@tmp,,:H% \expandafter\XC@cnv@rgb@HTML\@@tmp,}% - \XC@mod@HSB {\XC@cnv@rgb@hsb#1,#2,#3,% - \edef\@@scl{\rangeHSB}\expandafter\XC@calc@\@@tmp,,:M}% - \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,% - \edef\@@scl{\rangeGray}\XC@calcM\@@tmp\@@tmp}}% - {\XC@calc@#1,#2,#3,,:N}} + \XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,}% + \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,\XC@cnv@gray\@@tmp,}}% + {\XC@cnv@rgb@hsb#1,#2,#3,\XC@cnv@hsb@}} +\def\XC@cnv@rgb@ + {\ifx\tm\XC@mod@rgb\else\expandafter\XC@cnv@rgb\@@tmp,\fi} \def\XC@cnv@rgb@hsb#1,#2,#3,% {\count@\z@ \ifdim#2\p@>#1\p@ \else\advance\count@4 \fi @@ -1001,18 +1157,11 @@ {\edef\@@tmp{#1#2#3}} \def\XC@cnv@cmy#1,#2,#3,% {\XC@ifxcase\tm - {\XC@mod@rgb {\XC@calc@#1,#2,#3,,:C}% - \XC@mod@cmyk{\XC@cnv@cmy@cmyk#1,#2,#3,}% - \XC@mod@hsb {\XC@calc@#1,#2,#3,,:C\expandafter\XC@cnv@rgb@hsb\@@tmp,}% + {\XC@mod@cmyk{\XC@cnv@cmy@cmyk#1,#2,#3,}% \XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,\XC@calcC\@@tmp\@@tmp}% - \XC@mod@RGB {\XC@calc@#1,#2,#3,,:C% - \edef\@@scl{\rangeRGB}\expandafter\XC@calc@\@@tmp,,:M}% - \XC@mod@HTML{\XC@calc@#1,#2,#3,,:C\expandafter\XC@cnv@rgb\@@tmp,}% - \XC@mod@HSB {\XC@calc@#1,#2,#3,,:C\expandafter\XC@cnv@rgb@hsb\@@tmp,% - \edef\@@scl{\rangeHSB}\expandafter\XC@calc@\@@tmp,,:M}% \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,\XC@calcC\@@tmp\@@tmp - \edef\@@scl{\rangeGray}\XC@calcM\@@tmp\@@tmp}}% - {\XC@calc@#1,#2,#3,,:N}} + \XC@cnv@gray\@@tmp,}}% + {\XC@calc@#1,#2,#3,,:C\XC@cnv@rgb@}} \def\XC@cnv@cmy@cmyk#1,#2,#3,% {\edef\@@scl {\ifdim#1\p@<#2\p@ @@ -1025,36 +1174,22 @@ \expandafter\XC@calc@\@@tmp,:N} \def\XC@cnv@cmyk#1,#2,#3,#4,% {\XC@ifxcase\tm - {\XC@mod@rgb - {\XC@cnv@cmyk@cmy#1,#2,#3,#4,\expandafter\XC@calc@\@@tmp,,:C}% - \XC@mod@cmy{\XC@cnv@cmyk@cmy#1,#2,#3,#4,}% - \XC@mod@hsb - {\XC@cnv@cmyk@cmy#1,#2,#3,#4,\expandafter\XC@calc@\@@tmp,,:C% - \expandafter\XC@cnv@rgb@hsb\@@tmp,}% - \XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,% - \edef\@@arg{#4}\XC@calcT\@@tmp\@@tmp \XC@calcC\@@tmp\@@tmp}% - \XC@mod@RGB - {\XC@cnv@cmyk@cmy#1,#2,#3,#4,\expandafter\XC@calc@\@@tmp,,:C% - \edef\@@scl{\rangeRGB}\expandafter\XC@calc@\@@tmp,,:M}% - \XC@mod@HTML - {\XC@cnv@cmyk@cmy#1,#2,#3,#4,\expandafter\XC@cnv@cmy\@@tmp,}% - \XC@mod@HSB - {\XC@cnv@cmyk@cmy#1,#2,#3,#4,\expandafter\XC@calc@\@@tmp,,:C% - \expandafter\XC@cnv@rgb@hsb\@@tmp,% - \edef\@@scl{\rangeHSB}\expandafter\XC@calc@\@@tmp,,:M}% - \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,% - \edef\@@arg{#4}\XC@calcT\@@tmp\@@tmp \XC@calcC\@@tmp\@@tmp - \edef\@@scl{\rangeGray}\XC@calcM\@@tmp\@@tmp}}% - {\XC@calc@#1,#2,#3,#4,:N}} + {\XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,\edef\@@arg{#4}% + \XC@calcT\@@tmp\@@tmp \XC@calcC\@@tmp\@@tmp}% + \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,\edef\@@arg{#4}% + \XC@calcT\@@tmp\@@tmp \XC@calcC\@@tmp\@@tmp \XC@cnv@gray\@@tmp,}}% + {\XC@cnv@cmyk@cmy#1,#2,#3,#4,% + \ifx\tm\XC@mod@cmy\else\expandafter\XC@cnv@cmy\@@tmp,\fi}} \def\XC@cnv@cmyk@cmy#1,#2,#3,#4,% {\edef\@@arg{#4}\XC@calc@#1,#2,#3,,:T} \def\XC@cnv@hsb#1,#2,#3,% - {\ifx\tm\XC@mod@HSB - \edef\@@scl{\rangeHSB}\XC@calc@#1,#2,#3,,:M% - \else - \XC@cnv@hsb@rgb#1,#2,#3,% - \ifx\tm\XC@mod@rgb\else\expandafter\XC@cnv@rgb\@@tmp,\fi - \fi} + {\XC@ifxcase\tm + {\XC@mod@Hsb {\XC@cnv@hsb@Hsb#1,#2,#3,}% + \XC@mod@tHsb{\XC@cnv@hsb@Hsb#1,#2,#3,\expandafter\XC@cnv@Hsb\@@tmp,}% + \XC@mod@HSB {\edef\@@scl{\rangeHSB}\XC@calc@#1,#2,#3,,:M}}% + {\XC@cnv@hsb@rgb#1,#2,#3,\XC@cnv@rgb@}} +\def\XC@cnv@hsb@ + {\ifx\tm\XC@mod@hsb\else\expandafter\XC@cnv@hsb\@@tmp,\fi} \def\XC@cnv@hsb@rgb#1,#2,#3,% {\llshiftset\dimen@{#1}\dimen@6\dimen@ \rrshift\dimen@ \afterassignment\dimen@\count@=\the\dimen@ @@ -1067,12 +1202,13 @@ \expandafter\XC@calc@\@@tmp,,:C% \edef\@@scl{#3}\expandafter\XC@calc@\@@tmp,,:S% \expandafter\XC@calc@\@@tmp,,:N} +\def\XC@cnv@hsb@Hsb#1,#2,#3,% + {\XC@c@lcS\rangeHsb{,#2,#3}{#1}\@@tmp} \def\XC@cnv@gray#1,% {\XC@ifxcase\tm {\XC@mod@rgb {\XC@calcN{#1}\@@tmp \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}}% \XC@mod@cmy {\XC@calcC{#1}\@@tmp \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}}% \XC@mod@cmyk{\XC@calcC{#1}\@@tmp \edef\@@tmp{0,0,0,\@@tmp}}% - \XC@mod@hsb {\XC@calcN{#1}\@@tmp \edef\@@tmp{0,0,\@@tmp}}% \XC@mod@RGB {\edef\@@scl{\rangeRGB}\XC@calcM{#1}\@@tmp \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}}% \XC@mod@HTML{\edef\@@scl{\@cclv}\XC@calcM{#1}\@@tmp @@ -1080,62 +1216,85 @@ \XC@mod@HSB {\edef\@@scl{\rangeHSB}\XC@calcM{#1}\@@tmp \edef\@@tmp{0,0,\@@tmp}}% \XC@mod@Gray{\edef\@@scl{\rangeGray}\XC@calcM{#1}\@@tmp}}% - {\XC@calcN{#1}\@@tmp}} + {\XC@calcN{#1}\@@tmp \edef\@@tmp{0,0,\@@tmp}}} \def\XC@cnv@RGB#1,#2,#3,% - {\edef\@@scl{\rangeRGB}\XC@calc@#1,#2,#3,,:D\expandafter\XC@cnv@rgb\@@tmp,} + {\edef\@@scl{\rangeRGB}\XC@calc@#1,#2,#3,,:D\XC@cnv@rgb@} \def\XC@cnv@HTML#1,% {\edef\@@tmp{\expandafter\@hex@Hex#1\relax}\expandafter\XC@cnv@HTML@\@@tmp - \edef\@@scl{\@cclv}\expandafter\XC@calc@\@@tmp,,:D% - \expandafter\XC@cnv@rgb\@@tmp,} + \edef\@@scl{\@cclv}\expandafter\XC@calc@\@@tmp,,:D\XC@cnv@rgb@} \def\XC@cnv@HTML@#1#2#3#4#5#6% {\edef\@@tmp{\number"#1#2,\number"#3#4,\number"#5#6}} +\def\XC@cnv@Hsb#1,#2,#3,% + {\ifx\tm\XC@mod@tHsb\XC@cnv@@Hsb#1,#2,#3,\XC@cnv@Hsb@ + \else\XC@cnv@Hsb@hsb#1,#2,#3,\XC@cnv@hsb@\fi} +\def\XC@cnv@Hsb@hsb#1,#2,#3,% + {\XC@c@lcD\rangeHsb{,#2,#3}{#1}\@@tmp} +\def\XC@cnv@@Hsb#1,#2,#3,#4% + {\dimen@\rangeHsb\p@ \advance\dimen@\p@ \edef\@@tmp{\strip@pt\dimen@}% + \edef\@@tmp{0,0;\rangetHsb;\rangeHsb,\rangeHsb;\@@tmp,\@@tmp;}% + \dimen@#1\p@ \expandafter#4\@@tmp\@nnil + \edef\@@tmp{\strip@pt\dimen@,#2,#3}} +\def\XC@cnv@Hsb@#1,#2;#3,#4;% + {\ifdim\dimen@<#4\p@ + \@tempdima#3\p@ \advance\@tempdima-#1\p@ + \@tempdimb#4\p@ \advance\@tempdimb-#2\p@ + \rdivide\@tempdima\@tempdimb + \advance\dimen@-#2\p@ \rmultiply\dimen@{\strip@pt\@tempdima}% + \advance\dimen@#1\p@ \expandafter\remove@to@nnil + \else + \def\@@tmp{\XC@cnv@Hsb@#3,#4;}\expandafter\@@tmp + \fi} +\def\XC@cnv@tHsb#1,#2,#3,% + {\XC@cnv@@Hsb#1,#2,#3,\XC@cnv@tHsb@ + \ifx\tm\XC@mod@Hsb\else\expandafter\XC@cnv@Hsb\@@tmp,\fi} +\def\XC@cnv@tHsb@#1,#2;#3,#4;% + {\ifdim\dimen@<#3\p@ + \@tempdima#4\p@ \advance\@tempdima-#2\p@ + \@tempdimb#3\p@ \advance\@tempdimb-#1\p@ + \rdivide\@tempdima\@tempdimb + \advance\dimen@-#1\p@ \rmultiply\dimen@{\strip@pt\@tempdima}% + \advance\dimen@#2\p@ \expandafter\remove@to@nnil + \else + \def\@@tmp{\XC@cnv@tHsb@#3,#4;}\expandafter\@@tmp + \fi} \def\XC@cnv@HSB#1,#2,#3,% - {\edef\@@scl{\rangeHSB}\XC@calc@#1,#2,#3,,:D\expandafter\XC@cnv@hsb\@@tmp,} + {\edef\@@scl{\rangeHSB}\XC@calc@#1,#2,#3,,:D\XC@cnv@hsb@} \def\XC@cnv@Gray#1,% - {\edef\@@scl{\rangeGray}\XC@calcD{#1}\@@tmp \XC@cnv@gray\@@tmp,} + {\XC@c@lcD\rangeGray{}{#1}\@@tmp \XC@cnv@gray\@@tmp,} \def\XC@cnv@wave#1,% - {\XC@cnv@wave@hsb#1,% - \ifx\tm\XC@mod@hsb\else\expandafter\XC@cnv@hsb\@@tmp,\fi} + {\XC@cnv@wave@hsb#1,\XC@cnv@hsb@} \def\XC@cnv@wave@hsb#1,% {\@tempdima#1\p@ \ifdim\@tempdima<440\p@ - \XC@c@v@wave@hsb{-.0166667}{7.33333}4{}% - \else\ifdim\@tempdima<490\p@ - \XC@c@v@wave@hsb{.02}{-8.8}4-% - \else\ifdim\@tempdima<510\p@ - \XC@c@v@wave@hsb{-.05}{25.5}2{}% - \else\ifdim\@tempdima<580\p@ - \XC@c@v@wave@hsb{.0142857}{-7.28571}2-% - \else\ifdim\@tempdima<645\p@ - \XC@c@v@wave@hsb{-.0153846}{9.92308}0{}% - \else - \dimen@\z@ - \fi\fi\fi\fi\fi + \XC@c@v@wave@hsb{-.0166667}{7.33333}4{}\else + \ifdim\@tempdima<490\p@ + \XC@c@v@wave@hsb{.02}{-8.8}4-\else + \ifdim\@tempdima<510\p@ + \XC@c@v@wave@hsb{-.05}{25.5}2{}\else + \ifdim\@tempdima<580\p@ + \XC@c@v@wave@hsb{.0142857}{-7.28571}2-\else + \ifdim\@tempdima<645\p@ + \XC@c@v@wave@hsb{-.0153846}{9.92308}0{}\else + \dimen@\z@ \fi\fi\fi\fi\fi \divide\dimen@6\relax \edef\@@tmp{\strip@pt\dimen@,1,}% \ifdim\@tempdima<420\p@ - \XC@c@v@wave@hsb{.0175}{-6.35}0{}% - \else\ifdim\@tempdima>700\p@ - \XC@c@v@wave@hsb{-.00875}{7.125}0{}% - \else - \dimen@\p@ - \fi\fi + \XC@c@v@wave@hsb{.0175}{-6.35}0{}\else + \ifdim\@tempdima>700\p@ + \XC@c@v@wave@hsb{-.00875}{7.125}0{}\else + \dimen@\p@ \fi\fi \edef\@@tmp{\@@tmp\strip@pt\dimen@}} \def\XC@c@v@wave@hsb#1#2#3#4% {\dimen@#1\@tempdima \advance\dimen@#2\p@ - \edef\@tempa{\strip@pt\dimen@}% - \XC@calcR\@tempa\@tempa + \XC@calcR{\strip@pt\dimen@}\@tempa \dimen@#4\@tempa\p@ \advance\dimen@#3\p@} \def\XC@cnv@cmyk@compl#1,#2,#3,#4,% {\XC@cnv@cmyk@cmy#1,#2,#3,#4,% - \expandafter\XC@calc@\@@tmp,,:C% - \expandafter\XC@cnv@cmy@cmyk\@@tmp,} + \expandafter\XC@calc@\@@tmp,,:C\expandafter\XC@cnv@cmy@cmyk\@@tmp,} \def\XC@cnv@hsb@compl#1,#2,#3,% {\lshiftset\dimen@{#1}\advance\dimen@\ifdim\dimen@<5\p@-\fi-5\p@ - \rshift\dimen@ - \edef\@@tmp{\strip@pt\dimen@}% - \lshiftset\dimen@{#3}% - \@tempdima#2\dimen@ + \rshift\dimen@ \edef\@@tmp{\strip@pt\dimen@}% + \lshiftset\dimen@{#3}\@tempdima#2\dimen@ \@tempdimb\@tempdima \advance\@tempdimb10\p@ \advance\@tempdimb-\dimen@ \ifdim\@tempdimb=\z@ \edef\@@tmp{\@@tmp,0,0}% @@ -1144,33 +1303,35 @@ \edef\@@tmp{\@@tmp,\strip@pt\@tempdima,\strip@pt\@tempdimb}% \fi} \def\substitutecolormodel#1#2% - {\edef\XC@@tmp{\expandafter\XC@substitutecolormodel#2/ignore/\@nnil}% - \expandafter\edef\csname color@#1\endcsname##1##2% - {\noexpand\convertcolorspec - \expandafter\noexpand\csname XC@mod@#1\endcsname{##2}% - \expandafter\noexpand\csname XC@mod@\XC@@tmp\endcsname - \noexpand\XC@@tmp\noexpand\expandafter - \expandafter\noexpand\csname color@\XC@@tmp\endcsname - \noexpand\expandafter##1\noexpand\expandafter{\noexpand\XC@@tmp}}% + {\XC@sdef\XC@@tmp{\expandafter\XC@substitutecolormodel#2/ignore/\@nnil}% + \ifx\XC@@tmp\XC@mod@ignore + \XC@let@cN{color@#1}\color@ignore + \else + \expandafter\edef\csname color@#1\endcsname##1##2% + {\noexpand\convertcolorspec + \expandafter\noexpand\csname XC@mod@#1\endcsname{##2}% + \expandafter\noexpand\csname XC@mod@\XC@@tmp\endcsname + \noexpand\XC@@tmp\noexpand\expandafter + \expandafter\noexpand\csname color@\XC@@tmp\endcsname + \noexpand\expandafter##1\noexpand\expandafter{\noexpand\XC@@tmp}}% + \fi \expandafter\xglobalize@\csname color@#1\endcsname \xglobal@stop \PackageInfo{xcolor}{Model `#1' substituted by `\XC@@tmp'}} \def\XC@substitutecolormodel#1/% - {\@ifundefined{color@#1}{\XC@substitutecolormodel}{#1\remove@to@nnil}} + {\@ifundefinedmodel{#1}{\XC@substitutecolormodel}{#1\remove@to@nnil}} \def\color@ignore#1#2{\def#1{}} -\@ifundefined{color@rgb}% - {\substitutecolormodel{rgb}{RGB/HTML/hsb/HSB/cmy/cmyk/gray/Gray}}{} -\@ifundefined{color@cmyk}{\substitutecolormodel{cmyk}{cmy/rgb}}{} -\@ifundefined{color@cmy}% +\@ifundefinedmodel{rgb}% + {\substitutecolormodel{rgb}{RGB/HTML/hsb/Hsb/HSB/cmy/cmyk/gray/Gray}}{} +\@ifundefinedmodel{cmyk}{\substitutecolormodel{cmyk}{cmy/rgb}}{} +\@ifundefinedmodel{cmy}% {\PackageInfo{xcolor}{Model `cmy' substituted by `cmy0'} \def\color@cmy#1#2{\color@cmyk#1{#2,0}}}{} -\@ifundefined{color@hsb}{\@tempswatrue}% - {\@tempswafalse - \@tfor\@@tmp:={dvipdfm}{textures}\do - {\ifx\@@tmp\XC@@drv\@tempswatrue\@break@tfor\fi}} +\@ifundefinedmodel{hsb}{\@tempswatrue}% + {\XC@ifcase\XC@@drv{{dvipdfm,textures}\@tempswatrue}\@tempswafalse} \if@tempswa - \substitutecolormodel{hsb}{HSB/rgb} + \substitutecolormodel{hsb}{Hsb/HSB/rgb} \fi -\@ifundefined{color@RGB}% +\@ifundefinedmodel{RGB}% {\substitutecolormodel{RGB}{HTML/rgb}} {\PackageInfo{xcolor}{Model `RGB' extended} \let\XC@color@RGB\color@RGB @@ -1181,11 +1342,13 @@ \convertcolorspec\XC@mod@RGB{#2}\XC@mod@rgb\XC@@tmp \expandafter\color@rgb\expandafter#1\expandafter{\XC@@tmp}% \fi}} -\@ifundefined{color@gray}{\substitutecolormodel{gray}{Gray/rgb}}{} -\@ifundefined{color@HTML}{\substitutecolormodel{HTML}{rgb}}{} -\@ifundefined{color@HSB}{\substitutecolormodel{HSB}{hsb}}{} -\@ifundefined{color@Gray}{\substitutecolormodel{Gray}{gray}}{} -\@ifundefined{color@wave}{\substitutecolormodel{wave}{hsb}}{} +\@ifundefinedmodel{gray}{\substitutecolormodel{gray}{Gray/rgb}}{} +\@ifundefinedmodel{HTML}{\substitutecolormodel{HTML}{rgb}}{} +\@ifundefinedmodel{Hsb}{\substitutecolormodel{Hsb}{hsb}}{} +\@ifundefinedmodel{tHsb}{\substitutecolormodel{tHsb}{hsb}}{} +\@ifundefinedmodel{HSB}{\substitutecolormodel{HSB}{hsb}}{} +\@ifundefinedmodel{Gray}{\substitutecolormodel{Gray}{gray}}{} +\@ifundefinedmodel{wave}{\substitutecolormodel{wave}{hsb}}{} \@ifundefined{XC@pst}{% \def\XC@getcolor#1#2% {\begingroup\toks@{#1}\XC@getc@lor#1\XC@@\aftergroupdef#2{\@@tmp}} @@ -1207,10 +1370,10 @@ \fi} }{% compatibility code begin \def\XC@getcolor#1#2% - {\@ifundefined{\string\color@#1}% + {\@ifundefinedcolor{#1}% {\begingroup\color{#1}% \edef\@@tmp - {\noexpand\edef\noexpand#2{\noexpand\expandafter\noexpand\c@lor@to@ps + {\edef\noexpand#2{\noexpand\expandafter\noexpand\c@lor@to@ps \current@color\noexpand\@@}}% \expandafter\endgroup\@@tmp}% {\edef#2{\XC@usecolor{#1}}}} @@ -1232,35 +1395,31 @@ \def\c@lor@special#1#2{\edef\@tempa{\write#1{#2}}\@tempa} \def\normalcolor{\let\current@color\default@color\set@color} \AtBeginDocument{\let\default@color\current@color} -\@tfor\@@tmp:={dvipdf}{dvipdfm}{dvipdfmx}{dvips}{pctex32}\do - {\ifx\@@tmp\XC@@drv - \def\c@lor@@named#1,#2,#3\@@#4% - {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive - \csname\string\color@#1\endcsname}} - \def\define@color@named#1#2% - {\@namedef{\string\color@#1}{{}{}{ \colornameprefix#1}{}{}}} - \@break@tfor\fi} -\@tfor\@@tmp:={dvipsone}{pctexps}{pdftex}{tcidvi}{truetex}{vtex}{xetex}\do - {\ifx\@@tmp\XC@@drv - \def\c@lor@@named#1,#2,#3\@@#4% - {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive - \csname\string\color@#1\endcsname}} - \def\define@color@named#1#2% - {\let\@@cls\@empty\@namedef{\string\color@#1}{{}{}{#2}{}{}}} - \@break@tfor\fi} -\@tfor\@@tmp:={textures}\do - {\ifx\@@tmp\XC@@drv - \def\c@lor@@named#1,#2,#3\@@#4% - {\edef\@tempa{\color@P@custom{#1}{\if!#2!1\else#2\fi}}% - \expandafter\def\expandafter#4\@tempa} - \def\define@color@named#1#2% - {\edef\@tempa{{#1}{#2}}\expandafter\AddCustomColor\@tempa} - \def\c@lor@ps@#1 #2\@@ - {\expandafter\expandafter\expandafter\expandafter\expandafter - \expandafter\expandafter\c@lor@to@ps@ - \csname\string\color@#1\expandafter\endcsname\space - #2. \@@{#1}} - \@break@tfor\fi} +\XC@ifcase\XC@@drv + {{dvipdf,dvipdfm,dvipdfmx,dvips,pctex32}% + {\def\c@lor@@named#1,#2,#3\@@#4% + {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive + \csname\string\color@#1\endcsname}} + \def\define@color@named#1#2% + {\@namedef{\string\color@#1}{{}{}{ \colornameprefix#1}{}{}}}}% + {dvipsone,pctexps,pdftex,tcidvi,truetex,vtex,xetex}% + {\def\c@lor@@named#1,#2,#3\@@#4% + {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive + \csname\string\color@#1\endcsname}} + \def\define@color@named#1#2% + {\let\@@cls\@empty\@namedef{\string\color@#1}{{}{}{#2}{}{}}}}% + {textures}% + {\def\c@lor@@named#1,#2,#3\@@#4% + {\edef\@tempa{\color@P@custom{#1}{\if!#2!1\else#2\fi}}% + \expandafter\def\expandafter#4\@tempa} + \def\define@color@named#1#2% + {\edef\@tempa{{#1}{#2}}\expandafter\AddCustomColor\@tempa} + \def\c@lor@ps@#1 #2\@@ + {\expandafter\expandafter\expandafter\expandafter\expandafter + \expandafter\expandafter\c@lor@to@ps@ + \csname\string\color@#1\expandafter\endcsname\space + #2. \@@{#1}}}% + }{} \definecolorset{rgb/hsb/cmyk/gray}{}{}% {red,1,0,0/0,1,1/0,1,1,0/.3;% green,0,1,0/.33333,1,1/1,0,1,0/.59;% diff --git a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty index ee39992ab2f..b8aebc251d7 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{pst-xkey} - [2005/02/22 v1.5 package wrapper for pst-xkey.tex (HA)] + [2005/11/25 v1.6 package wrapper for pst-xkey.tex (HA)] \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi \DeclareOptionX*{% \PackageWarning{pst-xkey}{Unknown option `\CurrentOption'}% diff --git a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex index c78b82d6ae9..cad6b16f6e3 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex +++ b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex @@ -41,11 +41,11 @@ } \catcode`\@=11\relax \ifx\ProvidesFile\@undefined - \message{2005/02/22 v1.5 PSTricks specialization of xkeyval (HA)} + \message{2005/11/25 v1.6 PSTricks specialization of xkeyval (HA)} \ifx\XKeyValLoaded\endinput\else\input xkeyval \fi \else \ProvidesFile{pst-xkey.tex} - [2005/02/22 v1.5 PSTricks specialization of xkeyval (HA)] + [2005/11/25 v1.6 PSTricks specialization of xkeyval (HA)] \@addtofilelist{pst-xkey.tex} \RequirePackage{xkeyval} \fi @@ -59,7 +59,7 @@ \def\psset{% \expandafter\@testopt\expandafter\pss@t\expandafter{\pst@famlist}% } -\def\pss@t[#1]{\setkeys+[psset]{#1}} +\def\pss@t[#1]#2{\setkeys+[psset]{#1}{#2}\ignorespaces} \def\@psset#1,\@nil{% \edef\XKV@tempa{\noexpand\setkeys+[psset]{\pst@famlist}}% \XKV@tempa{#1}% diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty index eac101c3e4f..34b6222bcec 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{xkeyval} - [2005/08/12 v2.5d package option processing (HA)] + [2005/11/25 v2.5e package option processing (HA)] \ifx\XKeyValLoaded\endinput\else\input xkeyval \fi \edef\XKVcatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex index eeee64cd52f..aca45ff5443 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex +++ b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex @@ -57,10 +57,10 @@ \newif\ifXKV@preset \let\XKV@rm\@empty \ifx\ProvidesFile\@undefined - \message{2005/08/12 v2.5d key=value parser (HA)} + \message{2005/11/25 v2.5e key=value parser (HA)} \input xkvtxhdr \else - \ProvidesFile{xkeyval.tex}[2005/08/12 v2.5d key=value parser (HA)] + \ProvidesFile{xkeyval.tex}[2005/11/25 v2.5e key=value parser (HA)] \@addtofilelist{xkeyval.tex} \fi \long\def\@firstoftwo#1#2{#1} |