From f24377c5813241f4296f4b9d5118dbde63f296ed Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 23 Feb 2020 00:28:45 +0000 Subject: ntgclass (22feb20) git-svn-id: svn://tug.org/texlive/trunk@53870 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ntgclass/boek3.cls | 107 +++++++++++++------------ 1 file changed, 56 insertions(+), 51 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ntgclass/boek3.cls') diff --git a/Master/texmf-dist/tex/latex/ntgclass/boek3.cls b/Master/texmf-dist/tex/latex/ntgclass/boek3.cls index e1c936b528a..1587476cae6 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/boek3.cls +++ b/Master/texmf-dist/tex/latex/ntgclass/boek3.cls @@ -7,19 +7,22 @@ %% ntgclass.dtx (with options: `boek,type3') %% This is a generated file. %% -%% Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep. +%% The source is maintained by Johannes Braams and bug +%% reports for it can be sent to texniek at braams.xs4all.nl +%% +%% Copyright (C) 1990-2020 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. %% ------------------------------------------------------------------------------ %% %% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% 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.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2008 or later. %% %% This work has the LPPL maintenance status "maintained". %% @@ -35,28 +38,9 @@ %% The list of derived (unpacked) files belonging to the distribution %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. -%% Copyright (C) 1994 -- 2004 by Victor Eijkhout and Johannes Braams -%% Based on classes.dtx -%% Copyright (C) 1999 LaTeX3 project, all rights reserved. -%% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -\NeedsTeXFormat{LaTeX2e}[1995/06/01] +\NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{boek3}% - [2004/06/07 v2.1a + [2020/02/22 v2.1c NTG LaTeX document class] \newcommand*\@ptsize{} @@ -325,7 +309,7 @@ \else \protect\numberline{\csname the#1\endcsname}% \fi - \toc@font#2 #7}% + #7}% \else \def\@svsechd{#6\hskip #3\relax \@svsec #8\csname #1mark\endcsname{#7}% @@ -334,7 +318,7 @@ \else \protect\numberline{\csname the#1\endcsname}% \fi - \toc@font#2 #7}}% + #7}}% \fi \@xsect{#5}} \def\@seccntformat#1{% @@ -393,7 +377,7 @@ \def\@part[#1]#2{% \ifnum \c@secnumdepth >-2\relax \refstepcounter{part}% - \addcontentsline{toc}{part}{\thepart\hspace{1em}\toc@case{#1}}% + \addcontentsline{toc}{part}{\protect\numberline{\thepart}{#1}}% \else \addcontentsline{toc}{part}{\toc@case{#1}}% \fi @@ -403,12 +387,12 @@ \normalfont \ifnum \c@secnumdepth >-2\relax \Large\PartFont - \edef\@tempa{\noexpand\uppercase{\partname}}\@tempa + \edef\@tempa{\noexpand\MakeUppercase{\partname}}\@tempa \nobreakspace\thepart \par \vskip 20\p@ \fi - \Large \PartFont \uppercase{#2}\par}% + \Large \PartFont \MakeUppercase{#2}\par}% \@endpart} \def\@spart#1{% {\centering @@ -436,12 +420,12 @@ \refstepcounter{chapter}% \typeout{\@chapapp\space\thechapter.}% \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}\toc@font0 #1}% + {\protect\numberline{\thechapter}#1}% \else - \addcontentsline{toc}{chapter}{\toc@font0 #1}% + \addcontentsline{toc}{chapter}{#1}% \fi \else - \addcontentsline{toc}{chapter}{\toc@font0 #1}% + \addcontentsline{toc}{chapter}{#1}% \fi \chaptermark{#1}% \addtocontents{lof}{\protect\addvspace{10\p@}}% @@ -597,12 +581,14 @@ \renewcommand*\p@enumiii{\theenumi(\theenumii)} \renewcommand*\p@enumiv{\p@enumiii\theenumiii} \renewenvironment{enumerate}{% - \ifnum \@enumdepth >3 + \ifnum \@enumdepth >\thr@@ \@toodeep \else \advance\@enumdepth \@ne \edef\@enumctr{enum\romannumeral\the\@enumdepth}% - \list{\csname label\@enumctr\endcsname} + \expandafter + \list + \csname label\@enumctr\endcsname {\usecounter{\@enumctr}% \if@revlabel \def\makelabel##1{\hskip .5\unitindent{##1\hfil}}% @@ -612,17 +598,20 @@ }% \fi} {\global\@ignoretrue \endlist} -\newcommand*{\labelitemi}{\textbullet} -\newcommand*{\labelitemii}{\normalfont\bfseries \textendash} -\newcommand*{\labelitemiii}{\textasteriskcentered} -\newcommand*{\labelitemiv}{\textperiodcentered} +\newcommand\labelitemi {\labelitemfont \textbullet} +\newcommand\labelitemii {\labelitemfont \bfseries \textendash} +\newcommand\labelitemiii{\labelitemfont \textasteriskcentered} +\newcommand\labelitemiv {\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} \renewenvironment{itemize}{% - \ifnum \@itemdepth >3 + \ifnum \@itemdepth >\thr@@ \@toodeep \else \advance\@itemdepth \@ne \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% - \list{\csname\@itemitem\endcsname}% + \expandafter + \list + \csname\@itemitem\endcsname {% \if@revlabel \def\makelabel##1{\hskip .5\unitindent{##1\hfil}}\else @@ -635,7 +624,8 @@ {\list{}{\labelwidth\z@ \itemindent-\leftmargin \let\makelabel\descriptionlabel}} {\endlist} -\newcommand*\descriptionlabel[1]{\hspace\labelsep \bfseries #1} +\newcommand*\descriptionlabel[1]{\hspace\labelsep + \normalfont\bfseries #1} \def\verbatim{% \topsep=-.5\parskip \@verbatim @@ -643,7 +633,9 @@ \newenvironment{abstract}{% \titlepage \null\vfil - \hbox{\SectFont \abstractname} + \@beginparpenalty\@lowpenalty + \hbox{\SectFont \abstractname}% + \@endparpenalty\@M \noindent\ignorespaces} {\par\vfil\null\endtitlepage} \newenvironment{verse} @@ -795,7 +787,7 @@ \if@filesw \expandafter\newwrite\csname tf@#1\endcsname \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax - \fi \global\@nobreakfalse \endgroup} + \fi \@nobreakfalse \endgroup} \newcommand*\@regtocline[3]{% \ifnum #1>\c@tocdepth \else @@ -807,19 +799,30 @@ \@tempdima\unitindent \parindent\z@ \leavevmode - \hbox{}\hskip -\leftskip\relax#2\nobreak + \hbox{}\hskip -\leftskip\relax + \ifnum#1<0\toc@case{#2}\else + \toc@font#1 #2\fi\nobreak \hskip 1em \nobreak{\slshape #3}\par }% \fi} \if@oldtoc \newcommand*\toc@font[1]{\relax} \else - \newcommand*\toc@font[1]{% + \newcommand*\toc@font[4]{% + #2{#3}#4\toc@fontsel#1} + \newcommand*\toc@fontsel[1]{% \ifcase#1\relax \bfseries \or\slshape \or\rmfamily \fi} +\AtBeginDocument{% + \ifx\hyper@linkstart\undefined + \else + \let\ORG@hyper@linkstart\hyper@linkstart + \protected\def\hyper@linkstart#1#2{% + \lowercase{\ORG@hyper@linkstart{#1}{#2}}} + \fi} \fi \if@oldtoc \newcommand*\toc@case{\relax} @@ -836,7 +839,8 @@ \parindent \z@ \rightskip \@pnumwidth \parfillskip -\@pnumwidth {\leavevmode - \large \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par + \large \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2% + \kern-\p@\kern\p@}}\par \nobreak \global\@nobreaktrue \everypar{\global\@nobreakfalse\everypar{}}% @@ -844,11 +848,11 @@ \fi} \else \newcommand*\l@part{% - \ifnum \c@tocdepth >-2\relax + \ifnum \c@tocdepth >-2\let\l@@part\relax \addpenalty{-\@highpenalty}% \addvspace{2.25em \@plus \p@}% - \@regtocline{0}% - \fi} + \def\l@@part{\@regtocline{-1}}% + \fi\l@@part} \fi \if@oldtoc \newcommand*\l@chapter[2]{% @@ -861,7 +865,8 @@ \leavevmode \bfseries \advance\leftskip\@tempdima \hskip -\leftskip - #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par + #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2% + \kern-\p@\kern\p@}\par \penalty\@highpenalty \endgroup} \else -- cgit v1.2.3