diff options
28 files changed, 88 insertions, 406 deletions
diff --git a/Master/texmf-dist/doc/latex/ntgclass/CATALOG b/Master/texmf-dist/doc/latex/ntgclass/CATALOG index 93091087a60..bde215d2144 100644 --- a/Master/texmf-dist/doc/latex/ntgclass/CATALOG +++ b/Master/texmf-dist/doc/latex/ntgclass/CATALOG @@ -1,7 +1,7 @@ Name: ntgclass -Problems-To: texniek@braams.texniek.nl +Problems-To: texniek@texniek.nl Author: J.L. Braams and V. Eijkhout -Version: 2.2-patch level 5 +Version: 2.2-patch level 6 Description: @@ -20,6 +20,6 @@ See-Also: Address: TeXniek -Kersengaarde 33 -2723 BP Zoetermeer +Vfroomshoopseweg 12a +7683 RL Den Ham The Netherlands diff --git a/Master/texmf-dist/doc/latex/ntgclass/ChangeLog b/Master/texmf-dist/doc/latex/ntgclass/ChangeLog deleted file mode 100644 index adf4f7b4d74..00000000000 --- a/Master/texmf-dist/doc/latex/ntgclass/ChangeLog +++ /dev/null @@ -1,353 +0,0 @@ -2020-11-17 Johannes Braams <texniek at braams.xs4all.nl> - - * ntgclass.dtx: Removed a superfluous closing brace that broke - the oldtoc option. - -2020-02-22 Johannes Braams <texniek at braams.xs4all.nl> - - * ntgclass.dtx: The mechanism to work around the hyperref code - being injected int the tabel of contents lines needed to be - changed. There's a fourth token to jump over and the use of - \MakeUppercase instead of \uppercase in the toc-lines for parts - (rapport and boek classes) needed a different approach, made the - hyperref copmmand robust and protected it with \lowercase. - -2020-02-18 Johannes Braams <texniek at braams.xs4all.nl> - - * brief.dtx: Update to change copyright notice and address - information; synchronised with the standard document classes. - - * a4.dtx: Update to change copyright notice and address - information. - -2020-02-18 Johannes Braams <texniek at braams.xs4all.nl> - - * ntgclass.dtx: Update to synchronize with classes.dtx - -2004-08-17 Johannes Braams <texniek at braams.xs4all.nl> - - * ntgclass.dtx: Various changes involving no longer passing - \toc@font and \toc@case settings through the .aux file because - they break when the hyperref package is used. - Fixed a bug in the toc-entry for \part: the spacing was wrong and - the pagenumber was put on a line by itself. - -2004-06-07 Johannes Braams <texniek at braams.xs4all.nl> - - * ntgclass.dtx : updated version to 2.1a as 2.0z should be the - last, but no major changes, added a missing fix related to pr3285 - -2004-02-20 Johannes Braams <texniek at braams.xs4all.nl> - - * ntgclass.dtx: various changes to sychronise with classes.dtx, - mostly fixes for Problem reports in the bugs database - -Tue Sep 9 00:43:15 1997 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx: Repaired a few documentation buglets. - - * brief.dtx : Added a few extra command synonimes, suggested by - Wybo Dekker (wybo at servaly.hobby.nl) - (subsubsection{The address window}): Put the \textbullet in a - group to keep the font change local - (subsubsection{The little rules}): Make the rules slightly thinner - and modify their position a little - (subsubsection{Page breaking control}): Added a \leavevmode in - \@afsluiting to make \afsluiting work as documented. - (subsection{Footnotes}): The footnotemarker should appear - different in the text from in the footnotes themselves, changed - definition of \@makefntext and use default \@makefnmark - -Tue Apr 1 00:15:34 1997 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (subsection{Footnotes}): Mixed the syntac for \def - and \newcommand (had #1 instead of [1]). - Found by Thorsten Schwander (schwander at ooo.lanl.gov) - -Sun Mar 2 00:17:17 1997 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (subsection{The title}): Use \textendash instead of - -- in label in footnotes on the titlepage. - (subsubsection{Itemize}): Now also \textasteriskcentered instead - of using math - (subsubsection{Equation and eqnarray}): Added test for chapter 0 - in the definition of \theequation inb rapport and boek classes - (following classes.dtx) - (subsubsection{Figure}): Added test for chapter 0 - (subsubsection{tabel}): Added test for chapter 0 - -Mon Sep 23 23:12:21 1996 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx (subsubsection{Itemize}): Replaced --, $\bullet$ - and $\cdot$ with \text... commands, following a change in the - LaTeX classes. - - * ntgclass.dtx (subsubsection{Itemize}): Replaced --, $\bullet$ - and $\cdot$ with \text... commands, following a change in the - LaTeX classes. - (chapter*{...}): Changed \@xsect and \@ssect to follow a change in - the june 1996 release fo LaTeX which allows commands with an - argument in the last argument of \@sartsection. - -Mon Apr 1 19:26:32 1996 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx : use \renewcommand rather than \newcommand to - define \newblock - (subsection{Font changing}): Removed suerfluous - closing braces - (subsection{Footnotes}): Repaired definition of \@xmakefntext (it - had #1 in a \newcommand - - * brief.dtx (subsubsection{The address window}): Repaired a typo - (\parksip instead of \parskip - -Sun Mar 31 23:25:10 1996 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx : Added \CodelineIndex to the driver in order - to really produce a .idx file for the index. - -Wed Mar 27 22:57:57 1996 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dst: Update to make use of the new docstrip - possibillity to produce multiple files in one go. - -Wed Nov 29 00:19:36 1995 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx (subsubsection{The reference line}): Also set - \parindent to zero in \@refveld - (subsubsection{The address window}): Set both \parksip and - \parindent to zero inside the \adresveld - -Thu Oct 5 22:29:06 1995 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (subsection{The title}): Disable some more of the - commands that are only needed for \maketitle; empty internal - storage macros. - (subsection{Open bibliography}): openbib option reimplemented - Brought in sinc again with classes.dtx - -Tue Aug 22 23:57:27 1995 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx : Added missing braces around negative arguments to - \addpenalty; make l@part only do something when \c@tocdepthd>-2. - -Thu Aug 10 01:04:30 1995 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx : Brought up-to-date with LaTeX's letter.dtx in order - to make the classes run with LaTeX <1995/06/01> - - * ntgclass.dtx : Brought up-to-date with LaTeX's classes.dtx in - order to make the classes run with LaTeX <1995/06/01> - -Sun May 7 23:45:33 1995 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (subsection{Chapters and Sections}): Added \erlax - to the definition of \@svsec as a result of LaTeX pr/1596 - -Fri Jan 6 14:09:51 1995 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (subsection{Chapters and Sections}): Changed - {\baselineskip\@plus... to - {1\baselineskip\@plus... in the defintion of \subsection and - \subsubsection in artikel2. - Found by Dick Snippe (D.M.Snippe at el.utwente.nl) - (subsubsection{Building blocks}): Use \protected@edef instead of - the juggling with redefining \protect. - -Sat Dec 31 16:31:12 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx (subsubsection{Page breaking control}): The printing - of the closing text generated an overfull hbox message. Removed - the extra \hbox (width \textwidth) inside the \parbox of width - .5\textwidth. - -Fri Dec 30 14:25:00 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx (subsection{Words}): Repaired a small typo (a bracket - was used instead of a brace) - - * ntgclass.dtx: Repaired a number of typos that prevented - artikel2.cls from functioning properly. - - * brief.dtx (section{Executing Options}): Added a \relax after - \ProcessOptions to prevent the \ifcase to be `eaten' in the search - for a *. - -Fri Dec 23 21:48:47 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx: Use \newcommand* instead of \newcommand in most - places. - (subsection{Customizing the labels}): Redefined \mlabel to use the - new \parbox syntax instead of using the \setbox primitive. - (subsection{Font changing}): Define \cal and \mit using - \DeclareRobustCommand - (subsection{The generic letter commands}): Use - \let\protect\@unexpandable@protect instead of redefining it. - - * ntgclass.dtx: More updates to go with the december 1994 release - of LaTeX. - - Made the oneside option work for the boek class (LaTeX PR - #1195) - (section{Initial Code}): Moved the allocation of - \if@mainmatter to this section in order to let it be known when - the pagestyles are defined. The switch is used there and needs to - be known then; otherwise TeX finds the wrong \fi in an - \if@twoside...\else...\fi construct. - -Tue Dec 20 01:52:12 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx: Updates to go with the december 1994 release of - LaTeX. - - Use \newcommand* cs. - - Set the \@minipage flag in the caption - (subsubsection{Margins}): Moved the rounding of \topmargin into - native mode only (LaTeX PR #93) - (section{Cross Referencing}): Fixed a typo in the documentation of - \@tocrmarg. (LaTeX PR #904) - (subsection{Single or double sided printing}): removed typo (LaTeX - PR #881) - (subsubsection{Chapters}): Made chapter titles more robust against - pagebreaks in the middle of them. Added an extra \nobreak but not - the extra \interlinepenalty\@M lines as that is taken care of by - \head@style (LaTeX PR #1016, #1135) - (subsection{Font changing}): Define \cal and \mit using - \DeclareRobustCommand - (the driver): use \newcommand* for shorthands with argument - (whole file): Use \newcommand* for commands with arguments - -Tue Oct 4 00:12:26 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx (section{The documentation driver file}): Added a - missing comma in the \DoNotIndex list - -Tue Jul 12 22:45:13 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx (subsubsection{Defining the page styles}): Removed the - typo in \@othertheadheight - -Mon Jul 11 23:25:48 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx (subsubsection{Itemize}): \labelitemiii was - mistakenly called \labelitemiiii (LaTeX bug report # 711) - - * ntgclass.dtx (subsection{Paragraphing}): The definition of the - dimension \othermargin was erroneously left out of type2 document - classes. - (subsection{Footnotes}): Moved the `.' that appeared in the - definition of \@xmakefntext to the definition of \@makefntext. - This should prevent it from appearing in a footnote produced by - \thanks. - -Wed Jun 15 22:19:45 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx (section{The documentation driver file}): Reorder the - DoNotIndex list. Removed remnant from letter.dtx, now get the - file info from bief.dtx and also typeset brief.dtx instead of - trying to typeset letter.dtx. - - -Wed Jun 8 13:16:41 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (section{The documentation driver file}): The - documentation didn't run; had to shuffle some entries in - \DoNotIndex lines. - - * artdoc.tex (subsection{Fonts in sectiekoppen}): Added a missing - brace - - * ntgclass.dtx (subsubsection{Chapters}): Removed yet another - carriage return that caused \if@mainmatter to end up in the - rapport classes. - -Mon Jun 6 00:03:19 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * brief.dtx (subsection{Global Declarations}): Using \newcommand - for internal storage macros causes the test against \@empty to - fail; a nempty long macro is not the same as an empytt macro. This - happened to \fromsig and \@subject. - -Fri Jun 3 14:25:27 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (subsubsection{Chapters}): Removed a carriage - return behind %<+boek> which caused \f@mainmatter to end up in the - rapport classes. - - * brief.dtx: Finished upgrading for LaTeX2e - - * briefdoc.tex: Updated for latex2e and the use of the babel - package. Contents may not be correct with the new version of the - code. - - * rapdoc.tex: Updated for latex2e and the use of the babel - package. Contents may not be correct with the new version of the - code. - - * artdoc.tex: Updated for latex2e and the use of the babel - package. Contents may not be correct with the new version of the - code. - -Fri Jun 3 00:27:27 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (section{Identification}): The size files claimed - to have a name that starts with `size'; changed to `ntg'. - - * ntgclass.dst: Added the stripping of brief. - -Thu Jun 2 00:30:21 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (subsection{The title}): Added check on number of - columns in use locally - (section{Identification}): Fixed bug that prevented LaTeX from - seeing the \ProvideFile command in the driver - -Wed Jun 1 14:15:21 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx: Added \Charactertable - Moved the identification and driver sections to the start of the - file; they no longer print. - Added 'v' to changes entries; wrapped some long lines. - (subsubsection{Captions}): Use \sbox\@tempboxa instead of - \setbox\@tempboxa\hbox to make @makecaption color safe. - (subsection{The title}): The boek classes always havve a - titlepage, forgot to remove the code for the \else part of - \if@titlepage. - (section*{\contentsname): Added a missing backslash - -Mon Apr 18 12:45:43 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (subsection{Fonts}): The size changing commands are - no longer defined in the kernel. Use \newcommand instead of - \renewcommand. - (subsection{Font changing}): \@renewfontswitch has gone; - \@newfontswitch has become \DeclareOldFontCommand - Synchronized with the changes to classes.dtx - -Sun Mar 20 00:53:17 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dst: Removed production of the documentation driver. - - * ntgclass.dtx (section{Identification}): Removed the use of - \typeout statements as \Provides... does that now. - (section{The {\sc docstrip} modules}): This section added. - (section{The documentation driver file}): Moved this section to - the front in order not to need a searate driver. - -Sat Mar 19 17:40:24 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * ntgclass.dtx (subsubsection{Captions}): The \CaptionLabelFont - shouldn't influence the font in which the caption text comes out. - PUt a group around the label. - - * ntgclass.dst: Removed \TopLevel, a remnant from classes.dst - - * ntgclass.dtx (subsubsection{Abstract}): Treat the abstract like - a section and use \SectFont for the title. - -Tue Mar 15 11:54:32 1994 Johannes Braams (texniek at braams.xs4all.nl) - - * a4.dtx (subsection{The code}): The name of a package and the - name of the file should be the same. - - (subsection{The code}): Added \ProcessOptions and moved it to the - end of the package. - diff --git a/Master/texmf-dist/doc/latex/ntgclass/README b/Master/texmf-dist/doc/latex/ntgclass/README index 59c915dc6b7..5d25d0c9133 100644 --- a/Master/texmf-dist/doc/latex/ntgclass/README +++ b/Master/texmf-dist/doc/latex/ntgclass/README @@ -1,6 +1,6 @@ NTG document classes distribution - 17 November 2020 + 10 January 2023 This file contains the distribution guide for the new version of the NTG document classes and the A4 package. @@ -25,4 +25,4 @@ Please do not request updates from us. Distribution is done only through mail servers and TeX organisations. ---- Copyright 1994-2020 NTG. All rights reserved --- +--- Copyright 1994-2023 NTG. All rights reserved --- diff --git a/Master/texmf-dist/doc/latex/ntgclass/a4.pdf b/Master/texmf-dist/doc/latex/ntgclass/a4.pdf Binary files differindex 91bdbe4bccb..6fee1a4e82c 100644 --- a/Master/texmf-dist/doc/latex/ntgclass/a4.pdf +++ b/Master/texmf-dist/doc/latex/ntgclass/a4.pdf diff --git a/Master/texmf-dist/doc/latex/ntgclass/artdoc.pdf b/Master/texmf-dist/doc/latex/ntgclass/artdoc.pdf Binary files differindex 8eb6e01ad35..b75e1be5542 100644 --- a/Master/texmf-dist/doc/latex/ntgclass/artdoc.pdf +++ b/Master/texmf-dist/doc/latex/ntgclass/artdoc.pdf diff --git a/Master/texmf-dist/doc/latex/ntgclass/brief-sample.pdf b/Master/texmf-dist/doc/latex/ntgclass/brief-sample.pdf Binary files differindex 480f0947b8f..e20cb4abca5 100644 --- a/Master/texmf-dist/doc/latex/ntgclass/brief-sample.pdf +++ b/Master/texmf-dist/doc/latex/ntgclass/brief-sample.pdf diff --git a/Master/texmf-dist/doc/latex/ntgclass/brief.pdf b/Master/texmf-dist/doc/latex/ntgclass/brief.pdf Binary files differindex 80590ff0f9c..0fe405eb5c5 100644 --- a/Master/texmf-dist/doc/latex/ntgclass/brief.pdf +++ b/Master/texmf-dist/doc/latex/ntgclass/brief.pdf diff --git a/Master/texmf-dist/doc/latex/ntgclass/briefdoc.pdf b/Master/texmf-dist/doc/latex/ntgclass/briefdoc.pdf Binary files differindex 3cf449999da..171f783b5e5 100644 --- a/Master/texmf-dist/doc/latex/ntgclass/briefdoc.pdf +++ b/Master/texmf-dist/doc/latex/ntgclass/briefdoc.pdf diff --git a/Master/texmf-dist/doc/latex/ntgclass/classdoc.pdf b/Master/texmf-dist/doc/latex/ntgclass/classdoc.pdf Binary files differindex d799c88e66d..859038f7f7a 100644 --- a/Master/texmf-dist/doc/latex/ntgclass/classdoc.pdf +++ b/Master/texmf-dist/doc/latex/ntgclass/classdoc.pdf diff --git a/Master/texmf-dist/doc/latex/ntgclass/ntgclass.pdf b/Master/texmf-dist/doc/latex/ntgclass/ntgclass.pdf Binary files differindex d273db1dda4..130cb7f3304 100644 --- a/Master/texmf-dist/doc/latex/ntgclass/ntgclass.pdf +++ b/Master/texmf-dist/doc/latex/ntgclass/ntgclass.pdf diff --git a/Master/texmf-dist/doc/latex/ntgclass/rapdoc.pdf b/Master/texmf-dist/doc/latex/ntgclass/rapdoc.pdf Binary files differindex cda701838ab..2d1db4a6da9 100644 --- a/Master/texmf-dist/doc/latex/ntgclass/rapdoc.pdf +++ b/Master/texmf-dist/doc/latex/ntgclass/rapdoc.pdf diff --git a/Master/texmf-dist/source/latex/ntgclass/a4.dtx b/Master/texmf-dist/source/latex/ntgclass/a4.dtx index e480bfbde99..d2a87d26b66 100644 --- a/Master/texmf-dist/source/latex/ntgclass/a4.dtx +++ b/Master/texmf-dist/source/latex/ntgclass/a4.dtx @@ -1,6 +1,6 @@ % \iffalse % -% Copyright (C) 1994 -- 2020 by Nederlandstalige TeX Gebruikersgroep. +% Copyright (C) 1994 -- 2023 by Nederlandstalige TeX Gebruikersgroep. % % This file is part of the NTG document classes distribution % ---------------------------------------------------------- @@ -41,7 +41,7 @@ \ProvidesFile{a4.dtx} %</dtx> %<package>\ProvidesPackage{a4} - [2020/02/18 v1.2g A4 based page layout] + [2023/01/10 v1.2g A4 based page layout] % % Copying of this file is authorized only if either % (1) you make absolutely no changes to your copy, including name, or @@ -52,7 +52,7 @@ % % Error reports for UNCHANGED versions please to: % J.L. Braams -% texniek at braams.xs4all.nl +% texniek at texniek.nl % or: N.A.F.M. Poppelier % N.Poppelier@elsevier.nl % @@ -90,7 +90,7 @@ % Johannes Braams\\ % \TeX niek\\ % Zoetermeer\\ -% \texttt{JLBraams@texniek@braams.xs4all.nl}} +% \texttt{texniek@texniek.nl}} % % \date{Printed \today} % diff --git a/Master/texmf-dist/source/latex/ntgclass/a4.ins b/Master/texmf-dist/source/latex/ntgclass/a4.ins index 09300056a7a..32e717b676a 100644 --- a/Master/texmf-dist/source/latex/ntgclass/a4.ins +++ b/Master/texmf-dist/source/latex/ntgclass/a4.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1993-2020 +%% Copyright (C) 1993-2023 %% The Nederlandstalige TeX Gebruikersgroep and any individual %% authors listed elsewhere in this file. %% @@ -42,7 +42,7 @@ \preamble This is a generated file. -Copyright (C) 1990-2020 Nederlandstalige TeX Gebruikersgroep. +Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. All rights reserved. This file was generated from file(s) of the NTG document classes distribution. diff --git a/Master/texmf-dist/source/latex/ntgclass/brief.dtx b/Master/texmf-dist/source/latex/ntgclass/brief.dtx index fcc32e4e844..fa7f6e92239 100644 --- a/Master/texmf-dist/source/latex/ntgclass/brief.dtx +++ b/Master/texmf-dist/source/latex/ntgclass/brief.dtx @@ -1,6 +1,6 @@ % \iffalse % -% Copyright (C) 1994 -- 2020 by Nederlandstalige TeX Gebruikersgroep. +% Copyright (C) 1994 -- 2023 by Nederlandstalige TeX Gebruikersgroep. % Based on letter.dtx version 1.3a % % Copyright (C) 1994 LaTeX3 project, Frank Mittelbach @@ -47,7 +47,7 @@ %<*driver> \ProvidesFile{brief.drv} %</driver> - [2020/02/18 v2.0s + [2023/01/10 v2.0s %<+brief> NTG LaTeX document class] % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/ntgclass/ntgclass.dtx b/Master/texmf-dist/source/latex/ntgclass/ntgclass.dtx index 233a01d19fd..e4abdf8cd93 100644 --- a/Master/texmf-dist/source/latex/ntgclass/ntgclass.dtx +++ b/Master/texmf-dist/source/latex/ntgclass/ntgclass.dtx @@ -1,6 +1,6 @@ % \iffalse % -% Copyright (C) 1994 -- 2020 by Nederlandstalige TeX Gebruikersgroep. +% Copyright (C) 1994 -- 2023 by Nederlandstalige TeX Gebruikersgroep. % Based on classes.dtx % Copyright (C) 1999 LaTeX3 project, all rights reserved. % @@ -27,7 +27,7 @@ % extension .ins) which are part of the distribution. % % \fi -% \CheckSum{3782} +% \CheckSum{3793} %\iffalse % \section{Identification} % @@ -59,7 +59,7 @@ %<*driver> \ProvidesFile{ntgclass.drv} %</driver> - [2020-11-17 v2.1e + [2023-01-10 v2.1f %<artikel|rapport|boek> NTG LaTeX document class] %<10pt|11pt|12pt> NTG LaTeX file (size option)] % \end{macrocode} @@ -182,7 +182,7 @@ % % \author{% % Copyright (C) 1992 by Leslie Lamport \and -% Copyright (C) 1994-2020 by Victor Eijkhout \and Johannes Braams +% Copyright (C) 1994-2023 by Victor Eijkhout \and Johannes Braams % } % \date{\filedate} % @@ -4558,11 +4558,18 @@ % around the second argument. % \changes{v2.1b}{2004/08/16}{Introduce a separarte macro % \cs{toc@fontsel}} -% \changes{v2.1c}{2020/02/22}{We need to jump another tolken, so we +% \changes{v2.1c}{2020/02/22}{We need to jump another token, so we % need 4 arguments to accomplish that} +% \changes{v2.1f}{2023-01-10}{The fix in 2.1c was buggy without +% hyperref; aply proposal by Piet van Oostrum to explicitly test +% for hyperref} % \begin{macrocode} \newcommand*\toc@font[4]{% - #2{#3}#4\toc@fontsel#1} + \ifx\Hy@toclinkstart#2% + \def\@next{#2\toc@font#1#3#4}% + \else + \def\@next{#2{#3}\toc@fontsel#1#4}% + \expandafter\fi\@next} \newcommand*\toc@fontsel[1]{% %<*artikel> \ifcase#1\relax diff --git a/Master/texmf-dist/source/latex/ntgclass/ntgclass.ins b/Master/texmf-dist/source/latex/ntgclass/ntgclass.ins index d14cbbaf649..3f39291b853 100644 --- a/Master/texmf-dist/source/latex/ntgclass/ntgclass.ins +++ b/Master/texmf-dist/source/latex/ntgclass/ntgclass.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1993-2020 +%% Copyright (C) 1993-2023 %% The Nederlandstalige TeX Gebruikersgroep and any individual %% authors listed elsewhere in this file. %% @@ -45,7 +45,7 @@ This is a generated file. 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. +Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. All rights reserved. This file was generated from file(s) of the NTG document classes distribution. diff --git a/Master/texmf-dist/tex/latex/ntgclass/a4.sty b/Master/texmf-dist/tex/latex/ntgclass/a4.sty index 692bb056486..c09f9120e5d 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/a4.sty +++ b/Master/texmf-dist/tex/latex/ntgclass/a4.sty @@ -7,7 +7,7 @@ %% a4.dtx (with options: `package') %% This is a generated file. %% -%% Copyright (C) 1990-2020 Nederlandstalige TeX Gebruikersgroep. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -40,7 +40,7 @@ \wlog{LaTeX Package `#1' #3 <#2> #4}} \fi \ProvidesPackage{a4} - [2020/02/18 v1.2g A4 based page layout] + [2023/01/10 v1.2g A4 based page layout] \ifx\documentclass\undefined \else \DeclareOption{widemargins}{\WideMargins} diff --git a/Master/texmf-dist/tex/latex/ntgclass/artikel1.cls b/Master/texmf-dist/tex/latex/ntgclass/artikel1.cls index 031924a0fa0..7c1a78cb428 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/artikel1.cls +++ b/Master/texmf-dist/tex/latex/ntgclass/artikel1.cls @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -40,7 +40,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{artikel1}% - [2020-11-17 v2.1e + [2023-01-10 v2.1f NTG LaTeX document class] \newcommand*\@ptsize{} @@ -783,7 +783,11 @@ \newcommand*\toc@font[1]{\relax} \else \newcommand*\toc@font[4]{% - #2{#3}#4\toc@fontsel#1} + \ifx\Hy@toclinkstart#2% + \def\@next{#2\toc@font#1#3#4}% + \else + \def\@next{#2{#3}\toc@fontsel#1#4}% + \expandafter\fi\@next} \newcommand*\toc@fontsel[1]{% \ifcase#1\relax \or\bfseries diff --git a/Master/texmf-dist/tex/latex/ntgclass/artikel2.cls b/Master/texmf-dist/tex/latex/ntgclass/artikel2.cls index ed1e5fb96b1..ee5efc8dae4 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/artikel2.cls +++ b/Master/texmf-dist/tex/latex/ntgclass/artikel2.cls @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -40,7 +40,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{artikel2}% - [2020-11-17 v2.1e + [2023-01-10 v2.1f NTG LaTeX document class] \newcommand*\@ptsize{} @@ -730,7 +730,11 @@ \newcommand*\toc@font[1]{\relax} \else \newcommand*\toc@font[4]{% - #2{#3}#4\toc@fontsel#1} + \ifx\Hy@toclinkstart#2% + \def\@next{#2\toc@font#1#3#4}% + \else + \def\@next{#2{#3}\toc@fontsel#1#4}% + \expandafter\fi\@next} \newcommand*\toc@fontsel[1]{% \ifcase#1\relax \Large\bfseries diff --git a/Master/texmf-dist/tex/latex/ntgclass/artikel3.cls b/Master/texmf-dist/tex/latex/ntgclass/artikel3.cls index a46bac98698..2af22b92fbe 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/artikel3.cls +++ b/Master/texmf-dist/tex/latex/ntgclass/artikel3.cls @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -40,7 +40,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{artikel3}% - [2020-11-17 v2.1e + [2023-01-10 v2.1f NTG LaTeX document class] \newcommand*\@ptsize{} @@ -780,7 +780,11 @@ \newcommand*\toc@font[1]{\relax} \else \newcommand*\toc@font[4]{% - #2{#3}#4\toc@fontsel#1} + \ifx\Hy@toclinkstart#2% + \def\@next{#2\toc@font#1#3#4}% + \else + \def\@next{#2{#3}\toc@fontsel#1#4}% + \expandafter\fi\@next} \newcommand*\toc@fontsel[1]{% \ifcase#1\relax \or\bfseries diff --git a/Master/texmf-dist/tex/latex/ntgclass/boek.cls b/Master/texmf-dist/tex/latex/ntgclass/boek.cls index 8de0230f4a1..57ab5d2ba29 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/boek.cls +++ b/Master/texmf-dist/tex/latex/ntgclass/boek.cls @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -40,7 +40,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{boek}% - [2020-11-17 v2.1e + [2023-01-10 v2.1f NTG LaTeX document class] \newcommand*\@ptsize{} @@ -822,7 +822,11 @@ \newcommand*\toc@font[1]{\relax} \else \newcommand*\toc@font[4]{% - #2{#3}#4\toc@fontsel#1} + \ifx\Hy@toclinkstart#2% + \def\@next{#2\toc@font#1#3#4}% + \else + \def\@next{#2{#3}\toc@fontsel#1#4}% + \expandafter\fi\@next} \newcommand*\toc@fontsel[1]{% \ifcase#1\relax \bfseries diff --git a/Master/texmf-dist/tex/latex/ntgclass/boek3.cls b/Master/texmf-dist/tex/latex/ntgclass/boek3.cls index ce64b89bf04..3c664ae4538 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/boek3.cls +++ b/Master/texmf-dist/tex/latex/ntgclass/boek3.cls @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -40,7 +40,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{boek3}% - [2020-11-17 v2.1e + [2023-01-10 v2.1f NTG LaTeX document class] \newcommand*\@ptsize{} @@ -809,7 +809,11 @@ \newcommand*\toc@font[1]{\relax} \else \newcommand*\toc@font[4]{% - #2{#3}#4\toc@fontsel#1} + \ifx\Hy@toclinkstart#2% + \def\@next{#2\toc@font#1#3#4}% + \else + \def\@next{#2{#3}\toc@fontsel#1#4}% + \expandafter\fi\@next} \newcommand*\toc@fontsel[1]{% \ifcase#1\relax \bfseries diff --git a/Master/texmf-dist/tex/latex/ntgclass/brief.cls b/Master/texmf-dist/tex/latex/ntgclass/brief.cls index 997b39decde..7af5efccb19 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/brief.cls +++ b/Master/texmf-dist/tex/latex/ntgclass/brief.cls @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -40,7 +40,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{brief} - [2020/02/18 v2.0s + [2023/01/10 v2.0s NTG LaTeX document class] \newcommand*\@ptsize{} \newif\if@typhulp diff --git a/Master/texmf-dist/tex/latex/ntgclass/ntg10.clo b/Master/texmf-dist/tex/latex/ntgclass/ntg10.clo index bc485d79693..a5e9a0f3bac 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/ntg10.clo +++ b/Master/texmf-dist/tex/latex/ntgclass/ntg10.clo @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -39,7 +39,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ntg10.clo} - [2020-11-17 v2.1e + [2023-01-10 v2.1f NTG LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt diff --git a/Master/texmf-dist/tex/latex/ntgclass/ntg11.clo b/Master/texmf-dist/tex/latex/ntgclass/ntg11.clo index 4ee17127015..3a27fd65820 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/ntg11.clo +++ b/Master/texmf-dist/tex/latex/ntgclass/ntg11.clo @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -39,7 +39,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ntg11.clo} - [2020-11-17 v2.1e + [2023-01-10 v2.1f NTG LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% diff --git a/Master/texmf-dist/tex/latex/ntgclass/ntg12.clo b/Master/texmf-dist/tex/latex/ntgclass/ntg12.clo index bcd2b2d65ae..b82273c0cd2 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/ntg12.clo +++ b/Master/texmf-dist/tex/latex/ntgclass/ntg12.clo @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -39,7 +39,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{ntg12.clo} - [2020-11-17 v2.1e + [2023-01-10 v2.1f NTG LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% diff --git a/Master/texmf-dist/tex/latex/ntgclass/rapport1.cls b/Master/texmf-dist/tex/latex/ntgclass/rapport1.cls index 8e34becde78..383f8d9a93d 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/rapport1.cls +++ b/Master/texmf-dist/tex/latex/ntgclass/rapport1.cls @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -40,7 +40,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{rapport1}% - [2020-11-17 v2.1e + [2023-01-10 v2.1f NTG LaTeX document class] \newcommand*\@ptsize{} @@ -870,7 +870,11 @@ \newcommand*\toc@font[1]{\relax} \else \newcommand*\toc@font[4]{% - #2{#3}#4\toc@fontsel#1} + \ifx\Hy@toclinkstart#2% + \def\@next{#2\toc@font#1#3#4}% + \else + \def\@next{#2{#3}\toc@fontsel#1#4}% + \expandafter\fi\@next} \newcommand*\toc@fontsel[1]{% \ifcase#1\relax \bfseries diff --git a/Master/texmf-dist/tex/latex/ntgclass/rapport3.cls b/Master/texmf-dist/tex/latex/ntgclass/rapport3.cls index a855396e367..eec2ad9cba3 100644 --- a/Master/texmf-dist/tex/latex/ntgclass/rapport3.cls +++ b/Master/texmf-dist/tex/latex/ntgclass/rapport3.cls @@ -10,7 +10,7 @@ %% 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. +%% Copyright (C) 1990-2023 Nederlandstalige TeX Gebruikersgroep. %% All rights reserved. %% %% This file was generated from file(s) of the NTG document classes distribution. @@ -40,7 +40,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{rapport3}% - [2020-11-17 v2.1e + [2023-01-10 v2.1f NTG LaTeX document class] \newcommand*\@ptsize{} @@ -867,7 +867,11 @@ \newcommand*\toc@font[1]{\relax} \else \newcommand*\toc@font[4]{% - #2{#3}#4\toc@fontsel#1} + \ifx\Hy@toclinkstart#2% + \def\@next{#2\toc@font#1#3#4}% + \else + \def\@next{#2{#3}\toc@fontsel#1#4}% + \expandafter\fi\@next} \newcommand*\toc@fontsel[1]{% \ifcase#1\relax \bfseries |