From 21923df0aa733309adbfcc3169c7ffc0e0ab8b1c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Sep 2015 21:16:51 +0000 Subject: koma-script (30sep15) git-svn-id: svn://tug.org/texlive/trunk@38504 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/koma-script/README | 38 +- .../texmf-dist/doc/latex/koma-script/manifest.txt | 2 +- .../texmf-dist/doc/latex/koma-script/scrguide.html | 1145 +++++++++---------- .../texmf-dist/doc/latex/koma-script/scrguide.pdf | Bin 2555885 -> 2590178 bytes .../texmf-dist/doc/latex/koma-script/scrguien.html | 1181 ++++++++++---------- .../texmf-dist/doc/latex/koma-script/scrguien.pdf | Bin 2380734 -> 2409650 bytes .../texmf-dist/doc/latex/koma-script/scrhack.pdf | Bin 367777 -> 372716 bytes .../texmf-dist/doc/latex/koma-script/scrjura.pdf | Bin 448569 -> 448571 bytes .../texmf-dist/doc/latex/koma-script/scrpage2.pdf | Bin 707226 -> 707193 bytes .../texmf-dist/doc/latex/koma-script/tocstyle.pdf | Bin 249036 -> 249036 bytes .../texmf-dist/source/latex/koma-script/ChangeLog | 302 +++++ .../texmf-dist/source/latex/koma-script/Makefile | 1 + .../latex/koma-script/doc/english/common-8.tex | 22 +- .../latex/koma-script/doc/english/common-9.tex | 10 +- .../doc/english/scrbookreportarticle-experts.tex | 219 +++- .../doc/english/scrbookreportarticle.tex | 46 +- .../latex/koma-script/doc/english/scrextend.tex | 9 +- .../latex/koma-script/doc/english/scrhack.tex | 35 +- .../latex/koma-script/doc/english/scrlayer.tex | 266 +++-- .../koma-script/doc/english/scrlttr2-experts.tex | 4 +- .../latex/koma-script/doc/english/scrlttr2.tex | 95 +- .../latex/koma-script/doc/english/tocbasic.tex | 2 +- .../latex/koma-script/doc/english/typearea.tex | 9 +- .../source/latex/koma-script/doc/guide.bib | 16 +- .../latex/koma-script/doc/ngerman/common-21.tex | 4 +- .../latex/koma-script/doc/ngerman/common-8.tex | 18 +- .../latex/koma-script/doc/ngerman/common-9.tex | 8 +- .../latex/koma-script/doc/ngerman/scrbase.tex | 4 +- .../doc/ngerman/scrbookreportarticle-experts.tex | 279 ++++- .../doc/ngerman/scrbookreportarticle.tex | 49 +- .../latex/koma-script/doc/ngerman/scrextend.tex | 8 +- .../latex/koma-script/doc/ngerman/scrhack.tex | 38 +- .../latex/koma-script/doc/ngerman/scrlayer.tex | 286 +++-- .../koma-script/doc/ngerman/scrlttr2-experts.tex | 6 +- .../latex/koma-script/doc/ngerman/scrlttr2.tex | 102 +- .../latex/koma-script/doc/ngerman/typearea.tex | 7 +- .../source/latex/koma-script/doc/scrguide.cls | 28 +- .../source/latex/koma-script/doc/scrguide.html | 1145 +++++++++---------- .../source/latex/koma-script/doc/scrguide.pdf | Bin 2555885 -> 2590178 bytes .../source/latex/koma-script/doc/scrguien.html | 1181 ++++++++++---------- .../source/latex/koma-script/doc/scrguien.pdf | Bin 2380734 -> 2409650 bytes .../source/latex/koma-script/scrhack.dtx | 126 ++- .../source/latex/koma-script/scrkernel-basics.dtx | 76 +- .../latex/koma-script/scrkernel-compatibility.dtx | 14 +- .../source/latex/koma-script/scrkernel-fonts.dtx | 36 +- .../latex/koma-script/scrkernel-footnotes.dtx | 29 +- .../source/latex/koma-script/scrkernel-index.dtx | 10 +- .../latex/koma-script/scrkernel-language.dtx | 143 ++- .../source/latex/koma-script/scrkernel-listsof.dtx | 8 +- .../latex/koma-script/scrkernel-notepaper.dtx | 80 +- .../latex/koma-script/scrkernel-pagestyles.dtx | 20 +- .../latex/koma-script/scrkernel-paragraphs.dtx | 25 +- .../latex/koma-script/scrkernel-sections.dtx | 292 ++++- .../source/latex/koma-script/scrkernel-title.dtx | 10 +- .../latex/koma-script/scrkernel-typearea.dtx | 6 +- .../source/latex/koma-script/scrkernel-version.dtx | 4 +- .../source/latex/koma-script/scrlayer.dtx | 211 ++-- .../source/latex/koma-script/scrsource.tex | 1 + Master/texmf-dist/tex/latex/koma-script/DIN.lco | 4 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 4 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 6 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/NF.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/SN.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 4 +- .../tex/latex/koma-script/UScommercial9.lco | 4 +- .../tex/latex/koma-script/UScommercial9DW.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/float.hak | 10 +- .../texmf-dist/tex/latex/koma-script/floatrow.hak | 10 +- .../texmf-dist/tex/latex/koma-script/hyperref.hak | 10 +- .../texmf-dist/tex/latex/koma-script/listings.hak | 10 +- Master/texmf-dist/tex/latex/koma-script/lscape.hak | 95 ++ .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 162 ++- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 47 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 261 +++-- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 87 +- .../tex/latex/koma-script/scrfontsizes.sty | 12 +- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 24 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 25 +- .../tex/latex/koma-script/scrlayer-notecolumn.sty | 6 +- .../tex/latex/koma-script/scrlayer-scrpage.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrlayer.sty | 163 ++- .../texmf-dist/tex/latex/koma-script/scrletter.sty | 180 +-- .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 216 ++-- .../texmf-dist/tex/latex/koma-script/scrpage2.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 258 +++-- .../tex/latex/koma-script/scrsize10pt.clo | 8 +- .../tex/latex/koma-script/scrsize11pt.clo | 8 +- .../tex/latex/koma-script/scrsize12pt.clo | 8 +- .../texmf-dist/tex/latex/koma-script/scrtime.sty | 8 +- .../texmf-dist/tex/latex/koma-script/setspace.hak | 10 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 2 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 22 +- .../texmf-dist/tex/latex/koma-script/visualize.lco | 6 +- 101 files changed, 5963 insertions(+), 3419 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/koma-script/lscape.hak (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/koma-script/README b/Master/texmf-dist/doc/latex/koma-script/README index 944e8ddb93a..8951b3756f9 100644 --- a/Master/texmf-dist/doc/latex/koma-script/README +++ b/Master/texmf-dist/doc/latex/koma-script/README @@ -1,5 +1,5 @@ -KOMA-Script 2015/07/02 v3.18 +KOMA-Script 2015/09/29 v3.19 Copyright (c) Markus Kohm , 1994-2015 This material is subject to the LaTeX Project Public License. See @@ -56,7 +56,7 @@ Requires: scrkbase - internal KOMA-Script package typearea - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrbase - basic features for KOMA-Script, e.g. conditionals and key=value ------------------------------------------------------------------------------ @@ -95,7 +95,7 @@ Requires: keyval - key=value package from the graphics bundle manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrbook - versatile class may be used as a drop-in replacement of book ------------------------------------------------------------------------------ @@ -115,7 +115,7 @@ Requires: scrkbase - internal KOMA-Script package typearea - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrdate - calender date operations, e.g. calculation of the day of the week ------------------------------------------------------------------------------ @@ -134,7 +134,7 @@ Requires: scrbase - KOMA-Script package for some basic features. manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrdoc - internal source documentation class of KOMA-Script ------------------------------------------------------------------------------ @@ -163,7 +163,7 @@ Requires: scrkbase - internal package with some basics of KOMA-Script etoolbox - tool-box for LaTeX programming using e-TeX License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrfontsizes - package to generate a KOMA-Script font size file ------------------------------------------------------------------------------ @@ -175,7 +175,7 @@ Abstract: scrfontsizes is a LaTeX package of the KOMA-Script bundle. Requires: scrextend - some KOMA-Script features for other classes License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrhack - patch some isues with other packages ------------------------------------------------------------------------------ @@ -193,7 +193,7 @@ Requires: scrkbase - internal KOMA-Script package with basics tocbasic - features for helper files and float environments License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrjura - contract environment for advocates and scholary persons in law ------------------------------------------------------------------------------ @@ -225,7 +225,7 @@ Requires: scrbase - KOMA-Script package for some basic features. manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrlayer-notecolumn - control note columns parallel to the main text ------------------------------------------------------------------------------ @@ -266,7 +266,7 @@ Abstract: scrlayer-scrpage is a LaTeX package of the KOMA-Script Requires: scrlayer.sty License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrlayer - defining layers and controlling page headers and footers ------------------------------------------------------------------------------ @@ -291,7 +291,7 @@ Abstract: scrlayer is a LaTeX package of the KOMA-Script bundle. Requires: scrkbase.sty License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrletter - letter extention to KOMA-Script classes ------------------------------------------------------------------------------ @@ -305,7 +305,7 @@ Requires: scrkbase - internal KOMA-Script package Recommended: marvosym - package by Martin Vogel providing symbols License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrlfile - control of package dependencies ------------------------------------------------------------------------------ @@ -323,7 +323,7 @@ Abstract: scrlfile is a LaTeX package of the KOMA-Script bundle. It Requires: License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrlttr2 - versatile letter class with separation of text area and note paper ------------------------------------------------------------------------------ @@ -356,7 +356,7 @@ Requires: scrkbase - internal KOMA-Script package Recommended: marvosym - package by Martin Vogel providing symbols License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrpage2 - control of page headers and footers ------------------------------------------------------------------------------ @@ -382,7 +382,7 @@ Requires: Successor: scrlayer-scrpage License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrreprt - versatile class may be used as a drop-in replacement of report ------------------------------------------------------------------------------ @@ -402,7 +402,7 @@ Requires: scrkbase - internal KOMA-Script package typearea - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrtime - show the time of the LaTeX run ------------------------------------------------------------------------------ @@ -414,7 +414,7 @@ Abstract: scrtime is a LaTeX package of the KOMA-Script bundle. It Requires: scrkbase - internal package with some basics of KOMA-Script License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== scrwfile - Spare write handles for helper files to avoid `No room' messages ------------------------------------------------------------------------------ @@ -467,7 +467,7 @@ Abstract: tocbasic is a LaTeX package of the KOMA-Script bundle. The Requires: keyval - key=value interface of the graphics bundle License: LPPL 1.3c or later State: Author maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== tocstyle - Control layout of table of contents, list of figures etc. ------------------------------------------------------------------------------ @@ -510,5 +510,5 @@ Abstract: Many LaTeX classes, including the standard classes, present Requires: scrkbase - internal basic features for KOMA-Script packages License: LPPL 1.3c or later State: Autor maintained -Version: 2015/07/02 v3.18 +Version: 2015/09/29 v3.19 ============================================================================== diff --git a/Master/texmf-dist/doc/latex/koma-script/manifest.txt b/Master/texmf-dist/doc/latex/koma-script/manifest.txt index 2489d3c2de6..ea4687fc388 100644 --- a/Master/texmf-dist/doc/latex/koma-script/manifest.txt +++ b/Master/texmf-dist/doc/latex/koma-script/manifest.txt @@ -35,7 +35,7 @@ % Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien. % ====================================================================== % -% CONTENTS OF THE KOMA-SCRIPT RELEASE 2015/07/02 v3.18 +% CONTENTS OF THE KOMA-SCRIPT RELEASE 2015/09/29 v3.19 % ------------------------------------------------------ % % diff --git a/Master/texmf-dist/doc/latex/koma-script/scrguide.html b/Master/texmf-dist/doc/latex/koma-script/scrguide.html index 3c822f4d62a..6ab0c97f547 100644 --- a/Master/texmf-dist/doc/latex/koma-script/scrguide.html +++ b/Master/texmf-dist/doc/latex/koma-script/scrguide.html @@ -11,38 +11,38 @@

Optionen

Anweisungen

Umgebungen

Längen

Pseudolängen

Variablen

Seitenstile

Zähler

diff --git a/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf b/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf index 79abe5c052b..6a7205ef65c 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf and b/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/koma-script/scrguien.html b/Master/texmf-dist/doc/latex/koma-script/scrguien.html index 894fc020de0..d743a872ad1 100644 --- a/Master/texmf-dist/doc/latex/koma-script/scrguien.html +++ b/Master/texmf-dist/doc/latex/koma-script/scrguien.html @@ -13,311 +13,313 @@
  • BCOR --> 30
  • DIV --> 31
  • abstract --> 65
  • -
  • addrfield --> 172
  • -
  • adrFreeIVempty --> 238
  • -
  • adrFreeIVshow --> 238
  • -
  • adrFreeIVstop --> 238
  • -
  • adrFreeIVwarn --> 238
  • +
  • addrfield --> 174
  • +
  • adrFreeIVempty --> 239
  • +
  • adrFreeIVshow --> 239
  • +
  • adrFreeIVstop --> 239
  • +
  • adrFreeIVwarn --> 239
  • appendixprefix --> 86
  • -
  • autoclearnotecolumns --> 349
  • -
  • automark --> 218
  • -
  • autooneside --> 218
  • -
  • autoremoveinterfaces --> 327
  • -
  • backaddress --> 172
  • +
  • autoclearnotecolumns --> 352
  • +
  • automark --> 219
  • +
  • autooneside --> 219
  • +
  • autoremoveinterfaces --> 330
  • +
  • backaddress --> 174
  • bibliography --> 133
  • captions --> 115
  • chapteratlists --> 89
  • chapterentrydots --> 68
  • chapterprefix --> 86
  • cleardoublepage --> 78
  • -
  • clines --> 228
  • -
  • deactivatepagestylelayers --> 321
  • -
  • draft --> 324, 51
  • -
  • enlargefirstpage --> 160
  • -
  • extendedfeature --> 241
  • +
  • clines --> 229
  • +
  • deactivatepagestylelayers --> 324
  • +
  • draft --> 327, 51
  • +
  • enlargefirstpage --> 161
  • +
  • extendedfeature --> 242
  • firstfoot --> 185
  • -
  • firsthead --> 160
  • +
  • firsthead --> 162
  • fleqn --> 115
  • -
  • foldmarks --> 159
  • +
  • foldmarks --> 158
  • fontsize --> 153, 52
  • -
  • footbotline --> 226
  • +
  • footbotline --> 227
  • footheight --> 42
  • footinclude --> 39
  • footlines --> 42
  • footnotes --> 80
  • -
  • footsepline --> 187, 226, 73
  • -
  • footwidth --> 225
  • -
  • forceoverwrite --> 327
  • -
  • fromalign --> 161
  • -
  • fromemail --> 166
  • -
  • fromfax --> 166
  • -
  • fromlogo --> 170
  • -
  • frommobilephone --> 166
  • -
  • fromphone --> 166
  • -
  • fromrule --> 161
  • -
  • fromurl --> 166
  • +
  • footsepline --> 189, 227, 73
  • +
  • footwidth --> 226
  • +
  • forceoverwrite --> 330
  • +
  • fromalign --> 162
  • +
  • fromemail --> 167
  • +
  • fromfax --> 167
  • +
  • fromlogo --> 171
  • +
  • frommobilephone --> 167
  • +
  • fromphone --> 167
  • +
  • fromrule --> 162
  • +
  • fromurl --> 167
  • headheight --> 41
  • headinclude --> 39
  • headings --> 87
  • headlines --> 41
  • -
  • headsepline --> 187, 226, 73
  • -
  • headtopline --> 226
  • -
  • headwidth --> 225
  • -
  • hmode --> 338
  • -
  • ilines --> 228
  • +
  • headsepline --> 189, 227, 73
  • +
  • headtopline --> 227
  • +
  • headwidth --> 226
  • +
  • hmode --> 341
  • +
  • ilines --> 229
  • index --> 135
  • -
  • internalonly --> 246
  • -
  • komastyle --> 218
  • +
  • internalonly --> 247
  • +
  • komastyle --> 219
  • leqno --> 114
  • listof --> 128
  • -
  • locfield --> 176
  • -
  • manualmark --> 218
  • -
  • markcase --> 221
  • +
  • locfield --> 177
  • +
  • manualmark --> 219
  • +
  • markcase --> 222
  • mpinclude --> 40
  • numbers --> 89
  • -
  • numericaldate --> 178
  • -
  • olines --> 228
  • -
  • onpsbackground --> 320
  • -
  • onpsevenpage --> 320
  • -
  • onpsfloatpage --> 320
  • -
  • onpsforeground --> 320
  • -
  • onpsinit --> 320
  • -
  • onpsnonfloatpage --> 320
  • -
  • onpsoddpage --> 320
  • -
  • onpsoneside --> 320
  • -
  • onpsselect --> 320
  • -
  • onpstwoside --> 320
  • +
  • numericaldate --> 179
  • +
  • olines --> 229
  • +
  • onpsbackground --> 323
  • +
  • onpsevenpage --> 323
  • +
  • onpsfloatpage --> 323
  • +
  • onpsforeground --> 323
  • +
  • onpsinit --> 323
  • +
  • onpsnonfloatpage --> 323
  • +
  • onpsoddpage --> 323
  • +
  • onpsoneside --> 323
  • +
  • onpsselect --> 323
  • +
  • onpstwoside --> 323
  • open --> 85
  • origlongtable --> 128
  • -
  • pagenumber --> 188
  • +
  • pagenumber --> 189
  • pagesize --> 45
  • paper --> 44
  • parskip --> 70
  • -
  • plainfootbotline --> 228
  • -
  • plainfootsepline --> 228
  • -
  • plainheadsepline --> 228
  • -
  • plainheadtopline --> 228
  • -
  • priority --> 172
  • +
  • plainfootbotline --> 229
  • +
  • plainfootsepline --> 229
  • +
  • plainheadsepline --> 229
  • +
  • plainheadtopline --> 229
  • +
  • priority --> 174
  • refline --> 179
  • sectionentrydots --> 68
  • -
  • standardstyle --> 218
  • +
  • standardstyle --> 219
  • subject --> 183
  • -
  • symbolicnames --> 166
  • +
  • symbolicnames --> 167
  • titlepage --> 59
  • toc --> 66, 66, 66, 66
  • twocolumn --> 38
  • twoside --> 37
  • version --> 29
  • -
  • visualize --> 391
  • +
  • visualize --> 397
  • Commands

    Environments

    Lengths

    Pseudolengths

    Variables

    Page Styles

    Counter

    diff --git a/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf b/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf index 1a72ee728f0..bd015f6efc3 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf and b/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf differ diff --git a/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf b/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf index 605ead45719..de81e4de8d1 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf and b/Master/texmf-dist/doc/latex/koma-script/scrhack.pdf differ diff --git a/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf b/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf index 8ba1dfe6144..75f2a55b244 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf and b/Master/texmf-dist/doc/latex/koma-script/scrjura.pdf differ diff --git a/Master/texmf-dist/doc/latex/koma-script/scrpage2.pdf b/Master/texmf-dist/doc/latex/koma-script/scrpage2.pdf index 2c2e8e0e6e0..9453102f090 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/scrpage2.pdf and b/Master/texmf-dist/doc/latex/koma-script/scrpage2.pdf differ diff --git a/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf b/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf index a9e4cdb4ba9..9a163d94677 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf and b/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf differ diff --git a/Master/texmf-dist/source/latex/koma-script/ChangeLog b/Master/texmf-dist/source/latex/koma-script/ChangeLog index 5ef73610a0e..4dc2d9da332 100644 --- a/Master/texmf-dist/source/latex/koma-script/ChangeLog +++ b/Master/texmf-dist/source/latex/koma-script/ChangeLog @@ -1,3 +1,305 @@ +r2208 2015-09-29 10:13:01 +0200 kohm: + + * scrkernel-version.dtx: prepared for 3.19 + +r2207 2015-09-27 10:14:13 +0200 kohm: + + * TODO: new nice to have: TOC feature pagestyle + +r2206 2015-09-27 10:08:34 +0200 kohm: + + * scrkernel-listsof.dtx: fix: typo in warning message + +r2205 2015-09-15 12:55:19 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrlayer.tex: Rechtschreibung + +r2204 2015-09-15 11:35:31 +0200 kohm: + + * TODO, doc/, doc/ngerman/, doc/ngerman/scrlayer.tex, doc/english/, + doc/english/scrlayer.tex: new: doc of layer mode and the commands of + new layer mode picture + +r2203 2015-09-15 11:32:08 +0200 kohm: + + * doc/, doc/scrguide.cls: fix: LenToUnit no LengthToUnit + +r2202 2015-09-14 10:57:28 +0200 kohm: + + * TODO, doc/, doc/ngerman/, doc/ngerman/scrlayer.tex: neu: Doku für + mode=picture einschl. der dafür reservierten neuen Anweisungen new: + Doku für \layervalign und \layerhalign + +r2201 2015-09-14 10:54:18 +0200 kohm: + + * doc/, doc/scrguide.cls: version + +r2200 2015-09-14 10:53:49 +0200 kohm: + + * doc/, doc/scrguide.cls: added more moretexcs + +r2199 2015-09-14 10:33:00 +0200 kohm: + + * doc/, doc/guide.bib: change: using new version of eso-pic + +r2198 2015-09-11 14:31:18 +0200 kohm: + + * doc/, doc/english/, doc/english/scrbookreportarticle-experts.tex: + fix: counterwithout cancels counterwithin + +r2197 2015-09-10 07:56:45 +0200 kohm: + + * TODO, doc/, doc/ngerman/, + doc/ngerman/scrbookreportarticle-experts.tex, doc/english/, + doc/english/scrbookreportarticle-experts.tex: new: doc of + \DeclareSectionCommand's counterwithout + +r2196 2015-09-09 08:02:50 +0200 kohm: + + * TODO: need doc of \DeclareSectionCommand's counterwithout + +r2195 2015-09-09 08:01:54 +0200 kohm: + + * scrkernel-sections.dtx: new: \DeclareSectionCommand attribute + "counterwithout" + +r2194 2015-09-04 17:26:05 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/typearea.tex, doc/english/, + doc/english/typearea.tex: added: note about the optional argument of + \areaset + +r2193 2015-09-03 10:08:20 +0200 kohm: + + * TODO, doc/, doc/ngerman/, + doc/ngerman/scrbookreportarticle-experts.tex, doc/english/, + doc/english/scrbookreportarticle-experts.tex: doc: + \sectionlinesformat, \sectioncatchphraseformat + +r2192 2015-09-03 09:21:21 +0200 kohm: + + * scrkernel-sections.dtx: change: added extra group in + \sectionlinesformat + +r2191 2015-09-03 09:18:20 +0200 kohm: + + * scrkernel-sections.dtx: change: redundant change if + \interlinepenalty removed from \sectionlinesformat + +r2190 2015-08-29 19:21:55 +0200 kohm: + + * scrkernel-basics.dtx: fix: \protected@edef new: \IfArgIsEmpty + +r2189 2015-08-29 12:11:08 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/common-21.tex: fix: Doppelter + Schlusspunkt + +r2188 2015-08-28 16:54:24 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrbookreportarticle-experts.tex: + change: Stichwortverzeichniseinträge für Gliederungsstile + +r2187 2015-08-27 21:14:32 +0200 kohm: + + * scrkernel-sections.dtx: change: \sectionlinesformat and + \sectioncatchphraseformat has a new first + argument, level + +r2186 2015-08-27 11:10:36 +0200 kohm: + + * TODO, doc/, doc/ngerman/, doc/ngerman/scrbookreportarticle.tex, + doc/ngerman/scrbookreportarticle-experts.tex, doc/english/, + doc/english/scrbookreportarticle.tex, + doc/english/scrbookreportarticle-experts.tex: new: \chapterlinesformat + and \chapterlineswithprefixformat + +r2185 2015-08-27 10:30:15 +0200 kohm: + + * doc/, doc/scrguide.cls: change: add new commands to moretexcs of + listings style KOMA + +r2184 2015-08-27 10:05:10 +0200 kohm: + + * scrkernel-sections.dtx: change: \raggedchapter moved and \@hangfrom + called with extra group + +r2183 2015-08-25 11:11:53 +0200 kohm: + + * TODO, doc/, doc/ngerman/, doc/ngerman/scrlttr2.tex, doc/english/, + doc/english/scrlttr2.tex: new: \letterpagestyle + +r2182 2015-08-25 11:10:08 +0200 kohm: + + * scrkernel-title.dtx, scrkernel-index.dtx, scrkernel-sections.dtx: + change: use only defined non empty page styles + +r2181 2015-08-24 11:30:25 +0200 kohm: + + * scrkernel-fonts.dtx: fix: \addtokomafontgobblelist uses wrong list + [Falk] + +r2180 2015-08-24 11:28:16 +0200 kohm: + + * scrkernel-footnotes.dtx, doc/, doc/ngerman/, + doc/ngerman/common-9.tex, doc/ngerman/scrextend.tex, doc/english/, + doc/english/common-9.tex, doc/english/scrextend.tex: fix: scrextend + does not use footnote rule settings, so it should not provide + setting them fix: scrextend uses \providecommand instead of + \newcommand to define \multiplefootnotemark + +r2179 2015-08-22 08:36:48 +0200 kohm: + + * scrkernel-paragraphs.dtx: fix: usage of \setlength and \addtolength + inside \par@update provocates an conflict with tikz + +r2178 2015-08-20 18:11:02 +0200 kohm: + + * scrkernel-fonts.dtx, doc/, doc/ngerman/, + doc/ngerman/scrbookreportarticle-experts.tex, doc/english/, + doc/english/scrbookreportarticle-experts.tex: fix: usage of font names + with special characters with \usefontofkomafont etc. + +r2177 2015-08-20 09:23:35 +0200 kohm: + + * TODO, doc/, doc/ngerman/, doc/ngerman/scrlttr2.tex, doc/english/, + doc/english/scrlttr2.tex: - kind of translation of counter letter and + commands \thisletter and \letterlastpage + +r2176 2015-08-18 12:58:10 +0200 kohm: + + * TODO, doc/, doc/ngerman/, doc/ngerman/scrbookreportarticle.tex, + doc/english/, doc/english/scrbookreportarticle.tex: added: doc of + index=numbered and toc=indexnumbered + +r2175 2015-08-11 17:51:46 +0200 kohm: + + * scrhack.dtx: fix: lscape hack with more than one landscape page + +r2174 2015-08-02 13:58:44 +0200 kohm: + + * TODO, scrkernel-sections.dtx: new: commands \chapterlinesformat and + \chapterlineswithprefixformat + +r2173 2015-07-30 11:56:39 +0200 kohm: + + * scrkernel-version.dtx: change: version date + +r2172 2015-07-30 11:39:05 +0200 kohm: + + * scrlayer.dtx, TODO: removed: layer attribute picturecontents new: + layer attribute mode with predefined values text, raw and picture + new: inside layers \layerhalign and \layervalign can be used to + detect but not change the layer alignment + +r2171 2015-07-29 08:48:19 +0200 kohm: + + * scrkernel-paragraphs.dtx: fix: \setparsizes uses \par@updaterelativ + until first \selectfont at \begin{document} + +r2170 2015-07-27 11:52:22 +0200 kohm: + + * scrlayer.dtx, TODO: new: layer attribute picturecontents + +r2169 2015-07-26 12:14:32 +0200 kohm: + + * TODO, doc/, doc/ngerman/, doc/ngerman/scrlttr2.tex: new: + Dokumentation von Zähler letter und Anweisungen \thisletter und + \letterlastpage + +r2168 2015-07-26 11:32:03 +0200 kohm: + + * scrkernel-version.dtx, scrkernel-compatibility.dtx: prepared for + 3.19 BETA + +r2167 2015-07-26 11:18:40 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/common-8.tex, doc/english/, + doc/english/common-8.tex: doc-fix: \cleardoubleoddpageusingstyle and + \cleardoubleevenpageusingstyle + +r2166 2015-07-26 10:15:44 +0200 kohm: + + * scrkernel-typearea.dtx: fix: pfdtex settings + +r2165 2015-07-26 08:26:14 +0200 kohm: + + * TODO, scrkernel-sections.dtx: new: \sectionlinesformat and + \sectioncatchphraseformat + +r2164 2015-07-26 08:24:01 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrbase.tex: fix: Doku zu + \if@atdocument + +r2163 2015-07-15 18:39:57 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrlttr2-experts.tex, doc/english/, + doc/english/scrlttr2-experts.tex: fix: \LetterOptionsNeedsPapersize + example + +r2162 2015-07-15 09:30:52 +0200 kohm: + + * scrkernel-notepaper.dtx, scrkernel-pagestyles.dtx, TODO: new: + \letterpagestyle can be used to auto-change the page style of + letters new: letters are numbered new: \thisletter gives the number + of the current letter with it's prefix new: \letterlastpage gives + the last page number of the current letter + +r2161 2015-07-08 14:05:44 +0200 kohm: + + * scrkernel-pagestyles.dtx: fix: headinclude and footinclude at + headsepline and footsepline + +r2160 2015-07-08 11:06:35 +0200 kohm: + + * Makefile: change: lscape.hak added + +r2159 2015-07-08 10:27:58 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrhack.tex, doc/english/, + doc/english/scrhack.tex: additional fixes of the new sections by Elke + +r2158 2015-07-08 09:10:34 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrhack.tex, doc/english/, + doc/english/scrhack.tex: improvement of new section + +r2157 2015-07-07 21:29:19 +0200 kohm: + + * scrhack.dtx: new: lscape hack + +r2156 2015-07-07 21:28:34 +0200 kohm: + + * scrsource.tex, scrhack.dtx, doc/, doc/guide.bib, doc/ngerman/, + doc/ngerman/scrhack.tex, doc/english/, doc/english/scrhack.tex: new: + lscape hack + +r2155 2015-07-07 08:42:29 +0200 kohm: + + * scrkernel-basics.dtx: change: \ifisskip accepts \baselineskip or + \parskip as skip + +r2154 2015-07-06 18:18:47 +0200 kohm: + + * scrkernel-basics.dtx: fix: Usage of \FamilyKeyStateProcessed + +r2153 2015-07-03 22:06:24 +0200 kohm: + + * scrkernel-basics.dtx: fix: missing % in family keys without default + value added + +r2152 2015-07-03 22:03:38 +0200 kohm: + + * scrkernel-version.dtx, scrkernel-compatibility.dtx: start of new + beta + +r2151 2015-07-03 11:25:42 +0200 kohm: + + * scrkernel-language.dtx: fix: emergency code for brain dead language + default settings (like hyphen.cfg of babel) now executes all + commands using \@nameuse and also executes \@nameuse{extra…} + r2150 2015-07-02 10:10:21 +0200 kohm: * releaselist.txt: release 2015/07/02 v3.18 diff --git a/Master/texmf-dist/source/latex/koma-script/Makefile b/Master/texmf-dist/source/latex/koma-script/Makefile index d4fbbbcd86b..827436ca4c6 100644 --- a/Master/texmf-dist/source/latex/koma-script/Makefile +++ b/Master/texmf-dist/source/latex/koma-script/Makefile @@ -109,6 +109,7 @@ CLS_MAIN = scrbook.cls \ hyperref.hak \ listings.hak \ setspace.hak \ + lscape.hak \ scrfontsizes.sty \ visualize.lco \ DIN.lco \ diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-8.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-8.tex index 543ae35fb6c..cc41946018f 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-8.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-8.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-8.tex -% Copyright (c) Markus Kohm, 2001-2014 +% Copyright (c) Markus Kohm, 2001-2015 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % common-8.tex -% Copyright (c) Markus Kohm, 2001-2014 +% Copyright (c) Markus Kohm, 2001-2015 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,11 +46,11 @@ % ====================================================================== \KOMAProvidesFile{common-8.tex}% - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-07-26 11:18:40 +0200 (Sun, 26 Jul 2015) $ KOMA-Script guide (common paragraphs: Interleaf Pages)] \translator{Markus Kohm\and Gernot Hassenpflug\and Krickette Murabayashi} -% Date of the translated German file: 2014/06/25 +% Date of the translated German file: 2015/07/26 \makeatletter \@ifundefined{ifCommonmaincls}{\newif\ifCommonmaincls}{}% @@ -158,11 +158,11 @@ earlier version (see option \Option{version}, \autoref{sec:\csname \Macro{cleardoubleemptypage}\\ \Macro{cleardoubleplainpage}\\ \Macro{cleardoublestandardpage}\\ - \Macro{cleardoubleoddusingstyle}\Parameter{page style}\\ + \Macro{cleardoubleoddpageusingstyle}\Parameter{page style}\\ \Macro{cleardoubleoddemptypage}\\ \Macro{cleardoubleoddplainpage}\\ \Macro{cleardoubleoddstandardpage}\\ - \Macro{cleardoubleevenusingstyle}\Parameter{page style}\\ + \Macro{cleardoubleevenpageusingstyle}\Parameter{page style}\\ \Macro{cleardoubleevenemptypage}\\ \Macro{cleardoubleevenplainpage}\\ \Macro{cleardoubleevenstandardpage} @@ -173,11 +173,11 @@ earlier version (see option \Option{version}, \autoref{sec:\csname \BeginIndex{Cmd}{cleardoublestandardpage}% \BeginIndex{Cmd}{cleardoubleplainpage}% \BeginIndex{Cmd}{cleardoubleemptypage}% -\BeginIndex{Cmd}{cleardoubleoddusingstyle}% +\BeginIndex{Cmd}{cleardoubleoddpageusingstyle}% \BeginIndex{Cmd}{cleardoubleoddstandardpage}% \BeginIndex{Cmd}{cleardoubleoddplainpage}% \BeginIndex{Cmd}{cleardoubleoddemptypage}% -\BeginIndex{Cmd}{cleardoubleevenusingstyle}% +\BeginIndex{Cmd}{cleardoubleevenpageusingstyle}% \BeginIndex{Cmd}{cleardoubleevenstandardpage}% \BeginIndex{Cmd}{cleardoubleevenplainpage}% \BeginIndex{Cmd}{cleardoubleevenemptypage}% @@ -212,7 +212,7 @@ interleaf page is may be set with the argument of of the chapter start is of special contents. \KOMAScript{} therefor provides the commands \Macro{cleardoubleevenstandardpage}, \Macro{cleardoubleevenplainpage}, \Macro{cleardoubleevenemptypage}, - and \Macro{cleardoubleevenusingstyle}, which are equivalent to the odd-page + and \Macro{cleardoubleevenpageusingstyle}, which are equivalent to the odd-page commands.} However, the approach used by the \KOMAScript{} commands @@ -274,11 +274,11 @@ the standard command \Macro{cleardoublepage}, that may be either \EndIndex{Cmd}{cleardoublestandardpage}% \EndIndex{Cmd}{cleardoubleplainpage}% \EndIndex{Cmd}{cleardoubleemptypage}% -\EndIndex{Cmd}{cleardoubleoddusingstyle}% +\EndIndex{Cmd}{cleardoubleoddpageusingstyle}% \EndIndex{Cmd}{cleardoubleoddstandardpage}% \EndIndex{Cmd}{cleardoubleoddplainpage}% \EndIndex{Cmd}{cleardoubleoddemptypage}% -\EndIndex{Cmd}{cleardoubleevenusingstyle}% +\EndIndex{Cmd}{cleardoubleevenpageusingstyle}% \EndIndex{Cmd}{cleardoubleevenstandardpage}% \EndIndex{Cmd}{cleardoubleevenplainpage}% \EndIndex{Cmd}{cleardoubleevenemptypage}% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-9.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-9.tex index 32590b320e6..0776fe39c00 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-9.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-9.tex @@ -46,11 +46,11 @@ % ====================================================================== \KOMAProvidesFile{common-9.tex} - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-08-24 11:28:16 +0200 (Mon, 24 Aug 2015) $ KOMA-Script guide (common paragraphs: Footnotes)] \translator{Markus Kohm\and Krickette Murabayashi} -% Date of the translated German file: 2015/03/31 +% Date of the translated German file: 2015/08/24 \makeatletter \@ifundefined{ifCommonmaincls}{\newif\ifCommonmaincls}{}% @@ -90,7 +90,11 @@ . Nevertheless, by default the footnotes are under full control of the used class. This changes as soon as command \Macro{deffootnote} (see \autopageref{desc:\ifIgnoreThis maincls\else scrextend\fi.cmd.deffootnote}) - has been used.}% + has been used. + + Package \Package{scrextend} does not provide settings for the separation + line above the footnotes.% +}% \ifIgnoreThis %+++++++++++++++++++++++++++++++++++++++++++++ nicht maincls + \else %------------------------------------------------------- nur maincls - diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex index 724addb592e..f19c3ebc4fa 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle-experts.tex @@ -48,13 +48,13 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle-experts.tex} - [$Date: 2015-06-17 13:12:54 +0200 (Wed, 17 Jun 2015) $ + [$Date: 2015-09-11 14:31:18 +0200 (Fri, 11 Sep 2015) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl for experts)] \translator{Gernot Hassenpflug\and Markus Kohm} -% Date of the translated German file: 2015-06-17 +% Date of the translated German file: 2015-09-10 \chapter{Additional Information about the Main Classes \Class{scrbook}, @@ -295,9 +295,11 @@ itself defines a lot of \PName{alias name}s for several \PName{element}s. \EndIndex{Cmd}{newkomafont}% \begin{Declaration} - \Macro{addtokomafontrelaxlist}\Parameter{macro} + \Macro{addtokomafontrelaxlist}\Parameter{macro}\\ + \Macro{addtokomafontgobblelist}\Parameter{macro} \end{Declaration} \BeginIndex{Cmd}{addtokomafontrelaxlist}% +\BeginIndex{Cmd}{addtokomafontgobblelist}% As already mentioned in \autoref{part:forAuthors} of this manual, font settings of elements should consist only in commands to select the size, family, coding, series, shape, or colour. At least changing the colour is not always @@ -329,7 +331,7 @@ what \Macro{MakeUppercase} needs. Therefore\ChangedAt{v3.17}{\Class{scrbook}\and \Class{scrreprt}\and \Class{scrartcl}} \KOMAScript{} holds a list of macros, which should become \Macro{relax} inside \Macro{usefontofkomafont} and it's siblings. Amongst -others, \Macro{color}, \Macro{normalcolor}, \Macro{MakeUppercase}, and +others, \Macro{normalcolor}, \Macro{MakeUppercase}, and \Macro{MakeLowercase} are part of that list. More macros can be added one by one using \Macro{addtokomafontrelaxlist}. @@ -339,7 +341,15 @@ locally. Therefore you must not add commands like \Macro{setlength} to the list. The user himself is responsible for all errors resulting in the usage of \Macro{addtokomafontrelaxlist}. Additionally this command should not be misunderstood as a legitimation for adding all kind of commands to the font -setting of an element!% +setting of an element! + +If\ChangedAt{v3.19}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} a \PName{macro} and it's first argument should be ignored +locally inside \Macro{usefontofkomafont} and it's siblings, you can use +\Macro{addtokomafontgobblelist} instead of \Macro{addtokomafontrelaxlist}. An +example for this is the command \Macro{color}, that has to be ignored with the +colour name and therefore is a default member of the gobble-list.% +\EndIndex{Cmd}{addtokomafontgobblelist}% \EndIndex{Cmd}{addtokomafontrelaxlist}% @@ -499,6 +509,14 @@ dependent attributes, too. Currently the following styles are provided: be prefixed by \Macro{the\PName{counter name}} followed by a dot.\\ + \ChangedAt{v3.19}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartl}}% + \PValue{counterwithout} & \PName{counter name} & + Cancels a prior + \PValue{counterwithin} + setting. Therefore it makes sense + only if you re-define an existing + section-like command.\\ \PValue{expandtopt} & \PName{switch}& If the switch is on, all following values for lengths will be completely expanded, evaluated and @@ -1126,6 +1144,197 @@ print extra rules above and below the chapter heading may be found at \EndIndex{Cmd}{chapterheadstartvskip}% +\begin{Declaration} + \Macro{chapterlineswithprefixformat}% + \Parameter{level}\Parameter{number}\Parameter{text}\\ + \Macro{chapterlinesformat}% + \Parameter{level}\Parameter{number}\Parameter{text} +\end{Declaration} +\BeginIndex{Cmd}{chapterlineswithprefixformat}% +\BeginIndex{Cmd}{chapterlinesformat}% +These\ChangedAt{v3.19}{\Class{scrbook}\and \Class{scrreprt}} commands are used +by headings with style \PValue{chapter} to output the heading number and +heading text depending on option +\Option{chapterprefix}\IndexOption{chapterprefix}% +\textnote{\Option{chapterprefix}} (see \autoref{sec:maincls.structure}, +\autopageref{desc:maincls.option.chapterprefix}). If the option is +\PValue{true} \Macro{chapterlineswithprefixformat} is used, otherwise +\Macro{chapterlinesformat}. + +The arguments \PName{number} and \PName{text} are already formatted, i.\,e., +they contain font selections. At least the order and layout of both has to be +done with these commands. If a heading has no number argument \PName{number} +will be completely empty also without any format or font commands. + +The default definitions are very simple: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \newcommand{\chapterlinesformat}[3]{% + \@hangfrom{#2}{#3}% + } + \newcommand{\chapterlineswithprefixformat}[3]{% + #2#3% + } +\end{lstcode} + +\begin{Example} + You want to have chapter headings with yellow background. For the headings + without prefix line you use the follow definition in the document preamble: +\begin{lstcode} + \makeatletter + \renewcommand{\chapterlinesformat}[3]{% + \colorbox{yellow}{% + \parbox{\dimexpr\linewidth-2\fboxrule-2\fboxsep}{% + \@hangfrom{#2}#3% + }% + }% + } + \makeatother +\end{lstcode} + For chapter headings without prefix line you use: +\begin{lstcode} + \renewcommand{\chapterlineswithprefixformat}[3]{% + \colorbox{yellow}{% + \parbox{\dimexpr\linewidth-2\fboxrule-2\fboxsep}{% + #2#3% + }% + }% + } +\end{lstcode} + Unfortunately you will find, that these re-definitions result in justified + text for the headings. The reason is the \Macro{parbox} command. To change + this, you can use \Macro{raggedchapter} (see \autoref{sec:maincls.structure}, + \autopageref{desc:maincls.cmd.raggedchapter}) inside the argument of + \Macro{parbox}. Otherwise \Macro{raggedchapter} would be used only before + \Macro{chapterlineswithprefixformat} and \Macro{chapterlinesformat}: +\begin{lstcode} + \makeatletter + \renewcommand{\chapterlinesformat}[3]{% + \colorbox{yellow}{% + \parbox{\dimexpr\linewidth-2\fboxrule-2\fboxsep}{% + \raggedchapter + \@hangfrom{#2}#3% + }% + }% + } + \makeatother + \renewcommand{\chapterlineswithprefixformat}[3]{% + \colorbox{yellow}{% + \parbox{\dimexpr\linewidth-2\fboxrule-2\fboxsep}{% + \raggedchapter + #2#3% + }% + }% + } +\end{lstcode} + Remember to use \Macro{makeatletter} and \Macro{makeatother} only at the + document preamble. Do not use it inside your own wrapper-class or + package. It is only needed because of \Macro{@hangfrom} in the definition of + \Macro{chapterlinesformat}. +\end{Example} + +As the example shows, users, who change the definition of one of the commands, +should take care of several side effects. The alignment of the text is only +one thing. They also have to prevent page breaks in the headings, e.\,g., if +they add extra space into the output. The example above does not have page +break problems. Not only the boxes prevent page breaks. \KOMAScript{} itself +also changes \Macro{interlinepenalty} as part of \PName{text} to prevent page +breaks. It also finishes \PName{text} with an internal paragraph break using +\Macro{@par}. + +Command \Macro{raggedchapter} is not part of \PName{text} but executed before +\Macro{chapterlineswithprefixformat} or \Macro{chapterlinesformat}. This makes +it much easier to use, e.\,g., \Macro{MakeUppercase} at a +re-definition. Please note, typographers use individual letter spacing at +majuscule text, but \LaTeX{} command \Macro{MakeUppercase} does not. + +The first argument, \PName{level}, is not used by the default definition and +also not needed in the example above. It is of interest only, if a user would +define several commands with \PValue{chapter} style and need to distinguish +the different levels. The predefined commands \Macro{chapter}, +\Macro{chapter*}, \Macro{addchap}, and \Macro{addchap*} all share the same +\PName{level} \PName{chapter}.% +\EndIndex{Cmd}{chapterlinesformat}% +\EndIndex{Cmd}{chapterlineswithprefixformat}% + + +\begin{Declaration} + \Macro{sectionlinesformat}% + \Parameter{level}\Parameter{indent}\Parameter{number}\Parameter{text}\\ + \Macro{sectioncatchphraseformat}% + \Parameter{level}\Parameter{indent}\Parameter{number}\Parameter{text}\\ +\end{Declaration} +\BeginIndex{Cmd}{sectionlinesformat}% +\BeginIndex{Cmd}{sectioncatchphraseformat}% +These\ChangedAt{v3.19}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} commands are used by headings with style \PValue{section} +to output the heading number and heading text. If the heading is printed as +catch phrase at the very beginning of the following paragraph text +\Macro{sectioncatchphraseformat} is used, otherwise +\Macro{sectionlinesformat}. + +In both cases \PName{indent} is the value of the horizontal indention of the +heading relative to the text area. If the value is negative the heading should +even move into the left margin. + +The arguments \PName{number} and \PName{text} are already formatted, i.\,e., +they contain font selections. At least the order and layout of both has to be +done with these commands. If a heading has no number argument \PName{number} +will be completely empty also without any format or font commands. + +The default definitions are: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] +\newcommand{\sectionlinesformat}[4]{% + \@hangfrom{\hskip #2#3}{#4}% +} +\newcommand{\sectioncatchphraseformat}[4]{% + \hskip #2#3#4% +} +\end{lstcode} + +If the user re-defines one of these commands, he has to take care to prevent +page breaks inside the printing of the heading. \KOMAScript{} itself only +changes \Macro{interlinepenalty} to impede page breaks. + +\begin{Example} + Like chapter headings in the previous example, headings of \PName{level} + \PValue{section} should be printed with a background colour. The lower + levels should be affected: +\begin{lstcode} + \makeatletter + \renewcommand{\sectionlinesformat}[4]{% + \@tempswafalse + \ifstr{#1}{section}{% + \hspace*{#2}% + \colorbox{yellow}{% + \parbox{\dimexpr\linewidth-2\fboxrule-2\fboxsep-#2}{% + \raggedsection + \@hangfrom{#3}{#4}% + }% + }% + }{% + \@hangfrom{\hskip #2#3}{#4}% + }% + } + \makeatother +\end{lstcode} + With this code the indention part of indented headings would not be + coloured, but with negative indention the background of the margin part of + the headings will also become yellow. You can move the \Macro{hspace*} + command into the \Macro{colorbox} to change this. + + Again remember to use \Macro{makeatletter} and \Macro{makeatother} only at the + document preamble. Do not use it inside your own wrapper-class or + package. It is only needed because of \Macro{@hangfrom} in the definition of + \Macro{sectionlinesformat}. +\end{Example} + +The first argument, \PName{level}, is not used by the default definition. The +example shows how to use it to distinguish different heading levels of the +same style \PValue{section}.% +\EndIndex{Cmd}{sectioncatchphraseformat}% +\EndIndex{Cmd}{sectionlinesformat}% + + \begin{Declaration} \Macro{SecDef}\Parameter{star command}\Parameter{command}\\ \Macro{scr@startsection}\Parameter{name}\Parameter{level}% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle.tex index d0730d85b30..80d6724c660 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbookreportarticle.tex @@ -46,13 +46,13 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle.tex} - [$Date: 2015-06-15 13:41:43 +0200 (Mon, 15 Jun 2015) $ + [$Date: 2015-08-27 11:10:36 +0200 (Thu, 27 Aug 2015) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)] \translator{Jens-Uwe Morawski\and Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and Jana Schubert\and Jens H\"uhne} -% Date of translated german file: 2015-06-15 +% Date of translated german file: 2015-08-27 \chapter{The Main Classes: \Class{scrbook}, \Class{scrreprt}, and \Class{scrartcl}} @@ -323,8 +323,11 @@ one wants to ignore this general agreement, one may use \PName{selection} The\important{\OptionValue{toc}{index}} option \OptionValue{index}{totoc} causes an entry for the index to be included in the table of contents. The index is unnumbered since it too only includes references to the contents of -the other sectional units. \KOMAScript{} does not have support to ignore this -general agreement. +the other sectional units. Despite\ChangedAt{v3.18}{\Class{scrbook}\and + \Class{scrreprt}\and \Class{scrartcl}} +\important{\OptionValue{toc}{indexnumbered}}objection of the author, +\KOMAScript{} does also support to ignore this general agreement using +\OptionValue{toc}{indexnumbered}. \leavevmode\phantomsection\nobreak \label{desc:maincls.option.toc.bibliography}\nobreak @@ -412,6 +415,12 @@ The \autoref{tab:maincls.toc} shows an overview of possible values for The index will be represented by an entry at the table of contents, but will not be numbered.% \IndexOption{toc~=\PValue{index}}}% + \entry{\PValue{indexnumbered}}{% + \ChangedAt{v3.18}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + The index will be represented by an entry at the table of contents and + will be numbered.% + \IndexOption{toc~=\PValue{index}}}% \pventry{listof}{% The lists of floating environments, e.\,g., the list of figures and the list of tables, will be represented by entries at the table of contents, @@ -2199,7 +2208,12 @@ Do\textnote{Attention!} not forget to change \Macro{newcommand} into See \cite{latex:usrguide} for more information about the optional arguments of \Macro{makebox}. \end{Example} -% + +If you would like to change more than only the printing of the counter of a +heading, please have a look at \Macro{chapterlineswithprefixformat}, +\Macro{chapterlinesformat}, \Macro{sectionlinesformat}, and +\Macro{sectioncatchphraseformat} in \autoref{sec:maincls-experts.experts} from +\autopageref{desc:maincls-experts.cmd.chapterlineswithprefixformat}.% \EndIndex{Cmd}{autodot}% \EndIndex{Cmd}{IfUsePrefixLine}% \EndIndex{Cmd}{othersectionlevelsformat}% @@ -4096,9 +4110,13 @@ default or option The\important{\OptionValue{index}{totoc}} index does not need an entry at the table of contents, because it should always be the last element of a document. Nevertheless, such an entry may be achieved using option -\OptionValue{index}{totoc}\IndexOption{index~=\PValue{totoc}}. See also option -\Option{toc} with value \PValue{index} in \autoref{sec:maincls.toc} from -\autopageref{desc:maincls.option.toc.index} onward. +\OptionValue{index}{totoc}\IndexOption{index~=\PValue{totoc}}. +You\ChangedAt{v3.18}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} can even number the index using option +\OptionValue{index}{numbered}\IndexOption{index~=\PValue{numbered}}. See also +option \Option{toc} with value \PValue{index} or \PValue{indexnumbered} in +\autoref{sec:maincls.toc} from \autopageref{desc:maincls.option.toc.index} +onward. A summary of all available values for option \Option{index} may be found in \autoref{tab:maincls.index}. @@ -4107,13 +4125,19 @@ A summary of all available values for option \Option{index} may be found in \caption{Available values of option \Option{index}}% \label{tab:maincls.index} \begin{desctabular} + \entry{\PValue{default}, \PValue{nottotoc}, \PValue{plainheading}}{% + The index will not have an entry at the table of contents.% + \IndexOption{index~=\PValue{default}}}% + \entry{\PValue{numbered}, \PValue{totocnumbered}}{% + \ChangedAt{v3.18}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + The index will have an entry at the table of contents and also will have + a heading number.% + \IndexOption{index~=\PValue{numbered}}}% \entry{\PValue{totoc}, \PValue{toc}, \PValue{notnumbered}}{% The index will have an entry at the table of contents, but will not have a heading number.% \IndexOption{index~=\PValue{totoc}}}% - \entry{\PValue{default}, \PValue{nottotoc}, \PValue{plainheading}}{% - The index will not have an entry at the table of contents.% - \IndexOption{index~=\PValue{default}}}% \end{desctabular} \end{table} % diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrextend.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrextend.tex index 50c94727b61..90a7b16a54a 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrextend.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrextend.tex @@ -46,11 +46,11 @@ % ====================================================================== \KOMAProvidesFile{scrextend.tex} - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-08-24 11:28:16 +0200 (Mon, 24 Aug 2015) $ KOMA-Script package scrextend] \translator{Markus Kohm} -% Date of the translated German file: 2015-03-31 +% Date of the translated German file: 2015-08-24 \chapter{Making Basic Feature of the \KOMAScript{} Classes Available with Package \Package{scrextend} while Using Other Classes} @@ -70,6 +70,11 @@ many other classes. Package \Package{scrextend} would recognize, if it would be used with a \KOMAScript{} class, and would terminate with a warning message in that case. +There is no warranty for compatibility of \Package{scrextend} with every +class. The package has been designed primary to extend the standard classes +and derived classed. Anyway, before using \Package{scrextend} you should +make sure that the used class does not already provide the feature you need. + Beside the features from this chapter, there are additional common features, that are mainly provides for authors of classes and packages. These may be found in \autoref{cha:scrbase} from \autopageref{cha:scrbase}. The package diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrhack.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrhack.tex index c99d8f39aeb..7fb2c10f8f0 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrhack.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrhack.tex @@ -46,11 +46,11 @@ % ============================================================================ \KOMAProvidesFile{scrhack.tex} - [$Date: 2015-05-18 08:58:57 +0200 (Mon, 18 May 2015) $ + [$Date: 2015-07-08 10:27:58 +0200 (Wed, 08 Jul 2015) $ KOMA-Script guide (chapter: scrhack)] \translator{Markus Kohm} -% Date of the translated German file: 2015-04-16 +% Date of the translated German file: 2015-07-08 \chapter{Hacks for Third-Party Packages by Package \Package{scrhack}} \labelbase{scrhack} @@ -179,6 +179,37 @@ was not patient enough to wait more than a year for the change of \OptionValue{hyperref}{false}. Nevertheless, it is recommended to use the current \Package{hyperref} release. In this case \Package{scrhack} does automatically deactivate the not longer needed patch.% + + +\section{Inconsistent Handling of \Length{textwidth} and \Length{textheight}} +\seclabel{lscape} + +Package \Package{lscape}\IndexPackage[indexmain]{lscape} defines an +environment \Environment{landscape}\IndexEnv{landscape} to set the page +contents but not head and foot landscape. Inside this environment it changes +\Length{textheight}\IndexLength{textheight} to the value of +\Length{textwidth}, but it does not change \Length{textwidth} to the former +value of \Length{textheight}. This is inconsistent. As far as I know, +\Length{textwidth} is unchanged because setting it to \Length{textheight} +could blame other packages or user commands. But changing \Length{textheight} +could also blame other packages or user commands and indeed it breaks, e.\,g., +\Package{showframe}\IndexPackage{showframe} and +\Package{scrlayer}\IndexPackage{scrlayer}. So best would be, not to change +\Length{textheight}, too. \Package{scrhack} uses package \Package{xpatch} (see +\cite{package:xpatch}) to modify the environment start macro \Macro{landscape} +appropriately. + +If the modification for the package is not wanted or causes problems, +then it can be deactivated selectively with option +\OptionValue{lscape}{false}\IndexOption[indexmain]{lscape~=\PValue{false}}. +Please note\textnote{Attention!} that changing this option after loading +\Package{lscape} has an effect only, if it is not \PValue{false} while +loading \Package{lscape} respectively \Package{scrhack}, if +\Package{scrhack} is loaded after \Package{lscape}. + +Please note\textnote{Attention!}, +\Package{pdflscape}\IndexPackage[indexmain]{pdflscape} also uses +\Package{lscape} and therefore is influenced by \Package{scrhack}, too.% % \EndIndex{Package}{scrhack} diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex index e81a0a8a327..b1c0b73e789 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlayer.tex @@ -46,12 +46,12 @@ % ============================================================================ \KOMAProvidesFile{scrlayer.tex} - [$Date: 2015-05-19 11:08:32 +0200 (Tue, 19 May 2015) $ + [$Date: 2015-09-15 11:35:31 +0200 (Tue, 15 Sep 2015) $ KOMA-Script guide (chapter:scrlayer)] \translator{Markus Kohm} -% Date of the translated file: 2015-05-19 +% Date of the translated file: 2015-09-15 \chapter[{Defining Layers and Page Styles Using \Package{scrlayer}}]% {Defining Layers and Page Styles Using \Package{scrlayer}% @@ -190,55 +190,68 @@ contents, the foreground layer stack is above the normal page contents. So the normal contents is a kind of a separating layer between the background layer stack and the foreground layer stack. -A layer has several attributes. The first attribute states, whether or not the -layer is part of the foreground or the background. During page building -background layers will be printed first, followed by the main contents and the -foreground layers. Therefore, in the output the background layers show up -behind the main contents and the foreground layers in front of the main -contents. By default, a layer is both, a background layer \emph{and} a -foreground layer and therefore will be printed twice. - -The horizontal position of the layer is set by the second attribute, the -vertical position by the third. The forth and fifth attributes determine the -horizontal and vertical size of the layer. As you can see, a layer may be -smaller or larger than the paper. - -But having two numerical values of the second and third attribute does not -directly give us the position of the layer on the page. For each dimension we -need two reference points, one on the page and one on the layer. The -numerical value than states the distance between these reference. -Reference points in layouts are also known as alignment and are set by the -sixth attribute. - -The seventh attribute states, whether or not a layer should be -printed onto left or right pages. By default a layer will be printed on both, -left and right pages. Note, that \LaTeX{} names left pages as even pages and -right pages as odd pages and that there are no left or even pages in -single-sided mode. - -The eighth attribute states, whether or not a layer should be printed in -single-side mode or in two-side mode. By default a layer will be printed in -both, single-side mode and two-side mode. Nevertheless, an even page layer will -never be printed in single-side mode and therefore is not really a two-side -mode layer. - -The ninth attribute is, whether or not a layer should be printed onto float -pages or non-float pages. \LaTeX{} produces float pages for float environments -like tables or figures, if they are allowed to be printed on a page without -normal page contents (see option \PValue{p} for \Environment{figure} or -\Environment{table}). So from some point of view a float page is a page, that -may itself flow. Non-float pages are not pages without floats, but pages, that -are not float pages. They may contain floats inside the text, on the top of -the page, or on the bottom of the page. Very large floats may seem to be page -floats, while in reality they are top floats. - -The tenth and last attribute is the contents of the layer. This is simply, -what should be printed, whenever the layer will be printed. - -So we have ten attributes yet. Below in this manual we will describe -additional attributes. However, they are just defined for convenience and can -be expressed by a combination of the ten attributes stated above. We call -these ten attributes the primary attributes. +A layer has several attributes, which are the answers to some basic questions: +\begin{description} +\item[Is the layer part of the background or the + foreground?\textnote{background or foreground}]% + During page building background layers will be printed first, followed by + the main contents and the foreground layers. Therefore, in the output the + background layers show up behind the main contents and the foreground layers + in front of the main contents. By default, a layer is both, a background + layer \emph{and} a foreground layer and therefore will be printed + twice. Normally, it makes sense to restrict the layer in this aspect. +\item[What is the position of the layer?\textnote{horizontal and vertical + position}]% + There are some attributes to define the horizontal and the vertical position + of a layer. +\item[What is the size of the layer?\textnote{horizontal and vertical size}]% + As for the position there are several attributes to define the width and + height of a layer. So a layer can also be smaller or larger than the paper + and it can be placed everywhere on the paper. +\item[How is a layer aligned on the paper?\textnote{alignment}]% + This question is answered by the alignment attribute. The horizontal position + can be relative from the left edge of the paper either to the left edge of + the layer or to the centre of the layer or to the right edge of the + layer. Also the vertical position can be relative from the to edge of the + paper either to the top edge of the layer or to the centre of the layer or + to the bottom edge of the layer. +\item[Is the layer intended for text or picture output?\textnote{text or + picture}]% + This question is also related to the position. For picture output users + often expect the origin at the bottom left corner of the layer. But this + would not be suitable for text output. So the origin of a text layer is the + height of a standard text line below the top left corner of the + layer. Picture layers on the other hand span a + \Environment{picture}\IndexEnv{picture} environment and provide addition + positioning commands. +\item[Should the layer be printed on left or right pages?\textnote{left or + right page}]% + By default a layer will be printed on both, left and right pages. Note, that + \LaTeX{} names left pages as even pages and right pages as odd pages and + that there are no left or even pages in single-sided mode. +\item[Should the layer be printed in single-side mode or two-side + mode?\textnote{single-side or two-side}]% + By default a layer will be printed in both, single-side mode and two-side + mode. Nevertheless, an even page layer will never be printed in single-side + mode and therefore is not really a two-side mode layer. +\item[Should the layer be printed on float pages or non-float + pages?\textnote{float page or non-float page}]% + \LaTeX{} produces float pages for float environments like tables or figures, + if they are allowed to be printed on a page without normal page contents + (see option \PValue{p} for \Environment{figure} or \Environment{table}). So + from some point of view a float page is a page, that may itself + flow. Non-float pages are not pages without floats, but pages, that are not + float pages. They may contain floats inside the text, on the top of the + page, or on the bottom of the page. Very large floats may seem to be page + floats, while in reality they are top floats. +\item[What are the contents of the layer?\textnote{contents}]% + The corresponding attribute are the commands that produce the output. +\end{description} +So we have eight questions that immediately result in attributes yet. Below in +this manual we will describe additional attributes. However, they are just +defined for convenience and can be expressed by a combination of these primary +attributes. + \begin{Declaration} \Macro{DeclareLayer}\OParameter{option list}\Parameter{layer name}\\ @@ -258,15 +271,13 @@ are tolerated, but are not recommended. Command \Macro{DeclareLayer} does not care whether or not a layer with the given \PName{layer name} already exists. It will under all circumstances -define the layer with the attribute defined by the \PName{option list}. -An -\PName{option} can be either a key or a key followed by an -equal sign followed by a value. Several options may be concatenated to -a \PName{option list} and have to be separated by comma. If you'd like to have -a comma or a white space inside the value of an option, you should put the -value inside curly brackets. See \autoref{tab:scrlayer.layerkeys} for -more information on keys, values, and the corresponding -attributes. +define the layer with the attribute defined by the \PName{option list}. An +\PName{option} can be either a key or a key followed by an equal sign followed +by a value. Several options may be concatenated to a \PName{option list} and +have to be separated by comma. If you'd like to have a comma or a white space +inside the value of an option, you should put the value inside curly +brackets. See \autoref{tab:scrlayer.layerkeys} for more information on keys, +values, and the corresponding attributes. In contrast to \Macro{DeclareLayer} using \Macro{DeclareNewLayer} results in an error, if a layer with the same \PName{layer name} already exists. So you @@ -485,6 +496,23 @@ there has not been a layer with \PName{layer name} defined before. text area and vertically span the whole paper from the top edge to the bottom edge.% }% + \entry{\ChangedAt{v3.19}{\Package{scrlayer}}% + \KOption{mode}\PName{mode}}{% + The primary option defines the \PName{mode} for the layer output. Default + is \OptionValue{mode}{text}. The Baseline of the first text line will be + placed the height of one standard text line below the top edge of the + layer. Therefore the text output will be top aligned in the layer. In + \PValue{picture} \PName{mode} the layer spans a \Environment{picture} + environment with the origin in the bottom left corner of the layer. The + also available \PValue{raw} \PName{mode} current is the same like + \PValue{text} \PName{mode}. + + Changing\textnote{Attention!} the \PName{mode} of a layer generally can + move the contents. Additionally, i.\,e., \PValue{picture} \PName{mode} + provides additional commands that result in errors with another + \PName{mode}. Therefore, generally it makes no sense to change the + \PName{mode} of a layer after it's initial declaration!% + }% \entry{\Option{nonfloatpage}}{% Restricts the layer to pages, that are not float pages. The option does not expect any value. By the default the attribute is not set and @@ -576,27 +604,133 @@ there has not been a layer with \PName{layer name} defined before. \EndIndex{Cmd}{DeclareLayer}% \begin{Declaration} + \Macro{layerhalign}\\ + \Macro{layervalign}\\ \Macro{layerxoffset}\\ \Macro{layeryoffset}\\ \Macro{layerwidth}\\ \Macro{layerheight}% \end{Declaration} +\BeginIndex{Cmd}{layervalign}% +\BeginIndex{Cmd}{layerhalign}% \BeginIndex{Cmd}{layerxoffset}% \BeginIndex{Cmd}{layeryoffset}% \BeginIndex{Cmd}{layerwidth}% \BeginIndex{Cmd}{layerheight}% These commands are valid during output of the layer's contents only. So they can only be used inside the \PName{code} of option \Option{contents} of the -previously described commands. In this case they give the effective position -and dimension of the layer, that will be used for the output. However, the -effective dimension of the layer's contents may differ, i.\,e., if the -contents are oversized or do not fill the layer completely. Redefinition of -the commands to change the stored values is strictly forbidden and would -result in unpredictable issues.% +previously described commands. In this case they give the effective alignment, +position and dimension of the layer, that will be used for the +output. However, the effective dimension of the layer's contents may differ, +i.\,e., if the contents are oversized or do not fill the layer +completely. + +The primary layer attribute \PValue{align} is mapped to +\Macro{layerhalign}\ChangedAt{v3.19}{\Package{scrlayer}} and +\Macro{layervalign}. The horizontal values \PValue{l} and \PValue{r} are +copied to \Macro{layerhalign}. The vertical values \PValue{r} and \PValue{b} +are copied to \Macro{layervalign}. The also horizontal and vertical value +\PValue{c} is copied to both commands. If \PValue{align} has contradictory +values, only the last one is copied. Therefore the resulting +\Macro{layerhalign} is either \PValue{l}, \PValue{c}, or \PValue{r} and the +resulting \Macro{layervalign} is either \PValue{r}, \PValue{c}, or \PValue{b}. + +Redefinition of the commands to change the stored values is strictly forbidden +and would result in unpredictable issues.% \EndIndex{Cmd}{layerheight}% \EndIndex{Cmd}{layerwidth}% \EndIndex{Cmd}{layeryoffset}% \EndIndex{Cmd}{layerxoffset}% +\EndIndex{Cmd}{layerhalign}% +\EndIndex{Cmd}{layervalign}% + + +\begin{Declaration} + \Macro{LenToUnit}\Parameter{length} +\end{Declaration} +\BeginIndex{Cmd}{LenToUnit}% +This\ChangedAt{v3.19}{\Package{scrlayer}} command has been copied from +\Package{eso-pic}\IndexPackage{eso-pic} 2.0f. It converts lengths into +multiples of \Length{unitlength}. It can be used everywhere \LaTeX{} +expects \Environment{picture} coordinates or \Length{unitlength}-depending +values. For more information see \cite{package:eso-pic} and the following +descriptions of \Macro{putUR}, \Macro{putLL}, and \Macro{putLR}. If the +command is already defined, e.\,g., by loading \Package{eso-pic} before +\Package{scrlayer}, the package does not define it again.% +\EndIndex{Cmd}{LenToUnit}% + + +\begin{Declaration} + \Macro{putUL}\Parameter{content}\\ + \Macro{putUR}\Parameter{content}\\ + \Macro{putLL}\Parameter{content}\\ + \Macro{putLR}\Parameter{content}\\ + \Macro{putC}\Parameter{content} +\end{Declaration} +\BeginIndex{Cmd}{putUL}% +\BeginIndex{Cmd}{putUR}% +\BeginIndex{Cmd}{putLL}% +\BeginIndex{Cmd}{putLR}% +\BeginIndex{Cmd}{putC}% +You\ChangedAt{v3.19}{\Package{scrlayer}} can use these commands inside the +value of primary layer option \PValue{contents}, if the layer is declared with +\OptionValue{mode}{picture}. In that case, \Macro{putUL} places the +\PName{content} relative to the upper left corner of the layer and therefore +is the same like +\lstinline[breaklines=false]|\put(0,\LenToUnit{\layerheight})|. \Macro{putUR} +places the \PName{content} relative to the upper right corner of the layer and +therefore is the same like +\lstinline[breaklines=false]|\put(\LenToUnit{\layerwidth},\LenToUnit{\layerheight})|. +\Macro{putLL} places the \PName{content} relative to the lower left corner of +the layer and therefore is the same like +\lstinline[breaklines=false]|\put(0,0)|. \Macro{putLR} places the +\PName{content} relative to the lower right corner and therefore is the same +like \lstinline[breaklines=false]|\put(\LenToUnit{\layerwidth},0)|. Last but +not least \Macro{putC} places the \PName{content} relative to the centre of +the layer.% +\begin{Example} + You want to investigate, how accurate \OptionValue{DIV}{classic} sets the + height of the text area to the width of the page size. So you declare a + layer that not only border the text area, but also places a circle with + paper width as diameter dimension into the centre of the text area: +\begin{lstcode} +\documentclass[DIV=classic]{scrartcl} +\usepackage{pict2e} +\usepackage{scrlayer} +\DeclareNewLayer[% + textarea,background,mode=picture, + contents={% + \putLL{\line(1,0){\LenToUnit{\layerwidth}}}% + \putLR{\line(0,1){\LenToUnit{\layerheight}}}% + \putUR{\line(-1,0){\LenToUnit{\layerwidth}}}% + \putUL{\line(0,-1){\LenToUnit{\layerheight}}}% + \putC{\circle{\LenToUnit{\paperwidth}}}% + } +]{showtextarea} +\DeclareNewPageStyleByLayers{test}{showtextarea} +\pagestyle{test} +\begin{document} +\null +\end{document} +\end{lstcode} + You will see that \Package{typearea}'s mapping to an integer \PName{DIV} + value is very accurate in this example. +\end{Example} +For more information about the sketched Middle Age method of generating a text +area see \autoref{sec:typearea.circleConstruction}, +\autopageref{sec:typearea.circleConstruction}. + +For more information about command +\Macro{DeclareNewPageStyleByLayers}\IndexCmd{DeclareNewPageStyleByLayers} see +the description later in \autoref{sec:scrlayer.pagestyles}, +\autopageref{desc:scrlayer.cmd.DeclareNewPageStyleByLayers}. In short: It +defines a new page style using the newly declared layer.% +\EndIndex{Cmd}{putC}% +\EndIndex{Cmd}{putLR}% +\EndIndex{Cmd}{putLL}% +\EndIndex{Cmd}{putUR}% +\EndIndex{Cmd}{putUL}% + \begin{Declaration} \Macro{GetLayerContents}\Parameter{layer name} diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2-experts.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2-experts.tex index 639e64fa792..9b93f3776fc 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2-experts.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2-experts.tex @@ -46,7 +46,7 @@ % ============================================================================ \KOMAProvidesFile{scrlttr2-experts.tex} - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-07-15 18:39:57 +0200 (Wed, 15 Jul 2015) $ KOMA-Script guide (chapter: scrlttr2 for experts)] \translator{Harald Bongartz\and Georg Grandke\and Raimund Kohl\and Jens-Uwe @@ -1517,7 +1517,7 @@ forget about this option and skip the example.% \begin{lstcode} \ProvidesFile{a5.lco} [2002/05/02 letter class option] - \LetterOptionNeedsPapersize{paper=a5}{a5} + \LetterOptionNeedsPapersize{a5}{a5} \@setplength{tfoldmarkvpos}{\paperheight} \@setplength{bfoldmarkvpos}{\paperheight} \end{lstcode} diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2.tex index bda60ec0e3a..114f78a4884 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2.tex @@ -46,13 +46,13 @@ % ============================================================================ \KOMAProvidesFile{scrlttr2.tex}% - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-08-25 11:11:53 +0200 (Tue, 25 Aug 2015) $ KOMA-Script guide (chapter: scrlttr2)] \translator{Harald Bongartz\and Georg Grandke\and Raimund Kohl\and Jens-Uwe Morawski\and Stephan Hennig\and Gernot Hassenpflug\and Markus Kohm} -% Date of translated german file: 2015-03-31 +% Date of translated german file: 2015-08-25 \chapter{The New Letter Class \Class{scrlttr2}} \labelbase{scrlttr2} @@ -710,6 +710,57 @@ following example may illustrate. \EndIndex{Cmd}{AtBeginLetter}% +\begin{Declaration} + \Counter{letter}\\ + \Macro{thisletter}\\ + \Macro{letterlastpage} +\end{Declaration} +\BeginIndex{Counter}{letter}% +\BeginIndex{Cmd}{thisletter}% +\BeginIndex{Cmd}{letterlastpage}% +If\ChangedAt{v3.19}{\Class{scrlttr2}\and \Package{scrletter}} you have more +than one letter in one document, it is useful to have a letter number. Since +version~3.19 \KOMAScript{} provides counter \Counter{letter} and increases it +at every \Macro{begin}\PParameter{letter}. +\begin{Example} + Have one more look into the \Macro{AtBeginLetter} example. Instead of + resetting the counter explicitly at \Macro{begin}\PParameter{letter}, we can + do it implicitly by defining counter \Counter{Question} depending on counter + \Counter{letter}: +\begin{lstlisting} + \newcounter{Question}[letter] + \newcommand{\Question}[1]{% + \refstepcounter{Question}\par + \noindent\begin{tabularx}{\textwidth}{l@{}X} + \theQuestion:~ & #1\\ + \end{tabularx}% + }% +\end{lstlisting} + Now, the new counter will be reset at every start of a new letter and + the first question of every letter will be number one. +\end{Example} + +If you want the output of current value of \Counter{letter}, you may usually +use \Macro{theletter}. Indeed the letter can also be used for +cross-references. So you can use \Macro{label}\Parameter{name} to generate a +label immediately after \Macro{begin}\PParameter{letter} and reference it +somewhere in the document using \Macro{ref}\Parameter{name}. Inside the same +letter you can simply use \Macro{thisletter} without generating a label to get +the same result. + +\KOMAScript{} itself uses \Macro{thisletter} to put a label onto the last page +of every letter. You can use +\Macro{letterlastpage}\IndexCmd{label}\IndexCmd{pageref} to reference the last +page number of the current letter. Please note, the value of +\Macro{letterlastpage} is valid after some \LaTeX{} runs, because it uses +\Macro{label} and \Macro{pageref}. So you need at least two or three \LaTeX{} +runs, if you use \Macro{letterlastpage}. Please have a look at \emph{Rerun} +terminal or \File{log}-file messages about labels that have been changed.% +\EndIndex{Cmd}{letterlastpage}% +\EndIndex{Cmd}{thisletter}% +\EndIndex{Counter}{letter}% + + \begin{Declaration} \Macro{opening}\Parameter{opening} \end{Declaration} @@ -2501,6 +2552,46 @@ consecutive pages of letter after the note paper. At single-side letters this is the page style of the secondary letter sheet. At double-side letters this is also the page style of all backsides. + +\begin{Declaration} + \Macro{letterpagestyle} +\end{Declaration} +\BeginIndex{Cmd}{letterpagestyle}% +The\ChangedAt{v3.19}{\Class{scrlttr2}\and \Package{scrletter}} default page +style used for letters is specified by the contents of command +\Macro{letterpagestyle}. With \Class{scrlttr2} an empty value has been +predefined that does not change the +page style of the letter from the page style of the document. This has been +done, because \Class{scrlttr2} has been made for letter-only-documents. So it +is much easier to define the page style of all letters with the page style of +the document using \Macro{pagestyle} inside the preamble or before starting +the first letter. + +The \Pagestyle{plain} page style of letters differs from the \Pagestyle{plain} +page style of most classes. Therefore package \Package{scrletter} defines +\Macro{letterpagestyle} with the contents +\Pagestyle{plain.letter}\IndexPagestyle{plain.letter}. So all letters will use +the \Pagestyle{plain} style of page style pair +\Pagestyle{letter}\IndexPagestyle{letter} by default and independent from the +page style of the rest of the document. See +\autoref{sec:scrlttr2-expert.pagestyleatscrletter} for more information about +the characteristics of the page style of package \Package{scrletter}. +\begin{Example} + You are using package \Package{scrletter} and want to have the same page + style inside letters as for the rest of the document. So you are using +\begin{lstcode} + \renewcommand*{\letterpagestyle}{} +\end{lstcode} + in your document preamble. Take care about the star of + \Macro{renewcommand*}! +\end{Example} +Nevertheless, if you use \Macro{pagestyle} or \Macro{thispagestyle} inside a +letter, this will overwrite the setting of \Macro{letterpagestyle} that is +only the default for the initialisation inside +\Macro{begin}\PParameter{document}.% +\EndIndex{Cmd}{letterpagestyle}% + + \begin{Declaration} \KOption{headsepline}\PName{simple switch}\\ \KOption{footsepline}\PName{simple switch} diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex index eb7397b2352..8c49434a47a 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/tocbasic.tex @@ -50,7 +50,7 @@ %% %%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \ProvidesFile{tocbasic.tex}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (handling toc-files)% ] diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/typearea.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/typearea.tex index 566bd3108b8..615cb298a4c 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/typearea.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/typearea.tex @@ -46,11 +46,11 @@ % ====================================================================== \KOMAProvidesFile{typearea.tex}% - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-09-04 17:26:05 +0200 (Fri, 04 Sep 2015) $ KOMA-Script guide (chapter: typearea)] \translator{Markus Kohm\and Gernot Hassenpflug\and Krickette Murabayashi} -% Date of translated german file: 2015-03-31 +% Date of translated german file: 2015-09-04 \chapter{Construction of the Page Layout with \Package{typearea}} \labelbase{typearea} @@ -1296,6 +1296,11 @@ needed. On the other hand, the options \Option{headlines}\IndexOption{headlines} and \Option{headheight}\IndexOption{headheight} are ignored! +The default of \PName{BCOR} is 0\Unit{pt}. If you want to re-use the current +binding correction, e.\,g. the value set by option +\Option{BCOR}\IndexOption{BCOR}, you can use the symbolic value +\PValue{current} at the optional argument. + \begin{Example} Assume a text, printed on A4 paper, should have a width of exactly 60 characters of typewriter font and a height of exactly 30 lines. This could diff --git a/Master/texmf-dist/source/latex/koma-script/doc/guide.bib b/Master/texmf-dist/source/latex/koma-script/doc/guide.bib index 3ff95a93fe1..2f16b8025f0 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/guide.bib +++ b/Master/texmf-dist/source/latex/koma-script/doc/guide.bib @@ -576,9 +576,9 @@ Schlegl}, language = {english}, author = {Rolf Niepraschk}, title = {The {\Package{eso-pic}} package}, - month = oct, - year = 2013, - edition = {2.0d}, + month = jul, + year = 2015, + edition = {2.0g}, url = {CTAN://macros/latex/contrib/eso-pic/} } @@ -692,6 +692,16 @@ Schlegl}, url = {CTAN://macros/latex/contrib/mparhack/} } +@Misc{ package:xpatch, + language= {english}, + author = {Enrico Gregorio}, + title = {The {\Package{xpatch}} package, Extending {\Package{etoolbox}} patching commands}, + year = 2012, + month = oct, + edition = {0.3}, + url = {CTAN://macros/latex/contrib/xpatch/} +} + @Misc{ homepage, language = {ngerman}, key = {KDP}, diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-21.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-21.tex index 805b5a185a2..9ac4281a20f 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-21.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-21.tex @@ -46,7 +46,7 @@ % ============================================================================ \KOMAProvidesFile{common-21.tex} - [$Date: 2015-06-18 09:58:50 +0200 (Thu, 18 Jun 2015) $ + [$Date: 2015-08-29 12:11:08 +0200 (Sat, 29 Aug 2015) $ KOMA-Script guide (common paragraph: Setting up defined page styles)] @@ -308,7 +308,7 @@ nicht. Erst die explizite Verwendung einer der Optionen \Option{automark} oder dieser Befehle und Optionen mit dem auf \Package{scrlayer} basierenden Paket \Package{scrlayer-scrpage} in \autoref{sec:scrlayer-scrpage.pagestyle.content}, ab - \autopageref{desc:scrlayer-scrpage.cmd.manualmark}}.% + \autopageref{desc:scrlayer-scrpage.cmd.manualmark}.}% \EndIndex{Option}{autooneside~=\PName{Ein-Aus-Wert}}% \EndIndex{Option}{manualmark}% \EndIndex{Option}{automark}% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-8.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-8.tex index 705105282f4..bddad797497 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-8.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-8.tex @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{common-8.tex} - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-07-26 11:18:40 +0200 (Sun, 26 Jul 2015) $ KOMA-Script guide (common paragraphs)] \makeatletter @@ -163,11 +163,11 @@ entsprechend der typografischen Gepflogenheiten Vakatseiten mit dem Seitenstil \Macro{cleardoubleemptypage}\\ \Macro{cleardoubleplainpage}\\ \Macro{cleardoublestandardpage}\\ - \Macro{cleardoubleoddusingstyle}\Parameter{Seitenstil}\\ + \Macro{cleardoubleoddpageusingstyle}\Parameter{Seitenstil}\\ \Macro{cleardoubleoddemptypage}\\ \Macro{cleardoubleoddplainpage}\\ \Macro{cleardoubleoddstandardpage}\\ - \Macro{cleardoubleevenusingstyle}\Parameter{Seitenstil}\\ + \Macro{cleardoubleevenpageusingstyle}\Parameter{Seitenstil}\\ \Macro{cleardoubleevenemptypage}\\ \Macro{cleardoubleevenplainpage}\\ \Macro{cleardoubleevenstandardpage} @@ -178,11 +178,11 @@ entsprechend der typografischen Gepflogenheiten Vakatseiten mit dem Seitenstil \BeginIndex{Cmd}{cleardoublestandardpage}% \BeginIndex{Cmd}{cleardoubleplainpage}% \BeginIndex{Cmd}{cleardoubleemptypage}% -\BeginIndex{Cmd}{cleardoubleoddusingstyle}% +\BeginIndex{Cmd}{cleardoubleoddpageusingstyle}% \BeginIndex{Cmd}{cleardoubleoddstandardpage}% \BeginIndex{Cmd}{cleardoubleoddplainpage}% \BeginIndex{Cmd}{cleardoubleoddemptypage}% -\BeginIndex{Cmd}{cleardoubleevenusingstyle}% +\BeginIndex{Cmd}{cleardoubleevenpageusingstyle}% \BeginIndex{Cmd}{cleardoubleevenstandardpage}% \BeginIndex{Cmd}{cleardoubleevenplainpage}% \BeginIndex{Cmd}{cleardoubleevenemptypage}% @@ -211,7 +211,7 @@ linken Seite zus \IfCommon{scrlttr2}{Seitenkopf als auch Seitenfuß}% \ auf der leeren linken Seite zu unterdrücken. Die Seite ist damit vollständig leer. Will man für die Vakatseite einen eigenen \PName{Seitenstil} vorgeben, -so ist dieser als Argument von \Macro{cleardoubleoddusingstyle} +so ist dieser als Argument von \Macro{cleardoubleoddpageusingstyle} anzugeben. Dabei kann jeder bereits definierte Seitenstil (siehe auch \autoref{cha:scrlayer-scrpage}) verwendet werden. @@ -228,7 +228,7 @@ anzugeben. Dabei kann jeder bereits definierte Seitenstil (siehe auch \Macro{cleardoubleevenemptypage} und % \IfCommon{maincls}{% Umbruchoptimierungsalternative für die ein Argument erwartende Anweisung }% - \Macro{cleardoubleevenusingstyle}.} + \Macro{cleardoubleevenpageusingstyle}.} Die Arbeitsweise der Anweisungen \Macro{cleardoublestandardpage}, \Macro{cleardoubleemptypage}, \Macro{cleardoubleplainpage} und der ein @@ -297,11 +297,11 @@ Argument erwartenden Anweisung \Macro{cleardoublepageusingstyle} % \EndIndex{Cmd}{cleardoublestandardpage}% \EndIndex{Cmd}{cleardoubleplainpage}% \EndIndex{Cmd}{cleardoubleemptypage}% -\EndIndex{Cmd}{cleardoubleoddusingstyle}% +\EndIndex{Cmd}{cleardoubleoddpageusingstyle}% \EndIndex{Cmd}{cleardoubleoddstandardpage}% \EndIndex{Cmd}{cleardoubleoddplainpage}% \EndIndex{Cmd}{cleardoubleoddemptypage}% -\EndIndex{Cmd}{cleardoubleevenusingstyle}% +\EndIndex{Cmd}{cleardoubleevenpageusingstyle}% \EndIndex{Cmd}{cleardoubleevenstandardpage}% \EndIndex{Cmd}{cleardoubleevenplainpage}% \EndIndex{Cmd}{cleardoubleevenemptypage}% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-9.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-9.tex index 364441b3324..a8dccf7307d 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-9.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-9.tex @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{common-9.tex}% - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-08-24 11:28:16 +0200 (Mon, 24 Aug 2015) $ KOMA-Script guide (common paragraphs)] \makeatletter @@ -98,7 +98,11 @@ Selbstverst Klasse überlassen. Dies ändert sich, sobald die Anweisung \Macro{deffootnote} verwendet wird, die auf \autopageref{desc:\ifIgnoreThis maincls\else scrextend\fi.cmd.deffootnote} näher erläutert - wird.}% + wird. + + Die Einstellmöglichkeiten für die Trennlinie über den Fußnoten werden + hingegen von \Package{scrextend} nicht bereitgestellt.% +}% \ifIgnoreThis %+++++++++++++++++++++++++++++++++++++++++++++ nicht maincls + \else %------------------------------------------------------- nur maincls - diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbase.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbase.tex index ed61ae005ac..f2e84e7748a 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbase.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbase.tex @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{scrbase.tex} - [$Date: 2015-06-17 12:15:52 +0200 (Wed, 17 Jun 2015) $ + [$Date: 2015-07-26 08:24:01 +0200 (Sun, 26 Jul 2015) $ KOMA-Script package scrbase] \chapter{Grundlegende Funktionen im Paket \Package{scrbase}} @@ -1334,7 +1334,7 @@ Variante. \BeginIndex{Cmd}{if@atdocument}% Diese Verzweigung existiert ganz bewusst nur als interne Anweisung. Dabei entspricht \Macro{if@atdocument} in der Dokumentpräambel \Macro{iffalse}, nach -\Macro{begin}\PParameter{document} entspricht \Macro{if@document} hingegen +\Macro{begin}\PParameter{document} entspricht \Macro{if@atdocument} hingegen \Macro{iftrue}. Klassen und Paketautoren können dieses Anweisung manchmal sinnvoll nutzen, wenn sich Anweisungen in der Dokumentpräambel anders verhalten sollen als innerhalb des Dokuments. Es\textnote{Achtung!} ist zu diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle-experts.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle-experts.tex index 874e014c3d2..aa12bd08357 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle-experts.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle-experts.tex @@ -48,7 +48,7 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle-experts.tex}% - [$Date: 2015-06-17 13:12:54 +0200 (Wed, 17 Jun 2015) $ + [$Date: 2015-09-10 07:56:45 +0200 (Thu, 10 Sep 2015) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl for experts)] @@ -311,9 +311,11 @@ w \begin{Declaration} - \Macro{addtokomafontrelaxlist}\Parameter{Makro} + \Macro{addtokomafontrelaxlist}\Parameter{Makro}\\ + \Macro{addtokomafontgobblelist}\Parameter{Makro} \end{Declaration} \BeginIndex{Cmd}{addtokomafontrelaxlist}% +\BeginIndex{Cmd}{addtokomafontgobblelist}% Wie bereits in \autoref{part:forAuthors} der Anleitung erklärt, dürfen in den Schrifteinstellungen der Elemente nur Befehle zur Wahl der Größe, Familie, Codierung, Strichstärke, Form und Farbe enthalten sein. Dabei erfolgt schon @@ -348,9 +350,9 @@ Fall. Daher\ChangedAt{v3.17}{\Class{scrbook}\and \Class{scrreprt}\and \Class{scrartcl}} verwaltet \KOMAScript{} eine interne Liste von Makros, die innerhalb von \Macro{usefontofkomafont} und ihren Geschwistern zu \Macro{relax} werden sollen. In der Voreinstellung sind das unter anderem: -\Macro{color}, \Macro{normalcolor}, \Macro{MakeUppercase} und +\Macro{normalcolor}, \Macro{MakeUppercase} und \Macro{MakeLowercase}. Weitere Anweisungen können mit -\Macro{addtokomafontrelaxlist} einzeln hinzugefügt werden. +\Macro{addtokomafontrelaxlist} einzeln hinzugefügt werden. Es ist zu beachten, dass das angegebene \PName{Makro} wirklich stur auf \Macro{relax} gesetzt wird. Irgendwelche Argumente innerhalb der @@ -360,7 +362,16 @@ werden. F \Macro{addtokomafontrelaxlist} entstehen, ist der Anwender selbst verantwortlich. Außerdem sollte diese Möglichkeit nicht als Legitimation dafür missverstanden werden, den Schrifteinstellungen alle möglichen Anweisungen -hinzuzufügen!% +hinzuzufügen! + +Soll\ChangedAt{v3.19}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} hingegen ein \PName{Makro} innerhalb +\Macro{usefontofkomafont} und ihren Geschwistern einschließen eines einzelnen +Arguments des Makros ignoriert werden, so ist stattdessen +\Macro{addtokomafontgobblelist} zu verwenden. Ein Beispiel dafür ist die +Anweisung \Macro{color}, die einschließlich des Namens der Farbe ignoriert +werden muss und deshalb bereits in der Voreinstellung Teil dieser Liste ist.% +\EndIndex{Cmd}{addtokomafontgobblelist}% \EndIndex{Cmd}{addtokomafontrelaxlist}% @@ -455,7 +466,8 @@ auch Eigenschaften, die vom jeweiligen Stil abh folgenden Stile zur Verfügung: \begin{labeling}{\PValue{chapter}:} \item[\PValue{chapter}:] \ChangedAt{v3.18}{\Class{scrbook}\and - \Class{scrreprt}}Stil einer + \Class{scrreprt}}Stil\textnote{Gliederungsstil + \PValue{chapter}}\Index{Gliederung>Stil>~\PValue{chapter}} einer Kapitelüberschrift. Dieser Stil wird in der Voreinstellung für \Macro{chapter}\IndexCmd{chapter} und indirekt für \Macro{addchap}\IndexCmd{addchap} verwendet. Neue Überschriften in diesem @@ -470,20 +482,23 @@ folgenden Stile zur Verf dieser Stil von \Class{scrartcl}\OnlyAt{\Class{scrbook}\and \Class{scrreprt}} nicht bereitgestellt wird. \item[\PValue{part}:] \ChangedAt{v3.18}{\Class{scrbook}\and - \Class{scrreprt}\and \Class{scrartcl}}Stil einer Teileüberschrift. Dieser - Stil wird in der Voreinstellung für \Macro{part}\IndexCmd{part} und indirekt - für \Macro{addpart}\IndexCmd{addpart} verwendet. Neue Überschriften in - diesem Stil können definiert werden, haben dann aber nicht automatisch auch - eine \Macro{add\dots}-Variante. Für die Konfiguration des vorhandenen oder - neuer Überschriften stehen zusätzlich die Eigenschaften aus + \Class{scrreprt}\and \Class{scrartcl}}Stil\textnote{Gliederungsstil + \PValue{part}}\Index{Gliederung>Stil>~\PValue{part}} einer + Teileüberschrift. Dieser Stil wird in der Voreinstellung für + \Macro{part}\IndexCmd{part} und indirekt für + \Macro{addpart}\IndexCmd{addpart} verwendet. Neue Überschriften in diesem + Stil können definiert werden, haben dann aber nicht automatisch auch eine + \Macro{add\dots}-Variante. Für die Konfiguration des vorhandenen oder neuer + Überschriften stehen zusätzlich die Eigenschaften aus \autoref{tab:maincls-experts.declarepartstyle.keys}, \autopageref{tab:maincls-experts.declarepartstyle.keys} zur Verfügung. Die\textnote{Achtung!} Anweisung \Macro{addpart} wird ebenso wie die Sternformen automatisch zusammen mit \Macro{part} umkonfiguriert und kann nicht unabhängig davon verändert werden. -\item[\PValue{section}:] Stil einer Abschnittsüberschrift. Dieser Stil wird - derzeit für \Macro{section}\IndexCmd{section}, - \Macro{subsection}\IndexCmd{subsection}, +\item[\PValue{section}:] Stil\textnote{Gliederungsstil + \PValue{section}}\Index{Gliederung>Stil>~\PValue{section}} einer + Abschnittsüberschrift. Dieser Stil wird derzeit für + \Macro{section}\IndexCmd{section}, \Macro{subsection}\IndexCmd{subsection}, \Macro{subsubsection}\IndexCmd{subsubsection}, \Macro{paragraph}\IndexCmd{paragraph} und \Macro{subparagraph}\IndexCmd{subparagraph} verwendet. Neue Überschriften in @@ -530,6 +545,14 @@ folgenden Stile zur Verf gefolgt von einem Punkt in der Ausgabe des zur Gliederungsebene gehörenden Zählers vorangestellt.\\ + \ChangedAt{v3.19}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartl}}% + \PValue{counterwithout} & \PName{Zählername} & + Hebt eine früher vorgenommene + \PValue{counterwithin}-Einstellung + auf und ist daher nur bei Änderung + vorhandener Gliederungsbefehle + sinnvoll.\\ \PValue{expandtopt} & \PName{Schalter} & Ist dieser Schalter aktiv, so werden alle in den \PName{Einstellungen} @@ -583,7 +606,7 @@ folgenden Stile zur Verf \caption[{Eigenschaften des Stils \PValue{section} bei der Deklaration von Gliederungsbefehlen}]{Zusätzliche \PName{Schlüssel} und \PName{Werte} für die \PName{Eigenschaften} bei der Deklaration von Gliederungsbefehlen des - Stils \PValue{section}}% + Stils \PValue{section}\Index{Gliederung>Stil>~\PValue{section}}}% \label{tab:maincls-experts.declaresectionstyle.keys}% \begin{tabularx}{\linewidth}{llX} \toprule @@ -628,7 +651,7 @@ folgenden Stile zur Verf \caption[{Eigenschaften des Stils \PValue{chapter} bei der Konfiguration von Gliederungsbefehlen}]{Zusätzliche \PName{Schlüssel} und \PName{Werte} für die \PName{Eigenschaften} bei der Konfiguration von Gliederungsbefehlen des - Stils \PValue{chapter}}% + Stils \PValue{chapter}\Index{Gliederung>Stil>~\PValue{chapter}}}% \label{tab:maincls-experts.declarechapterstyle.keys}% \begin{tabularx}{\linewidth}{llX} \toprule @@ -689,7 +712,7 @@ folgenden Stile zur Verf \caption[{Eigenschaften des Stils \PValue{part} bei der Konfiguration von Gliederungsbefehlen}]{Zusätzliche \PName{Schlüssel} und \PName{Werte} für die \PName{Eigenschaften} bei der Konfiguration von Gliederungsbefehlen des - Stils \PValue{part}}% + Stils \PValue{part}\Index{Gliederung>Stil>~\PValue{part}}}% \label{tab:maincls-experts.declarepartstyle.keys}% \begin{tabularx}{\linewidth}{llX} \toprule @@ -1060,7 +1083,7 @@ Einstellungen sind in \autoref{tab:maincls.chapter.skips} zu finden. Eine \BeginIndex{Cmd}{DeclareNewSectionCommands}% \BeginIndex{Cmd}{RedeclareSectionCommands}% \BeginIndex{Cmd}{ProvideSectionCommands}% -Mit\ChangedAt[2014/11]{v3.15}{\Class{scrbook}\and \Class{scrreprt}\and +Mit\ChangedAt{v3.15}{\Class{scrbook}\and \Class{scrreprt}\and \Class{scrartcl}} diesen Anweisungen können gleich eine ganze Reihe von Gliederungsbefehlen definiert oder geändert werden. Dabei ist \PName{Namensliste} eine durch Komma separierte Liste von Namen der @@ -1197,7 +1220,7 @@ Auch hier wird \Length{@tempskipa}\IndexLength{@tempskipa} vor der Verwendung der Befehle innerhalb von \Macro{part} entsprechend der Einstellungen von \Macro{DeclareSectionCommand}\IndexCmd{DeclareSectionCommand} gesetzt. -Da\ChangedAt[2015/03]{v3.17}{\Class{scrbook}\and \Class{scrreprt}\and +Da\ChangedAt{v3.17}{\Class{scrbook}\and \Class{scrreprt}\and \Class{scrartcl}} die Abstände über, innerhalb und unter den Überschriften wesentlich einfacher mit \Macro{RedeclareSectionCommand} eingestellt werden können, wird nicht empfohlen zu diesem Zweck stattdessen die hier @@ -1215,6 +1238,220 @@ gesetzt werden.% \EndIndex{Cmd}{chapterheadendvskip}% \EndIndex{Cmd}{chapterheadstartvskip}% + +\begin{Declaration} + \Macro{chapterlineswithprefixformat}% + \Parameter{Ebene}\Parameter{Nummer}\Parameter{Text}\\ + \Macro{chapterlinesformat}% + \Parameter{Ebene}\Parameter{Nummer}\Parameter{Text} +\end{Declaration} +\BeginIndex{Cmd}{chapterlineswithprefixformat}% +\BeginIndex{Cmd}{chapterlinesformat}% +Diese\ChangedAt{v3.19}{\Class{scrbook}\and \Class{scrreprt}} beiden +Anweisungen werden von Überschriften des Stils +\PValue{chapter}\textnote{Gliederungsstil + \PValue{chapter}}\Index{Gliederung>Stil>~\PValue{chapter}} in Abhängigkeit +von Option \Option{chapterprefix}\IndexOption{chapterprefix}% +\textnote{\Option{chapterprefix}} (siehe \autoref{sec:maincls.structure}, +\autopageref{desc:maincls.option.chapterprefix}) verwendet. Dabei gibt +\Macro{chapterlineswithprefixformat} die Ausgabe bei aktivierter Option vor, +während \Macro{chapterlinesformat} die Ausgabe bei deaktivierter Option +bestimmt. + +Die beiden Argumente \PName{Nummer} und \PName{Text} sind dabei +einschließlich Einstellung der Fonts für sich bereits fertig +formatiert. Letztlich regeln die Anweisungen also die Anordnung der beiden +Teile der Überschrift. Bei nicht nummerierten Überschriften ist \PName{Nummer} +ein komplett leeres Argument, enthält also auch keine +Formatierungsanweisungen. + +Vordefiniert sind die beiden Anweisungen mit: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \newcommand{\chapterlinesformat}[3]{% + \@hangfrom{#2}{#3}% + } + \newcommand{\chapterlineswithprefixformat}[3]{% + #2#3% + } +\end{lstcode} +bisher eher spartanisch. + +\begin{Example} + Sie wollen Überschriften im Kapitelstil gelb hinterlegen. Für + Überschriften ohne Präfixzeile definieren Sie daher in der Präambel des + Dokument: +\begin{lstcode} + \makeatletter + \renewcommand{\chapterlinesformat}[3]{% + \colorbox{yellow}{% + \parbox{\dimexpr\linewidth-2\fboxrule-2\fboxsep}{% + \@hangfrom{#2}#3% + }% + }% + } + \makeatother +\end{lstcode} + und für Überschriften mit Präfixzeile: +\begin{lstcode} + \renewcommand{\chapterlineswithprefixformat}[3]{% + \colorbox{yellow}{% + \parbox{\dimexpr\linewidth-2\fboxrule-2\fboxsep}{% + #2#3% + }% + }% + } +\end{lstcode} + Allerdings fällt Ihnen nach einiger Zeit auf, dass mit dieser Umdefinierung + die Überschriften wieder im Blocksatz gesetzt werden. Das liegt daran, dass + \Macro{parbox} sein Argument so setzt. Um dies zu korrigieren, fügen Sie die + Anweisung \Macro{raggedchapter} (siehe \autoref{sec:maincls.structure}, + \autopageref{desc:maincls.cmd.raggedchapter}), die automatisch bereits vor + \Macro{chapterlinesformat} und \Macro{chapterlineswithprefixformat} + aufgerufen wird, in die Definitionen ein: +\begin{lstcode} + \makeatletter + \renewcommand{\chapterlinesformat}[3]{% + \colorbox{yellow}{% + \parbox{\dimexpr\linewidth-2\fboxrule-2\fboxsep}{% + \raggedchapter + \@hangfrom{#2}#3% + }% + }% + } + \makeatother + \renewcommand{\chapterlineswithprefixformat}[3]{% + \colorbox{yellow}{% + \parbox{\dimexpr\linewidth-2\fboxrule-2\fboxsep}{% + \raggedchapter + #2#3% + }% + }% + } +\end{lstcode} + Es sei daran erinnert, dass \Macro{makeatletter} und \Macro{makeatother} nur + in der Dokumentpräambel zu verwenden sind. In einer eigenen Wrapper-Klasse + oder einem Paket haben sie zu entfallen. Sie werden auch nur wegen + \Macro{@hangfrom} in der Definition von \Macro{chapterlinesformat} benötigt. +\end{Example} + +Wie im Beispiel gezeigt, ist der Anwender bei der Umdefinierung der +Anweisungen für einige Dinge selbst verantwortlich. Dazu gehört neben dem +Erhalt der voreingestellten Ausrichtung auch, dass innerhalb der Überschrift +kein Seitenumbruch beispielsweise an zusätzlich eingefügten Absätzen oder +Abständen erfolgen kann. Das gezeigte Beispiel ist diesbezüglich +unproblematisch. Nicht nur, dass die beiden Boxen ohnehin keinen Seitenumbruch +erlauben. \KOMAScript{} verändert außerdem \Macro{interlinepenalty} als Teil +von \PName{Text} so, dass darin kein Seitenumbruch stattfinden +darf. Gleichzeitig endet \PName{Text} immer mit einem internen Absatz, +\Macro{@par}. + +Die Anweisung \Macro{raggedchapter} ist übrigens nicht Bestandteil von +\PName{Text}, weil anderenfalls beispielsweise die Verwendung von +\Macro{MakeUppercase} innerhalb der Umdefinierung von +\Macro{chapterlinesformat} oder \Macro{chapterlineswithprefixformat} erheblich +erschwert wäre. Dennoch sei darauf hingewiesen, dass typografischen Regeln +zufolge Versalsatz mit gängigen Fonts immer der Sperrung und des Ausgleichs +bedarf. Die \LaTeX-Anweisung \Macro{MakeUppercase} leistet dies jedoch nicht. + +Das erste Argument, \PName{Ebene}, wird von den Anweisungen in der +Voreinstellung nicht verwendet und ist auch im Beispiel nicht +erforderlich. Erst, wenn der Anwender mehrere Anweisungen im Stil +\PValue{chapter} definiert und man innerhalb der Definition nach den +Anweisungen unterscheiden will, kann dies über \PName{Ebene} erfolgen. Dabei +ist \PName{Ebene} der vom Namen der Anweisung abgeleitete Name der +Gliederungsebene. Bei \Macro{chapter}, \Macro{chapter*}, \Macro{addchap} und +\Macro{addchap*} ist \PName{Ebene} daher einheitlich \PValue{chapter}.% +\EndIndex{Cmd}{chapterlinesformat}% +\EndIndex{Cmd}{chapterlineswithprefixformat}% + + +\begin{Declaration} + \Macro{sectionlinesformat}% + \Parameter{Ebene}\Parameter{Einzug}\Parameter{Nummer}\Parameter{Text}\\ + \Macro{sectioncatchphraseformat}% + \Parameter{Ebene}\Parameter{Einzug}\Parameter{Nummer}\Parameter{Text} +\end{Declaration} +\BeginIndex{Cmd}{sectionlinesformat}% +\BeginIndex{Cmd}{sectioncatchphraseformat}% +Diese\ChangedAt{v3.19}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} beiden Anweisungen werden von Überschriften des Stils +\PValue{section}\textnote{Gliederungsstil + \PValue{section}}\Index{Gliederung>Stil>~\PValue{section}} in Abhängigkeit +davon verwendet, ob die jeweilige Überschrift eine Spitzmarke erzeugt oder +eine frei stehende Überschrift. Frei stehende Überschriften werden dabei per +\Macro{sectionlinesformat} ausgegeben, während +\Macro{sectioncatchphraseformat} für Spitzmarken zuständig ist. + +In beiden Fällen gibt \PName{Einzug} den Wert eines horizontalen Einzugs +der Überschrift gegenüber dem Textbereich an. Durch Angabe eines negativen +Wertes soll es auch möglich sein, die Überschrift in den linken Rand zu +rücken. + +Die beiden Argumente \PName{Nummer} und \PName{Text} sind einschließlich +Einstellung der Fonts für sich bereits fertig formatiert. Letztlich regeln die +Anweisungen also die Anordnung der beiden Teile der Überschrift. Bei nicht +nummerierten Überschriften ist \PName{Nummer} ein komplett leeres Argument, +enthält also auch keine Formatierungsanweisungen. + +Vordefiniert sind die beiden Anweisungen als: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] +\newcommand{\sectionlinesformat}[4]{% + \@hangfrom{\hskip #2#3}{#4}% +} +\newcommand{\sectioncatchphraseformat}[4]{% + \hskip #2#3#4% +} +\end{lstcode} + +Bei Umdefinierung einer der beiden Anweisungen ist wiederum der Anwender +selbst dafür verantwortlich Seitenumbrüche innerhalb der Ausgabe zu +verhindern. \KOMAScript{} selbst setzt lediglich \Macro{interlinepenalty} +entsprechend. + +\begin{Example} + Wie schon im Beispiel der Kapitelüberschriften sollen nun die frei stehenden + Überschriften der Ebenen \PValue{section} mit einer Farbe hinterlegt + werden. Die frei stehenden Überschriften tieferer Ebenen sollen nicht + verändert werden: +\begin{lstcode} + \makeatletter + \renewcommand{\sectionlinesformat}[4]{% + \@tempswafalse + \ifstr{#1}{section}{% + \hspace*{#2}% + \colorbox{yellow}{% + \parbox{\dimexpr\linewidth-2\fboxrule-2\fboxsep-#2}{% + \raggedsection + \@hangfrom{#3}{#4}% + }% + }% + }{% + \@hangfrom{\hskip #2#3}{#4}% + }% + } + \makeatother +\end{lstcode} + Mit dem gezeigten Code wird im Falle eines Einzugs der Überschrift der + Bereich des Einzugs nicht mit gefärbt. Wird hingegen die Überschrift in den + linken Rand gestellt, so wird dieser Bereich des Randes ebenfalls farbig + hinterlegt. Durch Verschiebung der \Macro{hspace*}-Anweisung in die + \Macro{colorbox} kann dieses Verhalten verändert werden. + + Erneut sei daran erinnert, dass \Macro{makeatletter} und \Macro{makeatother} + nur in der Dokumentpräambel zu verwenden sind. In einer eigenen + Wrapper-Klasse oder einem Paket haben sie zu entfallen. Sie werden auch nur + wegen \Macro{@hangfrom} in der Definition von \Macro{sectionlinesformat} + benötigt. +\end{Example} + +Das erste Argument, \PName{Ebene}, wird von den Anweisungen in der +Voreinstellung nicht verwendet. Wie das Beispiel zeigt, kann es aber sehr gut +dazu verwendet werden, nach unterschiedlichen Gliederungsebenen im gemeinsamen +Stil \PValue{section} zu unterscheiden.% +\EndIndex{Cmd}{sectioncatchphraseformat}% +\EndIndex{Cmd}{sectionlinesformat}% + + \begin{Declaration} \Macro{SecDef}\Parameter{Sternanweisung}\Parameter{Normalanweisung}\\ \Macro{scr@startsection}\Parameter{Name}\Parameter{Ebene}% @@ -1491,3 +1728,5 @@ Option \Option{bibliography}. % LocalWords: Absolutwert Gliederungsbefehls Präfixzeile Schrifteinstellung % LocalWords: Zählername Spitzmarke Kolumnentitels Schrifteinstellungen % LocalWords: Strichstärke expandierbar expandierbaren expandierbares +% LocalWords: spartanisch Kapitelstil Spitzmarken Formatierungsanweisungen +% LocalWords: Kapitelüberschriften Gliederungsebenen diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle.tex index 9c53ce1bae8..72c37d38ef7 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrbookreportarticle.tex @@ -46,7 +46,7 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle.tex} - [$Date: 2015-06-15 13:41:43 +0200 (Mon, 15 Jun 2015) $ + [$Date: 2015-08-27 11:10:36 +0200 (Thu, 27 Aug 2015) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)] \chapter{Die Hauptklassen \Class{scrbook}, \Class{scrreprt}, \Class{scrartcl}} @@ -326,8 +326,12 @@ Das\important{\OptionValue{toc}{index}} Stichwortverzeichnis erh \OptionValue{toc}{index}\IndexOption{toc~=\PValue{index}} einen Eintrag im Inhaltsverzeichnis. Da das Stichwortverzeichnis ebenfalls nur Verweise auf den Inhalt anderer Abschnitte enthält, wird auch dieser Eintrag grundsätzlich -nicht nummeriert. Eine Abweichung von diesem Grundsatz wird von \KOMAScript{} -nicht unterstützt. +nicht nummeriert. Eine\ChangedAt{v3.18}{\Class{scrbook}\and + \Class{scrreprt}\and \Class{scrartcl}} +Abweichung\important{\OptionValue{toc}{indexnumbered}} von diesem Grundsatz +wird von \KOMAScript{} trotz Bedenken des Autors mit +\OptionValue{toc}{index}\IndexOption{toc~=\PValue{indexnumbered}} ebenfalls +unterstützt. \leavevmode\phantomsection\nobreak \label{desc:maincls.option.toc.bibliography}\nobreak @@ -435,6 +439,12 @@ Einen Das Stichwortverzeichnis erhält einen Eintrag im Inhaltsverzeichnis, ohne dass es nummeriert wird.% \IndexOption{toc~=\PValue{index}}}% + \entry{\PValue{indexnumbered}}{% + \ChangedAt{v3.18}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Das Stichwortverzeichnis erhält einen Eintrag im Inhaltsverzeichnis und + wird nummeriert.% + \IndexOption{toc~=\PValue{index}}}% \entry{\PValue{leftaligntextentries}, \PValue{leftalignunnumbered}, \PValue{nonumberline}}{% \ChangedAt{v3.12}{\Class{scrbook}\and \Class{scrreprt}\and @@ -2447,7 +2457,14 @@ Umdefinierung \Macro{newcommand} durch \Macro{renewcommand} zu ersetzen ist. Näheres zu den optionalen Argumenten von \Macro{makebox} ist \cite{latex:usrguide} zu entnehmen. \end{Example} -% + +Für Formatierungsänderungen bei den Überschriften, die über die Ausgabe der +Nummer hinaus gehen, sie ausdrücklich auf +\Macro{chapterlineswithprefixformat}, \Macro{chapterlinesformat}, +\Macro{sectionlinesformat} und \Macro{sectioncatchphraseformat} in +\autoref{sec:maincls-experts.experts}, ab +\autopageref{desc:maincls-experts.cmd.chapterlineswithprefixformat} +verwiesen.% \EndIndex{Cmd}{autodot}% \EndIndex{Cmd}{IfUsePrefixLine}% \EndIndex{Cmd}{othersectionlevelsformat}% @@ -4451,8 +4468,8 @@ nicht jedoch bei Verwendung von \BeginIndex{Option}{index~=\PName{Einstellung}}% \ChangedAt{v3.00}{\Class{scrbook}\and \Class{scrreprt}\and \Class{scrartcl}}% In der Voreinstellung -\OptionValue{index}{default}\IndexOption{index~=\PValue{default}} -ist das Stichwortverzeichnis ein nicht nummeriertes Kapitel ohne Eintrag im +\OptionValue{index}{default}\IndexOption{index~=\PValue{default}} ist das +Stichwortverzeichnis ein nicht nummeriertes Kapitel ohne Eintrag im Inhaltsverzeichnis. Da\important{\OptionValue{index}{totoc}} das Stichwortverzeichnis normalerweise in einem Buch oder ähnlichen Dokument zuletzt steht, benötigt es eigentlich auch keinen @@ -4460,8 +4477,12 @@ Inhaltsverzeichniseintrag. Wird dieser dennoch gew wie in \iffree{dieser Anleitung}{diesem Buch} mit einem mehrgliedrigen Stichwortverzeichnis gearbeitet wird, so kann dies mit der Einstellung \OptionValue{index}{totoc}\IndexOption{index~=\PValue{totoc}} erreicht -werden. Siehe hierzu auch Option \Option{toc} mit dem Wert \PValue{index} in -\autoref{sec:maincls.toc} ab \autopageref{desc:maincls.option.toc.index}. +werden. Soll\ChangedAt{v3.18}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} der Index entgegen aller Gepflogenheiten sogar nummeriert +werden, so verwendet man Option \OptionValue{index}{numbered}. Siehe hierzu +auch Option \Option{toc} mit dem Wert \PValue{index} oder +\PValue{indexnumbered} in \autoref{sec:maincls.toc} ab +\autopageref{desc:maincls.option.toc.index}. Eine Zusammenfassung der möglichen Werte für die \PName{Einstellung} von \Option{index} ist in \autoref{tab:maincls.index} zu finden. @@ -4471,13 +4492,19 @@ Eine Zusammenfassung der m Option \Option{index} zur Einstellung des Stich\-wort\-verzeichnisses} \label{tab:maincls.index} \begin{desctabular} + \entry{\PValue{default}, \PValue{nottotoc}, \PValue{plainheading}}{% + Das Stichwortverzeichnis erhält keinen Eintrag im Inhaltsverzeichnis.% + \IndexOption{index~=\PValue{default}}}% + \entry{\PValue{numbered}, \PValue{totocnumbered}}{% + \ChangedAt{v3.18}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + Das Stichwortverzeichnis erhält einen Eintrag im Inhaltsverzeichnis und + wird nummeriert.% + \IndexOption{index~=\PValue{numbered}}}% \entry{\PValue{totoc}, \PValue{toc}, \PValue{notnumbered}}{% Das Stichwortverzeichnis erhält einen Eintrag im Inhaltsverzeichnis, ohne dass er nummeriert wird.% \IndexOption{index~=\PValue{totoc}}}% - \entry{\PValue{default}, \PValue{nottotoc}, \PValue{plainheading}}{% - Das Stichwortverzeichnis erhält keinen Eintrag im Inhaltsverzeichnis.% - \IndexOption{index~=\PValue{default}}}% \end{desctabular} \end{table} % diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrextend.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrextend.tex index c599586d77c..efce4891f99 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrextend.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrextend.tex @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{scrextend.tex} - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-08-24 11:28:16 +0200 (Mon, 24 Aug 2015) $ KOMA-Script package scrextend] \chapter[tocentry={Grundlegende Fähigkeiten der @@ -71,6 +71,12 @@ sind, werden von \KOMAScript{} ab Version~3.00 auch von dem Paket werden. Der Versuch, das Paket mit einer \KOMAScript-Klasse zu laden, wird von \Package{scrextend} erkannt und mit einer Warnung abgelehnt. +Es gibt natürlich keine Garantie, dass \Package{scrextend} mit jeder +beliebigen Klasse zusammenarbeitet. Es ist primär für die Erweiterung der +Standardklassen und davon abgeleiteten Klassen gedacht. In jedem Fall sollten +Benutzer zunächst prüfen, ob die verwendete Klasse nicht selbst entsprechende +Möglichkeiten bereitstellt. + Neben den in diesem Kapitel beschriebenen Möglichkeiten gibt es einige weitere Möglichkeiten, die jedoch hauptsächlich für Klassen- und Paketautoren gedacht sind. Diese sind in \autoref{cha:scrbase}, ab \autopageref{cha:scrbase} zu diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrhack.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrhack.tex index 8f49318f0f6..60f8683ae5b 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrhack.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrhack.tex @@ -46,7 +46,7 @@ % ============================================================================ \KOMAProvidesFile{scrhack.tex} - [$Date: 2015-04-16 18:05:17 +0200 (Thu, 16 Apr 2015) $ + [$Date: 2015-07-08 10:27:58 +0200 (Wed, 08 Jul 2015) $ KOMA-Script guide (chapter: scrhack)] \chapter{Fremdpakete verbessern mit \Package{scrhack}} @@ -105,7 +105,7 @@ Andere Paketautoren haben die beiden Anweisungen ebenfalls zeigte sich, dass die Implementierung in einigen Paketen, darunter auch \Package{float}, dazu führt, dass all diese Pakete nur in einer bestimmten Reihenfolge geladen werden können, obwohl sie ansonsten in keinerlei Beziehung -zu einander stehen. +zueinander stehen. Um all diese Nachteile und Probleme zu beseitigen, unterstützt \KOMAScript{} diese alte Schnittstelle offiziell nicht mehr. Stattdessen wird bei Verwendung @@ -183,7 +183,39 @@ Vorschlag des \KOMAScript-Autors beseitigt. Da die entsprechende entsprechender Patch aufgenommen. Zwar kann dieser ebenfalls durch \OptionValue{hyperref}{false} deaktiviert werden, empfohlen wird jedoch stattdessen die aktuelle Version von \Package{hyperref} zu verwenden. In -diesem Fall wird die Änderung durch \Package{scrhack} automatisch verhindert.% +diesem Fall wird die Änderung durch \Package{scrhack} automatisch verhindert. + +\section{Inkonsistente Behandlung von \Length{textwidth} und \Length{textheight}} +\seclabel{lscape} + +Das Paket \Package{lscape}\IndexPackage[indexmain]{lscape} definiert eine +Umgebung \Environment{landscape}\IndexEnv{landscape}, um den Inhalt einer +Seite aber nicht deren Kopf und Fuß quer zu setzen. Innerhalb dieser Umgebung +wird \Length{textheight}\IndexLength{textheight} auf den Wert von +\Length{textwidth} gesetzt. Umgekehrt wird jedoch \Length{textwidth} nicht auf +den vorherigen Wert von \Length{textheight} gesetzt. Das ist +inkonsistent. Meines Wissens wird \Length{textwidth} nicht entsprechend +geändert, weil andere Pakete oder Anwenderanweisungen gestört werden +könnten. Jedoch hat auch die Änderung von \Length{textwidth} dieses Potential +und in der Tat beschädigt sie die Funktion beispielsweise der Pakete +\Package{showframe}\IndexPackage{showframe} und +\Package{scrlayer}\IndexPackage{scrlayer}. Daher wäre es am besten, wenn +\Length{textheight} ebenfalls unverändert bliebe. \Package{scrhack} verwendet +Paket \Package{xpatch} (siehe \cite{package:xpatch}) um die Startanweisung +\Macro{landscape} der gleichnamigen Umgebung entsprechend zu ändern. + +Falls diese Änderung nicht gewünscht wird oder Probleme verursacht, kann sie +mit Option +\OptionValue{lscape}{false}\IndexOption[indexmain]{lscape~=\PValue{false}} +deaktiviert werden. Es ist zu beachten\textnote{Achtung!}, dass eine +nachträgliche Zuweisung an Option \Option{lscape} mit +\Macro{KOMAoption}\IndexCmd{KOMAoption} oder +\Macro{KOMAoptions}\IndexCmd{KOMAoptions} nur eine Wirkung hat, wenn sie +während des Ladens von \Package{lscape} nicht \PValue{false} war. + +Im übrigens\textnote{Achtung!} wird \Package{lscape} auch von dem Paket +\Package{pdflscape}\IndexPackage[indexmain]{pdflscape} verwendet, so dass +\Package{scrhack} sich auch auf die Funktion dieses Pakets auswirkt.% % \EndIndex{Package}{scrhack} diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlayer.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlayer.tex index 2a69372fb06..a21fc09a37b 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlayer.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlayer.tex @@ -46,7 +46,7 @@ % ============================================================================ \KOMAProvidesFile{scrlayer.tex}% - [$Date: 2015-05-19 11:08:32 +0200 (Tue, 19 May 2015) $ + [$Date: 2015-09-15 12:55:19 +0200 (Tue, 15 Sep 2015) $ KOMA-Script guide (chapter:scrlayer)] \chapter[{Definition von Ebenen und Seitenstilen mit \Package{scrlayer}}] @@ -222,68 +222,82 @@ w ausgegeben wird. Der normale Seiteninhalt ist daher eine Art von Trennebene zwischen den beiden Ebenenstapeln. -Eine Ebene hat mehrere Eigenschaften. Die erste Eigenschaft\textnote{Vorder- - oder Hintergrund} ist Antwort auf -die Frage, ob die Ebene zum Hintergrund oder zum Vordergrund -gehört. Hintergrundebenen werden ausgegeben, bevor der normale Inhalt der -Seite gedruckt wird. Optisch erscheinen sie daher \emph{hinter} oder -\emph{unter} dem normalen Inhalt der Seite. Vordergrundebenen werden an den -normalen Inhalt anschließend ausgegeben. Optisch erscheinen sie daher -\emph{vor}, \emph{auf} oder \emph{über} dem normalen Inhalt der Seite. In der -Voreinstellung ist eine Ebene sowohl eine Hintergrundebene als auch eine -Vordergrundebene und wird daher zweimal ausgegeben. - -Die zweite und dritte Eigenschaft\textnote{horizontale - Position}\textnote{vertikale Position} sind die horizontale und vertikale -Position der Ebene. Die vierte und fünfte Eigenschaft sind die horizontale und -vertikale\textnote{horizontale Größe}\textnote{vertikale Größe} Größe der -Ebene. Daraus ergibt sich, dass eine Ebene auch kleiner oder größer als das -Papier sein kann. - -Aber wie werden die horizontale und die vertikale Position -gemessen?\textnote{Ausrichtung} Aus der Antwort ergibt sich die sechste -Eigenschaft, die Ausrichtung. Man kann von der linken Papierkante zur linken -Kante der Ebene, zur Mitte der Ebene oder zur rechten Kante der Ebene -messen. Entsprechend kann man von der oberen Kante des Papiers zur oberen -Kante der Ebene, zur Mitte der Ebene oder zur unteren Kante der Ebene messen. - -Die siebte Eigenschaft\textnote{linke oder rechte Seite} ist, ob eine Ebene -auf linken oder rechten Seiten eines Dokuments gedruckt werden soll. In der -Voreinstellung wird eine Ebene auf allen Seiten gedruckt. Es ist zu beachten, -dass \LaTeX{} Seiten mit geraden Seitenzahlen als linke Seiten und Seiten mit -ungeraden Seitenzahlen als rechte Seiten behandelt, dass es jedoch im -einseitigen Modus unabhängig von der Nummer nur rechte Seiten gibt. \LaTeX{} -bezeichnet den Gepflogenheiten in der englischen Sprache entsprechend linke -Seiten auch als gerade Seiten und rechte Seiten als ungerade Seiten. - -Die achte Eigenschaft\textnote{ein- oder doppelseitig} ist, ob eine Ebene auf -den einseitigen oder den doppelseitigen Modus beschränkt sein soll. In der -Voreinstellung ist die Ebene diesbezüglich unbeschränkt, wird also sowohl im -einseitigen als auch im doppelseitigen Modus ausgegeben. Nichtsdestotrotz wird -eine Ebene, die auf gerade Seiten beschränkt ist, im einseitigen Modus niemals -ausgegeben werden und ist daher auch keine einseitige Ebene. - -Die neunte Eigenschaft ist, ob eine Ebene auf Gleitseiten\textnote{Gleit- oder - Normalseiten} oder auf Normalseiten beschränkt ist. \LaTeX{} erzeugt -Gleitseiten für Objekte aus Umgebungen wie \Environment{table} oder -\Environment{figure}, wenn diesen erlaubt wurde, auf eigenen Seiten ohne Teile -des normalen Dokumentinhalts ausgegeben zu werden (siehe Option \PValue{p} für -\Environment{table} oder \Environment{figure}). In gewisser Weise ist es so -der gesamten Seite erlaubt, im Dokument zu gleiten. Normalseiten in diesem -Sinne sind alle Seiten, die keine Gleitseiten sind. Normalseiten können -ebenfalls Gleitumgebungen am Anfang, im Inneren oder am Ende enthalten. Sehr -große Gleitumgebungen können auch den Eindruck einer Gleitseite erzeugen, -obwohl es sich bei ihnen in Wirklichkeit um oben auf einer Normalseite -platzierte Gleitumgebungen handelt. - -Die zehnte und letzte Eigenschaft\textnote{Inhalt} ist der Inhalt der -Ebene. Das ist schlicht das, was gedruckt werden soll, wann immer die Ebene -ausgegeben wird. - -Damit haben wir also zehn Eigenschaften. Später in dieser Anleitung werden wir -weitere Eigenschaften sehen, die jedoch auf diese zehn Eigenschaften -abgebildet werden können. Daher nennen wir diese zehn Eigenschaften die -primären Eigenschaften. +Eine Ebene hat mehrere Eigenschaften, die als Antworten auf grundlegende +Fragen verstanden werden können: +\begin{description} +\item[Gehört die Ebene zum Vordergrund oder zum Hintergrund?\textnote{Vorder- + oder Hintergrund}]% + Hintergrundebenen werden ausgegeben, bevor der normale Inhalt der Seite + gedruckt wird. Optisch erscheinen sie daher \emph{hinter} oder \emph{unter} + dem normalen Inhalt der Seite. Vordergrundebenen werden an den normalen + Inhalt anschließend ausgegeben. Optisch erscheinen sie daher \emph{vor}, + \emph{auf} oder \emph{über} dem normalen Inhalt der Seite. In der + Voreinstellung ist eine Ebene sowohl eine Hintergrundebene als auch eine + Vordergrundebene und wird daher zweimal ausgegeben. Normalerweise ist es + daher sinnvoll, dies explizit einzuschränken. +\item[An welcher Position soll die Ebene ausgegeben + werden?\textnote{horizontale und vertikale Position}]% + Zur Beantwortung dieser Frage dienen Eigenschaften zur Festlegung der + horizontalen und der vertikalen Position. +\item[Wie groß ist die Ebene?\textnote{horizontale und vertikale Größe}]% + Ebenso wie für die Position gibt es auch für die horizontale und vertikale + Ausdehnung der Ebene Eigenschaften. Damit kann eine Ebene auch kleiner oder + größer als das Papier sein und an unterschiedlichen Positionen auf dem + Papier liegen. +\item[Wie werden die horizontale und die vertikale Position + gemessen?\textnote{Ausrichtung}]% + Die Antwort auf diese Frage ist die Eigenschaft der Ausrichtung. Man kann + von der linken Papierkante zur linken Kante der Ebene, zur Mitte der Ebene + oder zur rechten Kante der Ebene messen. Entsprechend kann man von der + oberen Kante des Papiers zur oberen Kante der Ebene, zur Mitte der Ebene + oder zur unteren Kante der Ebene messen. +\item[Ist die Ebene für Textausgabe oder für Grafik vorgesehen?\textnote{Text + oder Grafik}]% + Auch diese Frage ist eng mit der Position verknüpft. Während der Anwender + bei der Grafikausgabe beispielsweise davon ausgeht, dass der Ursprung in der + linken unteren Ecke der Ebene liegt, wäre dies bei der Textausgabe eher + ungünstig. Daher liegt der Ursprung für Textebenen um die Höhe einer + Standardtextzeile unterhalb der oberen, linken Ecke der Ebene. Grafikebenen + wiederum spannen von sich aus bereits eine + \Environment{picture}-Umgebung\IndexEnv{picture} auf, in der zusätzliche + Befehle zur Positionierung zur Verfügung stehen. +\item[Soll die Ebene auf linken oder rechten Seiten eines Dokuments gedruckt + werden?\textnote{linke oder rechte Seite}]% + In der Voreinstellung wird eine Ebene auf allen Seiten gedruckt. Es ist zu + beachten, dass \LaTeX{} Seiten mit geraden Seitenzahlen als linke Seiten und + Seiten mit ungeraden Seitenzahlen als rechte Seiten behandelt, dass es + jedoch im einseitigen Modus unabhängig von der Nummer nur rechte Seiten + gibt. \LaTeX{} bezeichnet den Gepflogenheiten in der englischen Sprache + entsprechend linke Seiten auch als gerade Seiten und rechte Seiten als + ungerade Seiten. +\item[Soll die Ebene in einseitigen oder in doppelseitigen Dokumenten + verwendet werden?\textnote{einseitig oder doppelseitig}]% + In der Voreinstellung ist die Ebene diesbezüglich unbeschränkt, wird also + sowohl im einseitigen als auch im doppelseitigen Modus + ausgegeben. Nichtsdestotrotz wird eine Ebene, die auf gerade Seiten + beschränkt ist, im einseitigen Modus niemals ausgegeben werden und ist daher + auch keine einseitige Ebene. +\item[Soll die Ebene auf Gleitseiten oder auf Normalseiten ausgegeben + werden?\textnote{Gleitseiten oder Normalseiten}]% + \LaTeX{} erzeugt Gleitseiten für Objekte aus Umgebungen wie + \Environment{table} oder \Environment{figure}, wenn diesen erlaubt wurde, + auf eigenen Seiten ohne Teile des normalen Dokumentinhalts ausgegeben zu + werden (siehe Option \PValue{p} für \Environment{table} oder + \Environment{figure}). In gewisser Weise ist es so der gesamten Seite + erlaubt, im Dokument zu gleiten. Normalseiten in diesem Sinne sind alle + Seiten, die keine Gleitseiten sind. Normalseiten können ebenfalls + Gleitumgebungen am Anfang, im Inneren oder am Ende enthalten. Sehr große + Gleitumgebungen können auch den Eindruck einer Gleitseite erzeugen, obwohl + es sich bei ihnen in Wirklichkeit um oben auf einer Normalseite platzierte + Gleitumgebungen handelt. +\item[Welchen Inhalt hat die Ebene?\textnote{Inhalt}]% + Die zugehörige Eigenschaft gibt schlicht an, was gedruckt werden soll, wann + immer die Ebene ausgegeben wird. +\end{description} +Damit haben wir derzeit acht Fragen an die Ebenen, aus denen sich unmittelbar +eine Reihe von Eigenschaften ergeben. Später in dieser Anleitung werden wir +weitere Eigenschaften kennen lernen, die jedoch auf diese primären +Eigenschaften abgebildet werden können. \begin{Declaration} \Macro{DeclareLayer}\OParameter{Optionenliste}\Parameter{Name der Ebene}\\ @@ -551,6 +565,24 @@ Ebene stellt bei beiden Anweisungen einen Fehler dar. Papieroberkante bis zur Papierunterkante überdeckt. Diese Option erwartet und erlaubt keinen Wert.% }% + \entry{\ChangedAt{v3.19}{\Package{scrlayer}}% + \KOption{mode}\PName{Modus}}{% + Diese primäre Eigenschaft bestimmt in welchem \PName{Modus} der Inhalt der + Ebene ausgegeben wird. Die Voreinstellung ist \PValue{text}. Dabei wird + die oberste Grundlinie um die Höhe einer Standardtextzeile unterhalb der + Oberkante der Ebene platziert. Damit ist Text normalerweise sauber am + oberen Rand der Ebene ausgerichtet. Im \PValue{picture}-\PName{Modus} wird + hingegen eine \Environment{picture}-Umgebung mit dem Ursprung in der + linken, unteren Ecke der Ebene aufgespannt. Der ebenfalls vordefinierte + \PName{Modus} \PValue{raw} entspricht in der Voreinstellung \PValue{text}. + + Die\textnote{Achtung!} Änderung des \PName{Modus} einer Ebene führt in der + Regel zu einer Verschiebung des Inhalts. Außerdem stehen beispielsweise im + \PName{Modus} \PValue{picture} zusätzliche Platzierungsbefehle zur + Verfügung, die in einem anderen \PName{Modus} zu Fehlermeldungen führen. + Daher ist es normalerweise nicht sinnvoll, den \PName{Modus} einer Ebene + nachträglich zu ändern!% + }% \entry{\Option{nonfloatpage}}{% Mit dieser Option wird die Ebene auf Seiten beschränkt, die keine Gleitseiten sind. Sie wird also im Gegensatz zur Grundeinstellung nicht @@ -660,28 +692,137 @@ Ebene stellt bei beiden Anweisungen einen Fehler dar. \EndIndex{Cmd}{DeclareLayer}% \begin{Declaration} + \Macro{layerhalign}\\ + \Macro{layervalign}\\ \Macro{layerxoffset}\\ \Macro{layeryoffset}\\ \Macro{layerwidth}\\ \Macro{layerheight}% \end{Declaration} +\BeginIndex{Cmd}{layervalign}% +\BeginIndex{Cmd}{layerhalign}% \BeginIndex{Cmd}{layerxoffset}% \BeginIndex{Cmd}{layeryoffset}% \BeginIndex{Cmd}{layerwidth}% \BeginIndex{Cmd}{layerheight}% Diese Anweisungen sind nur innerhalb der Ausgabe des mit \Option{contents}, \Option{addcontents} oder \Option{pretocontents} angegebenen \PName{Code} -gültig. In diesem Fall enthalten sie die tatsächlich verwendete Position und -Ausdehnung der Ebene, die für die Ausgabe verwendet werden. Dies ist jedoch -nicht zwangsläufig auch die tatsächliche Ausdehnung des Inhalts, falls dieser -beispielsweise überbreit oder überhoch ist oder die Ebene nicht komplett -ausfüllt. Eine Umdefinierung der Anweisungen und damit Änderung der in ihnen -gespeicherten Werte ist nicht gestattet und führt zu unvorhersehbaren +gültig. In diesem Fall enthalten sie die tatsächlich verwendete Ausrichtung, +Position und Ausdehnung der Ebene, die für die Ausgabe verwendet werden. Dies +ist jedoch nicht zwangsläufig auch die tatsächliche Ausdehnung des Inhalts, +falls dieser beispielsweise überbreit oder überhoch ist oder die Ebene nicht +komplett ausfüllt. + +Die primäre Ebeneneigenschaft \PValue{align} wird auf +\Macro{layerhalign}\ChangedAt{v3.19}{\Package{scrlayer}} und +\Macro{layervalign} abgebildet. Dabei werden die horizontalen Werte \PValue{l} +und \PValue{r} nur in \Macro{layerhalign} übernommen, während die vertikalen +Werte \PValue{t} und \PValue{b} nur in \Macro{layervalign} übernommen +werden. Der sowohl horizontale als auch vertikale Wert \PValue{c} wird in +beide Anweisungen übernommen. Sind bei \PValue{align} mehrere, +widersprüchliche Angaben zu finden, so gewinnt die jeweils letzte. Damit ist +also \Macro{layerhalign} immer entweder \PValue{l}, \PValue{c} oder \PValue{r} +und \Macro{layervalign} immer entweder \PValue{r}, \PValue{c} oder \PValue{b}. + +Eine\textnote{Achtung!} Umdefinierung der Anweisungen und damit Änderung der in +ihnen gespeicherten Werte ist nicht gestattet und führt zu unvorhersehbaren Ergebnissen.% \EndIndex{Cmd}{layerheight}% \EndIndex{Cmd}{layerwidth}% \EndIndex{Cmd}{layeryoffset}% \EndIndex{Cmd}{layerxoffset}% +\EndIndex{Cmd}{layerhalign}% +\EndIndex{Cmd}{layervalign}% + +\begin{Declaration} + \Macro{LenToUnit}\Parameter{Länge} +\end{Declaration} +\BeginIndex{Cmd}{LenToUnit}% +Diese\ChangedAt{v3.19}{\Package{scrlayer}} Anweisung stammt ursprünglich von +\Package{eso-pic}\IndexPackage{eso-pic} ab Version~2.0f. Sie rechnet +Längen-Werte in Vielfache von \Length{unitlength} um und kann daher an Stelle +von Koordinaten oder anderen von \Length{unitlength} abhängigen Werten einer +\Environment{picture}-Umgebung verwendet werden. Siehe dazu auch +\cite{package:eso-pic} und die nachfolgende Erklärung zu \Macro{putUR}, +\Macro{putLL} und \Macro{putLR}. Die Anweisung wird nur +definiert, wenn sie nicht bereits beispielsweise durch das Laden von +\Package{eso-pic} definiert ist.% +\EndIndex{Cmd}{LenToUnit}% + +\begin{Declaration} + \Macro{putUL}\Parameter{Inhalt}\\ + \Macro{putUR}\Parameter{Inhalt}\\ + \Macro{putLL}\Parameter{Inhalt}\\ + \Macro{putLR}\Parameter{Inhalt}\\ + \Macro{putC}\Parameter{Inhalt} +\end{Declaration} +\BeginIndex{Cmd}{putUL}% +\BeginIndex{Cmd}{putUR}% +\BeginIndex{Cmd}{putLL}% +\BeginIndex{Cmd}{putLR}% +\BeginIndex{Cmd}{putC}% +Diese\ChangedAt{v3.19}{\Package{scrlayer}} Anweisungen können innerhalb der +primären Ebeneneigenschaft \PValue{contents} verwendet werden, wenn die Ebene +mit \OptionValue{mode}{picture} erstellt wurde. In diesem Fall platziert +\Macro{putUL} den \PName{Inhalt} relativ zur oberen, linken Ecke der Ebene und +entspricht damit +\lstinline[breaklines=false]|\put(0,\LenToUnit{\layerheight})|. \Macro{putUR} +platziert \PName{Inhalt} relativ zur oberen, rechten Ecke der Ebene und +entspricht damit +\lstinline[breaklines=false]|\put(\LenToUnit{\layerwidth},\LenToUnit{\layerheight})|. +\Macro{putLL} platziert \PName{Inhalt} relativ zur unteren, linken Ecke der +Ebene und entspricht damit +\lstinline[breaklines=false]|\put(0,0)|. \Macro{putLR} platziert +\PName{Inhalt} relativ zur unteren, rechten Ecke der Ebene und entspricht +damit +\lstinline[breaklines=false]|\put(\LenToUnit{\layerwidth},0)|. \Macro{putC} +schließlich platziert \PName{Inhalt} relativ zur Mitte der Ebene.% +% +\begin{Example} + Sie wollen feststellen, wie genau die Höhe des Textbereichs bei + \OptionValue{DIV}{classic} tatsächlich der Breite der Seite entspricht und + erstellen dazu eine Ebene, die sowohl den Textbereich umrandet als auch + einen Kreis mit der Papierbreite als Durchmesser im Zentrum des Textbereichs + platziert: +\begin{lstcode} +\documentclass[DIV=classic]{scrartcl} +\usepackage{pict2e} +\usepackage{scrlayer} +\DeclareNewLayer[% + textarea,background,mode=picture, + contents={% + \putLL{\line(1,0){\LenToUnit{\layerwidth}}}% + \putLR{\line(0,1){\LenToUnit{\layerheight}}}% + \putUR{\line(-1,0){\LenToUnit{\layerwidth}}}% + \putUL{\line(0,-1){\LenToUnit{\layerheight}}}% + \putC{\circle{\LenToUnit{\paperwidth}}}% + } +]{showtextarea} +\DeclareNewPageStyleByLayers{test}{showtextarea} +\pagestyle{test} +\begin{document} +\null +\end{document} +\end{lstcode} + Wie Sie sehen werden, passt die von \Package{typearea} vorgenommene + Abbildung auf einen ganzzahligen \PName{DIV}-Wert im Beispiel sehr gut. +\end{Example} +Näheres zu dem im Beispiel skizzierten spätmittelalterlichen Buchseitenkanon +finden Sie übrigens in \autoref{sec:typearea.circleConstruction}, +\autopageref{sec:typearea.circleConstruction}. + +Die im Beispiel bereits verwendete Anweisung +\Macro{DeclareNewPageStyleByLayers}\IndexCmd{DeclareNewPageStyleByLayers} wird +leider erst in \autoref{sec:scrlayer.pagestyles}, +\autopageref{desc:scrlayer.cmd.DeclareNewPageStyleByLayers} erklärt +werden. Sie dient hier zur Definition eines Seitenstils, der die neu +definierte Ebene auch tatsächlich verwendet.% +\EndIndex{Cmd}{putC}% +\EndIndex{Cmd}{putLR}% +\EndIndex{Cmd}{putLL}% +\EndIndex{Cmd}{putUR}% +\EndIndex{Cmd}{putUL}% + \begin{Declaration} \Macro{GetLayerContents}\Parameter{Name der Ebene} @@ -1638,5 +1779,8 @@ optionale Argument sei auf die Erkl -% LocalWords: Vordergrundebene Sternvariante Gleitseiten -% LocalWords: Ausgabebeschränkungen +% LocalWords: Vordergrundebene Sternvariante Gleitseiten Hintergrundebenen +% LocalWords: Ausgabebeschränkungen Grafikausgabe Textausgabe Textebenen +% LocalWords: Standardgrundlinie Grafikebenen Standardtextzeile +% LocalWords: Platzierungsbefehle Ebeneneigenschaft Satzspiegelkonstruktion +% LocalWords: Kreisschlagen Buchseitenkanon spätmittelalterlichen diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2-experts.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2-experts.tex index 88762d6211c..776419c76e0 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2-experts.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2-experts.tex @@ -48,7 +48,7 @@ % ============================================================================ \KOMAProvidesFile{scrlttr2-experts.tex}% - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-07-15 18:39:57 +0200 (Wed, 15 Jul 2015) $ KOMA-Script guide (chapter: scrlttr2 for experts)] \chapter{Zusätzliche Informationen zur @@ -1542,7 +1542,7 @@ enthalten. Innerhalb von \Macro{opening}\IndexCmd{opening} wird jedoch nur auf die jeweils letzte angegebene \PName{Papiergröße} geprüft. Wie das nachfolgende Beispiel zeigt, ist es daher für den versierten Anwender leicht möglich, \File{lco}-Dateien mit Parametersätzen für andere Papierformate zu -schreiben. +schreiben. \iffalse% Umbruchoptimierung!!! Wer allerdings nicht vor hat, selbst solche \File{lco}-Dateien zu schreiben, der kann die Erklärung zu dieser Anweisung gleich wieder vergessen @@ -1561,7 +1561,7 @@ und auch das Beispiel \begin{lstcode} \ProvidesFile{a5.lco} [2002/05/02 letter class option] - \LetterOptionNeedsPapersize{paper=a5}{a5} + \LetterOptionNeedsPapersize{a5}{a5} \@setplength{tfoldmarkvpos}{\paperheight} \@setplength{bfoldmarkvpos}{\paperheight} \endinput diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex index f956add46a4..5baf9bdeb70 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrlttr2.tex @@ -46,7 +46,7 @@ % ============================================================================ \KOMAProvidesFile{scrlttr2.tex}% - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-08-25 11:11:53 +0200 (Tue, 25 Aug 2015) $ KOMA-Script guide (chapter: scrlttr2)] \chapter{Die Briefklasse \Class{scrlttr2}} @@ -693,6 +693,62 @@ folgende Beispiel zeigt dies. \EndIndex{Cmd}{AtBeginLetter}% +\begin{Declaration} + \Counter{letter}\\ + \Macro{thisletter}\\ + \Macro{letterlastpage} +\end{Declaration} +\BeginIndex{Counter}{letter}% +\BeginIndex{Cmd}{thisletter}% +\BeginIndex{Cmd}{letterlastpage}% +Für\ChangedAt{v3.19}{\Class{scrlttr2}\and \Package{scrletter}} den Fall, dass +sich mehrere Briefe in einem Dokument befinden, werden die Briefe intern von +\KOMAScript{} durchnummeriert. Hierfür ist seit Version~3.19 der Zähler +\Counter{letter} definiert, der mit jedem \Macro{begin}\PParameter{letter} +referenzierbar um eins erhöht wird. +\begin{Example} + Kommen wir auf das Beispiel zu \Macro{AtBeginLetter} zurück. Statt den + Zähler explizit innerhalb von \Macro{begin}\PParameter{letter} + zurückzusetzen, kann dies auch implizit erfolgen, indem der Zähler + \Counter{Frage} abhängig von \Counter{letter} definiert wird: +\begin{lstcode} + \newcounter{Frage}[letter] + \newcommand{\Frage}[1]{% + \refstepcounter{Frage}\par + \noindent\begin{tabularx}{\textwidth}{l@{}X} + \theFrage:~ & #1\\ + \end{tabularx}% + }% +\end{lstcode} + Damit wird der Zähler automatisch zu Beginn jedes Briefs wieder auf Null + zurück gesetzt, so dass die erste Frage in jedem Brief wieder mit der Nummer + Eins beginnt. +\end{Example} + +Will man sich den aktuellen Wert von \Counter{letter} ausgeben lassen, so ist +das wie gewohnt mit \Macro{theletter} möglich. Wie bereits erwähnt, ist der +Zähler aber auch referenzierbar. Das bedeutet, man könnte am Anfang eines +Briefes mit \Macro{label}\Parameter{Labelname} ein Label +setzen und mit \Macro{ref}\Parameter{Labelname} dann an beliebiger Stelle im +Dokument darauf verweisen. Innerhalb des Briefes selbst erhält man dasselbe +Ergebnis auch ganz ohne Label mit \Macro{thisletter}. + +Für Label innerhalb von Serienbriefen ist es notwendig, diesen einen über alle +Briefe hinweg eindeutigen Namen zu geben. Auch dafür kann \Macro{thisletter} +verwendet werden. Intern arbeitet \KOMAScript{} für diesen Zweck ebenfalls mit +\Macro{thisletter}, um auf der letzten Seite eines jeden Briefes ein Label zu +setzen. Dadurch ist es möglich, mit +\Macro{letterlastpage}\IndexCmd{label}\IndexCmd{pageref} jederzeit innerhalb +des Briefes die Nummer der letzten Seite des Briefes auszugeben. Da +\Macro{letterlastpage} über \Macro{label} und \Macro{pageref} arbeitet, ist +die Ausgabe allerdings erst nach mehreren \LaTeX-Läufen -- meist zwei oder +drei -- gültig. Achten Sie gegebenenfalls auf entsprechende +\emph{Rerun}-Meldungen in der Terminal-Ausgabe oder der \File{log}-Datei.% +\EndIndex{Cmd}{letterlastpage}% +\EndIndex{Cmd}{thisletter}% +\EndIndex{Counter}{letter}% + + \begin{Declaration} \Macro{opening}\Parameter{Anrede} \end{Declaration} @@ -2588,6 +2644,47 @@ Briefen ist das der Seitenstil des Zweitbogens. Bei doppelseitigen Briefen ist auch der Seitenstil aller Rückseiten betroffen. +\begin{Declaration} + \Macro{letterpagestyle} +\end{Declaration} +\BeginIndex{Cmd}{letterpagestyle}% +Der\ChangedAt{v3.19}{\Class{scrlttr2}\and \Package{scrletter}} für Briefe +voreingestellte Seitenstil wird durch den Inhalt dieser Anweisung bestimmt. In +der Voreinstellung von \Class{scrlttr2} ist die Anweisung leer definiert. Das +bedeutet, dass der Seitenstil von Briefen dem des restlichen Dokuments +entspricht. Dies ist deshalb sinnvoll, weil \Class{scrlttr2} für reine +Briefdokumente gedacht ist und es dafür einfacher ist, den Seitenstil wie +gewohnt mit \Macro{pagestyle} global einzustellen. + +Da der \Pagestyle{plain}-Seitenstil von Briefen vom +\Pagestyle{plain}-Seitenstil anderer Klassen abweicht, ist für das Paket +\Package{scrletter} der Seitenstil +\Pagestyle{plain.letter}\IndexPagestyle{plain.letter} in der Anweisung +gespeichert. Damit werden alle Briefe mit dem zum Seitenstil +\Pagestyle{letter}\IndexPagestyle{letter} gehörenden +\Pagestyle{plain}-Seitenstil gesetzt unabhängig davon, was für das restliche +Dokument als Seitenstil eingestellt ist. Siehe +\autoref{sec:scrlttr2-expert.pagestyleatscrletter} +%, \autopageref{desc:scrlttr2-experts.pagestyle.letter} +für weitere Informationen zu den Besonderheiten der Seitenstile von Paket +\Package{scrletter}. +\begin{Example} + Sie wollen auch bei Verwendung von Paket \Package{scrletter}, dass die + Briefe in dem Seitenstil gesetzt werden, der für das Dokument selbst mit + \Macro{pagestyle} eingestellt wurde. Dazu schreiben sie die Anweisung +\begin{lstcode} + \renewcommand*{\letterpagestyle}{} +\end{lstcode} + in die Dokumentpräambel. Dabei ist übrigens der Stern bei + \Macro{renewcommand*} wichtig!% +\end{Example} +Natürlich haben die Anweisung \Macro{pagestyle} und \Macro{thispagestyle} +innerhalb eines Briefes Vorrang vor dem innerhalb von +\Macro{begin}\PParameter{letter} über \Macro{letterpagestyle} eingestellten +Seitenstil.% +\EndIndex{Cmd}{letterpagestyle}% + + \begin{Declaration} \KOption{headsepline}\PName{Ein-Aus-Wert}\\ \KOption{footsepline}\PName{Ein-Aus-Wert} @@ -3550,4 +3647,5 @@ Version von \Package{adrconv} bereits mit \Macro{addrentry} und % LocalWords: Paketoption Satzspiegels Briefklasse Seitenkopf Seitenfuß -% LocalWords: Versandart Zentrierung Dokumenttitel +% LocalWords: Versandart Zentrierung Dokumenttitel Serienbriefen +% LocalWords: Dokumentpräambel diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/typearea.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/typearea.tex index b5dfd6856eb..2c9ffb43248 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/typearea.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/typearea.tex @@ -47,7 +47,7 @@ \KOMAProvidesFile{typearea.tex} - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2015-09-04 17:26:05 +0200 (Fri, 04 Sep 2015) $ KOMA-Script guide (chapter: typearea)] \chapter{Satzspiegelberechnung mit \Package{typearea.sty}} \labelbase{typearea} @@ -1504,6 +1504,11 @@ Optionen \Option{headlines}\IndexOption{headlines}\textnote{Achtung!} und \Option{headheight}\IndexOption{headheight} bleiben in diesem Fall jedoch unberücksichtigt! +Die Voreinstellung für \PName{BCOR} ist 0\Unit{pt}. Soll hingegen die aktuell, +beispielsweise per Option \Option{BCOR}\IndexOption{BCOR} eingestellte +Bindekorrektur erhalten bleiben, sollte man den symbolischen Wert +\PValue{current} als optionales Argument verwenden. + \begin{Example} Angenommen, ein Text auf A4-Papier soll genau die Breite von 60 Zeichen in der Typewriter-Schrift haben und exakt 30 Zeilen je Seite diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls index 6844a860dbc..95dfdcd2fa5 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls +++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls @@ -38,7 +38,7 @@ % \section{Identification} % % \begin{macrocode} -\ProvidesClass{scrguide}[2015/03/31 v1.9 internal KOMA-Script guide class] +\ProvidesClass{scrguide}[2015/09/14 v1.9a internal KOMA-Script guide class] % \end{macrocode} % % @@ -1305,7 +1305,8 @@ columns=fullflexible,keepspaces,% aboveskip=.4\baselineskip,% belowskip=0pt% -} \lstdefinestyle{code}{% +}% +\lstdefinestyle{code}{% style=basics,% language=[LaTeX]TeX,% moretexcs={% @@ -1313,7 +1314,7 @@ @ifundefined, @rightmark, @secondoftwo, @tempswafalse,@tempswatrue, @undefined, AtBeginDocument,AtEndDocument, appendix, ClassWarningNoLine,CurrentOption, - color, + color,colorbox, DeclareOption,DeclareRobustCommand,dimexpr, end@float, ExecuteOptions, if@filesw,if@tempswa,if@twoside, includegraphics, MessageBreak, onehalfspacing, @@ -1322,9 +1323,11 @@ RequirePackage,RequirePackageWithOptions,setkey,setlength, SelectInputMappings,setkeys, textsuperscript}% -} \lstdefinestyle{output}{% +}% +\lstdefinestyle{output}{% style=basics,breaklines,prebreak=\mbox{$\hookleftarrow$}% -} \lstdefinestyle{KOMA}{% +}% +\lstdefinestyle{KOMA}{% style=code,% moretexcs={% @addtoplength,@setplength,@newplength, activateareas, @@ -1343,9 +1346,12 @@ blinddocument,blindtext,Blinddocument,Blindtext, cc,captionabove,captionaboveof,captionbelow,captionbelowof,captionformat, captionof,cefoot,cfoot,chapapp, chapappifchapterprefix, - chapter,chapterformat,chaptermarkformat,chapterpagestyle,chead, + chapter,chapterlinesformat,chapterlineswithprefixformat, + chapterformat,chaptermarkformat,chapterpagestyle,chead, cleardoubleevenemptypage,clearscrheadfoot,closing,cofoot,Comment, - DeclareLayer,DeclareNewNoteColumn,DeclareNewPageStyleAlias, + DeclareLayer,DeclareNewLayer,DeclareNewPageStyleByLayers, + DeclarePageStyleByLayers, + DeclareNewNoteColumn,DeclareNewPageStyleAlias, DeclareNewTOC,DeclareSectionCommand,DeclareNewSectionCommand, RedeclareSectionCommand,ProvideSectionCommand, dedication,defcaptionname,deffootnote,deffootnotemark, @@ -1368,6 +1374,7 @@ ifattoclist,ifoot,ihead,ifkomavarempty,ifstr,ifthispageodd,InputAddressFile, KOMAoption,KOMAoptions,KOMAScript, l@addto@macro, LastName,layerwidth,layerheight,lefoot,lehead,LetterOptionNeedsPapersize, + LenToUnit, lipsum,listoffigures, listoftables,listoftoc,LoadLetterOption,lofoot,lohead,lowertitleback, MakeMarkcase,makenote,maketitle,manualmark,marginline,minisec, @@ -1378,6 +1385,7 @@ Paragraph,parellipsis,parformat,parname,parshortname, part,partformat,partname,partpagestyle,pnumfont, PreventPackageFromLoading,providecaptionname,publishers,ps, + putLL,putLR,putUL,putUR,putC, raggedsection,raggedpart,raggedsignature,recalctypearea, refL,refS,refN,refoot, refParagraph,refParagraphN,refPar,refParL,refParS,refParN, @@ -1386,8 +1394,10 @@ removereffields,renewcaptionname, RedeclarePageStyleAlias, ReplaceInput,ReplacePackage,ResetPreventPackageFromLoading, - rohead,sectionformat,subsectionformat,subsubsectionformat, - sectionmarkformat,Sentence,sentencename,sentenceshortname, + rohead, + sectionformat,subsectionformat,subsubsectionformat, + sectionmarkformat,sectioncatchphraseformat,sectionlinesformat, + Sentence,sentencename,sentenceshortname, setbibpreamble,setcapindent,setcapwidth, setchapterpreamble,setfootbotline,setfootsepline,setfootwidth, setheadsepline,setheadtopline,setheadwidth,setindexpreamble,setkomafont, diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.html b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.html index 3c822f4d62a..6ab0c97f547 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.html +++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.html @@ -11,38 +11,38 @@

    Optionen

    Anweisungen

    Umgebungen

    Längen

    Pseudolängen

    Variablen

    Seitenstile

    Zähler

    diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf index 79abe5c052b..6a7205ef65c 100644 Binary files a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf and b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf differ diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguien.html b/Master/texmf-dist/source/latex/koma-script/doc/scrguien.html index 894fc020de0..d743a872ad1 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/scrguien.html +++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguien.html @@ -13,311 +13,313 @@
  • BCOR --> 30
  • DIV --> 31
  • abstract --> 65
  • -
  • addrfield --> 172
  • -
  • adrFreeIVempty --> 238
  • -
  • adrFreeIVshow --> 238
  • -
  • adrFreeIVstop --> 238
  • -
  • adrFreeIVwarn --> 238
  • +
  • addrfield --> 174
  • +
  • adrFreeIVempty --> 239
  • +
  • adrFreeIVshow --> 239
  • +
  • adrFreeIVstop --> 239
  • +
  • adrFreeIVwarn --> 239
  • appendixprefix --> 86
  • -
  • autoclearnotecolumns --> 349
  • -
  • automark --> 218
  • -
  • autooneside --> 218
  • -
  • autoremoveinterfaces --> 327
  • -
  • backaddress --> 172
  • +
  • autoclearnotecolumns --> 352
  • +
  • automark --> 219
  • +
  • autooneside --> 219
  • +
  • autoremoveinterfaces --> 330
  • +
  • backaddress --> 174
  • bibliography --> 133
  • captions --> 115
  • chapteratlists --> 89
  • chapterentrydots --> 68
  • chapterprefix --> 86
  • cleardoublepage --> 78
  • -
  • clines --> 228
  • -
  • deactivatepagestylelayers --> 321
  • -
  • draft --> 324, 51
  • -
  • enlargefirstpage --> 160
  • -
  • extendedfeature --> 241
  • +
  • clines --> 229
  • +
  • deactivatepagestylelayers --> 324
  • +
  • draft --> 327, 51
  • +
  • enlargefirstpage --> 161
  • +
  • extendedfeature --> 242
  • firstfoot --> 185
  • -
  • firsthead --> 160
  • +
  • firsthead --> 162
  • fleqn --> 115
  • -
  • foldmarks --> 159
  • +
  • foldmarks --> 158
  • fontsize --> 153, 52
  • -
  • footbotline --> 226
  • +
  • footbotline --> 227
  • footheight --> 42
  • footinclude --> 39
  • footlines --> 42
  • footnotes --> 80
  • -
  • footsepline --> 187, 226, 73
  • -
  • footwidth --> 225
  • -
  • forceoverwrite --> 327
  • -
  • fromalign --> 161
  • -
  • fromemail --> 166
  • -
  • fromfax --> 166
  • -
  • fromlogo --> 170
  • -
  • frommobilephone --> 166
  • -
  • fromphone --> 166
  • -
  • fromrule --> 161
  • -
  • fromurl --> 166
  • +
  • footsepline --> 189, 227, 73
  • +
  • footwidth --> 226
  • +
  • forceoverwrite --> 330
  • +
  • fromalign --> 162
  • +
  • fromemail --> 167
  • +
  • fromfax --> 167
  • +
  • fromlogo --> 171
  • +
  • frommobilephone --> 167
  • +
  • fromphone --> 167
  • +
  • fromrule --> 162
  • +
  • fromurl --> 167
  • headheight --> 41
  • headinclude --> 39
  • headings --> 87
  • headlines --> 41
  • -
  • headsepline --> 187, 226, 73
  • -
  • headtopline --> 226
  • -
  • headwidth --> 225
  • -
  • hmode --> 338
  • -
  • ilines --> 228
  • +
  • headsepline --> 189, 227, 73
  • +
  • headtopline --> 227
  • +
  • headwidth --> 226
  • +
  • hmode --> 341
  • +
  • ilines --> 229
  • index --> 135
  • -
  • internalonly --> 246
  • -
  • komastyle --> 218
  • +
  • internalonly --> 247
  • +
  • komastyle --> 219
  • leqno --> 114
  • listof --> 128
  • -
  • locfield --> 176
  • -
  • manualmark --> 218
  • -
  • markcase --> 221
  • +
  • locfield --> 177
  • +
  • manualmark --> 219
  • +
  • markcase --> 222
  • mpinclude --> 40
  • numbers --> 89
  • -
  • numericaldate --> 178
  • -
  • olines --> 228
  • -
  • onpsbackground --> 320
  • -
  • onpsevenpage --> 320
  • -
  • onpsfloatpage --> 320
  • -
  • onpsforeground --> 320
  • -
  • onpsinit --> 320
  • -
  • onpsnonfloatpage --> 320
  • -
  • onpsoddpage --> 320
  • -
  • onpsoneside --> 320
  • -
  • onpsselect --> 320
  • -
  • onpstwoside --> 320
  • +
  • numericaldate --> 179
  • +
  • olines --> 229
  • +
  • onpsbackground --> 323
  • +
  • onpsevenpage --> 323
  • +
  • onpsfloatpage --> 323
  • +
  • onpsforeground --> 323
  • +
  • onpsinit --> 323
  • +
  • onpsnonfloatpage --> 323
  • +
  • onpsoddpage --> 323
  • +
  • onpsoneside --> 323
  • +
  • onpsselect --> 323
  • +
  • onpstwoside --> 323
  • open --> 85
  • origlongtable --> 128
  • -
  • pagenumber --> 188
  • +
  • pagenumber --> 189
  • pagesize --> 45
  • paper --> 44
  • parskip --> 70
  • -
  • plainfootbotline --> 228
  • -
  • plainfootsepline --> 228
  • -
  • plainheadsepline --> 228
  • -
  • plainheadtopline --> 228
  • -
  • priority --> 172
  • +
  • plainfootbotline --> 229
  • +
  • plainfootsepline --> 229
  • +
  • plainheadsepline --> 229
  • +
  • plainheadtopline --> 229
  • +
  • priority --> 174
  • refline --> 179
  • sectionentrydots --> 68
  • -
  • standardstyle --> 218
  • +
  • standardstyle --> 219
  • subject --> 183
  • -
  • symbolicnames --> 166
  • +
  • symbolicnames --> 167
  • titlepage --> 59
  • toc --> 66, 66, 66, 66
  • twocolumn --> 38
  • twoside --> 37
  • version --> 29
  • -
  • visualize --> 391
  • +
  • visualize --> 397
  • Commands

    Environments

    Lengths

    Pseudolengths

    Variables

    Page Styles

    Counter

    diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf b/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf index 1a72ee728f0..bd015f6efc3 100644 Binary files a/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf and b/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf differ diff --git a/Master/texmf-dist/source/latex/koma-script/scrhack.dtx b/Master/texmf-dist/source/latex/koma-script/scrhack.dtx index 4a54d7eeb2e..13460cd2ead 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrhack.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrhack.dtx @@ -1,4 +1,4 @@ -% \CheckSum{768} +% \CheckSum{814} % \iffalse meta-comment % ====================================================================== % scrhack.dtx @@ -62,7 +62,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ %%%% using: package,identify %%%% using: package,option %%%% using: package,body @@ -78,6 +78,7 @@ %\ProvidesFile{floatrow.hak}[% %\ProvidesFile{listings.hak}[% %\ProvidesFile{setspace.hak}[% +%\ProvidesFile{lscape.hak}[% %<*driver|manual|identify> %!KOMAScriptVersion package @@ -91,6 +92,7 @@ % floatrow)% % listings)% % setspace)% +% lscape)% %<*driver|manual|identify> ] % @@ -134,6 +136,11 @@ \from{scrhack.dtx}{hack,setspace,identify}% \from{scrhack.dtx}{hack,setspace,body}% }% + \file{lscape.hak}{% + \from{scrkernel-version.dtx}{file,lscape.hak}% + \from{scrhack.dtx}{hack,lscape,identify}% + \from{scrhack.dtx}{hack,lscape,body}% + }% } \@@input scrstrop.inc \else @@ -147,6 +154,7 @@ \usepackage[english,ngerman]{babel} \usepackage[T1]{fontenc} \usepackage{lmodern} +\newcommand*{\Environment}[1]{\texttt{\mbox{#1}}} \CodelineIndex \RecordChanges \begin{document} @@ -366,7 +374,7 @@ You can switch of the \Package{setspace} hack loading package \Package{scrhack} with option \OptionValue{setspace}{false}. You may also switch of the \Package{setspace} hack using \Macro{KOMAoptions}\PParameter{setspace=false} or -\Macro{KOMAOption}\PParameter{setspace}\PParameter{false} somewhere after +\Macro{KOMAoption}\PParameter{setspace}\PParameter{false} somewhere after loading package \Package{scrhack}, but before loading package \Package{setspace}. @@ -374,6 +382,39 @@ Note: If you want to use \Package{setspace} with package option \Option{onehalfspacing} or \Option{doublespacing} you have to load \Package{scrhack} before \Package{setspace}. + +\section{The \Package{lscape} hack} +\label{sec:scrhack.lscape} + +% \begingroup\let\Length\cs +Package \Package{lscape} defines an environment \Environment{landscape} to set +the page contents but not head and foot landscape. Inside this environment it +changes \Length{textheight} to the value of \Length{textwidth}, but it does +not change \Length{textwidth} to the former value of \Length{textheight}. +This is inconsistent. As far a I know, \Length{textwidth} is unchanged because +setting it to \Length{textheight} could blame other packages or user +commands. But changing \Length{textheight} could also blame other packages or +user commands and indeed it breaks, e.\,g., \Package{showframe} and +\Package{scrlayer}. So best would be, not to change \Length{textheight}, +too. \Package{scrhack} uses package \Package{xpatch} to modify the +environment start macro \Macro{landscape} appropriately. +% \endgroup + +% \iffalse +\begin{Declaration} + \KOption{lscape}{switch} +\end{Declaration} +% \fi +You can switch of the \Package{lscape} hack loading package \Package{scrhack} +with option \OptionValue{lscape}{false}. You can also change option +\Option{lscape} afterwards. If the option is \PValue{false} while loading +\Package{lscape}, \Package{scrhack} will not patch \Macro{landscape} and later +changes of the option have no effect. But if the option is \PValue{true} while +loading \Package{lscape} or if \Package{scrhack} is loaded after +\Package{lscape} without option \OptionValue{lscape}{false}, every later +change of the option using \Macro{KOMAoption} or \Macro{KOMAoptions} will have +the expected effect. + % \iffalse % % \fi @@ -1159,6 +1200,85 @@ Note: If you want to use \Package{setspace} with package option % \end{macro} % % +% \subsection{Der \textsf{lscape}-Hack} +% \changes{v3.18a}{2015/07/07}{Neuer \textsf{lscape}-Hack} +% +% Das \textsf{lscape}-Paket setzt innerhalb der +% \texttt{landscape}-Umgebung die Länge \cs{textheight} auf den Wert +% von \cs{textwidth} obwohl es auf der anderen Seite \cs{textwidth} +% nicht auf den Wert von \cs{textheight} setzt. Das ist inkonsequent. Da +% David~Carlisle außerdem angibt, dass \cs{textwidth} nicht verändert wird, +% weil das zu Problemen führen konnte, ist es unverständlich, dass +% \cs{textheight} verändert wird, obwohl das ebenfalls zu Problemen führen +% kann, beispielsweise für \textsf{showframe} oder \textsf{scrpage}. Daher +% verändere ich die Definition so, dass auch \cs{textheight} unverändert +% bleibt. Dabei muss allerdings auch \textsf{pdflscape} berücksichtigt +% werden. Das ist am einfachsten mit \textsf{xpatch}. +% +% \begin{option}{lscape} +% \changes{v3.18a}{2015/07/07}{Neue Option für neuen Hack}^^A +% \begin{macrocode} +%<*package&option> +\KOMA@ifkey{lscape}{@scrhack@lscape}% +\KOMAExecuteOptions{lscape=true}% +% +%<*package&body> +\AfterPackage*{lscape}{% + \if@scrhack@lscape\scr@hack@load\@pkgextension{lscape}\else + \KOMA@key[.scrhack.sty]{lscape}{% + \PackageWarning{scrhack}{option `lscape' ignored}% + \FamilyKeyStateProcessed + }% + \fi +} +% +% \end{macrocode} +% \end{option} +% +% \begin{macro}{\landscape} +% \changes{v3.18a}{2015/07/07}{Neu}^^A +% Über diese Anweisung wird die \texttt{landscape}-Umgebung von +% \textsf{lscape} gestartet. Genau diese muss gepatcht werden. Dafür wird das +% Paket \textsf{xpatch} benötigt. Da der Patch nur geladen wird, wenn die +% Option dafür gesetzt ist, kann die Option daher nur ein- und ausgeschaltet +% werden, wenn sie bis zum Laden des Pakets aktiviert wurde. +% \begin{macrocode} +%<*lscape&body> +\RequirePackage{xpatch} +\xpatchcmd{\landscape}{\textheight=\vsize}{% + \if@scrhack@lscape +% \end{macrocode} +% \changes{v3.18a}{2015/08/11}{Patchen von \cs{@outputpage}}^^A +% Es gibt allerdings in der Tat eine Stelle, an der ein verändertet Wert von +% \cs{textheight} benötigt wird. Das ist wenn innerhalb von \cs{@outputpage} +% der Wert von \cs{@colht} reinitialisiert wird. Also wird das entsprechend +% auch noch hinein gepatcht. +% \begin{macrocode} + \scrh@LT@textheight=\vsize + \let\scrh@LT@outputpage\@outputpage + \def\@outputpage{\scrh@LT@outputpage\global\@colht\scrh@LT@textheight}% + \else + \textheight=\vsize + \fi +}{% + \PackageInfo{scrhack}{\string\landscape\space patched to make + \string\textheight\space change optional}% +}{% + \PackageWarning{scrhack}{Cannot patch \string\landscape!\MessageBreak + Maybe you are using a unsupported lscape version}% + \@scrhack@lscapefalse +} +% \end{macrocode} +% \begin{Length}{\scrh@LT@textheight} +% \changes{v3.18a}{2015/08/11}{neue Länge (intern)} +% \begin{macrocode} +\newlength{\scrh@LT@textheight} +% +% \end{macrocode} +% \end{Length}^^A \scrh@LT@textheight +% \end{macro}^^A \landscape +% +% % \subsection{Optionen ausführen} % % Zum Schluss noch die Optionen ausführen. Im Paket wird diese Anweisung diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx index dd8d14f48e9..450a28de737 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx @@ -1,4 +1,4 @@ -% \CheckSum{2939} +% \CheckSum{2959} % \iffalse meta-comment % ====================================================================== % scrkernel-basics.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ %\NeedsTeXFormat{LaTeX2e}[1995/06/01] %<*driver> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}} - \filedate$Date: 2015-06-17 12:15:52 +0200 (Wed, 17 Jun 2015) $ + \filedate$Date: 2015-08-29 19:21:55 +0200 (Sat, 29 Aug 2015) $ \def\filerevision$#1: #2 ${\def\filerevision{r#2}} \filerevision$Revision: 1638 $ \xdef\fileinfo{\filedate\space\filerevision\space} @@ -285,6 +285,11 @@ % \changes{v3.00}{2008/04/30}{Neu (intern)}^^A % \begin{macro}{\scr@if@familymember} % \changes{v3.00}{2008/04/30}{Neu (intern)}^^A +% \begin{macro}{\scr@define@family@key} +% \changes{v3.00}{2008/04/30}{Neu (intern)}^^A +% \begin{macro}{\scr@define@family@key@nodefault} +% \changes{v3.00}{2008/04/30}{Neu (intern)}^^A +% \changes{v3.18a}{2015/07/03}{fehlendes \% ergänzt}^^A % Familie, Familienmitglied und \textsf{keyval}-Schlüssel für ein % Familienmitglied definieren. Dabei wird als Familienmitglied per Default der % (Datei-)Name des aktuellen Pakets bzw. der aktuellen Klasse verwendet. @@ -364,7 +369,7 @@ \define@key{#2#1}{#3}{% \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}% \FamilyKeyStateUnknown - #4 + #4% \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}% }% \@namedef{KV@#2#1@#3@default}{% @@ -375,6 +380,8 @@ } % % \end{macrocode} +% \end{macro}^^A \scr@define@family@key@nodefault +% \end{macro}^^A \scr@define@family@key % \end{macro}^^A \scr@if@familymember % \end{macro}^^A \scr@if@family % \end{macro}^^A \DefineFamilyKey @@ -971,7 +978,7 @@ \let\FamilyKeyState\OptionNotUsed }% }{% - \proteced@edef\reserved@b{\noexpand\setkeys{#2}{{\CurrentOption}}% + \protected@edef\reserved@b{\noexpand\setkeys{#2}{{\CurrentOption}}% \noexpand\def\noexpand\CurrentOption{\CurrentOption}}% \reserved@b \ifx\FamilyKeyState\FamilyKeyStateUnknown @@ -1290,8 +1297,25 @@ } % % \end{macrocode} -% \end{macro} -% \end{macro} +% \end{macro}^^A \@ifstrstart +% \end{macro}^^A \ifstrstart +% +% \begin{macro}{\IfArgIsEmpty} +% \changes{v3.19}{2015/08/29}{neu}^^A +% Falls das erste Argument tatsächlich leer ist, wird das zweite Argument +% ausgeführt sonst das dritte. +%<*base> +% \begin{macrocode} +\newcommand*{\IfArgIsEmpty}[1]{% + \if\relax\detokenize{#1}\relax + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi +} +% \end{macrocode} +% +% \end{macro}^^A \IfArgIsEmpty % % \begin{macro}{\ifisdimen} % \changes{v3.12}{2013/11/05}{neu}^^A @@ -1392,6 +1416,8 @@ % % \begin{macro}{\ifisskip} % \changes{v3.12}{2013/11/05}{neu}^^A +% \changes{v3.18a}{2015/07/07}{\cs{baselineskip} und \cs{parskip} werden als +% skips akzeptiert}^^A % Falls die Expansion des ersten Arguments ein \cs{skip} ist, wird das % zweite Argument ausgeführt, sonst das dritte. % \begin{macrocode} @@ -1410,7 +1436,17 @@ }{% \aftergroup\@secondoftwo }% - }{\aftergroup\@secondoftwo}% + }{% + \ifstr{\reserved@a}{\string\baselineskip}{% + \aftergroup\@firstoftwo + }{% + \ifstr{\reserved@a}{\string\parskip}{% + \aftergroup\@firstoftwo + }{% + \aftergroup\@secondoftwo + }% + }% + }% \endgroup } % @@ -2817,14 +2853,16 @@ % \end{macrocode} % \begin{macro}{\FamilySetCounter} % \changes{v3.12}{2013/11/05}{neu}^^A -% Über diese Anwesiung wird der Wert dann gesetzt. Dabei ist das erste -% Argument die Familie, das zweite der Name des Schlüssels, das dritte der -% Name des \LaTeX-Zählers, das vierte schließlich der gewünschte Wert. +% \changes{v3.18a}{2015/07/06}{korrekte Verwendung von +% \cs{FamilyKeyStateProcessed}}^^A +% Über diese Anwesiung wird der Wert dann gesetzt. Dabei ist das erste +% Argument die Familie, das zweite der Name des Schlüssels, das dritte der +% Name des \LaTeX-Zählers, das vierte schließlich der gewünschte Wert. % \begin{macrocode} \newcommand*{\FamilySetCounter}[4]{% \ifiscount{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisdimen{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\value{#3}=#4\FamilyKeyState\Processed}{% + \ifisskip{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisinteger{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% @@ -2859,6 +2897,8 @@ % \changes{v3.12}{2013/11/05}{neu}^^A % \changes{v3.15}{2014/12/17}{\cs{aftergroup} vor % \cs{FamilyKeyStateProcessed}}^^A +% \changes{v3.18a}{2015/07/06}{korrekte Verwendung von +% \cs{FamilyKeyStateProcessed}}^^A % Diese Anweisung arbeitet fast wie \cs{FamilySetCounter}, allerdings wird % nicht ein Zähler gesetzt, sondern ein Makro auf einen Wert definiert. Dabei % ist das erste Argument die Familie, das zweite der Name des Schlüssels, das @@ -2887,7 +2927,7 @@ \begingroup \ifiscount{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimen{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyState\Processed}{% + \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisinteger{#4}{% @@ -2947,14 +2987,16 @@ % \begin{macro}{\FamilySetLength} % \changes{v3.12}{2013/11/05}{neu}^^A % \changes{v3.15}{2015/01/02}{\cs{ifglueexpr} hinzugefügt}^^A -% Über diese Anwesiung wird der Wert dann gesetzt. Dabei ist das erste +% \changes{v3.18a}{2015/07/06}{korrekte Verwendung von +% \cs{FamilyKeyStateProcessed}}^^A +% Über diese Anweisung wird der Wert dann gesetzt. Dabei ist das erste % Argument die Familie, das zweite der Name des Schlüssels, das dritte der % Name der \LaTeX-Länge, das vierte schließlich der gewünschte Wert. % \begin{macrocode} \newcommand*{\FamilySetLength}[4]{% \ifiscount{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisdimen{#4}{#3=#4\FamilyKeyStateProcessed}{% - \ifisskip{#4}{#3=#4\FamilyKeyState\Processed}{% + \ifisskip{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisglueexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% @@ -2986,6 +3028,8 @@ % \changes{v3.15}{2014/12/17}{\cs{aftergroup} vor % \cs{FamilyKeyStateProcessed}}^^A % \changes{v3.15}{2015/01/02}{\cs{ifglueexpr} hinzugefügt}^^A +% \changes{v3.18a}{2015/07/06}{korrekte Verwendung von +% \cs{FamilyKeyStateProcessed}}^^A % Diese Anweisungen arbeitet fast wie \cs{FamilyCounterKey} und % \cs{FamilySetCounter}, allerdings wird nicht ein Zähler gesetzt, sondern % ein Makro auf einen Wert definiert. Dabei ist das erste Argument die @@ -3015,7 +3059,7 @@ \begingroup \ifiscount{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimen{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyState\Processed}{% + \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{% \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx index b90f0bee1b8..8887637e203 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx @@ -1,4 +1,4 @@ -% \CheckSum{206} +% \CheckSum{208} % \iffalse meta-comment % ====================================================================== % scrkernel-compatibility.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ %<*driver> % \fi \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}} - \filedate$Date: 2015-05-14 12:20:33 +0200 (Thu, 14 May 2015) $ + \filedate$Date: 2015-07-26 11:32:03 +0200 (Sun, 26 Jul 2015) $ \def\filerevision$#1: #2 ${\def\filerevision{r#2}} \filerevision$Revision: 1638 $ \edef\reserved@a{% @@ -387,6 +387,10 @@ % \changes{v3.17c}{2015/05/13}{Neues Macro} % \begin{macro}{\scr@v@3.18} % \changes{v3.18}{2015/05/14}{Neues Macro} +% \begin{macro}{\scr@v@3.18a} +% \changes{v3.18a}{2015/07/03}{Neues Macro} +% \begin{macro}{\scr@v@3.19} +% \changes{v3.19}{2015/07/26}{Neues Macro} % \begin{macro}{\scr@v@last} % \changes{v2.9u}{2005/03/05}{Neues Macro}^^A % Nun die unterschiedlichen möglichen Werte (|\scr@v@last| ist jeweils die @@ -449,6 +453,8 @@ \@namedef{scr@v@3.17a}{15} \@namedef{scr@v@3.17c}{15} \@namedef{scr@v@3.18}{15} +\@namedef{scr@v@3.18a}{15} +\@namedef{scr@v@3.19}{15} \@namedef{scr@v@last}{15} % \end{macrocode} % \end{macro} @@ -495,6 +501,8 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % \end{macro} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx index 4b2ccb34aae..90ce6819b17 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx @@ -1,4 +1,4 @@ -% \CheckSum{3224} +% \CheckSum{3237} % \iffalse meta-comment % ====================================================================== % scrkernel-fonts.dtx @@ -55,12 +55,12 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ %<*driver> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-04-03 13:55:42 +0200 (Fri, 03 Apr 2015) $ + \filedate$Date: 2015-08-24 11:30:25 +0200 (Mon, 24 Aug 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1827 $ \edef\reserved@a{% @@ -1920,21 +1920,33 @@ % der Anwendung des Fonts |\relax| verwenden sollen. % \begin{macrocode} \newcommand*{\scr@komafontrelaxlist}{% - \do\color \do\normalcolor + \do\normalcolor \do\uppercase \do\lowercase \do\MakeUppercase \do\MakeLowercase } % \end{macrocode} % \end{macro}^^A \scr@komafontrelaxlist +% \begin{macro}{scr@komafontgobblelist} +% \changes{v3.19}{2015/08/20}{neu (intern)}^^A +% Wie \cs{scr@komafontrelaxlist} nur dass |\@gobble| statt |\relax| verwendet +% wird. +% \begin{macrocode} +\newcommand*{\scr@komafontgobblelist}{% + \do\color +} +% \end{macrocode} +% \end{macro}^^A \scr@komafontgobblelist % \begin{macro}{\scr@prepareforkomafont} % \changes{v3.17}{2015/04/03}{neu (intern)}^^A +% \changes{v3.19}{2015/08/20}{abarbeiten von \cs{scr@komafontgobblelist}}^^A % Hilfsmakro, das die Vorbereitungen für die obigen Font-Makros trifft. In der % Voreinstellung ist das lediglich die Anwendung der |\do|-Liste, so dass die -% dort angegebenen Makros alle |\relax| werden. Da die Anweisung dazu |\do| -% umdefiniert, sollte die Anweisung immer in einer Gruppe eingeschlossen -% werden. +% dort angegebenen Makros alle |\relax| bzw. |\@gobble| werden. Da die +% Anweisung dazu |\do| umdefiniert, sollte die Anweisung immer in einer Gruppe +% eingeschlossen werden. % \begin{macrocode} \newcommand*{\scr@prepareforkomafont}{% \long\def\do##1{\let##1\relax}\scr@komafontrelaxlist + \long\def\do##1{\let##1\@gobble}\scr@komafontgobblelist } % \end{macrocode} % \end{macro}^^A \scr@prepareforkomafont @@ -1948,6 +1960,16 @@ } % \end{macrocode} % \end{macro}^^A \addtokomafontrelaxlist +% \begin{macro}{\addtokomafontgobblelist} +% \changes{v3.19}{2015/08/20}{Neu} +% Diese Anweisung erlaubt es genau ein Makro der obigen |\do|-Liste +% hinzuzufügen. +% \begin{macrocode} +\newcommand*{\addtokomafontgobblelist}[1]{% + \l@addto@macro\scr@komafontgobblelist{\do#1}% +} +% \end{macrocode} +% \end{macro}^^A \addtokomafontgobblelist % \end{macro} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-footnotes.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-footnotes.dtx index 51d0a99df1a..3a964c7c1ec 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-footnotes.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-footnotes.dtx @@ -1,4 +1,4 @@ -% \CheckSum{434} +% \CheckSum{432} % \iffalse meta-comment % ====================================================================== % scrkernel-footnotes.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ %<*driver> % \fi \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-03-17 12:39:55 +0100 (Tue, 17 Mar 2015) $ + \filedate$Date: 2015-08-24 11:28:16 +0200 (Mon, 24 Aug 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1962 $ \edef\reserved@a{% @@ -252,25 +252,23 @@ {\usekomafont{footnoterule}{% \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% \kern 2.6\p@} -% % \end{macrocode} % \begin{macro}{\ftn@rule@test@values} % \changes{v3.06}{2010/04/03}{neu (intern)}^^A +% \changes{v3.19}{2015/08/24}{nicht in \textsf{scrextend}}^^A % Test, ob die Einstellungen für die Längen der Fußnotenlinie halbwegs % vernünftig sind. % \begin{macrocode} \newcommand*{\ftn@rule@test@values}{% \ifdim\ftn@rule@height <\z@ -% \PackageWarning{scrextend}{% -% \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}{% You might get into trouble, because the\MessageBreak height of the footnote rule has a value\MessageBreak less than 0% }% \else \ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax -% \PackageWarning{scrextend}{% -% \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}{% You might get into trouble, because the\MessageBreak height of the footnote rule has a value\MessageBreak greater than \the\dimexpr\skip\footins -2.6\p@\relax @@ -278,16 +276,14 @@ \fi \fi \ifdim\ftn@rule@width <\z@ -% \PackageWarning{scrextend}{% -% \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}{% You might get into trouble, because the width\MessageBreak or length of the footnote rule has a value\MessageBreak less than 0pt% }% \else \ifdim\ftn@rule@width >\columnwidth -% \PackageWarning{scrextend}{% -% \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}{% You might get into trouble, because the width\MessageBreak or length of the footnote rule has a value\MessageBreak greater than \string\columnwidth @@ -300,6 +296,7 @@ % \begin{KOMAfont}{footnoterule} % \changes{v3.07}{2010/09/14}{\texttt{footnoterule} ist ein eneues % Fontelement} +% \changes{v3.19}{2015/08/24}{nicht in \textsf{scrextend}}^^A % Damit man die Farbe der Fußnotentrennlinie ändern kann, gibt es nun ein % eigenes Element dafür. Die Voreinstellung ist jedoch leer. % \begin{macrocode} @@ -308,6 +305,7 @@ % \end{KOMAfont} % \begin{macro}{\ftn@rule@width} % \changes{v3.06}{2010/04/03}{neu (intern)}^^A +% \changes{v3.19}{2015/08/24}{nicht in \textsf{scrextend}}^^A % Die Länge der Fußnotentrennlinie. % \begin{macrocode} \newcommand*{\ftn@rule@width}{.4\columnwidth} @@ -315,6 +313,7 @@ % \end{macro} % \begin{macro}{\ftn@rule@height} % \changes{v3.06}{2010/04/03}{neu (intern)}^^A +% \changes{v3.19}{2015/08/24}{nicht in \textsf{scrextend}}^^A % Die Höhe der Fußnotentrennlinie (die Tiefe ist immer 0). % \begin{macrocode} \newcommand*{\ftn@rule@height}{.4\p@} @@ -322,6 +321,7 @@ % \end{macro} % \begin{macro}{\setfootnoterule} % \changes{v3.06}{2010/04/03}{neue Anweisung}^^A +% \changes{v3.19}{2015/08/24}{nicht in \textsf{scrextend}}^^A % Das erste, optionale Argument ist die Höhe der Linie, das zweite nicht % optionale die Länge. % \begin{macrocode} @@ -334,6 +334,7 @@ }% \ftn@rule@test@values } +% % \end{macrocode} % \end{macro} % \end{macro} @@ -562,9 +563,11 @@ % % \begin{macro}{\multiplefootnotemarker} % \changes{v2.98c}{2008/02/01}{Neu}^^A +% \changes{v3.19}{2015/08/24}{im Paket mit \cs{providecommand} definieren}^^A % Das Markierungskerning wieder \textsf{footmisc}-kompatibel. % \begin{macrocode} -\newcommand*{\multiplefootnotemarker}{3sp} +%\newcommand*{\multiplefootnotemarker}{3sp} +%\providecommand*{\multiplefootnotemarker}{3sp} % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx index 471bdb7473f..1676501286c 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx @@ -1,4 +1,4 @@ -% \CheckSum{247} +% \CheckSum{252} % \iffalse meta-comment % ====================================================================== % scrkernel-index.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ %<*driver> % \fi \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-06-15 13:34:28 +0200 (Mon, 15 Jun 2015) $ + \filedate$Date: 2015-08-25 11:10:08 +0200 (Tue, 25 Aug 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1872 $ \edef\reserved@a{% @@ -365,6 +365,7 @@ % \changes{v2.3h}{1995/01/21}{Verwendung von \cs{idx@heading}} % \changes{v2.7j}{2001/05/27}{Setzen der Präambel in die % \texttt{theindex}-Umgebung verschoben} +% \changes{v3.19}{2015/08/25}{Seitenstil nur ändern wenn nicht leer}^^A % Der Index ist wie üblich definiert. % \begin{macrocode} \newenvironment{theindex}{% @@ -378,7 +379,8 @@ % \setchapterpreamble{\index@preamble}% \idx@heading% %
    \index@preamble\par\nobreak - \thispagestyle{\indexpagestyle}\parindent\z@ + \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi + \parindent\z@ \setlength{\parskip}{\z@ \@plus .3\p@}% \setlength{\parfillskip}{\z@ \@plus 1fil}% \let\item\@idxitem diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx index e28f5989f55..595934ee27f 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1969} +% \CheckSum{1996} % \iffalse meta-comment % ====================================================================== % scrkernel-language.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ %<*driver> % \fi \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-03-17 12:39:55 +0100 (Tue, 17 Mar 2015) $ + \filedate$Date: 2015-07-03 11:25:42 +0200 (Fri, 03 Jul 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1638 $ \edef\reserved@a{% @@ -1325,6 +1325,8 @@ % \changes{v2.9i}{2002/09/04}{Workaround für den % \texttt{hyphen.cfg}-Bug von Babel} % \changes{v2.97c}{2007/08/10}{Text einer Warnung geändert}^^A +% \changes{v3.18a}{2015/07/03}{\cs{extras\dots} werden auch ausgeführt}^^A +% \changes{v3.18a}{2015/07/03}{sprachabhhängige Befehle mit \cs{@nameuse}}^^A % Wird die \texttt{hyphen.cfg} von Babel verwendet, wird aber das % \textsl{babel}-Paket nicht geladen, so ist \cs{languagename} häufig % nicht korrekt, so dass dann \cs{selectlanguage} mit @@ -1355,112 +1357,139 @@ package\MessageBreak (e.g. `Babel', `german', `ngerman', ...)}% \ifx\l@american\undefined\else\ifnum\language=\l@american - \captionsamerican - \dateamerican + \@nameuse{captionsamerican}% + \@nameuse{extrasamerican}% + \@nameuse{dateamerican}% \fi\fi \ifx\l@australian\undefined\else\ifnum\language=\l@australian - \captionsaustralian - \dateaustralian + \@nameuse{captionsaustralian}% + \@nameuse{extrasaustralian}% + \@nameuse{dateaustralian}% \fi\fi \ifx\l@british\undefined\else\ifnum\language=\l@british - \captionsbritish - \datebritish + \@nameuse{captionsbritish}% + \@nameuse{extrasbritish}% + \@nameuse{datebritish}% \fi\fi \ifx\l@canadian\undefined\else\ifnum\language=\l@canadian - \captionscanadian - \datecanadian + \@nameuse{captionscanadian}% + \@nameuse{extrascanadian}% + \@nameuse{datecanadian}% \fi\fi \ifx\l@newzealand\undefined\else\ifnum\language=\l@newzealand - \captionsnewzealand - \datenewzealand + \@nameuse{captionsnewzealand}% + \@nameuse{extrasnewzealand}% + \@nameuse{datenewzealand}% \fi\fi \ifx\l@UKenglish\undefined\else\ifnum\language=\l@UKenglish - \captionsUKenglish - \dateUKenglish + \@nameuse{captionsUKenglish}% + \@nameuse{extrasUKenglish}% + \@nameuse{dateUKenglish}% \fi\fi \ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish - \captionsUSenglish - \dateUSenglish + \@nameuse{captionsUSenglish}% + \@nameuse{extrasUSenglish}% + \@nameuse{dateUSenglish}% \fi\fi \ifx\l@austrian\undefined\else\ifnum\language=\l@austrian - \captionsaustrian - \dateaustrian + \@nameuse{captionsaustrian}% + \@nameuse{extrasaustrian}% + \@nameuse{dateaustrian}% \fi\fi \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian - \captionsnaustrian - \datenaustrian + \@nameuse{captionsnaustrian}% + \@nameuse{extrasnaustrian}% + \@nameuse{datenaustrian}% \fi\fi \ifx\l@german\undefined\else\ifnum\language=\l@german - \captionsgerman - \dategerman + \@nameuse{captionsgerman}% + \@nameuse{extrasgerman}% + \@nameuse{dategerman}% \fi\fi \ifx\l@ngerman\undefined\else\ifnum\language=\l@ngerman - \captionsngerman - \datengerman + \@nameuse{captionsngerman}% + \@nameuse{extrasngerman}% + \@nameuse{datengerman}% \fi\fi \ifx\l@swissgerman\undefined\else\ifnum\language=\l@swissgerman - \captionsswissgerman - \dateswissgerman + \@nameuse{captionsswissgerman}% + \@nameuse{extrasswissgerman}% + \@nameuse{dateswissgerman}% \fi\fi \ifx\l@nswissgerman\undefined\else\ifnum\language=\l@nswissgerman - \captionsnswissgerman - \datenswissgerman + \@nameuse{captionsnswissgerman}% + \@nameuse{extrasnswissgerman}% + \@nameuse{datenswissgerman}% \fi\fi \ifx\l@acadian\undefined\else\ifnum\language=\l@acadian - \captionsacadian - \dateacadian + \@nameuse{captionsacadian}% + \@nameuse{extrasacadian}% + \@nameuse{dateacadian}% \fi\fi \ifx\l@canadien\undefined\else\ifnum\language=\l@canadien - \captionscanadien - \datecanadien + \@nameuse{captionscanadien}% + \@nameuse{extrascanadien}% + \@nameuse{datecanadien}% \fi\fi \ifx\l@francais\undefined\else\ifnum\language=\l@francais - \captionsfrancais - \datefrancais + \@nameuse{captionsfrancais}% + \@nameuse{extrasfrancais}% + \@nameuse{datefrancais}% \fi\fi \ifx\l@french\undefined\else\ifnum\language=\l@french - \captionsfrench - \datefrench + \@nameuse{captionsfrench}% + \@nameuse{extrasfrench}% + \@nameuse{datefrench}% \fi\fi \ifx\l@italian\undefined\else\ifnum\language=\l@italian - \captionsitalian - \dateitalian + \@nameuse{captionsitalian}% + \@nameuse{extrasitalian}% + \@nameuse{dateitalian}% \fi\fi \ifx\l@spanish\undefined\else\ifnum\language=\l@spanish - \captionsspanish - \datespanish + \@nameuse{captionsspanish}% + \@nameuse{extrasspanish}% + \@nameuse{datespanish}% \fi\fi \ifx\l@croatian\undefined\else\ifnum\language=\l@croatian - \captionscroatian - \datecroatian + \@nameuse{captionscroatian}% + \@nameuse{extrascroatian}% + \@nameuse{datecroatian}% \fi\fi \ifx\l@dutch\undefined\else\ifnum\language=\l@dutch - \captionsdutch - \datedutch + \@nameuse{captionsdutch}% + \@nameuse{extrasdutch}% + \@nameuse{datedutch}% \fi\fi \ifx\l@finnish\undefined\else\ifnum\language=\l@finnish - \captionsfinnish - \datefinnish + \@nameuse{captionsfinnish}% + \@nameuse{extrasfinnish}% + \@nameuse{datefinnish}% \fi\fi \ifx\l@norsk\undefined\else\ifnum\language=\l@norsk - \captionsnorsk - \datenorsk + \@nameuse{captionsnorsk}% + \@nameuse{extrasnorsk}% + \@nameuse{datenorsk}% \fi\fi \ifx\l@swedish\undefined\else\ifnum\language=\l@swedish - \captionsswedish - \dateswedish + \@nameuse{captionsswedish}% + \@nameuse{extrasswedish}% + \@nameuse{dateswedish}% \fi\fi \ifx\l@polish\undefined\else\ifnum\language=\l@polish - \captionspolish - \datepolish + \@nameuse{captionspolish}% + \@nameuse{extraspolish}% + \@nameuse{datepolish}% \fi\fi \ifx\l@czech\undefined\else\ifnum\language=\l@czech - \captionsczech - \dateczech + \@nameuse{captionsczech}% + \@nameuse{extrasczech}% + \@nameuse{dateczech}% \fi\fi \ifx\l@slovak\undefined\else\ifnum\language=\l@slovak - \captionsslovak - \dateslovak + \@nameuse{captionsslovak}% + \@nameuse{extrasslovak}% + \@nameuse{dateslovak}% \fi\fi \else \edef\@tempa{nohyphenation}% diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx index 51466315adf..f04a019968d 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx @@ -55,15 +55,15 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ %<*driver> % \fi \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-06-15 13:34:28 +0200 (Mon, 15 Jun 2015) $ + \filedate$Date: 2015-09-27 10:08:34 +0200 (Sun, 27 Sep 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 2134 $ + \filerevision$Revision: 2206 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-listsof.dtx}% @@ -837,7 +837,7 @@ usage of deprecated \string\toc@heading!\MessageBreak You should use the features of package `tocbasic'\MessageBreak instead of \string\toc@heading.\MessageBreak - Definition of \string\toc@heading\space my be removed from\MessageBreak + Definition of \string\toc@heading\space may be removed from\MessageBreak KOMA-Script soon, so it should not be used }% %
    \section*{\contentsname}% diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx index 52b8d1e7c0e..1d56645a744 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx @@ -1,4 +1,4 @@ -% \CheckSum{3365} +% \CheckSum{3382} % \iffalse meta-comment % ====================================================================== % scrkernel-notepaper.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ %<*driver> % \fi \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-04-26 14:49:41 +0200 (Sun, 26 Apr 2015) $ + \filedate$Date: 2015-07-15 09:30:52 +0200 (Wed, 15 Jul 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1767 $ \edef\reserved@a{% @@ -3351,6 +3351,8 @@ % \changes{v2.8q}{2002/01/16}{Fußnotenzähler wird zurückgesetzt}^^A % \changes{v2.9d}{2002/08/12}{Fußnotenzähler wird korrekt zurückgesetzt}^^A % \changes{v3.17}{2015/03/20}{Ersatz von \cs{pagemark}}^^A +% \changes{v3.19}{2015/07/15}{\cs{letterpagestyle} wird verwendet}^^A +% \changes{v3.19}{2015/07/15}{Briefe werden referenzierbar nummeriert}^^A % Diese Umgebung ist etwas anders definiert, als normalerweise von % \LaTeX gewohnt. Mit ihr können innerhalb eines Dokuments beliebig % viele Briefe erzeugt werden. Eine der Abweichungen von der @@ -3360,12 +3362,21 @@ \newenvironment{letter}[2][]{% % \end{macrocode} % Als erstes wird eine neue Seite begonnen. Dies kann ggf. auch eine neue -% rechte Seite sein. Danach werden alle relevanten Zähler und Strafpunkte +% rechte Seite sein. Dabei wird auch auf den korrekten Seitenstil +% geachtet. Danach werden alle relevanten Zähler und Strafpunkte % zurückgesetzt und der obligatorische Parameter ausgewertet. +% \changes{v3.19}{2015/07/15}{wegen des Pakets +% \cs{cleardoubleoddemptypage}}^^A % \begin{macrocode} - \newpage - \if@twoside\ifodd\c@page\else\thispagestyle{empty}\null\newpage\fi\fi + \cleardoubleoddemptypage + \scr@ifundefinedorrelax{letterpagestyle}{}{% + \ifx\letterpagestyle\@empty\else + \pagestyle{\letterpagestyle}% + \fi + }% %\let\pagemark\letterpagemark + \refstepcounter{letter}% + \let\thisletter\@currentlabel \setcounter{page}{\@ne}% \setcounter{footnote}{0}% \interlinepenalty=200\@processto{#2}% @@ -3375,13 +3386,32 @@ \KOMAoptions{#1}% % \end{macrocode} % Zum Schluss werden die per \cs{AtBeginLetter} angegeben Anweisungen -% ausgeführt. +% ausgeführt und noch danach ein Label gesetzt. +% \changes{v3.19}{2015/07/15}{ein Label wird gesetzt}^^A % \begin{macrocode} \@beginletterhook }{% - \stopletter\@@par\pagebreak\@@par% + \stopletter + \let\@currentlabel\thisletter + \label{\thisletter.lastpage}% + \@@par\pagebreak\@@par% } % \end{macrocode} +% \begin{macro}{\thisletter} +% \changes{v3.19}{2015/07/15}{neue Anweisung}^^A +% Gibt den Wert des aktuellen Labels wieder. Man benötigt dies beispielsweise, +% um per |\ref{\thisletter.lastpage}| auf die letzte Seite zugreifen zu +% können. +% \begin{macrocode} +\newcommand*{\thisletter}{outside.letter.undefined} +% \end{macrocode} +% \end{macro}^^A \thisletter +% \begin{macro}{\letterlastpage} +% \changes{v3.19}{2015/07/15}{neue Anweisung}^^A +% \begin{macrocode} +\newcommand*{\letterlastpage}{\pageref{\thisletter.lastpage}} +% \end{macrocode}^^A \letterlastpage +% \end{macro} % \begin{macro}{\stopletter} % Damit man Material am Ende des Briefes einschleusen kann. % \begin{macro}{\@processto} @@ -3401,9 +3431,9 @@ \long\def\@xproc#1\\#2\@nil{% \setkomavar{toname}{#1}\setkomavar{toaddress}{#2}} % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{macro}^^A \@xproc +% \end{macro}^^A \@processto +% \end{macro}^^A \stopletter % \begin{macro}{\flushbottom} % \changes{v2.97c}{2007/05/17}{neue Erweiterung}^^A % Das Verhalten muss auf der letzten Briefseite wieder \cs{raggedbottom} @@ -3413,9 +3443,32 @@ \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}% } % \end{macrocode} +% \end{macro}^^A \flushbottom +% \begin{Counter}{letter} +% \changes{3.19}{2015/07/15}{neuer Zähler}^^A +% Die Briefe werden durchnummeriert. +% \begin{macrocode} +\newcounter{letter} +% \end{macrocode} +% \end{Counter} +% \end{environment}^^A letter +% +% +% \begin{macro}{\letterpagestyle} +% \changes{v3.19}{2015/07/15}{neue Anweisung}^^A +% Analog zu \cs{titlepagestyle}, \cs{indexpagestyle} etc. gibt es jetzt auch +% ein \cs{letterpagestyle}. In der Voreinstellung ist dieser bei der Klasse +% leer. Dagegen wird beim Paket \texttt{plain.letter} verwendet. Durch den +% Unterschied wird faktisch die Kompatibilität mit des Pakets mit der Klasse +% jedoch verbessert! +% \begin{macrocode} +\newcommand*{\letterpagestyle}{% +% plain.letter% +} +% \end{macrocode} % \end{macro} -% \end{environment} -% +% +% % \begin{macro}{\AtBeginLetter} % \changes{v2.8n}{2001/09/08}{Neu}^^A % \begin{macro}{\@beginletterhook} @@ -3495,6 +3548,7 @@ % \end{macrocode} % \end{macro} % +% % \begin{macro}{\closing} % \changes{v2.2b}{1995/02/16}{{\cmd\fromsig} wird nicht mehr auf \cs{empty} % getestet sondern direkt eingesetzt} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx index facc1ffa72b..d082a7c6888 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx @@ -55,15 +55,15 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ %<*driver> % \fi \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-06-10 11:36:46 +0200 (Wed, 10 Jun 2015) $ + \filedate$Date: 2015-07-15 09:30:52 +0200 (Wed, 15 Jul 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 2130 $ + \filerevision$Revision: 2162 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-pagestyles.dtx}% @@ -129,6 +129,8 @@ % \changes{v3.12}{2013/03/05}{wenn \textsf{typearea} noch gar nicht geladen % ist, Option an dieses Paket schicken}^^A % \changes{v3.17}{2015/03/10}{Wert wird gespeichert}^^A +% \changes{v3.18a}{2015/07/08}{BugFix: Argument bei +% \cs{PassOptionsToPackage} erneut vertauscht}^^A % \begin{option}{headnosepline} % \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} durch \cs{PackageInfoNoLine} % ersetzt}^^A @@ -153,7 +155,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }{% \KOMAoptions{headinclude=#1}{}% }% @@ -185,6 +187,8 @@ % \changes{v3.13}{2014/07/07}{Satzspiegel wird nicht neu berechnet}^^A % \changes{v3.13}{2014/07/07}{\texttt{headinclude}-Fehler beseitigt}^^A % \changes{v3.17}{2015/03/10}{Wert wird gespeichert}^^A +% \changes{v3.18a}{2015/07/08}{BugFix: Argument bei +% \cs{PassOptionsToPackage} erneut vertauscht}^^A % \begin{option}{footnosepline} % \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} durch \cs{PackageInfoNoLine} % ersetzt} @@ -208,7 +212,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }{% \KOMAoptions{footinclude=#1}% }% @@ -855,9 +859,9 @@ % %<*class> % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{macro}^^A \ps@headings +% \end{macro}^^A \ps@myheadings +% \end{macro}^^A \ps@plain % % % \subsection{Festlegung des Seitenstils auf besonderen Seiten} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx index a33ea93d160..4d398010b1d 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ %<*driver> % \fi \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-03-25 10:47:54 +0100 (Wed, 25 Mar 2015) $ + \filedate$Date: 2015-08-22 08:36:48 +0200 (Sat, 22 Aug 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1872 $ \edef\reserved@a{% @@ -121,6 +121,8 @@ % \changes{v2.95}{2004/11/05}{neues Macro}^^A % \changes{v3.17}{2015/03/10}{löscht diverse \texttt{parskip}-Einstellungen % aus der internen Liste}^^A +% \changes{v3.19}{2015/07/29}{\cs{par@update} darf erst nach +% \cs{begin{document}} wieder \cs{default@par@update} werden}^^A % Über dieses Makro wird die Änderung der Absatzparameter |\parskip|, % |\parindent|, |\parfillskip| gesetzt. Das erste Argument ist der Einzug, das % zweite der Abstand und das dritte die Füllung. Aktiviert werden die @@ -135,7 +137,10 @@ \def\scr@parindent{#1}% \def\scr@parskip{#2}% \def\scr@parfillskip{#3}% - \def\par@update{\let\par@update\default@par@update\par@updaterelative}% + \def\par@update{% + \if@atdocument\let\par@update\default@par@update\fi + \par@updaterelative + }% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% @@ -599,10 +604,14 @@ % % \begin{macro}{\scr@defaultunits} % \changes{v2.95}{2004/11/05}{neues internes Macro}^^A +% \changes{v3.19}{2015/08/22}{\cs{setlength} wegen \textsf{tikz} +% eliminiert}^^A % \begin{macro}{\scr@@defaultunits} % \changes{v2.95}{2004/11/05}{neues internes Macro}^^A % \begin{macro}{\scr@@@defaultunits} % \changes{v2.95}{2004/11/05}{neues internes Macro}^^A +% \changes{v3.19}{2015/08/22}{\cs{setlength} und \cs{addtolength} wegen +% \textsf{tikz} eliminiert}^^A % Damit |\par@updaterelative| überhaupt funktionieren kann, wird % |\scr@defaultunits| benötigt. Dieses Makro arbeitet prinzipiell wie % |\@defaultunits| bekommt aber Dimension bzw. Skip als erstes und den Wert @@ -617,7 +626,7 @@ \begingroup \edef\@tempa{#2}% \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}% + \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}% \@tempa } \newcommand*{\scr@@defaultunits}{} @@ -632,16 +641,16 @@ \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{% \ifx\relax#2\relax \@defaultunits\@tempskipa#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \else \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \@defaultunits\@tempskipa#2pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi \ifx\relax#4\relax\else \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi } % \end{macrocode} 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 5211cf04d65..ca18472affb 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,4 @@ -% \CheckSum{3697} +% \CheckSum{3854} % \iffalse meta-comment % ====================================================================== % scrkernel-sections.dtx @@ -55,7 +55,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ % The runs of run-time file generation: %%%% (run: preidentify) % - everything that is needed before selfidentification of resulting files @@ -78,9 +78,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-06-10 20:17:51 +0200 (Wed, 10 Jun 2015) $ + \filedate$Date: 2015-09-09 08:01:54 +0200 (Wed, 09 Sep 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} - \filerevision$Revision: 2131 $ + \filerevision$Revision: 2195 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-sections.dtx}% @@ -593,6 +593,7 @@ \fi \@ifstar {% \csname scr@preto@ssect@hook\endcsname + \def\scr@s@ct@@nn@m@{#1}% \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}% }{% \csname scr@preto@sect@hook\endcsname @@ -731,6 +732,8 @@ % \changes{v3.18}{2015/05/22}{Verwendung von \cs{numexpr} für Argument 2}^^A % \changes{v3.18}{2015/05/22}{Verwendung von \cs{gluexpr} für Argument % 3--5}^^A +% \changes{v3.19}{2015/07/17}{Verwendung von \cs{sectionlinesformat} und +% \cs{sectioncatchphraseformat}}^^A % Damit auch alle mit \cs{@startsection} definierten Gliederungsebenen % bei der Entscheidung berücksichtigt werden, muss ein internes Makro % des \LaTeX-Kerns erweitert werden. Für die Ebenen \cs{part} und @@ -773,7 +776,7 @@ \ifx\@sect\@tempa\else \ClassWarning{\KOMAClassName}{% Unexpected definition of \string\@sect!\MessageBreak - Please send an information about this to\MessageBreak + Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak of \string\@sect\space}% @@ -809,9 +812,8 @@ \@tempskipa \glueexpr #5\relax\relax \ifdim \@tempskipa>\z@ \begingroup - #6{% - \@hangfrom{\hskip \glueexpr #3\relax\@svsec}% - \interlinepenalty \@M #8\@@par}% + #6{\interlinepenalty \@M + \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}% \endgroup % \ClassInfo{\KOMAClassName}{head=`\scr@ds@head'}% \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% @@ -832,8 +834,7 @@ \fi \else \def\@svsechd{% - #6{\hskip \glueexpr #3\relax - \@svsec #8}% + #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}% % \ClassInfo{\KOMAClassName}{head=`\scr@ds@head'}% \expandafter\csname #1mark\expandafter\endcsname \expandafter{\scr@ds@head}% @@ -880,15 +881,122 @@ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi } \newif\if@scr@tempswa -% % \end{macrocode} % \end{macro}^^A \scr@istest % \end{macro}^^A \if@scr@tempswa % \end{macro}^^A \scr@ds@head % \end{macro}^^A \scr@ds@tocentry +% \begin{macro}{\sectionlinesformat} +% \changes{v3.19}{2015/07/17}{neue Anweisung}^^A +% Diese Anweisung definiert das Format der eigentlichen Überschriften im Stil +% \texttt{section}, wenn mit Überschriftenzeilen gearbeitet +% wird. Fonteinstellungen sind zu diesem Zeitpunkt bereits erfolgt. Die +% Argumente sind: +% \begin{description} +% \item[\meta{Ebene} --] der Name der Gliederungebene +% \item[\meta{Einzug} --] ein eventuell zu verwendender horizontaler +% Einzug. +% \item[\meta{Gliederungsnummer} --] die bereits fertig formatierte +% Gliederungsnummer oder leer, falls keine Gliederungsnummer auszugeben ist. +% \item[\meta{Text} --] der Text der Überschrift. +% \end{description} +% Der Anwender ist selbst verantwortlich, dass innerhalb der Überschrift kein +% Seitenumbruch erfolgen kann. Nach der Überschrift wird jedoch zwangsweise +% ein \cs{@@par} ausgeführt, so dass sichergestellt ist, dass mit einem +% internen Absatz abgeschlossen wird. +% \begin{macrocode} +\newcommand{\sectionlinesformat}[4]{% + \@hangfrom{\hskip #2#3}{#4}% +} +% \end{macrocode} +% \end{macro}^^A \sectionlinesformat +% \begin{macro}{\sectioncatchphraseformat} +% \changes{v3.19}{2015/07/17}{neue Anweisung}^^A +% Diese Anweisung definiert das Format der eigentlichen Überschriften im +% Stil \texttt{section}, wenn mit Spitzmarken gearbeitet +% wird. Fonteinstellungen sind zu diesem Zeitpunkt bereits erfolgt. Die +% Argumente sind: +% \begin{description} +% \item[\meta{Ebene} --] der Name der Gliederungebene +% \item[\meta{Einzug} --] ein eventuell zu verwendender horizontaler +% Einzug. +% \item[\meta{Gliederungsnummer} --] die bereits fertig formatierte +% Gliederungsnummer oder leer, falls keine Gliederungsnummer auszugeben +% ist. +% \item[\meta{Text} --] der Text der Überschrift. +% \end{description} +% Der Anwender ist selbst verantwortlich, dass innerhalb der Überschrift kein +% Seitenumbruch erfolgen kann. +% \begin{macrocode} +\newcommand{\sectioncatchphraseformat}[4]{% + \hskip #2#3#4% +} +% \end{macrocode} +% \end{macro}^^A \sectioncatchphraseformat % \end{macro}^^A \@sect % \end{macro}^^A \scr@sect % +% \begin{macro}{\@ssect} +% \changes{v3.19}{2015/07/17}{Vollständige Neudefinition zur Realisierung +% der Erweiterung für die Formatieurng der Überschrift}^^A +% Das wird für Überschriften ohne Nummer verwendet. Im Prinzip machen wir hier +% dasselbe wie zuvor. +% \begin{macrocode} +\def\@tempa#1#2#3#4#5{% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{% + \@hangfrom{\hskip #1}% + \interlinepenalty \@M #5\@@par}% + \endgroup + \else + \def\@svsechd{#4{\hskip #1\relax #5}}% + \fi + \@xsect{#3}} +\ifx\@ssect\@tempa\else + \ClassWarning{\KOMAClassName}{% + Unexpected definition of \string\@ssect!\MessageBreak + Please send information about this to\MessageBreak + the KOMA-Script maintainer!\MessageBreak + Maybe LaTeX will be broken by the redefinition\MessageBreak + of \string\@ssect\space}% +\fi +%\ClassInfo{\KOMAClassName}{redefining LaTeX kernel macro +% \string\@ssect} +\def\@ssect#1#2#3#4#5{% + \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{% + \ClassWarning{\KOMAClassName}{incompatible usage of + \string\@ssect\space detected.\MessageBreak + You've used the KOMA-Script implementation of + \string\@ssect\MessageBreak + from within a non compatible caller, that does not\MessageBreak + \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@}% + }{}% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{\interlinepenalty \@M + \expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}% + {\glueexpr #1\relax}\@empty{#5}\@@par}% + \endgroup + \else + \edef\@svsechd{% + \unexpanded{#4}{% + \noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}% + \unexpanded{{\glueexpr #1\relax}\@empty{#5}}% + }% + }% + \fi + \let\scr@s@ct@@nn@m@\relax + \@xsect{\glueexpr #3\relax}% +} +% +% \end{macrocode} +% \end{macro}^^A \@ssect +% % \begin{macro}{\IfUsePrefixLine} % \changes{v3.18}{2015/06/09}{außerhalb von Gliederungsbefehlsstilen % definiert}^^A @@ -1489,6 +1597,15 @@ }% }\reserved@a }% +% \end{macrocode} +% \changes{v3.19}{2015/09/09}{neue Eigenschaft \texttt{counterwithout}} +% \begin{description}\item[\texttt{counterwithout}] Der Zähler dieser Ebene +% soll nicht länger abhängen vom angegebenen Zähler. +% \end{description} +% \begin{macrocode} + \FamilyStringKey[.dsc]{KOMAarg}{counterwithout}{\scr@local@counterwithout}% + \let\scr@local@counterwithout\relax +% \end{macrocode} % \begin{description}\item[\texttt{counterwithin}] Der Zähler dieser Ebene % soll abhängen vom angegebenen Zähler. % \end{description} @@ -1586,6 +1703,13 @@ % Ausgabe anpassen: % \begin{macrocode} \@ifundefined{c@#2}{\newcounter{#2}}{}% + \ifx\scr@local@counterwithout\relax + \else\ifx\scr@local@counterwithout\@empty + \else + \@removefromreset{#2}{\scr@local@counterwithout}% + \fi + \@namedef{the#2}{\arabic{#2}}% + \fi \ifx\scr@local@counterwithin\relax \else\ifx\scr@local@counterwithin\@empty \@namedef{the#2}{\arabic{#2}}% @@ -2416,6 +2540,8 @@ % \changes{v2.8d}{2001/07/05}{\cs{partpagestyle} statt \texttt{plain}}^^A % \changes{v2.8p}{2001/09/27}{Präambel über der Überschrift hinzugefügt}^^A % \changes{v3.13a}{2014/09/11}{Verwendung von \cs{SecDef}}^^A +% \changes{v3.19}{2015/08/25}{Seitenstil nur ändern wenn definiert und nicht +% leer}^^A % Die Anweisung definiert den Gliederungsüberschriften-Stil % \texttt{part}. Dazu bekommt sie als einziges explizites Argument den % \meta{Namen} der Gliederungsüberschrift. Weitere Argumente wie ein @@ -2429,7 +2555,11 @@ %
    \par %<*book|report> \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\@nameuse{#1pagestyle}}% + \scr@ifundefinedorrelax{#1pagestyle}{}{% + \ifstr{#1pagestyle}{}{}{% + \thispagestyle{\@nameuse{#1pagestyle}}% + }% + }% \if@twocolumn \onecolumn \@tempswatrue @@ -3219,11 +3349,11 @@ \newcommand*{\scr@chapter@afterskip}{\z@} \let\scr@chapter@afterskip\z@ \newcommand*{\scr@chapter@innerskip}{\z@} -\let\scr@chapter@sectionindent\z@ +\let\scr@chapter@innerskip\z@ \newcommand*{\scr@chapter@style}{chapter} % \end{macrocode} % \end{macro}^^A \scr@chapter@style -% \end{macro}^^A \scr@chapter@sectionindent +% \end{macro}^^A \scr@chapter@innerskip % \end{macro}^^A \scr@chapter@beforeskip % \end{macro}^^A \scr@chapter@afterskip % \begin{macrocode} @@ -3239,6 +3369,8 @@ % % \begin{macro}{\scr@startchapter} % \changes{v3.18}{2015/05/22}{neue Anweisung (für Paketautoren)} +% \changes{v3.19}{2015/08/25}{Seitenstil nur ändern wenn definiert und nicht +% leer}^^A % Diese Anweisung legt fest, wie der konkrete Aufruf für Überschriften des % Stils \texttt{chapter} lautet. Einziges Argument ist dabei der Name der % Gliederungsebene, beispielsweise \texttt{chapter}. Alle anderen benötigten @@ -3251,7 +3383,11 @@ %<*body> \newcommand*{\scr@startchapter}[1]{% \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\@nameuse{#1pagestyle}}% + \scr@ifundefinedorrelax{#1pagestyle}{}{% + \ifstr{#1pagestyle}{}{}{% + \thispagestyle{\@nameuse{#1pagestyle}}% + }% + }% \global\@topnum\z@ \@afterindentfalse \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname @@ -3529,40 +3665,58 @@ % \begin{macrocode} {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak - \usefontofkomafont{#1}% -% \if@mainmatter - \def\IfUseNumber{\ifnumbered{#1}}% -% \else\let\IfUseNumber\@secondoftwo\fi +% \end{macrocode} +% \changes{v3.19}{2015/08/02}{Verwendung von \cs{chapterlinesformat} und +% \cs{chapterlineswithprefixformat}}^^A +% \changes{v3.19}{2015/08/02}{Verwendung von Element \texttt{disposition} an +% Stelle von Befehl \cs{sectfont}}^^A +% Ab Version~3.19 wurde der Code weitgehend umgebaut, um die Befehle +% \cs{chapterlinesformat} für die hängende Version und +% \cs{chapterlinesandprefixformat} für die Version mit Präfixzeile zu +% verwenden. Dadurch entfällt dann auch die Verwendung von +% \cs{usefontofkomafont}. Ich bin mir bewusst, dass dadurch diverse Hacks +% bezüglich der Kapitelüberschriften nicht mehr funktionieren. Dafür kann man +% diese Hacks nun durch saubere Lösungen ersetzen. +% \begin{macrocode} + \def\IfUseNumber{\ifnumbered{#1}}% +% \if@mainmatter\else\let\IfUseNumber\@secondoftwo\fi + \def\IfUseNumber{\ifnumbered{#1}}% \if@chapterprefix - \raggedchapter \let\IfUsePrefixLine\@firstoftwo - \let\@tempa\@firstofone \else \let\IfUsePrefixLine\@secondoftwo - \let\@tempa\@hangfrom \fi - \@tempa{% - \IfUseNumber{% - \usekomafont{#1}{% + \normalfont\usekomafont{disposition}{% + \usekomafont{#1}{% + \settoheight{\@tempskipa}{% + {\usekomafont{#1prefix}{% + \vrule \@width\z@ \@height\csname scr@#1@innerskip\endcsname}}% + }% + \raggedchapter + \IfUseNumber{% \IfUsePrefixLine{% - {\usekomafont{#1prefix}{% - \csname #1format\endcsname - \setlength{\@tempskipa}{% - \csname scr@#1@innerskip\endcsname - }% - \chapterheadmidvskip - }}% + \chapterlineswithprefixformat{#1}% + {{\usekomafont{#1prefix}{\csname #1format\endcsname% + \setlength{\@tempskipa}{\csname scr@#1@innerskip\endcsname}% + \chapterheadmidvskip}}}% + {\interlinepenalty \@M#2\@@par}% }{% - \csname #1format\endcsname + \chapterlinesformat{#1}% + {\csname #1format\endcsname}% + {\interlinepenalty \@M#2\@@par}% + }% + }{% + \IfUsePrefixLine{% + \chapterlineswithprefixformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }{% + \chapterlinesformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% }% }% - }{}% - }% - {% - \IfUsePrefixLine{}{\raggedchapter}% - \interlinepenalty \@M - \usekomafont{#1}{#2}\par + }% }% }% \nobreak\par\nobreak @@ -3586,6 +3740,8 @@ % angepasst}^^A % \changes{v3.15}{2014/12/09}{\cs{raggedchapter} ersetzt % \cs{raggedsection}}^^A +% \changes{v3.19}{2015/08/02}{an die Änderungen bei \cs{scr@@makechapterhead} +% angepasst}^^A % \begin{macrocode} \newcommand*{\scr@@makeschapterhead}[2]{% \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax @@ -3593,17 +3749,67 @@ \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak\usekomafont{#1}{}% - \raggedchapter \interlinepenalty \@M \usekomafont{#1}{#2}\par + \let\IfUseNumber\secondoftwo + \if@chapterprefix + \let\IfUsePrefixLine\@firstoftwo + \else + \let\IfUsePrefixLine\@secondoftwo + \fi + \normalfont\usekomafont{disposition}{% + \usekomafont{#1}{% + \raggedchapter + \IfUsePrefixLine{% + \chapterlineswithprefixformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }{% + \chapterlinesformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }% + }% + }% }% \nobreak\par\nobreak - \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax + \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \chapterheadendvskip } % \end{macrocode} % \end{macro}^^A \scr@@makeschapterhead % +% \begin{macro}{\chapterlinesformat} +% \changes{v3.19}{2015/08/02}{neue Anweisung} +% \begin{macro}{\chapterlineswithprefixformat} +% \changes{v3.19}{2015/08/02}{neue Anweisung} +% Diese Anweisung definiert das Format der eigentlichen Überschriften im Stil +% \texttt{section}, wenn mit Überschriftenzeilen gearbeitet +% wird. Fonteinstellungen sind zu diesem Zeitpunkt bereits erfolgt. Die +% Argumente sind: +% \begin{description} +% \item[\meta{Befehlsname} --] der Name der Gliederungsebene, normalerweise +% \texttt{chapter}. +% \item[\meta{Gliederungsnummer} --] die bereits fertig formatierte +% Gliederungsnummer (bei \cs{chapterlineswithprefixformat} einschließlich +% des nachfolgenden vertikalen Abstands) oder leer, falls keine +% Gliederungsnummer auszugeben ist. +% \item[\meta{Text} --] der Text der Überschrift. +% \end{description} +% Der Anwender ist selbst verantwortlich, dass innerhalb der Überschrift kein +% Seitenumbruch erfolgen kann. Nach der Überschrift wird jedoch zwangsweise +% ein \cs{@@par} ausgeführt, so dass sichergestellt ist, dass mit einem +% internen Absatz abgeschlossen wird. +% \begin{macrocode} +\newcommand{\chapterlinesformat}[3]{% + \@hangfrom{#2}{#3}% +} +\newcommand{\chapterlineswithprefixformat}[3]{% + #2#3% +} +% \end{macrocode} +% \end{macro}^^A \chapterlineswithprefixformat +% \end{macro}^^A \chapterlinesformat +% % \begin{macro}{\use@chapter@o@preamble} % \changes{v3.15}{2014/12/08}{Anpassung an geänderte Abstandsbehandlung}^^A % \changes{v3.15a}{2015/02/02}{Korrektur, zur Verhinderung falscher diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-title.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-title.dtx index 9655e5ce305..32693afa4e3 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-title.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-title.dtx @@ -1,4 +1,4 @@ -% \CheckSum{797} +% \CheckSum{802} % \iffalse meta-comment % ====================================================================== % scrkernel-title.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ %<*driver> % \fi \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-03-17 12:39:55 +0100 (Tue, 17 Mar 2015) $ + \filedate$Date: 2015-08-25 11:10:08 +0200 (Tue, 25 Aug 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1638 $ \edef\reserved@a{% @@ -580,6 +580,7 @@ % nicht leer ist}^^A % \changes{v3.12a}{2014/03/03}{\cs{next@tdpage} aus \cs{@maketitle} und % \cs{@makeextrattitle} entfernt}^^A +% \changes{v3.19}{2015/08/25}{Seitenstil nur ändern wenn nicht leer}^^A % \begin{macrocode} \else \par @@ -619,7 +620,8 @@ \fi \@maketitle \fi - \thispagestyle{\titlepagestyle}\@thanks + \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi + \@thanks \endgroup \fi \setcounter{footnote}{0}% diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx index f91b4f0dd77..9c641843a98 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ %\NeedsTeXFormat{LaTeX2e}[1995/06/01] %<*driver> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-05-20 20:11:25 +0200 (Wed, 20 May 2015) $ + \filedate$Date: 2015-07-26 10:15:44 +0200 (Sun, 26 Jul 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1872 $ \edef\reserved@a{% @@ -995,7 +995,7 @@ \or \edef\@pagesizelast{automedia}% \if@atdocument - \set@pdftextpagesize + \set@pdftexpagesize \set@vtexpagesize \set@dvipspagesize \fi diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx index e8eaeddcb66..61a844665a2 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx @@ -55,7 +55,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ % \fi % % \iffalse @@ -123,7 +123,7 @@ \fi % \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx index 4d051a66ba7..951299b9585 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx @@ -1,4 +1,4 @@ -% \CheckSum{3819} +% \CheckSum{3896} % \iffalse^^A meta-comment % ====================================================================== % scrlayer.dtx @@ -57,18 +57,18 @@ % Right brace \} Tilde \~} % % \iffalse^^A meta-comment -%%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (identify) -%%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (init) -%%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options) -%%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body) -%%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (final) +%%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (identify) +%%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init) +%%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options) +%%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body) +%%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (final) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-06-09 09:58:46 +0200 (Tue, 09 Jun 2015) $ + \filedate$Date: 2015-07-30 11:39:05 +0200 (Thu, 30 Jul 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 2125 $ + \filerevision$Revision: 2172 $ \endgroup \ProvidesFile{scrlayer.dtx}[\filedate\space\filerevision\space % @@ -1096,6 +1096,18 @@ % There are basic, primitive attributes and compounding attributes. The basic % attributes are: % \begin{description} +% \item[\texttt{mode=\meta{command sequence}}:] the mode that should be used +% to output the \texttt{contents}. A command \cs{layer\meta{command +% sequence}mode} with one argument need to be defined. +% \changes{v3.19}{2015/07/30}{new layer attribute \texttt{mode}}^^A +% \begin{macrocode} +\DefineFamilyKey[.definelayer]{KOMAarg}{mode}{% + \scr@ifundefinedorrelax{layer#1mode}{\FamilyKeyStateUnknownValue}{% + \@namedef{scr@l@\scr@current@layer @mode}{#1}% + \FamilyKeyStateProcessed + }% +} +% \end{macrocode} % \item[\texttt{hoffset=\meta{dimension expression}}:] offset from the left % edge of the paper. % \begin{macrocode} @@ -1370,8 +1382,6 @@ % % Attribute modifications are attributes, that modify existing basic % attributes: -% There are basic, primitive attributes and compounding attributes. The basic -% attributes are: % \begin{description} % \changes{v3.16}{2015/01/26}{new layer attribute \texttt{addhoffset}}^^A % \item[\texttt{addhoffset=\meta{dimension expression}}:] add to offset from @@ -1698,6 +1708,7 @@ }% }{% \FamilyKeyStateProcessed + \scrlayer@clone@attribute{\scr@current@layer}{#1}{mode}% \scrlayer@clone@attribute{\scr@current@layer}{#1}{x}% \scrlayer@clone@attribute{\scr@current@layer}{#1}{y}% \scrlayer@clone@attribute{\scr@current@layer}{#1}{w}% @@ -1717,7 +1728,7 @@ % \end{macrocode} % \begin{macro}{\scrlayer@clone@attribute} % \begin{macro}{\scrlayer@clone@switch} -% Two helpers used to at option \texttt{clone} to clone either a macro-based +% Two helpers used at option \texttt{clone} to clone either a macro-based % attribute or a if-based attribute. % \begin{macrocode} \newcommand*{\scrlayer@clone@attribute}[3]{% @@ -1739,6 +1750,7 @@ % \begin{macrocode} \newcommand{\DeclareLayer}[2][]{% \def\scr@current@layer{#2}% + \@namedef{scr@l@#2@mode}{text}% \@namedef{scr@l@#2@x}{\z@}% \@namedef{scr@l@#2@y}{\z@}% \@namedef{scr@l@#2@w}{\paperwidth}% @@ -1787,7 +1799,7 @@ % \begin{macrocode} %<*package&body> \newcommand*{\IfLayerExists}[1]{% - \scr@ifundefinedorrelax{scr@l@#1@x}{% + \scr@ifundefinedorrelax{scr@l@#1@mode}{% \expandafter\@secondoftwo }{% \expandafter\@firstoftwo @@ -1847,7 +1859,17 @@ \newcommand{\ModifyLayer}[2][]{% \IfLayerExists{#2}{% \def\scr@current@layer{#2}% - \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}% + \edef\reserved@a{% + \unexpanded{% + \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}% + \ifstr{\csname scr@l@#2@mode\endcsname}% + }{\csname scr@l@#2@mode\endcsname}% + }\reserved@a{}{% + \PackageWarning{scrlayer}{% + change of layer mode could result in unexpected\MessageBreak + output and errors% + }% + }% \let\scr@current@layer\@empty }{% \PackageError{scrlayer}{layer `#2' not yet defined}{% @@ -1903,6 +1925,7 @@ %<*package&body> \newcommand*{\DestroyLayer}[1]{% \IfLayerExists{#1}{% + \expandafter\let\csname scr@l@#1@mode\endcsname\relax \expandafter\let\csname scr@l@#1@x\endcsname\relax \expandafter\let\csname scr@l@#1@y\endcsname\relax \expandafter\let\csname scr@l@#1@w\endcsname\relax @@ -1948,6 +1971,7 @@ % % % \begin{macro}{\layercontentsmeasure} +% \changes{v3.19}{2015/07/27}{\cs{@gobble} eliminated}^^A % This may used by used as the only value of the layer option % \texttt{contents} to show measure lines around the layer. The left and the % top measure line will be in centimeter, the right and the bottom measure @@ -1957,88 +1981,100 @@ %<*package&body> \newcommand*{\layercontentsmeasure}{% \smash{\begin{picture}(0,0) - (0,\if t\scr@l@valign -\ht\strutbox - \else - \if b\scr@l@valign -\dimexpr\layerheight-\dp\strutbox\relax - \else -.5\dimexpr \layerheight+\ht\strutbox-\dp\strutbox\relax - \fi - \fi\@gobble) + (0,\LenToUnit{% + \if t\layervalign -\ht\strutbox + \else + \if b\layervalign -\dimexpr\layerheight-\dp\strutbox\relax + \else -.5\dimexpr \layerheight+\ht\strutbox-\dp\strutbox\relax + \fi + \fi}) % \end{macrocode} % 1st horizontal cm % \begin{macrocode} - \put(0,0){\line(1,0){\layerwidth\@gobble}}% + \setlength{\unitlength}{1mm}% + \put(0,0){\line(1,0){\LenToUnit{\layerwidth}}}% \@tempcnta=\numexpr \dimexpr\layerwidth + .5mm\relax/\dimexpr 1mm\relax\relax - \multiput(0,0)(1mm\@gobble,0){\@tempcnta}{% - \line(0,-1){1mm\@gobble}% + \multiput(0,0)(1,0){\@tempcnta}{% + \line(0,-1){1}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + 2.5mm\relax/\dimexpr 5mm\relax\relax - \multiput(0,0)(5mm\@gobble,0){\@tempcnta}{% - \line(0,-1){2mm\@gobble}% + \multiput(0,0)(5,0){\@tempcnta}{% + \line(0,-1){2}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + .5cm\relax/\dimexpr 1cm\relax\relax - \multiput(0,0)(10mm\@gobble,0){\@tempcnta}{% - \put(0,0){\line(0,-1){3mm\@gobble}}% - \put(0,-3.5mm\@gobble){% + \multiput(0,0)(10,0){\@tempcnta}{% + \put(0,0){\line(0,-1){3}}% + \put(0,-3.5){% \makebox(0,0)[ct]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% % \end{macrocode} % 2nd horizontal in: % \begin{macrocode} - \put(0,-\layerheight\@gobble){\line(1,0){\layerwidth\@gobble}}% + \put(0,\LenToUnit{-\layerheight}){\line(1,0){\LenToUnit{\layerwidth}}}% \@tempcnta=\numexpr \dimexpr\layerwidth + .05in\relax/\dimexpr .1in\relax\relax - \multiput(0,-\layerheight\@gobble)(.1in\@gobble,0){\@tempcnta}{% - \line(0,1){1mm\@gobble}% + \multiput(0,\LenToUnit{-\layerheight})(2.54,0){\@tempcnta}{% + \line(0,1){1}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + .25in\relax/\dimexpr .5in\relax\relax - \multiput(0,-\layerheight\@gobble)(.5in\@gobble,0){\@tempcnta}{% - \line(0,1){2mm\@gobble}% + \multiput(0,\LenToUnit{-\layerheight})(12.7,0){\@tempcnta}{% + \line(0,1){2}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + .5in\relax/\dimexpr 1in\relax\relax - \multiput(0,-\layerheight\@gobble)(1in\@gobble,0){\@tempcnta}{% - \put(0,0){\line(0,1){3mm\@gobble}}% - \put(0,3.5mm\@gobble){% + \multiput(0,\LenToUnit{-\layerheight})(25.4,0){\@tempcnta}{% + \put(0,0){\line(0,1){3}}% + \put(0,3.5){% \makebox(0,0)[cb]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% % \end{macrocode} % 3rd vertical cm: % \begin{macrocode} - \put(0,0){\line(0,-1){\layerheight\@gobble}}% + \put(0,0){\line(0,-1){\LenToUnit{\layerheight}}}% \@tempcnta\numexpr \dimexpr\layerheight + .5mm\relax/\dimexpr 1mm\relax\relax - \multiput(0,0)(0,-1mm\@gobble){\@tempcnta}{% - \line(1,0){1mm\@gobble}% + \multiput(0,0)(0,-1){\@tempcnta}{% + \line(1,0){1}% }% \@tempcnta\numexpr \dimexpr\layerheight + 2.5mm\relax/\dimexpr 5mm\relax\relax - \multiput(0,0)(0,-5mm\@gobble){\@tempcnta}{% - \line(1,0){2mm\@gobble}% + \multiput(0,0)(0,-5){\@tempcnta}{% + \line(1,0){2}% }% \@tempcnta\numexpr \dimexpr\layerheight + .5cm\relax/\dimexpr 1cm\relax\relax - \multiput(0,0)(0,-1cm\@gobble){\@tempcnta}{% - \put(0,0){\line(1,0){3mm\@gobble}}% - \put(3.5mm\@gobble,0){% + \multiput(0,0)(0,-10){\@tempcnta}{% + \put(0,0){\line(1,0){3}}% + \put(3.5,0){% \makebox(0,0)[cl]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% % \end{macrocode} % 4th vertical in: % \begin{macrocode} - \put(\layerwidth\@gobble,0){\line(0,-1){\layerheight\@gobble}}% + \put(\LenToUnit{\layerwidth},0){\line(0,-1){\LenToUnit{\layerheight}}}% \@tempcnta\numexpr \dimexpr\layerheight + .05in\relax/\dimexpr .1in\relax\relax - \multiput(\layerwidth\@gobble,0)(0,-.1in\@gobble){\@tempcnta}{% - \line(-1,0){1mm\@gobble}% + \multiput(\LenToUnit{\layerwidth},0)(0,-2.54){\@tempcnta}{% + \line(-1,0){1}% }% \@tempcnta\numexpr \dimexpr\layerheight + .25in\relax/\dimexpr .5in\relax\relax - \multiput(\layerwidth\@gobble,0)(0,-.5in\@gobble){\@tempcnta}{% - \line(-1,0){2mm\@gobble}% + \multiput(\LenToUnit{\layerwidth},0)(0,-12.7){\@tempcnta}{% + \line(-1,0){2}% }% \@tempcnta\numexpr \dimexpr\layerheight + .5in\relax/\dimexpr 1in\relax\relax - \multiput(\layerwidth\@gobble,0)(0,-1in\@gobble){\@tempcnta}{% - \put(0,0){\line(-1,0){3mm\@gobble}}% - \put(-3.5mm\@gobble,0){% + \multiput(\LenToUnit{\layerwidth},0)(0,-25.4){\@tempcnta}{% + \put(0,0){\line(-1,0){3}}% + \put(-3.5,0){% \makebox(0,0)[cr]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% \end{picture}}% } +% \end{macrocode} +% \begin{macro}{\LenToUnit} +% \changes{v3.19}{2015/07/27}{new} +% Due to an incompatibility of package \textsf{curve2e} I've eliminated +% \cs{@gobble} in the definition of \cs{layercontentsmeasure} and replaced it +% sometimes by \cs{LenToUnit} with the (not long) definition suggested by +% \textsf{curve2e} itself. +% \begin{macrocode} +\providecommand*{\LenToUnit}[1]{\strip@pt\dimexpr#1*\p@/\unitlength} % % \end{macrocode} +% \end{macro}^^A \LenToUnit % \end{macro}^^A \layercontentsmeasure % % @@ -2788,7 +2824,9 @@ (\csname scr@l@#3@w\endcsname,% \csname scr@l@#3@h\endcsname)% [\csname scr@l@#3@align\endcsname]% - {\csname scr@l@#3@contents\endcsname}% + {\csname layer\csname scr@l@#3@mode\endcsname + mode\expandafter\endcsname + \csname scr@l@#3@contents\endcsname}% \fi \fi \fi @@ -2818,26 +2856,26 @@ \edef\layeryoffset{#2}% \edef\layerwidth{#3}% \edef\layerheight{#4}% - \def\scr@l@valign{t}% - \def\scr@l@halign{l}% + \def\layervalign{t}% + \def\layerhalign{l}% \edef\reserved@b{#5}% \expandafter\@tfor\expandafter\reserved@a\expandafter:\expandafter=% \reserved@b\do{% \if t\reserved@a - \def\scr@l@valign{t}% + \def\layervalign{t}% \else \if c\reserved@a - \def\scr@l@valign{c}% - \def\scr@l@halign{c}% + \def\layervalign{c}% + \def\layerhalign{c}% \else \if b\reserved@a - \def\scr@l@valign{b}% + \def\layervalign{b}% \else \if l\reserved@a - \def\scr@l@halign{l}% + \def\layerhalign{l}% \else \if r\reserved@a - \def\scr@l@halign{r}% + \def\layerhalign{r}% \else \PackageWarning{scrlayer}{% Unknown alignment `\reserved@a' ignored}% @@ -2849,12 +2887,12 @@ }% \parbox[t][\z@][t]{\z@}{% \vskip\layeryoffset - \if b\scr@l@valign\vskip-\layerheight\fi - \if c\scr@l@valign\vskip-.5\dimexpr\layerheight\relax\fi + \if b\layervalign\vskip-\layerheight\fi + \if c\layervalign\vskip-.5\dimexpr\layerheight\relax\fi \makebox[\z@][l]{% \hskip\layerxoffset - \makebox[\z@][\scr@l@halign]{% - \parbox[\scr@l@valign][\layerheight][\scr@l@valign]{\layerwidth}{% + \makebox[\z@][\layerhalign]{% + \parbox[\layervalign][\layerheight][\layervalign]{\layerwidth}{% \vskip\z@\strut{% \ifscrlayer@forceignoreuppercase \expandafter\let\csname MakeUppercase \endcsname\@firstofone @@ -2873,6 +2911,51 @@ % \end{macrocode} % \end{macro}^^A \scr@@layerbox % \end{macro}^^A \scr@layerbox +% +% \begin{macro}{\layerrawmode} +% \changes{v3.19}{2015/07/30}{new command}^^A +% \begin{macro}{\layertextmode} +% \changes{v3.19}{2015/07/30}{new command}^^A +% This is the command to output layers in raw mode. This is very simple: +% \begin{macrocode} +%<*package&body> +\newcommand{\layerrawmode}[1]{#1} +\newcommand{\layertextmode}[1]{#1} +% +% \end{macrocode} +% \end{macro}^^A \layertextmode +% \end{macro}^^A \layerrawmode +% +% \begin{macro}{\layerpicturemode} +% \changes{v3.19}{2015/07/30}{new command}^^A +% This is a bit more complicated. It is the layer output for \texttt{picture} +% layers. In this case we use a picture environment and internally define some +% additional commands. +% \begin{macrocode} +%<*package&body> +\newcommand{\layerpicturemode}[1]{% + \begin{picture}(0,0) + (0,\LenToUnit{% + \if t\layervalign \dimexpr\layerheight-\ht\strutbox\relax + \else + \if b\layervalign \dp\strutbox + \else .5\dimexpr\layerheight-\ht\strutbox+\dp\strutbox\relax + \fi + \fi}) + \long\def\putLL##1{\put(0,0){##1}}% + \long\def\putUL##1{\put(0,\LenToUnit{\layerheight}){##1}}% + \long\def\putLR##1{\put(\LenToUnit{\layerwidth},0){##1}}% + \long\def\putUR##1{\put(\LenToUnit{\layerwidth},% + \LenToUnit{\layerheight}){##1}}% + \long\def\putC##1{\put(\LenToUnit{.5\dimexpr\layerwidth\relax},% + \LenToUnit{.5\dimexpr\layerheight\relax}){##1}}% + #1% + \end{picture}% +} +% +% \end{macrocode} +% \end{macro}^^A \layerpicturemode +% % \begin{option}{draft} % \begin{macro}{\ifscrlayer@draft} % \begin{description} diff --git a/Master/texmf-dist/source/latex/koma-script/scrsource.tex b/Master/texmf-dist/source/latex/koma-script/scrsource.tex index 42abd44e4e1..efb88b62478 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrsource.tex +++ b/Master/texmf-dist/source/latex/koma-script/scrsource.tex @@ -53,6 +53,7 @@ \documentclass{scrdoc} \usepackage[english,ngerman]{babel} \usepackage[latin1]{inputenc} +\newcommand*{\Environment}[1]{\texttt{\mbox{#1}}} \CodelineIndex \RecordChanges\setcounter{GlossaryColumns}{1} \title{\KOMAScript{} -- The Source\footnote{Ich weiß natürlich, dass ein diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index 7798e4d789a..af0e864a459 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index 83f7b0929cd..3b147bfde95 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 58c083339d9..235a4ad32df 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% @@ -204,7 +204,7 @@ \@ObsoleteCommand{\subjectafteron}{subject=afteropening}} \def\subjectafteroff{% \@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}} -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \def\setpresigskip{\@setplength{sigbeforevskip}} \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index 2c784fe6b58..095f420c195 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco index f7178698b65..203a92de218 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index 7b6e128d3a3..3edf981e545 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco index 85a091832c9..664f9ac36f6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco index b83e7b34860..cfe906cb6c0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco index 2e15919da41..9fcddeba23d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco index 2fe7017e7f1..f0e650e94a8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index e24dd9b3339..6eeb1ac704b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 4b5a667c9ca..2d32f1177df 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index f36ebbbc423..eba1c6c55c1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index af67a6d7cca..83f9f14d614 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index a5907770954..f4d52d30089 100644 --- a/Master/texmf-dist/tex/latex/koma-script/float.hak +++ b/Master/texmf-dist/tex/latex/koma-script/float.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \ProvidesFile{float.hak}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (hacking package float)% ] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \scr@ifexpected{\newfloat}{% \long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3} \let\float@do=\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak index e5ea0b83de9..325065580a0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak +++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \ProvidesFile{floatrow.hak}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (hacking package floatrow)% ] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \scr@ifexpected{\DeclareNewFloatType}{% \long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}% \expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}% diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak index 2c95e198e78..ac586e39def 100644 --- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak +++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \ProvidesFile{hyperref.hak}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (hacking package hyperref)% ] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \scr@ifexpected\@schapter{% \def\@schapter#1{% \H@old@schapter{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index 57dfc7ecb42..54b47c08b58 100644 --- a/Master/texmf-dist/tex/latex/koma-script/listings.hak +++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \ProvidesFile{listings.hak}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (hacking package listings)% ] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \newcommand*{\scr@do@hack@listings}{% \RequirePackage{tocbasic}% \addtotoclist[float]{lol}% diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak new file mode 100644 index 00000000000..ae6807f45a6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak @@ -0,0 +1,95 @@ +%% +%% This is file `lscape.hak', +%% generated with the docstrip utility, extended by scrdocstrip. +%% +%% The original source files were: +%% +%% scrkernel-version.dtx (with options: `file,lscape.hak') +%% scrhack.dtx (with options: `hack,lscape,identify') +%% scrhack.dtx (with options: `hack,lscape,body') +%% +%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info] +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you may not be allowed to distribute +%% it. Look at the comments below to see if this is the case. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. You may +%% find a complete unmodified copy of LaTeX2e at +%% . +%% +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ +\begingroup + \catcode`\@11\relax + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% +\endgroup +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ +\ProvidesFile{lscape.hak}[% + 2015/09/29 v3.19 KOMA-Script + package + (hacking package + lscape)% +] +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ +\RequirePackage{xpatch} +\xpatchcmd{\landscape}{\textheight=\vsize}{% + \if@scrhack@lscape + \scrh@LT@textheight=\vsize + \let\scrh@LT@outputpage\@outputpage + \def\@outputpage{\scrh@LT@outputpage\global\@colht\scrh@LT@textheight}% + \else + \textheight=\vsize + \fi +}{% + \PackageInfo{scrhack}{\string\landscape\space patched to make + \string\textheight\space change optional}% +}{% + \PackageWarning{scrhack}{Cannot patch \string\landscape!\MessageBreak + Maybe you are using a unsupported lscape version}% + \@scrhack@lscapefalse +} +\newlength{\scrh@LT@textheight} +\endinput +%% +%% End of file `lscape.hak'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index befb01b633b..3874e878d2c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -74,7 +74,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -96,7 +96,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -111,19 +111,19 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \RequirePackage{tocbasic}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script ] \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -175,7 +175,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -295,6 +295,8 @@ \@namedef{scr@v@3.17a}{15} \@namedef{scr@v@3.17c}{15} \@namedef{scr@v@3.18}{15} +\@namedef{scr@v@3.18a}{15} +\@namedef{scr@v@3.19}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -330,8 +332,8 @@ {final}{draft=false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\@ptsize{% 11% } @@ -398,7 +400,7 @@ \KOMAClassFileName }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -504,7 +506,7 @@ {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -512,7 +514,10 @@ \def\scr@parindent{#1}% \def\scr@parskip{#2}% \def\scr@parfillskip{#3}% - \def\par@update{\let\par@update\default@par@update\par@updaterelative}% + \def\par@update{% + \if@atdocument\let\par@update\default@par@update\fi + \par@updaterelative + }% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% @@ -665,7 +670,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newif\if@titlepage \@titlepagefalse \newif\if@titlepageiscoverpage @@ -699,7 +704,7 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareStandardOption{abstracton}{abstract=true} \KOMA@DeclareStandardOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -825,14 +830,14 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }{% \KOMAoptions{headinclude=#1}{}% }% @@ -846,7 +851,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }{% \KOMAoptions{footinclude=#1}% }% @@ -1085,7 +1090,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1155,7 +1160,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% @@ -1542,7 +1547,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\subsection @@ -1626,7 +1631,7 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ @@ -1635,8 +1640,8 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2074,12 +2079,12 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \def\today{\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2123,7 +2128,7 @@ }\reserved@a \fi \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} @@ -2208,7 +2213,7 @@ \begingroup \edef\@tempa{#2}% \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}% + \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}% \@tempa } \newcommand*{\scr@@defaultunits}{} @@ -2223,16 +2228,16 @@ \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{% \ifx\relax#2\relax \@defaultunits\@tempskipa#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \else \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \@defaultunits\@tempskipa#2pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi \ifx\relax#4\relax\else \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi } \newcommand*{\@list@extra}{% @@ -2251,7 +2256,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% #1% @@ -2445,7 +2450,8 @@ \fi \@maketitle \fi - \thispagestyle{\titlepagestyle}\@thanks + \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi + \@thanks \endgroup \fi \setcounter{footnote}{0}% @@ -2589,7 +2595,7 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} \newcommand*{\ifnumbered}[1]{% @@ -2671,6 +2677,7 @@ \fi \@ifstar {% \csname scr@preto@ssect@hook\endcsname + \def\scr@s@ct@@nn@m@{#1}% \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}% }{% \csname scr@preto@sect@hook\endcsname @@ -2778,7 +2785,7 @@ \ifx\@sect\@tempa\else \ClassWarning{\KOMAClassName}{% Unexpected definition of \string\@sect!\MessageBreak - Please send an information about this to\MessageBreak + Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak of \string\@sect\space}% @@ -2813,9 +2820,8 @@ \@tempskipa \glueexpr #5\relax\relax \ifdim \@tempskipa>\z@ \begingroup - #6{% - \@hangfrom{\hskip \glueexpr #3\relax\@svsec}% - \interlinepenalty \@M #8\@@par}% + #6{\interlinepenalty \@M + \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}% \endgroup \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -2834,8 +2840,7 @@ \fi \else \def\@svsechd{% - #6{\hskip \glueexpr #3\relax - \@svsec #8}% + #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}% \expandafter\csname #1mark\expandafter\endcsname \expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -2868,6 +2873,61 @@ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi } \newif\if@scr@tempswa +\newcommand{\sectionlinesformat}[4]{% + \@hangfrom{\hskip #2#3}{#4}% +} +\newcommand{\sectioncatchphraseformat}[4]{% + \hskip #2#3#4% +} +\def\@tempa#1#2#3#4#5{% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{% + \@hangfrom{\hskip #1}% + \interlinepenalty \@M #5\@@par}% + \endgroup + \else + \def\@svsechd{#4{\hskip #1\relax #5}}% + \fi + \@xsect{#3}} +\ifx\@ssect\@tempa\else + \ClassWarning{\KOMAClassName}{% + Unexpected definition of \string\@ssect!\MessageBreak + Please send information about this to\MessageBreak + the KOMA-Script maintainer!\MessageBreak + Maybe LaTeX will be broken by the redefinition\MessageBreak + of \string\@ssect\space}% +\fi +\def\@ssect#1#2#3#4#5{% + \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{% + \ClassWarning{\KOMAClassName}{incompatible usage of + \string\@ssect\space detected.\MessageBreak + You've used the KOMA-Script implementation of + \string\@ssect\MessageBreak + from within a non compatible caller, that does not\MessageBreak + \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@}% + }{}% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{\interlinepenalty \@M + \expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}% + {\glueexpr #1\relax}\@empty{#5}\@@par}% + \endgroup + \else + \edef\@svsechd{% + \unexpanded{#4}{% + \noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}% + \unexpanded{{\glueexpr #1\relax}\@empty{#5}}% + }% + }% + \fi + \let\scr@s@ct@@nn@m@\relax + \@xsect{\glueexpr #3\relax}% +} \newcommand*{\scr@IfUsePrefixLineWarning}[2]{% \ClassWarning{\KOMAClassName}{% usage of \string\IfUsePrefixLine\space outside @@ -3072,6 +3132,8 @@ }% }\reserved@a }% + \FamilyStringKey[.dsc]{KOMAarg}{counterwithout}{\scr@local@counterwithout}% + \let\scr@local@counterwithout\relax \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}% \let\scr@local@counterwithin\relax \scr@ifundefinedorrelax{scr@local@tocleveloffset}{% @@ -3138,6 +3200,13 @@ \endgroup \@firstofone{% \@ifundefined{c@#2}{\newcounter{#2}}{}% + \ifx\scr@local@counterwithout\relax + \else\ifx\scr@local@counterwithout\@empty + \else + \@removefromreset{#2}{\scr@local@counterwithout}% + \fi + \@namedef{the#2}{\arabic{#2}}% + \fi \ifx\scr@local@counterwithin\relax \else\ifx\scr@local@counterwithin\@empty \@namedef{the#2}{\arabic{#2}}% @@ -3938,7 +4007,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -4577,7 +4646,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -4714,7 +4783,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \renewcommand*{\numberline}[1]{% \numberline@box{% \numberline@prefix @@ -4778,7 +4847,7 @@ usage of deprecated \string\toc@heading!\MessageBreak You should use the features of package `tocbasic'\MessageBreak instead of \string\toc@heading.\MessageBreak - Definition of \string\toc@heading\space my be removed from\MessageBreak + Definition of \string\toc@heading\space may be removed from\MessageBreak KOMA-Script soon, so it should not be used }% \section*{\contentsname}% @@ -4931,7 +5000,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -4962,7 +5031,8 @@ \columnsep 35\p@ \idx@heading% \index@preamble\par\nobreak - \thispagestyle{\indexpagestyle}\parindent\z@ + \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi + \parindent\z@ \setlength{\parskip}{\z@ \@plus .3\p@}% \setlength{\parfillskip}{\z@ \@plus 1fil}% \let\item\@idxitem diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 64f173801d6..50d512bc3b2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +66,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (% KOMA-Script-independent basics and keyval usage)] @@ -194,7 +194,7 @@ \define@key{#2#1}{#3}{% \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}% \FamilyKeyStateUnknown - #4 + #4% \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}% }% \@namedef{KV@#2#1@#3@default}{% @@ -329,7 +329,7 @@ \let\FamilyKeyState\OptionNotUsed }% }{% - \proteced@edef\reserved@b{\noexpand\setkeys{#2}{{\CurrentOption}}% + \protected@edef\reserved@b{\noexpand\setkeys{#2}{{\CurrentOption}}% \noexpand\def\noexpand\CurrentOption{\CurrentOption}}% \reserved@b \ifx\FamilyKeyState\FamilyKeyStateUnknown @@ -387,12 +387,12 @@ \fi } \FamilyProcessOptions{KOMA}\relax -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \RequirePackage{scrlfile}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax } @@ -493,6 +493,13 @@ }% \reserved@a#1#2\@nil } +\newcommand*{\IfArgIsEmpty}[1]{% + \if\relax\detokenize{#1}\relax + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi +} \newcommand*{\ifisdimen}[1]{% \begingroup \edef\reserved@a{#1}% @@ -567,7 +574,17 @@ }{% \aftergroup\@secondoftwo }% - }{\aftergroup\@secondoftwo}% + }{% + \ifstr{\reserved@a}{\string\baselineskip}{% + \aftergroup\@firstoftwo + }{% + \ifstr{\reserved@a}{\string\parskip}{% + \aftergroup\@firstoftwo + }{% + \aftergroup\@secondoftwo + }% + }% + }% \endgroup } \newcommand*{\ifisglueexpr}[1]{% @@ -1221,7 +1238,7 @@ \newcommand*{\FamilySetCounter}[4]{% \ifiscount{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisdimen{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\value{#3}=#4\FamilyKeyState\Processed}{% + \ifisskip{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisinteger{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% @@ -1255,7 +1272,7 @@ \begingroup \ifiscount{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimen{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyState\Processed}{% + \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisinteger{#4}{% @@ -1293,7 +1310,7 @@ \newcommand*{\FamilySetLength}[4]{% \ifiscount{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisdimen{#4}{#3=#4\FamilyKeyStateProcessed}{% - \ifisskip{#4}{#3=#4\FamilyKeyState\Processed}{% + \ifisskip{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisglueexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% @@ -1327,7 +1344,7 @@ \begingroup \ifiscount{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimen{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyState\Processed}{% + \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{% \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed @@ -1406,7 +1423,7 @@ \newcommand{\Family@String@Key}[4]{% \DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}% } -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newcommand*{\defcaptionname}{% \@ifstar\scr@def@scaptionname\scr@def@captionname } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index a3bc316743b..31b36c78368 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -74,7 +74,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -96,7 +96,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -111,21 +111,21 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \RequirePackage{tocbasic}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: prepare) \newif\if@openright \@openrighttrue @@ -190,7 +190,7 @@ \newcommand*{\scr@chapter@afterskip}{\z@} \let\scr@chapter@afterskip\z@ \newcommand*{\scr@chapter@innerskip}{\z@} -\let\scr@chapter@sectionindent\z@ +\let\scr@chapter@innerskip\z@ \newcommand*{\scr@chapter@style}{chapter} \newcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}} \newcommand*{\chapterheadendvskip}{\vskip\@tempskipa} @@ -201,7 +201,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -321,6 +321,8 @@ \@namedef{scr@v@3.17a}{15} \@namedef{scr@v@3.17c}{15} \@namedef{scr@v@3.18}{15} +\@namedef{scr@v@3.18a}{15} +\@namedef{scr@v@3.19}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -356,8 +358,8 @@ {final}{draft=false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\@ptsize{% 11% } @@ -424,7 +426,7 @@ \KOMAClassFileName }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -530,7 +532,7 @@ {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -538,7 +540,10 @@ \def\scr@parindent{#1}% \def\scr@parskip{#2}% \def\scr@parfillskip{#3}% - \def\par@update{\let\par@update\default@par@update\par@updaterelative}% + \def\par@update{% + \if@atdocument\let\par@update\default@par@update\fi + \par@updaterelative + }% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% @@ -691,7 +696,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newif\if@titlepage \@titlepagetrue \newif\if@titlepageiscoverpage @@ -722,7 +727,7 @@ }{titlepage}{\if@titlepage true\else false\fi} \KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -984,14 +989,14 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }{% \KOMAoptions{headinclude=#1}{}% }% @@ -1005,7 +1010,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }{% \KOMAoptions{footinclude=#1}% }% @@ -1244,7 +1249,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1314,7 +1319,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% @@ -1752,7 +1757,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\section @@ -1836,7 +1841,7 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} @@ -1846,8 +1851,8 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2292,12 +2297,12 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \def\today{\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2341,7 +2346,7 @@ }\reserved@a \fi \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} @@ -2426,7 +2431,7 @@ \begingroup \edef\@tempa{#2}% \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}% + \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}% \@tempa } \newcommand*{\scr@@defaultunits}{} @@ -2441,16 +2446,16 @@ \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{% \ifx\relax#2\relax \@defaultunits\@tempskipa#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \else \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \@defaultunits\@tempskipa#2pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi \ifx\relax#4\relax\else \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi } \newcommand*{\@list@extra}{% @@ -2469,7 +2474,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% #1% @@ -2663,7 +2668,8 @@ \fi \@maketitle \fi - \thispagestyle{\titlepagestyle}\@thanks + \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi + \@thanks \endgroup \fi \setcounter{footnote}{0}% @@ -2774,7 +2780,7 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \newcommand*{\ifnumbered}[1]{% @@ -2856,6 +2862,7 @@ \fi \@ifstar {% \csname scr@preto@ssect@hook\endcsname + \def\scr@s@ct@@nn@m@{#1}% \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}% }{% \csname scr@preto@sect@hook\endcsname @@ -2963,7 +2970,7 @@ \ifx\@sect\@tempa\else \ClassWarning{\KOMAClassName}{% Unexpected definition of \string\@sect!\MessageBreak - Please send an information about this to\MessageBreak + Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak of \string\@sect\space}% @@ -2998,9 +3005,8 @@ \@tempskipa \glueexpr #5\relax\relax \ifdim \@tempskipa>\z@ \begingroup - #6{% - \@hangfrom{\hskip \glueexpr #3\relax\@svsec}% - \interlinepenalty \@M #8\@@par}% + #6{\interlinepenalty \@M + \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}% \endgroup \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -3019,8 +3025,7 @@ \fi \else \def\@svsechd{% - #6{\hskip \glueexpr #3\relax - \@svsec #8}% + #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}% \expandafter\csname #1mark\expandafter\endcsname \expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -3053,6 +3058,61 @@ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi } \newif\if@scr@tempswa +\newcommand{\sectionlinesformat}[4]{% + \@hangfrom{\hskip #2#3}{#4}% +} +\newcommand{\sectioncatchphraseformat}[4]{% + \hskip #2#3#4% +} +\def\@tempa#1#2#3#4#5{% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{% + \@hangfrom{\hskip #1}% + \interlinepenalty \@M #5\@@par}% + \endgroup + \else + \def\@svsechd{#4{\hskip #1\relax #5}}% + \fi + \@xsect{#3}} +\ifx\@ssect\@tempa\else + \ClassWarning{\KOMAClassName}{% + Unexpected definition of \string\@ssect!\MessageBreak + Please send information about this to\MessageBreak + the KOMA-Script maintainer!\MessageBreak + Maybe LaTeX will be broken by the redefinition\MessageBreak + of \string\@ssect\space}% +\fi +\def\@ssect#1#2#3#4#5{% + \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{% + \ClassWarning{\KOMAClassName}{incompatible usage of + \string\@ssect\space detected.\MessageBreak + You've used the KOMA-Script implementation of + \string\@ssect\MessageBreak + from within a non compatible caller, that does not\MessageBreak + \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@}% + }{}% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{\interlinepenalty \@M + \expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}% + {\glueexpr #1\relax}\@empty{#5}\@@par}% + \endgroup + \else + \edef\@svsechd{% + \unexpanded{#4}{% + \noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}% + \unexpanded{{\glueexpr #1\relax}\@empty{#5}}% + }% + }% + \fi + \let\scr@s@ct@@nn@m@\relax + \@xsect{\glueexpr #3\relax}% +} \newcommand*{\scr@IfUsePrefixLineWarning}[2]{% \ClassWarning{\KOMAClassName}{% usage of \string\IfUsePrefixLine\space outside @@ -3321,6 +3381,8 @@ }% }\reserved@a }% + \FamilyStringKey[.dsc]{KOMAarg}{counterwithout}{\scr@local@counterwithout}% + \let\scr@local@counterwithout\relax \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}% \let\scr@local@counterwithin\relax \scr@ifundefinedorrelax{scr@local@tocleveloffset}{% @@ -3387,6 +3449,13 @@ \endgroup \@firstofone{% \@ifundefined{c@#2}{\newcounter{#2}}{}% + \ifx\scr@local@counterwithout\relax + \else\ifx\scr@local@counterwithout\@empty + \else + \@removefromreset{#2}{\scr@local@counterwithout}% + \fi + \@namedef{the#2}{\arabic{#2}}% + \fi \ifx\scr@local@counterwithin\relax \else\ifx\scr@local@counterwithin\@empty \@namedef{the#2}{\arabic{#2}}% @@ -3757,7 +3826,11 @@ } \newcommand*{\scr@startpart}[1]{% \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\@nameuse{#1pagestyle}}% + \scr@ifundefinedorrelax{#1pagestyle}{}{% + \ifstr{#1pagestyle}{}{}{% + \thispagestyle{\@nameuse{#1pagestyle}}% + }% + }% \if@twocolumn \onecolumn \@tempswatrue @@ -3955,7 +4028,11 @@ \newkomafont{partentrypagenumber}{} \newcommand*{\scr@startchapter}[1]{% \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\@nameuse{#1pagestyle}}% + \scr@ifundefinedorrelax{#1pagestyle}{}{% + \ifstr{#1pagestyle}{}{}{% + \thispagestyle{\@nameuse{#1pagestyle}}% + }% + }% \global\@topnum\z@ \@afterindentfalse \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname @@ -4075,40 +4152,45 @@ \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak - \usefontofkomafont{#1}% - \if@mainmatter - \def\IfUseNumber{\ifnumbered{#1}}% - \else\let\IfUseNumber\@secondoftwo\fi + \def\IfUseNumber{\ifnumbered{#1}}% + \if@mainmatter\else\let\IfUseNumber\@secondoftwo\fi + \def\IfUseNumber{\ifnumbered{#1}}% \if@chapterprefix - \raggedchapter \let\IfUsePrefixLine\@firstoftwo - \let\@tempa\@firstofone \else \let\IfUsePrefixLine\@secondoftwo - \let\@tempa\@hangfrom \fi - \@tempa{% - \IfUseNumber{% - \usekomafont{#1}{% + \normalfont\usekomafont{disposition}{% + \usekomafont{#1}{% + \settoheight{\@tempskipa}{% + {\usekomafont{#1prefix}{% + \vrule \@width\z@ \@height\csname scr@#1@innerskip\endcsname}}% + }% + \raggedchapter + \IfUseNumber{% \IfUsePrefixLine{% - {\usekomafont{#1prefix}{% - \csname #1format\endcsname - \setlength{\@tempskipa}{% - \csname scr@#1@innerskip\endcsname - }% - \chapterheadmidvskip - }}% + \chapterlineswithprefixformat{#1}% + {{\usekomafont{#1prefix}{\csname #1format\endcsname% + \setlength{\@tempskipa}{\csname scr@#1@innerskip\endcsname}% + \chapterheadmidvskip}}}% + {\interlinepenalty \@M#2\@@par}% }{% - \csname #1format\endcsname + \chapterlinesformat{#1}% + {\csname #1format\endcsname}% + {\interlinepenalty \@M#2\@@par}% + }% + }{% + \IfUsePrefixLine{% + \chapterlineswithprefixformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }{% + \chapterlinesformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% }% }% - }{}% - }% - {% - \IfUsePrefixLine{}{\raggedchapter}% - \interlinepenalty \@M - \usekomafont{#1}{#2}\par + }% }% }% \nobreak\par\nobreak @@ -4122,14 +4204,38 @@ \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak\usekomafont{#1}{}% - \raggedchapter \interlinepenalty \@M \usekomafont{#1}{#2}\par + \let\IfUseNumber\secondoftwo + \if@chapterprefix + \let\IfUsePrefixLine\@firstoftwo + \else + \let\IfUsePrefixLine\@secondoftwo + \fi + \normalfont\usekomafont{disposition}{% + \usekomafont{#1}{% + \raggedchapter + \IfUsePrefixLine{% + \chapterlineswithprefixformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }{% + \chapterlinesformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }% + }% + }% }% \nobreak\par\nobreak - \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax + \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \chapterheadendvskip } +\newcommand{\chapterlinesformat}[3]{% + \@hangfrom{#2}{#3}% +} +\newcommand{\chapterlineswithprefixformat}[3]{% + #2#3% +} \newcommand*{\use@chapter@o@preamble}[1]{% {% \settoheight{\@tempdima}{% @@ -4650,7 +4756,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -5306,7 +5412,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -5444,7 +5550,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \doforeachtocfile[float]{% \setuptoc{\@currext}{chapteratlist}% } @@ -5514,7 +5620,7 @@ usage of deprecated \string\toc@heading!\MessageBreak You should use the features of package `tocbasic'\MessageBreak instead of \string\toc@heading.\MessageBreak - Definition of \string\toc@heading\space my be removed from\MessageBreak + Definition of \string\toc@heading\space may be removed from\MessageBreak KOMA-Script soon, so it should not be used }% \chapter*{\contentsname}% @@ -5667,7 +5773,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -5700,7 +5806,8 @@ \columnsep 35\p@ \setchapterpreamble{\index@preamble}% \idx@heading% - \thispagestyle{\indexpagestyle}\parindent\z@ + \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi + \parindent\z@ \setlength{\parskip}{\z@ \@plus .3\p@}% \setlength{\parfillskip}{\z@ \@plus 1fil}% \let\item\@idxitem diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index adf367e8bc1..af67cf88e60 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 465ea46b5f7..87c1b0892f0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -76,7 +76,7 @@ }% \expandafter\endinput \fi -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -98,7 +98,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -106,7 +106,7 @@ } %%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ \ProvidesPackage{scrextend}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (extend other classes with features of KOMA-Script classes)% ] \newcommand*{\scr@ext@activate}[1]{% @@ -130,9 +130,9 @@ \expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname }% } -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} %%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ @@ -158,7 +158,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \providecommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -259,6 +259,8 @@ \@namedef{scr@v@3.17a}{15} \@namedef{scr@v@3.17c}{15} \@namedef{scr@v@3.18}{15} +\@namedef{scr@v@3.18a}{15} +\@namedef{scr@v@3.19}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -295,7 +297,7 @@ \KOMA@DeclareStandardOption [scrextend] {final}{draft=false} -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \providecommand*{\@fontsizefilebase}{scrsize} \KOMA@key{fontsize}{% \expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil @@ -331,7 +333,7 @@ scrextend.\scr@pkgextension }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \scr@ext@activateable{title}{% \scr@ifundefinedorrelax{if@titlepage}{% \expandafter\newif\csname if@titlepage\endcsname @@ -374,9 +376,9 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \KOMA@key{cleardoublepage}{% \begingroup% \def\@tempc{% @@ -458,7 +460,7 @@ \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} %%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $ -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -529,12 +531,12 @@ \ifhmode\spacefactor\@x@sf\fi \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: execoption) %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -890,7 +892,7 @@ because I do not change it% }% } -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \scr@ext@addto@activateable{title}{% \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -1086,7 +1088,8 @@ \fi \@maketitle \fi - \thispagestyle{\titlepagestyle}\@thanks + \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi + \@thanks \endgroup \fi \setcounter{footnote}{0}% @@ -1199,7 +1202,7 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} @@ -1276,56 +1279,12 @@ \providecommand*{\@textsubscript}[1]{% {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ %%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ -\newcommand*{\ftn@rule@test@values}{% - \ifdim\ftn@rule@height <\z@ - \PackageWarning{scrextend}{% - You might get into trouble, because the\MessageBreak - height of the footnote rule has a value\MessageBreak - less than 0% - }% - \else - \ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax - \PackageWarning{scrextend}{% - You might get into trouble, because the\MessageBreak - height of the footnote rule has a value\MessageBreak - greater than \the\dimexpr\skip\footins -2.6\p@\relax - }% - \fi - \fi - \ifdim\ftn@rule@width <\z@ - \PackageWarning{scrextend}{% - You might get into trouble, because the width\MessageBreak - or length of the footnote rule has a value\MessageBreak - less than 0pt% - }% - \else - \ifdim\ftn@rule@width >\columnwidth - \PackageWarning{scrextend}{% - You might get into trouble, because the width\MessageBreak - or length of the footnote rule has a value\MessageBreak - greater than \string\columnwidth - }% - \fi - \fi -} -\newkomafont{footnoterule}{} -\newcommand*{\ftn@rule@width}{.4\columnwidth} -\newcommand*{\ftn@rule@height}{.4\p@} -\newcommand*{\setfootnoterule}[2][]{% - \ifstr{#1}{}{}{% - \renewcommand*{\ftn@rule@height}{#1}% - }% - \ifstr{#2}{}{}{% - \renewcommand*{\ftn@rule@width}{#2}% - }% - \ftn@rule@test@values -} +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \newcommand\deffootnote[4][]{% \long\def\@makefntext##1{% \setlength{\@tempdimc}{#3}% @@ -1401,7 +1360,7 @@ \begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup } \providecommand*{\multfootsep}{,} -\newcommand*{\multiplefootnotemarker}{3sp} +\providecommand*{\multiplefootnotemarker}{3sp} \providecommand*{\thefootnotemark}{\@thefnmark} \def\reserved@a{\hbox{\@textsuperscript{\normalfont\@thefnmark}}} \ifx\reserved@a\@makefnmark diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index df975033151..d0126995249 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty @@ -42,7 +42,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,19 +64,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \ProvidesPackage{scrfontsizes}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (font size file generator)] -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \ProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{} \newcommand*{\generatefontfile}[1]{% \ifstr{#1}{scrsize}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index bcff62f8862..6aff9ba38ef 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,21 +65,21 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ %%% using: package,option \KOMA@ifkey{hyperref}{@scrhack@hyperref}% \KOMAExecuteOptions{hyperref=true}% @@ -91,8 +91,10 @@ \KOMAExecuteOptions{listings=true} \KOMA@ifkey{setspace}{@scrhack@setspace} \KOMAExecuteOptions{setspace=true} +\KOMA@ifkey{lscape}{@scrhack@lscape}% +\KOMAExecuteOptions{lscape=true}% \KOMAProcessOptions\relax -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ %%% using: package,body \newcommand{\scr@ifexpected}[2]{% \begingroup @@ -175,6 +177,14 @@ }% \if@scrhack@setspace\scr@hack@load\@pkgextension{setspace}\fi } +\AfterPackage*{lscape}{% + \if@scrhack@lscape\scr@hack@load\@pkgextension{lscape}\else + \KOMA@key[.scrhack.sty]{lscape}{% + \PackageWarning{scrhack}{option `lscape' ignored}% + \FamilyKeyStateProcessed + }% + \fi +} %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index f9a9a083acd..052ef6b8b2e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +66,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (% KOMA-Script-dependent basics and keyval usage)] @@ -241,12 +241,12 @@ \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \RequirePackage{scrlfile}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% } @@ -410,7 +410,7 @@ }% \KOMAoptions{#3}% } -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*{\IfExistskomafont}[1]{% \@ifundefined{scr@fnt@#1}{% \@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}% @@ -563,15 +563,22 @@ }% } \newcommand*{\scr@komafontrelaxlist}{% - \do\color \do\normalcolor + \do\normalcolor \do\uppercase \do\lowercase \do\MakeUppercase \do\MakeLowercase } +\newcommand*{\scr@komafontgobblelist}{% + \do\color +} \newcommand*{\scr@prepareforkomafont}{% \long\def\do##1{\let##1\relax}\scr@komafontrelaxlist + \long\def\do##1{\let##1\@gobble}\scr@komafontgobblelist } \newcommand*{\addtokomafontrelaxlist}[1]{% \l@addto@macro\scr@komafontrelaxlist{\do#1}% } +\newcommand*{\addtokomafontgobblelist}[1]{% + \l@addto@macro\scr@komafontgobblelist{\do#1}% +} \newcommand*{\newkomafont}[3][\relax]{% \expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}% \expandafter\expandafter\expandafter\newcommand diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty index fe6cb8c9d4d..f0221481210 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -52,7 +52,7 @@ 2014/06/03 v0.1.1760 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -83,7 +83,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -216,7 +216,7 @@ \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns} \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default} -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body) \KOMAProcessOptions\relax \expandafter\let \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty index 07cfaedda44..def6a4fa9e9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -48,10 +48,10 @@ %%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -78,7 +78,7 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% \begingroup @@ -694,7 +694,7 @@ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}% \scrlayer@AddCsToInterface{sls@leavevmode@linetrue} \scrlayer@AddCsToInterface{sls@leavevmode@linefalse} -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body) \KOMAProcessOptions\relax \expandafter\let \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index 9cfcb3e9abd..67954d739d2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,13 +43,13 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (identify) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init) \RequirePackage{scrkbase}[2013/03/05] \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -113,7 +113,7 @@ \setlength{\footheight}{\baselineskip} \fi } -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -265,7 +265,7 @@ \KOMA@ifkey{draft}{scrlayer@draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} \newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty} @@ -586,6 +586,12 @@ \@namedef{scr@l@\scr@current@layer @w}{#3}% \@namedef{scr@l@\scr@current@layer @h}{#4}% } +\DefineFamilyKey[.definelayer]{KOMAarg}{mode}{% + \scr@ifundefinedorrelax{layer#1mode}{\FamilyKeyStateUnknownValue}{% + \@namedef{scr@l@\scr@current@layer @mode}{#1}% + \FamilyKeyStateProcessed + }% +} \DefineFamilyKey[.definelayer]{KOMAarg}{hoffset}{% \@namedef{scr@l@\scr@current@layer @x}{\dimexpr #1\relax}% \FamilyKeyStateProcessed @@ -932,6 +938,7 @@ }% }{% \FamilyKeyStateProcessed + \scrlayer@clone@attribute{\scr@current@layer}{#1}{mode}% \scrlayer@clone@attribute{\scr@current@layer}{#1}{x}% \scrlayer@clone@attribute{\scr@current@layer}{#1}{y}% \scrlayer@clone@attribute{\scr@current@layer}{#1}{w}% @@ -958,6 +965,7 @@ } \newcommand{\DeclareLayer}[2][]{% \def\scr@current@layer{#2}% + \@namedef{scr@l@#2@mode}{text}% \@namedef{scr@l@#2@x}{\z@}% \@namedef{scr@l@#2@y}{\z@}% \@namedef{scr@l@#2@w}{\paperwidth}% @@ -985,7 +993,7 @@ } \newcommand*{\scr@current@layer}{} \newcommand*{\IfLayerExists}[1]{% - \scr@ifundefinedorrelax{scr@l@#1@x}{% + \scr@ifundefinedorrelax{scr@l@#1@mode}{% \expandafter\@secondoftwo }{% \expandafter\@firstoftwo @@ -1022,7 +1030,17 @@ \newcommand{\ModifyLayer}[2][]{% \IfLayerExists{#2}{% \def\scr@current@layer{#2}% - \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}% + \edef\reserved@a{% + \unexpanded{% + \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}% + \ifstr{\csname scr@l@#2@mode\endcsname}% + }{\csname scr@l@#2@mode\endcsname}% + }\reserved@a{}{% + \PackageWarning{scrlayer}{% + change of layer mode could result in unexpected\MessageBreak + output and errors% + }% + }% \let\scr@current@layer\@empty }{% \PackageError{scrlayer}{layer `#2' not yet defined}{% @@ -1042,6 +1060,7 @@ } \newcommand*{\DestroyLayer}[1]{% \IfLayerExists{#1}{% + \expandafter\let\csname scr@l@#1@mode\endcsname\relax \expandafter\let\csname scr@l@#1@x\endcsname\relax \expandafter\let\csname scr@l@#1@y\endcsname\relax \expandafter\let\csname scr@l@#1@w\endcsname\relax @@ -1081,74 +1100,77 @@ } \newcommand*{\layercontentsmeasure}{% \smash{\begin{picture}(0,0) - (0,\if t\scr@l@valign -\ht\strutbox - \else - \if b\scr@l@valign -\dimexpr\layerheight-\dp\strutbox\relax - \else -.5\dimexpr \layerheight+\ht\strutbox-\dp\strutbox\relax - \fi - \fi\@gobble) - \put(0,0){\line(1,0){\layerwidth\@gobble}}% + (0,\LenToUnit{% + \if t\layervalign -\ht\strutbox + \else + \if b\layervalign -\dimexpr\layerheight-\dp\strutbox\relax + \else -.5\dimexpr \layerheight+\ht\strutbox-\dp\strutbox\relax + \fi + \fi}) + \setlength{\unitlength}{1mm}% + \put(0,0){\line(1,0){\LenToUnit{\layerwidth}}}% \@tempcnta=\numexpr \dimexpr\layerwidth + .5mm\relax/\dimexpr 1mm\relax\relax - \multiput(0,0)(1mm\@gobble,0){\@tempcnta}{% - \line(0,-1){1mm\@gobble}% + \multiput(0,0)(1,0){\@tempcnta}{% + \line(0,-1){1}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + 2.5mm\relax/\dimexpr 5mm\relax\relax - \multiput(0,0)(5mm\@gobble,0){\@tempcnta}{% - \line(0,-1){2mm\@gobble}% + \multiput(0,0)(5,0){\@tempcnta}{% + \line(0,-1){2}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + .5cm\relax/\dimexpr 1cm\relax\relax - \multiput(0,0)(10mm\@gobble,0){\@tempcnta}{% - \put(0,0){\line(0,-1){3mm\@gobble}}% - \put(0,-3.5mm\@gobble){% + \multiput(0,0)(10,0){\@tempcnta}{% + \put(0,0){\line(0,-1){3}}% + \put(0,-3.5){% \makebox(0,0)[ct]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% - \put(0,-\layerheight\@gobble){\line(1,0){\layerwidth\@gobble}}% + \put(0,\LenToUnit{-\layerheight}){\line(1,0){\LenToUnit{\layerwidth}}}% \@tempcnta=\numexpr \dimexpr\layerwidth + .05in\relax/\dimexpr .1in\relax\relax - \multiput(0,-\layerheight\@gobble)(.1in\@gobble,0){\@tempcnta}{% - \line(0,1){1mm\@gobble}% + \multiput(0,\LenToUnit{-\layerheight})(2.54,0){\@tempcnta}{% + \line(0,1){1}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + .25in\relax/\dimexpr .5in\relax\relax - \multiput(0,-\layerheight\@gobble)(.5in\@gobble,0){\@tempcnta}{% - \line(0,1){2mm\@gobble}% + \multiput(0,\LenToUnit{-\layerheight})(12.7,0){\@tempcnta}{% + \line(0,1){2}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + .5in\relax/\dimexpr 1in\relax\relax - \multiput(0,-\layerheight\@gobble)(1in\@gobble,0){\@tempcnta}{% - \put(0,0){\line(0,1){3mm\@gobble}}% - \put(0,3.5mm\@gobble){% + \multiput(0,\LenToUnit{-\layerheight})(25.4,0){\@tempcnta}{% + \put(0,0){\line(0,1){3}}% + \put(0,3.5){% \makebox(0,0)[cb]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% - \put(0,0){\line(0,-1){\layerheight\@gobble}}% + \put(0,0){\line(0,-1){\LenToUnit{\layerheight}}}% \@tempcnta\numexpr \dimexpr\layerheight + .5mm\relax/\dimexpr 1mm\relax\relax - \multiput(0,0)(0,-1mm\@gobble){\@tempcnta}{% - \line(1,0){1mm\@gobble}% + \multiput(0,0)(0,-1){\@tempcnta}{% + \line(1,0){1}% }% \@tempcnta\numexpr \dimexpr\layerheight + 2.5mm\relax/\dimexpr 5mm\relax\relax - \multiput(0,0)(0,-5mm\@gobble){\@tempcnta}{% - \line(1,0){2mm\@gobble}% + \multiput(0,0)(0,-5){\@tempcnta}{% + \line(1,0){2}% }% \@tempcnta\numexpr \dimexpr\layerheight + .5cm\relax/\dimexpr 1cm\relax\relax - \multiput(0,0)(0,-1cm\@gobble){\@tempcnta}{% - \put(0,0){\line(1,0){3mm\@gobble}}% - \put(3.5mm\@gobble,0){% + \multiput(0,0)(0,-10){\@tempcnta}{% + \put(0,0){\line(1,0){3}}% + \put(3.5,0){% \makebox(0,0)[cl]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% - \put(\layerwidth\@gobble,0){\line(0,-1){\layerheight\@gobble}}% + \put(\LenToUnit{\layerwidth},0){\line(0,-1){\LenToUnit{\layerheight}}}% \@tempcnta\numexpr \dimexpr\layerheight + .05in\relax/\dimexpr .1in\relax\relax - \multiput(\layerwidth\@gobble,0)(0,-.1in\@gobble){\@tempcnta}{% - \line(-1,0){1mm\@gobble}% + \multiput(\LenToUnit{\layerwidth},0)(0,-2.54){\@tempcnta}{% + \line(-1,0){1}% }% \@tempcnta\numexpr \dimexpr\layerheight + .25in\relax/\dimexpr .5in\relax\relax - \multiput(\layerwidth\@gobble,0)(0,-.5in\@gobble){\@tempcnta}{% - \line(-1,0){2mm\@gobble}% + \multiput(\LenToUnit{\layerwidth},0)(0,-12.7){\@tempcnta}{% + \line(-1,0){2}% }% \@tempcnta\numexpr \dimexpr\layerheight + .5in\relax/\dimexpr 1in\relax\relax - \multiput(\layerwidth\@gobble,0)(0,-1in\@gobble){\@tempcnta}{% - \put(0,0){\line(-1,0){3mm\@gobble}}% - \put(-3.5mm\@gobble,0){% + \multiput(\LenToUnit{\layerwidth},0)(0,-25.4){\@tempcnta}{% + \put(0,0){\line(-1,0){3}}% + \put(-3.5,0){% \makebox(0,0)[cr]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% \end{picture}}% } +\providecommand*{\LenToUnit}[1]{\strip@pt\dimexpr#1*\p@/\unitlength} \DefineFamily{KOMAarg} \DefineFamilyMember[.definelayerpagestyle]{KOMAarg} \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onselect}{% @@ -1417,7 +1439,9 @@ (\csname scr@l@#3@w\endcsname,% \csname scr@l@#3@h\endcsname)% [\csname scr@l@#3@align\endcsname]% - {\csname scr@l@#3@contents\endcsname}% + {\csname layer\csname scr@l@#3@mode\endcsname + mode\expandafter\endcsname + \csname scr@l@#3@contents\endcsname}% \fi \fi \fi @@ -1434,26 +1458,26 @@ \edef\layeryoffset{#2}% \edef\layerwidth{#3}% \edef\layerheight{#4}% - \def\scr@l@valign{t}% - \def\scr@l@halign{l}% + \def\layervalign{t}% + \def\layerhalign{l}% \edef\reserved@b{#5}% \expandafter\@tfor\expandafter\reserved@a\expandafter:\expandafter=% \reserved@b\do{% \if t\reserved@a - \def\scr@l@valign{t}% + \def\layervalign{t}% \else \if c\reserved@a - \def\scr@l@valign{c}% - \def\scr@l@halign{c}% + \def\layervalign{c}% + \def\layerhalign{c}% \else \if b\reserved@a - \def\scr@l@valign{b}% + \def\layervalign{b}% \else \if l\reserved@a - \def\scr@l@halign{l}% + \def\layerhalign{l}% \else \if r\reserved@a - \def\scr@l@halign{r}% + \def\layerhalign{r}% \else \PackageWarning{scrlayer}{% Unknown alignment `\reserved@a' ignored}% @@ -1465,12 +1489,12 @@ }% \parbox[t][\z@][t]{\z@}{% \vskip\layeryoffset - \if b\scr@l@valign\vskip-\layerheight\fi - \if c\scr@l@valign\vskip-.5\dimexpr\layerheight\relax\fi + \if b\layervalign\vskip-\layerheight\fi + \if c\layervalign\vskip-.5\dimexpr\layerheight\relax\fi \makebox[\z@][l]{% \hskip\layerxoffset - \makebox[\z@][\scr@l@halign]{% - \parbox[\scr@l@valign][\layerheight][\scr@l@valign]{\layerwidth}{% + \makebox[\z@][\layerhalign]{% + \parbox[\layervalign][\layerheight][\layervalign]{\layerwidth}{% \vskip\z@\strut{% \ifscrlayer@forceignoreuppercase \expandafter\let\csname MakeUppercase \endcsname\@firstofone @@ -1485,6 +1509,27 @@ }% \endgroup } +\newcommand{\layerrawmode}[1]{#1} +\newcommand{\layertextmode}[1]{#1} +\newcommand{\layerpicturemode}[1]{% + \begin{picture}(0,0) + (0,\LenToUnit{% + \if t\layervalign \dimexpr\layerheight-\ht\strutbox\relax + \else + \if b\layervalign \dp\strutbox + \else .5\dimexpr\layerheight-\ht\strutbox+\dp\strutbox\relax + \fi + \fi}) + \long\def\putLL##1{\put(0,0){##1}}% + \long\def\putUL##1{\put(0,\LenToUnit{\layerheight}){##1}}% + \long\def\putLR##1{\put(\LenToUnit{\layerwidth},0){##1}}% + \long\def\putUR##1{\put(\LenToUnit{\layerwidth},% + \LenToUnit{\layerheight}){##1}}% + \long\def\putC##1{\put(\LenToUnit{.5\dimexpr\layerwidth\relax},% + \LenToUnit{.5\dimexpr\layerheight\relax}){##1}}% + #1% + \end{picture}% +} \newcommand*{\DeclareNewPageStyleByLayers}[2][]{% \@ifundefined{ps@#2}{}{% \PackageError{scrlayer}{% @@ -2105,7 +2150,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (final) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty index 67cca69968b..b22c16927b8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -60,7 +60,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -82,17 +82,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \scr@ifundefinedorrelax{KOMAClassName}{% @@ -147,7 +147,7 @@ } \AtEndOfPackage {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi @@ -162,11 +162,11 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ %%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -680,7 +680,7 @@ %%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \newcommand*{\LoadLetterOption}[1]{% @@ -845,7 +845,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% \PackageInfo{scrletter% @@ -1214,112 +1214,139 @@ package\MessageBreak (e.g. `Babel', `german', `ngerman', ...)}% \ifx\l@american\undefined\else\ifnum\language=\l@american - \captionsamerican - \dateamerican + \@nameuse{captionsamerican}% + \@nameuse{extrasamerican}% + \@nameuse{dateamerican}% \fi\fi \ifx\l@australian\undefined\else\ifnum\language=\l@australian - \captionsaustralian - \dateaustralian + \@nameuse{captionsaustralian}% + \@nameuse{extrasaustralian}% + \@nameuse{dateaustralian}% \fi\fi \ifx\l@british\undefined\else\ifnum\language=\l@british - \captionsbritish - \datebritish + \@nameuse{captionsbritish}% + \@nameuse{extrasbritish}% + \@nameuse{datebritish}% \fi\fi \ifx\l@canadian\undefined\else\ifnum\language=\l@canadian - \captionscanadian - \datecanadian + \@nameuse{captionscanadian}% + \@nameuse{extrascanadian}% + \@nameuse{datecanadian}% \fi\fi \ifx\l@newzealand\undefined\else\ifnum\language=\l@newzealand - \captionsnewzealand - \datenewzealand + \@nameuse{captionsnewzealand}% + \@nameuse{extrasnewzealand}% + \@nameuse{datenewzealand}% \fi\fi \ifx\l@UKenglish\undefined\else\ifnum\language=\l@UKenglish - \captionsUKenglish - \dateUKenglish + \@nameuse{captionsUKenglish}% + \@nameuse{extrasUKenglish}% + \@nameuse{dateUKenglish}% \fi\fi \ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish - \captionsUSenglish - \dateUSenglish + \@nameuse{captionsUSenglish}% + \@nameuse{extrasUSenglish}% + \@nameuse{dateUSenglish}% \fi\fi \ifx\l@austrian\undefined\else\ifnum\language=\l@austrian - \captionsaustrian - \dateaustrian + \@nameuse{captionsaustrian}% + \@nameuse{extrasaustrian}% + \@nameuse{dateaustrian}% \fi\fi \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian - \captionsnaustrian - \datenaustrian + \@nameuse{captionsnaustrian}% + \@nameuse{extrasnaustrian}% + \@nameuse{datenaustrian}% \fi\fi \ifx\l@german\undefined\else\ifnum\language=\l@german - \captionsgerman - \dategerman + \@nameuse{captionsgerman}% + \@nameuse{extrasgerman}% + \@nameuse{dategerman}% \fi\fi \ifx\l@ngerman\undefined\else\ifnum\language=\l@ngerman - \captionsngerman - \datengerman + \@nameuse{captionsngerman}% + \@nameuse{extrasngerman}% + \@nameuse{datengerman}% \fi\fi \ifx\l@swissgerman\undefined\else\ifnum\language=\l@swissgerman - \captionsswissgerman - \dateswissgerman + \@nameuse{captionsswissgerman}% + \@nameuse{extrasswissgerman}% + \@nameuse{dateswissgerman}% \fi\fi \ifx\l@nswissgerman\undefined\else\ifnum\language=\l@nswissgerman - \captionsnswissgerman - \datenswissgerman + \@nameuse{captionsnswissgerman}% + \@nameuse{extrasnswissgerman}% + \@nameuse{datenswissgerman}% \fi\fi \ifx\l@acadian\undefined\else\ifnum\language=\l@acadian - \captionsacadian - \dateacadian + \@nameuse{captionsacadian}% + \@nameuse{extrasacadian}% + \@nameuse{dateacadian}% \fi\fi \ifx\l@canadien\undefined\else\ifnum\language=\l@canadien - \captionscanadien - \datecanadien + \@nameuse{captionscanadien}% + \@nameuse{extrascanadien}% + \@nameuse{datecanadien}% \fi\fi \ifx\l@francais\undefined\else\ifnum\language=\l@francais - \captionsfrancais - \datefrancais + \@nameuse{captionsfrancais}% + \@nameuse{extrasfrancais}% + \@nameuse{datefrancais}% \fi\fi \ifx\l@french\undefined\else\ifnum\language=\l@french - \captionsfrench - \datefrench + \@nameuse{captionsfrench}% + \@nameuse{extrasfrench}% + \@nameuse{datefrench}% \fi\fi \ifx\l@italian\undefined\else\ifnum\language=\l@italian - \captionsitalian - \dateitalian + \@nameuse{captionsitalian}% + \@nameuse{extrasitalian}% + \@nameuse{dateitalian}% \fi\fi \ifx\l@spanish\undefined\else\ifnum\language=\l@spanish - \captionsspanish - \datespanish + \@nameuse{captionsspanish}% + \@nameuse{extrasspanish}% + \@nameuse{datespanish}% \fi\fi \ifx\l@croatian\undefined\else\ifnum\language=\l@croatian - \captionscroatian - \datecroatian + \@nameuse{captionscroatian}% + \@nameuse{extrascroatian}% + \@nameuse{datecroatian}% \fi\fi \ifx\l@dutch\undefined\else\ifnum\language=\l@dutch - \captionsdutch - \datedutch + \@nameuse{captionsdutch}% + \@nameuse{extrasdutch}% + \@nameuse{datedutch}% \fi\fi \ifx\l@finnish\undefined\else\ifnum\language=\l@finnish - \captionsfinnish - \datefinnish + \@nameuse{captionsfinnish}% + \@nameuse{extrasfinnish}% + \@nameuse{datefinnish}% \fi\fi \ifx\l@norsk\undefined\else\ifnum\language=\l@norsk - \captionsnorsk - \datenorsk + \@nameuse{captionsnorsk}% + \@nameuse{extrasnorsk}% + \@nameuse{datenorsk}% \fi\fi \ifx\l@swedish\undefined\else\ifnum\language=\l@swedish - \captionsswedish - \dateswedish + \@nameuse{captionsswedish}% + \@nameuse{extrasswedish}% + \@nameuse{dateswedish}% \fi\fi \ifx\l@polish\undefined\else\ifnum\language=\l@polish - \captionspolish - \datepolish + \@nameuse{captionspolish}% + \@nameuse{extraspolish}% + \@nameuse{datepolish}% \fi\fi \ifx\l@czech\undefined\else\ifnum\language=\l@czech - \captionsczech - \dateczech + \@nameuse{captionsczech}% + \@nameuse{extrasczech}% + \@nameuse{dateczech}% \fi\fi \ifx\l@slovak\undefined\else\ifnum\language=\l@slovak - \captionsslovak - \dateslovak + \@nameuse{captionsslovak}% + \@nameuse{extrasslovak}% + \@nameuse{dateslovak}% \fi\fi \else \edef\@tempa{nohyphenation}% @@ -1539,7 +1566,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{% \letterpagemark }{% @@ -1570,7 +1597,7 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \newkomavar{firsthead} \setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% @@ -2628,17 +2655,28 @@ \fi } \newenvironment{letter}[2][]{% - \newpage - \if@twoside\ifodd\c@page\else\thispagestyle{empty}\null\newpage\fi\fi + \cleardoubleoddemptypage + \scr@ifundefinedorrelax{letterpagestyle}{}{% + \ifx\letterpagestyle\@empty\else + \pagestyle{\letterpagestyle}% + \fi + }% \let\pagemark\letterpagemark + \refstepcounter{letter}% + \let\thisletter\@currentlabel \setcounter{page}{\@ne}% \setcounter{footnote}{0}% \interlinepenalty=200\@processto{#2}% \KOMAoptions{#1}% \@beginletterhook }{% - \stopletter\@@par\pagebreak\@@par% + \stopletter + \let\@currentlabel\thisletter + \label{\thisletter.lastpage}% + \@@par\pagebreak\@@par% } +\newcommand*{\thisletter}{outside.letter.undefined} +\newcommand*{\letterlastpage}{\pageref{\thisletter.lastpage}} \newcommand*{\stopletter}{} \newcommand{\@processto}[1]{% \ifx\relax#1\relax\else @@ -2652,6 +2690,10 @@ \g@addto@macro\flushbottom{% \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}% } +\newcounter{letter} +\newcommand*{\letterpagestyle}{% + plain.letter% +} \newcommand{\AtBeginLetter}{\g@addto@macro\@beginletterhook} \newcommand{\@beginletterhook}{} \newcommand{\AtEndLetter}{\g@addto@macro\stopletter} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 5b336d88f95..bd3437ea9ff 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -41,7 +41,7 @@ %% %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \ProvidesPackage{scrlfile}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (loading files)] \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname% ^^J\@spaces\@spaces\@spaces\@spaces\space\space diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index e72cb65fac8..542dddaa311 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -71,7 +71,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -93,7 +93,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -108,12 +108,12 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \newcommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -209,6 +209,8 @@ \@namedef{scr@v@3.17a}{15} \@namedef{scr@v@3.17c}{15} \@namedef{scr@v@3.18}{15} +\@namedef{scr@v@3.18a}{15} +\@namedef{scr@v@3.19}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -259,7 +261,7 @@ } \AtEndOfClass {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi @@ -274,7 +276,7 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\@ptsize{% 12% } @@ -343,7 +345,7 @@ } %%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -448,7 +450,7 @@ \DeclareOption*{% \lco@test \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -456,7 +458,10 @@ \def\scr@parindent{#1}% \def\scr@parskip{#2}% \def\scr@parfillskip{#3}% - \def\par@update{\let\par@update\default@par@update\par@updaterelative}% + \def\par@update{% + \if@atdocument\let\par@update\default@par@update\fi + \par@updaterelative + }% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% @@ -609,14 +614,14 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }{% \KOMAoptions{headinclude=#1}{}% }% @@ -630,7 +635,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }{% \KOMAoptions{footinclude=#1}% }% @@ -736,7 +741,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $ -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -807,7 +812,7 @@ \ifhmode\spacefactor\@x@sf\fi \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -1354,7 +1359,7 @@ parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% \begingroup @@ -1366,7 +1371,7 @@ \expandafter\endgroup\@tempa }% \fi -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2048,7 +2053,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% \ClassInfo{scrlttr2% @@ -2417,112 +2422,139 @@ package\MessageBreak (e.g. `Babel', `german', `ngerman', ...)}% \ifx\l@american\undefined\else\ifnum\language=\l@american - \captionsamerican - \dateamerican + \@nameuse{captionsamerican}% + \@nameuse{extrasamerican}% + \@nameuse{dateamerican}% \fi\fi \ifx\l@australian\undefined\else\ifnum\language=\l@australian - \captionsaustralian - \dateaustralian + \@nameuse{captionsaustralian}% + \@nameuse{extrasaustralian}% + \@nameuse{dateaustralian}% \fi\fi \ifx\l@british\undefined\else\ifnum\language=\l@british - \captionsbritish - \datebritish + \@nameuse{captionsbritish}% + \@nameuse{extrasbritish}% + \@nameuse{datebritish}% \fi\fi \ifx\l@canadian\undefined\else\ifnum\language=\l@canadian - \captionscanadian - \datecanadian + \@nameuse{captionscanadian}% + \@nameuse{extrascanadian}% + \@nameuse{datecanadian}% \fi\fi \ifx\l@newzealand\undefined\else\ifnum\language=\l@newzealand - \captionsnewzealand - \datenewzealand + \@nameuse{captionsnewzealand}% + \@nameuse{extrasnewzealand}% + \@nameuse{datenewzealand}% \fi\fi \ifx\l@UKenglish\undefined\else\ifnum\language=\l@UKenglish - \captionsUKenglish - \dateUKenglish + \@nameuse{captionsUKenglish}% + \@nameuse{extrasUKenglish}% + \@nameuse{dateUKenglish}% \fi\fi \ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish - \captionsUSenglish - \dateUSenglish + \@nameuse{captionsUSenglish}% + \@nameuse{extrasUSenglish}% + \@nameuse{dateUSenglish}% \fi\fi \ifx\l@austrian\undefined\else\ifnum\language=\l@austrian - \captionsaustrian - \dateaustrian + \@nameuse{captionsaustrian}% + \@nameuse{extrasaustrian}% + \@nameuse{dateaustrian}% \fi\fi \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian - \captionsnaustrian - \datenaustrian + \@nameuse{captionsnaustrian}% + \@nameuse{extrasnaustrian}% + \@nameuse{datenaustrian}% \fi\fi \ifx\l@german\undefined\else\ifnum\language=\l@german - \captionsgerman - \dategerman + \@nameuse{captionsgerman}% + \@nameuse{extrasgerman}% + \@nameuse{dategerman}% \fi\fi \ifx\l@ngerman\undefined\else\ifnum\language=\l@ngerman - \captionsngerman - \datengerman + \@nameuse{captionsngerman}% + \@nameuse{extrasngerman}% + \@nameuse{datengerman}% \fi\fi \ifx\l@swissgerman\undefined\else\ifnum\language=\l@swissgerman - \captionsswissgerman - \dateswissgerman + \@nameuse{captionsswissgerman}% + \@nameuse{extrasswissgerman}% + \@nameuse{dateswissgerman}% \fi\fi \ifx\l@nswissgerman\undefined\else\ifnum\language=\l@nswissgerman - \captionsnswissgerman - \datenswissgerman + \@nameuse{captionsnswissgerman}% + \@nameuse{extrasnswissgerman}% + \@nameuse{datenswissgerman}% \fi\fi \ifx\l@acadian\undefined\else\ifnum\language=\l@acadian - \captionsacadian - \dateacadian + \@nameuse{captionsacadian}% + \@nameuse{extrasacadian}% + \@nameuse{dateacadian}% \fi\fi \ifx\l@canadien\undefined\else\ifnum\language=\l@canadien - \captionscanadien - \datecanadien + \@nameuse{captionscanadien}% + \@nameuse{extrascanadien}% + \@nameuse{datecanadien}% \fi\fi \ifx\l@francais\undefined\else\ifnum\language=\l@francais - \captionsfrancais - \datefrancais + \@nameuse{captionsfrancais}% + \@nameuse{extrasfrancais}% + \@nameuse{datefrancais}% \fi\fi \ifx\l@french\undefined\else\ifnum\language=\l@french - \captionsfrench - \datefrench + \@nameuse{captionsfrench}% + \@nameuse{extrasfrench}% + \@nameuse{datefrench}% \fi\fi \ifx\l@italian\undefined\else\ifnum\language=\l@italian - \captionsitalian - \dateitalian + \@nameuse{captionsitalian}% + \@nameuse{extrasitalian}% + \@nameuse{dateitalian}% \fi\fi \ifx\l@spanish\undefined\else\ifnum\language=\l@spanish - \captionsspanish - \datespanish + \@nameuse{captionsspanish}% + \@nameuse{extrasspanish}% + \@nameuse{datespanish}% \fi\fi \ifx\l@croatian\undefined\else\ifnum\language=\l@croatian - \captionscroatian - \datecroatian + \@nameuse{captionscroatian}% + \@nameuse{extrascroatian}% + \@nameuse{datecroatian}% \fi\fi \ifx\l@dutch\undefined\else\ifnum\language=\l@dutch - \captionsdutch - \datedutch + \@nameuse{captionsdutch}% + \@nameuse{extrasdutch}% + \@nameuse{datedutch}% \fi\fi \ifx\l@finnish\undefined\else\ifnum\language=\l@finnish - \captionsfinnish - \datefinnish + \@nameuse{captionsfinnish}% + \@nameuse{extrasfinnish}% + \@nameuse{datefinnish}% \fi\fi \ifx\l@norsk\undefined\else\ifnum\language=\l@norsk - \captionsnorsk - \datenorsk + \@nameuse{captionsnorsk}% + \@nameuse{extrasnorsk}% + \@nameuse{datenorsk}% \fi\fi \ifx\l@swedish\undefined\else\ifnum\language=\l@swedish - \captionsswedish - \dateswedish + \@nameuse{captionsswedish}% + \@nameuse{extrasswedish}% + \@nameuse{dateswedish}% \fi\fi \ifx\l@polish\undefined\else\ifnum\language=\l@polish - \captionspolish - \datepolish + \@nameuse{captionspolish}% + \@nameuse{extraspolish}% + \@nameuse{datepolish}% \fi\fi \ifx\l@czech\undefined\else\ifnum\language=\l@czech - \captionsczech - \dateczech + \@nameuse{captionsczech}% + \@nameuse{extrasczech}% + \@nameuse{dateczech}% \fi\fi \ifx\l@slovak\undefined\else\ifnum\language=\l@slovak - \captionsslovak - \dateslovak + \@nameuse{captionsslovak}% + \@nameuse{extrasslovak}% + \@nameuse{dateslovak}% \fi\fi \else \edef\@tempa{nohyphenation}% @@ -2742,7 +2774,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2753,7 +2785,7 @@ \let\x@@paper =\relax \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \newcommand*{\scr@selectfont}{} @@ -2836,7 +2868,7 @@ \begingroup \edef\@tempa{#2}% \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}% + \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}% \@tempa } \newcommand*{\scr@@defaultunits}{} @@ -2851,16 +2883,16 @@ \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{% \ifx\relax#2\relax \@defaultunits\@tempskipa#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \else \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \@defaultunits\@tempskipa#2pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi \ifx\relax#4\relax\else \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi } \newcommand*{\@list@extra}{% @@ -2879,7 +2911,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -2979,7 +3011,7 @@ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -3258,7 +3290,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% Deprecated usage of \string\@firsthead.\MessageBreak @@ -4380,16 +4412,27 @@ \setkomavar{nextfoot}% } \newenvironment{letter}[2][]{% - \newpage - \if@twoside\ifodd\c@page\else\thispagestyle{empty}\null\newpage\fi\fi + \cleardoubleoddemptypage + \scr@ifundefinedorrelax{letterpagestyle}{}{% + \ifx\letterpagestyle\@empty\else + \pagestyle{\letterpagestyle}% + \fi + }% + \refstepcounter{letter}% + \let\thisletter\@currentlabel \setcounter{page}{\@ne}% \setcounter{footnote}{0}% \interlinepenalty=200\@processto{#2}% \KOMAoptions{#1}% \@beginletterhook }{% - \stopletter\@@par\pagebreak\@@par% + \stopletter + \let\@currentlabel\thisletter + \label{\thisletter.lastpage}% + \@@par\pagebreak\@@par% } +\newcommand*{\thisletter}{outside.letter.undefined} +\newcommand*{\letterlastpage}{\pageref{\thisletter.lastpage}} \newcommand*{\stopletter}{} \newcommand{\@processto}[1]{% \ifx\relax#1\relax\else @@ -4403,6 +4446,9 @@ \g@addto@macro\flushbottom{% \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}% } +\newcounter{letter} +\newcommand*{\letterpagestyle}{% +} \newcommand{\AtBeginLetter}{\g@addto@macro\@beginletterhook} \newcommand{\@beginletterhook}{} \newcommand{\AtEndLetter}{\g@addto@macro\stopletter} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index a11d3358c31..f708b393cf6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty @@ -42,7 +42,7 @@ %%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrpage2}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (page head and foot)] \newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{% \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index b83c40c3456..ab0e0c646ca 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -74,7 +74,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -96,7 +96,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -111,21 +111,21 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \RequirePackage{tocbasic}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: prepare) \newif\if@openright \@openrightfalse @@ -190,7 +190,7 @@ \newcommand*{\scr@chapter@afterskip}{\z@} \let\scr@chapter@afterskip\z@ \newcommand*{\scr@chapter@innerskip}{\z@} -\let\scr@chapter@sectionindent\z@ +\let\scr@chapter@innerskip\z@ \newcommand*{\scr@chapter@style}{chapter} \newcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}} \newcommand*{\chapterheadendvskip}{\vskip\@tempskipa} @@ -201,7 +201,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -322,6 +322,8 @@ \@namedef{scr@v@3.17a}{15} \@namedef{scr@v@3.17c}{15} \@namedef{scr@v@3.18}{15} +\@namedef{scr@v@3.18a}{15} +\@namedef{scr@v@3.19}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -357,8 +359,8 @@ {final}{draft=false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\@ptsize{% 11% } @@ -425,7 +427,7 @@ \KOMAClassFileName }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -531,7 +533,7 @@ {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -539,7 +541,10 @@ \def\scr@parindent{#1}% \def\scr@parskip{#2}% \def\scr@parfillskip{#3}% - \def\par@update{\let\par@update\default@par@update\par@updaterelative}% + \def\par@update{% + \if@atdocument\let\par@update\default@par@update\fi + \par@updaterelative + }% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% @@ -692,7 +697,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newif\if@titlepage \@titlepagetrue \newif\if@titlepageiscoverpage @@ -726,7 +731,7 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareStandardOption{abstracton}{abstract=true} \KOMA@DeclareStandardOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -988,14 +993,14 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }{% \KOMAoptions{headinclude=#1}{}% }% @@ -1009,7 +1014,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }{% \KOMAoptions{footinclude=#1}% }% @@ -1248,7 +1253,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1318,7 +1323,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% @@ -1756,7 +1761,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\section @@ -1840,7 +1845,7 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} @@ -1850,8 +1855,8 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2289,12 +2294,12 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \def\today{\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2338,7 +2343,7 @@ }\reserved@a \fi \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} @@ -2423,7 +2428,7 @@ \begingroup \edef\@tempa{#2}% \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}% + \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}% \@tempa } \newcommand*{\scr@@defaultunits}{} @@ -2438,16 +2443,16 @@ \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{% \ifx\relax#2\relax \@defaultunits\@tempskipa#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \else \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \@defaultunits\@tempskipa#2pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi \ifx\relax#4\relax\else \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi } \newcommand*{\@list@extra}{% @@ -2466,7 +2471,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% #1% @@ -2660,7 +2665,8 @@ \fi \@maketitle \fi - \thispagestyle{\titlepagestyle}\@thanks + \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi + \@thanks \endgroup \fi \setcounter{footnote}{0}% @@ -2805,7 +2811,7 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \newcommand*{\ifnumbered}[1]{% @@ -2887,6 +2893,7 @@ \fi \@ifstar {% \csname scr@preto@ssect@hook\endcsname + \def\scr@s@ct@@nn@m@{#1}% \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}% }{% \csname scr@preto@sect@hook\endcsname @@ -2994,7 +3001,7 @@ \ifx\@sect\@tempa\else \ClassWarning{\KOMAClassName}{% Unexpected definition of \string\@sect!\MessageBreak - Please send an information about this to\MessageBreak + Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak of \string\@sect\space}% @@ -3029,9 +3036,8 @@ \@tempskipa \glueexpr #5\relax\relax \ifdim \@tempskipa>\z@ \begingroup - #6{% - \@hangfrom{\hskip \glueexpr #3\relax\@svsec}% - \interlinepenalty \@M #8\@@par}% + #6{\interlinepenalty \@M + \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}% \endgroup \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -3050,8 +3056,7 @@ \fi \else \def\@svsechd{% - #6{\hskip \glueexpr #3\relax - \@svsec #8}% + #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}% \expandafter\csname #1mark\expandafter\endcsname \expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -3084,6 +3089,61 @@ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi } \newif\if@scr@tempswa +\newcommand{\sectionlinesformat}[4]{% + \@hangfrom{\hskip #2#3}{#4}% +} +\newcommand{\sectioncatchphraseformat}[4]{% + \hskip #2#3#4% +} +\def\@tempa#1#2#3#4#5{% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{% + \@hangfrom{\hskip #1}% + \interlinepenalty \@M #5\@@par}% + \endgroup + \else + \def\@svsechd{#4{\hskip #1\relax #5}}% + \fi + \@xsect{#3}} +\ifx\@ssect\@tempa\else + \ClassWarning{\KOMAClassName}{% + Unexpected definition of \string\@ssect!\MessageBreak + Please send information about this to\MessageBreak + the KOMA-Script maintainer!\MessageBreak + Maybe LaTeX will be broken by the redefinition\MessageBreak + of \string\@ssect\space}% +\fi +\def\@ssect#1#2#3#4#5{% + \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{% + \ClassWarning{\KOMAClassName}{incompatible usage of + \string\@ssect\space detected.\MessageBreak + You've used the KOMA-Script implementation of + \string\@ssect\MessageBreak + from within a non compatible caller, that does not\MessageBreak + \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@}% + }{}% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{\interlinepenalty \@M + \expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}% + {\glueexpr #1\relax}\@empty{#5}\@@par}% + \endgroup + \else + \edef\@svsechd{% + \unexpanded{#4}{% + \noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}% + \unexpanded{{\glueexpr #1\relax}\@empty{#5}}% + }% + }% + \fi + \let\scr@s@ct@@nn@m@\relax + \@xsect{\glueexpr #3\relax}% +} \newcommand*{\scr@IfUsePrefixLineWarning}[2]{% \ClassWarning{\KOMAClassName}{% usage of \string\IfUsePrefixLine\space outside @@ -3352,6 +3412,8 @@ }% }\reserved@a }% + \FamilyStringKey[.dsc]{KOMAarg}{counterwithout}{\scr@local@counterwithout}% + \let\scr@local@counterwithout\relax \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}% \let\scr@local@counterwithin\relax \scr@ifundefinedorrelax{scr@local@tocleveloffset}{% @@ -3418,6 +3480,13 @@ \endgroup \@firstofone{% \@ifundefined{c@#2}{\newcounter{#2}}{}% + \ifx\scr@local@counterwithout\relax + \else\ifx\scr@local@counterwithout\@empty + \else + \@removefromreset{#2}{\scr@local@counterwithout}% + \fi + \@namedef{the#2}{\arabic{#2}}% + \fi \ifx\scr@local@counterwithin\relax \else\ifx\scr@local@counterwithin\@empty \@namedef{the#2}{\arabic{#2}}% @@ -3776,7 +3845,11 @@ } \newcommand*{\scr@startpart}[1]{% \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\@nameuse{#1pagestyle}}% + \scr@ifundefinedorrelax{#1pagestyle}{}{% + \ifstr{#1pagestyle}{}{}{% + \thispagestyle{\@nameuse{#1pagestyle}}% + }% + }% \if@twocolumn \onecolumn \@tempswatrue @@ -3974,7 +4047,11 @@ \newkomafont{partentrypagenumber}{} \newcommand*{\scr@startchapter}[1]{% \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\@nameuse{#1pagestyle}}% + \scr@ifundefinedorrelax{#1pagestyle}{}{% + \ifstr{#1pagestyle}{}{}{% + \thispagestyle{\@nameuse{#1pagestyle}}% + }% + }% \global\@topnum\z@ \@afterindentfalse \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname @@ -4092,38 +4169,44 @@ \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak - \usefontofkomafont{#1}% - \def\IfUseNumber{\ifnumbered{#1}}% + \def\IfUseNumber{\ifnumbered{#1}}% + \def\IfUseNumber{\ifnumbered{#1}}% \if@chapterprefix - \raggedchapter \let\IfUsePrefixLine\@firstoftwo - \let\@tempa\@firstofone \else \let\IfUsePrefixLine\@secondoftwo - \let\@tempa\@hangfrom \fi - \@tempa{% - \IfUseNumber{% - \usekomafont{#1}{% + \normalfont\usekomafont{disposition}{% + \usekomafont{#1}{% + \settoheight{\@tempskipa}{% + {\usekomafont{#1prefix}{% + \vrule \@width\z@ \@height\csname scr@#1@innerskip\endcsname}}% + }% + \raggedchapter + \IfUseNumber{% \IfUsePrefixLine{% - {\usekomafont{#1prefix}{% - \csname #1format\endcsname - \setlength{\@tempskipa}{% - \csname scr@#1@innerskip\endcsname - }% - \chapterheadmidvskip - }}% + \chapterlineswithprefixformat{#1}% + {{\usekomafont{#1prefix}{\csname #1format\endcsname% + \setlength{\@tempskipa}{\csname scr@#1@innerskip\endcsname}% + \chapterheadmidvskip}}}% + {\interlinepenalty \@M#2\@@par}% }{% - \csname #1format\endcsname + \chapterlinesformat{#1}% + {\csname #1format\endcsname}% + {\interlinepenalty \@M#2\@@par}% + }% + }{% + \IfUsePrefixLine{% + \chapterlineswithprefixformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }{% + \chapterlinesformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% }% }% - }{}% - }% - {% - \IfUsePrefixLine{}{\raggedchapter}% - \interlinepenalty \@M - \usekomafont{#1}{#2}\par + }% }% }% \nobreak\par\nobreak @@ -4137,14 +4220,38 @@ \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak\usekomafont{#1}{}% - \raggedchapter \interlinepenalty \@M \usekomafont{#1}{#2}\par + \let\IfUseNumber\secondoftwo + \if@chapterprefix + \let\IfUsePrefixLine\@firstoftwo + \else + \let\IfUsePrefixLine\@secondoftwo + \fi + \normalfont\usekomafont{disposition}{% + \usekomafont{#1}{% + \raggedchapter + \IfUsePrefixLine{% + \chapterlineswithprefixformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }{% + \chapterlinesformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }% + }% + }% }% \nobreak\par\nobreak - \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax + \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \chapterheadendvskip } +\newcommand{\chapterlinesformat}[3]{% + \@hangfrom{#2}{#3}% +} +\newcommand{\chapterlineswithprefixformat}[3]{% + #2#3% +} \newcommand*{\use@chapter@o@preamble}[1]{% {% \settoheight{\@tempdima}{% @@ -4647,7 +4754,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -5293,7 +5400,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -5431,7 +5538,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \doforeachtocfile[float]{% \setuptoc{\@currext}{chapteratlist}% } @@ -5501,7 +5608,7 @@ usage of deprecated \string\toc@heading!\MessageBreak You should use the features of package `tocbasic'\MessageBreak instead of \string\toc@heading.\MessageBreak - Definition of \string\toc@heading\space my be removed from\MessageBreak + Definition of \string\toc@heading\space may be removed from\MessageBreak KOMA-Script soon, so it should not be used }% \chapter*{\contentsname}% @@ -5654,7 +5761,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -5687,7 +5794,8 @@ \columnsep 35\p@ \setchapterpreamble{\index@preamble}% \idx@heading% - \thispagestyle{\indexpagestyle}\parindent\z@ + \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi + \parindent\z@ \setlength{\parskip}{\z@ \@plus .3\p@}% \setlength{\parfillskip}{\z@ \@plus 1fil}% \let\item\@idxitem diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 805331f88f3..4c9147e6ea9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \ProvidesFile{% scrsize10pt.clo% }[\KOMAScriptVersion\space font size class option % @@ -149,7 +149,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index c43550fe868..1edfd540ecc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \ProvidesFile{% scrsize11pt.clo% }[\KOMAScriptVersion\space font size class option % @@ -149,7 +149,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index 82dd886bf60..cc895196fbe 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \ProvidesFile{% scrsize12pt.clo% }[\KOMAScriptVersion\space font size class option % @@ -149,7 +149,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index 81b6d291eea..37b89b00b6d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ \newif\if@Hxii diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index 90bbc5678ed..5262fee95d1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak +++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \ProvidesFile{setspace.hak}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (hacking package setspace)% ] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \scr@ifexpected{\onehalfspacing}{% \long\def\onehalfspacing{% \setstretch{1.25}% default diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 522e9af8727..591d154d80f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -42,7 +42,7 @@ %%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (handling toc-files)% ] diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 9f3d0233d9e..0a1ee19c768 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,16 +67,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (type area)] \typeout{% Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J% @@ -85,9 +85,9 @@ \@spaces\@spaces\@spaces\@spaces\space\space Copyright (C) Markus Kohm, 1994-^^J% } -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}} \newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}} \newlength{\ta@bcor} @@ -375,7 +375,7 @@ \or \edef\@pagesizelast{automedia}% \if@atdocument - \set@pdftextpagesize + \set@pdftexpagesize \set@vtexpagesize \set@dvipspagesize \fi @@ -673,7 +673,7 @@ \KOMA@ifkey{usegeometry}{@ta@usegeometry} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \providecommand* {\scr@compatibility}{\scr@v@last} \newcommand*{\scr@ta@compatibility}{\scr@compatibility} @@ -775,6 +775,8 @@ \@namedef{scr@v@3.17a}{15} \@namedef{scr@v@3.17c}{15} \@namedef{scr@v@3.18}{15} +\@namedef{scr@v@3.18a}{15} +\@namedef{scr@v@3.19}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@ta@v@is@lt}[1]{% \scr@ta@compatibility<\@nameuse{scr@v@#1} @@ -788,7 +790,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \InputIfFileExists{typearea.cfg}{% \typeout{% ***************************************^^J% @@ -1504,7 +1506,7 @@ \fi } \typearea[current]{current} -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 864f3297486..c0f6dc36d08 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% @@ -574,7 +574,7 @@ \newcommand*{\showUScheck}{% \showenvelope(8.625in,3.625in)% } -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \endinput %% %% End of file `visualize.lco'. -- cgit v1.2.3