diff options
author | Karl Berry <karl@freefriends.org> | 2019-01-03 21:58:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-01-03 21:58:12 +0000 |
commit | 9a6785706ed1238169de63236cf1ade3038a8315 (patch) | |
tree | ebb7724b3d63ab7a3670016195a008e8b1995026 /Master/texmf-dist/tex/latex/koma-script/typearea.sty | |
parent | 5e448e499d3c7ac969a219544ef8c2d51cc282b0 (diff) |
koma-script (3jan19)
git-svn-id: svn://tug.org/texlive/trunk@49587 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/typearea.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/typearea.sty | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 3a751f344e2..6bcd9f8f32d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -48,7 +48,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3050 2018-12-30 14:36:55Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -70,23 +70,23 @@ \fi } \fi - \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}% + \@CheckKOMAScriptVersion{2018/12/30 v3.26a KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2018/03/30 v3.25 KOMA-Script + 2018/12/30 v3.26a KOMA-Script package (type area)] -%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3043 2018-11-06 07:50:06Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3050 2018-12-30 14:36:55Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -157,12 +157,14 @@ \@namedef{scr@v@3.23}{16} \@namedef{scr@v@3.24}{16} \@namedef{scr@v@3.25}{17} +\@namedef{scr@v@3.26}{17} +\@namedef{scr@v@3.26a}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $ %%% (run: init) \providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}} \providecommand\ta@divlistelse{1} -%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3050 2018-12-30 14:36:55Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -217,7 +219,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $ %%% (run: options) \providecommand*{\PaperNameToSize}[2][warning]{% \ifstr{#2}{letter}{% @@ -967,9 +969,9 @@ \KOMAExecuteOptions{twoside=false} \fi \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3050 2018-12-30 14:36:55Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $ %%% (run: body) \newcommand*{\ta@divfor}[1]{% \ta@div=\z@ @@ -1411,21 +1413,27 @@ Bad type area settings!\MessageBreak The detected line width is about \the\@tempcnta\@percentchar\MessageBreak - larger than the heuristically detected line width.\MessageBreak - You should e.g. decrease DIV, increase fontsize\MessageBreak + larger than the heuristically estimated maximum\MessageBreak + limit of typographical good line width.\MessageBreak + You should e.g. + \ifnum\ta@div >6 decrease DIV, \fi + \ifdim\f@size\p@<\@xiipt\p@ increase fontsize\else + (increase fontsize)\fi\MessageBreak or change papersize% }% \@tempcnta=-\@tempcnta \else \ifnum\@tempcnta>15 - \PackageWarningNoLine{typearea}{% + \PackageInfoNoLine{typearea}{% Maybe no optimal type area settings!\MessageBreak - The maximum limit of line width is about + The detected line width is about \the\@tempcnta\@percentchar\MessageBreak - larger than the heuristically detected line width.\MessageBreak - You may e.g. increase DIV, decrease fontsize\MessageBreak + smaller than the heuristically estimated maximum\MessageBreak + limit of typographical good line width.\MessageBreak + You could e.g. increase DIV% + \ifdim\f@size\p@>\@xpt\p@, decrease fontsize\fi\MessageBreak or change the papersize% - } + }% \fi\fi \ifnum\ta@div <6 \PackageWarningNoLine{typearea}{% @@ -1701,7 +1709,7 @@ \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end } \newcommand*{\@areaset@end}{} -%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $ %%% (run: final) \typearea[current]{current} %%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ |