ntgclass (22feb20)

git-svn-id: svn://tug.org/texlive/trunk@53870 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 518 insertions, 556 deletions

diff --git a/Master/texmf-dist/tex/latex/ntgclass/a4.sty b/Master/texmf-dist/tex/latex/ntgclass/a4.sty
index 76580e18985..692bb056486 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/a4.sty
+++ b/Master/texmf-dist/tex/latex/ntgclass/a4.sty
@@ -7,19 +7,19 @@
 %% a4.dtx  (with options: `package')
 %% This is a generated file.
 %% 
-%% Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
+%% 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,16 +35,12 @@
 %% 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.
-%% Style option `A4' to be used with LaTeX V2.09
-%% Copyright (C) 1990-2004 Johannes Braams, Nico Poppelier.
-%%               All rights reserved.
-%%
 \ifx\ProvidesPackage\undefined
   \def\ProvidesPackage#1[#2 #3 #4]{%
     \wlog{LaTeX Package `#1' #3 <#2> #4}}
 \fi
 \ProvidesPackage{a4}
-       [2004/04/15 v1.2g A4 based page layout]
+       [2020/02/18 v1.2g A4 based page layout]
 \ifx\documentclass\undefined
 \else
   \DeclareOption{widemargins}{\WideMargins}
@@ -132,22 +128,6 @@
 \else
   \ProcessOptions
 \fi
-%% \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         \~}
-%%
 \endinput
 %%
 %% End of file `a4.sty'.
diff --git a/Master/texmf-dist/tex/latex/ntgclass/artikel1.cls b/Master/texmf-dist/tex/latex/ntgclass/artikel1.cls
index ef966c861a3..72b9861e12d 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/artikel1.cls
+++ b/Master/texmf-dist/tex/latex/ntgclass/artikel1.cls
@@ -7,19 +7,22 @@
 %% ntgclass.dtx  (with options: `artikel,type1')
 %% 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{artikel1}%
-              [2004/06/07 v2.1a
+              [2020/02/22 v2.1c
        NTG LaTeX document class]
 \newcommand*\@ptsize{}
 
@@ -369,7 +353,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}%
@@ -378,7 +362,7 @@
            \else
              \protect\numberline{\csname the#1\endcsname}%
            \fi
-           \toc@font#2 #7}}%
+           #7}}%
      \fi
      \@xsect{#5}}
 \def\@seccntformat#1{%
@@ -417,7 +401,7 @@
 \def\@part[#1]#2{%
     \ifnum \c@secnumdepth >\m@ne
       \refstepcounter{part}%
-      \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+      \addcontentsline{toc}{part}{\protect\numberline{\thepart}#1}%
     \else
       \addcontentsline{toc}{part}{#1}%
     \fi
@@ -552,12 +536,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}%
            \ifnum \@listdepth=1
              \if@revlabel
@@ -571,17 +557,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
          {%
            \ifnum \@listdepth=1\relax
             \if@revlabel
@@ -598,7 +587,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\center
    {\topsep=.25\baselineskip \@plus .1\baselineskip
                              \@minus .1\baselineskip
@@ -625,7 +615,9 @@
   \newenvironment{abstract}{%
       \titlepage
       \null\vfil
-      \hbox{\SectFont \abstractname}
+      \@beginparpenalty\@lowpenalty
+      \hbox{\SectFont \abstractname}%
+      \@endparpenalty\@M
       \noindent\ignorespaces}
      {\par\vfil\null\endtitlepage}
 \else
@@ -781,19 +773,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
     \or\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}
@@ -810,7 +813,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
        \if@compatibility
         \global\@nobreaktrue
@@ -820,11 +824,11 @@
   \fi}
 \else
    \newcommand*\l@part{%
-     \ifnum \c@tocdepth >-2\relax
+     \ifnum \c@tocdepth >-2\let\l@@part\relax
      \addpenalty\@secpenalty
      \addvspace{2.25em \@plus \p@}%
-     \@regtocline{0}%
-   \fi}
+     \def\l@@part{\@regtocline{-1}}%
+   \fi\l@@part}
 \fi
 \if@oldtoc
 \newcommand*\l@section[2]{%
@@ -837,7 +841,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
    \endgroup}
 \else
    \newcommand*\l@section{\@regtocline{1}}
diff --git a/Master/texmf-dist/tex/latex/ntgclass/artikel2.cls b/Master/texmf-dist/tex/latex/ntgclass/artikel2.cls
index 28eafa559c5..4a1f31ca12c 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/artikel2.cls
+++ b/Master/texmf-dist/tex/latex/ntgclass/artikel2.cls
@@ -7,19 +7,22 @@
 %% ntgclass.dtx  (with options: `artikel,type2')
 %% 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{artikel2}%
-              [2004/06/07 v2.1a
+              [2020/02/22 v2.1c
        NTG LaTeX document class]
 \newcommand*\@ptsize{}
 
@@ -342,7 +326,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}%
@@ -351,7 +335,7 @@
            \else
              \protect\numberline{\csname the#1\endcsname}%
            \fi
-           \toc@font#2 #7}}%
+           #7}}%
      \fi
      \@xsect{#5}}
 \def\@seccntformat#1{%
@@ -390,7 +374,7 @@
 \def\@part[#1]#2{%
     \ifnum \c@secnumdepth >\m@ne
       \refstepcounter{part}%
-      \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+      \addcontentsline{toc}{part}{\protect\numberline{\thepart}#1}%
     \else
       \addcontentsline{toc}{part}{#1}%
     \fi
@@ -525,28 +509,33 @@
 \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}%
              \def\makelabel##1{##1\hfil}%
          }%
   \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
          {%
             \def\makelabel##1{##1\hfil}
           }%
@@ -556,7 +545,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=.25\baselineskip \@plus .1\baselineskip
                            \@minus .1\baselineskip
@@ -567,7 +557,9 @@
   \newenvironment{abstract}{%
       \titlepage
       \null\vfil
-      \hbox{\SectFont \abstractname}
+      \@beginparpenalty\@lowpenalty
+      \hbox{\SectFont \abstractname}%
+      \@endparpenalty\@M
       \noindent\ignorespaces}
      {\par\vfil\null\endtitlepage}
 \else
@@ -727,7 +719,9 @@
      \advance\@tempdima by \othermargin
      \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}
@@ -735,13 +729,22 @@
 \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
     \Large\bfseries
     \or\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}
@@ -758,7 +761,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
        \if@compatibility
         \global\@nobreaktrue
@@ -768,11 +772,11 @@
   \fi}
 \else
    \newcommand*\l@part{%
-     \ifnum \c@tocdepth >-2\relax
+     \ifnum \c@tocdepth >-2\let\l@@part\relax
      \addpenalty\@secpenalty
      \addvspace{2.25em \@plus \p@}%
-     \@regtocline{0}%
-   \fi}
+     \def\l@@part{\@regtocline{-1}}%
+   \fi\l@@part}
 \fi
 \if@oldtoc
 \newcommand*\l@section[2]{%
@@ -785,7 +789,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
    \endgroup}
 \else
    \newcommand*\l@section{\@regtocline{1}}
diff --git a/Master/texmf-dist/tex/latex/ntgclass/artikel3.cls b/Master/texmf-dist/tex/latex/ntgclass/artikel3.cls
index d10d173336a..1b47d36213a 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/artikel3.cls
+++ b/Master/texmf-dist/tex/latex/ntgclass/artikel3.cls
@@ -7,19 +7,22 @@
 %% ntgclass.dtx  (with options: `artikel,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{artikel3}%
-              [2004/06/07 v2.1a
+              [2020/02/22 v2.1c
        NTG LaTeX document class]
 \newcommand*\@ptsize{}
 
@@ -382,7 +366,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}%
@@ -391,7 +375,7 @@
            \else
              \protect\numberline{\csname the#1\endcsname}%
            \fi
-           \toc@font#2 #7}}%
+           #7}}%
      \fi
      \@xsect{#5}}
 \def\@seccntformat#1{%
@@ -430,7 +414,7 @@
 \def\@part[#1]#2{%
     \ifnum \c@secnumdepth >\m@ne
       \refstepcounter{part}%
-      \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+      \addcontentsline{toc}{part}{\protect\numberline{\thepart}#1}%
     \else
       \addcontentsline{toc}{part}{#1}%
     \fi
@@ -565,12 +549,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}}%
@@ -580,17 +566,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
@@ -603,7 +592,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
@@ -612,7 +602,9 @@
   \newenvironment{abstract}{%
       \titlepage
       \null\vfil
-      \hbox{\SectFont \abstractname}
+      \@beginparpenalty\@lowpenalty
+      \hbox{\SectFont \abstractname}%
+      \@endparpenalty\@M
       \noindent\ignorespaces}
      {\par\vfil\null\endtitlepage}
 \else
@@ -766,7 +758,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
@@ -778,19 +770,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
     \or\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}
@@ -807,7 +810,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
        \if@compatibility
         \global\@nobreaktrue
@@ -817,11 +821,11 @@
   \fi}
 \else
    \newcommand*\l@part{%
-     \ifnum \c@tocdepth >-2\relax
+     \ifnum \c@tocdepth >-2\let\l@@part\relax
      \addpenalty\@secpenalty
      \addvspace{2.25em \@plus \p@}%
-     \@regtocline{0}%
-   \fi}
+     \def\l@@part{\@regtocline{-1}}%
+   \fi\l@@part}
 \fi
 \if@oldtoc
 \newcommand*\l@section[2]{%
@@ -834,7 +838,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
    \endgroup}
 \else
    \newcommand*\l@section{\@regtocline{1}}
diff --git a/Master/texmf-dist/tex/latex/ntgclass/boek.cls b/Master/texmf-dist/tex/latex/ntgclass/boek.cls
index 55d31ba0dd8..e6a1d31638a 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/boek.cls
+++ b/Master/texmf-dist/tex/latex/ntgclass/boek.cls
@@ -7,19 +7,22 @@
 %% ntgclass.dtx  (with options: `boek,type1')
 %% 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{boek}%
-              [2004/06/07 v2.1a
+              [2020/02/22 v2.1c
        NTG LaTeX document class]
 \newcommand*\@ptsize{}
 
@@ -322,7 +306,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}%
@@ -331,7 +315,7 @@
            \else
              \protect\numberline{\csname the#1\endcsname}%
            \fi
-           \toc@font#2 #7}}%
+           #7}}%
      \fi
      \@xsect{#5}}
 \def\@seccntformat#1{%
@@ -390,7 +374,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
@@ -400,12 +384,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
@@ -433,12 +417,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@}}%
@@ -594,12 +578,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}%
            \ifnum \@listdepth=1
              \if@revlabel
@@ -613,17 +599,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
          {%
            \ifnum \@listdepth=1\relax
             \if@revlabel
@@ -640,7 +629,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\center
    {\topsep=.25\baselineskip \@plus .1\baselineskip
                              \@minus .1\baselineskip
@@ -666,7 +656,9 @@
   \newenvironment{abstract}{%
       \titlepage
       \null\vfil
-      \hbox{\SectFont \abstractname}
+      \@beginparpenalty\@lowpenalty
+      \hbox{\SectFont \abstractname}%
+      \@endparpenalty\@M
       \noindent\ignorespaces}
      {\par\vfil\null\endtitlepage}
 \newenvironment{verse}
@@ -820,19 +812,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}
@@ -849,7 +852,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{}}%
@@ -857,11 +861,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]{%
@@ -874,7 +878,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
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
diff --git a/Master/texmf-dist/tex/latex/ntgclass/brief.cls b/Master/texmf-dist/tex/latex/ntgclass/brief.cls
index aac42637d92..997b39decde 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/brief.cls
+++ b/Master/texmf-dist/tex/latex/ntgclass/brief.cls
@@ -7,19 +7,22 @@
 %% brief.dtx  (with options: `brief')
 %% 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,34 +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.
-%% \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         \~}
-%% Copyright (C) 1994 -- 1999 by Victor Eijkhout \and Johannes Braams
-%% Based on letter.dtx version 1.2i
-%% Copyright (C) 1994 LaTeX3 project, Frank Mittelbach
-%% and Rainer Sch\"opf, all rights reserved.
-%%
-%% 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.
-%%
-\NeedsTeXFormat{LaTeX2e}[1995/06/01]
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{brief}
-              [1999/03/03 v2.0r
+              [2020/02/18 v2.0s
                NTG LaTeX document class]
 \newcommand*\@ptsize{}
 \newif\if@typhulp
@@ -158,22 +136,25 @@
 \fi
 \let\@normalsize\normalsize
 \normalsize
+\ifx\MakeRobust\@undefined \else
+    \MakeRobust\normalsize
+\fi
 \ifcase\@ptsize
-  \newcommand*\small{%
+  \DeclareRobustCommand\small{%
     \@setfontsize\small\@ixpt{11}%
     \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
     \abovedisplayshortskip \z@ \@plus2\p@
     \belowdisplayshortskip 4\p@ \@plus2\p@ \@minus2\p@
     \belowdisplayskip \abovedisplayskip}
 \or
-  \newcommand*\small{%
+  \DeclareRobustCommand\small{%
     \@setfontsize\small\@xpt\@xiipt
     \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
     \abovedisplayshortskip \z@ \@plus3\p@
     \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@
     \belowdisplayskip \abovedisplayskip}
 \or
-  \newcommand*\small{%
+  \DeclareRobustCommand\small{%
     \@setfontsize\small\@xipt{13.6}%
     \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
     \abovedisplayshortskip \z@ \@plus3\p@
@@ -181,21 +162,21 @@
     \belowdisplayskip \abovedisplayskip}
 \fi
 \ifcase\@ptsize
-  \newcommand*\footnotesize{%
+  \DeclareRobustCommand\footnotesize{%
     \@setfontsize\footnotesize\@viiipt{9.5}%
     \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
     \abovedisplayshortskip \z@ \@plus\p@
     \belowdisplayshortskip 3\p@ \@plus\p@ \@minus2\p@
     \belowdisplayskip \abovedisplayskip}
 \or
-  \newcommand*\footnotesize{%
+  \DeclareRobustCommand\footnotesize{%
     \@setfontsize\footnotesize\@ixpt{11}%
     \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
     \abovedisplayshortskip \z@ \@plus\p@
     \belowdisplayshortskip 4\p@ \@plus2\p@ \@minus2\p@
     \belowdisplayskip \abovedisplayskip}
 \or
-  \newcommand*\footnotesize{%
+  \DeclareRobustCommand\footnotesize{%
     \@setfontsize\footnotesize\@xpt\@xiipt
     \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
     \abovedisplayshortskip \z@ \@plus3\p@
@@ -203,28 +184,28 @@
     \belowdisplayskip \abovedisplayskip}
 \fi
 \ifcase\@ptsize
-  \newcommand*\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
-  \newcommand*\tiny{\@setfontsize\tiny\@vpt\@vipt}
-  \newcommand*\large{\@setfontsize\large\@xiipt{14}}
-  \newcommand*\Large{\@setfontsize\Large\@xivpt{18}}
-  \newcommand*\LARGE{\@setfontsize\LARGE\@xviipt{22}}
-  \newcommand*\huge{\@setfontsize\huge\@xxpt{25}}
-  \newcommand*\Huge{\@setfontsize\Huge\@xxvpt{30}}
+  \DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
+  \DeclareRobustCommand\tiny{\@setfontsize\tiny\@vpt\@vipt}
+  \DeclareRobustCommand\large{\@setfontsize\large\@xiipt{14}}
+  \DeclareRobustCommand\Large{\@setfontsize\Large\@xivpt{18}}
+  \DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xviipt{22}}
+  \DeclareRobustCommand\huge{\@setfontsize\huge\@xxpt{25}}
+  \DeclareRobustCommand\Huge{\@setfontsize\Huge\@xxvpt{30}}
 \or
-  \newcommand*\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
-  \newcommand*\tiny{\@setfontsize\tiny\@vipt\@viipt}
-  \newcommand*\large{\@setfontsize\large\@xiipt{14}}
-  \newcommand*\Large{\@setfontsize\Large\@xivpt{18}}
-  \newcommand*\LARGE{\@setfontsize\LARGE\@xviipt{22}}
-  \newcommand*\huge{\@setfontsize\huge\@xxpt{25}}
-  \newcommand*\Huge{\@setfontsize\Huge\@xxvpt{30}}
+  \DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
+  \DeclareRobustCommand\tiny{\@setfontsize\tiny\@vipt\@viipt}
+  \DeclareRobustCommand\large{\@setfontsize\large\@xiipt{14}}
+  \DeclareRobustCommand\Large{\@setfontsize\Large\@xivpt{18}}
+  \DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xviipt{22}}
+  \DeclareRobustCommand\huge{\@setfontsize\huge\@xxpt{25}}
+  \DeclareRobustCommand\Huge{\@setfontsize\Huge\@xxvpt{30}}
 \or
-  \newcommand*\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
-  \newcommand*\tiny{\@setfontsize\tiny\@vipt\@viipt}
-  \newcommand*\large{\@setfontsize\large\@xivpt{18}}
-  \newcommand*\Large{\@setfontsize\Large\@xviipt{22}}
-  \newcommand*\LARGE{\@setfontsize\LARGE\@xxpt{25}}
-  \newcommand*\huge{\@setfontsize\huge\@xxvpt{30}}
+  \DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
+  \DeclareRobustCommand\tiny{\@setfontsize\tiny\@vipt\@viipt}
+  \DeclareRobustCommand\large{\@setfontsize\large\@xivpt{18}}
+  \DeclareRobustCommand\Large{\@setfontsize\Large\@xviipt{22}}
+  \DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xxpt{25}}
+  \DeclareRobustCommand\huge{\@setfontsize\huge\@xxvpt{30}}
   \let\Huge=\huge
 \fi
 \newfont\refkopfont{cmssq8}
@@ -318,17 +299,17 @@
       \let\@oddhead\@empty
       \def\@oddfoot{\normalfont\hfil\thepage}%
       \def\@evenfoot{\normalfont\hfil\thepage}}
-\def\name#1{\def\fromname{#1}}
+\newcommand*\name[1]{\def\fromname{#1}}
 \def\fromname{}
 \newcommand*\ondertekening[1]{\def\fromsig{#1}}
 \def\fromsig{}
 \let\signature\ondertekening
 \newcommand*\address[1]{\maakbriefhoofd*{}{#1}}
-\newcommand*{\location}[1]{\def\fromlocation{#1}}
+\newcommand*\location[1]{\def\fromlocation{#1}}
 \def\fromlocation{}
-\newcommand*{\telephone}[1]{\def\telephonenum{#1}}
+\newcommand*\telephone[1]{\def\telephonenum{#1}}
 \def\telephonenum{}
-\newcommand*{\makelabels}{%
+\newcommand*\makelabels{%
   \AtBeginDocument{%
      \let\@startlabels\startlabels
      \let\@mlabel\mlabel
@@ -380,7 +361,7 @@
 \newcommand*\@antwoordadres{}
 \let\replyaddress\antwoordadres
 \newdimen\adresveldbreedte
-\newcommand*{\adresveld}{%
+\newcommand*\adresveld{%
   \hbox{}\kern-\topskip
   \kern\@vensterskip
   \begingroup
@@ -501,13 +482,17 @@
         \streepje  %% denk maar dat dit geen dikte heeft
         \kern 45mm %% 155-150
         \streepje}}
-\def\stopbreaks{\interlinepenalty \@M
+\newcommand*\stopbreaks{\interlinepenalty \@M
    \def\par{\@@par\nobreak}\let\\=\@nobreakcr
    \let\vspace\@nobreakvspace}
-\def\@nobreakvspace{\@ifstar{\@nobreakvspacex}{\@nobreakvspacex}}
-
-\def\@nobreakvspacex#1{\ifvmode\nobreak\vskip #1\relax\else
-               \@bsphack\vadjust{\nobreak\vskip #1}\@esphack\fi}
+\DeclareRobustCommand\@nobreakvspace
+   {\@ifstar{\@nobreakvspacex}{\@nobreakvspacex}}
+\def\@nobreakvspacex#1{%
+  \ifvmode
+    \nobreak\vskip #1\relax
+  \else
+    \@bsphack\vadjust{\nobreak\vskip #1}\@esphack
+  \fi}
 \def\@nobreakcr{%
   \let\reserved@e\relax
   \let\reserved@f\relax
@@ -554,20 +539,20 @@
 \newcommand*{\cc}[1]{\par\noindent
   \parbox[t]{\textwidth}{\@hangfrom{\normalfont\ccname: }%
                        \ignorespaces #1\strut}\par}
-\newcommand*{\bijlage}[1]{%
+\newcommand*\bijlage[1]{%
   \par\noindent
   \parbox[t]{\textwidth}{\@hangfrom{\normalfont\bijlagetekst\ }%
     \ignorespaces #1\strut}\par}
-\newcommand*{\bijlagen}[1]{%
+\newcommand*\bijlagen[1]{%
   \par\noindent
   \parbox[t]{\textwidth}{\@hangfrom{\normalfont\bijlagentekst\ }%
     \ignorespaces #1\strut}\par}
 \let\encl\bijlagen
-\def\ps{\par\startbreaks}
-\def\stopletter{}
-\def\returnaddress{}
+\newcommand*\ps{\par\startbreaks}
+\newcommand*\stopletter{}
+\newcommand*\returnaddress{}
 \newcount\labelcount
-\newcommand*{\startlabels}{\labelcount\z@
+\newcommand*\startlabels{\labelcount\z@
   \pagestyle{empty}%
   \let\@texttop\relax
   \topmargin -50\p@
@@ -589,9 +574,9 @@
   \lineskip \z@
   \boxmaxdepth \z@
   \parindent \z@
-  \twocolumn\relax}
+    \twocolumn\relax}
 \let\@startlabels=\relax
-\newcommand*{\mlabel}[2]{%
+\newcommand*\mlabel[2]{%
   \parbox[b][2in][c]{262\p@}{\strut\ignorespaces #2}%
   }
 \let\@mlabel=\@gobbletwo
@@ -649,21 +634,22 @@
               \labelwidth\leftmarginvi
               \advance\labelwidth-\labelsep
               \topsep -.5\parskip \@plus \p@}
-\renewcommand*{\theenumi}{\@arabic\c@enumi}
-\renewcommand*{\theenumii}{\@alph\c@enumii}
-\renewcommand*{\theenumiii}{\@roman\c@enumiii}
-\renewcommand*{\theenumiv}{\@Alph\c@enumiv}
-\newcommand*{\labelenumi}{\theenumi.}
-\newcommand*{\labelenumii}{(\theenumii)}
-\newcommand*{\labelenumiii}{\theenumiii.}
-\newcommand*{\labelenumiv}{\theenumiv.}
-\renewcommand*{\p@enumii}{\theenumi}
-\renewcommand*{\p@enumiii}{\theenumi(\theenumii)}
-\renewcommand*{\p@enumiv}{\p@enumiii\theenumiii}
-\newcommand*{\labelitemi}{\textbullet}
-\newcommand*{\labelitemii}{\normalfont\bfseries \textendash}
-\newcommand*{\labelitemiii}{\textasteriskcentered}
-\newcommand*{\labelitemiv}{\textperiodcentered}
+\renewcommand*\theenumi  {\@arabic\c@enumi}
+\renewcommand*\theenumii {\@alph\c@enumii}
+\renewcommand*\theenumiii{\@roman\c@enumiii}
+\renewcommand*\theenumiv {\@Alph\c@enumiv}
+\newcommand*\labelenumi  {\theenumi.}
+\newcommand*\labelenumii {(\theenumii)}
+\newcommand*\labelenumiii{\theenumiii.}
+\newcommand*\labelenumiv {\theenumiv.}
+\renewcommand*\p@enumii {\theenumi}
+\renewcommand*\p@enumiii{\theenumi(\theenumii)}
+\renewcommand*\p@enumiv {\p@enumiii\theenumiii}
+\newcommand*\labelitemi  {\labelitemfont \textbullet}
+\newcommand*\labelitemii {\labelitemfont \bfseries \textendash}
+\newcommand*\labelitemiii{\labelitemfont \textasteriskcentered}
+\newcommand*\labelitemiv {\labelitemfont \textperiodcentered}
+\newcommand\labelitemfont{\normalfont}
 \newenvironment{description}
                {\list{}{\labelwidth\z@ \itemindent-\leftmargin
                         \let\makelabel\descriptionlabel}}
@@ -697,7 +683,7 @@
 \skip\@mpfootins = \skip\footins
 \setlength\fboxsep{3\p@}
 \setlength\fboxrule{.4\p@}
-\renewcommand*{\theequation}{\@arabic\c@equation}
+\renewcommand*\theequation{\@arabic\c@equation}
 \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
 \DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
 \DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
@@ -707,13 +693,13 @@
 \DeclareOldFontCommand{\sc}{\normalfont\scshape}{\relax}
 \DeclareRobustCommand*{\cal}{\@fontswitch{\relax}{\mathcal}}
 \DeclareRobustCommand*{\mit}{\@fontswitch{\relax}{\mathnormal}}
-\renewcommand*{\footnoterule}{%
+\renewcommand*\footnoterule{%
   \kern-\p@
   \hrule \@width .4\columnwidth
   \kern .6\p@}
 \long\def\@makefntext#1{%
   \noindent\hb@xt@\leftmargini{\normalfont\@thefnmark.\hfil}#1}
-\newcommand*{\dutchbrief}{%
+\newcommand*\dutchbrief{%
   \def\uwbrieftekst{Uw brief van}
   \def\uwkenmerktekst{Uw kenmerk}
   \def\onskenmerktekst{Ons kenmerk}
@@ -729,7 +715,7 @@
   \def\bijlagetekst{Bijlage:}
   \def\bijlagentekst{Bijlagen:}
   \def\telefoontekst{telefoon}}
-\newcommand*{\englishbrief}{%
+\newcommand*\englishbrief{%
   \def\uwbrieftekst{Your letter of}
   \def\uwkenmerktekst{Your reference}
   \def\onskenmerktekst{Our reference}
@@ -752,7 +738,7 @@
   \def\bijlagetekst{Enclosure:}
   \def\bijlagentekst{Enclosures:}
   \def\telefoontekst{telephone}}
-\newcommand*{\americanbrief}{%
+\newcommand*\americanbrief{%
   \def\uwbrieftekst{Your letter of}
   \def\uwkenmerktekst{Your reference}
   \def\onskenmerktekst{Our reference}
@@ -768,7 +754,7 @@
   \def\bijlagetekst{Enclosure:}
   \def\bijlagentekst{Enclosures:}
   \def\telefoontekst{telephone}}
-\newcommand*{\germanbrief}{%
+\newcommand*\germanbrief{%
    \def\uwbrieftekst{Ihr Brief vom}
    \def\uwkenmerktekst{Ihr Zeichen}
    \def\onskenmerktekst{Unser Zeichen}
@@ -784,7 +770,7 @@
    \def\bijlagetekst{Anlage:}
    \def\bijlagentekst{Anlagen:}
    \def\telefoontekst{Telefon}}
-\newcommand*{\frenchbrief}{%
+\newcommand*\frenchbrief{%
    \def\uwbrieftekst{Votre lettre du}
    \def\uwkenmerktekst{Vos r\'ef\'erences:}
    \def\onskenmerktekst{Nos r\'ef\'erences:}
diff --git a/Master/texmf-dist/tex/latex/ntgclass/ntg10.clo b/Master/texmf-dist/tex/latex/ntgclass/ntg10.clo
index 08a16600dab..14315a862b4 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/ntg10.clo
+++ b/Master/texmf-dist/tex/latex/ntgclass/ntg10.clo
@@ -7,19 +7,22 @@
 %% ntgclass.dtx  (with options: `10pt')
 %% 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,27 +38,8 @@
 %% 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         \~}
 \ProvidesFile{ntg10.clo}
-              [2004/06/07 v2.1a
+              [2020/02/22 v2.1c
              NTG LaTeX file (size option)]
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@xpt\@xiipt
@@ -66,27 +50,30 @@
    \let\@listi\@listI}
 \let\@normalsize\normalsize
 \normalsize
-\newcommand*\small{%
+\ifx\MakeRobust\@undefined \else
+    \MakeRobust\normalsize
+\fi
+\DeclareRobustCommand\small{%
    \@setfontsize\small\@ixpt{11}%
    \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
    \abovedisplayshortskip \z@ \@plus2\p@
    \belowdisplayshortskip 4\p@ \@plus2\p@ \@minus2\p@
    \belowdisplayskip \abovedisplayskip
 }
-\newcommand*\footnotesize{%
+\DeclareRobustCommand\footnotesize{%
    \@setfontsize\footnotesize\@viiipt{9.5}%
    \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
    \abovedisplayshortskip \z@ \@plus\p@
    \belowdisplayshortskip 3\p@ \@plus\p@ \@minus2\p@
    \belowdisplayskip \abovedisplayskip
 }
-\newcommand*\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand*\tiny{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand*\large{\@setfontsize\large\@xiipt{14}}
-\newcommand*\Large{\@setfontsize\Large\@xivpt{18}}
-\newcommand*\LARGE{\@setfontsize\LARGE\@xviipt{22}}
-\newcommand*\huge{\@setfontsize\huge\@xxpt{25}}
-\newcommand*\Huge{\@setfontsize\Huge\@xxvpt{30}}
+\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand\tiny{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand\large{\@setfontsize\large\@xiipt{14}}
+\DeclareRobustCommand\Large{\@setfontsize\Large\@xivpt{18}}
+\DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xviipt{22}}
+\DeclareRobustCommand\huge{\@setfontsize\huge\@xxpt{25}}
+\DeclareRobustCommand\Huge{\@setfontsize\Huge\@xxvpt{30}}
 \setlength\headheight{12\p@}
 \setlength\headsep   {25\p@}
 \setlength\topskip   {10\p@}
diff --git a/Master/texmf-dist/tex/latex/ntgclass/ntg11.clo b/Master/texmf-dist/tex/latex/ntgclass/ntg11.clo
index 8bc9cc2aeec..9643cb131be 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/ntg11.clo
+++ b/Master/texmf-dist/tex/latex/ntgclass/ntg11.clo
@@ -7,19 +7,22 @@
 %% ntgclass.dtx  (with options: `11pt')
 %% 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,27 +38,8 @@
 %% 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         \~}
 \ProvidesFile{ntg11.clo}
-              [2004/06/07 v2.1a
+              [2020/02/22 v2.1c
              NTG LaTeX file (size option)]
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@xipt{13.6}%
@@ -66,27 +50,30 @@
    \let\@listi\@listI}
 \let\@normalsize\normalsize
 \normalsize
-\newcommand*\small{%
+\ifx\MakeRobust\@undefined \else
+    \MakeRobust\normalsize
+\fi
+\DeclareRobustCommand\small{%
    \@setfontsize\small\@xpt\@xiipt
    \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
    \abovedisplayshortskip \z@ \@plus3\p@
    \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@
    \belowdisplayskip \abovedisplayskip
 }
-\newcommand*\footnotesize{%
+\DeclareRobustCommand\footnotesize{%
    \@setfontsize\footnotesize\@ixpt{11}%
    \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
    \abovedisplayshortskip \z@ \@plus\p@
    \belowdisplayshortskip 4\p@ \@plus2\p@ \@minus2\p@
    \belowdisplayskip \abovedisplayskip
 }
-\newcommand*\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand*\tiny{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand*\large{\@setfontsize\large\@xiipt{14}}
-\newcommand*\Large{\@setfontsize\Large\@xivpt{18}}
-\newcommand*\LARGE{\@setfontsize\LARGE\@xviipt{22}}
-\newcommand*\huge{\@setfontsize\huge\@xxpt{25}}
-\newcommand*\Huge{\@setfontsize\Huge\@xxvpt{30}}
+\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand\tiny{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand\large{\@setfontsize\large\@xiipt{14}}
+\DeclareRobustCommand\Large{\@setfontsize\Large\@xivpt{18}}
+\DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xviipt{22}}
+\DeclareRobustCommand\huge{\@setfontsize\huge\@xxpt{25}}
+\DeclareRobustCommand\Huge{\@setfontsize\Huge\@xxvpt{30}}
 \setlength\headheight{12\p@}
 \setlength\headsep   {25\p@}
 \setlength\topskip   {11\p@}
diff --git a/Master/texmf-dist/tex/latex/ntgclass/ntg12.clo b/Master/texmf-dist/tex/latex/ntgclass/ntg12.clo
index 0159ff46dcb..5449fdb7b55 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/ntg12.clo
+++ b/Master/texmf-dist/tex/latex/ntgclass/ntg12.clo
@@ -7,19 +7,22 @@
 %% ntgclass.dtx  (with options: `12pt')
 %% 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,27 +38,8 @@
 %% 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         \~}
 \ProvidesFile{ntg12.clo}
-              [2004/06/07 v2.1a
+              [2020/02/22 v2.1c
              NTG LaTeX file (size option)]
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@xiipt{14.5}%
@@ -66,26 +50,29 @@
    \let\@listi\@listI}
 \let\@normalsize\normalsize
 \normalsize
-\newcommand*\small{%
+\ifx\MakeRobust\@undefined \else
+    \MakeRobust\normalsize
+\fi
+\DeclareRobustCommand\small{%
    \@setfontsize\small\@xipt{13.6}%
    \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
    \abovedisplayshortskip \z@ \@plus3\p@
    \belowdisplayshortskip 6.5\p@ \@plus3.5\p@ \@minus3\p@
    \belowdisplayskip \abovedisplayskip
 }
-\newcommand*\footnotesize{%
+\DeclareRobustCommand\footnotesize{%
    \@setfontsize\footnotesize\@xpt\@xiipt
    \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
    \abovedisplayshortskip \z@ \@plus3\p@
    \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@
    \belowdisplayskip \abovedisplayskip
 }
-\newcommand*\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand*\tiny{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand*\large{\@setfontsize\large\@xivpt{18}}
-\newcommand*\Large{\@setfontsize\Large\@xviipt{22}}
-\newcommand*\LARGE{\@setfontsize\LARGE\@xxpt{25}}
-\newcommand*\huge{\@setfontsize\huge\@xxvpt{30}}
+\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand\tiny{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand\large{\@setfontsize\large\@xivpt{18}}
+\DeclareRobustCommand\Large{\@setfontsize\Large\@xviipt{22}}
+\DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xxpt{25}}
+\DeclareRobustCommand\huge{\@setfontsize\huge\@xxvpt{30}}
 \let\Huge=\huge
 \setlength\headheight{12\p@}
 \setlength\headsep   {25\p@}
diff --git a/Master/texmf-dist/tex/latex/ntgclass/rapport1.cls b/Master/texmf-dist/tex/latex/ntgclass/rapport1.cls
index f8f8e2e4d94..a2bcada4f11 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/rapport1.cls
+++ b/Master/texmf-dist/tex/latex/ntgclass/rapport1.cls
@@ -7,19 +7,22 @@
 %% ntgclass.dtx  (with options: `rapport,type1')
 %% 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{rapport1}%
-              [2004/06/07 v2.1a
+              [2020/02/22 v2.1c
        NTG LaTeX document class]
 \newcommand*\@ptsize{}
 
@@ -371,7 +355,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}%
@@ -380,7 +364,7 @@
            \else
              \protect\numberline{\csname the#1\endcsname}%
            \fi
-           \toc@font#2 #7}}%
+           #7}}%
      \fi
      \@xsect{#5}}
 \def\@seccntformat#1{%
@@ -428,7 +412,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
@@ -438,12 +422,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
@@ -472,9 +456,9 @@
         \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
       \chaptermark{#1}%
       \addtocontents{lof}{\protect\addvspace{10\p@}}%
@@ -628,12 +612,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}%
            \ifnum \@listdepth=1
              \if@revlabel
@@ -647,17 +633,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
          {%
            \ifnum \@listdepth=1\relax
             \if@revlabel
@@ -674,7 +663,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\center
    {\topsep=.25\baselineskip \@plus .1\baselineskip
                              \@minus .1\baselineskip
@@ -701,7 +691,9 @@
   \newenvironment{abstract}{%
       \titlepage
       \null\vfil
-      \hbox{\SectFont \abstractname}
+      \@beginparpenalty\@lowpenalty
+      \hbox{\SectFont \abstractname}%
+      \@endparpenalty\@M
       \noindent\ignorespaces}
      {\par\vfil\null\endtitlepage}
 \else
@@ -868,19 +860,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}
@@ -897,7 +900,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{}}%
@@ -905,11 +909,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]{%
@@ -922,7 +926,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
diff --git a/Master/texmf-dist/tex/latex/ntgclass/rapport3.cls b/Master/texmf-dist/tex/latex/ntgclass/rapport3.cls
index 08248016f5e..69adae24133 100644
--- a/Master/texmf-dist/tex/latex/ntgclass/rapport3.cls
+++ b/Master/texmf-dist/tex/latex/ntgclass/rapport3.cls
@@ -7,19 +7,22 @@
 %% ntgclass.dtx  (with options: `rapport,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{rapport3}%
-              [2004/06/07 v2.1a
+              [2020/02/22 v2.1c
        NTG LaTeX document class]
 \newcommand*\@ptsize{}
 
@@ -384,7 +368,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}%
@@ -393,7 +377,7 @@
            \else
              \protect\numberline{\csname the#1\endcsname}%
            \fi
-           \toc@font#2 #7}}%
+           #7}}%
      \fi
      \@xsect{#5}}
 \def\@seccntformat#1{%
@@ -441,7 +425,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
@@ -451,12 +435,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
@@ -485,9 +469,9 @@
         \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
       \chaptermark{#1}%
       \addtocontents{lof}{\protect\addvspace{10\p@}}%
@@ -641,12 +625,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}}%
@@ -656,17 +642,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
@@ -679,7 +668,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
@@ -688,7 +678,9 @@
   \newenvironment{abstract}{%
       \titlepage
       \null\vfil
-      \hbox{\SectFont \abstractname}
+      \@beginparpenalty\@lowpenalty
+      \hbox{\SectFont \abstractname}%
+      \@endparpenalty\@M
       \noindent\ignorespaces}
      {\par\vfil\null\endtitlepage}
 \else
@@ -853,7 +845,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
@@ -865,19 +857,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}
@@ -894,7 +897,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{}}%
@@ -902,11 +906,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]{%
@@ -919,7 +923,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