diff options
author | Karl Berry <karl@freefriends.org> | 2020-07-25 21:47:49 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-07-25 21:47:49 +0000 |
commit | 66279a58ec36789c4d363e2d4598176d99f43c66 (patch) | |
tree | 40ff5b787895347555e7977c470436170b3df203 /Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx | |
parent | ee3282ef4f3e4cbd372d0834f75a7d3b65f4f04f (diff) |
koma-script (25jul20)
git-svn-id: svn://tug.org/texlive/trunk@55944 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx | 104 |
1 files changed, 89 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx index 3fdf99854c0..339196dfe21 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx @@ -1,4 +1,3 @@ -% \CheckSum{4900} % \iffalse meta-comment % ====================================================================== % scrkernel-sections.dtx @@ -55,7 +54,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ % The runs of run-time file generation: %<preidentify>%%% (run: preidentify) % - everything that is needed before selfidentification of resulting files @@ -78,9 +77,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2020-04-08 16:42:59 +0200 (Wed, 08 Apr 2020) $ + \filedate$Date: 2020-06-11 16:57:03 +0200 (Thu, 11 Jun 2020) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3476 $ + \filerevision$Revision: 3507 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-sections.dtx}% @@ -1085,6 +1084,25 @@ \z@ \fi \let\@svsec\@empty +% \end{macrocode} +% \selectlanguage{english}% +% \changes{v3.31}{2020/06/02}{execute counter reset list}%^^A +% Even for not numbered sections, the reset list für the section counter has +% to be executed. +% \begin{macrocode} + \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@#1\endcsname + \endgroup + \fi +% \end{macrocode} +% \changes{v3.31}{2020/06/02}{\cs{hy@insteadofrefstepcounter} added}%^^A +% At this point we have to make sure, that the \textsf{hyperref} code for not +% increasing a counter is executed. +% \selectlanguage{ngerman}% +% \begin{macrocode} + \hy@insteadofrefstepcounter{#1}% \else \refstepcounter{#1}% \expandafter\@maybeautodot\csname the#1\endcsname @@ -1126,8 +1144,7 @@ \expandafter\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% - \expandafter\global\expandafter\def - \csname add#1tocentry\endcsname##1##2{% + \expandafter\gdef\csname add#1tocentry\endcsname##1##2{% \addtocentrydefault{#1}{##1}{##2}% }% }{}% @@ -1139,7 +1156,17 @@ \fi \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else - \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% +% \end{macrocode} +% \selectlanguage{english}% +% \changes{v3.31}{2020/06/06}{use \cs{\dots tocformat}}% +%^^ATODO: move \cs{autodot} to the definition of \cs{\dots tocformat} +% \selectlanguage{ngerman}% +% \begin{macrocode} + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% + \csname add#1tocentry\endcsname{\csname #1tocformat\endcsname}{% \@currenttocentry}% \fi \fi @@ -1169,8 +1196,7 @@ \expandafter{\@currentheadentry}% \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% - \expandafter\global\expandafter\def - \csname add#1tocentry\endcsname####1####2{% + \expandafter\gdef\csname add#1tocentry\endcsname####1####2{% \addtocentrydefault{#1}{####1}{####2}% }% }{}% @@ -1182,8 +1208,18 @@ \fi \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else - \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% - \@currenttocentry}% +% \end{macrocode} +% \selectlanguage{english}% +% \changes{v3.31}{2020/06/06}{use \cs{\dots tocformat}}% +%^^ATODO: move \cs{autodot} to the definition of \cs{\dots tocformat} +% \selectlanguage{ngerman}% +% \begin{macrocode} + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% + \csname add#1tocentry\endcsname{\csname #1tocformat\endcsname}{% + \@currenttocentry}% \fi \fi \ExecuteDoHook{heading/endgroup/#1}% @@ -1351,7 +1387,21 @@ \string\scr@s@ct@@nn@m@\space locally.\MessageBreak This could result in several error messages}% \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}% - }{}% + }{% +% \end{macrocode} +% \selectlanguage{english}% +% \changes{v3.31}{2020/06/02}{execute counter reset list}%^^A +% Even for not numbered sections, the reset list für the corresponding section +% counter has to be executed. +% \selectlanguage{ngerman}% +% \begin{macrocode} + \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@\scr@s@ct@@nn@m@\endcsname + \endgroup + \fi + }% % \end{macrocode} % \changes{v3.26}{2018/09/18}{\cs{scr@sect@runin} beachten}%^^A % Falls \cs{scr@sect@runin} nicht definiert ist, wird es jetzt höchste Zeit @@ -3907,18 +3957,29 @@ % \cs{typeout}}%^^A % \changes{v3.28}{2019/11/19}{\cs{ifnumbered} umbenannt in % \cs{Ifnumbered}}%^^A +% \changes{v3.31}{2020/06/02}{\cs{@maybeautodot}\cs{thepart} entfernt}%^^A % \begin{macrocode} \Ifnumbered{#1}{% \refstepcounter{#1}% - \@maybeautodot\thepart% \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% \ifx\@currenttocentry\@empty\else +% \end{macrocode} +% \selectlanguage{english}% +% \changes{v3.31}{2020/06/06}{use \cs{\dots tocformat}}% +%^^ATODO: move \cs{autodot} to the definition of \cs{\dots tocformat} +% \selectlanguage{ngerman}% +% \begin{macrocode} + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\@currenttocentry}% + }{\csname\@ifundefined{#1tocformat}{the#1}{#1tocformat}\endcsname}% + {\@currenttocentry}% \fi }{% % \end{macrocode} @@ -4750,11 +4811,22 @@ \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% \ifx\@currenttocentry\@empty\else +% \end{macrocode} +% \selectlanguage{english}% +% \changes{v3.31}{2020/06/06}{use \cs{\dots tocformat}}% +%^^ATODO: move \cs{autodot} to the definition of \cs{\dots tocformat} +% \selectlanguage{ngerman}% +% \begin{macrocode} + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\@currenttocentry}% + }{\csname\@ifundefined{#1tocformat}{the#1}{#1tocformat}\endcsname}% + {\@currenttocentry}% \fi % \end{macrocode} % Für alle nicht nummerieten Überschriften dieser Ebene trotzdem die @@ -6261,6 +6333,7 @@ beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,% afterskip=2.3ex \@plus.2ex,% tocstyle=section,% +%<book|report> tocindentfollows=chapter,% %<article> tocindent=0pt,% %<book|report> tocindent=1.5em,% %<article> tocnumwidth=1.5em% @@ -6309,6 +6382,7 @@ beforeskip=3.25ex \@plus1ex \@minus.2ex,% afterskip=-1em,% %<article> tocstyle=subsection,% + tocindentfollows=subsubsection,% %<book|report> tocstyle=section,% %<article> tocindent=7.0em,% %<book|report> tocindent=10em,% |