diff options
Diffstat (limited to 'Master/texmf-dist/source')
66 files changed, 13542 insertions, 5973 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/ChangeLog b/Master/texmf-dist/source/latex/koma-script/ChangeLog index 12f4ccfd9a4..fed09622ba7 100644 --- a/Master/texmf-dist/source/latex/koma-script/ChangeLog +++ b/Master/texmf-dist/source/latex/koma-script/ChangeLog @@ -1,3 +1,1105 @@ +r2458 2016-05-10 14:02:52 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex, doc/english/, + doc/english/scrjura.tex: typofixes by Elke + +r2457 2016-05-09 11:38:14 +0200 kohm: + + * doc/, doc/english/, doc/english/scrjura.tex: Summary: some typo + fixes + +r2456 2016-05-09 11:37:44 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrjura.tex: Summary: + Ãœberflüssiges \ProvidesFile entfernt + +r2455 2016-05-09 11:36:06 +0200 kohm: + + * doc/, doc/scrguide.cls: Summary: \Paragraph has been changed to + \Clause + +r2454 2016-05-09 10:57:53 +0200 kohm: + + * doc/, doc/english/, doc/english/guide-english.tex: Summary: typo + fixes + +r2453 2016-05-09 07:33:31 +0200 kohm: + + * doc/, doc/english/, doc/english/preface.tex: Summary: ready for the + release + +r2452 2016-05-08 10:45:54 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrbookreportarticle.tex: Summary: + typofix + +r2451 2016-05-07 20:11:55 +0200 kohm: + + * scrhack.dtx: Summary: load each hack only once + +r2450 2016-05-07 19:47:53 +0200 kohm: + + * README.in/: Summary: scrhack needs xpatch (for lscape hack) + +r2449 2016-05-07 15:50:41 +0200 kohm: + + * scrhack.dtx: Summary: requires xpatch not only while lscape hack is + loaded but always + +r2448 2016-05-06 11:06:19 +0200 kohm: + + * scrjura.dtx: Summary: docu removed from package source + +r2447 2016-05-06 11:05:08 +0200 kohm: + + * scrstrip.inc: Summary: we have 2016 + +r2446 2016-05-06 10:38:06 +0200 kohm: + + * Makefile: do not make scrjura.pdf any longer + +r2445 2016-05-05 09:22:38 +0200 kohm: + + * doc/, doc/english/, doc/english/preface.tex: two more chapters are + translated + +r2444 2016-05-05 09:16:53 +0200 kohm: + + * doc/, doc/english/, doc/english/scrjura.tex: (almost) complete + translation of the scrjura chapter + +r2443 2016-05-04 10:34:46 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrjura.tex: Hinweis auf zusätzlich + unterstützte Sprachen + +r2442 2016-05-04 10:19:38 +0200 kohm: + + * doc/, doc/Makefile.guide, doc/ngerman/, doc/ngerman/scrjura.tex, + doc/english/, doc/english/scrjura.tex: prepared to have a real chapter + about scrjura + +r2441 2016-04-30 08:43:16 +0200 kohm: + + * doc/, doc/english/, doc/english/common-0.tex: support for more + packages + +r2440 2016-04-29 17:59:32 +0200 kohm: + + * tocbasic.dtx: Summary: empty option list bug in \DeclareNewTOC + [Elke] + +r2439 2016-04-29 07:56:21 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/common-4.tex: Summary: fehlendes + »Klasse« ergänzt + +r2438 2016-04-27 12:58:21 +0200 kohm: + + * scrkernel-tocstyle.dtx, scrkernel-sections.dtx, + scrkernel-basics.dtx: Summary: distinguish between test and assignment + of values + +r2437 2016-04-27 07:57:47 +0200 kohm: + + * obsolete/, obsolete/Makefile: Summary: back to RELEASEDATE instead + of RELEASE because its the version + +r2436 2016-04-27 07:48:45 +0200 kohm: + + * obsolete/, obsolete/Makefile: Summary: using RELEASE instead of + RELEASEDATE for dist-tds + +r2435 2016-04-25 12:42:03 +0200 kohm: + + * scrkernel-tocstyle.dtx: Summary: expand length/number options before + test + +r2434 2016-04-25 11:47:58 +0200 kohm: + + * tocbasic.dtx: Summary: spelling of tocnumwidth in warning message + +r2433 2016-04-23 19:14:01 +0200 kohm: + + * doc/, doc/english/, doc/english/tocbasic.tex: Summary: corrections + by Arndt and Elke + +r2432 2016-04-23 18:42:24 +0200 kohm: + + * tocbasic.dtx: Summary: \DeclareNewTOC hang/indent --> + numwidth/indent [Elke] + +r2431 2016-04-13 07:40:50 +0200 kohm: + + * doc/, doc/english/, doc/english/tocbasic.tex: Summary: Improvements + by A. S. + +r2430 2016-04-12 15:59:04 +0200 kohm: + + * scrkernel-sections.dtx: Summary: issue using amsgen in combination + with \@startsection and spaces between the arguments fixed + +r2429 2016-04-12 14:10:19 +0200 kohm: + + * scrkernel-notepaper.dtx, scrkernel-floats.dtx, + scrkernel-language.dtx, scrkernel-variables.dtx, scrlayer.dtx, + scrkernel-typearea.dtx, scrjura.dtx, scrkernel-sections.dtx, + scrkernel-miscellaneous.dtx, scrtime.dtx, scrlayer-scrpage.dtx, + scrlfile.dtx, tocbasic.dtx, scrkernel-basics.dtx: Summary: \@ifstr + replaced by \kernel@ifstr + +r2428 2016-04-12 12:31:07 +0200 kohm: + + * scrkernel-tocstyle.dtx, scrkernel-floats.dtx, + scrkernel-variables.dtx, scrlayer.dtx, scrdoc.dtx, scrjura.dtx, + scrkernel-letterclassoptions.dtx, tocstyle.dtx, scrpage.dtx, + scrkernel-sections.dtx, scrlayer-scrpage.dtx, scrkernel-fonts.dtx, + scrlfile.dtx, tocbasic.dtx, scrkernel-basics.dtx: Summary: replaced + \@ifnextchar by \kernel@ifnextchar + +r2427 2016-04-12 09:33:09 +0200 kohm: + + * scrjura.dtx, doc/, doc/ngerman/, doc/ngerman/scrjuraexample.tex, + doc/english/, doc/english/scrjuraexample.tex: Summary: Using + clausemark instead of paragraphmark + +r2426 2016-04-12 09:22:06 +0200 kohm: + + * doc/, doc/Makefile, doc/Makefile.guide: Summary: prepare rule + extended (to make scrjura.tex if needed) + +r2425 2016-04-12 09:08:31 +0200 kohm: + + * scrjura.dtx: Summary: paragraphmark has never been documented but + clausemark; so clausemark should exist + +r2424 2016-04-11 08:29:39 +0200 kohm: + + * manifest.txt, doc/, doc/Makefile.guide: Summary: scrjura.tex could + be made from scrjura-non.tex + +r2423 2016-04-11 08:17:06 +0200 kohm: + + * doc/, doc/Makefile.guide, doc/ngerman/, + doc/ngerman/scrjuraexample.tex, doc/english/, + doc/english/scrjuraexample.tex: Summary: scrjuraexample.tex added + +r2422 2016-04-11 08:03:43 +0200 kohm: + + * doc/, doc/Makefile.guide, doc/ngerman/, doc/english/: Summary: + scrjura.tex can be made on-the-fly from scrjura-non.tex + +r2421 2016-04-10 12:16:08 +0200 kohm: + + * TODO, doc/, doc/english/, doc/english/tocbasic.tex: Summary: "helper + file" issue removed + +r2420 2016-04-09 20:02:52 +0200 kohm: + + * doc/, doc/english/, doc/english/tocbasic.tex: Summary: Improved by + A. S. + +r2419 2016-04-07 17:04:37 +0200 kohm: + + * scrkernel-tocstyle.dtx: Summary: fix of break after number bug + +r2418 2016-04-07 16:47:41 +0200 kohm: + + * doc/, doc/english/, doc/english/tocbasic.tex: Summary: Elke's + corrections + +r2417 2016-04-07 11:16:58 +0200 kohm: + + * tocstyle.dtx: Summary: \CheckSum + +r2416 2016-04-07 10:52:42 +0200 kohm: + + * scrkernel-floats.dtx: Summary: late caption position change provided + +r2415 2016-04-07 10:29:28 +0200 kohm: + + * TODO, doc/, doc/ngerman/, doc/ngerman/scrbookreportarticle.tex, + doc/english/, doc/english/scrbookreportarticle.tex: Summary: docu of + \setcapdynwidth + +r2414 2016-04-07 09:48:00 +0200 kohm: + + * doc/, doc/english/, doc/english/scrbookreportarticle-experts.tex: + Summary: label fixed + +r2413 2016-04-07 09:19:47 +0200 kohm: + + * doc/, doc/english/, doc/english/scrbookreportarticle-experts.tex: + Summary: change log entry fixed + +r2412 2016-04-07 09:17:22 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex, doc/english/, + doc/english/tocbasic.tex: Summary: first translation completed + +r2411 2016-04-06 19:07:59 +0200 kohm: + + * doc/, doc/english/, doc/english/tocbasic.tex: Summary: some more + translation + +r2410 2016-04-06 19:07:42 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: typo fix + +r2409 2016-04-06 17:39:52 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: Tippfehler + +r2408 2016-04-06 16:35:25 +0200 kohm: + + * doc/, doc/english/, doc/english/tocbasic.tex: Summary: docu of + \DeclareTOCStyleEntry + +r2407 2016-04-06 11:32:02 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: Small + improvements of new descriptions + +r2406 2016-04-06 11:31:00 +0200 kohm: + + * doc/, doc/english/, doc/english/tocbasic.tex: Summary: Some + translations added + +r2405 2016-04-05 11:15:47 +0200 kohm: + + * TODO, tocbasic.dtx, doc/, doc/scrguide.cls, doc/ngerman/, + doc/ngerman/tocbasic.tex: Summary: new features of \DeclareNewTOC + +r2404 2016-04-05 09:11:03 +0200 kohm: + + * tocbasic.dtx: Summary: docu typo fix + +r2403 2016-04-01 13:34:57 +0200 kohm: + + * scrkernel-notepaper.dtx: Summary: delayed loading of marvosym + improved + +r2402 2016-03-31 18:16:47 +0200 kohm: + + * TODO: Summary: new feature need new docu + +r2401 2016-03-31 18:12:59 +0200 kohm: + + * scrkernel-floats.dtx: Summary: \setcapdynwidth for Ulrike + +r2400 2016-03-31 09:51:17 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: Alle + TODO-Kommentare abgeleistet + +r2399 2016-03-30 13:34:21 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: + \DeclareTOCEntryStyle dokumentiert + +r2398 2016-03-25 11:22:23 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrjura.dtx, tocstyle.dtx, + scrlayer-notecolumn.dtx, scrkernel-miscellaneous.dtx: Summary: writing + to aux-file improved + +r2397 2016-03-25 10:07:48 +0100 kohm: + + * scrkernel-sections.dtx: Summary: \@altsecnumformattrue will not + break aux-file after class change + +r2396 2016-03-25 09:56:22 +0100 kohm: + + * tocstyle.dtx: Summary: change information fixed + +r2395 2016-03-25 09:26:37 +0100 kohm: + + * scrkernel-tocstyle.dtx, doc/, doc/ngerman/, + doc/ngerman/tocbasic.tex: Summary: new tocline feature + breakafternumber + +r2394 2016-03-24 15:45:04 +0100 kohm: + + * scrkernel-miscellaneous.dtx: Summary: titlesec workaround also for + v2.10.2 2016/03/21 + +r2393 2016-03-24 10:47:53 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: Korrekturen + von Elke + +r2392 2016-03-23 12:56:36 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: + \LastTOCLevelWas… and \TOCEntryStyle…InitCode + +r2391 2016-03-23 08:35:30 +0100 kohm: + + * tocstyle.dtx: Summary: - package combination warning extended + - package status section added + +r2390 2016-03-22 20:07:43 +0100 kohm: + + * scrkernel-miscellaneous.dtx: Summary: titlesec workaround also for + titlesec 2016/03/15 v2.10.1 + +r2389 2016-03-22 18:41:28 +0100 kohm: + + * tocstyle.dtx: Summary: Better "cooperation" with new tocbasic + +r2388 2016-03-21 18:28:06 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: \usetocbasicnumberline should + temporary set \@tempdima + +r2387 2016-03-16 18:15:26 +0100 kohm: + + * TODO: Summary: Need for change of \DeclareNewTOC + +r2386 2016-03-16 17:46:17 +0100 kohm: + + * TODO: Summary: Verzeichnisstile Doc + +r2385 2016-03-15 15:50:30 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: + \usetocbasicnumberline + +r2384 2016-03-15 12:58:53 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrkernel-listsof.dtx: Summary: enforce + usage of \scr@numberline whenever needed. Summary: usage of \autodot + indirekt + +r2383 2016-03-14 10:24:36 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: Docu fixes + +r2382 2016-03-14 09:37:24 +0100 kohm: + + * scrkernel-tocstyle.dtx, TODO, doc/, doc/.ignore: Summary: replaced + \par by \@par in tocline to make \textit etc. work + +r2381 2016-03-13 09:38:02 +0100 kohm: + + * TODO: Summary: missing entrytextformat attribute + +r2380 2016-03-12 20:23:47 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: documentation + of toc entry style attributes + +r2379 2016-03-12 19:46:51 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: \SetPenaltyByTOCLevel --> + \tocbasic@SetPenaltyByTOCLevel, + + \DependOnPenaltyAndTOCLevel --> \tocbasic@DependOnPenaltyAndTOCLevel + +r2378 2016-03-12 19:09:37 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: attribute entryformat formats the + whole entry not only the number and + text + +r2377 2016-03-12 09:24:50 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: documentation + of several toc entry style attributes + +r2376 2016-03-11 14:46:30 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: documentation + of toc entry style numsep + +r2375 2016-03-11 14:26:50 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: some more + entry style attribute documentation + +r2374 2016-03-11 13:51:13 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: 6m replaced by 6em + +r2373 2016-03-11 13:16:33 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: documentation + of some \DeclareTOCStyleEntry attributes + +r2372 2016-03-11 09:47:22 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: figure for + TOC-entry style tocline + +r2371 2016-03-11 09:45:03 +0100 kohm: + + * doc/, doc/scrguide.cls: Summary: Usage of tikz and tikzlibrary calc + +r2370 2016-03-10 13:42:51 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: caption text + changed + +r2369 2016-03-10 13:37:58 +0100 kohm: + + * scrkernel-tocstyle.dtx, doc/, doc/scrguide.cls, doc/ngerman/, + doc/ngerman/tocbasic.tex: Summary: Illustrations added + +r2368 2016-03-10 11:20:56 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: remove errornous group level from + style largetocline + +r2367 2016-03-09 18:14:56 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/guide-ngerman.tex: Summary: neue + Trennausnahme für Eintragsebene + +r2366 2016-03-09 18:09:14 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrbase.tex, + doc/ngerman/tocbasic.tex, doc/english/, doc/english/scrbase.tex: + Summary: serveral suggestions by Elke + +r2365 2016-03-09 12:30:58 +0100 kohm: + + * TODO: Summary: Serveral TODOs removed + +r2364 2016-03-09 12:23:21 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: Summary: documentation + of TOC entry styles started + +r2363 2016-03-09 09:03:32 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex, doc/english/, + doc/english/tocbasic.tex: Summary: documentation of \DeclareNewTOC + options atbegin and atend + +r2362 2016-03-09 08:53:27 +0100 kohm: + + * TODO, doc/, doc/ngerman/, doc/ngerman/scrbase.tex, doc/english/, + doc/english/scrbase.tex: Summary: documentation of special option + @else@ + +r2361 2016-03-08 10:14:05 +0100 kohm: + + * TODO, doc/, doc/ngerman/, + doc/ngerman/scrbookreportarticle-experts.tex, doc/english/, + doc/english/scrbookreportarticle-experts.tex: Summary: documentation + of \DeclareSectionCommand attribute tocstyle + +r2360 2016-03-01 17:02:36 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrkernel-listsof.dtx: change: \numberline + definition moved to scrkernel-tocstyle change: redefining + \numberline@box instead of \numberline to measure the entry number + width + +r2359 2016-03-01 09:15:48 +0100 kohm: + + * releaselist.txt: RC without space + +r2358 2016-02-26 12:10:01 +0100 kohm: + + * TODO: Summary: issue removed + +r2357 2016-02-26 10:39:21 +0100 kohm: + + * TODO: issue note + +r2356 2016-02-25 07:56:41 +0100 kohm: + + * TODO: Summary: new issue with combination of beta scrjura and + KOMA-Script prerelease + +r2355 2016-02-24 12:59:00 +0100 kohm: + + * scrjura.dtx: Summary: new environment names may contain numbers + +r2354 2016-02-23 12:01:52 +0100 kohm: + + * TODO, scrkernel-sections.dtx: Summary: serveral todo notes processed + +r2351 2016-02-22 09:20:29 +0100 kohm: + + * scrkernel-paragraphs.dtx, TODO: fix: first font change after + \begin{document} was always using \par@update@relative + +r2348 2016-02-19 11:53:14 +0100 kohm: + + * TODO: new issue (parskip default) + +r2343 2016-02-17 12:23:24 +0100 kohm: + + * doc/, doc/Makefile.latexinit: Summary: waste / removed + +r2342 2016-02-17 12:13:55 +0100 kohm: + + * scrkernel-compatibility.dtx: Summary: change log entry and copyright + date fixed + +r2341 2016-02-17 12:13:17 +0100 kohm: + + * scrkernel-notepaper.dtx: Summary: version information in change log + entries fixed + +r2340 2016-02-17 10:29:18 +0100 kohm: + + * doc/, doc/german/, doc/german/.ignore: svn ignore list changed + +r2339 2016-02-17 10:27:13 +0100 kohm: + + * doc/, doc/ngerman/: svn ignore list changed + +r2338 2016-02-17 10:26:20 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/.ignore: svn ignore list changed + +r2337 2016-02-17 10:25:04 +0100 kohm: + + * doc/, doc/ngerman/: svn ignore list changed + +r2336 2016-02-17 10:24:36 +0100 kohm: + + * doc/, doc/english/, doc/english/.ignore: svn ignore list changed + +r2335 2016-02-17 10:24:02 +0100 kohm: + + * doc/, doc/english/, doc/english/.ignore: svn ignore list changed + +r2334 2016-02-17 10:19:31 +0100 kohm: + + * doc/, doc/.ignore: svn ignore list changed + +r2333 2016-02-17 10:18:25 +0100 kohm: + + * doc/, doc/.ignore: svn ignore list changed + +r2332 2016-02-17 10:15:15 +0100 kohm: + + * obsolete/, obsolete/.ignore: svn ignore list changed + +r2330 2016-02-17 10:12:56 +0100 kohm: + + * .globalignores, .ignore: svn ignore list changed + +r2326 2016-02-17 10:05:42 +0100 kohm: + + * .ignore: ignore list changed + +r2324 2016-02-17 10:00:23 +0100 kohm: + + * .globalignores, .ignore: svn ignore list changed + +r2323 2016-02-17 09:34:48 +0100 kohm: + + * .globalignores, .ignore, tocbasic.dtx, README.in/, doc/, + doc/ngerman/, doc/english/: svn ignore list changed + +r2322 2016-02-16 17:25:20 +0100 kohm: + + * scrkernel-compatibility.dtx: Summary: emulatestandardclasses changes + font of headings also for scrartcl + +r2321 2016-02-16 16:35:29 +0100 kohm: + + * scrkernel-typearea.dtx: Summary: twocolumn-depending \sloppy and + \raggedbottom/\flushbottom delayed + +r2320 2016-02-06 13:55:29 +0100 kohm: + + * scrjura.dtx: Summary: new \parformatseparation with default + \nobreakspace instead of hard coded \nobreakspace + +r2319 2016-02-06 13:18:07 +0100 kohm: + + * scrkernel-basics.dtx: Summary: scrbase can be loaded before + \documentclass + +r2318 2016-01-29 12:40:15 +0100 kohm: + + * scrkernel-listsandtabulars.dtx, scrkernel-sections.dtx, + scrkernel-miscellaneous.dtx: new: special option + egregdoesnotlikesansseriftitles + +r2317 2016-01-27 11:25:16 +0100 kohm: + + * TODO: docu issue (missing options of \DeclareNewTOC) + +r2316 2016-01-19 09:46:48 +0100 kohm: + + * scrkernel-sections.dtx: fix: \section etc. have to change + \parfillskip if afterskip is > 0 not of beforeskip is < 0 + +r2315 2016-01-15 16:14:15 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: Default of several level depening + settings changed + +r2314 2016-01-15 13:35:17 +0100 kohm: + + * scrkernel-tocstyle.dtx: change: some commands deleted, some renamed, + one new length + +r2313 2016-01-15 12:44:20 +0100 kohm: + + * scrkernel-basics.dtx: Summary: date + +r2312 2016-01-15 12:44:01 +0100 kohm: + + * scrkernel-basics.dtx: Summary: Warning about usage of + \l@appto@macro@a and \l@preto@macro@a. + +r2311 2016-01-12 11:49:21 +0100 kohm: + + * scrkernel-tocstyle.dtx: new: \@BeforeTOCEntry and \@AfterTOCEntry + for all toc entry styles + +r2310 2016-01-05 19:03:19 +0100 kohm: + + * scrkernel-language.dtx: Summary: always define \captionsngerman, + \captionsaustrian, \captionsnaustrian, \captionsswiss and + \captionsnswiss if polyglossia an language german ist used + +r2309 2016-01-05 16:41:35 +0100 kohm: + + * scrkernel-language.dtx: Summary: several tricks to make caption name + definitions or changes for ngerman, austrian, naustrian, swiss and + nswiss also work with polyglossia + +r2308 2015-12-23 09:33:52 +0100 kohm: + + * scrkernel-sections.dtx: Summary: two times \parfillskip set to 0pt + plus 1fil instead of \fill + +r2307 2015-12-17 11:57:09 +0100 kohm: + + * doc/, doc/ngerman/, doc/ngerman/scrlttr2.tex, doc/english/, + doc/english/scrlttr2.tex: fix: undefined reference [Elke] + +r2306 2015-12-17 11:44:15 +0100 kohm: + + * tocbasic.dtx: fix: Fammily [Elke] + +r2305 2015-12-16 13:19:31 +0100 kohm: + + * scrkernel-tocstyle.dtx, tocbasic.dtx: new: \DeclareNewTOC + understands option tocentrystyle and provides all options of the toc + entry style + +r2304 2015-12-12 09:55:47 +0100 kohm: + + * scrkernel-typearea.dtx, scrkernel-pagestyles.dtx: fix: + head/footsepline handling of typearea package + +r2303 2015-12-11 10:55:30 +0100 kohm: + + * tocbasic.dtx: fix: usage of \scr@ifundefinedorrelax + +r2302 2015-12-11 10:53:59 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: property change + +r2301 2015-12-11 10:52:22 +0100 kohm: + + * tocbasic.dtx: Summary: property change + +r2300 2015-12-11 10:49:30 +0100 kohm: + + * scrkernel-tocstyle.dtx, tocbasic.dtx: tocbasic uses scrbase + +r2299 2015-12-09 09:25:56 +0100 kohm: + + * Makefile, manifest.txt, scrmain.ins, tocbasic.dtx, doc/, + doc/english/, doc/english/Makefile, doc/english/tocbasic.tex: change: + scrkernel-tocbasic.dtx is mandatory not optional change: user manual + of package tocbasic is not longer part of tocbasic.dtx + +r2298 2015-12-08 09:27:34 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrmain.ins, tocbasic.dtx: change: most of + the TOC style features moved to tocbasic.sty, so tocbasic needs + scrbase now + +r2297 2015-12-07 18:48:04 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrkernel-sections.dtx: Summary: store the + toc entry style only once per symbolic entry level + +r2296 2015-12-07 16:16:54 +0100 kohm: + + * TODO: note about TODOs in scrkernel-sections.dtx + +r2295 2015-12-07 16:08:18 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrmain.ins: new: TOC styles part, chapter, + section, subsection, default + +r2294 2015-12-07 13:06:51 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrkernel-sections.dtx: Summary: + \DeclareTOCEntryStyle syntax changed so it needs only one argument; + several commands became internal macros + +r2293 2015-12-01 08:28:49 +0100 kohm: + + * scrkernel-sections.dtx: Summary: formatting code + +r2292 2015-11-29 17:35:46 +0100 kohm: + + * scrkernel-sections.dtx: Summary: fix warning message + +r2291 2015-11-26 12:07:32 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: style options with (at most one) + argument + +r2290 2015-11-26 09:24:54 +0100 kohm: + + * scrkernel-listsof.dtx: Summary: some preparation for cooperating + with scrkernel-tocstyle + +r2289 2015-11-25 21:42:33 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrkernel-basics.dtx: fix: + \TOCEntryStyleInitCode and \TOCEntryStyleStartInitCode + +r2288 2015-11-25 17:52:09 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: use my own box + +r2287 2015-11-25 15:43:36 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: \CloneTOCEntryStyle + +r2286 2015-11-25 15:14:59 +0100 kohm: + + * scrkernel-basics.dtx: new: \l@preto@macro and \l@preto@macro@a + +r2285 2015-11-25 14:22:21 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: options do not longer use @dte@ but + @tso@ + +r2284 2015-11-25 10:53:52 +0100 kohm: + + * scrkernel-tocstyle.dtx: change: restructutation of the source code + to avoid double implementation + +r2283 2015-11-24 13:49:50 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: usage of addpenalty in vmode only + +r2282 2015-11-24 09:35:27 +0100 kohm: + + * scrkernel-tocstyle.dtx: several new options for toc entry style + tocline + +r2281 2015-11-23 14:10:31 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: options numberformat and + entryformat for entry style tocline + +r2280 2015-11-23 10:58:23 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrmain.ins: start of new (universal) toc + entry style tocline + +r2279 2015-11-23 10:46:01 +0100 kohm: + + * scrkernel-sections.dtx: fix: missing % added + +r2278 2015-11-20 15:26:19 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrmain.ins: new: toc entry style + largetocline + +r2277 2015-11-20 12:39:09 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: new toc style undottedtocline + +r2276 2015-11-20 12:05:35 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: docu fixes + +r2275 2015-11-20 11:36:12 +0100 kohm: + + * scrkernel-tocstyle.dtx: end of style conditional added + +r2274 2015-11-20 10:44:21 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrmain.ins: new: TOC styles gobble and + dottedtocline + +r2273 2015-11-20 10:43:55 +0100 kohm: + + * scrkernel-basics.dtx: new: \l@addto@macro@a + +r2272 2015-11-19 09:01:30 +0100 kohm: + + * scrkernel-tocstyle.dtx: new: optional style init code + +r2271 2015-11-18 17:41:28 +0100 kohm: + + * scrkernel-sections.dtx: fix: book|report condition + +r2270 2015-11-18 17:37:59 +0100 kohm: + + * scrkernel-sections.dtx: checksum and unmasked trace output + +r2269 2015-11-18 17:35:18 +0100 kohm: + + * scrkernel-sections.dtx: change: not yet defined toc style + information handling removed + +r2268 2015-11-18 16:25:18 +0100 kohm: + + * scrmain.ins: scrkernel-sections uses features of scrkernel-tocstyle + +r2267 2015-11-18 14:03:00 +0100 kohm: + + * scrkernel-sections.dtx: todo notes added + +r2266 2015-11-18 10:41:05 +0100 kohm: + + * scrkernel-sections.dtx: do not longer define a dummy option list but + use the special member option @else@ + +r2265 2015-11-18 10:40:24 +0100 kohm: + + * TODO, scrkernel-basics.dtx: \FamilyExecuteOptions has a special + handling für member option @else@ + +r2264 2015-11-17 18:26:57 +0100 kohm: + + * doc/, doc/Makefile: fix: distclean_local + +r2263 2015-11-17 18:10:58 +0100 kohm: + + * scrkernel-tocstyle.dtx: change: usable \DeclareTOCEntryStyle and + usable \DeclareTOCStyleEntry + +r2262 2015-11-17 16:15:53 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: do not use + \DeclareSectionCommandDummyOption any longer + +r2261 2015-11-17 12:14:34 +0100 kohm: + + * scrkernel-tocstyle.dtx: changes: Have a look at the TODO notes! + +r2260 2015-11-17 12:08:54 +0100 kohm: + + * scrkernel-sections.dtx: fix: \DeclareSectionCommandStyleNumberOption + +r2259 2015-11-17 11:47:54 +0100 kohm: + + * scrkernel-tocstyle.dtx: Summary: optional TOC styles are ready to be + used + +r2258 2015-11-13 12:34:19 +0100 kohm: + + * scrmain.ins: scrkernel-tocstyle prepare + +r2257 2015-11-13 12:19:37 +0100 kohm: + + * scrkernel-tocstyle.dtx: new: \DeclareTOCStyleEntry (currently + unused) + +r2256 2015-11-13 09:46:59 +0100 kohm: + + * scrsource.tex: fix: generation without scrkernel-tocstyle.dtx + +r2255 2015-11-13 09:44:57 +0100 kohm: + + * scrkernel-tocstyle.dtx, scrsource.tex, scrmain.ins, + scrkernel-sections.dtx, scrdocstrip.tex: change: KOMA-Script can be + implemented either with or without optional scrkernel-tocstyle.dtx + +r2254 2015-11-12 10:31:08 +0100 kohm: + + * scrkernel-sections.dtx: change: \DeclareSectionCommand etc. do only + accept options of the current style + +r2253 2015-11-12 09:21:34 +0100 kohm: + + * scrdocstrip.tex: improved: beta message + +r2252 2015-11-12 09:01:36 +0100 kohm: + + * scrkernel-sections.dtx: fix: empty style parameter at + \DeclareSectionCommand etc. + +r2251 2015-11-06 11:10:25 +0100 kohm: + + * scrkernel-sections.dtx: new: toc entries for part, chapter and + section respect tocindent in the main classes + +r2250 2015-11-06 10:16:26 +0100 kohm: + + * TODO, doc/, doc/guide.bib, doc/ngerman/, doc/ngerman/scrlayer.tex, + doc/english/, doc/english/scrlayer.tex: change: reference to picture + package (suggestion by rolf) + +r2249 2015-11-04 08:07:36 +0100 kohm: + + * scrjura.dtx: Summary: detection of lists, minipages etc. before + \Sentence + +r2248 2015-11-03 10:31:16 +0100 kohm: + + * scrjura.dtx: fix: \Sentence at start of paragraph creates wrong + reference + +r2247 2015-11-03 09:37:48 +0100 kohm: + + * scrjura.dtx: fix: \@doendpe has been changed in LaTeX 2015/01/01 + +r2246 2015-11-02 08:02:18 +0100 kohm: + + * scrkernel-typearea.dtx: Fix: twoside executes \flushbottom but + twocolumn does not recognize twoside + + and executes \raggedbottom at class option initialization. + +r2245 2015-10-21 10:21:22 +0200 kohm: + + * scrkernel-basics.dtx: change: deprecated options activate deprecated + font commands + +r2244 2015-10-21 10:02:33 +0200 kohm: + + * scrkernel-fonts.dtx: change: improved deprecated font command + message + +r2243 2015-10-21 09:45:18 +0200 kohm: + + * TODO: removed: \if… issue + +r2242 2015-10-21 09:44:26 +0200 kohm: + + * scrkernel-basics.dtx: change: \ifisglue reimplemented + +r2241 2015-10-20 11:06:45 +0200 kohm: + + * scrkernel-basics.dtx: change: reimplementation of \ifisinteger + improved + +r2240 2015-10-19 17:57:29 +0200 kohm: + + * scrkernel-basics.dtx: new: \ifislengthprimitive + +r2239 2015-10-19 16:37:08 +0200 kohm: + + * scrkernel-basics.dtx: fix: \newcommand instead of \renewcommand + +r2238 2015-10-19 16:35:35 +0200 kohm: + + * scrkernel-basics.dtx: change: \ifisinteger reimplemented + +r2237 2015-10-19 13:45:06 +0200 kohm: + + * scrkernel-basics.dtx: change: \ifiscounter improved + +r2236 2015-10-19 12:40:09 +0200 kohm: + + * scrkernel-basics.dtx: new: \ifisdefchar + +r2235 2015-10-19 12:15:34 +0200 kohm: + + * scrkernel-basics.dtx: change: \ifisnumexpr reimplemented + +r2234 2015-10-19 12:04:30 +0200 kohm: + + * scrkernel-basics.dtx: change: \ifisglueexpr reimplemented + +r2233 2015-10-19 11:53:52 +0200 kohm: + + * scrkernel-basics.dtx: change: \ifisdimexpr reimplemented + +r2232 2015-10-19 10:29:26 +0200 kohm: + + * TODO: new general issue with \ifis… + +r2231 2015-10-19 10:13:54 +0200 kohm: + + * scrkernel-basics.dtx: change: reimplementation if \ifiscount + +r2230 2015-10-19 09:56:04 +0200 kohm: + + * scrkernel-basics.dtx: change: reimplementation of \ifisskip + +r2229 2015-10-19 09:35:54 +0200 kohm: + + * scrkernel-basics.dtx: change: reimplementation of \ifisdimen + +r2228 2015-10-15 14:15:09 +0200 kohm: + + * scrkernel-sections.dtx: fix: Option counterwithin of + \DeclareSectionCommand etc. + +r2227 2015-10-14 16:31:04 +0200 kohm: + + * scrkernel-title.dtx: fix: last fix improved + +r2226 2015-10-14 16:18:07 +0200 kohm: + + * scrkernel-title.dtx: fix: overfull \hbox on title pages + +r2225 2015-10-14 11:19:36 +0200 kohm: + + * scrkernel-fonts.dtx: change: old font commands throw errors by + default. You may use (already deprecated option) + enabledeprecatedfontcommands to change the error into a warning + message. + +r2224 2015-10-09 17:11:06 +0200 kohm: + + * TODO, tocbasic.dtx, doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: + change: docu of hyperref issue + +r2223 2015-10-08 13:53:29 +0200 kohm: + + * doc/, doc/ngerman/, doc/ngerman/tocbasic.tex: typofix + +r2222 2015-10-08 08:18:34 +0200 kohm: + + * scrkernel-notepaper.dtx: change: allow final line break in \closing + +r2221 2015-10-07 12:17:20 +0200 kohm: + + * scrkernel-sections.dtx: new: \toclevel@… will be set by + \DeclareSectionCommand etc. if it could be usefull + +r2220 2015-10-07 09:30:29 +0200 kohm: + + * scrkernel-typearea.dtx, TODO, scrlayer-notecolumn.dtx: changes: + ready for luaTeX 0.80.1/0.81 + +r2219 2015-10-07 07:37:37 +0200 kohm: + + * TODO: new issue because of luaTeX change + +r2218 2015-10-06 14:04:15 +0200 kohm: + + * TODO: new nice to have + +r2217 2015-10-06 12:19:14 +0200 kohm: + + * TODO: new to do + +r2216 2015-10-06 12:13:11 +0200 kohm: + + * scrkernel-sections.dtx: new: \DeclareSectionCommand option tocstyle + with value one of part, chapter, + section, subsection + +r2215 2015-10-06 11:50:41 +0200 kohm: + + * scrkernel-version.dtx, scrkernel-compatibility.dtx: prepared for + 3.20 BETA + r2214 2015-10-03 14:59:44 +0200 kohm: * releaselist.txt: release 2015/10/03 v3.19a @@ -1159,7 +2261,7 @@ r1997 2015-03-11 20:19:06 +0100 kohm: r1995 2015-03-11 18:37:10 +0100 kohm: - * .cvsignore, doc/, doc/ngerman/, doc/english/: svn:ingore changed + * .ignore, doc/, doc/ngerman/, doc/english/: svn:ingore changed r1994 2015-03-11 18:15:19 +0100 kohm: @@ -1530,8 +2632,7 @@ r1922 2015-02-05 08:47:19 +0100 kohm: r1921 2015-02-04 09:57:44 +0100 kohm: * manifest.txt, doc/, doc/guide.tex, doc/Makefile.guide, - doc/ngerman/, doc/ngerman/scrjura.tex, doc/english/, - doc/english/scrjura.tex: note about missing chapter about scrjura + doc/ngerman/, doc/english/: note about missing chapter about scrjura r1920 2015-02-03 08:27:01 +0100 kohm: @@ -2182,11 +3283,11 @@ r1793 2014-09-19 08:31:45 +0200 kohm: r1792 2014-09-19 08:26:04 +0200 kohm: - * .cvsignore: ignore list updated + * .ignore: ignore list updated r1791 2014-09-19 08:15:10 +0200 kohm: - * .cvsignore: ignore list updated + * .ignore: ignore list updated r1790 2014-09-19 08:01:41 +0200 kohm: @@ -10922,21 +12023,21 @@ r1 2005-07-25 12:19:51 +0200 mjk: scrkernel-footnotes.dtx, scrkernel-index.dtx, scrstrop.inc, scrkernel-bibliography.dtx, scrstrip.inc, scrkernel-typearea.dtx, scrkernel-pagestyles.dtx, scrkernel-listsandtabulars.dtx, scrdoc.dtx, - .cvsignore, scrkernel-listsof.dtx, scrmain.ins, scrkxflo.dtx, - Makefile.baserules, missing.dtx, README, ChangeLog.cvs, - scrkernel-sections.dtx, ChangeLog.2, scrkernel-miscellaneous.dtx, - scrkernel-fonts.dtx, Makefile.cfg, scrlfile.dtx, - scrkernel-basics.dtx, doc/, doc/scrguide.ist, doc/guide.bib, - doc/Makefile, doc/guide.tex, doc/scrguide.cls, doc/plength.dtx, - doc/Makefile.guide, doc/Makefile.latexinit, doc/german/, - doc/german/scrlttr2.tex, doc/german/Makefile, - doc/german/guide-ngerman.tex, doc/german/scrbookreportarticle.tex, - doc/german/scrdatetime.tex, doc/german/scrpage2.tex, - doc/german/typearea.tex, doc/german/scrlfile.tex, - doc/german/introduction.tex, doc/german/scraddr.tex, doc/bin/, - doc/bin/genindex.pl: Initial subversion import of KOMA-Script 3; see - ChangeLog for version information prior to 2005-07-25 12:14 and - ChangeLog.2 for version information of KOMA-Script < 2.91 + scrkernel-listsof.dtx, scrmain.ins, scrkxflo.dtx, Makefile.baserules, + missing.dtx, README, ChangeLog.cvs, scrkernel-sections.dtx, + ChangeLog.2, scrkernel-miscellaneous.dtx, scrkernel-fonts.dtx, + .ignore, Makefile.cfg, scrlfile.dtx, scrkernel-basics.dtx, doc/, + doc/scrguide.ist, doc/guide.bib, doc/Makefile, doc/guide.tex, + doc/scrguide.cls, doc/plength.dtx, doc/Makefile.guide, + doc/Makefile.latexinit, doc/german/, doc/german/scrlttr2.tex, + doc/german/Makefile, doc/german/guide-ngerman.tex, + doc/german/scrbookreportarticle.tex, doc/german/scrdatetime.tex, + doc/german/scrpage2.tex, doc/german/typearea.tex, + doc/german/scrlfile.tex, doc/german/introduction.tex, + doc/german/scraddr.tex, doc/bin/, doc/bin/genindex.pl: Initial + subversion import of KOMA-Script 3; see ChangeLog for version + information prior to 2005-07-25 12:14 and ChangeLog.2 for version + information of KOMA-Script < 2.91 ------- Switch from CVS to subversion ---------------------------------------- diff --git a/Master/texmf-dist/source/latex/koma-script/Makefile b/Master/texmf-dist/source/latex/koma-script/Makefile index 827436ca4c6..08d7c1efe0d 100644 --- a/Master/texmf-dist/source/latex/koma-script/Makefile +++ b/Master/texmf-dist/source/latex/koma-script/Makefile @@ -149,8 +149,9 @@ CLS_MAIN_DTX = scrkernel-basics.dtx \ scrkernel-paragraphs.dtx \ scrkernel-pseudolengths.dtx \ scrkernel-sections.dtx \ - scrkernel-typearea.dtx \ scrkernel-title.dtx \ + scrkernel-tocstyle.dtx \ + scrkernel-typearea.dtx \ scrkernel-variables.dtx \ scrkernel-version.dtx \ scrlfile.dtx \ @@ -184,7 +185,7 @@ CLS_MAIN_SUBINS = scrstrip.inc scrstrop.inc scrdocstrip.tex ALPHA_INS = tocstyle.dtx scrjura.dtx scrwfile.dtx -ALPHA_DOC = tocstyle.pdf scrjura.pdf scrhack.pdf +ALPHA_DOC = tocstyle.pdf scrhack.pdf ALPHA_DTX = $(subst .pdf,.dtx,$(ALPHA_DOC)) @@ -220,7 +221,7 @@ NODIST_GENERATED = $(CLS_DVIS) $(CLS_FILES) $(ALPHA_DOC) GENERATED = $(NODIST_GENERATED) ChangeLog \ scrjura.ins \ scrwfile.ins scrwfile.tex scrwfile.drv \ - tocbasic.ins tocbasic.tex \ + tocbasic.ins \ tocstyle.ins tocstyle.tex tocstyle.dvi tocstyle.drv \ scrlayer.tex scrlayer-scrpage.tex scrlayer-notecolumn.tex diff --git a/Master/texmf-dist/source/latex/koma-script/doc/Makefile b/Master/texmf-dist/source/latex/koma-script/doc/Makefile index 5a2e08b4729..3695d148e8c 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/Makefile +++ b/Master/texmf-dist/source/latex/koma-script/doc/Makefile @@ -131,6 +131,7 @@ MAINTAIN_FILES = $(DIST_FILES) # ---------------------------------------------------------------------- # local rules prepare_local: $(STATIC_DOC_LINKS) + $(make_recursive) default_local: $(STATIC_DOC) $(DOC_FILES) $(make_recursive) @@ -214,7 +215,7 @@ maintain_local: $(make_recursive) distclean_local: - $(SRM) scrpage2-ngerman.tex scrpage2-english.tex \ + $(SRM) scrpage2-ngerman.tex scrpage2-english.tex $(make_recursive) maintainclean_local: diff --git a/Master/texmf-dist/source/latex/koma-script/doc/Makefile.guide b/Master/texmf-dist/source/latex/koma-script/doc/Makefile.guide index fc3f628c4be..f8debae21ce 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/Makefile.guide +++ b/Master/texmf-dist/source/latex/koma-script/doc/Makefile.guide @@ -1,6 +1,6 @@ # ====================================================================== # Makefile.guide -# Copyright (c) Markus Kohm, 2002-2015 +# Copyright (c) Markus Kohm, 2002-2016 # # This file is part of the LaTeX2e KOMA-Script bundle. # @@ -18,7 +18,7 @@ # This work consists of all files listed in manifest.txt. # ---------------------------------------------------------------------- # Makefile.guide -# Copyright (c) Markus Kohm, 2002-2015 +# Copyright (c) Markus Kohm, 2002-2016 # # Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, # Version 1.3c, verteilt und/oder veraendert werden. @@ -100,6 +100,10 @@ EXAMPLE_LETTER_DTX_RESULT = $(EXAMPLE_LETTER_LETTERS) musterlogo.eps ich.lco EXAMPLE_NOTECOLUMN_SRC = scrlayer-notecolumn-example.tex EXAMPLE_NOTECOLUMN_PDF = $(addsuffix .pdf,$(basename $(EXAMPLE_NOTECOLUMN_SRC))) +EXAMPLE_JURA_SRC = scrjuraexample.tex + +EXAMPLE_JURA_PDF = $(addsuffix .pdf,$(basename $(EXAMPLE_JURA_SRC))) + PLENGTH_DTX = $(DOCDIR)plength.dtx PLENGTH_DTX_RESULT = plength.drv plenDIN.mp varDIN.mp plinc.mp \ @@ -112,15 +116,14 @@ PDF_EPS_SRC = musterlogo.eps PDF_EPS = $(addsuffix .pdf,$(basename $(PDF_EPS_SRC))) EXAMPLE_LETTER_SRC = $(EXAMPLE_LETTER_LETTERS) $(PDF_EPS) ich.lco - EXAMPLE_LETTER_PDF = $(addsuffix .pdf,$(basename $(EXAMPLE_LETTER_LETTERS))) GENERATED_SRC = $(EXAMPLE_LETTER_PDF) $(PLENGTH_PDF) \ - $(EXAMPLE_NOTECOLUMN_PDF) + $(EXAMPLE_NOTECOLUMN_PDF) $(EXAMPLE_JURA_PDF) GENERATED_CLEAN = $(GENERATED_SRC) \ $(EXAMPLE_LETTER_DTX_RESULT) letter-label.tex \ - $(EXAMPLE_NOTECOLUMN_PDF) $(PDF_EPS) \ + $(PDF_EPS) \ $(PLENGTH_DTX_RESULT) TEX_SRC = guide-$(LANGUAGELONG).tex $(TEX_CHAPTERS) $(TEX_MISC) @@ -128,7 +131,7 @@ TEX_SRC = guide-$(LANGUAGELONG).tex $(TEX_CHAPTERS) $(TEX_MISC) MISC_SRC = $(MAKE_FILES) htmlsetup DIST_SRC = $(MISC_SRC) $(TEX_SRC) $(EXAMPLE_LETTER_DTX) \ - $(EXAMPLE_NOTECOLUMN_SRC) + $(EXAMPLE_NOTECOLUMN_SRC) $(EXAMPLE_JURA_SRC) GUIDE_FILES = $(GUIDENAME).pdf $(GUIDENAME).html @@ -142,8 +145,8 @@ MAINTAIN_FILES = $(MAINTAIN_SRC) # local rules default_local: $(GUIDE_FILES) -prepare_local: # nothing to do - $(ECHO) $(GENERATED_SRC) +prepare_local: +# $(ECHO) $(GENERATED_SRC) clean_local: $(RM) *.aux *.bbl *.blg *.glo *.idx *.ilg *.ind *.lof *.log *.lot \ @@ -294,6 +297,13 @@ $(EXAMPLE_NOTECOLUMN_PDF): $(EXAMPLE_NOTECOLUMN_SRC) $(PDFLATEX) $< endif +ifdef EXAMPLE_JURA_SRC +$(EXAMPLE_JURA_PDF): $(EXAMPLE_JURA_SRC) + $(PDFLATEX) $(addsuffix .tex,$(basename $@)) + $(PDFLATEX) $(addsuffix .tex,$(basename $@)) + $(PDFLATEX) $(addsuffix .tex,$(basename $@)) +endif + guide.ind: guide.idx $(MAKEINDEX) $@ $< $(INDEXPOSTOP) guide diff --git a/Master/texmf-dist/source/latex/koma-script/doc/Makefile.latexinit b/Master/texmf-dist/source/latex/koma-script/doc/Makefile.latexinit index bbf2f753530..b8a2e70833a 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/Makefile.latexinit +++ b/Master/texmf-dist/source/latex/koma-script/doc/Makefile.latexinit @@ -1,5 +1,5 @@ # Makefile.latexinit -# Copyright (c) Markus Kohm, 2002-2012 +# Copyright (c) Markus Kohm, 2002-2016 # # This file is part of the LaTeX2e KOMA-Script bundle. # @@ -17,7 +17,7 @@ # This work consists of all files listed in manifest.txt. # ---------------------------------------------------------------------- # Makefile.latexinit -# Copyright (c) Markus Kohm, 2002-2012 +# Copyright (c) Markus Kohm, 2002-2016 # # Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, # Version 1.3c, verteilt und/oder veraendert werden. @@ -52,8 +52,8 @@ MAKECHANGE = makeindex $(MAKECHANGEOPT) PDFLATEX = $(LATEX) $(NONSTOPMODE) \ '\def\languagename{'$(LANGUAGELONG)'}' \ $(PDFOUTPUT) -INDEXPOSTOP = $(DOCDIR)/bin/genindex.pl -GENHTMLINDEX = $(DOCDIR)/bin/genhtmlidx.pl +INDEXPOSTOP = $(DOCDIR)bin/genindex.pl +GENHTMLINDEX = $(DOCDIR)bin/genhtmlidx.pl #BIBTEX = bibtex8 #BIBTEXNOERROR = 1 # BibTeX8 returns 1 after warnings BIBTEX = bibtex diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/Makefile b/Master/texmf-dist/source/latex/koma-script/doc/english/Makefile index bb94aafa6c0..b418a621f75 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/Makefile +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/Makefile @@ -1,6 +1,6 @@ # ====================================================================== # Makefile -# Copyright (c) Markus Kohm, 2002-2014 +# Copyright (c) Markus Kohm, 2002-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. # ---------------------------------------------------------------------- # Makefile -# Copyright (c) Markus Kohm, 2002-2014 +# Copyright (c) Markus Kohm, 2002-2015 # # Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, # Version 1.3c, verteilt und/oder veraendert werden. @@ -47,19 +47,9 @@ LANGUAGELONG = english include $(DOCDIR)Makefile.guide # ---------------------------------------------------------------------- -# NOTE: Remove these rules after real translation of tocbasic.tex -# is available. -tocbasic.tex: ../../tocbasic.tex - if [ -L $@ ] || ! [ -f $@ ]; then $(SYMLINK) $< .; else touch $@; fi - -../../tocbasic.tex: ../../tocbasic.dtx - cd ../.. && tex \\nonstopmode\\input $(basename $<) -# ---------------------------------------------------------------------- maintainclean_local: distclean_local $(RM) guide.pdf $(GUIDENAME).pdf $(GUIDENAME).html [ -L tocbasic.tex ] && $(RM) tocbasic.tex || true - [ -L scrwfile.tex ] && $(RM) scrwfile.tex || true - [ -L scrlayer-notecolumn.tex ] && $(RM) scrlayer-notecolumn.tex || true # # end of file `Makefile' diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/common-0.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/common-0.tex index 616b4e67ba3..8bea4b301ff 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/common-0.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/common-0.tex @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{common-0.tex} - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2016-04-30 08:43:16 +0200 (Sat, 30 Apr 2016) $ KOMA-Script guide (common paragraphs)] \translator{Gernot Hassenpflug\and Krickette Murabayashi} @@ -56,6 +56,18 @@ \@ifundefined{ifCommonmaincls}{\newif\ifCommonmaincls}{}% \@ifundefined{ifCommonscrextend}{\newif\ifCommonscrextend}{}% \@ifundefined{ifCommonscrlttr}{\newif\ifCommonscrlttr}{}% +\@ifundefined{ifCommonscrlayer}{\newif\ifCommonscrlayer}{}% +\@ifundefined{ifCommonscrlayer-scrpage}{% + \expandafter\newif\csname ifCommonscrlayer-scrpage\endcsname}{}% +\@ifundefined{ifCommonscrlayerscrpage}{% + \expandafter\let\expandafter\ifCommonscrlayerscrpage + \csname ifCommonscrlayer-scrpage\endcsname}{}% +\@ifundefined{ifCommonscrlayer-notecolumn}{% + \expandafter\newif\csname ifCommonscrlayer-notecolumn\endcsname}{}% +\@ifundefined{ifCommonscrlayernotecolumn}{% + \expandafter\let\expandafter\ifCommonscrlayernotecolumn + \csname ifCommonscrlayer-notecolumn\endcsname}{}% +\@ifundefined{ifIgnoreThis}{\newif\ifIgnoreThis}{}% \@ifundefined{ifIgnoreThis}{\newif\ifIgnoreThis}{}% \makeatother @@ -78,6 +90,16 @@ apart from % {\KOMAScript} classes and packages}% \IfCommon{scrextend}{the classes and the \Package{scrextend} package is also relevant to several other {\KOMAScript} packages}% +\IfCommon{scrhack}{the \Package{scrhack} package, is also relevant to other + \KOMAScript{} packages and classes}% +\IfCommon{scrjura}{the \Package{scrjura} package, is also relevant to other + \KOMAScript{} packages and classes}% +\IfCommon{scrlayer}{the \Package{scrlayer} package, is also relevant to other + \KOMAScript{} packages and classes}% +\IfCommon{scrlayer-scrpage}{the \Package{scrlayer-scrpage} package, is also + relevant to other \KOMAScript{} packages and classes}% +\IfCommon{scrlayer-notecolumn}{the \Package{scrlayer-notecolumn} package, is + also relevant to other \KOMAScript{} packages and classes}% . Such that the user can find all information corresponding to a single package or a single class in the relevant chapter, this section is found almost identically in several chapters. Users who are not @@ -113,6 +135,11 @@ function the same in {\KOMAScript} as described in \cite{latex:usrguide} or any introduction to \LaTeX, for example \cite{lshort}.% % +\IfNotCommon{scrjura}{% + \IfNotCommon{scrhack}{% + \IfNotCommon{scrlayer}{% + \IfNotCommon{scrlayer-scrpage}{% + \IfNotCommon{scrlayer-notecolumn}{% \IfNotCommon{scrextend}{\par% When using a {\KOMAScript} class, no options should be passed on % Die Alternativen an dieser Stelle dienen der Verbesserung des Umbruchs @@ -126,7 +153,7 @@ function the same in {\KOMAScript} as described in packages.}% \IfCommon{scrlttr2}{\ Actually, it is no longer necessary when using any {\KOMAScript} class to explicity load either one of these - packages.}} + packages.}}}}}}} You should note\textnote{Attention!}, that in opposite to the interface described below the options interface of \Macro{documentclass} and @@ -162,31 +189,38 @@ i.\,e., gives the option simply in the form \PName{option}, then the default value will be used. Some options can % -\IfCommon{maincls}{also }% Umbruchkorrektur -\IfCommon{scrlttr2}{also }% Umbruchkorrektur +%\IfCommon{maincls}{also }% Umbruchkorrektur +%\IfCommon{scrlttr2}{also }% Umbruchkorrektur assume several values simultaneously. For such options there exists the possibility, with the help of \Macro{KOMAoption}, to pass a single \PName{option} a list of values. The individual values are given as a comma-separated \PName{value list}. \begin{Explain} - If in the \PName{option list} one sets an option to a disallowed - value, or the \PName{value list} contains an invalid value, then an - error is produced. If \LaTeX{} is run in an interactive mode, then - it stops at this point. Entering ``\texttt{h}'' displays a help - screen, in which also the valid values for the corresponding option - are given. + % If in the \PName{option list} one sets an option to a disallowed + % value, or the \PName{value list} contains an invalid value, then an + % error is produced. If \LaTeX{} is run in an interactive mode, then + % it stops at this point. Entering ``\texttt{h}'' displays a help + % screen, in which also the valid values for the corresponding option + % are given. - If a \PName{value} includes an equal sign or a comma, then the - \PName{value} must be enclosed in curly brackets. + % If a \PName{value} includes an equal sign or a comma, then the + % \PName{value} must be enclosed in curly brackets. To implement this possibility {\KOMAScript} uses the commands \Macro{FamilyOptions} and \Macro{FamilyOption} with the family - ``\PValue{KOMA}''. More information on these commands % + ``\PValue{KOMA}''. +\iffalse % Umbruchkorrektur + More information on these commands % \IfCommon{maincls}{for experts }% \IfCommon{scrlttr2}{for experts }% is found in \autoref{sec:scrbase.keyvalue}, \autopageref{desc:scrbase.cmd.FamilyOptions}. +\else + For more information in these commands see \autoref{part:forExperts}, + \autoref{sec:scrbase.keyvalue}, + \autopageref{desc:scrbase.cmd.FamilyOptions}. +\fi \end{Explain} % \EndIndex{Cmd}{KOMAoption}% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/guide-english.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/guide-english.tex index cec24176a0c..2661ba1b6e5 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/guide-english.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/guide-english.tex @@ -1,6 +1,6 @@ % ====================================================================== % guide-english.tex -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % guide-english.tex -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,7 +46,7 @@ % ====================================================================== % \KOMAProvidesFile{guide-english.tex} - [$Date: 2015-09-30 11:43:03 +0200 (Wed, 30 Sep 2015) $ + [$Date: 2016-05-09 10:57:53 +0200 (Mon, 09 May 2016) $ KOMA-Script guide language dependencies] % % \section{Extra Packages} @@ -80,7 +80,7 @@ \newcommand*{\GuideTranslatorHeadline}{English translation of this manual by: } \newcommand*{\GuideWarrantyHeadline}{Legal Notes:}% \newcommand*{\GuideWarranty}{There is no warranty for any part of the - documented Software. The authors have taken care in the preparation of this + documented software. The authors have taken care in the preparation of this book, but make no expressed or implied warranty of any kind and assume no responsibility for errors or omissions. No liability is assumed for incidental or consequential damages in connection with or arising out of the @@ -96,7 +96,7 @@ this license, which is valid to {\KOMAScript}, is part of {\KOMAScript} (see \File{lppl.txt}). Distribution of this manual\,---\,even if it is printed\,---\,is allowed provided that all parts of {\KOMAScript} are - distributed. Distribution without the other parts of {\KOMAScript} needs a + distributed. Distribution without the other parts of {\KOMAScript} needs an explicit, additional authorization by the authors.}% \newcommand*{\GuideDedication}{To All Friends of Typography!}% % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/preface.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/preface.tex index c684b87c49b..fdb92d5c98d 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/preface.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/preface.tex @@ -1,6 +1,6 @@ % ====================================================================== % preface.tex -% Copyright (c) Markus Kohm, 2008-2015 +% Copyright (c) Markus Kohm, 2008-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % preface.tex -% Copyright (c) Markus Kohm, 2008-2015 +% Copyright (c) Markus Kohm, 2008-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -36,7 +36,7 @@ % ====================================================================== \KOMAProvidesFile{preface.tex} - [$Date: 2015-04-04 11:36:35 +0200 (Sat, 04 Apr 2015) $ + [$Date: 2016-05-09 07:33:31 +0200 (Mon, 09 May 2016) $ Preface to the KOMA-Script book] %\translator{Markus Kohm} @@ -49,16 +49,11 @@ and a never ending story. I always try to have an English user guide with all descriptions of the German one. But as long as I have to do the primary translation, these translations not only can but should be improved. -Currently, whole \autoref{cha:tocbasic} is not a translation from the German -manual but the primary description from the implementation of the -package. Nevertheless, a native or very advanced English speaker with basic -TeX knowledge is urgently needed to translate the German text or to improve my -own translation. - -A real gap is the chapter about \Package{scrjura}. Currently there isn't such -a chapter, neither in the German nor in the English manual. But there is a -chapter at the German \KOMAScript{} book. If someone would translate it, I -would add this chapter and the translation to the manuals. +In this release the translation of \autoref{cha:tocbasic} has been +completed. Nevertheless, a proficient English speaker with basic TeX knowledge +could improve the translation. A large part of \autoref{cha:scrjura} has been +translated by Alexander Willand. The remaining part may need improvement. The +example still has not been translated. So this English guide is complete but nevertheless not as good as the German one. Currently there are only a few editors for the English guide, who improve diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbase.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbase.tex index 7a003c40f3c..8b68d25fd98 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrbase.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrbase.tex @@ -1,6 +1,6 @@ % ====================================================================== % scrbase.tex -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrbase.tex -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,11 +46,11 @@ % ====================================================================== \KOMAProvidesFile{scrbase.tex} - [$Date: 2015-06-17 12:15:52 +0200 (Wed, 17 Jun 2015) $ + [$Date: 2016-03-09 18:09:14 +0100 (Wed, 09 Mar 2016) $ KOMA-Script package scrbase] \translator{Markus Kohm\and Melvin Hendrix} -% Date of the translated German file: 2015-06-17 +% Date of the translated German file: 2016-03-09 \chapter{Basic Functions of Package \Package{scrbase}} \labelbase{scrbase} @@ -411,6 +411,16 @@ members. \end{lstcode} has to be added. \end{Example} + +If\ChangedAt{v3.20}{\Package{scrbase}} you call \Macro{FamilyExecuteOptions} +with an unknown option inside the \PName{options list}, you will get an +error. But you will not get an error, if the \PName{family member} has an +option \Option{@else@}. In this case option \Option{@else@} will be used +instead of the unknown option. \KOMAScript{} itself uses this feature, e.\,g., +inside the definition of section like commands to prior the style attribute +above all other attributes. + +Usage of the command inside the execution of an option is provided.% % \EndIndex{Cmd}{FamilyExecuteOptions}% 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 f19c3ebc4fa..017c382ab10 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 @@ -1,6 +1,6 @@ % ====================================================================== % scrbookreportarticle-experts.tex -% Copyright (c) Markus Kohm, 2001-2015 +% Copyright (c) Markus Kohm, 2001-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrbookreportarticle-experts.tex -% Copyright (c) Markus Kohm, 2001-2015 +% Copyright (c) Markus Kohm, 2001-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -48,16 +48,18 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle-experts.tex} - [$Date: 2015-09-11 14:31:18 +0200 (Fri, 11 Sep 2015) $ + [$Date: 2016-04-07 09:48:00 +0200 (Thu, 07 Apr 2016) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl for experts)] \translator{Gernot Hassenpflug\and Markus Kohm} -% Date of the translated German file: 2015-09-10 +% Date of the translated German file: 2016-03-08 -\chapter{Additional Information about the Main Classes \Class{scrbook}, +\chapter[{Additional Information about the Main Classes and + \Package{scrextend}}]{Additional Information about the Main Classes + \Class{scrbook}, \Class{scrreprt}, and \Class{scrartcl} as well as the Package \Package{scrextend}} \labelbase{maincls-experts} @@ -536,26 +538,35 @@ dependent attributes, too. Currently the following styles are provided: the value should be unique.\\ \PValue{style} & \PName{name} & Defines the style of the heading.\\ - \PValue{tocindent} & \PName{length} & Total indentation from the left - margin of the entry in the table of - contents corresponding to this - heading, if and only if such an - entry will be made (see - \Counter{tocdepth} (siehe - \autoref{sec:maincls.toc}, - \autopageref{desc:maincls.counter.tocdepth}).\\ - \PValue{toclevel} & \PName{integer} & - A number denoting the depth of the - entry in the table of contents - corresponding to this heading, if - this should differ from - \PValue{level} (see - \Counter{tocdepth} in - \autoref{sec:maincls.toc}, - \autopageref{desc:maincls.counter.tocdepth}). \\ - \PValue{tocnumwidth} & \PName{length} & - Width of the box for the number of - the entry in the table of contents.\\ + \ChangedAt[2016/03]{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + \PValue{tocstyle} & \PName{name} & Defines the style of the entries into + the table of contents. You can use + every already defined toc-entry + style (see + \autoref{sec:tocbasic.tocstyle}). An + empty \PName{name} prevents a new + definition of the toc-entry command.\\ + % \PValue{tocindent} & \PName{length} & Total indentation from the left + % margin of the entry in the table of + % contents corresponding to this + % heading, if and only if such an + % entry will be made (see + % \Counter{tocdepth} (siehe + % \autoref{sec:maincls.toc}, + % \autopageref{desc:maincls.counter.tocdepth}).\\ + % \PValue{toclevel} & \PName{integer} & + % A number denoting the depth of the + % entry in the table of contents + % corresponding to this heading, if + % this should differ from + % \PValue{level} (see + % \Counter{tocdepth} in + % \autoref{sec:maincls.toc}, + % \autopageref{desc:maincls.counter.tocdepth}). \\ + % \PValue{tocnumwidth} & \PName{length} & + % Width of the box for the number of + % the entry in the table of contents.\\ \bottomrule \end{tabularx} \end{table} @@ -738,6 +749,26 @@ the \PName{key} \PValue{counterwithin} defines a counter the heading number depends on, the output of the counter will be prefixed by the output of that counter followed by a dot. +Beside\ChangedAt[2016/03]{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} the section-like command, a command for corresponding +entries to the table of contents is defined also. This is done using package +\Package{tocbasic}\important{\Package{tocbasic}}\IndexPackage{tocbasic}. +Attribute \PName{tocstyle} defines the style of those entries. If you set an +empty \PName{name}, e.\,g., using \OptionValue{tocstyle}{} or +\OptionValue{tocstyle}{\{\}}, the entry command will not be changed. This is +important, if you use another package to modify the table of contents. If you +do not set attribute \PValue{tocstyle} the already configured style will be +used again. + +The\ChangedAt[2016/03]{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} different toc-entry styles also have different, additional +attributes. You can set them here too, if you prefix them with +\PValue{toc}. For example, you can setup the level of the toc-entries, +\PValue{level}, using \PValue{toclevel}, the indention, \PValue{indent}, using +\PValue{tocindent}, or the number width, \PValue{numwidth}, using +\PValue{tocnumwidth}. For more toc-entry style attributes see +\autoref{sec:tocbasic.tocstyle}, \autopageref{sec:tocbasic.tocstyle}. + \begin{Example} Because of incomprehensible reasons, the headings of \Macro{paragraph} shouldn't be run-in headings any longer but headings similar to @@ -791,12 +822,16 @@ with their initial definition. Furthermore, the original definition of \Class{scrreprt} and \Class{scrbook} use slightly different values. Some settings of \Macro{chapter} depend on option \Option{headings} (see -\autoref{sec:maincls.structure}, -\autopageref{desc:maincls.option.headings}). \hyperref[tab:maincls.chapter.skips]{Table~\ref*{tab:maincls.chapter.skips}} +\autoref{sec:maincls.structure}, \autopageref{desc:maincls.option.headings}). +\hyperref[tab:maincls.chapter.skips]{Table~\ref*{tab:maincls.chapter.skips}} shows the default values of these settings. An overview of all settings is -shown in \autoref{tab:maincls.section.defaults}. Please note, that -\PValue{1ex} and \Length{baselineskip} depend on the default font size -of the heading or the table of contents entry.% +shown in \autoref{tab:maincls.section.defaults}. For more +information\ChangedAt[2016/03]{v3.20}{\Class{scrbook}\and + \Class{scrreprt}\and \Class{scrartcl}} about the default of the toc-entry +styles see \autoref{sec:tocbasic.tocstyle}\important{\Package{tocbasic}}, +\autopageref{sec:tocbasic.tocstyle}. Please note, that \PValue{1ex} and +\Length{baselineskip} depend on the default font size of the heading or the +table of contents entry.% % \begin{table} \centering @@ -870,7 +905,9 @@ of the heading or the table of contents entry.% \autoref{tab:maincls.structureElementsFont}, \autopageref{tab:maincls.structureElementsFont} \\ \PValue{tocindent} & \PValue{0pt} \\ + \PValue{toclevel} & -1 \\ \PValue{tocnumwidth} & \PValue{2em} \\ + \PValue{tocstyle} & \PValue{part} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -890,7 +927,9 @@ of the heading or the table of contents entry.% \autoref{tab:maincls.structureElementsFont}, \autopageref{tab:maincls.structureElementsFont} \\ \PValue{tocindent} & \PValue{0pt} \\ + \PValue{toclevel} & 0 \\ \PValue{tocnumwidth} & \PValue{1.5em} \\ + \PValue{tocstyle} & \PValue{chapter} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -907,7 +946,9 @@ of the heading or the table of contents entry.% \PValue{indent} & \PValue{0pt} \\ \PValue{level} & 1 \\ \PValue{tocindent} & \PValue{1.5em}\\ + \PValue{toclevel} & 1 \\ \PValue{tocnumwidth} & \PValue{2.3em}\\ + \PValue{tocstyle} & \PValue{section} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -924,7 +965,9 @@ of the heading or the table of contents entry.% \PValue{indent} & \PValue{0pt} \\ \PValue{level} & 2 \\ \PValue{tocindent} & \PValue{3.8em}\\ + \PValue{toclevel} & 2 \\ \PValue{tocnumwidth} & \PValue{3.2em}\\ + \PValue{tocstyle} & \PValue{section} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -942,6 +985,8 @@ of the heading or the table of contents entry.% \PValue{level} & 3 \\ \PValue{tocindent} & \PValue{7.0em}\\ \PValue{tocnumwidth} & \PValue{4.1em}\\ + \PValue{toclevel} & 3 \\ + \PValue{tocstyle} & \PValue{section} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -958,7 +1003,9 @@ of the heading or the table of contents entry.% \PValue{indent} & \PValue{0pt} \\ \PValue{level} & 4 \\ \PValue{tocindent} & \PValue{10em}\\ + \PValue{toclevel} & 4 \\ \PValue{tocnumwidth} & \PValue{5em}\\ + \PValue{tocstyle} & \PValue{section} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -975,7 +1022,9 @@ of the heading or the table of contents entry.% \PValue{indent} & \Macro{scr@parindent} \\ \PValue{level} & 5 \\ \PValue{tocindent} & \PValue{12em}\\ + \PValue{toclevel} & 5 \\ \PValue{tocnumwidth} & \PValue{6em}\\ + \PValue{tocstyle} & \PValue{section} \\ \bottomrule \end{tabularx} \end{longtable} @@ -1064,7 +1113,7 @@ already part of the default of \Macro{partheadendvskip} in \Class{scrreprt}} is used to produce the empty page after the part heading page of \Class{scrbook} and \Class{scrreprt}. -Since \KOMAScript~3.15\ChangedAt{3.15}{\Class{scrbook}\and +Since \KOMAScript~3.15\ChangedAt{v3.15}{\Class{scrbook}\and \Class{scrreprt}\and \Class{scrartcl}} the defaults of these seven commands are independent from option \Option{headings} (see \autoref{sec:maincls.structure}, 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 80d6724c660..3ba49ba03e6 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 @@ -1,6 +1,6 @@ % ====================================================================== % scrbookreportarticle.tex -% Copyright (c) Markus Kohm, 2001-2015 +% Copyright (c) Markus Kohm, 2001-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrbookreportarticle.tex -% Copyright (c) Markus Kohm, 2001-2015 +% Copyright (c) Markus Kohm, 2001-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,13 +46,13 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle.tex} - [$Date: 2015-08-27 11:10:36 +0200 (Thu, 27 Aug 2015) $ + [$Date: 2016-04-07 10:29:28 +0200 (Thu, 07 Apr 2016) $ 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-08-27 +% Date of translated german file: 2016-04-07 \chapter{The Main Classes: \Class{scrbook}, \Class{scrreprt}, and \Class{scrartcl}} @@ -3547,9 +3547,11 @@ of the document. This also of course applies to tables. \begin{Declaration} \Macro{setcapwidth}\OParameter{justification}\Parameter{width}\\ + \Macro{setcapdynwidth}\OParameter{justification}\Parameter{width}\\ \Macro{setcapmargin}\OParameter{margin left}\Parameter{margin}\\ \Macro{setcapmargin*}\OParameter{margin inside}\Parameter{margin} \end{Declaration} +\BeginIndex{Cmd}{setcapdynwidth}% \BeginIndex{Cmd}{setcapwidth}% \BeginIndex{Cmd}{setcapmargin}% \BeginIndex{Cmd}{setcapmargin*}% @@ -3581,6 +3583,14 @@ such tables are aligned according to the format of the caption on the first page of the table. This is a conceptual problem in the implementation of \Package{longtable}. +Please\ChangedAt{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}\textnote{Attention!} note, \Macro{setcapwidth} sets the +width immediately to the value of parameter \PName{width} like +\Macro{setlength} would do. If you instead want the value of \PName{width} +when the caption is set, you can use \Macro{setcapdynwidth}. There can be +differences in the result, if you, e.\,g., use lengths like \Length{linewidth} +or other commands as argument \PName{width}. + With\important{\Macro{setcapmargin}} the command \Macro{setcapmargin} you can specify a \PName{margin} which is to be left free next to the description in addition to the normal text margin. If you want margins with different widths diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex index 822c10bc08e..a9697cbb2aa 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrjura.tex @@ -1,6 +1,6 @@ % ====================================================================== % scrjura.tex -% Copyright (c) Markus Kohm, 2015 +% Copyright (c) Markus Kohm, 2011-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrjura.tex -% Copyright (c) Markus Kohm, 2015 +% Copyright (c) Markus Kohm, 2011-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -45,30 +45,1078 @@ % % ====================================================================== - -\KOMAProvidesFile{scrjura.tex} - [$Date: 2014-06-25 16:38:45 +0200 (Wed, 25 Jun 2014) $ +\KOMAProvidesFile{scrjura.tex}% + [$Date: 2016-05-10 14:02:52 +0200 (Tue, 10 May 2016) $ KOMA-Script guide (chapter: scrjura)] -\chapter{Support for Jurists with \Package{scrjura}} +\translator{Alexander Willand\and Markus Kohm} + +% Date of translated German version: 2016/05/09 + +\chapter{Support for the Law Office by \Package{scrjura}} \labelbase{scrjura} \BeginIndex{Package}{scrjura} -In \cite{book:komascript} you can find a chapter about \Package{scrjura} at -this place. Unfortunately, I could not find anyone with good enough English -knowledge and the juristic vocabulary to translate that chapter into -English. So I was not yet able to have such a chapter here in the free English -users guide. Because of this I have also decided to add the chapter from -the book not to the free German users guide. Nevertheless, if you understand -German you may try the free manual by Dr.\,Alexander Willand. Unfortunately, -this is only sometimes complete but sometimes outdated.% +In case you'd like to write a contract\Index{contract}, the bylaws of a +company or of the club, an act of law or a whole commentary, the package +\Package{scrjura} will provide typographical support. Despite the fact that +\Package{scrjura} is intended as a broad help for juridical documents, the +contract is the central element of the package. Particular attention is being +paid to the clause with numbered title and numbered paragraphs\,---\,if +a clause consists of more than one paragraph\,---, even numbered sentences, +entries in the table of contents and cross references according to German +standards. + +The package has been developed in cooperation with Dr Alexander Willand, +lawyer in Karlsruhe. + +Note\textnote{Attention!} that the package cooperates with +\Package{hyperref}\IndexPackage{hyperref}. Nevertheless, \Package{hyperref} +has to be loaded after \Package{scrjura} as usual. + +\LoadCommon{0} % \section{Frühe oder späte Optionenwahl} + +\section{Table of Contents} +\label{sec:scrjura.toc} + +The package \Package{scrjura} provides entries into the table of contents. + +\begin{Declaration} + \KOption{juratotoc}\PName{simple switch}\\ + \KOption{juratotoc}\PName{level number} +\end{Declaration} +\BeginIndex{Option}{juratotoc~=\PName{simple switch}}% +\BeginIndex{Option}{juratotoc~=\PName{level number}}% +A clause\Index{clause} is being shown in the table of contents only, if its +\PName{level number} is smaller or equal to the +counter \Counter{tocdepth}\important{\Counter{tocdepth}}\IndexCounter{tocdepth} +(see \autoref{sec:maincls.toc}, +\autopageref{desc:maincls.counter.tocdepth}). Default for the \PName{level + number} is 10000, which as well will be used, if the option is switched off +by the \PName{simple switch}\important{\OptionValue{juratotoc}{false}} (see +\autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}). Because the +counter \Counter{tocdepth} usually has a one digit value, clause entries are +not shown in the table of contents. + +If you switch on the option using the \PName{simple + switch}\important{\OptionValue{juratotoc}{true}}, as a default \PName{level + number} 2 is used, so that clauses are shown in the table of contents on the +same level as subsections. If the counter \Counter{tocdepth} has default +values as well, clauses are shown with all \KOMAScript{} classes.% +\EndIndex{Option}{juratotoc~=\PName{level number}}% +\EndIndex{Option}{juratotoc~=\PName{simple switch}}% + +\begin{Declaration} + \KOption{juratocindent}\PName{indent}\\ + \KOption{juratocnumberwidth}\PName{number width} +\end{Declaration} +\BeginIndex{Option}{juratocindent~=\PName{indent}}% +\BeginIndex{Option}{juratocnumberwidth~=\PName{number width}}% +These two options can be used to determine the indentation in the table of +contents as well as the reserved space for the numbers there. Defaults are the +values for the subsection entries in \Class{scrartcl}.% +\EndIndex{Option}{juratocnumberwidth~=\PName{number width}}% +\EndIndex{Option}{juratocindent~=\PName{indent}}% + + + +\section{Environment for Contracts} +\label{sec:scrjura.contract} + +\BeginIndex{}{contract} +The main mechanism of \Package{scrjura} only work inside of the contract +environment. + +\begin{Declaration} + \XMacro{begin}\PParameter{\Environment{contract}}\\ + \dots\\ + \XMacro{end}\PParameter{\XEnvironment{contract}} +\end{Declaration} +\BeginIndex{Env}{contract}% +Till this date, this is the one and only environment for legal practitioner +provided by \Package{scrjura}. Using it will activate the automatic numbering +of paragraphs and the commands \Macro{Clause} and \Macro{SubClause} will +become a form, which will be documented below. + +The\textnote{Attention!} environment \Environment{contract} must not be nested +in itself. Within the document the environment may be used several times. In +this case the clauses within the environment are treated as if they were +within the same environment. Ending the environment means just a break and +with beginning a new environment in the same document the former +environment is continued. A break inside a clause is not possible.% +\EndIndex{Env}{contract} + +\begin{Declaration} + \Option{contract} +\end{Declaration} +\BeginIndex{Option}{contract}% +The whole document becomes a contract if you use this option while loading the +package with \Macro{usepackage}\important{\Macro{usepackage}} or as a global +option with \Macro{documentclass}\important{\Macro{documentclass}}. The +document behaves as if you started the contract environment right after the +beginning of the document. + +Neither\textnote{Attention!} you can use this option with \Macro{KOMAoption} +nor with \Macro{KOMAoptions}, so that it is not possible to switch the option +off in this way. Please use the \Environment{contract} environment directly.% +\EndIndex{Option}{contract} + +\subsection{Clauses} +\label{sec:scrjura.clause} +\index{section|seealso{clause}} + +With \Package{scrjura} clauses\footnote{% + In English, the word ``section'' also is used in an act of law or in an + agreement. To distinguish \Macro{section} of most document classes from the + section in \Package{scrjura}, we decided to call the section in the latter + simply ``clause''.} in a legal sense only exist inside of contracts, meaning +inside of the environment \Environment{contract}. + +\begin{Declaration} + \Macro{Clause}\OParameter{options}\\ + \Macro{SubClause}\OParameter{options} +\end{Declaration} +\BeginIndex{Cmd}{Clause}% +\BeginIndex{Cmd}{SubClause}% +These are the most important commands inside of a contract. Without using +further \PName{options} the command \Macro{Clause} creates the heading of a +clause, which consists only of the sign »\S«, followed by its number. In +contrast to this the command \Macro{SubClause} creates the heading of a clause +with the last number used by \Macro{Clause} and adds a lowercase +letter. \Macro{SubClause} mainly is intended for cases where an act or a +contract is amended and not only clauses are changed or deleted, but between +existing clauses new ones are inserted without changing the numbering. + +Both commands except as \PName{options} a list separated by commas of +properties. An overview over possible properties is provided by +\autoref{tab:scrjura.Clause.options}. For the most important of them we will +go into the details. + +\begin{table} + \caption{Possible properties for the optional argument of \Macro{Clause} and + \Macro{SubClause}} + \label{tab:scrjura.Clause.options} + \begin{desctabular} + \entry{\Option{dummy}}{% + The heading will not be printed but counted in the automatic numbering.% + }% + \entry{\KOption{head}\PName{running head}}{% + If running heads are available, \PName{running head} is used instead of + the clause \PName{title}.% + }% + \entry{\Option{nohead}}{% + The running head stays unchanged.% + }% + \entry{\Option{notocentry}}{% + Does not make an entry into the table of contents.% + }% + \entry{\KOption{number}\PName{number}}{% + Uses \PName{number} for the output of the clause number.% + }% + \entry{\KOption{preskip}\PName{skip}}{% + Changes the vertical \PName{skip} before the clause heading.% + }% + \entry{\KOption{postskip}\PName{skip}}{% + Changes the vertical \PName{skip} after the clause heading.% + }% + \entry{\KOption{title}\PName{title}}{% + Additional to the clause number a clause \PName{title} will be printed. + This is also used as default for the \PName{running head} and the + \PName{entry} in the table of contents.% + }% + \entry{\KOption{tocentry}\PName{entry}}{% + Independent from the clause \PName{title}, an \PName{entry} into the + table of contents will be made, if such entries are activated.% + }% + \end{desctabular} +\end{table} + +A skip of two lines is inserted before the heading and afterwards a skip of +one line as a default. Via the options \Option{preskip}\important[i]{\Option{preskip}, \Option{postskip}} and \Option{postskip} these skips can +be changed. The new values are not only valid for the current clause but +beginning with the actual clause until the end of the current contract +environment. It is possible as well to set these keys in advance by writing +\begin{flushleft}\quad\small + \textbf{\Macro{setkeys}}\PParameter{contract}% + \PParameter{preskip=\PName{skip},\\ + \normalsize\quad\small + \hspace{11.5em}postskip=\PName{skip}} +\end{flushleft} +independently from a clause and outside of a contract environment as well. +Also it is possible to set the keys inside of the preamble after loading +\Package{scrjura}. But it is not possible to set these options while loading +the package or by using \Macro{KOMAoptions} or \Macro{KOMAoption}. + +\BeginIndex{FontElement}{contract.Clause}% +\BeginIndex{FontElement}{Clause}% +The headings use as a default the fonts +\Macro{sffamily}\Macro{bfseries}\Macro{large}. The fonts can be changed using +the element +\FontElement{contract.Clause}\important{\FontElement{contract.Clause}} with +the help of \Macro{setkomafont}\important[i]{\Macro{setkomafont}, + \Macro{addtokomafont}} and \Macro{addtokomafont} (see +\autoref{sec:maincls.textmarkup}, +\autopageref{desc:maincls.cmd.setkomafont}). Inside the \Environment{contract} +environment instead of \FontElement{contract.Clause} simply +\FontElement{Clause}\important{\FontElement{Clause}} may be used.% +\EndIndex{FontElement}{Clause}% +\EndIndex{FontElement}{contract.Clause} + +With the options \Option{title}\important[i]{\Option{title}, \Option{head}, + \Option{tocentry}}, \Option{head}, and \Option{tocentry} a clause may get in +addition to the number a title. It\textnote{Attention!} is recommended to put +the value of these options inside brackets. Failing this, e.g., commas may +lead to confusion between different options. Empty values for \Option{head} +and \Option{tocentry} cause an empty entry. If one would like to avoid an +entry, the options \Option{nohead}\important[i]{\Option{nohead}, + \Option{notocentry}} and \Option{notocentry} have to be used. + +Instead of the running numbers the option +\Option{number}\important{\Option{number}} manually sets the number of a +clause. This will have no impact on the numbers of the subsequent clauses. +Empty numbers are not possible. Fragile commands inside \PName{number} have to +be protected with \Macro{protect}. It\textnote{Attention!} is recommended only +to use numbers and letters as assignment to \Option{number}. + +With the option \Option{dummy}\important{\Option{dummy}} the output of the +whole heading of a clause can be suppressed. The automatic numbering will +count this clause nonetheless. Thus you can skip a clause in the automatic +numbering with\textnote{Example} +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \Clause{dummy} +\end{lstcode} +in case the clause has been deleted in a later version of a contract. + +Note\textnote{Attention!}, only the values \PValue{true} and \PValue{false} +may be used in combination with \Option{dummy}. All other values will be +ignored, but may throw up an error.% +\EndIndex{Cmd}{SubClause}% +\EndIndex{Cmd}{Clause}% + +\begin{Declaration} + \Macro{Clauseformat}\Parameter{number} +\end{Declaration} +\BeginIndex{Cmd}{Clauseformat}% +As already mentioned the clauses and subclauses usually are being numbered. +The format of the number is done with the help of the command +\Macro{Clauseformat}, which expects as one and only argument the number. The +default is defined as +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \newcommand*{\Clauseformat}[1]{\S~#1} +\end{lstcode} +and, as you see, it is only the \Macro{S}\IndexCmd{S} followed by a +non-breaking space and the number. In case of redefinition take care to keep +it expandable.% +\EndIndex{Cmd}{Clauseformat}% + +\begin{Declaration} + \KOption{juratitlepagebreak}\PName{simple switch} +\end{Declaration}% +\BeginIndex{Option}{juratitlepagebreak~=\PName{simple switch}}% +Usually a page break inside a heading is prohibited. Some jurists may need +page breaks inside of clause headings. Such a break may be allowed using +\Option{juratitlepagebreak}\important{\Option{juratitlepagebreak}}. The +possible values for \PName{simple switch} are printed in +\autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}.% +\EndIndex{Option}{juratitlepagebreak~=\PName{simple switch}}% + +\begin{Declaration} + \KOption{clausemark}\PName{value} +\end{Declaration}% +\BeginIndex{Option}{clausemark~=\PName{value}}% +Clauses are a kind of inferior structure with an independent numbering +they will not have running headlines as a default. Running headlines +are possible and may be created with alternative properties. The +possible \PName{values} and their meaning are listed in +\autoref{tab:scrjura.clausemark}.% +% +\begin{table} + \caption{Possible values for option \Option{clausemark} for activation of + running heads}% + \label{tab:scrjura.clausemark}% + \begin{desctabular} + \entry{\PValue{both}}{% + Clauses generate left and right marks for running heads, if the + document provides automatic running heads.% + \IndexOption{clausemark~=\PValue{both}}% + }% + \entry{\PValue{false}, \PValue{off}, \PValue{no}}{% + Clauses do not generate marks for running heads and therefore do not + change running heads.% + \IndexOption{clausemark~=\PValue{false}}% + }% + \entry{\PValue{forceboth}}{% + Clauses use \Macro{markbith} to generate left and right marks for + running heads even if the document does not provide automatic running + heads for the current page style.% + \IndexOption{clausemark~=\PValue{forceboth}}% + }% + \entry{\PValue{forceright}}{% + Clauses use \Macro{markright} to generate right marks for running heads + even if the document does not provide automatic running heads for the + current page style.% + \IndexOption{clausemark~=\PValue{forceright}}% + }% + \entry{\PValue{right}}{% + Clauses generate right marks for running heads, if the document provides + automatic running heads.% + \IndexOption{clausemark~=\PValue{right}}% + }% + \end{desctabular} +\end{table} +% +\EndIndex{Option}{clausemark~=\PName{value}}% + + +\subsection{Paragraphs} +\label{sec:scrjura.par} + +\BeginIndex{}{paragraph>number}% +Within clauses the paragraphs are being numbered automatically. With this, the +paragraphs are a strongly structuring element, similar to \Macro{paragraph} or +\Macro{subparagraph} known, e.\,g., from article classes. Contracts usually +use a vertical skip between paragraphs. The package \Package{scrjura} does not +provide its own mechanism for this. Instead, it uses the option +\Option{parskip}\IndexOption{parskip}\important{\Option{parskip}} of the +\KOMAScript{} classes (see \autoref{sec:maincls.parmarkup}, +\autopageref{desc:maincls.option.parskip}). + + +\begin{Declaration} + \KOption{parnumber}\PName{value} +\end{Declaration} +\BeginIndex{Option}{parnumber~=\PName{value}}% +The default numbering of paragraphs is \OptionValue{parnumber}{auto} and +\OptionValue{parnumber}{true}. Once in a while it might be necessary to switch +off the automatic numbering. This is done with \OptionValue{parnumber}{false}% +\important{\OptionValue{parnumber}{false}}% +\IndexOption{parnumber~=\PValue{false}}. In this case the numbering of +sentences will be reseted. + +To realise this way of numbering paragraphs it has been necessary to gear into +the paragraph building mechanism of \LaTeX. In rare cases there is a negative +impact, which can be avoided by switching to \OptionValue{parnumber}{manual}% +\important{\OptionValue{parnumber}{manual}}% +\IndexOption{parnumber~=\PValue{manual}}. On the other hand \LaTeX itself +sometimes undoes the change. In those cases one has to activate it again with +\OptionValue{parnumber}{auto}% +\important{\OptionValue{parnumber}{auto}}% +\IndexOption{parnumber~=\PValue{auto}}. + +In a clause which consist of only one paragraph, the paragraph usually +has no number. This does only work if there are not two clauses with an +identical number in a document. Note that the number of paragraphs in a clause +is not available before the end of the clause. Therefore you need a least two +\LaTeX{} runs to get the correct, automatic paragraph numbering.% +\EndIndex{Option}{parnumber~=\PName{Einstellung}} + +\begin{Declaration} + \Counter{par}\\ + \Macro{thepar}\\ + \Macro{parformat}\\ + \Macro{parformatseparation} +\end{Declaration}% +\BeginIndex{Counter}{par}% +\BeginIndex{Cmd}{thepar}% +\BeginIndex{Cmd}{parformat}% +\BeginIndex{Cmd}{parformatseparation}% +For numbering the paragraphs inside a clause we use the counter +\Counter{par}. The output of \Macro{thepar} will display an arabic number, +because the default is \Macro{arabic}\PParameter{par}. \Macro{parformat} +provides the format, which is \Macro{thepar} in rounded brackets. For +numbering a paragraph manually, use \Macro{parformat} as well. It makes sense +to call \Macro{parformat} with a following \Macro{nobreakspace} or a tilde. + +The\ChangedAt{v0.7}{\Package{scrjura}} output of \Macro{parformat} is followed +by one or more delimiter(s). These are provided by +\Macro{parformatseparation}, which currently consists of +\Macro{nonbreakspace}, the non-breakable inter word distance. + +Package\textnote{Attention!} \Package{scrjura} assumes internally, that +\Macro{thepar} is an arabic number. Don't redefine!% +\EndIndex{Cmd}{parformatseparation} +\EndIndex{Cmd}{parformat}% +\EndIndex{Cmd}{thepar}% +\EndIndex{Counter}{par}% + +\begin{Declaration} + \Macro{ellipsispar}\OParameter{number}\\ + \Macro{parellipsis} +\end{Declaration} +\BeginIndex{Cmd}{ellipsispar}% +\BeginIndex{Cmd}{parellipsis}% +Sometimes\ChangedAt{v0.7}{\Package{scrjura}}\,---\,particularly in +comparisons\,---\,it is desirable to omit paragraphs, but to mark the +omission. Those omitted paragraphs\Index{paragraph>omission} shall be included +in the counter of the paragraphs. The package \Package{scrjura} provides the +command \Macro{ellipsispar} to do this. + +By default \Macro{ellipsispar} omits precisely one paragraph. Using the +optional argument multiple paragraphs may be omitted. In any case the output +shows just one not numbered paragraph, which only consists of the ellipsis +defined by \Macro{parellipsis}. The automatic numbering of paragraphs takes +the \PName{number} of omitted paragraphs into account. +\begin{Example} + Supposed you are writing a »comment« of the German\footnote{We have decided + to translate it into English. But please remember, it is only an example + not of existing law but of a technical realisation with + \Package{scrjura}.} penal code, but only paragraph 3 of §~2. Nevertheless + you'd like to hint at the omission. This can be done this way: +\begin{lstcode} + \documentclass[parskip=half]{scrartcl} + \usepackage{scrjura} + \begin{document} + \begin{contract} + \Clause{title={Temporal application},number=2} + \ellipsispar[2] + + If, subsequent to the commission of a criminal + offence, the law provides for a lighter penalty, + that penalty shall be applicable. + + \ellipsispar[3] + \end{contract} + \end{document} +\end{lstcode} + To see the result, just give it a try. +\end{Example} + +The ellipsis is by default \Macro{textellipsis}\IndexCmd{textellipsis}, if +such a command is defined. If not, \Macro{dots} will be +used. \Macro{parellipsis} may be redefined with \Macro{renewcommand}.% +\EndIndex{Cmd}{parellipsis}% +\EndIndex{Cmd}{ellipsispar}% +% +\EndIndex{}{paragraph>number}% + + +\subsection{Sentences} +\label{sec:scrjura.sentence} + +\BeginIndex{}{sentence>number}% +In a contract the paragraphs consist of one or more sentences. In German acts +of law it is common to number the sentences as well. Regarding +\Package{scrjura}, an automatic numbering is cumbersome and error-prone and +has not been implemented yet. + +\begin{Declaration} + \Counter{sentence}\\ + \Macro{thesentence}\\ + \Macro{Sentence} +\end{Declaration} +\BeginIndex{Counter}{sentence}% +\BeginIndex{Cmd}{thesentence}% +\BeginIndex{Cmd}{Sentence}% +Manual numbering of sentences is done with the command \Macro{Sentence}. It +adds one to the counter \Counter{sentence}. As a default, \Macro{thesentence} +is printed as an arabic number. + +Using\textnote{Hint!} \Package{babel}\IndexPackage{babel} offers an easy way +to define a short hand for \Macro{Sentence}:% +\phantomsection\label{sec:scrjura.shorthandexample}% +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt,% + moretexcs={useshorthands,defineshorthand}] + \useshorthands{'} + \defineshorthand{'S}{\Sentence\ignorespaces} +\end{lstcode} +With this definition any space after \lstinline|'S| will be ignored. It is +even possible to use the dot as abbrevation for dot and new number of the +following sentence: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt,% + moretexcs={useshorthands,defineshorthand}] + \defineshorthand{'.}{. \Sentence\ignorespaces} +\end{lstcode} +These abbrevations have been tried and tested. For details regarding +\Macro{useshorthands} and \Macro{defineshorthands} please consult the manual +of the package \Package{babel} (see \cite{package:babel}).% +\EndIndex{Cmd}{Sentence}% +\EndIndex{Cmd}{thesentence}% +\EndIndex{Counter}{sentence}% +% +\EndIndex{}{sentence>number} +% +\EndIndex{}{contract}% + + +\section{Cross References} +\label{sec:scrjura.ref} + +The conventional mechanism to set cross references using +\Macro{label}\IndexCmd{label}\important{\Macro{label}}, \Macro{ref}, and +\Macro{pageref} does not suffice. \Package{scrjura} provides more commands. + +\begin{Declaration} + \Macro{ref}\Parameter{label}\\ + \Macro{refL}\Parameter{label}\\ + \Macro{refS}\Parameter{label}\\ + \Macro{refN}\Parameter{label} +\end{Declaration} +\BeginIndex{Cmd}{ref}% +\BeginIndex{Cmd}{refL}% +\BeginIndex{Cmd}{refS}% +\BeginIndex{Cmd}{refN}% +The commands \Macro{refL}, \Macro{refS}, and \Macro{refN} give a full +reference to clause, paragraph and sentence. \Macro{refL} is a long text, +\Macro{refS} a short text and \Macro{refN} an abbreviated, numeric +form. \Macro{ref} defaults to \Macro{refL}.% +\EndIndex{Cmd}{refN}% +\EndIndex{Cmd}{refS}% +\EndIndex{Cmd}{refL}% +\EndIndex{Cmd}{ref}% + + +\begin{Declaration} + \Macro{refClause}\Parameter{label}\\ + \Macro{refClauseN}\Parameter{label} +\end{Declaration} +\BeginIndex{Cmd}{refClause}% +\BeginIndex{Cmd}{refClauseN}% +For a cross reference to to a clause without displaying paragraph and +sentences as well. \Macro{refClause} puts a section symbol (\S) in front of +the reference, while \Macro{refClauseN} does not.% +\EndIndex{Cmd}{refClauseN}% +\EndIndex{Cmd}{refClause}% + + +\begin{Declaration} + \Macro{refPar}\Parameter{label}\\ + \Macro{refParL}\Parameter{label}\\ + \Macro{refParS}\Parameter{label}\\ + \Macro{refParN}\OParameter{number format}\Parameter{label} +\end{Declaration} +\BeginIndex{Cmd}{refPar}% +\BeginIndex{Cmd}{refParL}% +\BeginIndex{Cmd}{refParS}% +\BeginIndex{Cmd}{refParN}% +You can make a cross reference to a paragraph using \Macro{refParL}, +\Macro{refParS} and \Macro{refParN}. The differences between the forms +correspond to the differences between \Macro{refL}, \Macro{refN} and +\Macro{refS}. A special feature is the optional argument of +\Macro{refParN}. Usually the numeric reference to a paragraph uses a roman +number. The optional argument allows to set a different \PName{number format}, +it may make sense to use arabic numbers. \Macro{refPar} defaults to +\Macro{refParL}.% +\EndIndex{Cmd}{refParN}% +\EndIndex{Cmd}{refParS}% +\EndIndex{Cmd}{refParL}% +\EndIndex{Cmd}{refPar}% + + +\begin{Declaration} + \Macro{refSentence}\Parameter{label}\\ + \Macro{refSentenceL}\Parameter{label}\\ + \Macro{refSentenceS}\Parameter{label}\\ + \Macro{refSentenceN}\Parameter{label} +\end{Declaration} +\BeginIndex{Cmd}{refSentence}% +\BeginIndex{Cmd}{refSentenceL}% +\BeginIndex{Cmd}{refSentenceS}% +\BeginIndex{Cmd}{refSentenceN}% +You can make a cross reference to a sentence with \Macro{refSentenceL}, +\Macro{refSentenceS}, or \Macro{refSentenceN}. Again we have a long text form, +a short text form and a numerical form. \Macro{refSentence} defaults to +\Macro{refSentenceL}.% +\EndIndex{Cmd}{refSentenceN}% +\EndIndex{Cmd}{refSentenceS}% +\EndIndex{Cmd}{refSentenceL}% +\EndIndex{Cmd}{refSentence}% + + +\begin{Declaration} + \KOption{ref}\PName{value} +\end{Declaration} +\BeginIndex{Option}{ref~=\PName{value}}% +The results of \Macro{ref}, \Macro{refPar}, and \Macro{refSentence} depend on +the \PName{value} of option \Option{ref}. Defaults are \Macro{refL}, +\Macro{refParL} and \Macro{refSentenceL}. For possible values and their +meaning see \autoref{tab:scrjura.ref}.% +% +\begin{table} +%\begin{desclist} +% \desccaption + \caption[{% + Possible values for option \Option{ref} to configure the cross reference + format% + }]{% + Possible values for option \Option{ref} to configure the cross reference + format of \Macro{ref}, \Macro{refPar}, and \Macro{refSentence}% + \label{tab:scrjura.ref}% + }% + \begin{desctabular} + \entry{\PValue{long}}{% + Combination of \PValue{parlong} and \PValue{sentencelong}.% + \IndexOption{ref~=\PValue{long}}% + }% + \entry{\PValue{numeric}}{% + Combination of \PValue{parnumeric} and \PValue{sentencenumeric}.% + \IndexOption{ref~=\PValue{numeric}}% + }% + \entry{\PValue{clauseonly}, \PValue{onlyclause}, + \PValue{ClauseOnly}, \PValue{OnlyClause}}{% + Combination of \PValue{paroff} and \PValue{sentenceoff}; note that + \Macro{refPar} and \Macro{refSentence} have empty results!% + \IndexOption{ref~=\PValue{long}}% + }% + \entry{\PValue{parlong}, \PValue{longpar}, \PValue{ParL}}{% + Paragraphs are referenced in long textual form.% + \IndexOption{ref~=\PValue{parlong}}% + }% + \entry{\PValue{parnumeric}, \PValue{numericpar}, \PValue{ParN}}{% + Paragraphs are referenced in simple numerical form.% + \IndexOption{ref~=\PValue{parnumeric}}% + }% + \entry{\PValue{paroff}, \PValue{nopar}}{% + Paragraphs have not reference. Note that \Macro{refPar} has an empty + result!% + \IndexOption{ref~=\PValue{paroff}}% + }% + \entry{\PValue{parshort}, \PValue{shortpar}, \PValue{ParS}}{% + Paragraphs are referenced in short textual form.% + \IndexOption{ref~=\PValue{parshort}}% + }% + \entry{\PValue{sentencelong}, \PValue{longsentence}, \PValue{SentenceL}}{% + Sentences are referenced in long textual form.% + \IndexOption{ref~=\PValue{parlong}}% + }% + \entry{\PValue{sentencenumeric}, \PValue{numericsentence}, + \PValue{SentenceN}}{% + Sentences are referenced in simple numeric form.% + \IndexOption{ref~=\PValue{sentencenumeric}}% + }% + \entry{\PValue{sentenceoff}, \PValue{nosentence}}{% + Sentences have no reference. Note that \Macro{refSentence} has an empty + result!% + \IndexOption{ref~=\PValue{sentenceoff}}% + }% + \entry{\PValue{sentenceshort}, \PValue{shortsentence}, \PValue{SentenceS}}{% + Sentences are referenced in short textual form.% + \IndexOption{ref~=\PValue{sentenceshort}}% + }% + \entry{\PValue{short}}{% + Combination if \PValue{parshort} and \PValue{sentenceshort}.% + \IndexOption{ref~=\PValue{value}}% + }% +\end{desctabular} +\end{table} +\EndIndex{Option}{ref~=\PName{Einstellung}}% + +\begin{Example} + Supposed you would like to reference to paragraphs in the form ``paragraph 1 + in clause 1''. As scrjura lacks of a predefined command for this, you have + to build your own definitions out of what's given:% +\begin{lstcode} + \newcommand*{\refParM}[1]{% + paragraph~\refParN[arabic]{#1} + in clause~\refClauseN{#1}% + } +\end{lstcode} + This new command can be used in the same way as \Macro{refParL}.% +\end{Example}% + +\hyperref[tab:scrjura.refexamples]{Table~\ref*{tab:scrjura.refexamples}} +provides examples of the output of the fundamental commands, not configured.% +% +\begin{table} + \KOMAoptions{captions=topbeside}% + \setcapindent{0pt}% + \begin{captionbeside}{Example outputs of the \Option{ref}-independent cross + reference commands}[l] + \begin{tabular}[t]{ll} + \toprule + Command & Example output \\ + \midrule + \Macro{refL}\Parameter{label} & § 1 paragraph 1 sentence 1 \\ + \Macro{refS}\Parameter{label} & § 1 par. 1 sent. 1 \\ + \Macro{refN}\Parameter{label} & § 1 I 1. \\ + \Macro{refClause}\Parameter{label} & § 1 \\ + \Macro{refClauseN}\Parameter{label} & 1 \\ + \Macro{refParL}\Parameter{label} & paragraph 1 \\ + \Macro{refParS}\Parameter{label} & par. 1 \\ + \Macro{refParN}\Parameter{label} & I \\ + \Macro{refParN}\POParameter{arabic}\Parameter{label} & 1 \\ + \Macro{refParN}\POParameter{roman}\Parameter{label} & i \\ + \Macro{refSentenceL}\Parameter{label} & sentence 1 \\ + \Macro{refSentenceS}\Parameter{label} & sent. 1 \\ + \Macro{refSentenceN}\Parameter{label} & 1. \\ + \bottomrule + \end{tabular} + \end{captionbeside} + \label{tab:scrjura.refexamples} +\end{table} + + +\section{Additional Environments} +\label{sec:scrjura.newenv} + +There are users of \Package{scrjura} who use it to draft neither contracts nor +commentaries on certain acts of law, but a compilation of, +e.\,g., different laws, which does not necessarly use the section prefix (\S) +before the title of each clause. Maybe somebody would like to write +something like ``Art. XY'' and needed an indpendent counter for each +contract environment. + +\begin{Declaration} + \Macro{DeclareNewJuraEnvironment}\Parameter{name}\OParameter{options}% + \Parameter{start commands}\Parameter{end commands} +\end{Declaration} +\BeginIndex{Cmd}{DeclareNewJuraEnvironment}% +This\ChangedAt{v0.9}{\Package{scrjura}} command allows to define new and +independent environments of the type contract. The argument \PName{name} is +the name of the new environment, of course. \PName{start commands} are +commands which will be executed at the beginning of the environment, as if +they were added directly after \Macro{begin}\Parameter{name}. Correspondingly +\PName{end commands} will be executed at the end of the environment, as if +added directly before \Macro{end}\Parameter{name}. Without any \PName{options} +the new environment behaves similiar to the \Environment{contract} +environment, but with its own counters. It is possible to set \PName{options} +in a comma separated list. Currently the following \PName{options} are +supported: +\begin{description} +\item[\KOption{Clause}\PName{instruction}:] Defines on which + \PName{instruction} inside the environment the command \Macro{Clause} is + being mapped. The \PName{instruction} expects exactly one argument. To use + it correctly, a deeper knowledge and understanding of the internal functions + of \Package{scrjura} is needed. Furthermore the requirements for + \PName{instruction} may change in future versions. It is recommended not to + use this option.% +\item[\KOption{SubClause}\PName{instruction}:] See explanation for + \Option{Clause} above. +\item[\KOption{Sentence}\PName{instruction}:] Defines on which + \PName{instruction} inside the environment the command \Macro{Sentence} is + being mapped. The \PName{instruction} must not have an argument. Typically + it should add one to the counter \Counter{sentence}\IndexCounter{sentence} + (using \Macro{refstepcounter}\IndexCmd{refstepcounter}) and display it + somehow. Please avoid undesirable spaces. +\item[\KOption{ClauseNumberFormat}\PName{instruction}:] Formats the numbers of + clauses. Expects exactly one argument, the number of the clause. If the + \PName{instruction} implements a series of instructions and the number is the + last argument of a that series, you may directly use the series of + instructions as \PName{instruction}. +\end{description} +\begin{Example} + To define the environment we mentioned in the preface of this section, + for articles, it is sufficient to write: +\begin{lstcode} + \DeclareNewJuraEnvironment{Artikel}[ClauseNumberFormat=Art.]{}{} +\end{lstcode} + In case paragraphs have to be separated by space between the + paragraphs, \Package{scrjura} together with a \KOMAScript{} document class + allows to write: +\begin{lstcode} + \DeclareNewJuraEnvironment{Artikel}[ClauseNumberFormat=Art.~] + {\KOMAoptions{parskip}}{} +\end{lstcode} + In cross references will ``Art.'' be used instead of ``\S'', of course.% +\end{Example}% +\EndIndex{Cmd}{DeclareNewJuraEnvironment}% + + +\section{Support for Different Languages} +\label{sec:scrjura.babel} + +The package \Package{scrjura} has been developed in cooperation with an German +lawyer. Therefore primarily it has provided the languages \PValue{german}, +\PValue{ngerman}, \PValue{austrian}, and \PValue{naustrian}. Nevertheless, it +has been designed to support common language packages like +\Package{babel}\important{\Package{babel}}\IndexPackage{babel}. Users can make +language adjustments simply using \Macro{providecaptionname} (see +\autoref{sec:scrbase.languageSupport}, +\autopageref{desc:scrbase.cmd.providecaptionname}). But if you have definite +information about the correct juristic terms and conventions of a language, it +is recommended to contact the \KOMAScript{} author. This has been happened for +English and therefore in the meantime \Package{scrjura} also provides terms +for languages \PValue{english}, \PValue{american}, \PValue{british}, +\PValue{canadian}, \PValue{USenglish}, and \PValue{UKenglish}. + +\begin{Declaration} + \Macro{parname}\\ + \Macro{parshortname}\\ + \Macro{sentencename}\\ + \Macro{sentenceshortname} +\end{Declaration} +\BeginIndex{Cmd}{parname}% +\BeginIndex{Cmd}{parshortname}% +\BeginIndex{Cmd}{sentencename}% +\BeginIndex{Cmd}{sentenceshortname}% +These are the language-dependent terms used by \Package{scrjura}. The meaning +of the terms and the English defaults are shown in +\autoref{tab:scrjura.captionnames}. The package itself uses +\Macro{providecaptionname} inside \Macro{begin}\PParameter{document} to define +them. So pre-definitions for the same language but before loading +\Package{scrjura} will not be changed. If you use \Package{scrjura} with a +language setting currently not supported, the package throws an error.% +% +\begin{table} + \KOMAoptions{captions=topbeside}% + \setcapindent{0pt}% + \begin{captionbeside} + [{% + Meanings and English defaults of language dependent terms% + }]{% + Meanings and English defaults of language dependent terms if not already + defined% + } [l] + \begin{tabular}[t]{lll} + \toprule + Command & Meaning & Default \\ + \midrule + \Macro{parname} & long form ``paragraph'' & paragraph \\ + \Macro{parshortname} & short form ``paragraph'' & par. \\ + \Macro{sentencename} & long form ``sentence'' & sentence \\ + \Macro{sentenceshortname} & short form ``sentence'' & sent. \\ + \bottomrule + \end{tabular} + \end{captionbeside} + \label{tab:scrjura.captionnames} +\end{table} +% +\EndIndex{Cmd}{sentenceshortname}% +\EndIndex{Cmd}{sentencename}% +\EndIndex{Cmd}{parshortname} +\EndIndex{Cmd}{parname} + + +\section{A Detailed Example} +\label{sec:scrjura.example} + +Remember the letter from \autoref{cha:scrlttr2}. A club member has written to +the board because of the general meeting that is regulated by the club +statutes. Such club statutes are a kind of contract and you can realise them +using \Package{scrjura}.\footnote{Please note, the example is still in German + and has to be translated. Currently we have had not enough manpower to do + the translation. Nevertheless, the contents of the example does not matter + but the technical realisation.} + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=1-2}]{scrjuraexample.tex}% +We use class \Class{scrartcl}. Because paragraph distance instead of paragraph +indentation is usual in club statutes we load the class with option +\OptionValue{parskip}{half} (see \autoref{sec:maincls.parmarkup}, +\autopageref{desc:maincls.option.parskip}). + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=4-4}]{scrjuraexample.tex}% +The club rules are in German. Therefore package \Package{babel} with option +\Option{ngerman} is used, too. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange={6-7,9-9}}]{scrjuraexample.tex}% +Default settings for the fonts are made. Additionally package +\Package{textcomp} is loaded, because it does not only provide a usable Euro +sign but also an improved section sign (\S). + +\lstinputcode[{moretexcs=SelectInputMappings,xleftmargin=2em,% + belowskip=\dp\strutbox plus 1pt,% + linerange=11-15}]{scrjuraexample.tex}% +We want to input special characters and umlauts without commands. To do so, we +let \LaTeX{} detect the input encoding. Alternatively we could use package +\Package{inputenc}. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=17-17}]{scrjuraexample.tex}% +Later in the document we want lists numbered not with arabic numbers but with +lower letters. We can do this easily with package \Package{enumerate}. + +\lstinputcode[{moretexcs={useshorthands,defineshorthand},% + belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=19-27}]{scrjuraexample.tex}% +Now, it is time for \Package{scrjura}. With option +\OptionValue{clausemark}{forceboth} we enforce left an right clause marks for +the running head. On the other hand we do not want \Macro{section} to change +the marks for the running head. Therefore we use page style +\Pagestyle{myheadings}. This page style generally does not provide automatic +running heads. + +Later we also want a table of contents with the clauses. This can be achieved +with option \Option{juratotoc}. Doing so we will see, that the clause number +width is to large for default of the entry into the table of contents. With +\OptionValue{juratocnumberwidth}{2.5em} we declare a larger reserved width. + +The definition of short hands has already been shown in +\autoref{sec:scrjura.shorthandexample}. We also use this to make the input +easier and more readable. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=29-29}]{scrjuraexample.tex}% +It is time to begin the document. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=31-35}]{scrjuraexample.tex}% +Like other documents the statutes have a title. We make it with the usual +\KOMAScript{} commands from \autoref{sec:maincls.titlepage} (see down from +\autopageref{sec:maincls.titlepage}). + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=37-37}]{scrjuraexample.tex}% +As already stated, we want to have a table of contents. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=39-43}]{scrjuraexample.tex}% +Preambles are not unusual in club statutes. Here we use \Macro{addsec} to +realise it, because we want to have an entry into the table of contents. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=45-45}]{scrjuraexample.tex}% +Here we use a tiny trick. The articles of the club statutes should be numbered +with uppercase letters instead of arabic numbers. This is the same like the +numbering of appendix sections of an article with \Class{scrartcl}. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=47-49}]{scrjuraexample.tex}% +We begin the contract with the first article. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=50-59}]{scrjuraexample.tex}% +The first clause has a number and a title. We will do the same with all +following clauses. + +The first paragraph of the clause is very usual. Because it is not the only +paragraph, the output is done with a number before the text. Note that the +numbering of the first paragraph needs at least two \LaTeX{} runs like you +will for the table of contents. + +In the second paragraph we have two sentences. Here we can see the short hands +\texttt{'S} and \texttt{'.} in action. The first one does only generate the +sentence number. The second one does not only print the full stop but also the +sentence number. With this, both sentences are numbered. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=60-75}]{scrjuraexample.tex}% +The second clause: also with several paragraphs with one or more +sentences. The second paragraph additionally has a numbered list. At the last +paragraph we used a label, because we want to reference it later. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=77-84}]{scrjuraexample.tex}% +The third clause has something special: a cross reference. Here we use the +long form with clause, paragraph and sentence. If we would decide, that +sentences should not be referenced, we could use option +\OptionValue{ref}{nosentence} globally. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=86-87}]{scrjuraexample.tex}% +Here we have a special kind of clauses. In prior versions of the club statutes +this was a real clause. But then it has been removed. Nevertheless, the +numbering of the following clauses should not be changed by removing this +one. Therefore the \Macro{Clause} statement has not been removed but +supplemented by option \Option{dummy}. With this, we also can set a label +despite the clause will not be printed. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=88-92}]{scrjuraexample.tex}% +Another article starts. To avoid problems with the paragraph numbering we +interrupt the \Environment{contract} environment. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=93-93}]{scrjuraexample.tex}% +The first clause of the next article also has been removed. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=95-104}]{scrjuraexample.tex}% +We have a real clause again. We cross reference one of the removed +clauses and also use a label. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=107-112}]{scrjuraexample.tex}% +Once more, this is a special kind of clause. This time we have not removed a +clause but added one without renumbering of the following clauses. To do so, +we use \Macro{SubClause}. Therefore the clause number is the same like the +previous one but with an appended ``a''. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=114-134}]{scrjuraexample.tex}% +The other clauses of this article are very usual. You already know all the +features used for them. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=136-150}]{scrjuraexample.tex}% +More articles with known features are following. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=152-152}]{scrjuraexample.tex}% +Then the \LaTeX{} document ends. You can see three pages from the front of the +document in \autoref{fig:scrjura.example}.% +% +\begin{figure} + \setcapindent{0pt}% + \iffree{% + {\hfill + \frame{\includegraphics[page=1,width=.482\textwidth,% + height=.49\textheight,keepaspectratio]{scrjuraexample}}\enskip + \frame{\includegraphics[page=2,width=.482\textwidth,% + height=.49\textheight,keepaspectratio]{scrjuraexample}}\par + \smallskip} + \begin{captionbeside}[{% + Example: Three pages from the front of the example club statutes of + \protect\autoref{sec:scrjura.example}% + }]{% + Three pages from the front of the example club statutes of + \protect\autoref{sec:scrjura.example}% + }% + [l] + \frame{\includegraphics[page=3,width=.482\textwidth,% + height=.49\textheight,keepaspectratio]{scrjuraexample}}\enskip + \end{captionbeside} + }{% + {\hfill + \frame{\includegraphics[page=1,width=.482\textwidth]{scrjuraexample}}% + \enskip + \frame{\includegraphics[page=2,width=.482\textwidth]{scrjuraexample}}\par + \smallskip} + \begin{captionbeside}[{% + Example: Three pages from the front of the example club statutes of + \protect\autoref{sec:scrjura.example}% + }]{% + Three pages from the front of the example club statutes of + \protect\autoref{sec:scrjura.example}% + }% + [l] + \frame{\includegraphics[page=3,width=.482\textwidth]{scrjuraexample}}% + \enskip + \end{captionbeside} + }% + \label{fig:scrjura.example} +\end{figure} + +\section{State of Development} +\label{sec:scrjura.draft} + +The package is part of \KOMAScript{} for several years and has been used by +lawyers even longer. Nevertheless, it has a version number less than 1. So you +should still regard it as work in progress. Here are the three reasons for +this: + +The package has been designed much more general than it can be used +currently. For example several environments beside \Environment{contract} has +been expected. Later we find that this one and only environment could be used +very general. Nevertheless we also find that it could be useful to be able to +define additional \Environment{contract} environments, e.\,g., for articles of +constitutional law. This has been implemented now. + +Neither the cooperation with other packages nor the cooperation of the +\Environment{contract} environment with all kind of \LaTeX{} environments or +document classes has been tested. The main reason for this is that the package +is very special and the package author does not have any requirement to use +it. So all changes, all features, all improvement can only base on detailed +user feedback and only about two and a half users are willing to send such +feedback. + +The low version number should state that things could change. The author +endeavours to preserve compatibility to prior versions. Nevertheless, +sometimes compatibility is less important than usability. So compatibility +cannot be guaranteed.% % \EndIndex{Package}{scrjura} +\endinput + %%% Local Variables: %%% mode: latex %%% mode: flyspell -%%% coding: us-ascii +%%% coding: iso-latin-1 %%% ispell-local-dictionary: "en_GB" -%%% TeX-master: "../guide.tex" +%%% TeX-PDF-mode: t +%%% TeX-master: "guide.tex" %%% End: + +% LocalWords: reseted diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrjuraexample.tex b/Master/texmf-dist/source/latex/koma-script/doc/english/scrjuraexample.tex new file mode 100644 index 00000000000..b9d700eaef5 --- /dev/null +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrjuraexample.tex @@ -0,0 +1,152 @@ +\documentclass[fontsize=12pt,pagesize,parskip=half] + {scrartcl} + +\usepackage[ngerman]{babel} + +\usepackage[T1]{fontenc} +\usepackage{lmodern} +\usepackage{charter,helvet} +\usepackage{textcomp} + +\usepackage{selinput} +\SelectInputMappings{ + adieresis={ä}, + germandbls={ß}, +} + +\usepackage{enumerate} + +\usepackage[clausemark=forceboth, + juratotoc, + juratocnumberwidth=2.5em] + {scrjura} +\useshorthands{'} +\defineshorthand{'S}{\Sentence\ignorespaces} +\defineshorthand{'.}{. \Sentence\ignorespaces} + +\pagestyle{myheadings} + +\begin{document} + +\subject{Satzung} +\title{VfVmai} +\subtitle{Verein für Vereinsmaierei mit ai n.e.V.} +\date{11.\,11.\,2011} +\maketitle + +\tableofcontents + +\addsec{Präambel} + +Die Vereinslandschaft in Deutschland ist vielfältig. +Doch leider mussten wir feststellen, dass es dabei oft +am ernsthaften Umgang mit der Ernsthaftigkeit krankt. + +\appendix + +\section{Allgemeines} + +\begin{contract} +\Clause{title={Name, Rechtsform, Sitz des Vereins}} + +Der Verein führt den Namen »Verein für Vereinsmaierei mit +ai n.e.V.« und ist in keinem Vereinsregister eingetragen. + +'S Der Verein ist ein nichtwirtschaftlicher, unnützer +Verein'. Er hat keinen Sitz und muss daher stehen. + +Geschäftsjahr ist vom 31.~März bis zum 1.~April. + +\Clause{title={Zweck des Vereins}} + +'S Der Verein ist zwar sinnlos, aber nicht zwecklos'. +Vielmehr soll er den ernsthaften Umgang mit der +Ernsthaftigkeit auf eine gesunde Basis stellen. + +Zu diesem Zweck kann der Verein +\begin{enumerate}[\qquad a)] +\item in der Nase bohren, +\item Nüsse knacken, +\item am Daumen lutschen. +\end{enumerate} + +Der Verein ist selbstsüchtig und steht dazu. + +Der Verein verfügt über keinerlei Mittel.\label{a:mittel} + +\Clause{title={Vereinsämter}} + +Die Vereinsämter sind Ehrenämter. + +'S Würde der Verein über Mittel verfügen +(siehe \ref{a:mittel}), so könnte er einen +hauptamtlichen Geschäftsführer bestellen'. Ohne +die notwendigen Mittel ist dies nicht möglich. + +\Clause{title={Vereinsmaier},dummy} +\label{p.maier} +\end{contract} + +\section{Mitgliedschaft} + +\begin{contract} +\Clause{title={Mitgliedsarten},dummy} + +\Clause{title={Erwerb der Mitgliedschaft}} + +Die Mitgliedschaft kann jeder zu einem angemessenen +Preis von einem der in \refClause{p.maier} +genannten Vereinsmaier erwerben.\label{a.preis} + +'S Zum Erwerb der Mitgliedschaft ist ein formloser +Antrag erforderlich'. Dieser Antrag ist in grüner +Tinte auf rosa Papier einzureichen. + +Die Mitgliedschaft kann nicht abgelehnt werden. + +\SubClause{title={Ergänzung zu vorstehendem + Paragraphen}} + +'S Mit Abschaffung von \refClause{p.maier} verliert +\ref{a.preis} seine Umsetzbarkeit'. Mitgliedschaften +können ersatzweise vererbt werden. + +\Clause{title={Ende der Mitgliedschaft}} + +'S Die Mitgliedschaft endet mit dem Leben'. Bei nicht +lebenden Mitgliedern endet die Mitgliedschaft nicht. + +\Clause{title={Mitgliederversammlung}} + +Zweimal jährlich findet eine Mitgliederversammlung statt. + +Der Abstand zwischen zwei Mitgliederversammlungen +beträgt höchstens 6~Monate, 1~Woche und 2~Tage. + +Frühestens 6~Monate nach der letzten Mitgliederversammlung +hat die Einladung zur nächsten Mitgliederversammlung zu +erfolgen. + +\SubClause{title={Ergänzung zur Mitgliederversammlung}} + +Die Mitgliederversammlung darf frühstens 2~Wochen nach +letztem Eingang der Einladung abgehalten werden. +\end{contract} + +\section{Gültigkeit} + +\begin{contract} +\Clause{title={In Kraft treten}} + +Diese Satzung tritt am 11.\,11.\,2011 um 11:11~Uhr +in Kraft. + +'S Sollten irgendwelche Bestimmungen dieser Satzung im +Widerspruch zu einander stehen, tritt die Satzung am +11.\,11.\,2011 um 11:11~Uhr und 11~Sekunden wieder +außer Kraft'. Der Verein ist in diesem Fall als +aufgelöst zu betrachten. + +\end{contract} + +\end{document} 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 b1c0b73e789..c0e3824006c 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-09-15 11:35:31 +0200 (Tue, 15 Sep 2015) $ + [$Date: 2015-11-06 10:16:26 +0100 (Fri, 06 Nov 2015) $ KOMA-Script guide (chapter:scrlayer)] \translator{Markus Kohm} -% Date of the translated file: 2015-09-15 +% Date of the translated file: 2015-11-06 \chapter[{Defining Layers and Page Styles Using \Package{scrlayer}}]% {Defining Layers and Page Styles Using \Package{scrlayer}% @@ -657,6 +657,12 @@ 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.% + +It should be noted at this point that using package +\Package{picture}\IndexPackage{picture}\textnote{\Package{picture}} (see +\cite{package:picture}) supersedes \Macro{LenToUnit} more or less. The package +extends environment \Environment{picture} and the picture commands to accept +\LaTeX{} lengths directly.% \EndIndex{Cmd}{LenToUnit}% 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 114f78a4884..c2b92f9e897 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-08-25 11:11:53 +0200 (Tue, 25 Aug 2015) $ + [$Date: 2015-12-17 11:57:09 +0100 (Thu, 17 Dec 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-08-25 +% Date of translated german file: 2015-12-17 \chapter{The New Letter Class \Class{scrlttr2}} \labelbase{scrlttr2} @@ -2574,7 +2574,7 @@ page style of most classes. Therefore package \Package{scrletter} defines 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 +\autoref{sec:scrlttr2-experts.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 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 a2625eea6ae..6020dd474dd 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 @@ -1,69 +1,63 @@ -\immediate\write17{^^J% -+----------------------------------------------------------------------^^J% -| WARNING (`tocbasic.tex'):^^J% -+----------------------------------------------------------------------^^J% -| YOU SHOULD NOTE, THAT THIS IS NOT AN OFFICIAL RELEASE!^^J% -| THIS VERSION IS INTENDED TO BE USED FOR TESTING ONLY!^^J% -| USAGE FOR PURPOSES OTHER THAN INTENDED IS DANGEROUS!^^J% -| DON'T EXPECT ANY SUPPORT FOR THIS VERSION!^^J% -+----------------------------------------------------------------------^^J% -} -%% -%% This is file `tocbasic.tex', -%% generated with the docstrip utility, extended by scrdocstrip. -%% -%% The original source files were: -%% -%% tocbasic.dtx (with options: `doc') -%% -%% 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 -%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. -%% -%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ -\ProvidesFile{tocbasic.tex}[% - 2015/10/03 v3.19a KOMA-Script - package - (handling toc-files)% -] - -\translator{Markus Kohm} - +% ====================================================================== +% tocbasic.tex +% Copyright (c) Markus Kohm, 2002-2016 +% +% This file is part of the LaTeX2e KOMA-Script bundle. +% +% This work may be distributed and/or modified under the conditions of +% the LaTeX Project Public License, version 1.3c of the license. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later and of this work. +% +% This work has the LPPL maintenance status "author-maintained". +% +% The Current Maintainer and author of this work is Markus Kohm. +% +% This work consists of all files listed in manifest.txt. +% ---------------------------------------------------------------------- +% tocbasic.tex +% Copyright (c) Markus Kohm, 2002-2016 +% +% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, +% Version 1.3c, verteilt und/oder veraendert werden. +% Die neuste Version dieser Lizenz ist +% http://www.latex-project.org/lppl.txt +% und Version 1.3c ist Teil aller Verteilungen von LaTeX +% Version 2005/12/01 oder spaeter und dieses Werks. +% +% Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained" +% (allein durch den Autor verwaltet). +% +% Der Aktuelle Verwalter und Autor dieses Werkes ist Markus Kohm. +% +% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien. +% ====================================================================== +% +% Package tocbasic for Package and Class Authors +% Maintained by Markus Kohm +% +% ---------------------------------------------------------------------- +% +% Paket tocbasic fuer Paket- und Klassenautoren +% Verwaltet von Markus Kohm +% +% ====================================================================== + +\KOMAProvidesFile{tocbasic.tex} + [$Date: 2016-04-23 19:14:01 +0200 (Sat, 23 Apr 2016) $ + KOMA-Script guide (package tocbasic)] + +% Date of translated German file: 2016/04/07 + +\translator{Markus Kohm\and Arndt Schubert} \chapter[{Management of Tables and Lists of Contents Using \Package{tocbasic}}] {Management of Tables and Lists of Contents Using - \Package{tocbasic}\protect\footnote{This chapter has been generated from the - source of the package. It's not a 1-to-1 translation of the German - manual. Currently translation has not been finished}} + \Package{tocbasic}\protect\footnote{Translation of this chapter has been + made by the package author and needs editing!}} \labelbase{tocbasic} \BeginIndex{Package}{tocbasic}% @@ -75,45 +69,53 @@ authors of classes and packages to create own tables or lists of contents like the list of figures and the list of tables and thereby allow other classes or packages some types of control over these. For examples package \Package{tocbasic} delegates language control of all these tables and lists of -contents to package \Package{babel}\IndexPackage{babel}%^^A -\ (see \cite{package:babel})%^^A -. So automatic change of language will be provided inside -all these tables and lists of contents. Using \Package{tocbasic} will +contents to package \Package{babel}\IndexPackage{babel} (see +\cite{package:babel}). So automatic change of language will be provided +inside all these tables and lists of contents. Using \Package{tocbasic} will exculpate authors of classes and packages from implementation of such features. \KOMAScript{} itself uses \Package{tocbasic} not only for the table of -contents but also for the already mentioned lists of figures and tables. +contents but also for the already mentioned lists of figures and +tables. In\textnote{TOC} this chapter we call all kinds of tables of contents +or lists of contents simply TOC\Index[indexmain]{TOC}. \section{Basic Commands} \label{sec:tocbasic.basics} -Basic commands are used to handle a list of all extensions\textnote{file - extension, table or list of contents} known for files representing a table -of contents or list of something. Entries to such files are typically written -using \Macro{addtocontents}\important{\Macro{addtocontents}, - \Macro{addcontentsline}} or \Macro{addcontentsline}. There are also -commands to do something for all known extensions. And there are commands to -set or unset features of an extension or the file represented by the -extension. Typically an extension also has an owner\textnote{file owner}. -This owner may be a class or package or a term decided by the author of the -class or package using \Package{tocbasic}, e.\,g., \KOMAScript{} uses the -owner \texttt{float} for list of figures and list of tables, and the file name -of the class file as owner for the table of contents. +Basic commands are used to handle a list of all file name +extensions\textnote{file name extension, table or list of contents} known for +files representing a table or list of contents. We call these auxiliary +files\Index{auxiliary file}\footnote{Here we do not talk about the + \File{aux}-file but the auxiliary files used indirect via the + \File{aux}-file, e.\,g., the \File{toc}-file, the \File{lof}-file, or the + \File{lot}-file.} TOC-files\textnote{TOC-file}\Index[indexmain]{TOC-file} +independent from the file name extension that is used. Entries to such files +are typically written using +\Macro{addtocontents}\important{\Macro{addtocontents}, + \Macro{addcontentsline}} or \Macro{addcontentsline}. Later in this chapter +you will learn to know recommended, additional commands. There are also +commands to do something for all known extensions. Additionally, there are +commands to set or unset features of a file name extension or the file +represented by the extension. Typically an extension also has an +owner\textnote{file owner}. This owner may be a class or package or a term +decided by the author of the class or package using \Package{tocbasic}, +e.\,g., \KOMAScript{} uses the owner \texttt{float} for list of figures and +list of tables, and the file name of the class file as owner for the table of +contents. \begin{Declaration} \Macro{ifattoclist}\Parameter{extension}\Parameter{true part}\Parameter{false part} \end{Declaration} \BeginIndex{Cmd}{ifattoclist}% -This command -may be used to ask, wether or not an \PName{extension} is already a known -extension. If the \PName{extension} is already known the \PName{true - instructions} will be used, otherwise the \PName{false instructions} will be -used. +This command may be used to ask, whether or not a file name \PName{extension} +is already a known extension. If the \PName{extension} is already known the +\PName{true instructions} will be used, otherwise the \PName{false + instructions} will be used. \begin{Example} - Maybe you want to know if the extension ``\File{foo}'' is already in use to - report an error, if you can not use it: + Maybe you want to know if the file name extension ``\File{foo}'' is already + in use to report an error, if you can not use it: \begin{lstcode} \ifattoclist{foo}{% \PackageError{bar}{% @@ -136,12 +138,11 @@ used. \Macro{addtotoclist}\OParameter{owner}\Parameter{extension} \end{Declaration} \BeginIndex{Cmd}{addtotoclist}% -This command -adds the \PName{extension} to the list of known extensions. But if the -\PName{extension} is a known one already, then an error will be reported to -avoid double usage of the same \PName{extension}. +This command adds the \PName{extension} to the list of known extensions. But +if the \PName{extension} is a known one already, then an error will be +reported to avoid double usage of the same \PName{extension}. -If the optional argument, \OParameter{owner}, was given this \PName{owner} +If the optional argument, \OParameter{owner}, was given, this \PName{owner} will be stored to be the owner of the \PName{extension}. If the optional argument has been omitted, \Package{tocbasic} tries to find out the file name of the current processed class or package and stores this as owner. @@ -160,7 +161,7 @@ result in an empty owner. \addtotoclist{foo} \end{lstcode}% This will add the extension ``\PValue{foo}'' with owner ``\PValue{bar.sty}'' - to the list of known extensions, if it was not already on the list of known + to the list of known extensions, if it was not already in the list of known extensions. If the class or another package already added the extension you will get the error: \begin{lstoutput} @@ -169,7 +170,7 @@ result in an empty owner. See the tocbasic package documentation for explanation. Type H <return> for immediate help. \end{lstoutput} - and after typing \texttt{H} and pressing the return key you will get the + and after typing \texttt{h} and pressing the return key you will get the help: \begin{lstoutput} File extension `foo' is already used by a toc-file, while bar.sty @@ -178,7 +179,7 @@ result in an empty owner. or a mistake by the user. \end{lstoutput} - Maybe your package has a command, that creates list of files dynamically. In + Maybe your package has a command, that creates list of files dynamically. In this case you should use the optional argument of \Macro{addtotoclist} to set the owner. \begin{lstcode} @@ -192,8 +193,8 @@ result in an empty owner. \createnewlistofsomething{foo} \end{lstcode} this would add the extension ``\PValue{foo}'' with the owner - ``\PValue{bar.sty}'' to the list of known extension or report an error, if the - extension is already in use. + ``\PValue{bar.sty}'' to the list of known extension or report an error, if + the extension is already in use. \end{Example} You may use any owner you want. But it should be unique! So, if you would be, e.\,g., the author of package \Package{float} you could use for example @@ -201,21 +202,21 @@ owner ``\PValue{float}'' instead of owner ``\PValue{float.sty}'', so the \KOMAScript{} options for the list of figures and the list of tables will also handle the lists of this package. Those are already added to the known extensions when the option is used. This is because \KOMAScript{} already -registers file extension ``\PValue{lof}'' for the list of figures and file -extension ``\PValue{lot}'' for the list of tables with owner -``\PValue{float}'' and sets options for this owner. +registers file name extension ``\PValue{lof}'' for the list of figures and +file name extension ``\PValue{lot}'' for the list of tables with owner +``\PValue{float}'' and sets options for this owner. Package \Package{scrhack} +redefines some of package \Package{float}'s commands to do this.% \EndIndex{Cmd}{addtotoclist}% \begin{Declaration} \Macro{AtAddToTocList}\OParameter{owner}\Parameter{instructions} \end{Declaration} \BeginIndex{Cmd}{AtAddToTocList}% -This command -adds the \PName{instructions} to a internal list of instructions that will be -processed whenever a file extension with the given \PName{owner} will be -added to the list of known extensions using \Macro{addtotoclist}. The -optional argument is handled in the same way as with the command -\Macro{addtotoclist}. With an empty \PName{owner} you may +This command adds the \PName{instructions} to an internal list of instructions +that will be processed whenever a file name extension with the given +\PName{owner} will be added to the list of known extensions using +\Macro{addtotoclist}. The optional argument is handled in the same way as +with the command \Macro{addtotoclist}. With an empty \PName{owner} you may add \Parameter{instructions}, that will be processed at every successful \Macro{addtotoclist}, after processing the instructions for the individual owner. While processing the \PValue{instructions}, @@ -236,18 +237,16 @@ the extension of the currently added extension. The two \Macro{expandafter} commands are needed, because the argument of \Macro{tocbasic@extend@babel} has to be expanded! See the description of \Macro{tocbasic@extend@babel} at \autoref{sec:tocbasic.internals}% -, \autopageref{desc:tocbasic.cmd.tocbasic@extend@babel} -for more information. +, \autopageref{desc:tocbasic.cmd.tocbasic@extend@babel} for more information.% \EndIndex{Cmd}{AtAddToTocList}% \begin{Declaration} \Macro{removefromtoclist}\OParameter{owner}\Parameter{extension} \end{Declaration} \BeginIndex{Cmd}{removefromtoclist}% -This command -removes the \PName{extension} from the list of known extensions. If the -optional argument, \OParameter{owner}, was given, the \PName{extension} will -only be removed if it was added by this \PName{owner}. See description of +This command removes the \PName{extension} from the list of known extensions. +If the optional argument, \OParameter{owner}, was given, the \PName{extension} +will only be removed if it was added by this \PName{owner}. See description of \Macro{addtotoclist} for information of omitting optional argument. Note that an empty \PName{owner} is not the same like omitting the optional argument, but removes the \PName{extension} without any owner test.% @@ -258,14 +257,14 @@ but removes the \PName{extension} without any owner test.% \end{Declaration} \BeginIndex{Cmd}{doforeachtocfile}% Until now you've learned to know commands that result in more safety in -handling file extensions, but also needs some additional effort. With -\Macro{doforeachtocfile}%^^A -\ you will win for this. The command provides to processes \PName{instructions} -for every known file extension of the given \PName{owner}. While processing -the \PName{instructions} \Macro{@currext} is the extension of the current -file. If you omit the optional argument, \OParameter{owner}, every known file -extensions independent from the owner will be used. If the optional argument -is empty, only file extensions with an empty owner will be processed. +handling file name extensions, but also needs some additional effort. With +\Macro{doforeachtocfile} you will win for this. The command provides to +processes \PName{instructions} for every known file name extension of the +given \PName{owner}. While processing the \PName{instructions} +\Macro{@currext} is the extension of the current file. If you omit the +optional argument, \OParameter{owner}, every known file name extension +independent from the owner will be used. If the optional argument is empty, +only file name extensions with an empty owner will be processed. \begin{Example} If you want to type out all known extensions, you may simply write: \begin{lstcode} @@ -282,45 +281,44 @@ is empty, only file extensions with an empty owner will be processed. \Macro{tocbasicautomode} \end{Declaration} \BeginIndex{Cmd}{tocbasicautomode}% -This command -redefines \LaTeX{} kernel macro \Macro{@starttoc} to add all not yet added -extensions to the list of known extensions and use \Macro{tocbasic@starttoc} -instead of \Macro{@starttoc}. See \autoref{sec:tocbasic.internals}%^^A -, \autopageref{desc:tocbasic.cmd.tocbasic@starttoc} -for more information about \Macro{tocbasic@starttoc} and \Macro{@starttoc}. +This command redefines \LaTeX{} kernel macro \Macro{@starttoc} to add all not +yet added extensions to the list of known extensions and use +\Macro{tocbasic@starttoc} instead of \Macro{@starttoc}. See +\autoref{sec:tocbasic.internals}, +\autopageref{desc:tocbasic.cmd.tocbasic@starttoc} for more information about +\Macro{tocbasic@starttoc} and \Macro{@starttoc}. This means that after using \Macro{tocbasicautomode} every table of contents or list of something, that will be generated using \Macro{@starttoc} will be -at least partially under control of \Package{tocbasic}. Whether or not this will -make the wanted result, depends on the individual table of contents and lists -of something. At least the \Package{babel} control extension for -all those tables of contents and lists of something will work. Nevertheless, +at least partially under control of \Package{tocbasic}. Whether or not this +will make the wanted result, depends on the individual TOC. At least the +\Package{babel} control extension for all those TOCs will work. Nevertheless, it would be better if the author of the corresponding class or package will use \Package{tocbasic} explicitly. In that case additional advantages of \Package{tocbasic} may be used that will be described at the following sections.% \EndIndex{Cmd}{tocbasicautomode}% -\section{Creating a Table of Contents or List of Something} +\section{Creating a Table or List of Contents} \label{sec:tocbasic.toc} -In the previous section you've seen commands to handle a list of known -extensions and to trigger commands while adding a new extension to this +In the previous section you've seen commands to handle a list of known file +name extensions and to trigger commands while adding a new extension to this list. You've also seen a command to do something for all known extensions or -all known extensions of one owner. In this section you will see commands to -handle the file corresponding with an extension or the list of known -extensions. +all known extensions of one owner. In this section you will learn to know +commands to handle the file corresponding with an extension or the list of +known extensions. \begin{Declaration} \Macro{addtoeachtocfile}\OParameter{owner}\Parameter{content} \end{Declaration} \BeginIndex{Cmd}{addtoeachtocfile}% -This command -writes \PName{content} to the files of every known file extension of -\PName{owner} using \LaTeX{} kernel command \Macro{addtocontents}. If you omit -the optional argument, \PName{content} is written to the files of every known -file extension. Furthermore, the practical file name is built from -\Macro{jobname} and the file extension. While writing the \PName{content}, +This command writes \PName{content} to the TOC-files\Index{TOC} of every known +file name extension of \PName{owner} using \LaTeX{} kernel command +\Macro{addtocontents}. If you omit the optional argument, \PName{content} is +written to the files of every known file name extension. Furthermore, the +practical file name is built from \Macro{jobname} and the file name +extension. While writing the \PName{content}, \Macro{@currext}\IndexCmd{@currext}\important{\Macro{@currext}} is the extension of the currently handled file. \begin{Example} @@ -330,7 +328,7 @@ extension of the currently handled file. \protect\addvspace{\protect\baselineskip}% } \end{lstcode} - And if you want to do this, only for the toc-files of owner + And if you want to do this, only for the TOC-files of owner ``\PValue{foo}'': \begin{lstcode} \addtoeachtocfile[foo]{% @@ -345,17 +343,17 @@ Commands, that shouldn't be expanded while writing, should be prefixed by \begin{Declaration} \Macro{addxcontentsline}% - \Parameter{extension}\Parameter{level}\OParameter{number}%^^A + \Parameter{extension}\Parameter{level}\OParameter{number}% \Parameter{text} \end{Declaration} \BeginIndex{Cmd}{addxcontentsline}% -The command \Macro{addxcontentsline} -adds an entry of given \PName{level} to toc-file with \PName{extension}. If -the \Parameter{number} is empty or omitted the entry won't have a number for -the entry with the given \PName{text}. Entries without number may be left -aligned to the number of the numbered entries of the same \PName{level} or -indented like the text of the numbered entries of the same \PName{level}, -depending on the \PValue{numberline} feature. +The command \Macro{addxcontentsline} adds an entry of given \PName{level} to +TOC-file with file name \PName{extension}. If the \Parameter{number} is empty +or omitted the entry will not have number for the entry with the given +\PName{text}. Entries without number may be left aligned to the number of the +numbered entries of the same \PName{level} or indented like the text of the +numbered entries of the same \PName{level}, depending on the +\PValue{numberline} feature. \begin{Example} Maybe you are not using a \KOMAScript{} class but need a not numbered @@ -373,7 +371,7 @@ depending on the \PValue{numberline} feature. \PValue{numberline}. \end{Example} -Note, that \Macro{addxcontentsline} uses +Note that \Macro{addxcontentsline} uses \Macro{add\PName{level}\PName{extension}entry} if such a macro exists and \Macro{tocbasic@addxcontentsline} otherwise. Therefore you cannot define a macro \Macro{add\PName{level}\PName{extension}entry} using @@ -384,26 +382,24 @@ It is recommended to use \Macro{addxcontentsline} instead of \EndIndex{Cmd}{addxcontentsline} \begin{Declaration} - \Macro{addcontentslinetoeachtocfile}\OParameter{owner}\Parameter{level}%^^A + \Macro{addcontentslinetoeachtocfile}\OParameter{owner}\Parameter{level}% \Parameter{contentsline}\\ - \Macro{addxcontentslinetoeachtocfile}\OParameter{owner}%^^A + \Macro{addxcontentslinetoeachtocfile}\OParameter{owner}% \Parameter{level}\OParameter{number}\Parameter{text} \end{Declaration} \BeginIndex{Cmd}{addcontentslinetoeachtocfile}% \BeginIndex{Cmd}{addxcontentslinetoeachtocfile}% -The first command -is something like \Macro{addcontentsline} from \LaTeX{} kernel. In difference -to that it writes the \PName{contentsline} not only -into one file, but into all files of all known file extensions or of all known -file extensions of a given owner. - -The Command \Macro{addxcontentslinetoeachtocfile}%^^A -\ is similar but uses +The first command is something like \Macro{addcontentsline} from \LaTeX{} +kernel. In difference to that it writes the \PName{contentsline} not only into +one file, but into all files of all known file name extensions or of all known +file name extensions of a given owner. + +The command \Macro{addxcontentslinetoeachtocfile} is similar but uses \Macro{addxcontentsline} instead of \Macro{addcontentsline} and therefore supports \Package{tocbasic} feature \PValue{numberline}. \begin{Example} You are a class author and want to write the chapter entry not only to the - table of contents toc-file but to all toc-files, while \texttt{\#1} is the + table of contents TOC-file but to all TOC-files, while \texttt{\#1} is the title, that should be written to the files. \begin{lstcode} \addxcontentslinetoeachtocfile @@ -413,7 +409,7 @@ therefore supports \Package{tocbasic} feature \PValue{numberline}. into the file. So it isn't protected from expansion using \Macro{protect}. \end{Example} While writing \Macro{@currext}\IndexCmd{@currext}\important{\Macro{@currext}} -is the file extension of the file into which \PName{contentsline} will be +is the file name extension of the file into which \PName{contentsline} will be written. It is recommended to use \Macro{addxcontentslinetoeachtocfile} instead @@ -422,45 +418,41 @@ of \Macro{addcontentslinetoeachtocfile} whenever possible. \EndIndex{Cmd}{addcontentslinetoeachtocfile}% \begin{Declaration} - \Macro{listoftoc}\OParameter{list of title}\Parameter{extension}%^^A -\\ - \Macro{listoftoc*}\Parameter{extension}%^^A -\\ - \Macro{listofeachtoc}\OParameter{owner}%^^A -\\ - \Macro{listof\PName{file-extension}name} + \Macro{listoftoc}\OParameter{list of title}\Parameter{extension}\\ + \Macro{listoftoc*}\Parameter{extension}\\ + \Macro{listofeachtoc}\OParameter{owner}\\ + \Macro{listof\PName{extension}name} \end{Declaration} \BeginIndex{Cmd}{listoftoc*}% \BeginIndex{Cmd}{listoftoc}% \BeginIndex{Cmd}{listofeachtoc}% -\BeginIndex{Cmd}{listof\PName{file-extension}name}% -These commands -may be used to set the ``list of'' corresponding to file -extension. The\important{\Macro{listoftoc*}} star version \Macro{listoftoc*} -needs only one argument, the extension of the file. It does setup the vertical -and horizontal spacing of paragraphs, calls before hooks, reads the file, and -last but not least calls the after hooks. You may interpret it as direct -replacement of the \LaTeX{} kernel macro +\BeginIndex{Cmd}{listof\PName{extension}name}% +These commands may be used to print the TOC corresponding to file name +\PName{extension}. The\important{\Macro{listoftoc*}} star version +\Macro{listoftoc*} needs only one argument, the \PName{extension} of the +file. It does setup the vertical and horizontal spacing of paragraphs, calls +before hooks, reads the file, and last but not least calls the after hooks. +You may interpret it as direct replacement of the \LaTeX{} kernel macro \Macro{@starttoc}\IndexCmd{@starttoc}\important{\Macro{@starttoc}}. -The\important{\Macro{listoftoc}} version without star, sets the whole file +The\important{\Macro{listoftoc}} version without star, prints the whole file with title, optional table of contents entry, and running heads. If the optional argument \OParameter{list of title} was given, it will be used as title term, optional table of contents entry and running head. Please note\textnote{Attention!}: If the optional argument is empty, this term will be empty, too! If you omit the optional argument, but \Macro{listof\PName{extension}name} was defined, that will be used. If that is -also not defined, a standard ersatz name will be used and reported by a +also not defined, a standard replacement name will be used and reported by a warning message. The\important{\Macro{listofeachtoc}} command \Macro{listofeachtoc} outputs all lists of something of the given \PName{owner} or of all known file extensions. Thereby\textnote{Attention!} -\Macro{listof\PName{file-extension}name} should be defined to get the correct +\Macro{listof\PName{extension}name} should be defined to get the correct titles. It\textnote{Hint!} is recommended to define -\Macro{listof\PName{file-extension}name} for all used file extensions, because +\Macro{listof\PName{extension}name} for all used file name extensions, because the user itself may use \Macro{listofeachtoc}. \begin{Example} Assumed, you have a new ``list of algorithms'' with extension \PValue{loa} @@ -511,29 +503,27 @@ if there are no more write handles left. Loading package \Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile} (see \autoref{cha:scrwfile}) may solve this problem. -\EndIndex{Cmd}{listof\PName{Dateierweiterung}name}% +\EndIndex{Cmd}{listof\PName{extension}name}% \EndIndex{Cmd}{listofeachtoc}% \EndIndex{Cmd}{listoftoc*}% \EndIndex{Cmd}{listoftoc}% \begin{Declaration} - \Macro{BeforeStartingTOC}\OParameter{extension}\Parameter{instructions} -\\ + \Macro{BeforeStartingTOC}\OParameter{extension}\Parameter{instructions}\\ \Macro{AfterStartingTOC}\OParameter{extension}\Parameter{instructions} \end{Declaration} \BeginIndex{Cmd}{BeforeStartingTOC}% \BeginIndex{Cmd}{AfterStartingTOC}% Sometimes it's useful, to process \PName{instructions} immediately before -reading the helper file of a list of something. -These commands -may be used to process \PName{instructions} before or after loading the file -with given \PName{extension} using \Macro{listoftoc*}, \Macro{listoftoc}, or +reading the auxiliary file of a TOC. These commands may be used to process +\PName{instructions} before or after loading the file with given +\PName{extension} using \Macro{listoftoc*}, \Macro{listoftoc}, or \Macro{listofeachtoc}. If you omit the optional argument (or set an empty one) the general hooks will be set. The general before hook will be called before the individuel one and the general after hook will be called after the individuel one. While calling the hooks \Macro{@currext}\IndexCmd{@currext}\important{\Macro{@currext}} is the -extension of the toc-file and should not be changed. +extension of the TOC-file and should not be changed. An example\textnote{Example} for usage of \Macro{AfterStartingTOC} may be found in \autoref{sec:scrwfile.clonefilefeature} at @@ -542,19 +532,17 @@ found in \autoref{sec:scrwfile.clonefilefeature} at \EndIndex{Cmd}{BeforeStartingTOC}% \begin{Declaration} - \Macro{BeforeTOCHead}\OParameter{file extension}\Parameter{instructions} -\\ - \Macro{AfterTOCHead}\OParameter{file extension}\Parameter{instructions} + \Macro{BeforeTOCHead}\OParameter{extension}\Parameter{instructions}\\ + \Macro{AfterTOCHead}\OParameter{extension}\Parameter{instructions} \end{Declaration} \BeginIndex{Cmd}{BeforeTOCHead}% \BeginIndex{Cmd}{AfterTOCHead}% -This commands -may be used to process \PName{instructions} before or after setting the title -of a list of something corresponding to given \PName{file extension} using -\Macro{listoftoc*} or \Macro{listoftoc}. If you omit the optional argument (or -set an empty one) the general hooks will be set. The general before hook will -be called before the individuel one and the general after hook will be called -after the individuel one. While calling the hooks +This commands may be used to process \PName{instructions} before or after +setting the title of a TOC corresponding to given file name \PName{extension} +using \Macro{listoftoc*} or \Macro{listoftoc}. If you omit the optional +argument (or set an empty one) the general hooks will be set. The general +before hook will be called before the individuel one and the general after +hook will be called after the individuel one. While calling the hooks \Macro{@currext}IndexCmd{@currext}\important{\Macro{@currext}} is the extension of the corresponding file and should not be changed. \EndIndex{Cmd}{AfterTOCHead}% @@ -565,9 +553,9 @@ extension of the corresponding file and should not be changed. \end{Declaration} \BeginIndex{Cmd}{MakeMarkcase}% Whenever \Package{tocbasic} sets a mark for a running head, The text of the -mark will be an argument of \Macro{MakeMarkcase}%^^A -. This command may be used, to change the case of the letters at the running -head if wanted. The default is, to use +mark will be an argument of \Macro{MakeMarkcase}. This command may be used, to +change the case of the letters at the running head if wanted. The default is, +to use \Macro{@firstofone}\IndexCmd{@firstofone}\important{\Macro{@firstofone}} for \KOMAScript{} classes. This means the text of the running head will be set without change of case. @@ -584,51 +572,48 @@ overwrite that definition. \let\MakeMarkcase\MakeLowercase \end{lstcode} \end{Example} -Please\textnote{Hint!} allow me some words about \Macro{MakeUppercase}, First -of all this command isn't fully expandable. This means, that problems may -occur using it in the context of other commands. Beyond that typographers -accord, that whenever setting whole words or phrases in capitals, letter -spacing is absolutely necessary. But correct letter spacing of capitals -shouldn't be done with a fix white space between all letters. Different pairs -of letters need different space between each other. Additional some letters -build holes in the text, that have to be taken into account. Packages like -\Package{ulem} or \Package{soul} doesn't provide this and -\Macro{MakeUppercase} doesn't do anything like this. Also automatic letter -spacing using package \Package{microtype} is only one step to a less-than-ideal -solution, because it cannot recognize and take into account the glyphs of the -letters. Because of this\textnote{Attention!} typesetting whole words and -phrases is expert work and almost ever must be hand made. So average users are -recommended to not do that or to use it only spare and not at exposed places -like running heads.% +Please\textnote{Hint!} allow me some words about +\Macro{MakeUppercase}\IndexCmd{MakeUppercase}, First of all this command isn't +fully expandable. This means, that problems may occur using it in the context +of other commands. Beyond that typographers accord, that whenever setting +whole words or phrases in capitals, letter spacing is absolutely +necessary. But correct letter spacing of capitals should not be done with a +fix white space between all letters. Different pairs of letters need different +space between each other. Additional some letters build holes in the text, +that have to be taken into account. Packages like \Package{ulem} or +\Package{soul} doesn't provide this and \Macro{MakeUppercase} does not do +anything like this. Also automatic letter spacing using package +\Package{microtype} is only one step to a less-than-ideal solution, because it +cannot recognize and take into account the glyphs of the letters. Because of +this\textnote{Attention!} typesetting whole words and phrases is expert work +and almost ever must be hand made. So average users are recommended to not do +that or to use it only spare and not at exposed places like running heads.% \EndIndex{Cmd}{MakeMarkcase}% \begin{Declaration} - \Macro{deftocheading}\Parameter{file extension}\Parameter{definition} + \Macro{deftocheading}\Parameter{extension}\Parameter{definition} \end{Declaration} \BeginIndex{Cmd}{deftocheading}% The package \Package{tocbasic} contains a standard definition for typesetting -headings of tables of contents or lists of something. This standard definition -is configurable by several features, described at \Macro{setuptoc} next. But -if all those features are not enough, an alternative heading command may be -defined using \Macro{deftocheading}%^^A -. Thereby \PName{file extension} is the file extension of the corresponding -helper file. The \PName{definition} of the heading command may use one single -parameter \PValue{\#1}. While calling the newly defined command inside of -\Macro{listoftoc} or \Macro{listofeachtoc} that \PValue{\#1} will be replaced by the -corresponding heading term. +headings of TOCs. This standard definition is configurable by several +features, described at \Macro{setuptoc} next. But if all those features are +not enough, an alternative heading command may be defined using +\Macro{deftocheading}. Thereby \PName{extension} is the file name extension of +the corresponding TOC-file. The \PName{definition} of the heading command may +use one single parameter \PValue{\#1}. While calling the newly defined command +inside of \Macro{listoftoc} or \Macro{listofeachtoc} that \PValue{\#1} will be +replaced by the corresponding heading term.% \EndIndex{Cmd}{deftocheading}% \begin{Declaration} - \Macro{setuptoc}\Parameter{file extension}\Parameter{feature list} -\\ - \Macro{unsettoc}\Parameter{file extension}\Parameter{feature list} + \Macro{setuptoc}\Parameter{extension}\Parameter{feature list}\\ + \Macro{unsettoc}\Parameter{extension}\Parameter{feature list} \end{Declaration} \BeginIndex{Cmd}{setuptoc}% \BeginIndex{Cmd}{unsettoc}% -This commands -set up and unset features bound to an \PName{file extension}. The -\PName{feature list} is a comma seperated list of single -features. \Package{tocbasic} does know following features: +This commands set up and unset features bound to a file name +\PName{extension}. The \PName{feature list} is a comma separated list of +single features. \Package{tocbasic} does know following features: \begin{description} \item[\texttt{leveldown}] uses not the top level heading below \Macro{part}\,---\,\Macro{chapter} if available, \Macro{section} @@ -638,14 +623,13 @@ features. \Package{tocbasic} does know following features: for the evaluation of the feature. The \KOMAScript{} classes set this feature using option \OptionValue{listof}{leveldown}important{\OptionValue{listof}{leveldown}}% - \IndexOption{listof~=\PValue{leveldown}} for all file extensions of the + \IndexOption{listof~=\PValue{leveldown}} for all file name extensions of the owner \PValue{float}. \item[\texttt{nobabel}] prevents usage of the language switch of - \Package{babel}\IndexPackage{babel} at the helper file with the - corresponding \PName{file extension}. This feature should be used only for - helper files, that contain text in one language only. Changes of the - language inside of the document will not longer regarded at the helper - file. Package + \Package{babel}\IndexPackage{babel} at the TOC-file with the corresponding + file name \PName{extension}. This feature should be used only for auxiliary + files, that contain text in one language only. Changes of the language + inside of the document will not longer regarded at the TOC-file. Package \Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile} uses this feature also for clone destinations, because those will get the language change from the clone source already. @@ -655,58 +639,76 @@ features. \Package{tocbasic} does know following features: distance is less vertical space between heading and first entry than between normal headings and normal text. \item[\texttt{noprotrusion}] prevents\ChangedAt{v3.10}{\Package{tocbasic}} - disabling character protrusion at the lists of something. Character - protrusion at the lists will be disabled by default if package + disabling character protrusion at the TOC. Character protrusion at the TOCs + will be disabled by default if package \Package{microtype}\IndexPackage{microtype} or another package, that supports \Macro{microtypesetup}\IndexCmd{microtypesetup}, was loaded. So if - you want protrusion at the lists, you have to set this feature. But - note\textnote{Attention!}, that with character protrusion entries at the - list may be set wrong. This is a known issue of character protrusion. -\item[\texttt{numbered}] uses a numbered heading for the table of contents or - list of something and because of this also generates an entry to the table - of contents. This feature will be evaluated by the internal heading - command. On the other hand, if an user defined heading command has been made - with \Macro{deftocheading}, that user is responsible for the evaluation of - the feature. The \KOMAScript{} classes set this feature using option + you want protrusion at a TOC, you have to set this feature. But + note\textnote{Attention!}, with character protrusion TOC-entries may be + printed wrong. This is a known issue of character protrusion. +\item[\texttt{numbered}] uses a numbered heading for the TOC and because of + this also generates an entry to the table of contents. This feature will be + evaluated by the internal heading command. On the other hand, if an user + defined heading command has been made with \Macro{deftocheading}, that user + is responsible for the evaluation of the feature. The \KOMAScript{} classes + set this feature using option \OptionValue{listof}{numbered}\important{\OptionValue{listof}{numbered}}% - \IndexOption{listof~=\PValue{numbered}} for all file extensions of the owner - \PValue{float}. + \IndexOption{listof~=\PValue{numbered}} for all file name extensions of the + owner \PValue{float}. \item[\texttt{numberline}] \leavevmode\ChangedAt{v3.12}{\Package{tocbasic}}% redefines \Macro{nonumberline} to use \Macro{numberline}. With this the not numbered entries generated by \KOMAScript{} or using \Macro{nonumberline} at the very beginning of the last argument of \Macro{addcontentline} will also - be indented like numbered entries of the same type. + be indented like numbered entries of the same + type. Using\ChangedAt{v3.20}{\Package{tocbasic}} \Macro{numberline} for + entries without number\ChangedAt{v3.20}{\Package{tocbasic}} can have + additional side effects if you use entry style \PValue{tocline}. See style + attribute \Option{breakafternumber} and \Option{entrynumberformat} in + \autoref{tab:tocbasic.tocstyle.attributes} from + \autopageref{tab:tocbasic.tocstyle.attributes} downwards. + + \KOMAScript{} classes set this feature for the file name extensions of the + owner \PValue{float} if you use option \OptionValue{listof}{numberline}% + \important{\OptionValue{listof}{numberline}}% + \IndexOption{listof~=\PValue{numberline}} and for file name extension + \PValue{toc} if you use option + \OptionValue{toc}{numberline}\important{\OptionValue{toc}{numberline}}% + \IndexOption{toc~=\PValue{numberline}}. Analogous they reset this feature if + you use \OptionValue{listof}{nonumberline}% + \important{\OptionValue{listof}{nonumberline}}% + \IndexOption{listof~=\PValue{nonumberline}} or + \OptionValue{toc}{nonumberline}% + \important{\OptionValue{toc}{nonumberline}}% + \IndexOption{toc~=\PValue{nonumberline}}. \item[\texttt{onecolumn}] \leavevmode\ChangedAt{v3.01}{\Package{tocbasic}}% - typesets the corresponding table of contents or list of something with - internal one column mode of + typesets the corresponding TOC with internal one column mode of \Macro{onecolumn}\IndexCmd{onecolumn}. This\textnote{Attention!} will be - done only, if the corresponding table of contents or list of something - doesn't use feature \PValue{leveldown}\important{\PValue{leveldown}}. The + done only, if the corresponding table of contents or list of something does + not use feature \PValue{leveldown}\important{\PValue{leveldown}}. The \KOMAScript{} classes \Class{scrbook} and \Class{scrreprt} activate this - feature with \Macro{AtAddToTocList} (see \autoref{sec:tocbasic.basics}%^^A - , \autopageref{desc:tocbasic.cmd.AtAddToTocList}%^^A - ) for all lists of something with owner \PValue{float} or with themselves as - owner. With this, e.\,g., the table of contents, the list of figures and the - list of tables of both classes will be single columned automatically. The - multiple-column-mode of package \Package{multicol}\IndexPackage{multicol} - will not be recognized or changed by this option. -\item[\texttt{totoc}] writes the title of the corresponding table of contents - or the list of something to the table of contents. This feature will be - evaluated by the internal heading command. On the other hand, if an user - defined heading command has been made with \Macro{deftocheading}, that user - is responsible for the evaluation of the feature. The \KOMAScript{} classes - set this feature using option + feature with \Macro{AtAddToTocList} (see \autoref{sec:tocbasic.basics}, + \autopageref{desc:tocbasic.cmd.AtAddToTocList}) for all TOCs with owner + \PValue{float} or with themselves as owner. With this, e.\,g., the table of + contents, the list of figures and the list of tables of both classes will be + single columned automatically. The multiple-column-mode of package + \Package{multicol}\IndexPackage{multicol} will not be recognised or changed + by this option. +\item[\texttt{totoc}] writes the title of the corresponding TOC to the table + of contents. This feature will be evaluated by the internal heading + command. On the other hand, if an user defined heading command has been made + with \Macro{deftocheading}, that user is responsible for the evaluation of + the feature. The \KOMAScript{} classes set this feature using option \OptionValue{listof}{totoc}\important{\OptionValue{listof}{totoc}}% - \IndexOption{listof~=\PValue{totoc}} for all file extensions of the owner - \PValue{float}. + \IndexOption{listof~=\PValue{totoc}} for all file name extensions of the + owner \PValue{float}. \end{description} Classes and packages may know features, too, e.\,g, the \KOMAScript{} classes know following additional features: \begin{description} -\item[\texttt{chapteratlist}] activates special code to be put into the list - at start of a new chapter. This code may either be vertical space or the - heading of the chapter. - See \Option{listof}\IndexOption{listof}\important{\Option{listof}} in +\item[\texttt{chapteratlist}] activates special code to be put into the TOC at + start of a new chapter. This code may either be vertical space or the + heading of the chapter. See + \Option{listof}\IndexOption{listof}\important{\Option{listof}} in \autoref{sec:maincls.floats}, \autopageref{desc:maincls.option.listof} for more information about such features. \end{description} @@ -720,8 +722,8 @@ know following additional features: \end{lstcode} And if you want to have the chapter structuring of the \KOMAScript{} classes - at your own list of algorithms with \PName{file extension} ``\PValue{load}'' - from the previous examples, you may use + at your own list of algorithms with file name \PName{extension} + ``\PValue{loa}'' from the previous examples, you may use \begin{lstcode} \setuptoc{loa}{chapteratlist} \end{lstcode} @@ -732,17 +734,16 @@ know following additional features: \setuptoc{loa}{onecolumn}% } \end{lstcode} - Usage of \Macro{ifundefinedorrelax} presumes package \Package{scrbase}%^^A - \ (see \autoref{sec:scrbase.if}, - \autopageref{desc:scrbase.cmd.ifundefinedorrelax})%^^A - . + Usage of \Macro{ifundefinedorrelax} presumes package \Package{scrbase} (see + \autoref{sec:scrbase.if}, + \autopageref{desc:scrbase.cmd.ifundefinedorrelax}). It\textnote{Hint!} doesn't matter if you're package would be used with another class. You should never the less set this feature. And if the other - class would also recognize the feature your package would automatically use + class would also recognise the feature your package would automatically use the feature of that class. \end{Example} -As you may see, packages, that use \Package{tocbasic}, already provide several +As you may see, packages that use \Package{tocbasic}, already provide several interesting features, without the need of a lot of implementation effort. Such an effort would be needed only without \Package{tocbasic} and because of this, most packages currently lack of such features.% @@ -750,19 +751,916 @@ most packages currently lack of such features.% \EndIndex{Cmd}{setuptoc}% \begin{Declaration} - \Macro{iftocfeature}\Parameter{file extension}\Parameter{feature}%^^A - \Parameter{true-instructions}%^^A - \Parameter{false-instructions} + \Macro{iftocfeature}\Parameter{extension}\Parameter{feature}% + \Parameter{true-instructions}\Parameter{false-instructions} \end{Declaration} \BeginIndex{Cmd}{iftocfeature}% -This command -may be used, to test, if a \PName{feature} was set for \PName{file - extension}. If so the \PName{true-instructions} will be processed, otherwise -the \PName{false-instruction} will be. This may be useful, e.\,g., if you -define your own heading command using \Macro{deftocheading} but want to -support the features \PValue{totoc}, \PValue{numbered} or \PValue{leveldown}. +This command may be used, to test, if a \PName{feature} was set for file name +\PName{extension}. If so the \PName{true-instructions} will be processed, +otherwise the \PName{false-instruction} will be. This may be useful, e.\,g., +if you define your own heading command using \Macro{deftocheading} but want to +support the features \PValue{totoc}, \PValue{numbered} or \PValue{leveldown}.% \EndIndex{Cmd}{iftocfeature}% + +\section{Configuration of Entries to a Table or List of Contents} +\seclabel{tocstyle}% +\BeginIndex{}{table of contents>entry}% +\Index{list of contents|\see{table of contents}} + +Since\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} version~3.20 package +\Package{tocbasic} can not only configure the tables or lists of contents and +their auxiliary files but also influence their entries. To do so, you can +define new styles or you can use and configure one of the predefined +styles. In the medium term \Package{tocbasic} will replace the experimental +package \Package{tocstyle} that never became an official part of the +\KOMAScript{} bundle. The \KOMAScript{} classes intensively use the TOC-entry +styles of \Package{tocbasic} since version~3.20. + +\begin{Declaration} + \Macro{numberline}\Parameter{entry number}\\ + \Macro{usetocbasicnumberline}\OParameter{code} +\end{Declaration} +\BeginIndex{Cmd}{numberline}% +\BeginIndex{Cmd}{usetocbasicnumberline}% +Though\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} the \LaTeX{} kernel +already defines command \Macro{numberline}, the kernel definition is not +sufficient for \Package{tocbasic}. Therefore \Package{tocbasic} has its own +definition of \Macro{numberline}. The package uses +\Macro{usetocbasicnumberline} to activate this definition whenever a TOC-entry +needs it. Because of this, re-defining \Macro{numberline} often does not work +and even may result in warnings if you use \Package{tocbasic}. + +You can use the definition of \Package{tocbasic} putting +\Macro{usetocbasicnumberline} into your document's preamble. The command first +of all checks, whether or not the current definition of \Macro{numberline} +uses essential, internal commands of \Package{tocbasic}. Only if this is not +the case \Macro{usetocbasicnumberline} redefines \Macro{numberline} and +executes \PName{code}. If you omit the optional argument, a +\Macro{PackageInfo} outputs a message about the successful re-definition. If +you just do not want such a message, use an empty optional argument. + +Please note\textnote{Attention!}, as a side effect +\Macro{usetocbasicnumberline} can globally change the internal switch +\Macro{@tempswa}!% +\EndIndex{Cmd}{usetocbasicnumberline}% +\EndIndex{Cmd}{numberline}% + + +\begin{Declaration} + \Macro{DeclareTOCStyleEntry}\OParameter{option list}\Parameter{style}% + \Parameter{entry level} +\end{Declaration} +\BeginIndex{Cmd}{DeclareTOCStyleEntry}% +This\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} command is used to define +or configure the TOC-entries of a given \PName{entry level}. Argument +\PName{entry level} is a symbolic name, e.\,g., \PValue{section} for the entry +to the table of contents of the section level with the same name or +\PValue{figure} for an entry of a figure to the list of figures. A \PName{style} +is assigned to each \PName{entry level}. The \PName{style} has to be defined +before using it as an argument of \Macro{DeclareTOCStyleEntry}. The +\PName{option list} is used to configure several \PName{style}-dependent +attributes of the \PName{entry level}. + +Currently, \Package{tocbasic} defines the following entry styles: +\begin{description} +\item[\PValue{default}] defaults to a clone of style + \PValue{dottedtocline}. It is recommended to class authors, who use + \Package{tocbasic}, to change this style into the default style of the class + using \Macro{CloneTOCStyle}. For example the \KOMAScript{} classes change + \PValue{default} into a clone of \PValue{tocline}. +\item[\PValue{dottedtocline}] is similar to the style used by the standard + classes \Class{book} and \Class{report} for the \PValue{section} down to + \PValue{subparagraph} entry levels of the table of contents and for the + entries at the list of figures or list of tables. It supports the attributes + \PValue{level}, \PValue{indent}, and \PValue{numwidth}. The entries will be + indented by the value of \PValue{indent} from the left. The width of the + entry number is given by the value of \PValue{numwidth}. For multiline + entries the indent will be increased by the value of \PValue{numwidth} for + the second and following lines. The page number is printed using + \Macro{normalfont}\IndexCmd{normalfont}. Entry text and page number are + connected by a dotted line. \hyperref[fig:tocbasic.dottedtocline]% + {Figure~\ref*{fig:tocbasic.dottedtocline}} illustrates the attributes of + this style. + \begin{figure} + \centering + \resizebox{.8\linewidth}{!}{% + \begin{tikzpicture} + \draw[color=lightgray] (0,2\baselineskip) -- (0,-2.5\baselineskip); + \draw[color=lightgray] (\linewidth,2\baselineskip) -- + (\linewidth,-2.5\baselineskip); + \node (dottedtocline) at (0,0) [anchor=west,inner sep=0,outer sep=0] + {% + \hspace*{7em}% + \parbox[t]{\dimexpr\linewidth-9.55em}{% + \setlength{\parindent}{-3.2em}% + \addtolength{\parfillskip}{-2.55em}% + \makebox[3.2em][l]{1.1.10}% + Text of an entry to the table of contents with style + \PValue{dottedtocline} and more than one line% + \leaders\hbox{$\csname m@th\endcsname + \mkern 4.5mu\hbox{.}\mkern 4.5mu$}\hfill\nobreak + \makebox[1.55em][r]{12}% + }% + }; + \draw[|-|,color=gray,overlay] (0,0) -- + node [anchor=north,font=\small] { + \PValue{indent} + } + (3.8em,0); + \draw[|-|,color=gray,overlay] (3.8em,\baselineskip) -- + node [anchor=south,font=\small] { + \PValue{numwidth} + } + (7em,\baselineskip); + \draw[|-|,color=gray,overlay] (\linewidth,\ht\strutbox) -- + node [anchor=south,font=\small] { + \Macro{@tocrmarg} + } + (\linewidth-2.55em,\ht\strutbox); + \draw[|-|,color=gray,overlay] (\linewidth,-\baselineskip) -- + node [anchor=north,font=\small] { + \Macro{@pnumwidth} + } + (\linewidth-1.55em,-\baselineskip); + \end{tikzpicture}% + } + \caption{Illustrations of some attributes of a TOC-entry with style + \PValue{dottedtocline}} + \label{fig:tocbasic.dottedtocline} + \end{figure} +\item[\PValue{gobble}] is the most ordinary style. Independently from the + setting of + \Counter{tocdepth}\IndexCounter{tocdepth}\important{\Counter{tocdepth}}, + entries with this style will never be printed. The style simply gobbles the + entries. Nevertheless, it supports the standard attribute \PValue{level} but + does ignore it. +\item[\PValue{largetocline}] is similar to the style used by the + standard classes for the level \PValue{part}. It supports attributes + \PValue{level} and \PValue{indent} only. The last one is already a variation + of the standard classes that do not support an indent of the \PValue{part} + entries. + + Before an entry a page break will be made easier. The entries will be + indented by the value of \PValue{indent} from the left. They are printed + using \Macro{large}\Macro{bfseries}. If \Macro{numberline} is used, the + number width is 3\Unit{em}. \Macro{numberline} is not redefined. The + standard classes do not use \Macro{numberline} for \PName{part} entries. The + value of \PName{indent} even does not influence the indent from the second + line of an entry. + + \hyperref[fig:tocbasic.largetocline]% + {Figure~\ref*{fig:tocbasic.largetocline}} illustrates the attributes of + this style. There you can also see that the style copies inconsistencies of + the standard classes, e.\,g. the missing indent of the second and following + lines of an entry or the different values of \Macro{@pnumwidth} that results + from the font size dependency. This can even result in a to small distance + between the entry text and the page number. Please note, the entry number + width shown in the figure is only valid if \Macro{numberline} has been + used. In contrast, the standard classes use a distance of 1\Unit{em} after + the number. + \begin{figure} + \centering + \resizebox{.8\linewidth}{!}{% + \begin{tikzpicture} + \draw[color=lightgray] (0,2\baselineskip) -- (0,-2.5\baselineskip); + \draw[color=lightgray] (\linewidth,2\baselineskip) -- + (\linewidth,-2.5\baselineskip); + \node (largetocline) at (0,0) [anchor=west,inner sep=0,outer sep=0] {% + \parbox[t]{\dimexpr \linewidth-1.55em\relax}{% + \makebox[3em][l]{\large\bfseries I}% + \large\bfseries + Text of an entry to the table of contents with style + \PValue{largetocline} and more than one line% + \hfill + \makebox[0pt][l]{\normalsize\normalfont + \makebox[1.55em][r]{\large\bfseries 1}}% + }% + }; + \draw[|-|,color=gray] (0,\baselineskip) -- + node [anchor=south] { 3\,em } + (3em,\baselineskip); + \draw[|-|,color=gray,overlay] (\linewidth,\ht\strutbox) -- + node [anchor=south] { \Macro{@pnumwidth} } + (\linewidth-1.55em,\ht\strutbox); + \large\bfseries + \draw[|-|,color=gray,overlay] (\linewidth,-\baselineskip) -- + node [anchor=north,font=\normalfont\normalsize] { + \Macro{large}\Macro{@pnumwidth} + } + (\linewidth-1.55em,-\baselineskip); + \end{tikzpicture}% + } + \caption{Illustrations of some attributes of a TOC-entry with style + \PValue{largetocline}} + \label{fig:tocbasic.largetocline} + \end{figure} +\item[\PValue{tocline}] is a very flexible style. The \KOMAScript{} classes + use this style by default for all kinds of entries. Classes \Class{scrbook} + and \Class{scrreprt} respectively \Class{scrartcl} also define + clones \PValue{part}, \PValue{chapter} and \PValue{section} respectively + \PValue{section} and \PValue{subsection}, but add extra + \PName{initial code} to the clones to change their defaults. + + The style supports attributes \PValue{level}, \PValue{beforeskip}, + \PValue{dynnumwidth}, \PValue{entryformat}, \PValue{entrynumberformat}, + \PValue{breakafternumber}, \PValue{indent}, \PValue{linefill}, + \PValue{numsep}, \PValue{numwidth}, \PValue{onstarthigherlevel}, + \PValue{onstartlowerlevel}, \PValue{onstartsamelevel}, + \PValue{pagenumberbox}, \PValue{pagenumberformat}, and + \PValue{raggedpagenumber}. The defaults of all these attributes depend on + the name of the \PName{entry level}. They correspond to the results of the + standard classes. So after loading \Package{tocbasic}, you can change the + style of the standard classes entries to the table of contents into + \PValue{tocline} using \Macro{DeclareTOCEntryStyle} without obvious visual + changes unless you change exactly these attributes that should induce such + changes. Same is valid for list of figures or list of tables of the standard + classes. + + Because of the flexibility of this style it even could be used instead of + the styles \PValue{dottedtocline}, \PValue{undottedtocline} or + \PValue{largetocline}. However it needs more effort for configuration. + + {Figure~\ref*{fig:tocbasic.tocline}} illustrates some of the length + attributes of this style. All attributes are described in + \autoref{tab:tocbasic.tocstyle.attributes} from + \autopageref{tab:tocbasic.tocstyle.attributes}. + \begin{figure} + \centering + \resizebox{.8\linewidth}{!}{% + \begin{tikzpicture} + \coordinate (subsection) at (0,0); + \coordinate (section) at ($(subsection)+(0,2\baselineskip)$); + \coordinate (chapter) at ($(section)+(0,2\baselineskip)$); + \coordinate (part) at ($(chapter)+(0,2.4\baselineskip+1em)$); + + \draw[color=lightgray] + ($(part)+(0,2\baselineskip)$) -- + (0,-2.5\baselineskip); + \draw[color=lightgray] + ($(part)+(\linewidth,2\baselineskip)$) -- + (\linewidth,-2.5\baselineskip); + + \coordinate (subsection) at (0,0); + + \node at (part) [anchor=west,inner sep=0,outer sep=0] + {% + \hspace*{3em}% + \parbox[t]{\dimexpr\linewidth-5.55em}{% + \setlength{\parindent}{-3em}% + \addtolength{\parfillskip}{-2.55em}% + \makebox[3em][l]{\large\bfseries I.}% + \textbf{\large Text of a part entry with style + \PValue{tocline} and with at least two lines of text}% + \hfill + \makebox[1.55em][r]{\bfseries 12}\large + }% + }; + \draw[|-|,color=gray,overlay] + (part) -- + ($(part)+(3em,0)$) + node [anchor=north east,font=\small] { + \PValue{numwidth} + }; + \draw[|-|,color=gray,overlay] + ($(part)+(\linewidth,\ht\strutbox)$) + node [anchor=north,font=\small] { + \Macro{@tocrmarg} + } -- + ($(part)+(\linewidth-2.55em,\ht\strutbox)$); + \draw[|-|,color=gray,overlay] + ($(part)+(\linewidth,-\baselineskip)$) -- + node [anchor=north,font=\small] { + \Macro{@pnumwidth} + } + ($(part)+(\linewidth-1.55em,-\baselineskip)$); + \node at (chapter) [anchor=west,inner sep=0,outer sep=0] + {% + \hspace*{1.5em}% + \parbox[t]{\dimexpr\linewidth-4.05em}{% + \setlength{\parindent}{-1.5em}% + \addtolength{\parfillskip}{-2.55em}% + \makebox[1.5em][l]{\bfseries 1.}% + \textbf{Text of a chapter entry with style + \PValue{tocline} and for demonstration purpose with more than one + line of text}% + \hfill + \makebox[1.55em][r]{\bfseries 12}% + }% + }; + \draw[|-|,color=gray,overlay] + ($(chapter)+(3em,\baselineskip)$) -- + node [anchor=west,font=\small] { + \PValue{beforeskip} + } + ($(part)+(3em,-\baselineskip)$); + \draw[|-|,color=gray,overlay] + (chapter) -- + ($(chapter)+(1.5em,0)$) + node [anchor=north east,font=\small] { + \PValue{numwidth} + }; + \draw[|-|,color=gray,overlay] + ($(chapter)+(\linewidth,\ht\strutbox)$) + node [anchor=north,font=\small] { + \Macro{@tocrmarg} + } -- + ($(chapter)+(\linewidth-2.55em,\ht\strutbox)$); + \draw[|-|,color=gray,overlay] + ($(chapter)+(\linewidth,-\baselineskip)$) + node [anchor=north,font=\small] { + \Macro{@pnumwidth} + } -- + ($(chapter)+(\linewidth-1.55em,-\baselineskip)$); + \node at (section) [anchor=west,inner sep=0,outer sep=0] + { + \hspace*{3.8em}% + \parbox[t]{\dimexpr\linewidth-6.35em}{% + \setlength{\parindent}{-2.3em}% + \addtolength{\parfillskip}{-2.55em}% + \makebox[2.3em][l]{1.1.}% + Text of a section entry with style + \PValue{tocline} and for demonstration purpose with more than one + line of text% + \leaders\hbox{$\csname m@th\endcsname + \mkern 4.5mu\hbox{.}\mkern 4.5mu$}\hfill\nobreak + \makebox[1.55em][r]{3}% + }% + }; + \node at (subsection) [anchor=west,inner sep=0,outer sep=0] + {% + \hspace*{7em}% + \parbox[t]{\dimexpr\linewidth-9.55em}{% + \setlength{\parindent}{-3.2em}% + \addtolength{\parfillskip}{-2.55em}% + \makebox[3.2em][l]{1.1.10.}% + Text of a subsection entry with style + \PValue{tocline} and for demonstration purpose with more than one + line of text% + \leaders\hbox{$\csname m@th\endcsname + \mkern 4.5mu\hbox{.}\mkern 4.5mu$}\hfill\nobreak + \makebox[1.55em][r]{12}% + }% + }; + \draw[|-|,color=gray,overlay] + ($(subsection)+(0,\ht\strutbox)$) -- + node [anchor=north,font=\small] { + \PValue{indent} + } + ($(subsection)+(3.8em,\ht\strutbox)$); + \draw[|-|,color=gray,overlay] + ($(subsection)+(3.8em,0)$) -- + ($(subsection)+(7em,0)$) + node [anchor=north east,font=\small] { + \PValue{numwidth} + }; + \draw[|-|,color=gray,overlay] + ($(subsection)+(\linewidth,\ht\strutbox)$) + node [anchor=north,font=\small] { + \Macro{@tocrmarg} + } -- + ($(subsection)+(\linewidth-2.55em,\ht\strutbox)$); + \draw[|-|,color=gray,overlay] + ($(subsection)+(\linewidth,-\baselineskip)$) -- + node [anchor=north,font=\small] { + \Macro{@pnumwidth} + } + ($(subsection)+(\linewidth-1.55em,-\baselineskip)$); + \end{tikzpicture}% + } + \caption{Illustrations of some attributes of a TOC-entry with style + \PValue{tocline}} + \label{fig:tocbasic.tocline} + \end{figure} +\item[\PValue{undottedtocline}] is similar to the style used by the standard + classes \Class{book} and \Class{report} for the \PValue{chapter} entry level + or by \Class{article} for the \PValue{section} entry level of the table of + contents. It supports the attributes \PValue{level}, \PValue{indent}, and + \PValue{numwidth}. The last one is already a variation of the standard + classes that do not support an indent of these entry levels. + + Before an entry, a page break will be made easier. The entries will be + indented by the value of \PValue{indent} from the left. They are printed + using \Macro{bfseries}. \Macro{numberline} is used unchanged. The width of + the entry number is given by the value of \PValue{numwidth}. For multiline + entries the indent will be increased by the value of \PValue{numwidth} for + the second and following lines. \hyperref[fig:tocbasic.undottedtocline]% + {Figure~\ref*{fig:tocbasic.undottedtocline}} illustrates the attributes of + this style. + \begin{figure} + \centering + \resizebox{.8\linewidth}{!}{% + \begin{tikzpicture} + \draw[color=lightgray] (0,2\baselineskip) -- (0,-2.5\baselineskip); + \draw[color=lightgray] (\linewidth,2\baselineskip) -- + (\linewidth,-2.5\baselineskip); + \node (undottedtocline) at (0,0) [anchor=west,inner sep=0,outer sep=0] + {% + \makebox[1.5em][l]{\bfseries 1}% + \parbox[t]{\dimexpr \linewidth-4.05em\relax}{% + \bfseries + Text of an entry to the table of contents with style + \PValue{undottedtocline} and more than one line% + }% + \raisebox{-\baselineskip}{\makebox[2.55em][r]{\bfseries 3}}% + }; + \draw[|-|,color=gray,overlay] (0,\baselineskip) -- + node [anchor=south,font=\small] { + \PValue{numwidth} + } + (1.5em,\baselineskip); + \draw[|-|,color=gray,overlay] (\linewidth,\ht\strutbox) -- + node [anchor=south,font=\small] { + \Macro{@tocrmarg} + } + (\linewidth-2.55em,\ht\strutbox); + \draw[|-|,color=gray,overlay] (\linewidth,-\baselineskip) -- + node [anchor=north,font=\small] { + \Macro{@pnumwidth} + } + (\linewidth-1.55em,-\baselineskip); + \end{tikzpicture}% + } + \caption{Illustration of some attributes of style \PValue{undottedtocline} + by the example of a chapter title}% + \label{fig:tocbasic.undottedtocline} + \end{figure} +\end{description} +\hyperref[tab:tocbasic.tocstyle.attributes]% +{Table~\ref*{tab:tocbasic.tocstyle.attributes}} describes all attributes of +all styles defined by \Package{tocbasic}. If you want to use these attributes +as options to \Macro{DeclareNewTOC} (see +\autopageref{desc:tocbasic.cmd.DeclareNewTOC}) or +\Macro{DeclareSectionCommand} (see +\autopageref{desc:maincls-experts.cmd.DeclareSectionCommand}) and similar +commands you have to prefix the names of the attributes by \PValue{toc}, e\,g., +attribute \PValue{level} becomes option \Option{toclevel}. + +Last but not least using \Macro{DeclareTOCStyleEntry} will define internal +command \Macro{l@\PName{entry level}}. + +\begin{desclist} + \desccaption{% + Attributes of the predefined TOC-entry styles of \Package{tocbasic}% + \label{tab:tocbasic.tocstyle.attributes}% + }{% + Attributes of the TOC-entry styles (\emph{continuation})% + }% + \entry{\KOption{beforeskip}\PName{length}}{% + vertical distance, inserted before an entry of this level using style + \PValue{tocline} (see \autoref{fig:tocbasic.tocline}). The distance is + made using either \Macro{vskip} or \Macro{addvspace} depending on the + \PName{entry level} to adapt the differences of the standard classes and + former versions of \KOMAScript. + + At \PName{entry level} \PValue{part} the attribute will be initialised + with \texttt{2.25em plus 1pt}, at \PValue{chapter} with \texttt{1em plus + 1pt}. If \PName{entry level} currently is unknown, rather + \PValue{section} is initialised with \texttt{1em plus 1pt}. The initial + value for all other levels is \texttt{0pt plus .2pt}.% + }% + \entry{\KOption{breakafternumber}\PName{switch}}{% + \PName{switch} is one of the values for simple switches from + \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}. If the + switch is active with style \PValue{tocline}, there will be a line break + after the entry number of \Macro{numberline}\IndexCmd{numberline}. The + line after the entry number again starts left aligned with the number. + + This switch is not active by default at style \PValue{tocline}. + + If\textnote{Attention!} the feature \Option{numberline} of a list of + something has been activated (see \Macro{setuptoc}, + \autoref{sec:tocbasic.toc}, \autopageref{desc:tocbasic.cmd.setuptoc}), + i.\,e., if a \KOMAScript{} class with option + \OptionValue{toc}{numberline}\IndexOption{toc~=\PValue{numberline}} is + used, then the not numbered entries will nevertheless have a (by default + empty) number line using the format code of \Option{entrynumberformat}.% + }% + \entry{\KOption{dynnumwidth}\PName{switch}}{% + \PName{switch} is one of the values for simple switches from + \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}. If the + switch is active with style \PValue{tocline}, attribute \PValue{numwidth} + is ignored. Instead of that the maximum number width detected at the + previous \LaTeX{} run increased by the value of \PValue{numsep} is used.% + }% + \entry{\KOption{entryformat}\PName{command}}{% + This attributes makes the format of the entry. The value should be a + \PName{command} with exactly one argument. The \PName{command} should not + expect the argument to be fully expandable. Commands like + \Macro{MakeUppercase}, that need a fully expandable argument, must no be + used here. Font changes are allowed and are relative to + \Macro{normalfont}\Macro{normalsize}. Please note that the output of + \Option{linefill} and the page number are independent from + \Option{entryformat}. See also attribute \Option{pagenumberformat}. + + The initial value of the attribute for \PName{entry level} \PValue{part} + is printing the argument in \Macro{large}\Macro{bfseries} and for + \PValue{chapter} printing the argument in \Macro{bfseries}. If currently + no level \PValue{chapter} exists, \PValue{section} used + \Macro{bfseries}. All other levels print the argument unchanged.% + }% + \entry{\KOption{entrynumberformat}\PName{command}}{% + This attribute makes the format of the entry number within + \Macro{numberline}. The value should be a \PName{command} with exactly one + argument. Font changes are relative to the one of attribute + \Option{entryformat}. + + The initial \PName{command} prints the argument unchanged. This means the + entry number will be printed as it is. + + If\textnote{Attention!} the feature \Option{numberline} of a list of + something has been activated (see \Macro{setuptoc}, + \autoref{sec:tocbasic.toc}, \autopageref{desc:tocbasic.cmd.setuptoc}), + i.\,e., if a \KOMAScript{} class with option + \OptionValue{toc}{numberline}\IndexOption{toc~=\PValue{numberline}} is + used, then the not numbered entries will nevertheless execute the + \PName{command}.% + }% + \entry{\KOption{indent}\PName{length}}{% + Horizontal distance of the entry relative to the left margin (siehe + \autoref{fig:tocbasic.dottedtocline} and \autoref{fig:tocbasic.tocline}). + + At style \PValue{tocline} all entry levels with a name that starts with + ``\texttt{sub}'' are initialised with the sum of the values of + \PValue{indent} and \PValue{numwidth} of the entry level without this + prefix. At styles \PValue{dottedtocline}, \PValue{undottedtocline} and + \PValue{tocline} the initial values of levels \PValue{part} down to + \PValue{subparagraph} and the levels \PValue{figure} and \PValue{table} + are compatible with the standard classes. All other levels do not have an + initial value. Therefore you have to set an explicit value for such + levels when they are defined first time.% + }% + \entry{\KOption{level}\PName{integer}}{% + The numerical value of the \PName{entry level}. Only those entries are + printed that have a numerical value less or equal to counter + \Counter{tocdepth}\important{\Counter{tocdepth}}\IndexCounter{tocdepth}. + + This attribute is mandatory for all styles and will be defined + automatically at the declaration of the style. + + At style \PValue{tocline} all entry levels with a name starting with + ``\texttt{sub}'', the initial value is the level value of the entry level + without this prefix increased by one. At the styles \PValue{dottedtocline}, + \PValue{largetocline}, \PValue{tocline}, and \PValue{undottedtocline} + entry levels \PValue{part} down to \PValue{subparagraph}, \PValue{figure}, + and \PValue{table} are initialised compatible with the standard + classes. For all other levels the initialisation is done with the value of + \Macro{\PName{entry level}numdepth} if this is defined.% + }% + \entry{\KOption{linefill}\PName{code}}{% + At style \PValue{tocline} there can be a filler between the end of the + entry text and the page number. The value of attribute \PName{linefill} is + a \PName{code} that prints this filler. For \PName{entry level} + \PValue{part} and \PValue{chapter} the attribute is initialised with + \Macro{hfill}. If currently no \PName{entry level} \PValue{chapter} has + been defined, \PValue{section} also uses \Macro{hfill}. All other entry + levels are initialised with \Macro{TOCLineLeaderFill} (see + \autopageref{desc:tocbasic.cmd.TOCLineLeaderFill}). + + If \PName{code} does not result in filling the distance, you should also + activate attribute \PValue{raggedpagenumber}, to avoid ``\texttt{underfull + \Macro{hbox}}'' messages.% + }% + \entry{\KOption{numsep}\PName{length}}{% + Style \PValue{tocline} tries to ensure a minimum distance of + \PName{length} between the entry number and the entry text. If + \PValue{dynnumwidth} is active, it will correct the number width to achieve + this. Otherwise it simply throws a warning, if the condition is missed. + + The initial \PName{length} is 0.4\Unit{em}.% + }% + \entry{\KOption{numwidth}\PName{length}}{% + The reserved width for the entry number (see + \autoref{fig:tocbasic.dottedtocline} until + \autoref{fig:tocbasic.undottedtocline}). At the styles + \PValue{dottedtocline}, \PValue{tocline}, and \PValue{undottedtocline} + this \PName{length} will be added to the \PName{length} of attribute + \PValue{indent} for the second and each following entry text line. + + At style \PValue{tocline} the initial \PName{length} of all entries with + a name starting with ``\texttt{sub}'' is the value of the level without + this prefix plus 0.9\Unit{em}. At the styles \PValue{dottedtocline}, + \PValue{undottedtocline} and \PValue{tocline} the initial \PName{length} + of levels \PValue{part} down to \PValue{subparagraph} and levels + \PName{figure} and \PName{table} is compatible to the standard + classes. All other levels do not have an initial value. Therefore you + have to explicitly set \PValue{numwidth} at the first definition of the + entry.% + }% + \entry{\KOption{onstarthigherlevel}\PName{code}}{% + Style \PValue{tocline} can execute \PName{code} at the start of an entry, + if the numerical level is greater than the numerical level of the previous + entry. Remember: The numerical level of, e.\,g., \PValue{section} is + greater than the numerical level of \PValue{part}. Nevertheless + \PValue{part} has the highest position in the entry hierarchy. + + Please note that the detection of the level of the previous entry depends + on a valid unchanged value of \Macro{lastpenalty}. + + The initial \PName{code} is \Macro{LastTOCLevelWasLower} (see + \autopageref{desc:tocbasic.cmd.LastTOCLevelWasLower}).% + }% + \entry{\KOption{onstartlowerlevel}\PName{code}}{% + Style \PValue{tocline} can execute \PName{code} at the start of an entry, + if the numerical level is lower than the numerical level of the previous + entry. Remember: The numerical level of, e.\,g., \PValue{part} is + lower than the numerical level of \PValue{section}. Nevertheless + \PValue{part} has the highest position in the entry hierarchy. + + Please note that the detection of the level of the previous entry depends + on a valid unchanged value of \Macro{lastpenalty}. + + The initial \PName{code} is \Macro{LastTOCLevelWasHigher} (see + \autopageref{desc:tocbasic.cmd.LastTOCLevelWasHigher}).% + }% + \entry{\KOption{onstartsamelevel}\PName{code}}{% + Style \PValue{tocline} can execute \PName{code} at the start of an entry, + if the level is same like the level of the previous entry. + + Please note that the detection of the level of the previous entry depends + on a valid unchanged value of \Macro{lastpenalty}. + + The initial \PName{code} is \Macro{LastTOCLevelWasSame} (see + \autopageref{desc:tocbasic.cmd.LastTOCLevelWasSame}).% + }% + \entry{\KOption{pagenumberbox}\PName{command}}{% + By default the page number of an entry is printed right aligned in a box + of width \Macro{@pnumwidth}. At style \PValue{tocline} the \PName{command} + to print the number can be changed using this attribute. The + \PName{command} should have exactly one argument, the page number.% + }% + \entry{\KOption{pagenumberformat}\PName{command}}{% + This attribute is the format of the page number of an entry. The + \PName{command} should have exactly one argument, the page number. Font + changes are relative to the font of \Option{entryformat} followed by + \Macro{normalfont}\Macro{normalsize}. + + The initial \PName{command} of entry level \PValue{part} prints the + argument in \Macro{large}\Macro{bfseries}. The initial \PName{command} of + all other levels prints the argument in + \Macro{normalfont}\Macro{normalcolor}.% + }% + \entry{\KOption{raggedpagenumber}\PName{switch}}{% + \PName{switch} is one of the values for simple switches from + \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}. If the + switch is active, style \PValue{tocline} does not force the page number to + be right aligned. + + Depending on the value of \PValue{linefill}, the setting of this attribute + could be needed for the wanted printing of the number, or only to avoid + unwanted warning messages. So both attributes should correspond. + + By default the switch is not activated and therefore corresponds with an + initial value \Macro{hfill} or \Macro{TOCLineLeaderFill} of attribute + \PValue{linefill}.% + }% +\end{desclist}% +% +\EndIndex{Cmd}{DeclareTOCStyleEntry}% + +\begin{Declaration} + \Macro{DeclareTOCEntryStyle}\Parameter{style}% + \OParameter{initial code}% + \Parameter{command code}\\ + \Macro{DefineTOCEntryOption}\Parameter{option}\OParameter{default value}% + \Parameter{code}\\ + \Macro{DefineTOCEntryBooleanOption}\Parameter{option}% + \OParameter{default value}% + \Parameter{prefix}% + \Parameter{postfix}% + \Parameter{description}\\% + %\OParameter{initial code}\\ + \Macro{DefineTOCEntryCommandOption}\Parameter{option}% + \OParameter{default value}% + \Parameter{prefix}% + \Parameter{postfix}% + \Parameter{description}\\% + %\OParameter{initial code}\\ + \Macro{DefineTOCEntryIfOption}\Parameter{option}% + \OParameter{default value}% + \Parameter{prefix}% + \Parameter{postfix}% + \Parameter{description}\\% + %\OParameter{initial code}\\ + \Macro{DefineTOCEntryLengthOption}\Parameter{option}% + \OParameter{default value}% + \Parameter{prefix}% + \Parameter{postfix}% + \Parameter{description}\\% + %\OParameter{initial code}\\ + \Macro{DefineTOCEntryNumberOption}\Parameter{option}% + \OParameter{default value}% + \Parameter{prefix}% + \Parameter{postfix}% + \Parameter{description}% + %\OParameter{initial code}% +\end{Declaration} +\BeginIndex{Cmd}{DeclareTOCEntryStyle}% +\BeginIndex{Cmd}{DefineTOCEntryOption}% +\BeginIndex{Cmd}{DefineTOCEntryBooleanOption}% +\BeginIndex{Cmd}{DefineTOCEntryCommandOption}% +\BeginIndex{Cmd}{DefineTOCEntryIfOption}% +\BeginIndex{Cmd}{DefineTOCEntryLengthOption}% +\BeginIndex{Cmd}{DefineTOCEntryNumberOption}% +\Macro{DeclareTOCEntryStyle}\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} is +one of the most complex commands in \KOMAScript. It is addressed to \LaTeX{} +developers not the \LaTeX{} users. It provides the definition of a new +TOC-entry \PName{style}. Usually TOC-entries are made using +\Macro{addcontentsline}\IndexCmd{addcontentsline}, or, if you use +\Package{tocbasic}, with recommended +\Macro{addxcontentsline}\IndexCmd{addxcontentsline} (see +\autoref{sec:tocbasic.basics}, +\autopageref{desc:tocbasic.cmd.addxcontentsline}). In both cases \LaTeX{} +writes a corresponding \Macro{contentsline}\IndexCmd{contentsline} into the +given auxiliary file. Reading this auxiliary file each \Macro{contentsline} +results in execution of a command \Macro{l@\PName{entry level}}. + +Whenever you assign a \PName{style} to a TOC-entry level using +\Macro{DeclareTOCStyleEntry}, first of all the \PName{initial code} is +executed and then \Macro{l@\PName{entry level}} is defined to be +\PName{command code}. So \PName{command code} is the code that will be +expanded and executed by \Macro{l@\PName{entry level}}. Inside +\PName{command code} \texttt{\#1} is the name of the TOC-entry level and +\texttt{\#\#1} and \texttt{\#\#2} are the arguments of +\Macro{l@\PName{entry level}}. + +The \PName{initial code} should initialise all attributes of the +\PName{style}. Developers are recommended to use \PName{initial code} to +initialise all internal macros of the \PName{style} without the need of +using an \PName{option list}. The second task of the \PName{initial code} is +the definition of options to setup the attributes of the \PName{style}. Option +\Option{level} is always defined automatically. The value of \Option{level} +can be got in \PName{command code} using +\Macro{@nameuse}\PParameter{\#1tocdepth}% +\important{\Macro{\PName{entry level}tocdepth}}, e.\,g., to compare it with +the counter \Counter{tocdepth}\IndexCounter{tocdepth}. + +Commands \Macro{DefineTOCEntryBooleanOption}, +\Macro{DefineTOCEntryCommandOption}, \Macro{DefineTOCEntryIfOption}, +\Macro{DefineTOCEntryLengthOption}, and \Macro{DefineTOCEntryNumberOption} +should be used to define options for the attributes of the +\PName{style} inside \PName{initial code} only. If you use an \PName{option} +defined by one of these commands, a macro \Macro{\PName{prefix}\PName{entry + level}\PName{postfix}} will be defined to be the assigned value or the +\PName{default value} of the option. Somehow special is +\Macro{DefineTOCEntryIfOption}. It defines \Macro{\PName{prefix}\PName{entry + level}\PName{postfix}} as a command with two arguments. If the value to +the option is an activation value of \autoref{tab:truefalseswitch}, +\autopageref{tab:truefalseswitch} the command expands to the first +argument. If the value to the option is a deactivation value, the command +expands to the second argument. + +The \PName{description} should be a real short text that describes the sense +of the option with some catchwords. Package \Package{tocbasic} uses this text +in error messages, warnings or information output on the terminal and into the +\File{log}-file. + +The most simple style of \Package{tocbasic}, \PValue{gobble}, is defined +using: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \DeclareTOCEntryStyle{gobble}{}% +\end{lstcode} +If you would define a entry level \PValue{dummy} using: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \DeclareTOCStyleEntry[level=1]{gobble}{dummy} +\end{lstcode} +among others this would do something like: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \def\dummytocdepth{1} + \def\l@dummy#1#2{} +\end{lstcode} + +Inside style \PValue{tocline} for example +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \DefineTOCEntryCommandOption{linefill}[\TOCLineLeaderFill]% + {scr@tso@}{@linefill}{filling between text and page number}% +\end{lstcode} +is used to define option \Option{linefill} with \PName{default value} +\Macro{TOCLineLeaderFill}. A call like: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \RedeclareTOCStyleEntry[linefill]{tocline}{part} +\end{lstcode} +would therefore result in a definition like: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \def\scr@tso@part@linefill{\TOCLineLeaderFill} +\end{lstcode} + +Whoever likes to define his own styles is recommended to first study the +definition of style \PValue{dottedtocline}. If this definition is understood, +the much more complex definition of style \PValue{tocline} gives a lot of +hints of the correct usage of the described commands. + +In many cases it will be enough to clone an existing style using +\Macro{CloneTOCEntryStyle} and to change the initial code of the new style +using \Macro{TOCEntryStyleInitCode} or \Macro{TOCEntryStyleStartInitCode}. + +\Macro{DefineTOCEntryOption} is merely used to define the other +commands. It is not recommended to define options directly using +\Macro{DefineTOCEntryOption}. Normally this is even not needed. It is +alluded only for completeness.% +\EndIndex{Cmd}{DefineTOCEntryNumberOption}% +\EndIndex{Cmd}{DefineTOCEntryLengthOption}% +\EndIndex{Cmd}{DefineTOCEntryIfOption}% +\EndIndex{Cmd}{DefineTOCEntryCommandOption}% +\EndIndex{Cmd}{DefineTOCEntryBooleanOption}% +\EndIndex{Cmd}{DefineTOCEntryOption}% +\EndIndex{Cmd}{DeclareTOCEntryStyle}% + +\begin{Declaration} + \Macro{CloneTOCEntryStyle}\Parameter{style}\Parameter{new style}% +\end{Declaration} +\BeginIndex{Cmd}{CloneTOCEntryStyle}% +With\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} this command you can clone +an existing \PName{style}. This defines a \PName{new style} with the same +attributes and settings like the existing \PName{style}. The package itself +uses \Macro{CloneTOCEntryStyle} to declare style \PValue{default} as a clone +of \PValue{dottedtocline}. The \KOMAScript{} classes use the command to +declare the styles \PValue{part}, \PValue{section}, and \PValue{chapter} or +\PValue{subsection} as a clone of \PValue{tocline} and the style +\PValue{default} new as a clone of \PValue{section} or \PValue{subsection}.% +\EndIndex{Cmd}{CloneTOCEntryStyle}% + +\begin{Declaration} + \Macro{TOCEntryStyleInitCode}\Parameter{style}% + \Parameter{initial code}\\ + \Macro{TOCEntryStyleStartInitCode}\Parameter{style}% + \Parameter{initial code} +\end{Declaration} +\BeginIndex{Cmd}{TOCEntryStyleInitCode}% +\BeginIndex{Cmd}{TOCEntryStyleStartInitCode}% +Every\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} TOC-entry style has an +initialisation code. This is used whenever a \PName{style} is assigned to an +TOC-entry using \Macro{DeclareTOCEntryStyle}. This \PName{initial code} should +never do anything global, because it is also used for local initialisation +inside other commands like \Macro{DeclareNewTOC}\IndexCmd{DeclareNewTOC}. The +\PName{initial code} not only defines all attributes of a \PName{style}. It +also should set the defaults for those attributes. + +You can use \Macro{TOCEntryStyleStartInitCode} and +\Macro{TOCEntryStyleInitCode} to extend the already existing initialisation +code by \PName{initial code}. \Macro{TOCEntryStyleStartInitCode} adds +\PName{initial code} in front of the existing initialisation +code. \Macro{TOCEntryStyleInitCode} adds the \PName{initial code} at the end +of the existing initialisation code. The \KOMAScript{} classes, e.\,g., are +using \Macro{TOCEntryStyleStartInitCode} to change the filling, font and +vertical distances of style \PValue{part} that is a clone of +\PValue{tocline}. Class \Class{scrbook} and \Class{scrreprt} use +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \CloneTOCEntryStyle{tocline}{section} + \TOCEntryStyleStartInitCode{section}{% + \expandafter\providecommand% + \csname scr@tso@#1@linefill\endcsname + {\TOCLineLeaderFill\relax}% + } +\end{lstcode} +to declare \PValue{section} as a modified clone of \PValue{tocline}.% +\EndIndex{Cmd}{TOCEntryStyleStartInitCode}% +\EndIndex{Cmd}{TOCEntryStyleInitCode}% + +\begin{Declaration} + \Macro{LastTOCLevelWasHigher}\\ + \Macro{LastTOCLevelWasSame}\\ + \Macro{LastTOCLevelWasLower} +\end{Declaration} +\BeginIndex{Cmd}{LastTOCLevelWasHigher}% +\BeginIndex{Cmd}{LastTOCLevelWasSame}% +\BeginIndex{Cmd}{LastTOCLevelWasLower}% +At\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} the very beginning entries +with style \PValue{tocline} \Package{tocbasic} executes one of these three +commands depending on \Macro{lastpenalty}. \Macro{LastTOCLevelWasHigher} and +\Macro{LastTOCLevelWasSame} used in vertical mode add +\Macro{addpenalty}\PParameter{\Macro{@lowpenalty}} and therefore permit a +page break before an entry with same or higher hierarchical +position. \Macro{LastTOCLevelWasLower} is an empty command. Therefore page +break between an entry and its sub-entry is not permitted. + +Users should not redefine these commands. Instead of a redefinition you should +change the behaviour of single entry levels using attributes +\PValue{onstartlowerlevel}, \PValue{onstartsamelevel}, and +\PValue{onstarthigherlevel}.% +\EndIndex{Cmd}{LastTOCLevelWasLower}% +\EndIndex{Cmd}{LastTOCLevelWasSame}% +\EndIndex{Cmd}{LastTOCLevelWasHigher}% + +\begin{Declaration} + \Macro{TOCLineLeaderFill}\OParameter{filling code} +\end{Declaration} +\BeginIndex{Cmd}{TOCLineLeaderFill}% +Command\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} has been made to be used +as value of option \Option{linefill} of assigning style \PName{tocline} to a +TOC-entry. It is a line filler between the end of the entry text and the entry +page number. The \PName{filling code} will be repeated with constant +distance. The default for this optional argument is a dot. + +As implied by the name of the command it uses \Macro{leaders} to put the +\PName{filling code}. The distance is defined analogous to the \LaTeX{} kernel +command \Macro{@dottedtocline} by +\Macro{mkern}\Macro{@dotsep}\Unit{\texttt{mu}}.% +\EndIndex{Cmd}{TOCLineLeaderFill}% +% +\EndIndex{}{table of contents>entry} + + \section{Internal Commands for Class and Package Authors} \label{sec:tocbasic.internals} @@ -771,69 +1669,60 @@ authors may use them. But even if you are a class or package author you should not change them! \begin{Declaration} - \Macro{tocbasic@extend@babel}\Parameter{file extension} + \Macro{tocbasic@extend@babel}\Parameter{extension} \end{Declaration} \BeginIndex{Cmd}{tocbasic@extend@babel}% -The Package \Package{babel}\IndexPackage{babel} -(see \cite{package:babel}) -respectively a \LaTeX{} kernel that has been extended by the language +The Package \Package{babel}\IndexPackage{babel} (see \cite{package:babel}), +or more specifically a \LaTeX{} kernel that has been extended by the language management of \Package{babel} writes instructions to change the language -inside of the files with the file extensions \File{toc}, \File{lof}, and -\File{lot} into those files at every change of the current language -either at the begin of the document or inside the document. Package -\Package{tocbasic} extends this mechanism with -\Macro{tocbasic@extend@babel} -to be used for other file extensions too. Argument \PName{file extension} has -to be expandable! Otherwise the meaning of the argument may change until it -will be used really. - -Normally this command will be used by default for every \PName{file extension} -that will be added to the list of known extensions using -\Macro{addtotoclist}. The may be suppressed using feature +inside of the files with the file name extensions \File{toc}, \File{lof}, and +\File{lot} into those files at every change of the current language either at +the begin of the document or inside the document. Package \Package{tocbasic} +extends this mechanism with \Macro{tocbasic@extend@babel} to be used for other +file name extensions too. Argument \PName{extension} has to be expandable! +Otherwise the meaning of the argument may change until it will be used really. + +Normally this command will be used by default for every file name +\PName{extension} that will be added to the list of known extensions using +\Macro{addtotoclist}. This may be suppressed using feature \PValue{nobabel}\important{\PValue{nobabel}} (see \Macro{setuptoc}, -\autoref{sec:tocbasic.toc}%^^A -, \autopageref{desc:tocbasic.cmd.setuptoc}%^^A -). For the file extensions \File{toc}, \File{lof}, and \File{lot} this will be -done automatically by \Package{tocbasic} to avoid double language switching in -the corresponding files. +\autoref{sec:tocbasic.toc}, \autopageref{desc:tocbasic.cmd.setuptoc}). For the +file name extensions \File{toc}, \File{lof}, and \File{lot} this will be done +automatically by \Package{tocbasic} to avoid double language switching in the +corresponding files. Normally there isn't any reason to call this command yourself. But there may by lists of something, that should not be under control of \Package{tocbasic}, -and to are not in \Package{tocbasic}'s list of known file extensions, but +and so are not in \Package{tocbasic}'s list of known file name extensions, but nevertheless should be handled by the language change mechanism of -\Package{babel}. The command may be used explicitly for those files. But pleas -note, that this should be done only once per file extension!% +\Package{babel}. The command may be used explicitly for those files. But please +note that this should be done only once per file name extension!% \EndIndex{Cmd}{tocbasic@extend@babel}% \begin{Declaration} \Macro{tocbasic@starttoc}\Parameter{extension} \end{Declaration} \BeginIndex{Cmd}{tocbasic@starttoc} -This command -is something like the \LaTeX{} kernel macro -\Macro{@starttoc}\IndexCmd{@starttoc}\important{\Macro{@starttoc}}. It's the -command behind \Macro{listoftoc*} (siehe \autoref{sec:tocbasic.toc}%^^A -, \autopageref{desc:tocbasic.cmd.listoftoc*}%^^A -). Authors of classes or packages who want to participate from the advantages -of \Package{tocbasic} should at least use this command. Nevertheless it's -recommended to use \Macro{listoftoc}. Command \Macro{tocbasic@starttoc} -internally uses \Macro{\@starttoc}, but sets -\Length -{parskip}\IndexLength{parskip}\important{\Length{parskip}\\ +This command is something like the \LaTeX{} kernel macro +\Macro{@starttoc}\IndexCmd{@starttoc}\important{\Macro{@starttoc}}. It is the +command behind \Macro{listoftoc*} (see \autoref{sec:tocbasic.toc}, +\autopageref{desc:tocbasic.cmd.listoftoc*}). Authors of classes or packages +who want to participate from the advantages of \Package{tocbasic} should at +least use this command. Nevertheless it is recommended to use +\Macro{listoftoc}. Command \Macro{tocbasic@starttoc} internally uses +\Macro{\@starttoc}, but sets +\Length{parskip}\IndexLength{parskip}\important{\Length{parskip}\\ \Length{parindent}\\ - \Length{parfillskip}} and -\Length -{parindent}\IndexLength{parindent} to 0 and -\Length -{parfillskip} to 0 until infinite before. Moreover, + \Length{parfillskip}} and \Length {parindent}\IndexLength{parindent} to 0 +and \Length{parfillskip} to 0 until infinite before. Moreover, \Macro{@currext}\important{\Macro{@currext}}\IndexCmd{@currext} will be set to -the file extension of the current helper file, so this will be available while -the execution of the hooks, that will be done before and after reading the -helper files. +the file name extension of the current TOC-file, so this will be available +while the execution of the hooks, that will be done before and after reading +the auxiliary files. -Because\textnote{Attention!} of \LaTeX{} will immediately open a new helper -file for writing after reading that file, the usage of -\Macro{tocbasic@starttoc} may result in an error message like +Because\textnote{Attention!} of \LaTeX{} will immediately open a new TOC-file +for writing after reading that file, the usage of \Macro{tocbasic@starttoc} +may result in an error message like \begin{lstoutput} ! No room for a new \write . \ch@ck ...\else \errmessage {No room for a new #3} @@ -852,13 +1741,12 @@ See \autoref{cha:scrwfile} for more information about that package.% \BeginIndex{Cmd}{tocbasic@@before@hook}% \BeginIndex{Cmd}{tocbasic@@after@hook}% The hook \Macro{tocbasic@@before@hook} will be executed immediately before -reading a helper file for a table of contents or list of something even -before execution of the instructions of a \Macro{BeforeStartingTOC} -command. It is permitted to extend this hook using -\Macro{g@addto@macro}\IndexCmd{g@addto@macro}. +reading a auxiliary file for a TOC even before execution of the instructions +of a \Macro{BeforeStartingTOC} command. It is permitted to extend this hook +using \Macro{g@addto@macro}\IndexCmd{g@addto@macro}. Similarly \Macro{tocbasic@@after@hook} will be executed immediately after -reading such a helper file and before execution of instructions of +reading such an auxiliary file and before execution of instructions of \Macro{AfterStartingTOC}. It is permitted to extend this hook using \Macro{g@addto@macro}\IndexCmd{g@addto@macro}. @@ -866,12 +1754,12 @@ reading such a helper file and before execution of instructions of the place needed by heading numbers. Only classes and packages should use these hooks. Users\textnote{Attention!} should really use \Macro{BeforeStartingTOC} and \Macro{AfterStartingTOC} instead. Authors of -packages should also favor those commands! These hooks shouldn't be used to +packages should also favour those commands! These hooks should not be used to generate any output! If neither\textnote{Attention!} \Macro{listofeachtoc} nor \Macro{listoftoc} -nor \Macro{listoftoc*} are used for the output of a table of contents or list -of something, the hooks should be executed explicitly.% +nor \Macro{listoftoc*} are used for the output of a TOC, the hooks should be +executed explicitly.% \EndIndex{Cmd}{tocbasic@@before@hook}% \EndIndex{Cmd}{tocbasic@@after@hook}% @@ -882,13 +1770,13 @@ of something, the hooks should be executed explicitly.% \BeginIndex{Cmd}{tocbasic@\PName{extension}@before@hook}% \BeginIndex{Cmd}{tocbasic@\PName{extension}@after@hook}% These hooks are processed after \Macro{tocbasic@@before@hook}, respectively -before \Macro{tocbasic@@after@hook} before and after loading the helper file -with the corresponding file \PName{extension}. Authors\textnote{Attention!} -of classes and packages should never manipulate them! But if +before \Macro{tocbasic@@after@hook} before and after loading the TOC-file with +the corresponding file \PName{extension}. Authors\textnote{Attention!} of +classes and packages should never manipulate them! But if neither\textnote{Attention!} \Macro{listofeachtoc} nor \Macro{listoftoc} nor -\Macro{listoftoc*} are used for the output of a table of contents or list of -something, the hooks should be executed explicitly, if they are -defined. Please note, that they even can be undefined.% +\Macro{listoftoc*} are used for the output of a TOC, the hooks should be +executed explicitly, if they are defined. Please note that they even can be +undefined.% \EndIndex{Cmd}{tocbasic@\PName{extension}@after@hook}% \EndIndex{Cmd}{tocbasic@\PName{extension}@before@hook}% @@ -896,46 +1784,87 @@ defined. Please note, that they even can be undefined.% \Macro{tocbasic@listhead}\Parameter{title} \end{Declaration} \BeginIndex{Cmd}{tocbasic@listhead}% -This command -is used by \Macro{listoftoc} to set the heading of the list, either the -default heading or the individually defined heading. If you define your own -list command not using \Macro{listoftoc} you may use +This command is used by \Macro{listoftoc} to set the heading of the TOC, +either the default heading or the individually defined heading. If you define +your own TOC-command not using \Macro{listoftoc} you may use \Macro{tocbasic@listhead}. In this case you should define \Macro{@currext}\important{\Macro{@currext}}\IndexCmd{@currext} to be the file -extension of the corresponding helper file before using -\Macro{tocbasic@listhead}. +extension of the corresponding TOC-file before using +\Macro{tocbasic@listhead}.% \EndIndex{Cmd}{tocbasic@listhead}% \begin{Declaration} \Macro{tocbasic@listhead@\PName{extension}}\Parameter{title} \end{Declaration} \BeginIndex{Cmd}{tocbasic@listhead@\PName{extension}}% -This command -is used in \Macro{tocbasic@listhead} to set the individual headings, optional -toc-entry, and running head, if it was defined. If it was not defined it will -be defined and used in \Macro{tocbasic@listhead} automatically. +This command is used in \Macro{tocbasic@listhead} to set the individual +headings, optional table of contents entry, and running head, if it was +defined. If it was not defined it will be defined and used in +\Macro{tocbasic@listhead} automatically. \EndIndex{Cmd}{tocbasic@listhead@\PName{extension}}% \begin{Declaration} \Macro{tocbasic@addxcontentsline}% - \Parameter{extension}\Parameter{level}\Parameter{number}\Parameter{text} + \Parameter{extension}\Parameter{level}\Parameter{number}\Parameter{text}\\ + \Macro{nonumberline} \end{Declaration} \BeginIndex{Cmd}{tocbasic@addxcontentsline}% -This command +\BeginIndex{Cmd}{nonumberline}% +Command\ChangedAt{v3.12}{\Package{tocbasic}} \Macro{tocbasic@addxcontentsline} uses \Macro{addcontentsline} to either create a numbered or not numbered text -entry to toc-file with given \PName{extension}. Note, that all parameters of -\Macro{tocbasic@addxcontentsline} are mandatory. But you may use an -empty \PName{number} argument, if you don't want a number. -\EndIndex{Cmd}{tocbasic@addxcontentsline} +entry to the TOC-file with the given \PName{extension}. Note, all parameters +of \Macro{tocbasic@addxcontentsline} are mandatory. But you may use an empty +\PName{number} argument, if you do not want a number. In this case the +\PName{text} will be prefixed by \Macro{nonumberline} without any argument. In +the other case, if \PName{number} is not empty, \Macro{numberline} with +argument \PName{number} will used as usual. + +Command \Macro{nonumberline} is redefined inside \Macro{listoftoc} (see +\autoref{sec:tocbasic.toc}, \autopageref{desc:tocbasic.cmd.listoftoc}) +depending on feature \PValue{numberline} (see \autoref{sec:tocbasic.toc}, +\autopageref{desc:tocbasic.cmd.setuptoc}). This guarantees that changes of the +feature results in changes of the corresponding TOC immediately at the next +\LaTeX{} run.% +\EndIndex{Cmd}{nonumberline}% +\EndIndex{Cmd}{tocbasic@addxcontentsline}% + +\begin{Declaration} + \Macro{tocbasic@DependOnPenaltyAndTOCLevel}\Parameter{entry level}\\ + \Macro{tocbasic@SetPenaltyByTOCLevel}\Parameter{entry level} +\end{Declaration} +\BeginIndex{Cmd}{tocbasic@DependOnPenaltyAndTOCLevel}% +\BeginIndex{Cmd}{tocbasic@SetPenaltyByTOCLevel}% +At\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} the end of TOC-entry style +\PValue{tocline} (see \autoref{sec:tocbasic.tocstyle}) \Macro{penalty} is set +to prohibit page breaks. The used penalty value depends on the \PName{entry + level}. This is done by \Macro{tocbasic@SetPenaltyByTOCLevel}. At the very +beginning of an entry \Macro{tocbasic@DependOnPenaltyAndTOCLevel} is used to +execute the value of either style option \Option{onstartlowerlevel}, +\Option{onstartsamelevel}, or \Option{onstarthigherlevel} depending on +\Macro{lastpenalty} and the current \PName{entry level}. The default of the +first and second option would be to permit a page break, if used in vertical +mode. + +Developers of \PValue{tocline}-compatible styles should adapt this. To do so, +they are even allowed to copy the style option declarations of +\Option{onstartlowerlevel}, \Option{onstartsamelevel}, and +\Option{onstarthigherlevel}. These options should even use the same internal +macros \Macro{scr@tso@\PName{entry level}@LastTOCLevelWasHigher}, +\Macro{scr@tso@\PName{entry level}@LastTOCLevelWasSame} and +\Macro{scr@tso@\PName{entry level}@LastTOCLevelWasLower} to store the current +values of the options.% +\EndIndex{Cmd}{tocbasic@SetPenaltyByTOCLevel}% +\EndIndex{Cmd}{tocbasic@DependOnPenaltyAndTOCLevel}% + \section{A Complete Example} -\label{sec:tocbasic.example} +\seclabel{example} This section will show you a complete example of a user defined floating environment with list of that kind of floats and \KOMAScript{} integration using \Package{tocbasic}. This example uses internal commands, that have a ``\texttt{@}'' in their name. This means\textnote{Attention}, that the code -has to be put into a own package or class, or has to be placed between +has to be put into a package or class, or has to be placed between \Macro{makeatletter}\important[i]{\Macro{makeatletter}\\\Macro{makeatother}}% \IndexCmd{makeatletter} and \Macro{makeatother}\IndexCmd{makeatother}. @@ -983,12 +1912,13 @@ value. Afterwards this has been used defining the formatted output of the counter. Last this formatted output has been used for the output of the environment number of the \Macro{caption} command. -Floating\textnote{file extension} environments have lists of themselves and -those need a helper file with name \Macro{jobname} and a file extension. +Floating\textnote{file name extension} environments have lists of themselves +and those need a auxiliary file with name \Macro{jobname} and a file name +extension, the TOC-file\Index{TOC-file}: \begin{lstcode}[belowskip=\dp\strutbox plus 1pt] \newcommand*{\ext@remarkbox}{lor} \end{lstcode} -The file extension of the helper file for the list of +The file name extension of the TOC-file for the list of \Environment{remarkbox}es is ``\File{lor}''. This was the definition of the floating environment. But the list of this new @@ -1009,7 +1939,8 @@ Now\textnote{extension} we register the file name extension for package \addtotoclist[float]{lor} \end{lstcode} Thereby the owner \PValue{float} has been used, to allude all further -\KOMAScript{} options for lists of something also to the new one. +\KOMAScript{} options for list of figures and list of tables also to the new +one. Next\textnote{title} we define a title or heading for the list of \Environment{remarkbox}es: @@ -1025,10 +1956,11 @@ to the list of remarks: \newcommand*{\l@remarkbox}{\l@figure} \end{lstcode} Here simply the entries to the list of remarks get the same layout like the -entries to the list of figure. This would be the easiest solution. A more +entries to the list of figures. This would be the easiest solution. A more explicit would be, e.\,g., \begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newcommand*{\l@remarkbox}{\@dottedtocline{1}{1em}{1.5em}} + \DeclareTOCStyleEntry[level=1,indent=1em,numwidth=1.5em]% + {tocline}{remarkbox} \end{lstcode} Additionally\textnote{chapter entry} you may want structure the list of @@ -1036,13 +1968,13 @@ remarks depending on chapters. \begin{lstcode}[belowskip=\dp\strutbox plus 1pt] \setuptoc{lor}{chapteratlist} \end{lstcode} -The \KOMAScript{} classes provide that feature and may other classes do so +The \KOMAScript{} classes provide that feature and maybe other classes do so too. Unfortunately the standard classes do not. This\textnote{list of remarks} would already be enough. Now, users may already select different kinds of headings either using the corresponding options of the \KOMAScript{} classes, or \Macro{setuptoc}, e.\,g., with or without entry -in the table of contents, with or without number. But a simply +in the table of contents, with or without number. But a simple \begin{lstcode}[belowskip=\dp\strutbox plus 1pt] \newcommand*{\listofremarkboxes}{\listoftoc{lor}} \end{lstcode} @@ -1059,56 +1991,73 @@ remarks at every new \Macro{chapter}. Even changes of the current language are handled inside the list of remarks like they will inside the list of figures or inside the list of tables. -Moreover.\textnote{additional features} an author of a package may add more +Moreover,\textnote{additional features} an author of a package may add more features. For example, options to hide \Macro{setuptoc} from the users may be added. On the other hand, the \Package{tocbasic} manual may be referenced to describe the corresponding features. The advantage of this would be that user would get information about new features provides by \Package{tocbasic}. But if the user should be able to set the features of the remarks even without -knowledge about the file extension \File{lor} a simple +knowledge about the file name extension \File{lor} a simple \begin{lstcode}[belowskip=\dp\strutbox plus 1pt] \newcommand*{\setupremarkboxes}{\setuptoc{lor}} \end{lstcode} would be enough to use a list of features argument to -\Macro{setupremarkboxes} as list of features of file extension \File{lor}. +\Macro{setupremarkboxes} as list of features of file name extension \File{lor}. \section{Everything with One Command Only} \label{sec:tocbasic.highlevel} The example from the previous section shows, that using \Package{tocbasic} to define floating environments and lists with the captions of those floating -environments is easy. The following example will show, that is may be even +environments is easy. The following example will show, that it may be even easier. \begin{Declaration} \Macro{DeclareNewTOC}\OParameter{options}\Parameter{extension} \end{Declaration} \BeginIndex{Cmd}{DeclareNewTOC}% -This command -declares\ChangedAt{v3.06}{\Package{tocbasic}} in one step only a new list of -something, the heading of that list, the term used for the entries to the -list, and to manage the file name \PName{extension}. Additionally optional -floating and non-floating environments may be defined, and inside of both such -environments \Macro{caption}\important{\Macro{caption}}\IndexCmd{caption} may -be used. The additional features \Macro{captionabove}\important[i]{% +This command declares\ChangedAt{v3.06}{\Package{tocbasic}} in one step only a +new TOC, the heading of that TOC, the term used for the TOC-entries, and to +manage the file name \PName{extension}. Additionally optional floating and +non-floating environments may be defined, and inside of both such environments +\Macro{caption}\important{\Macro{caption}}\IndexCmd{caption} may be used. The +additional features \Macro{captionabove}\important[i]{% \Macro{captionabove}\\ \Macro{captionbelow}}, \Macro{captionbelow}, and \Environment{captionbeside} -of the \KOMAScript{} classes -(see \autoref{sec:maincls.floats}) -may also be used inside of those environments. +of the \KOMAScript{} classes (see \autoref{sec:maincls.floats}) may also be +used inside of those environments. -Argument \PName{extension} is the file name extension of the helper file, that +Argument \PName{extension} is the file name extension of the TOC-file, that represents the list of something. See \autoref{sec:tocbasic.basics} for more information about this. This argument is mandatory and must not be empty! Argument \PName{options} is a comma separated list, like you know it from, -e.\,g., \Macro{KOMAoptions}% -\ (see \autoref{sec:typearea.options})%^^A -. Nevertheless\textnote{Attention!}, those options cannot be set using -\Macro{KOMAoptions}\IndexCmd{KOMAoptions}! An overview of all available -options -may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. - +e.\,g., \Macro{KOMAoptions} (see +\autoref{sec:typearea.options}). Nevertheless\textnote{Attention!}, those +options cannot be set using \Macro{KOMAoptions}\IndexCmd{KOMAoptions}! An +overview of all available options may be found in +\autoref{tab:tocbasic.DeclareNewTOC-options}. + +If\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} option \Option{tocentrystyle} +is not used, style \PValue{default} will be used. For information about this +style see \autoref{sec:tocbasic.tocstyle}. If you do not want to define a +command for entries to the list of something, you can use an empty argument, +i.\,e., \OptionValue{tocentrystyle}{} or +\OptionValue{tocentrystyle}{\PParameter{}}. Nevertheless, this would contain +the risk to get a lot of errors while printing that list. + +Depending\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} on the style of the +entries to the list of something, you can setup all valid attributes of the +selected style as part of the \PName{options}. To do so you have to prefix the +names of the attributes given in \autoref{tab:tocbasic.tocstyle.attributes} +from \autopageref{tab:tocbasic.tocstyle.attributes} by prefix +\PValue{toc}. Later changes of the style of the entries can be made using +\Macro{DeclareTOCStyleEntry}% +\IndexCmd{DeclareTOCStyleEntry}\important{\Macro{DeclareTOCStyleEntry}}. See +\autoref{sec:tocbasic.tocstyle}, +\autopageref{desc:tocbasic.cmd.DeclareTOCStyleEntry} for more information +about the styles.% +% \begin{desclist} \renewcommand*{\abovecaptionskipcorrection}{-\normalbaselineskip}% \desccaption[{Options for command \Macro{DeclareNewTOC}}]{% @@ -1116,13 +2065,15 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \Macro{DeclareNewTOC}\ChangedAt{v3.06}{\Package{tocbasic}}% \label{tab:tocbasic.DeclareNewTOC-options}% }{% - Options for command \Macro{DeclareNewTOC} (continuation)% + Options for command \Macro{DeclareNewTOC} (\emph{continuation})% }% - \entry{\KOption{atbegin}\PName{instructions}}{% + \entry{\KOption{atbegin}\PName{instructions}% + \ChangedAt{v3.09}{\Package{tocbasic}}}{% The \PName{instructions} will be executed at the begin of the floating or non-floating environment.% }% - \entry{\KOption{atend}\PName{instructions}}{% + \entry{\KOption{atend}\PName{instructions}% + \ChangedAt{v3.09}{\Package{tocbasic}}}{% The \PName{instructions} will be executed at the end of the floating or non-floating environment.% }% @@ -1154,23 +2105,40 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. before.% }% \entry{\KOption{hang}\PName{length}}{% - The amount of the hanging indent of the entries for that list. If not - given, 1.5\,em will be used like standard classes use for entries to list - of figures or list of tables.% + \ChangedAt{v3.20}{\Package{tocbasic}}% + This option is deprecated since \KOMAScript~3.20. Now, the amount of the + hanging indent of the entries for that list\index{table of contents>entry} + depend on attributes of the TOC-entry style given by option + \Option{tocentrystyle}. The styles of \KOMAScript{} provide an attribute + \PValue{numwidth}. If the used style has such an attribute, + \Macro{DeclareNewTOC} will initialise it with 1.5\Unit{em}. You can change + the real \PName{value} using \KOption{tocnumwidth}\PName{value}. The + \KOMAScript{} classed for example use \OptionValue{tocnumwidth}{2.3em}.% }% \entry{\KOption{indent}\PName{length}}{% - The indent value for the entries of that list. If not given, 1\,em will be - used like standard classes use for entries to list of figures or list of - tables.% + \ChangedAt{v3.20}{\Package{tocbasic}}% + This option is deprecated since \KOMAScript~3.20. Now, the amount of + indenting the entries of that list\index{table of contents>entry} depend + on attributes of the TOC-entry style given by option + \Option{tocentrystyle}. The styles of \KOMAScript{} provide an attribute + \PValue{indent}. If the used style has such an attribute, + \Macro{DeclareNewTOC} will initialise it with 1\Unit{em}. You can change + the real \PName{value} using \KOption{tocindent}\PName{value}. The + \KOMAScript{} classed for example use \OptionValue{tocnumwidth}{1.5em}.% }% \entry{\KOption{level}\PName{number}}{% - The level of the entries of that list. If not given level 1 will be used - like standard classes use for entries to list of figures or list of - tables.% + \ChangedAt{v3.20}{\Package{tocbasic}}% + This option is deprecated since \KOMAScript~3.20. Now, the level of the + entries of that list\index{table of contents>entry} depend on attributes + of the TOC-entry style given by option + \Option{tocentrystyle}. Nevertheless all styles have an attribute + \PValue{level} and \Macro{DeclareNewTOC} initialises it with 1. You can + change the real \PName{value} using \KOption{toclevel}\PName{value}.% }% \entry{\KOption{listname}\PName{string}}{% - The name of the list of foo. If not given the value of \PValue{types} with - upper case first char prefixed by ``List of '' will be used.% + The name of the TOC. If not given the value of \PValue{types} with upper + case first char using \Macro{MakeUppercase}\IndexCmd{MakeUppercase} + prefixed by ``List of '' will be used.% }% \entry{\KOption{name}\PName{string}}{% The name of an element. If no name is given, the value of \PValue{type} @@ -1178,20 +2146,32 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. }% \entry{\Option{nonfloat}}{% If set, a non floating environment will be defined. The name of the - environment is the value of \PName{type} with postfix ``\PValue{-}''.% + environment is the value of \PName{type} with attached ``\PValue{-}''.% }% \entry{\KOption{owner}\PName{string}}{% The owner as described in the sections before. If no owner was given owner \PValue{float} will be used.% }% + \entry{\KOption{tocentrystyle}\PName{TOC-entry style}}{% + \ChangedAt[2016/03]{v3.20}{\Package{tocbasic}}% + \PName{TOC-entry style} is the style that should be used for all entries + into the TOC corresponding to the \PName{extension}. The name of the entry + level is given by option \Option{type}. Additional to the options of this + table all attributes of the \PName{TOC-entry style} can be used as + options. To do so, you have to prefix the name of such an attribute by + \PValue{toc}. For example, you can change the numerical level of the + entries using option \Option{toclevel}. For more information about the + styles and their attributes see \autoref{sec:tocbasic.tocstyle} from + \autopageref{sec:tocbasic.tocstyle}.% + }% \entry{\KOption{type}\PName{string}}{% - sets the type of the new declared list. The type will be used e.\,g. to + sets the type of the new declared TOC. The type will be used e.\,g. to defined a \Macro{listof}\PName{string}. If no type is set up the extension from the mandatory argument will be used.% }% \entry{\KOption{types}\PName{string}}{% the plural of the type. If no plural was given the value of \PValue{type} - with addendum ``s'' will be used.% + with attached ``s'' will be used.% }% \end{desclist} @@ -1210,9 +2190,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \setuptoc{lor}{chapteratlist} \end{lstcode} Beside environments \Environment{remarkbox} and \Environment{remarkbox*} the - counter -\Counter - {remarkbox}, the commands \Macro{theremarkbox}, + counter \Counter{remarkbox}, the commands \Macro{theremarkbox}, \Macro{remarkboxname}, and \Macro{remarkboxformat} that are used for captions; the commands \Macro{listremarkboxnames} and \Macro{listofremarkboxes} that are used at the list of remarks; and some @@ -1223,7 +2201,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. be also defined. You may use \Macro{caption}\IndexCmd{caption} inside of that non-floating environment as usual for floating environments. \hyperref[tab:tocbasic.comparison]{Figure~\ref*{tab:tocbasic.comparison}} - showes a comparison of the commands, counters and environments of the + shows a comparison of the commands, counters and environments of the example environment \Environment{remarkbox} and of the commands, counters and environments for figures.% \begin{table} @@ -1250,7 +2228,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. & output command to the respective counters\\[1ex] \Macro{remarkboxformat} & \Macro{figureformat} & \Option{type}, \Option{float} - & formating command to the respective counters used by + & formatting command to the respective counters used by \Macro{caption}\\[1ex] \Macro{remarkboxname} & \Macro{figurename} & \Option{type}, \Option{float}, \Option{name} @@ -1263,10 +2241,10 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. & heading text of the respective list \\[1ex] \Macro{fps@remarkbox} & \Macro{fps@figure} & \Option{type}, \Option{float}, \Option{floattype} - & numeric float type for order perputation\\[1ex] + & numeric float type for order perpetuation\\[1ex] \File{lor} & \File{lof} & - & file extension of the helper file of the respective list \\ + & file name extension of the TOC-file of the respective list \\ \bottomrule \end{tabularx} \end{table} @@ -1296,11 +2274,26 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \end{tabular}% \end{center}% \end{Example} + +Users of \Package{hyperref} should always use option +\Option{listname}. Otherwise they may get an error message, because +\Package{hyperref} usually has a problem with the +\Macro{MakeUppercase}\IndexCmd{MakeUppercase} command that is used to change +the case of the first letter of \Option{types} in the name of the list.% \EndIndex{Cmd}{DeclareNewTOC}% \EndIndex{Package}{tocbasic}% \EndIndex{}{table of contents}% \EndIndex{}{list>of contents}% \EndIndex{}{file>extension}% \endinput -%% -%% End of file `tocbasic.tex'. + +%%% Local Variables: +%%% mode: latex +%%% mode: flyspell +%%% coding: us-ascii +%%% ispell-local-dictionary: "en_GB" +%%% TeX-master: "../guide" +%%% End: + + +% LocalWords: Multiline multiline 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 2f16b8025f0..ce7c87cad37 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/guide.bib +++ b/Master/texmf-dist/source/latex/koma-script/doc/guide.bib @@ -41,6 +41,17 @@ % % ====================================================================== +@Article{ DANTE:TK0203:MJK, + language= {ngerman}, + author = {Markus Kohm}, + title = {Moderne Briefe mit {\KOMAScript}}, + journal = {Die {\TeX}nische Komödie}, + volume = {2}, + year = 2003, + pages = {32--51}, + note = {{DANTE} e.\,V.} +} + @Article{ DANTE:TK0297:MJK1, language= {ngerman}, author = {Markus Kohm}, @@ -64,15 +75,44 @@ note = {{DANTE} e.\,V.} } -@Article{ DANTE:TK0203:MJK, +@Book{ DUDEN, language= {ngerman}, - author = {Markus Kohm}, - title = {Moderne Briefe mit {\KOMAScript}}, - journal = {Die {\TeX}nische Komödie}, - volume = {2}, - year = 2003, - pages = {32--51}, - note = {{DANTE} e.\,V.} + author = {DUDEN}, + title = {Die deutsche Rechtschreibung}, + publisher = {DUDENVERLAG}, + year = 1996, + address = {Mannheim}, + edition = 21 +} + +@Book{ TYPO:ErsteHilfe, + language= {ngerman}, + author = {Hans Peter Willberg and Friedrich Forssman}, + title = {Erste Hilfe in Typografie}, + subtitle = {Ratgeber für Gestaltung mit Schrift}, + publisher = {Verlag Hermann Schmidt}, + year = 2000, + address = {Mainz} +} + +@Book{ JTsch87, + language= {ngerman}, + author = {Jan Tschichold}, + title = {Ausgewählte Aufsätze über Fragen der Gestalt des Buches und der Typographie}, + publisher = {Birkhäuser Verlag}, + year = 1987, + address = {Basel}, + edition = 2 +} + +@Book{ JTschErfreulich, + language = {ngerman}, + author = {Jan Tschichold}, + title = {Erfreuliche Drucksachen durch gute Typographie}, + publisher = {Ravensburger Buchverlag Otto Maier GmbH}, + year = 1960, + note = {Nachdruck bei: MaroVerlag, Augsburg, 2001}, + isbn = {3-87512-413-8} } @Book{ book:komascript, @@ -88,14 +128,13 @@ isbn = {978-3-86541-613-1} } -@Book{ DUDEN, - language= {ngerman}, - author = {DUDEN}, - title = {Die deutsche Rechtschreibung}, - publisher = {DUDENVERLAG}, - year = 1996, - address = {Mannheim}, - edition = 21 +@Book{ latexbook, + language = {ngerman}, + author = {Leslie Lamport}, + title = {Das {\LaTeX}-Handbuch}, + publisher = {Addison-Wesley Publishing Company}, + address = {Bonn, Paris {u.\,a.}}, + year = 1995 } @Book{ knuth:mfbook, @@ -122,36 +161,6 @@ series = {Computers and Typesetting} } -@Book{ JTsch87, - language= {ngerman}, - author = {Jan Tschichold}, - title = {Ausgewählte Aufsätze über Fragen der Gestalt des Buches und der Typographie}, - publisher = {Birkhäuser Verlag}, - year = 1987, - address = {Basel}, - edition = 2 -} - -@Book{ JTschErfreulich, - language = {ngerman}, - author = {Jan Tschichold}, - title = {Erfreuliche Drucksachen durch gute Typographie}, - publisher = {Ravensburger Buchverlag Otto Maier GmbH}, - year = 1960, - note = {Nachdruck bei: MaroVerlag, Augsburg, 2001}, - isbn = {3-87512-413-8} -} - -@Book{ TYPO:ErsteHilfe, - language= {ngerman}, - author = {Hans Peter Willberg and Friedrich Forssman}, - title = {Erste Hilfe in Typografie}, - subtitle = {Ratgeber für Gestaltung mit Schrift}, - publisher = {Verlag Hermann Schmidt}, - year = 2000, - address = {Mainz} -} - @Book{ TYPO:Werkstattbuch, language = {ngerman}, author = {Indra Kupferschmid}, @@ -172,70 +181,14 @@ address = {Berlin} } -@Manual{ manual:eTeX, - language = {english}, - author = {The {\NTS} Team}, - title = {The {\eTeX} manual}, - year = {1998}, - month = feb, - url = {CTAN://systems/e-tex/v2/doc/etex_man.pdf} -} - -@Manual{ latex:source2e, - language = {english}, - author = {Johannes Braams and David Carlisle and Alan Jeffrey and Leslie Lamport and Frank Mittelbach and Chris Rowley and Rainer Schöpf}, - title = {The {\LaTeX2e} Source}, - year = 2005, - month = 12 -} - -@Manual{ makeindex, - language= {english}, - author = {Leslie Lamport}, - title = {{\Package{MakeIndex}}: An Index Processor For {\LaTeX}}, - year = 1987, - month = feb, - url = {CTAN://indexing/makeindex/doc/makeindex.pdf} -} - -@Manual{ xindy, - language= {english}, - author = {Roger Kehr}, - title = {XINDY, A Flexible Indexing System}, - year = 1997}, - month = mar, - edition = {1.1}, - url = {http://www.xindy.org/doc/tutorial.html} -} - -@Manual{ l2kurz, +@InCollection{ zeitung, language = {ngerman}, - author = {Marco Daniel and Patrick Gundlach and Walter Schmidt and Jörg Knappen and Hubert Partl and Irene Hyna}, - title = {{\LaTeXe}-Kurzbeschreibung}, - year = 2012, - month = jul, - version = {3.0}, - url = {CTAN://info/lshort/german/} -} - -@Manual{ lshort, - language= {english}, - author = {Tobias Oetker and Hubert Partl and Irene Hyna and Elisabeth -Schlegl}, - title = {The Not So Short Introduction to {\LaTeXe}}, - year = 2011, - month = apr, - version = {5.01}, - url = {CTAN://info/lshort/english/} -} - -@Book{ latexbook, - language = {ngerman}, - author = {Leslie Lamport}, - title = {Das {\LaTeX}-Handbuch}, - publisher = {Addison-Wesley Publishing Company}, - address = {Bonn, Paris {u.\,a.}}, - year = 1995 + author = {Martin Z. Schröder}, + title = {Die Anmut des Unscheinbaren}, + booktitle = {Berliner Zeitung}, + year = 1998, + month = {10. Oktober}, + url = {http://www.berliner-zeitung.de/archiv} } @Manual{ btxdoc, @@ -256,17 +209,7 @@ Schlegl}, url = {CTAN://biblio/bibtex/base/btxhak.pdf} } -@Misc{ latex:classes, - language= {english}, - author = {Leslie Lamport and Frank Mittelbach and Johannes Braams}, - title = {Standard Document Classes for {\LaTeX} version 2e}, - year = 2007, - month = oct, - edition = {1.4h}, - url = {CTAN://macros/latex/base/classes.dtx} -} - -@Misc{ latex:cfgguide, +@Manual{ latex:cfgguide, language= {english}, author = {{\LaTeX3} Project Team}, title = {Configuration options for {\LaTeXe}}, @@ -275,7 +218,7 @@ Schlegl}, url = {CTAN://macros/latex/doc/cfgguide.pdf} } -@Misc{ latex:clsguide, +@Manual{ latex:clsguide, language= {english}, author = {{\LaTeX3} Project Team}, title = {{\LaTeXe} for class and package writers}, @@ -284,7 +227,7 @@ Schlegl}, url = {CTAN://macros/latex/doc/clsguide.pdf} } -@Misc{ latex:fntguide, +@Manual{ latex:fntguide, language= {english}, author = {{\LaTeX3} Project Team}, title = {{\LaTeXe} font selection}, @@ -293,7 +236,45 @@ Schlegl}, url = {CTAN://macros/latex/doc/fntguide.pdf} } -@Misc{ latex:usrguide, +@Manual{ manual:eTeX, + language = {english}, + author = {The {\NTS} Team}, + title = {The {\eTeX} manual}, + year = {1998}, + month = feb, + url = {CTAN://systems/e-tex/v2/doc/etex_man.pdf} +} + +@Manual{ l2kurz, + language = {ngerman}, + author = {Marco Daniel and Patrick Gundlach and Walter Schmidt and Jörg Knappen and Hubert Partl and Irene Hyna}, + title = {{\LaTeXe}-Kurzbeschreibung}, + year = 2012, + month = jul, + version = {3.0}, + url = {CTAN://info/lshort/german/} +} + +@Manual{ lshort, + language= {english}, + author = {Tobias Oetker and Hubert Partl and Irene Hyna and Elisabeth +Schlegl}, + title = {The Not So Short Introduction to {\LaTeXe}}, + year = 2011, + month = apr, + version = {5.01}, + url = {CTAN://info/lshort/english/} +} + +@Manual{ latex:source2e, + language = {english}, + author = {Johannes Braams and David Carlisle and Alan Jeffrey and Leslie Lamport and Frank Mittelbach and Chris Rowley and Rainer Schöpf}, + title = {The {\LaTeX2e} Source}, + year = 2005, + month = 12 +} + +@Manual{ latex:usrguide, language= {english}, author = {{\LaTeX3} Project Team}, title = {{\LaTeXe} for authors}, @@ -302,6 +283,16 @@ Schlegl}, url = {CTAN://macros/latex/doc/usrguide.pdf} } +@Manual{ xindy, + language= {english}, + author = {Roger Kehr}, + title = {XINDY, A Flexible Indexing System}, + year = 1997}, + month = mar, + edition = {1.1}, + url = {http://www.xindy.org/doc/tutorial.html} +} + @Misc{ package:adrconv, language= {ngerman}, author = {Axel Kielhorn}, @@ -312,6 +303,46 @@ Schlegl}, url = {CTAN://macros/latex/contrib/adrconv/} } +@Misc{ package:amsmath, + language = {english}, + author = {{American Mathematical Society}}, + title = {User's Guide for the {\Package{amsmath}} Package}, + year = 2002, + month = feb, + edition = {2.0}, + url = {CTAN://macros/latex/required/amslatex/math/} +} + +@Misc{ package:babel, + language= {english}, + author = {Johannes Braams and Javier Bezos}, + title = {Babel}, + year = 2013, + month = dec, + edition = {3.9h}, + url = {CTAN://macros/latex/required/babel/} +} + +@Misc{ package:caption, + language = {ngerman}, + author = {Axel Sommerfeldt}, + title = {Anpassen der Abbildungs- und Tabellenbeschriftungen mit Hilfe des {\Package{caption}}-Paketes}, + year = 2013, + month = may, + edition = {3.3}, + url = {CTAN://macros/latex/contrib/caption/} +} + +@Misc{ package:caption.engl, + language = {english}, + author = {Axel Sommerfeldt}, + title = {Customizing captions of floating environments using the {\Package{caption}} package}, + year = 2013, + month = may, + edition = {3.3}, + url = {CTAN://macros/latex/contrib/caption/} +} + @Misc{ package:CJK, language= {english}, author = {Werner Lemberg}, @@ -322,6 +353,16 @@ Schlegl}, url = {CTAN://languages/chinese/CJK/} } +@Misc{ latex:classes, + language= {english}, + author = {Leslie Lamport and Frank Mittelbach and Johannes Braams}, + title = {Standard Document Classes for {\LaTeX} version 2e}, + year = 2007, + month = oct, + edition = {1.4h}, + url = {CTAN://macros/latex/base/classes.dtx} +} + @Misc{ package:engord, language= {english}, author = {Heiko Oberdiek}, @@ -342,6 +383,16 @@ Schlegl}, url = {CTAN://macros/latex/contrib/envlab/} } +@Misc{ package:eso-pic, + language = {english}, + author = {Rolf Niepraschk}, + title = {The {\Package{eso-pic}} package}, + month = jul, + year = 2015, + edition = {2.0g}, + url = {CTAN://macros/latex/contrib/eso-pic/} +} + @Misc{ package:etoolbox, language= {english}, author = {Philipp Lehman}, @@ -362,34 +413,44 @@ Schlegl}, url = {CTAN://macros/latex/contrib/etoolbox/} } -@Misc{ package:microtype, +@Misc{ package:extsizes, language= {english}, - author = {R Schlicht}, - title = {The {\Package{microtype}} package: An interface to the micro-typographic extensions of pdf{\TeX}}, - year = 2013, - month = may, - edition = {2.5a}, - url = {CTAN://macros/latex/contrib/microtype/} + author = {James Kilfiger}, + title = {{\Package{extsizes}}, a non standard {\LaTeX}-package}, + year = 1999, + month = nov, + edition = {1.4a}, + url = {CTAN://macros/latex/contrib/extsizes/} } -@Misc{ package:selinput, +@Misc{ package:fancyhdr, language= {english}, - author = {Heiko Oberdiek}, - title = {The {\Package{selinput}} package}, - year = 2007, - month = sep, - edition = {1.2}, - url = {CTAN://macros/latex/contrib/oberdiek/} + author = {Piet van Oostrum}, + title = {Page layout in {\LaTeX}}, + year = 2004, + month = mar, + edition = {3.1}, + url = {CTAN://macros/latex/contrib/fancyhdr/} } -@Misc{ package:tabularx, +@Misc{ package:float, language= {english}, - author = {David Carlisle}, - title = {The {\Package{tabularx}} package}, - year = 1999, - month = jan, - edition = {2.07}, - url = {CTAN://macros/latex/required/tools/} + author = {Anselm Lingnau}, + title = {An Improved Environment for Floats}, + year = 2001, + month = nov, + edition = {1.3d}, + url = {CTAN://macros/latex/contrib/float/} +} + +@Misc{ package:floatrow, + language = {english}, + author = {Olga Lapko}, + title = {The {\Package{floatrow}} package}, + year = 2008, + month = aug, + edition = {0.3b}, + url = {CTAN://macros/latex/contrib/floatrow/} } @Misc{ package:footmisc, @@ -402,44 +463,15 @@ Schlegl}, url = {CTAN://macros/latex/contrib/footmisc/} } -@Misc{ package:marginnote, - language= {english}, - author = {Markus Kohm}, - title = {Non-Floating Margin Notes with {\Package{marginnote}}}, - year = 2012, - month = mar, - edition = {1.1i}, - url = {CTAN://macros/latex/contrib/marginnote/} -} - -@Misc{ package:tocstyle, - language= {english}, - author = {Markus Kohm}, - title = {The {\KOMAScript} package {\Package{tocstyle}}}, - year = 2013, - month = aug, - edition = {0.2e}, - note = {\KOMAScript} -} - -@Misc{ package:splitindex, - language= {english}, - author = {Markus Kohm}, - title = {Creating More Than One Index Using {\Package{splitidx}} And {\Package{SplitIndex}}}, - year = 2014, - month = apr, - edition = {1.2a}, - url = {CTAN://macros/latex/contrib/splitindex/} -} - -@Misc{ package:setspace, +% I don't want the french changes! +@Misc{ package:french, language= {english}, - author = {Geoffrey Tobin and Robin Fairbairns}, - title = {{\Package{setspace}} {\LaTeX} package}, - year = 2011, - month = dec, - edition = {6.7a}, - url = {CTAN://macros/latex/contrib/setspace/} + author = {Bernard Gaulle}, + title = {Les distributions de fichiers de francisation pour LaTeX}, + year = 2007, + month = may, + edition = {5,9993}, + url = {CTAN://language/french/} } @Misc{ package:geometry, @@ -462,26 +494,6 @@ Schlegl}, url = {CTAN://language/german/} } -@Misc{ package:ngerman, - language = {english}, - author = {Bernd Raichle}, - title = {{\Package{ngerman}} package}, - year = 1998, - month = jul, - edition = {2.5e}, - url = {CTAN://language/german/} -} - -@Misc{ package:xcolor, - language = {english}, - author = {Dr. Uwe Kern}, - title = {Extending {\LaTeX}'s color facilities: the {\Package{xcolor}} package}, - year = 2007, - month = jan, - edition = {2.11}, - url = {CTAN://macros/latex/contrib/xcolor/} -} - @Misc{ package:graphics, language= {english}, author = {David P. Carlisle}, @@ -491,24 +503,14 @@ Schlegl}, url = {CTAN://macros/latex/required/graphics/} } -@Misc{ package:keyval, - language = {english}, - author = {David Carlisle}, - title = {The {\Package{keyval}} package}, - year = 1999, - month = mar, - edition = {1.13}, - url = {CTAN://macros/latex/required/graphics/} -} - -@Misc{ package:multicol, +@Misc{ package:hyperref, language= {english}, - author = {Frank Mittelbach}, - title = {An environment for multicolumn output}, - year = 2011, - month = jun, - edition = {1.7a}, - url = {CTAN://macros/latex/required/tools/} + author = {Sebastian Rahtz and Heiko Oberdiek}, + title = {Hypertext marks in {\LaTeX}: the {\Package{hyperref}} package}, + year = 2012, + month = nov, + edition = {6.83m}, + url = {CTAN://macros/latex/contrib/hyperref/} } @Misc{ package:ifthen, @@ -521,85 +523,73 @@ Schlegl}, url = {CTAN://macros/latex/base/} } -@Misc{ package:amsmath, +@Misc{ package:keyval, language = {english}, - author = {{American Mathematical Society}}, - title = {User's Guide for the {\Package{amsmath}} Package}, - year = 2002, - month = feb, - edition = {2.0}, - url = {CTAN://macros/latex/required/amslatex/math/} -} - -@Misc{ package:caption, - language = {ngerman}, - author = {Axel Sommerfeldt}, - title = {Anpassen der Abbildungs- und Tabellenbeschriftungen mit Hilfe des {\Package{caption}}-Paketes}, - year = 2013, - month = may, - edition = {3.3}, - url = {CTAN://macros/latex/contrib/caption/} + author = {David Carlisle}, + title = {The {\Package{keyval}} package}, + year = 1999, + month = mar, + edition = {1.13}, + url = {CTAN://macros/latex/required/graphics/} } -@Misc{ package:caption.engl, +@Misc{ package:longtable, language = {english}, - author = {Axel Sommerfeldt}, - title = {Customizing captions of floating environments using the {\Package{caption}} package}, - year = 2013, - month = may, - edition = {3.3}, - url = {CTAN://macros/latex/contrib/caption/} + author = {David Carlisle}, + title = {The {\Package{longtable}} package}, + year = 2004, + month = feb, + edition = {4.11}, + url = {CTAN://macros/latex/required/tools/} } -% I don't want the french changes! -@Misc{ package:french, +@Misc{ makeindex, language= {english}, - author = {Bernard Gaulle}, - title = {Les distributions de fichiers de francisation pour LaTeX}, - year = 2007, - month = may, - edition = {5,9993}, - url = {CTAN://language/french/} + author = {Leslie Lamport}, + title = {{\Package{MakeIndex}}: An Index Processor For {\LaTeX}}, + year = 1987, + month = feb, + url = {CTAN://indexing/makeindex/doc/makeindex.pdf} } -@Misc{ package:babel, +@Misc{ package:marginnote, language= {english}, - author = {Johannes Braams and Javier Bezos}, - title = {Babel}, - year = 2013, - month = dec, - edition = {3.9h}, - url = {CTAN://macros/latex/required/babel/} + author = {Markus Kohm}, + title = {Non-Floating Margin Notes with {\Package{marginnote}}}, + year = 2012, + month = mar, + edition = {1.1i}, + url = {CTAN://macros/latex/contrib/marginnote/} } -@Misc{ package:eso-pic, - language = {english}, - author = {Rolf Niepraschk}, - title = {The {\Package{eso-pic}} package}, - month = jul, - year = 2015, - edition = {2.0g}, - url = {CTAN://macros/latex/contrib/eso-pic/} +@Misc{ package:microtype, + language= {english}, + author = {R Schlicht}, + title = {The {\Package{microtype}} package: An interface to the micro-typographic extensions of pdf{\TeX}}, + year = 2013, + month = may, + edition = {2.5a}, + url = {CTAN://macros/latex/contrib/microtype/} } -@Misc{ package:extsizes, +@Misc{ package:mparhack, language= {english}, - author = {James Kilfiger}, - title = {{\Package{extsizes}}, a non standard {\LaTeX}-package}, - year = 1999, - month = nov, - edition = {1.4a}, - url = {CTAN://macros/latex/contrib/extsizes/} + author = {Tom Sgouros and Stefan Ulrich}, + title = {The {\Package{mparhack}} package}, + year = 2005, + month = apr, + edition = {1.4}, + url = {CTAN://macros/latex/contrib/mparhack/} } -@Misc{ package:fancyhdr, +@Misc{ package:multicol, language= {english}, - author = {Piet van Oostrum}, - title = {Page layout in {\LaTeX}}, - year = 2004, - month = mar, - edition = {3.1}, - url = {CTAN://macros/latex/contrib/fancyhdr/} + author = {Frank Mittelbach}, + title = {An environment for multicolumn output}, + year = 2011, + month = jun, + edition = {1.7a}, + url = {CTAN://macros/latex/required/tools/} } @Misc{ package:natbib, @@ -612,6 +602,26 @@ Schlegl}, url = {CTAN://macros/latex/contrib/natbib/} } +@Misc{ package:ngerman, + language = {english}, + author = {Bernd Raichle}, + title = {{\Package{ngerman}} package}, + year = 1998, + month = jul, + edition = {2.5e}, + url = {CTAN://language/german/} +} + +@Misc{ package:picture, + language = {english}, + author = {Heiko Oberdiek}, + title = {The {\Package{picture}} package}, + year = 2009, + month = oct, + edition = {1.3}, + url = {CTAN://macros/latex/contrib/oberdiek/picture.dtx} +} + @Misc{ package:ragged2e, language = {english}, author = {Martin Schröder}, @@ -622,54 +632,34 @@ Schlegl}, url = {CTAN://macros/latex/contrib/ms/} } -@Misc{ package:topcapt, +@Misc{ package:selinput, language= {english}, - author = {Robin Fairbairns}, - title = {topcapt.sty}, - year = 2004, - month = dec, + author = {Heiko Oberdiek}, + title = {The {\Package{selinput}} package}, + year = 2007, + month = sep, edition = {1.2}, - url = {CTAN://macros/latex/contrib/misc/topcapt.sty} + url = {CTAN://macros/latex/contrib/oberdiek/} } -@Misc{ package:hyperref, +@Misc{ package:setspace, language= {english}, - author = {Sebastian Rahtz and Heiko Oberdiek}, - title = {Hypertext marks in {\LaTeX}: the {\Package{hyperref}} package}, - year = 2012, - month = nov, - edition = {6.83m}, - url = {CTAN://macros/latex/contrib/hyperref/} + author = {Geoffrey Tobin and Robin Fairbairns}, + title = {{\Package{setspace}} {\LaTeX} package}, + year = 2011, + month = dec, + edition = {6.7a}, + url = {CTAN://macros/latex/contrib/setspace/} } -@Misc{ package:float, +@Misc{ package:splitindex, language= {english}, - author = {Anselm Lingnau}, - title = {An Improved Environment for Floats}, - year = 2001, - month = nov, - edition = {1.3d}, - url = {CTAN://macros/latex/contrib/float/} -} - -@Misc{ package:floatrow, - language = {english}, - author = {Olga Lapko}, - title = {The {\Package{floatrow}} package}, - year = 2008, - month = aug, - edition = {0.3b}, - url = {CTAN://macros/latex/contrib/floatrow/} -} - -@Misc{ package:longtable, - language = {english}, - author = {David Carlisle}, - title = {The {\Package{longtable}} package}, - year = 2004, - month = feb, - edition = {4.11}, - url = {CTAN://macros/latex/required/tools/} + author = {Markus Kohm}, + title = {Creating More Than One Index Using {\Package{splitidx}} And {\Package{SplitIndex}}}, + year = 2014, + month = apr, + edition = {1.2a}, + url = {CTAN://macros/latex/contrib/splitindex/} } @Misc{ package:tabu, @@ -682,14 +672,44 @@ Schlegl}, url = {CTAN://macros/latex/contrib/tabu/} } -@Misc{ package:mparhack, +@Misc{ package:topcapt, language= {english}, - author = {Tom Sgouros and Stefan Ulrich}, - title = {The {\Package{mparhack}} package}, - year = 2005, - month = apr, - edition = {1.4}, - url = {CTAN://macros/latex/contrib/mparhack/} + author = {Robin Fairbairns}, + title = {topcapt.sty}, + year = 2004, + month = dec, + edition = {1.2}, + url = {CTAN://macros/latex/contrib/misc/topcapt.sty} +} + +@Misc{ package:tabularx, + language= {english}, + author = {David Carlisle}, + title = {The {\Package{tabularx}} package}, + year = 1999, + month = jan, + edition = {2.07}, + url = {CTAN://macros/latex/required/tools/} +} + +@Misc{ package:tocstyle, + language= {english}, + author = {Markus Kohm}, + title = {The {\KOMAScript} package {\Package{tocstyle}}}, + year = 2013, + month = aug, + edition = {0.2e}, + note = {\KOMAScript} +} + +@Misc{ package:xcolor, + language = {english}, + author = {Dr. Uwe Kern}, + title = {Extending {\LaTeX}'s color facilities: the {\Package{xcolor}} package}, + year = 2007, + month = jan, + edition = {2.11}, + url = {CTAN://macros/latex/contrib/xcolor/} } @Misc{ package:xpatch, @@ -731,16 +751,6 @@ Schlegl}, url = {http://www.uta.fi/~trjusc/typoblatt.htm} } -@Misc{ zeitung, - language = {ngerman}, - author = {Martin Z. Schröder}, - title = {Die Anmut des Unscheinbaren}, - howpublished = {Berliner Zeitung}, - year = 1998, - month = {10. Oktober}, - url = {http://www.berliner-zeitung.de/archiv} -} - @Misc{ www:gutetypo, language = {ngerman}, author = {Hermann Rotermund}, diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-4.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-4.tex index 1afd63995ab..69e7facc15b 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-4.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-4.tex @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{common-4.tex} - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2016-04-29 07:56:21 +0200 (Fri, 29 Apr 2016) $ KOMA-Script guide (common paragraphs: fontsize)] \makeatletter @@ -109,9 +109,9 @@ und der Klasse abhängig. passen nicht alle Längen an eine nach dem Laden der Klasse vorgenommene Änderung der Grundschriftgröße an.}% \IfCommon{scrlttr2}{Dabei sind Fehler möglich, die nicht als Fehler von - \KOMAScript{} betrachtet werden und auch die \Package{scrlttr2} selbst passt - nicht alle Längen an eine nach dem Laden der Klasse vorgenommene Änderung - der Grundschriftgröße an.}% + \KOMAScript{} betrachtet werden und auch die Klasse \Class{scrlttr2} selbst + passt nicht alle Längen an eine nach dem Laden der Klasse vorgenommene + Änderung der Grundschriftgröße an.}% \IfCommon{scrextend}{Es können also Fehler auf"|treten, die nicht als Fehler von \KOMAScript{} angesehen werden.}% diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/guide-ngerman.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/guide-ngerman.tex index 588d775481e..9c7e8727554 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/guide-ngerman.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/guide-ngerman.tex @@ -1,6 +1,6 @@ % ====================================================================== % guide-ngerman.tex -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % guide-ngerman.tex -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,7 +46,7 @@ % ====================================================================== % \KOMAProvidesFile{guide-ngerman.tex} - [$Date: 2015-09-30 11:43:03 +0200 (Wed, 30 Sep 2015) $ + [$Date: 2016-03-09 18:14:56 +0100 (Wed, 09 Mar 2016) $ KOMA-Script guide language dependencies] % % \section{Title} @@ -564,6 +564,7 @@ Brief-um-ge-bung Brief-um-ge-bun-gen Da-tei-na-me Da-tei-na-men Da-tei-na-mens Da-tei-na-men-er-wei-te-rung Da-tei-na-men-er-wei-te-rung-en + Ein-trags-ebe-ne Gleich-zei-tig Hin-ter-grund-ebe-ne Hin-ter-grund-ebe-nen Ka-pi-tel-ebe-ne Ka-pi-tel-ebe-nen 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 f2e84e7748a..cbdc64ff4d9 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 @@ -1,6 +1,6 @@ % ====================================================================== % scrbase.tex -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrbase.tex -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{scrbase.tex} - [$Date: 2015-07-26 08:24:01 +0200 (Sun, 26 Jul 2015) $ + [$Date: 2016-03-09 18:09:14 +0100 (Wed, 09 Mar 2016) $ KOMA-Script package scrbase] \chapter{Grundlegende Funktionen im Paket \Package{scrbase}} @@ -448,6 +448,15 @@ Mitglieds gesetzt wird. ergänzt werden. \end{Example} +Wird\ChangedAt{v3.20}{\Package{scrbase}} \Macro{FamilyExecuteOptions} mit +einer nicht definierten Option in der \PName{Optionenliste} aufgerufen, so +wird normalerweise ein Fehler ausgegeben. Eine Ausnahme von dieser Regel ist, +wenn für das \PName{Mitglied} eine Option namens \Option{@else@} definiert +wurde. In diesem Fall wird statt der unbekannten Option eben diese Option +\Option{@else@} verwendet. Innerhalb von \KOMAScript{} wird das +beispielsweise verwendet, um die Stil-Option bei der Definition von +Gliederungsbefehlen vor allen anderen auszuwerten. + Diese Anweisung darf auch innerhalb der Ausführung von Optionen verwendet werden.% % @@ -1738,4 +1747,4 @@ arabische Zahl ist \Macro{the} voran zu stellen.% % LocalWords: Wurstpaket FamilyOption salatmit SalatZusatz scrbase false % LocalWords: AtEndOfFamilyOptions FamilyBoolKey FamilySetBool Schaltername % LocalWords: FamilyLengthKey FamilySetLength FamilyLengthMacroKey -% LocalWords: FamilySetLengthMacro Wertübergabe +% LocalWords: FamilySetLengthMacro Wertübergabe Gliederungsbefehlen 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 aa12bd08357..4189d709107 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 @@ -1,6 +1,6 @@ % ====================================================================== % scrbookreportarticle-experts.tex -% Copyright (c) Markus Kohm, 2001-2015 +% Copyright (c) Markus Kohm, 2001-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrbookreportarticle-experts.tex -% Copyright (c) Markus Kohm, 2001-2015 +% Copyright (c) Markus Kohm, 2001-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -48,11 +48,12 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle-experts.tex}% - [$Date: 2015-09-10 07:56:45 +0200 (Thu, 10 Sep 2015) $ + [$Date: 2016-03-08 10:14:05 +0100 (Tue, 08 Mar 2016) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl for experts)] -\chapter[{Zusätzliche Informationen zu den Hauptklassen und \Package{scrextend}}]{Zusätzliche +\chapter[{Zusätzliche Informationen zu den Hauptklassen und + \Package{scrextend}}]{Zusätzliche Informationen zu den Hauptklassen \Class{scrbook}, \Class{scrreprt} und \Class{scrartcl} sowie dem @@ -577,27 +578,38 @@ folgenden Stile zur Verfügung: der Wert sollte eindeutig sein. \\ \PValue{style} & \PName{Name} & Legt den Stil der Überschriften fest.\\ - \PValue{tocindent} & \PName{Länge} & Der horizontale Einzug des zum - Gliederungsbefehls gehörenden - Eintrags ins Inhaltsverzeichnis, - falls ein solcher abhängig von - \Counter{tocdepth} (siehe - \autoref{sec:maincls.toc}, - \autopageref{desc:maincls.counter.tocdepth}) - erzeugt wird.\\ - \PValue{toclevel} & \PName{Ganzzahl} & - Die Ebene des zum Gliederungsbefehl - gehörenden Eintrags ins - Inhaltsverzeichnis, falls diese von - \PValue{level} abweichen soll - (siehe auch \Counter{tocdepth} in - \autoref{sec:maincls.toc}, - \autopageref{desc:maincls.counter.tocdepth}). \\ - \PValue{tocnumwidth} & \PName{Länge}& Die Breite, die für die - Gliederungsnummer im zum - Gliederungsbefehl gehörenden Eintrag - ins Inhaltsverzeichnis reserviert - wird.\\ + \ChangedAt[2016/03]{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + \PValue{tocstyle} & \PName{Name} & Legt den Stil der + Verzeichniseinträge fest. Es können + alle bisher definierten + Verzeichniseintragsstile (siehe + \autoref{sec:tocbasic.tocstyle}) + verwendet werden. Ein leerer + \PName{Name} verhindert die + Definition des Befehls für + Verzeichniseinträge.\\ + % \PValue{tocindent} & \PName{Länge} & Der horizontale Einzug des zum + % Gliederungsbefehls gehörenden + % Eintrags ins Inhaltsverzeichnis, + % falls ein solcher abhängig von + % \Counter{tocdepth} (siehe + % \autoref{sec:maincls.toc}, + % \autopageref{desc:maincls.counter.tocdepth}) + % erzeugt wird.\\ + % \PValue{toclevel} & \PName{Ganzzahl} & + % Die Ebene des zum Gliederungsbefehl + % gehörenden Eintrags ins + % Inhaltsverzeichnis, falls diese von + % \PValue{level} abweichen soll + % (siehe auch \Counter{tocdepth} in + % \autoref{sec:maincls.toc}, + % \autopageref{desc:maincls.counter.tocdepth}). \\ + % \PValue{tocnumwidth} & \PName{Länge}& Die Breite, die für die + % Gliederungsnummer im zum + % Gliederungsbefehl gehörenden Eintrag + % ins Inhaltsverzeichnis reserviert + % wird.\\ \bottomrule \end{tabularx} \end{table} @@ -812,6 +824,30 @@ vordefiniert. Wird über den \PName{Schlüssel} \PValue{counterwithin} der Zähler als von einem anderen Zähler abhängig definiert, so wird in der Ausgabe dieser andere Zähler mit einem Punkt getrennt vorangestellt. +Neben\ChangedAt[2016/03]{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} dem Gliederungsbefehl selbst wird auch ein Befehl für +einen Eintrag ins Inhaltsverzeichnis definiert. Dafür wird auf das Paket +\Package{tocbasic}\important{\Package{tocbasic}}\IndexPackage{tocbasic} +zurückgegriffen. Der Stil des Verzeichniseintrags wird über die Eigenschaft +\PValue{tocstyle} festgelegt. Wird hier mit \OptionValue{tocstyle}{} oder +\OptionValue{tocstyle}{\{\}} ein leerer \PName{Name} angegeben, so erfolgt +keine Umdefinierung des Befehls für den Verzeichniseintrag. Das ist +beispielsweise dann wichtig, wenn Sie ein zusätzliches Paket zur Modifikation +des Inhaltsverzeichnisses verwenden. Fehlt die Eigenschaft \PValue{tocstyle}, +so wird bei der Umdefinierung der bisherige Stil erneut verwendet. + +Unterschiedliche\ChangedAt[2016/03]{v3.20}{\Class{scrbook}\and + \Class{scrreprt}\and \Class{scrartcl}} Stile für Verzeichniseinträge haben +unterschiedliche zusätzliche Eigenschaften. Diese können mit dem Präfix +\PValue{toc} versehen direkt mit angegeben werden. So kann beispielsweise die +Ebene des Verzeichniseintrags, die bei allen von den \KOMAScript-Klassen und +\Package{tocbasic} definierten Stilen als Eigenschaft \PValue{level} bekannt +ist, mit \PValue{toclevel} gesetzt werden, der Einzug des Eintrags, +\PValue{indent}, über \PValue{tocindent} und die für die Nummer reservierte +Breite, \PValue{numwidth}, mit \PValue{tocnumwidth}. Für weitere Eigenschaften +der Verzeichniseinträge siehe \autoref{sec:tocbasic.tocstyle} ab Seite +\autopageref{sec:tocbasic.tocstyle}. + \begin{Example} Aus unerfindlichen Gründen sollen die Überschriften von \Macro{paragraph} nicht mehr als Spitzmarken, sondern als Überschriften ähnlich @@ -878,7 +914,11 @@ Einstellungen sind in \autoref{tab:maincls.chapter.skips} zu finden. Eine Übersicht über alle Voreinstellungen bietet \autoref{tab:maincls.section.defaults}. Es ist zu beachten, dass dabei \PValue{1ex} und \Length{baselineskip} von der voreingestellten Größe der -Überschrift beziehungsweise des Inhaltsverzeichniseintrags abhängig sind. +Überschrift beziehungsweise des Inhaltsverzeichniseintrags abhängig +sind. Weitere Voreinstellungen\ChangedAt[2016/03]{v3.20}{\Class{scrbook}\and + \Class{scrreprt}\and \Class{scrartcl}} für die Stile der Verzeichniseinträge +sind \autoref{sec:tocbasic.tocstyle}\important{\Package{tocbasic}} ab +\autopageref{sec:tocbasic.tocstyle} zu entnehmen. \begin{table} \centering @@ -952,7 +992,9 @@ Einstellungen sind in \autoref{tab:maincls.chapter.skips} zu finden. Eine \autoref{tab:maincls.structureElementsFont}, \autopageref{tab:maincls.structureElementsFont} \\ \PValue{tocindent} & \PValue{0pt} \\ + \PValue{toclevel} & -1 \\ \PValue{tocnumwidth} & \PValue{2em} \\ + \PValue{tocstyle} & \PValue{part} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -972,7 +1014,9 @@ Einstellungen sind in \autoref{tab:maincls.chapter.skips} zu finden. Eine \autoref{tab:maincls.structureElementsFont}, \autopageref{tab:maincls.structureElementsFont} \\ \PValue{tocindent} & \PValue{0pt} \\ + \PValue{toclevel} & 0 \\ \PValue{tocnumwidth} & \PValue{1.5em} \\ + \PValue{tocstyle} & \PValue{chapter} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -989,7 +1033,9 @@ Einstellungen sind in \autoref{tab:maincls.chapter.skips} zu finden. Eine \PValue{indent} & \PValue{0pt} \\ \PValue{level} & 1 \\ \PValue{tocindent} & \PValue{1.5em}\\ + \PValue{toclevel} & 1 \\ \PValue{tocnumwidth} & \PValue{2.3em}\\ + \PValue{tocstyle} & \PValue{section} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -1006,7 +1052,9 @@ Einstellungen sind in \autoref{tab:maincls.chapter.skips} zu finden. Eine \PValue{indent} & \PValue{0pt} \\ \PValue{level} & 2 \\ \PValue{tocindent} & \PValue{3.8em}\\ + \PValue{toclevel} & 2 \\ \PValue{tocnumwidth} & \PValue{3.2em}\\ + \PValue{tocstyle} & \PValue{section} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -1023,7 +1071,9 @@ Einstellungen sind in \autoref{tab:maincls.chapter.skips} zu finden. Eine \PValue{indent} & \PValue{0pt} \\ \PValue{level} & 3 \\ \PValue{tocindent} & \PValue{7.0em}\\ + \PValue{toclevel} & 3 \\ \PValue{tocnumwidth} & \PValue{4.1em}\\ + \PValue{tocstyle} & \PValue{section} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -1040,7 +1090,9 @@ Einstellungen sind in \autoref{tab:maincls.chapter.skips} zu finden. Eine \PValue{indent} & \PValue{0pt} \\ \PValue{level} & 4 \\ \PValue{tocindent} & \PValue{10em}\\ + \PValue{toclevel} & 4 \\ \PValue{tocnumwidth} & \PValue{5em}\\ + \PValue{tocstyle} & \PValue{section} \\ \bottomrule \end{tabularx} \\ \addlinespace[\normalbaselineskip] @@ -1057,7 +1109,9 @@ Einstellungen sind in \autoref{tab:maincls.chapter.skips} zu finden. Eine \PValue{indent} & \Macro{scr@parindent} \\ \PValue{level} & 5 \\ \PValue{tocindent} & \PValue{12em}\\ + \PValue{toclevel} & 5 \\ \PValue{tocnumwidth} & \PValue{6em}\\ + \PValue{tocstyle} & \PValue{section} \\ \bottomrule \end{tabularx} \end{longtable} @@ -1729,4 +1783,6 @@ Option \Option{bibliography}. % LocalWords: Zählername Spitzmarke Kolumnentitels Schrifteinstellungen % LocalWords: Strichstärke expandierbar expandierbaren expandierbares % LocalWords: spartanisch Kapitelstil Spitzmarken Formatierungsanweisungen -% LocalWords: Kapitelüberschriften Gliederungsebenen +% LocalWords: Kapitelüberschriften Gliederungsebenen Verzeichniseinträge +% LocalWords: Verzeichniseintragsstile Gliederungsbefehl Verzeichniseintrag +% LocalWords: Verzeichniseintrags Verzeichniseintragsstilen 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 72c37d38ef7..5cf5d29486e 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 @@ -1,6 +1,6 @@ % ====================================================================== % scrbookreportarticle.tex -% Copyright (c) Markus Kohm, 2001-2015 +% Copyright (c) Markus Kohm, 2001-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrbookreportarticle.tex -% Copyright (c) Markus Kohm, 2001-2015 +% Copyright (c) Markus Kohm, 2001-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,7 +46,7 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle.tex} - [$Date: 2015-08-27 11:10:36 +0200 (Thu, 27 Aug 2015) $ + [$Date: 2016-05-08 10:45:54 +0200 (Sun, 08 May 2016) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)] \chapter{Die Hauptklassen \Class{scrbook}, \Class{scrreprt}, \Class{scrartcl}} @@ -3840,10 +3840,12 @@ gewählt. Siehe hierzu die Erklärung zu den Werten \PValue{oneline} und \begin{Declaration} \Macro{setcapwidth}\OParameter{Ausrichtung}\Parameter{Breite}\\ + \Macro{setcapdynwidth}\OParameter{Ausrichtung}\Parameter{Breite}\\ \Macro{setcapmargin}\OParameter{Rand \kern-.25em links}\Parameter{Rand}\\ \Macro{setcapmargin*}\OParameter{Rand \kern-.25em innen}\Parameter{Rand} \end{Declaration} \BeginIndex{Cmd}{setcapwidth}% +\BeginIndex{Cmd}{setcapdynwidth}% \BeginIndex{Cmd}{setcapmargin}% \BeginIndex{Cmd}{setcapmargin*}% Mit \ChangedAt{v2.8q}{\Class{scrbook}\and \Class{scrreprt}\and @@ -3875,32 +3877,44 @@ Tabellen immer nach den Beschreibungen der ersten Teiltabelle ausgerichtet. Dies ist ein konzeptionelles Problem des Paketes \Package{longtable}. +Zu\ChangedAt{v3.20}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}\textnote{Achtung!} beachten ist, dass die an +\Macro{setcapwidth} übergebene \PName{Breite} wie bei \Macro{setlength} zum +Zeitpunkt der Zuweisung ausgewertet wird. Will man hingegen, dass +\PName{Breite} erst bei der Verwendung ausgewertet wird, dann sollte man +stattdessen \Macro{setcapdynwidth} verwenden. Entscheidende Unterschiede gibt +es beispielsweise, wenn Längen wie \Length{linewidth} oder andere Anweisungen +als Argument verwendet werden. + Mit\important{\Macro{setcapmargin}} der Anweisung \Macro{setcapmargin} kann statt der Breite der Beschreibung ein \PName{Rand} angegeben werden, der neben der Beschreibung zusätzlich zum normalen Textrand eingehalten werden soll. Sollen der Rand rechts und links nicht identisch gewählt werden, kann mit dem -optionalen Argument ein von \PName{Rand} abweichender \PName{Rand \kern-.25em links} von -der Beschreibung eingestellt werden. Bei\important{\Macro{setcapmargin*}} der -Sternvariante \Macro{setcapmargin*} wird statt \PName{Rand \kern-.25em links} im +optionalen Argument ein von \PName{Rand} abweichender \PName{Rand \kern-.25em + links} von der Beschreibung eingestellt +werden. Bei\important{\Macro{setcapmargin*}} der Sternvariante +\Macro{setcapmargin*} wird statt \PName{Rand \kern-.25em links} im doppelseitigen Satz \PName{Rand \kern-.25em innen} abweichend definiert. Hier\textnote{Achtung!} ergibt sich bei \Package{longtable}\IndexPackage{longtable}-Tabellen% \important{\Package{longtable}} das gleiche Problem wie bei der Ausrichtung außen oder innen bei der Anweisung \Macro{setcapwidth}. Die Verwendung von -\Macro{setcapmargin} oder \Macro{setcapmargin*} aktiviert außerdem +\Macro{setcapmargin} oder \Macro{setcapmargin*} aktiviert außerdem \OptionValue{captions}{nooneline} (siehe \autopageref{desc:maincls.option.captions.nooneline}) für die Beschreibungen, die mit dieser Randeinstellung gesetzt werden. Man\textnote{Tipp!} kann übrigens auch negative Werte für \PName{Rand} und -\PName{Rand \kern-.25em rechts} oder \PName{Rand \kern-.25em außen} angeben. Dadurch erreicht man, -dass die Beschreibung in den entsprechenden Rand hineinragt. +\PName{Rand \kern-.25em rechts} oder \PName{Rand \kern-.25em außen} +angeben. Dadurch erreicht man, dass die Beschreibung in den entsprechenden +Rand hineinragt. Für\textnote{Tipp!} Experten und versierte Anwender ist eine etwas trickreiche Anwendung für \Macro{setcapwidth} in \iffree{\cite{book:komascript}}{\autoref{cha:floattricks}, \autopageref{cha:floattricks}} zu finden.% % +\EndIndex{Cmd}{setcapdynwidth}% \EndIndex{Cmd}{setcapwidth}% \EndIndex{Cmd}{setcapmargin}% \EndIndex{Cmd}{setcapmargin*}% @@ -4571,4 +4585,5 @@ zuständig.% % LocalWords: Teildokumenten Klassenoption Tabellenunterschrift float % LocalWords: Satzspiegels Schrifteinstellung Abschnittseinträgen -% LocalWords: Vakatseiten Kolumnentitel Sternformen +% LocalWords: Vakatseiten Kolumnentitel Sternformen Teiltabelle + diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjura.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjura.tex index 9a9a99827b9..66b710f926c 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjura.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjura.tex @@ -1,6 +1,6 @@ % ====================================================================== % scrjura.tex -% Copyright (c) Markus Kohm, 2015 +% Copyright (c) Markus Kohm, 2011-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrjura.tex -% Copyright (c) Markus Kohm, 2015 +% Copyright (c) Markus Kohm, 2011-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -40,30 +40,1153 @@ % % ---------------------------------------------------------------------- % -% Kapitel über scrjura in der KOMA-Script-Anleitung +% Kapitel ueber scrjura in der KOMA-Script-Anleitung % Verwaltet von Markus Kohm % % ====================================================================== - -\KOMAProvidesFile{scrjura.tex} - [$Date: 2014-06-25 16:38:45 +0200 (Wed, 25 Jun 2014) $ +\KOMAProvidesFile{scrjura.tex}% + [$Date: 2016-05-09 11:37:44 +0200 (Mon, 09 May 2016) $ KOMA-Script guide (chapter: scrjura)] \chapter{Unterstützung für die Anwaltspraxis durch \Package{scrjura}} \labelbase{scrjura} \BeginIndex{Package}{scrjura} -An dieser Stelle findet sich in \cite{book:komascript} ein Kapitel über das -Paket \Package{scrjura}. Leider hat sich bisher niemand mit hinreichenden -Englisch-Kenntnissen im juristischen Vokabular gefunden, der dieses Kapitel -übersetzt und die Rechte an dieser Übersetzung an mich abtritt. Da es aber -sehr unfair wäre, wenn die deutsche Anleitung dieses Kapitel enthielte, die -Anwender, die der deutschen Sprache nicht mächtig sind, jedoch auf jegliche -Anleitung verzichten müssten, fehlt dieses Kapitel hier. Es gibt daher für -\Package{scrjura} derzeit nur die freie Anleitung von Dr.\,Alexander -Willand (mit einigen Ergänzungen von mir). Bei dieser ist leider weder die -Vollständigkeit noch die Aktualität immer sichergestellt.% +Will man einen Vertrag\Index{Vertraege=Verträge}, die Satzung +einer Gesellschaft oder eines Vereins, ein Gesetz oder gleich einen +Gesetzeskommentar schreiben, so übernimmt das Paket \Package{scrjura} den +typografischen Teil der Unterstützung für diese Tätigkeit. Obwohl +\Package{scrjura} als allgemeine Hilfe für anwaltliche Schriftstücke +angedacht ist, hat sich gezeigt, dass der Vertrag dabei ein ganz zentrales +Element ist. Besonderes Augenmerk gilt hier dem +Paragraphen\Index{Paragraphen>juristische} mit Nummer, Titel, +nummerierten Absätzen -- falls es mehrere davon in einem Paragraphen gibt --, +bedarfsweise nummerierten Sätzen, Einträgen in das Inhaltsverzeichnis und +Querverweisen in den deutschen Gepflogenheiten entsprechenden Formen. + +Das Paket ist in Zusammenarbeit mit Rechtsanwalt Dr.\,Alexander Willand, +Karlsruhe, entstanden. Die folgenden Ausführungen erklären das Paket aus einem +etwas anderen Blickwinkel als die dem Paket beiliegenden Anleitung. + +Es ist zu beachten\textnote{Achtung!}, dass das Paket mit +\Package{hyperref}\IndexPackage{hyperref} zusammenarbeitet, aber wie üblich +\Package{hyperref} nach \Package{scrjura} geladen werden muss! + +\LoadCommon{0} % \section{Frühe oder späte Optionenwahl} + +\section{Verzeichnisse} +\label{sec:scrjura.toc} + +Das Paket \Package{scrjura} sieht auch Einträge in das +Inhaltsverzeichnis\Index{Inhaltsverzeichnis} vor. + +\begin{Declaration} + \KOption{juratotoc}\PName{Ein-Aus-Wert}\\ + \KOption{juratotoc}\PName{Ebenennummer} +\end{Declaration} +\BeginIndex{Option}{juratotoc~=\PName{Ein-Aus-Wert}}% +\BeginIndex{Option}{juratotoc~=\PName{Ebennummer}}% +Im Inhaltsverzeichnis angezeigt werden +Paragraphen\Index{Paragraphen>juristische} nur, wenn ihre \PName{Ebenennummer} +kleiner oder gleich dem Zähler +\Counter{tocdepth}\important{\Counter{tocdepth}}\IndexCounter{tocdepth} ist +(siehe \autoref{sec:maincls.toc}, +\autopageref{desc:maincls.counter.tocdepth}). Voreingestellt ist für +\PName{Ebenennummer} der Wert 10000, der auch verwendet wird, wenn die Option +über einen \PName{Ein-Aus-Wert}\important{\OptionValue{juratotoc}{false}} +(siehe \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}) +ausgeschaltet wird. Da der Zähler \Counter{tocdepth} üblicherweise einen +kleinen, einstelligen Wert besitzt, werden die Paragraphen-Einträge im +Inhaltsverzeichnis daher normalerweise nicht angezeigt. + +Wird die Option hingegen über einen +\PName{Ein-Aus-Wert}\important{\OptionValue{juratotoc}{true}} eingeschaltet, +so wird als \PName{Ebenennummer} 2 voreingestellt. Damit werden sie in +Inhaltsverzeichnissen bei allen \KOMAScript-Klassen auf derselben Ebene wie +\Macro{subsection} eingeordnet. In der Voreinstellung von \Counter{tocdepth} +werden sie dann auch bei allen \KOMAScript-Klassen im Inhaltsverzeichnis +angezeigt.% +\EndIndex{Option}{juratotoc~=\PName{Ebenennummer}}% +\EndIndex{Option}{juratotoc~=\PName{Ein-Aus-Wert}}% + +\begin{Declaration} + \KOption{juratocindent}\PName{Einzug}\\ + \KOption{juratocnumberwidth}\PName{Nummernbreite} +\end{Declaration} +\BeginIndex{Option}{juratocindent~=\PName{Einzug}}% +\BeginIndex{Option}{juratocnumberwidth~=\PName{Nummernbreite}}% +Mit diesen beiden Optionen kann für die Einträge der Paragraphen ins +Inhaltsverzeichnis sowohl der Einzug als auch die Breite, die für Nummern +reserviert wird, festgelegt werden. Voreingestellt sind dieselben Werte wie +für \Macro{subsection}-Einträge bei \Class{scrartcl}. +% +\EndIndex{Option}{juratocnumberwidth~=\PName{Nummernbreite}}% +\EndIndex{Option}{juratocindent~=\PName{Einzug}}% + + + +\section{Umgebung für Verträge} +\label{sec:scrjura.contract} + +\BeginIndex{}{Vertraege=Verträge} +Die wesentlichen Mechanismen von \Package{scrjura} stehen ausschließlich +innerhalb von Verträgen der zugehörigen Umgebung zur Verfügung. + +\begin{Declaration} + \XMacro{begin}\PParameter{\Environment{contract}}\\ + \dots\\ + \XMacro{end}\PParameter{\XEnvironment{contract}} +\end{Declaration} +\BeginIndex{Env}{contract}% +Dies ist die erste und bisher einzige Umgebung für Juristen, die +\Package{scrjura} bereit stellt. Durch ihre Verwendung wird die automatische +Absatznummerierung aktiviert und die Anweisungen \Macro{Clause} und +\Macro{SubClause} mit einer konkreten Form versehen, die später näher +dokumentiert wird. + +Die\textnote{Achtung!} Umgebung \Environment{contract} darf nicht in sich +selbst geschachtelt werden. Innerhalb eines Dokuments dürfen jedoch mehrere +dieser Umgebungen verwendet werden. Dabei werden die Paragraphen innerhalb +dieser Umgebungen so behandelt, als stünden sie innerhalb einer einzigen +Umgebung. Durch das Beenden der Umgebung wird diese also quasi lediglich +unterbrochen und durch den Beginn einer neuen Umgebung wird sozusagen die alte +Umgebung fortgesetzt. Dabei sind allerdings keine Unterbrechungen innerhalb +eines Paragraphen möglich.% +\EndIndex{Env}{contract} + +\begin{Declaration} + \Option{contract} +\end{Declaration} +\BeginIndex{Option}{contract}% +Bei Angabe dieser Option beim Laden des Pakets beispielsweise mit +\Macro{usepackage}\important{\Macro{usepackage}} oder als globale Option bei +\Macro{documentclass}\important{\Macro{documentclass}} wird das gesamte +Dokument zu einem Vertrag. Das Dokument verhält sich dann also genauso, als +würde es genau eine \Environment{contract}-Umgebung enthalten. + +Es\textnote{Achtung!} wird darauf hingewiesen, dass Option \Option{contract} +weder mit \Macro{KOMAoption} oder \Macro{KOMAoptions} gesetzt werden kann! +Damit ist es auch nicht möglich die Option wieder abzuschalten. Verwenden Sie +in einem solchen Fall stattdessen direkt eine \Environment{contract}-Umgebung. +% +\EndIndex{Option}{contract} + + +\subsection{Juristische Paragraphen} +\label{sec:scrjura.clause} +\BeginIndex{}{Paragraphen>juristische} + +Paragraphen\footnote{Obwohl der korrekte Begriff für juristische Paragraphen + im Englischen »\emph{section}« wäre, sind die Bezeichnungen in + \Package{scrjura} von »\emph{clause}« abgeleitet. Dadurch sollen + Verwechslungen sowohl mit \Macro{section} als auch mit \Macro{paragraph} + vermieden werden.} im juristischen Sinn, sind bei \Package{scrjura} nur +innerhalb von Verträgen, also innerhalb der Umgebung \Environment{contract} +definiert. + +\begin{Declaration} + \phantomsection\label{desc:scrjura.contract.macro.Clause}% + \Macro{Clause}\OParameter{Einstellungen}\\ + \phantomsection\label{desc:scrjura.contract.macro.SubClause}% + \Macro{SubClause}\OParameter{Einstellungen} +\end{Declaration} +\BeginIndex{Cmd}{Clause}% +\BeginIndex{Cmd}{SubClause}% +Dies sind die wichtigsten Anweisungen innerhalb eines Vertrags. Ohne +zusätzliche \PName{Einstellungen} erzeugt \Macro{Clause} eine +Paragraphenüberschrift, die nur aus dem Paragraphenzeichen gefolgt von einer +fortlaufenden Nummer besteht. Dagegen erzeugt \Macro{SubClause} eine +Paragraphenüberschrift, bei der an die zuletzt mit \Macro{Clause} gesetzte +Nummer noch ein fortlaufender Kleinbuchstabe angehängt wird. Gedacht ist +\Macro{SubClause} vor allem für den Fall, dass bei der Novellierung von +Gesetzen oder Verträgen nicht nur Paragraphen umformuliert oder gestrichen +werden, sondern zwischen existierenden Paragraphen neue eingefügt werden, ohne +dass eine komplett neue Nummerierung erfolgt. + +Als \PName{Einstellungen} kann +bei beiden Anweisungen eine durch Komma separierte Liste von +Eigenschaften angegeben werden. Eine Übersicht über die möglichen +Eigenschaften bietet \autoref{tab:scrjura.Clause.options}. Auf die +wichtigsten soll noch näher eingegangen werden. + +\begin{table} + \caption{Mögliche Eigenschaften für die optionalen Argumente der Anweisungen + \Macro{Clause} und \Macro{SubClause}} + \label{tab:scrjura.Clause.options} + \begin{desctabular} + \entry{\Option{dummy}}{% + Die Überschrift wird nicht gesetzt aber gezählt.% + }% + \entry{\KOption{head}\PName{Kolumnentitel}}{% + Sind Kolumnentitel aktiviert wird unabhängig von einem Titel für den + Paragraphen dieser Kolumnentitel verwendet.% + }% + \entry{\Option{nohead}}{% + Es wird kein neuer Kolumnentitel gesetzt.% + }% + \entry{\Option{notocentry}}{% + Es wird kein Eintrag ins Inhaltsverzeichnis vorgenommen.% + }% + \entry{\KOption{number}\PName{Nummer}}{% + Die Nummer für den Paragraphen wird direkt angegeben.% + }% + \entry{\KOption{preskip}\PName{Abstand}}{% + Neuer Abstand vor den Überschriften der Paragraphen.% + }% + \entry{\KOption{postskip}\PName{Abstand}}{% + Neuer Abstand nach den Überschrift der Paragraphen.% + }% + \entry{\KOption{title}\PName{Überschrift}}{% + Der Paragraph wird zusätzlich zur Nummer mit einem Titel versehen. Dies + ist gleichzeitig die Grundeinstellung für die Einträge in den + Kolumnentitel und das Inhaltsverzeichnis.% + }% + \entry{\KOption{tocentry}\PName{Inhaltsverzeichniseintrag}}{% + Unabhängig von einem Titel für den Paragraphen wird dieser Eintrag ins + Inhaltsverzeichnis vorgenommen.% + }% + \end{desctabular} +\end{table} + +In der Voreinstellung wird vor der Überschrift ein Abstand von zwei Zeilen und +danach ein Abstand von einer Zeile eingefügt. Über die Eigenschaften +\Option{preskip}\important[i]{\Option{preskip}, \Option{postskip}} und +\Option{postskip} kann dieser Abstand verändert werden. Diese neue Einstellung +gilt dann aber nicht nur für den aktuellen Paragraphen, sondern ab dem +aktuellen Paragraphen bis zum Ende der aktuellen Umgebung. Es ist auch +möglich, die entsprechende Einstellung bereits vorab mit Hilfe von +\begin{flushleft}\quad\small + \textbf{\Macro{setkeys}}\PParameter{contract}% + \PParameter{preskip=\PName{Abstand},\\ + \normalsize\quad\small + \hspace{11.5em}postskip=\PName{Abstand}} +\end{flushleft} +unabhängig von einem konkreten Paragraphen und auch außerhalb einer +\Environment{contract}-Umgebung vorzunehmen. Auch das Setzen innerhalb der +Präambel nach dem Laden von \Package{scrjura} ist so möglich. Dagegen ist es +nicht möglich, diese beiden Optionen bereits beim Laden des Pakets anzugeben +oder sie per \Macro{KOMAoptions} oder \Macro{KOMAoption} zu setzen. + +\BeginIndex{FontElement}{contract.Clause}% +\BeginIndex{FontElement}{Clause}% +In der Voreinstellung wird für die Überschrift des Paragraphen als Schrift +\Macro{sffamily}\Macro{bfseries}\Macro{large} verwendet. Über das Element +\FontElement{contract.Clause}\important{\FontElement{contract.Clause}} +kann diese Schrift jederzeit mit Hilfe der Anweisungen +\Macro{setkomafont}\important[i]{\Macro{setkomafont}, \Macro{addtokomafont}} und +\Macro{addtokomafont} (siehe \autoref{sec:maincls.textmarkup}, +\autopageref{desc:maincls.cmd.setkomafont}) geändert werden. Innerhalb der +\Environment{contract}-Umgebung kann statt \FontElement{contract.Clause} +auch \FontElement{Clause}\important{\FontElement{Clause}} +verwendet werden.% +\EndIndex{FontElement}{Clause}% +\EndIndex{FontElement}{contract.Clause} + +Mit Hilfe der Einstellungen \Option{title}\important[i]{\Option{title}, + \Option{head}, \Option{tocentry}}, \Option{head} und \Option{tocentry} +können Paragraphen zusätzlich zur Nummer mit einem Titel versehen +werden. Dabei\textnote{Achtung!} wird empfohlen, den Wert der jeweiligen +Eigenschaft in geschweifte Klammern zu setzen. Anderenfalls führen +beispielsweise Kommata zu Verwechslungen mit den Trennzeichen zwischen +unterschiedlichen Eigenschaften. Leere Werte für \Option{head} und +\Option{tocentry} führen zu leeren Einträgen. Will man hingegen keine Einträge +vornehmen, so sind \Option{nohead}\important[i]{\Option{nohead}, + \Option{notocentry}} und \Option{notocentry} zu verwenden. + +Statt der fortlaufenden Nummer, kann mit Hilfe der Eigenschaft +\Option{number}\important{\Option{number}} auch manuell eine Nummer vergeben +werden. Dies hat jedoch keinen Einfluss auf die Nummern der nachfolgenden +Paragraphen. Die Angabe einer leeren Nummer ist nicht +vorgesehen. Zerbrechliche Anweisungen in \PName{Nummer} sollten mit +\Macro{protect} geschützt werden. Es\textnote{Achtung!} wird empfohlen als +\PName{Nummer} nur Ziffern und Buchstaben anzugeben. + +Mit der Eigenschaft \Option{dummy}\important{\Option{dummy}} kann man die +Ausgabe der kompletten Überschrift des Paragraphen unterdrücken. In der +automatischen Zählung wird der Paragraph aber dennoch berücksichtigt. Auf +diese Weise kann man beispielsweise\textnote{Beispiel} mit +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \Clause{dummy} +\end{lstcode} +einen Paragraphen in der automatischen Zählung überspringen, falls der +entsprechende Paragraph in einer späteren Fassung eines Vertrags gestrichen +wurde. + +Es\textnote{Achtung!} ist zu beachten, dass Eigenschaft \Option{dummy} als +Wert allenfalls \PValue{true} und \PValue{false} versteht. Alle anderen Werte +werden normalerweise ignoriert, können im ungünstigsten Fall aber auch zu +einer Fehlermeldung führen.% +\EndIndex{Cmd}{SubClause}% +\EndIndex{Cmd}{Clause}% + +\begin{Declaration} + \Macro{Clauseformat}\Parameter{Nummer} +\end{Declaration} +\BeginIndex{Cmd}{Clauseformat}% +Wie bereits in der vorausgehenden Erklärung erwähnt, werden juristische +Paragraphen und Unterparagraphen normalerweise nummeriert. Die Formatierung +der Nummer erfolgt dabei mit Hilfe der Anweisung \Macro{Clauseformat}, die +als einziges Argument die Nummer erwartet. Bei der Vordefinierung als +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \newcommand*{\Clauseformat}[1]{\S~#1} +\end{lstcode} +wird der Nummer mit \Macro{S}\IndexCmd{S} lediglich das Paragraphensymbol +gefolgt von einem nicht trennbaren Leerzeichen vorangestellt. Bei +Umdefinierungen ist auf die Expandierbarkeit zu achten!% +\EndIndex{Cmd}{Clauseformat}% + +\begin{Declaration} + \KOption{juratitlepagebreak}\PName{Ein-Aus-Wert} +\end{Declaration}% +\BeginIndex{Option}{juratitlepagebreak~=\PName{Ein-Aus-Wert}}% +Normalerweise sind Seitenumbrüche innerhalb von Überschriften aller Art +verboten. Einige Juristen benötigen jedoch Seitenumbrüche innerhalb von +Paragraphentiteln. Daher kann ein solcher Umbruch mit +\Option{juratitlepagebreak}\important{\Option{juratitlepagebreak}} erlaubt +werden. Die möglichen Einstellungen für \PName{Ein-Aus-Wert} sind +\autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch} zu +entnehmen.% +\EndIndex{Option}{juratitlepagebreak~=\PName{Ein-Aus-Wert}}% + +\begin{Declaration} + \KOption{clausemark}\PName{Einstellung} +\end{Declaration}% +\BeginIndex{Option}{clausemark~=\PName{Einstellung}}% +Da Paragraphen eine untergeordnete Gliederung mit unabhängiger Nummerierung +sind, erzeugen sie in der Voreinstellung keine Kolumnentitel. Über alternative +Einstellungen können jedoch auch Kolumnentitel erzeugt werden. Die möglichen +Werte und ihre Bedeutung sind \autoref{tab:scrjura.clausemark} zu +entnehmen.% +% +\begin{table} + \caption{Mögliche Werte für Option \Option{clausemark} zur Erzeugung von + Kolumnentiteln durch Paragraphen} + \label{tab:scrjura.clausemark}% + \begin{desctabular} + \entry{\PValue{both}}{% + Paragraphen erzeugen linke und rechte Marken für Kolumnentitel, wenn das + Dokument die Verwendung von lebenden Kolumnentiteln vorsieht.% + \IndexOption{clausemark~=\PValue{both}}% + }% + \entry{\PValue{false}, \PValue{off}, \PValue{no}}{% + Paragraphen erzeugen keine Kolumnentitel.% + \IndexOption{clausemark~=\PValue{false}}% + }% + \entry{\PValue{forceboth}}{% + Paragraphen erzeugen mit \Macro{markboth} linke und rechte Marken für + Kolumnentitel unabhängig davon, ob das Dokument beispielsweise über den + Seitenstil überhaupt lebende Kolumnentitel verwendet.% + \IndexOption{clausemark~=\PValue{forceboth}}% + }% + \entry{\PValue{forceright}}{% + Paragraphen erzeugen mit \Macro{markright} rechte Marken für + Kolumnentitel unabhängig davon, ob das Dokument beispielsweise über den + Seitenstil überhaupt lebende Kolumnentitel verwendet.% + \IndexOption{clausemark~=\PValue{forceright}}% + }% + \entry{\PValue{right}}{% + Paragraphen erzeugen rechte Marken für Kolumnentitel, wenn das Dokument + die Verwendung von lebenden Kolumnentiteln vorsieht.% + \IndexOption{clausemark~=\PValue{right}}% + }% + \end{desctabular} +\end{table} +% +\EndIndex{Option}{clausemark~=\PName{Einstellung}}% + + +\subsection{Absätze} +\label{sec:scrjura.par} + +\BeginIndex{}{Absatz>Nummerierung}% +Innerhalb von Paragraphen werden Absätze von \Package{scrjura} normalerweise +automatisch nummeriert. Sie sind damit ein stark gliederndes Element, ähnlich +\Macro{paragraph} oder \Macro{subparagraph} in normalen Texten. Innerhalb von +Verträgen wird deshalb häufig auch gerne mit Abstand zwischen den Absätzen +gearbeitet. Das Paket \Package{scrjura} bietet keinen eigenen Mechanismus +hierfür. Stattdessen sei auf die Option +\Option{parskip}\IndexOption{parskip}\important{\Option{parskip}} der +\KOMAScript-Klassen verwiesen (siehe \autoref{sec:maincls.parmarkup}, +\autopageref{desc:maincls.option.parskip}). + +\begin{Declaration} + \KOption{parnumber}\PName{Einstellung} +\end{Declaration} +\BeginIndex{Option}{parnumber~=\PName{Einstellung}}% +Die automatische Nummerierung der Absätze entspricht den beiden Einstellungen +\OptionValue{parnumber}{auto} und \OptionValue{parnumber}{true}. Manchmal ist +es notwendig, die automatische Nummerierung abzuschalten. Das ist mit +\OptionValue{parnumber}{false}% +\important{\OptionValue{parnumber}{false}}% +\IndexOption{parnumber~=\PValue{false}} möglich. In diesem Fall wird nur die +Satznummer automatisch zurück gesetzt. + +Zur Realisierung dieser Option war es notwendig, in den Absatzmechanismus von +\LaTeX{} einzugreifen. In einigen seltenen Fällen kann sich das negativ +auswirken. Dann bleibt nur, diese Änderung mit +\OptionValue{parnumber}{manual}% +\important{\OptionValue{parnumber}{manual}}% +\IndexOption{parnumber~=\PValue{manual}} zurück zu nehmen. Umgekehrt hebt +\LaTeX{} selbst den Eingriff manchmal auf. In diesem Fällen kann er mit +\OptionValue{parnumber}{auto}% +\important{\OptionValue{parnumber}{auto}}% +\IndexOption{parnumber~=\PValue{auto}} erneut aktiviert werden. + +Paragraphen, die nur aus einem einzigen Absatz bestehen, werden normalerweise +nicht automatisch nummeriert. Damit dies funktioniert, dürfen sich keine zwei +Paragraphen mit identischer Nummer in einem Dokument +befinden. Da\textnote{Achtung!} die Information erst am Ende eines Paragraphen +zur Verfügung steht, werden in der Regel zwei \LaTeX-Läufe benötigt, bis die +automatische Absatznummerierung korrekt erfolgt.% +\EndIndex{Option}{parnumber~=\PName{Einstellung}} + +\begin{Declaration} + \Counter{par}\\ + \Macro{thepar}\\ + \Macro{parformat}\\ + \Macro{parformatseparation} +\end{Declaration}% +\BeginIndex{Counter}{par}% +\BeginIndex{Cmd}{thepar}% +\BeginIndex{Cmd}{parformat}% +\BeginIndex{Cmd}{parformatseparation}% +Für die Nummerierung der Absätze wird der Zähler \Counter{par} +verwendet. Seine Darstellung, \Macro{thepar} ist mit +\Macro{arabic}\PParameter{par} als arabische Zahl voreingestellt. Die Ausgabe +als automatische Absatznummer erfolgt mit \Macro{parformat}. Dabei wird +\Macro{thepar} in runde Klammern gesetzt. Will man einem Absatz manuell eine +Absatznummer voranstellen, so sollte das ebenfalls mit \Macro{parformat} +geschehen. Dabei ist es sinnvoll, auf \Macro{parformat} noch ein nicht +trennbares Leerzeichen mit \Macro{nobreakspace} oder der Tilde folgen zu +lassen. + +Bei\ChangedAt{v0.7}{\Package{scrjura}} der Ausgabe der Nummer wird +\Macro{parformat} außerdem noch ein oder mehrere Trennzeichen angehängt. Diese +sind durch \Macro{parformatseparation} vorgegeben und derzeit mit +\Macro{nonbreakspace}, also einem nicht umbrechbaren Wortabstand, +voreingestellt. + +Es\textnote{Achtung!} wird darauf hingewiesen, dass \Package{scrjura} intern +davon ausgeht, dass \Macro{thepar} eine arabische Zahl ist. Daher sollte +diese Anweisung keinesfalls umdefiniert werden!% +\EndIndex{Cmd}{parformatseparation} +\EndIndex{Cmd}{parformat}% +\EndIndex{Cmd}{thepar}% +\EndIndex{Counter}{par}% + +\begin{Declaration} + \Macro{ellipsispar}\OParameter{Anzahl}\\ + \Macro{parellipsis} +\end{Declaration} +\BeginIndex{Cmd}{ellipsispar}% +\BeginIndex{Cmd}{parellipsis}% +Manchmal\ChangedAt{v0.7}{\Package{scrjura}} -- insbesondere in vergleichenden +Kommentaren -- ist es wünschenswert, wenn man Absätze in Gesetzen auslassen, +aber gleichzeitig die Auslassung\Index{Absatz>Auslassung} markieren kann. Die +Absätze sollen dann auch in der Zählung der übrigen Absätze berücksichtigt +werden. Das Paket \Package{scrjura} stellt dafür die Anweisung +\Macro{ellipsispar} bereit. + +In der Voreinstellung lässt \Macro{ellipsispar} genau einen Absatz aus. Über +das optionale Argument \PName{Anzahl} können jedoch auch mehrere Absätze +ausgelassen werden. In jedem Fall erscheint in der Ausgabe stattdessen genau +ein nicht nummerierter Absatz, der nur die Auslassungszeichen +\Macro{parellipsis} enthält. Bei der Entscheidung für eine automatische +Nummerierung der übrigen Absätze eines juristischen Paragraphen werden die +ausgelassenen Absätze jedoch mit gezählt. Dies gilt ebenso für die Nummern +etwaiger nachfolgender Absätze. +\begin{Example} + Angenommen, Sie kommentieren das Strafgesetzbuch, wollen aber in \S~2 nur + Absatz~3 kommentieren. Dennoch soll auf die übrigen Absätze indirekt + hingewiesen werden. Sie erreichen das beispielsweise mit: +\begin{lstcode} + \documentclass[parskip=half]{scrartcl} + \usepackage{scrjura} + \usepackage{selinput} + \SelectInputMappings{ + adieresis={ä},germandbls={ß}, + } + \begin{document} + \begin{contract} + \Clause{title={Zeitliche Geltung},number=2} + \ellipsispar[2] + + Wird das Gesetz, das bei Beendigung der Tat + gilt, vor der Entscheidung geändert, so ist + das mildeste Gesetz anzuwenden. + + \ellipsispar[3] + \end{contract} + \end{document} +\end{lstcode} + Um das Ergebnis zu sehen, sollten Sie das einfach einmal ausprobieren. +\end{Example} + +Die Auslassungszeichen sind so vordefiniert, dass +\Macro{textellipsis}\IndexCmd{textellipsis} verwendet wird, falls eine solche +Anweisung definiert ist. Anderenfalls wird \Macro{dots} verwendet. Eine +Umdefinierung von \Macro{parellipsis} ist mit \Macro{renewcommand} jederzeit +möglich.% +\EndIndex{Cmd}{parellipsis}% +\EndIndex{Cmd}{ellipsispar}% +% +\EndIndex{}{Absatz>Nummerierung}% + +\subsection{Sätze} +\label{sec:scrjura.sentence} + +\BeginIndex{}{Satz>Nummerierung}% +Absätze in Verträge bestehen aus einem oder mehreren Sätzen, die teilweise +ebenfalls nummeriert werden. Da eine automatische Nummerierung jedoch +problematisch und fehleranfällig ist, wurde eine solche bisher nicht +implementiert. + +\begin{Declaration} + \Counter{sentence}\\ + \Macro{thesentence}\\ + \Macro{Sentence} +\end{Declaration} +\BeginIndex{Counter}{sentence}% +\BeginIndex{Cmd}{thesentence}% +\BeginIndex{Cmd}{Sentence}% +Die Nummerierung von Sätzen erfolgt manuell mit der Anweisung +\Macro{Sentence}. Dabei wird der Zähler \Counter{sentence} automatisch erhöht +und in der Voreinstellung von \Macro{thesentence} als arabische Zahl +ausgegeben. + +Bei\textnote{Tipp!} Verwendung von \Package{babel}\IndexPackage{babel} ist es +einfach möglich, eine Abkürzung für \Macro{Sentence} zu definieren:% +\phantomsection\label{sec:scrjura.shorthandexample}% +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt,% + moretexcs={useshorthands,defineshorthand}] + \useshorthands{'} + \defineshorthand{'S}{\Sentence\ignorespaces} +\end{lstcode} +Bei dieser Definition wurde dafür gesorgt, dass Leerzeichen nach +\lstinline|'S| ignoriert werden. Es ist sogar möglich zusätzlich eine +Abkürzung für einen Punkt gefolgt von einer neuen Satznummer zu definieren: +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt,% + moretexcs={useshorthands,defineshorthand}] + \defineshorthand{'.}{. \Sentence\ignorespaces} +\end{lstcode} +Diese beiden Abkürzungen haben sich in der Praxis sehr bewährt. Näheres zur +Verwendung von +\Macro{useshorthands} und \Macro{defineshorthand} ist der Anleitung zum Paket +\Package{babel} zu entnehmen (siehe \cite{package:babel}).% +\EndIndex{Cmd}{Sentence}% +\EndIndex{Cmd}{thesentence}% +\EndIndex{Counter}{sentence}% +% +\EndIndex{}{Satz>Nummerierung} +% +\EndIndex{}{Paragraphen>juristische}% +% +\EndIndex{}{Vertraege=Verträge}% + + +\section{Querverweise} +\label{sec:scrjura.ref} + +Für Paragraphen, Absätze und Sätze reicht der normale Mechanismus für +Querverweise mit \Macro{label}\IndexCmd{label}\important{\Macro{label}}, +\Macro{ref} und \Macro{pageref} nicht mehr aus. Daher wird dieser von +\Package{scrjura} um weitere Anweisungen ergänzt. + +\begin{Declaration} + \Macro{ref}\Parameter{Label}\\ + \Macro{refL}\Parameter{Label}\\ + \Macro{refS}\Parameter{Label}\\ + \Macro{refN}\Parameter{Label} +\end{Declaration} +\BeginIndex{Cmd}{ref}% +\BeginIndex{Cmd}{refL}% +\BeginIndex{Cmd}{refS}% +\BeginIndex{Cmd}{refN}% +Die Anweisungen \Macro{refL}, \Macro{refS} und \Macro{refN} +referenzieren Paragraph, Absatz und Satz immer vollständig. \Macro{refL} +verwendet dabei eine textuelle Langform, während \Macro{refS} eine textuelle +Kurzform bietet. \Macro{refN} ist eine rein nummerische Kurzform. \Macro{ref} +entspricht in der Voreinstellung \Macro{refL}.% +\EndIndex{Cmd}{refN}% +\EndIndex{Cmd}{refS}% +\EndIndex{Cmd}{refL}% +\EndIndex{Cmd}{ref}% + + +\begin{Declaration} + \Macro{refClause}\Parameter{Label}\\ + \Macro{refClauseN}\Parameter{Label} +\end{Declaration} +\BeginIndex{Cmd}{refClause}% +\BeginIndex{Cmd}{refClauseN}% +Für die Referenzierung von Paragraphen ohne Absatz und Satz, unterscheiden sich +\Macro{refClause} und \Macro{refClauseN} nur darin, dass ersteres +automatisch ein Paragraphenzeichen voran stellt.% +\EndIndex{Cmd}{refClauseN}% +\EndIndex{Cmd}{refClause}% + + +\begin{Declaration} + \Macro{refPar}\Parameter{Label}\\ + \Macro{refParL}\Parameter{Label}\\ + \Macro{refParS}\Parameter{Label}\\ + \Macro{refParN}\OParameter{Zahlenformat}\Parameter{Label} +\end{Declaration} +\BeginIndex{Cmd}{refPar}% +\BeginIndex{Cmd}{refParL}% +\BeginIndex{Cmd}{refParS}% +\BeginIndex{Cmd}{refParN}% +Nur den Absatz kann man mit \Macro{refParL}, \Macro{refParS} und +\Macro{refParN} referenzieren. Die Formen unterscheiden sich dabei wie bereits +für \Macro{refL}, \Macro{refN} und \Macro{refS} angegeben. Eine Besonderheit +stellt das optionale Argument von \Macro{refParN} dar. Normalerweise werden +Absätze in rein nummerischer Form als römische Zahlen referenziert. Über das +optionale Argument kann jedoch auch ein anderes Format vorgegeben +werden. Sinnvoll ist hier in erster Linie das \PValue{Zahlenformat} +\PValue{arabic} für eine arabische Absatznummer. \Macro{refPar} entspricht in +der Voreinstellung \Macro{refParL}. +\EndIndex{Cmd}{refParN}% +\EndIndex{Cmd}{refParS}% +\EndIndex{Cmd}{refParL}% +\EndIndex{Cmd}{refPar}% + + +\begin{Declaration} + \Macro{refSentence}\Parameter{Label}\\ + \Macro{refSentenceL}\Parameter{Label}\\ + \Macro{refSentenceS}\Parameter{Label}\\ + \Macro{refSentenceN}\Parameter{Label} +\end{Declaration} +\BeginIndex{Cmd}{refSentence}% +\BeginIndex{Cmd}{refSentenceL}% +\BeginIndex{Cmd}{refSentenceS}% +\BeginIndex{Cmd}{refSentenceN}% +Der Satz ohne Paragraph und Absatz kann mit \Macro{refSentenceL}, +\Macro{refSentenceS} oder \Macro{refSentenceN} referenziert werden. Auch hier +gibt es wieder eine textuelle Langform, eine textuelle Kurzform und eine rein +nummerische Form. \Macro{refSentence} entspricht in der Voreinstellung +\Macro{refSentenceL}.% +\EndIndex{Cmd}{refSentenceN}% +\EndIndex{Cmd}{refSentenceS}% +\EndIndex{Cmd}{refSentenceL}% +\EndIndex{Cmd}{refSentence}% + + +\begin{Declaration} + \KOption{ref}\PName{Einstellung} +\end{Declaration} +\BeginIndex{Option}{ref~=\PName{Einstellung}}% +Die Ergebnisse von \Macro{ref}, \Macro{refPar} und \Macro{refSentence} sind +von der \PName{Einstellung} für Option \Option{ref} abhängig. In der +Voreinstellung entsprechen diese \Macro{refL}, \Macro{refParL} und +\Macro{refSentenceL}. Mögliche Werte und ihre Bedeutung sind +\autoref{tab:scrjura.ref} zu entnehmen.% +% +\begin{table} +%\begin{desclist} +% \desccaption + \caption[{% + Mögliche Werte für Option \Option{ref} zur Einstellung der + Referenzierungsformate% + }]{% + Mögliche Werte für Option \Option{ref} zur Einstellung des Formats von + \Macro{ref}, \Macro{refPar} und \Macro{refSentence}% + \label{tab:scrjura.ref}% + }% +% {% +% Mögliche Werte für Option \Option{ref} \emph{(Fortsetzung)}% +% }% + \begin{desctabular} + \entry{\PValue{long}}{% + Die Einstellungen \PValue{parlong} und \PValue{sentencelong} werden + kombiniert.% + \IndexOption{ref~=\PValue{long}}% + }% + \entry{\PValue{numeric}}{% + Die Einstellungen \PValue{parnumeric} und \PValue{sentencenumeric} werden + kombiniert.% + \IndexOption{ref~=\PValue{numeric}}% + }% + \entry{\PValue{clauseonly}, \PValue{onlyclause}, + \PValue{ClauseOnly}, \PValue{OnlyClause}}{% + Die Einstellungen \PValue{paroff} und \PValue{sentenceoff} werden + kombiniert. Es ist zu beachten, dass dadurch sowohl \Macro{refPar} als + auch \Macro{refSentence} ein leeres Ergebnis erzeugen!% + \IndexOption{ref~=\PValue{long}}% + }% + \entry{\PValue{parlong}, \PValue{longpar}, \PValue{ParL}}{% + Der Absatz wird in der textuellen Langform referenziert.% + \IndexOption{ref~=\PValue{parlong}}% + }% + \entry{\PValue{parnumeric}, \PValue{numericpar}, \PValue{ParN}}{% + Der Absatz wird in der rein nummerischen Form referenziert.% + \IndexOption{ref~=\PValue{parnumeric}}% + }% + \entry{\PValue{paroff}, \PValue{nopar}}{% + Der Absatz wird nicht mit referenziert. Es ist zu beachten, dass dadurch + \Macro{refPar} ein leeres Ergebnis erzeugt!% + \IndexOption{ref~=\PValue{paroff}}% + }% + \entry{\PValue{parshort}, \PValue{shortpar}, \PValue{ParS}}{% + Der Absatz wird in der textuellen Kurzform referenziert.% + \IndexOption{ref~=\PValue{parshort}}% + }% + \entry{\PValue{sentencelong}, \PValue{longsentence}, \PValue{SentenceL}}{% + Der Satz wird in der textuellen Langform referenziert.% + \IndexOption{ref~=\PValue{parlong}}% + }% + \entry{\PValue{sentencenumeric}, \PValue{numericsentence}, + \PValue{SentenceN}}{% + Der Satz wird in der rein nummerischen Form referenziert.% + \IndexOption{ref~=\PValue{sentencenumeric}}% + }% + \entry{\PValue{sentenceoff}, \PValue{nosentence}}{% + Der Satz wird nicht mit referenziert. Es ist zu beachten, dass dadurch + von \Macro{refSentence} ein leeres Ergebnis erzeugt wird!% + \IndexOption{ref~=\PValue{sentenceoff}}% + }% + \entry{\PValue{sentenceshort}, \PValue{shortsentence}, \PValue{SentenceS}}{% + Der Satz wird in der textuellen Kurzform referenziert.% + \IndexOption{ref~=\PValue{sentenceshort}}% + }% + \entry{\PValue{short}}{% + Die Einstellungen \PValue{parshort} und \PValue{sentenceshort} werden + kombiniert.% + \IndexOption{ref~=\PValue{short}}% + }% +\end{desctabular} +\end{table} +\EndIndex{Option}{ref~=\PName{Einstellung}}% + +\begin{Example} + Angenommen Sie wollen, dass auf Absätze immer in der Form »Absatz 1 in + Paragraph 1« verwiesen wird. Da es hierfür keine vordefinierte Anweisung + gibt, müssen Sie sich Ihre eigene Definition aus den vorhanden Möglichkeiten + zusammen bauen. Dies können Sie mit% +\begin{lstcode} + \newcommand*{\refParM}[1]{% + Absatz~\refParN[arabic]{#1} + in Paragraph~\refClauseN{#1}% + } +\end{lstcode} + sehr einfach erreichen. Die so neu definierte Anweisung ist genau wie + \Macro{refParL} zu verwenden.% +\end{Example}% + +Beispiele für die Ergebnisse der nicht konfigurierbaren, grundlegenden +Anweisungen finden sich in \autoref{tab:scrjura.refexamples}. +% +\begin{table} + \KOMAoptions{captions=topbeside}% + \setcapindent{0pt}% + \begin{captionbeside}{Beispielausgaben der von Option \Option{ref} + unabhängigen Anweisungen für Querverweise}[l] + \begin{tabular}[t]{ll} + \toprule + Anweisung & Beispielausgabe \\ + \midrule + \Macro{refL}\Parameter{Label} & § 1 Absatz 1 Satz 1 \\ + \Macro{refS}\Parameter{Label} & § 1 Abs. 1 S. 1 \\ + \Macro{refN}\Parameter{Label} & § 1 I 1. \\ + \Macro{refClause}\Parameter{Label} & § 1 \\ + \Macro{refClauseN}\Parameter{Label} & 1 \\ + \Macro{refParL}\Parameter{Label} & Absatz 1 \\ + \Macro{refParS}\Parameter{Label} & Abs. 1 \\ + \Macro{refParN}\Parameter{Label} & I \\ + \Macro{refParN}\POParameter{arabic}\Parameter{Label} & 1 \\ + \Macro{refParN}\POParameter{roman}\Parameter{Label} & i \\ + \Macro{refSentenceL}\Parameter{Label} & Satz 1 \\ + \Macro{refSentenceS}\Parameter{Label} & S. 1 \\ + \Macro{refSentenceN}\Parameter{Label} & 1. \\ + \bottomrule + \end{tabular} + \end{captionbeside} + \label{tab:scrjura.refexamples} +\end{table} + +\section{Zusätzliche Vertragsumgebungen} +\label{sec:scrjura.newenv} + +Einer der Anwender setzt mit \Package{scrjura} keine Verträge oder Kommentare +zu einzelnen Gesetzen, sondern Werke, in denen unterschiedliche Arten von +Gesetzen behandelt werden. Es ist daher erforderliche, dass ein Paragraph +nicht immer mit demselben Präfix »\S« versehen wird, sondern beispielsweise +als »Art.« oder »GG« oder was auch immer bezeichnet wird. Darüber hinaus +wird eine unabhängige Zählung der unterschiedlichen Paragraphen benötigt. + +\begin{Declaration} + \Macro{DeclareNewJuraEnvironment}\Parameter{Name}\OParameter{Optionen}% + \Parameter{Start-Anweisungen}\Parameter{End-Anweisungen} +\end{Declaration} +\BeginIndex{Cmd}{DeclareNewJuraEnvironment}% +Über\ChangedAt{v0.9}{\Package{scrjura}} diese Anweisung können weitere, +voneinander unabhängige Umgebungen für Vertrags- oder Gesetzestexte deklariert +werden. Das Argument \PName{Name} ist dabei der Name der neuen +Umgebung. \PName{Start-Anweisungen} sind Anweisungen, die immer am Anfang der +Umgebung ausgeführt werden, ganz als ob man sie jedes Mal unmittelbar hinter +\Macro{begin}\Parameter{Name} einfügen würde. Entsprechend werden +\PName{End-Anwesiungen} immer am Ende der Umgebung ausgeführt, ganz als ob man +sie jedes Mal unmittelbar vor \Macro{end}\Parameter{Name} einfügen würde. Ohne +\PName{Optionen} entspricht die neue Umgebung \PName{Name} einer +\Environment{contract}-Umgebung mit eigenen Zählern. Es besteht jedoch die +Möglichkeit über eine mit Komma separierte Liste an \PName{Optionen} darauf +Einfluss zu nehmen. Derzeit werden folgende \PName{Optionen} unterstützt: +\begin{description} +\item[\KOption{Clause}\PName{Anweisung}:] Legt fest, auf welche + \PName{Anweisung} innerhalb der Umgebung die Anweisung \Macro{Clause} + abgebildet werden soll. Die \PName{Anweisung} sollte wie die für + \Environment{contract} dokumentierte Anweisung genau ein Argument + erwarten. Für eine korrekte Anwendung dieser Option sind erweiterte + Kenntnisse über die interne Funktion von \Package{scrjura} + notwendig. Außerdem können sich die Anforderungen an die \PName{Anweisung} + von Version zu Version noch ändern. Daher wird derzeit empfohlen, die Option + nicht zu verwenden! +\item[\KOption{SubClause}\PName{Anweisung}:] Siehe Option \Option{Clause}, + allerdings für \Macro{SubClause} statt \Macro{Clause}. +\item[\KOption{Sentence}\PName{Anweisung}:] Legt fest, auf welche + \PName{Anweisung} innerhalb der Umgebung die Anweisung \Macro{Sentence} + abgebildet werden soll. Die \Macro{Anweisung} sollte kein Argument + besitzen. Normalerweise sollte sie den Zähler + \Counter{sentence}\IndexCounter{sentence} mit + \Macro{refstepcounter}\IndexCmd{refstepcounter} erhöhen und dann in + geeigneter Form ausgeben. Dabei ist besonders darauf zu achten, dass keine + unerwünschten Leerzeichen eingebaut werden! +\item[\KOption{ClauseNumberFormat}\PName{Anweisung}:] Legt fest, auf welche + Weise die Paragraphen"=Nummern dieser Umgebung bei der Ausgabe formatiert + werden. Es wird eine Anweisung mit genau einem Argument erwartet, der Nummer + des Paragraphen. Falls diese Nummer das letzte Argument einer Kette von + Anweisungen ist, so kann diese Kette an Anweisungen auch direkt angegeben + werden. +\end{description} +\begin{Example} + Um beispielsweise die in der Einleitung zu diesem Abschnitt erwähnte + Umgebung für Artikel zu definieren, genügt: +\begin{lstcode} + \DeclareNewJuraEnvironment{Artikel}[ClauseNumberFormat=Art.]{}{} +\end{lstcode} + Sollen die Artikel unter Verwendung einer \KOMAScript-Klasse mit + Absatzabstand statt Absatzeinzug gesetzt werden, kann +\begin{lstcode} + \DeclareNewJuraEnvironment{Artikel}[ClauseNumberFormat=Art.~] + {\KOMAoptions{parskip}}{} +\end{lstcode} + verwendet werden. Natürlich wird dann auch bei der Referenzierung + automatisch »Art.« an Stelle von »\S« vorangestellt.% +\end{Example}% +\EndIndex{Cmd}{DeclareNewJuraEnvironment}% + + +\section{Unterstützung verschiedener Sprachen} +\label{sec:scrjura.babel} + +Das Paket \Package{scrjura} wurde in Zusammenarbeit mit einem Anwalt für +Deutsches Recht entwickelt. Daher unterstützte zunächst auch nur die Sprachen +\PValue{german}, \PValue{ngerman}, \PValue{austrian} und +\PValue{naustrian}. Das Paket wurde aber so entworfen, dass es mit üblichen +Sprachpaketen wie +\Package{babel}\important{\Package{babel}}\IndexPackage{babel} zusammen +arbeitet. Anwender können solche Anpassungen einfach mit +\Macro{providecaptionname} (siehe \autoref{sec:scrbase.languageSupport}, +\autopageref{desc:scrbase.cmd.providecaptionname}) vornehmen. Sollten Sie über +gesicherte Informationen zu den im juristischen Umfeld gebräuchlichen +Begriffen in anderen Sprachen verfügen, würde sich der Autor über +entsprechende Rückmeldungen freuen. Auf diesem Weg ist inzwischen auch +Unterstützung für \PValue{english}, \PValue{american}, \PValue{british}, +\PValue{canadian}, \PValue{USenglish} und \PValue{UKenglish} hinzu gekommen. + +\begin{Declaration} + \Macro{parname}\\ + \Macro{parshortname}\\ + \Macro{sentencename}\\ + \Macro{sentenceshortname} +\end{Declaration} +\BeginIndex{Cmd}{parname}% +\BeginIndex{Cmd}{parshortname}% +\BeginIndex{Cmd}{sentencename}% +\BeginIndex{Cmd}{sentenceshortname}% +Dies sind die sprachabhängigen Bezeichnungen, die von \Package{scrjura} +verwendet werden. Die Bedeutung und die im Deutschen vordefinierten Werte sind +\autoref{tab:scrjura.captionnames} zu entnehmen. Dabei nimmt \Package{scrjura} +die entsprechenden Definitionen innerhalb von +\Macro{begin}\PParameter{document} nur vor, wenn nicht bereits andere Vorgaben +getroffen wurden. Wird \Package{scrjura} mit einer nicht unterstützten Sprache +verwendet, so wird eine entsprechende Fehlermeldung ausgegeben.% +% +\begin{table} + \KOMAoptions{captions=topbeside}% + \setcapindent{0pt}% + \begin{captionbeside} + [{% + Bedeutungen und Voreinstellungen sprachabhängiger Begriffe% + }]{% + Bedeutungen und Voreinstellungen für die sprachabhängigen Begriffe + soweit nicht bereits definiert% + } + [l] + \begin{tabular}[t]{lll} + \toprule + Anweisung & Bedeutung & Voreinstellung \\ + \midrule + \Macro{parname} & Langform »Absatz« & Absatz \\ + \Macro{parshortname} & Kurzform »Absatz« & Abs. \\ + \Macro{sentencename} & Langform »Satz« & Satz \\ + \Macro{sentenceshortname} & Kurzform »Satz« & S. \\ + \bottomrule + \end{tabular} + \end{captionbeside} + \label{tab:scrjura.captionnames} +\end{table} +% +\EndIndex{Cmd}{sentenceshortname}% +\EndIndex{Cmd}{sentencename}% +\EndIndex{Cmd}{parshortname} +\EndIndex{Cmd}{parname} + +\section{Ein ausführliches Beispiel} +\label{sec:scrjura.example} + +Erinnern wir uns an den Brief aus \autoref{cha:scrlttr2}, in dem ein +Vereinsmitglied die überfällige Mitgliederversammlung in Erinnerung bringen +wollte. Damit so etwas möglich ist, muss es auch einen Verein mit einer +Satzung geben, die das vorschreibt. Eine Vereinssatzung ist letztlich eine Art +Vertrag und kann mit \Package{scrjura} gesetzt werden. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=1-2}]{scrjuraexample.tex}% +Als Klasse wird \Class{scrartcl} verwendet. Da es bei Satzungen eher üblich +ist, die Absätze mit einem Abstand zu setzen, wird Option +\OptionValue{parskip}{half} verwendet (siehe \autoref{sec:maincls.parmarkup}, +\autopageref{desc:maincls.option.parskip}). + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=4-4}]{scrjuraexample.tex}% +Die Satzung soll in Deutsch verfasst werden. Daher wird das Paket +\Package{babel} mit Option \Option{ngerman} geladen. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange={6-7,9-9}}]{scrjuraexample.tex}% +Es werden einige Standardeinstellungen für die Schrift vorgenommen. Dazu kommt +das Paket \Package{textcomp}, das neben einem brauchbaren Euro-Zeichen für +einige Schriften auch ein verbessertes Paragraphenzeichen bereit stellt. + +\lstinputcode[{moretexcs=SelectInputMappings,xleftmargin=2em,% + belowskip=\dp\strutbox plus 1pt,% + linerange=11-15}]{scrjuraexample.tex}% +Damit Sonderzeichen und Umlaute direkt eingegeben werden können, wird die +Eingabecodierung ermittelt. Alternativ könnte hier auch das Paket +\Package{inputenc} zum Einsatz kommen. + + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=17-17}]{scrjuraexample.tex}% +Später sollen Listen nicht mit arabischen Zahlen, sondern mit Kleinbuchstaben +nummeriert werden. Dies ist beispielsweise mit dem Paket \Package{enumerate} +möglich. + +\lstinputcode[{moretexcs={useshorthands,defineshorthand},% + belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=19-27}]{scrjuraexample.tex}% +Nun ist es Zeit für \Package{scrjura}. Mit Option +\OptionValue{clausemark}{forceboth} wird für Paragraphen das Setzen von +linken und rechten Marken für Kolumnentitel erzwungen. Da andererseits nicht +erwünscht ist, dass \Macro{section} Kolumnentitel erzeugen, wird Seitenstil +\Pagestyle{myheadings} verwendet, der normalerweise keine lebenden +Kolumnentitel aktiviert. + +Es soll später auch ein Inhaltsverzeichnis erstellt werden, in das die +Paragraphen ebenfalls aufgenommen werden. Das wird mit \Option{juratotoc} +erreicht. Später werden wir feststellen, dass die voreingestellte Breite für +die Paragraphennummern im Inhaltsverzeichnis nicht genügt. Daher wird mit +\OptionValue{juraticnumberwidth}{2.5em} für etwas mehr Platz gesorgt. + +Die Definition der Abkürzungen wurde bereits in +\autoref{sec:scrjura.shorthandexample} erklärt. Im Beispiel wurde sie +übernommen, um später die Eingabe zu vereinfachen. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=29-29}]{scrjuraexample.tex}% +Es ist Zeit, das eigentliche Dokument zu beginnen. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=31-35}]{scrjuraexample.tex}% +Wie jedes Dokument hat auch eine Satzung einen Titel. Dieser wird mit den +gewohnten \KOMAScript-Mitteln (siehe \autoref{sec:maincls.titlepage}, ab +\autopageref{sec:maincls.titlepage}) erstellt. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=37-37}]{scrjuraexample.tex}% +Wie bereits erwähnt, soll ein Inhaltsverzeichnis erstellt werden. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=39-43}]{scrjuraexample.tex}% +Präambeln sind in Satzungen nicht ungewöhnlich. Hier wird sie mit +\Macro{addsec} gesetzt, damit sie auch einen Eintrag ins Inhaltsverzeichnis +erhält. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=45-45}]{scrjuraexample.tex}% +Hier wird ein kleiner Trick angewendet. Die einzelnen Artikel der Satzung +sollen nicht mit arabischen Zahlen, sondern mit Großbuchstaben nummeriert +werden -- genau wie dies auch im Anhang eines Artikels mit \Class{scrartcl} +der Fall ist. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=47-49}]{scrjuraexample.tex}% +Mit dem ersten Artikel beginnt auch der Vertrag. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=50-59}]{scrjuraexample.tex}% +Der erste Paragraph erhält neben der Nummer auch einen Titel. Dies wird auch +bei den nachfolgenden Paragraphen so sein. + +Der erste Absatz des Vertrags enthält nichts ungewöhnliches. Da es nicht der +einzige Absatz ist, werden bei der Ausgabe jedem Absatz automatisch +Absatznummern voran gestellt werden. Damit dies auch beim ersten Absatz +geschieht, sind allerdings zwei \LaTeX-Läufe notwendig. Da dies für das +Inhaltsverzeichnis ohnehin der Fall sein wird, stört das aber auch nicht +weiter. + +Im zweiten Absatz stehen zwei Sätze. Hier finden zum ersten Mal die +Abkürzungen \texttt{'S} und +\texttt{'.} Anwendung. Mit der ersten wird lediglich eine Satznummer +erzeugt. Mit der zweiten wird nicht nur ein Punkt, sondern nachfolgend +auch eine Satznummer erzeugt. Beide Sätze des Absatzes sind somit nummeriert. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=60-75}]{scrjuraexample.tex}% +Der zweite Paragraph: Auch dieser enthält wieder mehrere Absätze, die +teilweise auch mehrere Sätze umfassen. Im zweiten Absatz ist darüber hinaus +eine Aufzählung zu finden. Beim letzten Absatz wurde ein Label gesetzt, da auf +diesen später noch verwiesen werden soll. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=77-84}]{scrjuraexample.tex}% +Der dritte Paragraph enthält als Besonderheit einen Querverweis. In diesem +Fall wird in der Langform mit Paragraph, Absatz und Satz referenziert. Soll +der Satz später doch entfallen, so kann dies global durch Setzen der Option +\OptionValue{ref}{nosentence} erreicht werden. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=86-87}]{scrjuraexample.tex}% +Hier gibt es nun einen ersten Spezialfall eines Paragraphen. Dieser Paragraph +war in einer früheren Fassung der Satzung noch enthalten, wurde dann aber +entfernt. Dabei sollen jedoch die nachfolgenden Paragraphen nicht neu +nummeriert werden, sondern ihre alte Nummer behalten. Deshalb wurde die +\Macro{Clause}-Anweisung nicht entfernt, sondern lediglich um die +Eigenschaft \Option{dummy} erweitert. Außerdem kann so auch weiterhin ein +Label für diesen Paragraphen gesetzt werden, obwohl der Paragraph selbst nicht +angezeigt wird. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=88-92}]{scrjuraexample.tex}% +Es wird ein weiterer Artikel begonnen. Damit Probleme mit der +Absatznummerierung ausgeschlossen sind, wird dazu kurzzeitig die +\Environment{contract}-Umgebung unterbrochen. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=93-93}]{scrjuraexample.tex}% +Auch der erste Paragraph im nächsten Artikel wurde gestrichen. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=95-104}]{scrjuraexample.tex}% +Hier haben wir wieder einen echten Paragraphen. Darin wird zum einen auf einen +der gestrichenen Paragraphen verwiesen. Zum anderen wird auch wieder ein Label +gesetzt. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=107-112}]{scrjuraexample.tex}% +Hier haben wir den zweiten Spezialfall eines Paragraphen. In diesem Fall wurde +kein Paragraph gestrichen, sondern ein neuer Paragraph eingefügt, ohne dass +nachfolgend Paragraphen neu nummeriert werden. Dazu wurde \Macro{SubClause} +verwendet. Somit erhält dieser Paragraph die Nummer des vorherigen +Paragraphen, die zur Unterscheidung um ein kleines »a« erweitert wurde. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=114-134}]{scrjuraexample.tex}% +Die übrigen Paragraphen dieses Artikels enthalten nur bereits bekannte +Anweisungen und keine neuen Besonderheiten. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=136-150}]{scrjuraexample.tex}% +Es folgt noch ein weiterer Artikel ohne Besonderheiten. + +\lstinputcode[{belowskip=\dp\strutbox plus 1pt,xleftmargin=2em,% + linerange=152-152}]{scrjuraexample.tex}% +Danach endet das \LaTeX-Dokument, dessen vordere drei Seiten +\autoref{fig:scrjura.example} zeigt.% +% +\begin{figure} + \setcapindent{0pt}% + \iffree{% + {\hfill + \frame{\includegraphics[page=1,width=.482\textwidth,% + height=.49\textheight,keepaspectratio]{scrjuraexample}}\enskip + \frame{\includegraphics[page=2,width=.482\textwidth,% + height=.49\textheight,keepaspectratio]{scrjuraexample}}\par + \smallskip} + \begin{captionbeside}[{% + Beispiel: Die ersten drei Seiten der Beispielsatzung + aus\protect\linebreak + \protect\autoref{sec:scrjura.example}% + }]{% + Die ersten drei Seiten der Beispielsatzung aus + \protect\autoref{sec:scrjura.example}% + }% + [l] + \frame{\includegraphics[page=3,width=.482\textwidth,% + height=.49\textheight,keepaspectratio]{scrjuraexample}}\enskip + \end{captionbeside} + }{% + {\hfill + \frame{\includegraphics[page=1,width=.482\textwidth]{scrjuraexample}}% + \enskip + \frame{\includegraphics[page=2,width=.482\textwidth]{scrjuraexample}}\par + \smallskip} + \begin{captionbeside}[{% + Beispiel: Die ersten drei Seiten der Beispielsatzung + aus\protect\linebreak + \protect\autoref{sec:scrjura.example}% + }]{% + Die ersten drei Seiten der Beispielsatzung aus + \protect\autoref{sec:scrjura.example}% + }% + [l] + \frame{\includegraphics[page=3,width=.482\textwidth]{scrjuraexample}}% + \enskip + \end{captionbeside} + }% + \label{fig:scrjura.example} +\end{figure} + +\section{Entwicklungsstand} +\label{sec:scrjura.draft} + +Obwohl das Paket bereits seit Jahren Teil von \KOMAScript{} und noch länger im +Einsatz bei diversen Juristen ist, hat es noch immer eine Versionsnummer +kleiner 1. Deshalb ist es eigentlich als unfertig zu betrachten. Dafür gibt es +im Wesentlichen drei Ursachen. + +Zum Einen ist das Paket wesentlich allgemeiner entworfen als es derzeit +genutzt wird. So war beispielsweise ursprünglich geplant, neben +\Environment{contract} weitere, ähnliche Umgebungen zu erstellen. Erst später +stellte sich heraus, dass diese eine Umgebung alle wesentlichen Anwendungen +bereits abdeckt. Allerdings hat sich später gezeigt, dass es nützlich wäre, neue +\Environment{contract}-Umgebungen definieren zu können, beispielsweise für +Grundgesetzartikel. Dies ist inzwischen implementiert. + +Zum Anderen ist weder das Zusammenspiel mit vielen anderen Paketen +noch die Funktion der \Environment{contract}-Umgebung mit allen möglichen +\LaTeX-Umgebungen und Einstellungen verschiedener Klassen und Pakete +getestet. Dies liegt nicht zuletzt daran, dass es sich bei \Package{scrjura} +um ein sehr spezielles Paket handelt, das weit außerhalb der täglichen Praxis +des Autors liegt. Damit ist der Autor diesbezüglich in hohem Maße auf +ausführliche Rückmeldungen durch die Anwender angewiesen. + +Aus der kleinen Versionsnummer darf und soll auch abgeleitet werden, dass sich +Dinge in \Package{scrjura} noch ändern können. Zwar ist der Autor bemüht, +dabei die Kompatibilität zu früheren Versionen zu erhalten. Garantiert kann +diese jedoch nicht werden.% % \EndIndex{Package}{scrjura} @@ -72,5 +1195,11 @@ Vollständigkeit noch die Aktualität immer sichergestellt.% %%% mode: flyspell %%% coding: iso-latin-1 %%% ispell-local-dictionary: "de_DE" -%%% TeX-master: "../guide.tex" +%%% TeX-PDF-mode: t +%%% TeX-master: "guide.tex" %%% End: + +% LocalWords: Seitenstil bedarfsweise Ebenennummer Absatznummerierung +% LocalWords: Paragraphenüberschrift Präambeln renewcommand Gesetzestexte +% LocalWords: Grundgesetzartikel Absatzabstand umbrechbaren Wortabstand +% LocalWords: Beispielsatzung diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjuraexample.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjuraexample.tex new file mode 100644 index 00000000000..b9d700eaef5 --- /dev/null +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/scrjuraexample.tex @@ -0,0 +1,152 @@ +\documentclass[fontsize=12pt,pagesize,parskip=half] + {scrartcl} + +\usepackage[ngerman]{babel} + +\usepackage[T1]{fontenc} +\usepackage{lmodern} +\usepackage{charter,helvet} +\usepackage{textcomp} + +\usepackage{selinput} +\SelectInputMappings{ + adieresis={ä}, + germandbls={ß}, +} + +\usepackage{enumerate} + +\usepackage[clausemark=forceboth, + juratotoc, + juratocnumberwidth=2.5em] + {scrjura} +\useshorthands{'} +\defineshorthand{'S}{\Sentence\ignorespaces} +\defineshorthand{'.}{. \Sentence\ignorespaces} + +\pagestyle{myheadings} + +\begin{document} + +\subject{Satzung} +\title{VfVmai} +\subtitle{Verein für Vereinsmaierei mit ai n.e.V.} +\date{11.\,11.\,2011} +\maketitle + +\tableofcontents + +\addsec{Präambel} + +Die Vereinslandschaft in Deutschland ist vielfältig. +Doch leider mussten wir feststellen, dass es dabei oft +am ernsthaften Umgang mit der Ernsthaftigkeit krankt. + +\appendix + +\section{Allgemeines} + +\begin{contract} +\Clause{title={Name, Rechtsform, Sitz des Vereins}} + +Der Verein führt den Namen »Verein für Vereinsmaierei mit +ai n.e.V.« und ist in keinem Vereinsregister eingetragen. + +'S Der Verein ist ein nichtwirtschaftlicher, unnützer +Verein'. Er hat keinen Sitz und muss daher stehen. + +Geschäftsjahr ist vom 31.~März bis zum 1.~April. + +\Clause{title={Zweck des Vereins}} + +'S Der Verein ist zwar sinnlos, aber nicht zwecklos'. +Vielmehr soll er den ernsthaften Umgang mit der +Ernsthaftigkeit auf eine gesunde Basis stellen. + +Zu diesem Zweck kann der Verein +\begin{enumerate}[\qquad a)] +\item in der Nase bohren, +\item Nüsse knacken, +\item am Daumen lutschen. +\end{enumerate} + +Der Verein ist selbstsüchtig und steht dazu. + +Der Verein verfügt über keinerlei Mittel.\label{a:mittel} + +\Clause{title={Vereinsämter}} + +Die Vereinsämter sind Ehrenämter. + +'S Würde der Verein über Mittel verfügen +(siehe \ref{a:mittel}), so könnte er einen +hauptamtlichen Geschäftsführer bestellen'. Ohne +die notwendigen Mittel ist dies nicht möglich. + +\Clause{title={Vereinsmaier},dummy} +\label{p.maier} +\end{contract} + +\section{Mitgliedschaft} + +\begin{contract} +\Clause{title={Mitgliedsarten},dummy} + +\Clause{title={Erwerb der Mitgliedschaft}} + +Die Mitgliedschaft kann jeder zu einem angemessenen +Preis von einem der in \refClause{p.maier} +genannten Vereinsmaier erwerben.\label{a.preis} + +'S Zum Erwerb der Mitgliedschaft ist ein formloser +Antrag erforderlich'. Dieser Antrag ist in grüner +Tinte auf rosa Papier einzureichen. + +Die Mitgliedschaft kann nicht abgelehnt werden. + +\SubClause{title={Ergänzung zu vorstehendem + Paragraphen}} + +'S Mit Abschaffung von \refClause{p.maier} verliert +\ref{a.preis} seine Umsetzbarkeit'. Mitgliedschaften +können ersatzweise vererbt werden. + +\Clause{title={Ende der Mitgliedschaft}} + +'S Die Mitgliedschaft endet mit dem Leben'. Bei nicht +lebenden Mitgliedern endet die Mitgliedschaft nicht. + +\Clause{title={Mitgliederversammlung}} + +Zweimal jährlich findet eine Mitgliederversammlung statt. + +Der Abstand zwischen zwei Mitgliederversammlungen +beträgt höchstens 6~Monate, 1~Woche und 2~Tage. + +Frühestens 6~Monate nach der letzten Mitgliederversammlung +hat die Einladung zur nächsten Mitgliederversammlung zu +erfolgen. + +\SubClause{title={Ergänzung zur Mitgliederversammlung}} + +Die Mitgliederversammlung darf frühstens 2~Wochen nach +letztem Eingang der Einladung abgehalten werden. +\end{contract} + +\section{Gültigkeit} + +\begin{contract} +\Clause{title={In Kraft treten}} + +Diese Satzung tritt am 11.\,11.\,2011 um 11:11~Uhr +in Kraft. + +'S Sollten irgendwelche Bestimmungen dieser Satzung im +Widerspruch zu einander stehen, tritt die Satzung am +11.\,11.\,2011 um 11:11~Uhr und 11~Sekunden wieder +außer Kraft'. Der Verein ist in diesem Fall als +aufgelöst zu betrachten. + +\end{contract} + +\end{document} 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 a21fc09a37b..f422ef4db91 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-09-15 12:55:19 +0200 (Tue, 15 Sep 2015) $ + [$Date: 2015-11-06 10:16:26 +0100 (Fri, 06 Nov 2015) $ KOMA-Script guide (chapter:scrlayer)] \chapter[{Definition von Ebenen und Seitenstilen mit \Package{scrlayer}}] @@ -746,7 +746,14 @@ von Koordinaten oder anderen von \Length{unitlength} abhängigen Werten einer \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.% +\Package{eso-pic} definiert ist. + +Es sei an dieser Stelle darauf hingewiesen, dass man bei Verwendung von Paket +\Package{picture}\IndexPackage{picture}\textnote{\Package{picture}} (siehe +\cite{package:picture}) die Anweisung \Macro{LenToUnit} in der Regel nicht +mehr benötigt. Das Paket erweitert die \Environment{picture}-Umgebung und +deren Anweisung so, dass man für Koordinaten auch direkt \LaTeX-Längen +verwenden kann.% \EndIndex{Cmd}{LenToUnit}% \begin{Declaration} 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 5baf9bdeb70..8572b667ee8 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-08-25 11:11:53 +0200 (Tue, 25 Aug 2015) $ + [$Date: 2015-12-17 11:57:09 +0100 (Thu, 17 Dec 2015) $ KOMA-Script guide (chapter: scrlttr2)] \chapter{Die Briefklasse \Class{scrlttr2}} @@ -2664,7 +2664,7 @@ 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} +\autoref{sec:scrlttr2-experts.pagestyleatscrletter} %, \autopageref{desc:scrlttr2-experts.pagestyle.letter} für weitere Informationen zu den Besonderheiten der Seitenstile von Paket \Package{scrletter}. diff --git a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/tocbasic.tex b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/tocbasic.tex index ba6a32bbeb9..a71fe1e3483 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/ngerman/tocbasic.tex +++ b/Master/texmf-dist/source/latex/koma-script/doc/ngerman/tocbasic.tex @@ -1,6 +1,6 @@ % ====================================================================== % tocbasic.tex -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % tocbasic.tex -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -46,7 +46,7 @@ % ====================================================================== \KOMAProvidesFile{tocbasic.tex} - [$Date: 2015-03-31 11:10:59 +0200 (Tue, 31 Mar 2015) $ + [$Date: 2016-05-10 14:02:52 +0200 (Tue, 10 May 2016) $ KOMA-Script guide (package tocbasic)] \chapter{Verzeichnisse verwalten mit Hilfe von \Package{tocbasic}} @@ -695,28 +695,6 @@ getrennte Aneinanderreihung von \PName{Eigenschaften}. Das Paket \OptionValue{listof}{leveldown}\important{\OptionValue{listof}{leveldown}}% \IndexOption{listof~=\PValue{leveldown}} für alle Dateierweiterungen des Besitzers \PValue{float}. -\item[\PValue{numberline}] \ChangedAt{v3.12}{\Package{tocbasic}}% - bedeutet, dass auch all diejenigen Einträge, die mit Hilfe der Anweisung - \Macro{addxcontentsline} oder der Anweisung - \Macro{addxcontentslinetoceachtocfile} in das Verzeichnis geschrieben werden - und bei denen das optionale Argument für die Nummer fehlt oder leer ist, mit - einer (leeren) \Macro{numberline}-Anweisung versehen werden. Das führt in - der Regel dazu, dass diese Einträge nicht linksbündig mit der Nummer, - sondern mit dem Text der nummerierten Einträge gleicher Ebene gesetzt - werden. Die \KOMAScript-Klassen setzen diese Eigenschaft bei Verwendung der - Option \OptionValue{listof}{numberline}% - \important{\OptionValue{listof}{numberline}}% - \IndexOption{listof~=\PValue{numberline}} für die Dateierweiterungen des - Besitzers \PValue{float} und bei Verwendung der Option - \OptionValue{toc}{numberline}\important{\OptionValue{toc}{numberline}}% - \IndexOption{toc~=\PValue{numberline}} für die Dateierweiterung - \PValue{toc}. Entsprechend wird die Eigenschaft bei Verwendung von Option - \OptionValue{listof}{nonumberline}% - \important{\OptionValue{listof}{nonumberline}}% - \IndexOption{listof~=\PValue{nonumberline}} oder - \OptionValue{toc}{nonumberline}% - \important{\OptionValue{toc}{nonumberline}}% - \IndexOption{toc~=\PValue{nonumberline}} wieder zurückgesetzt. \item[\PValue{nobabel}] bedeutet, dass die normalerweise automatisch verwendete Erweiterung für die Sprachumschaltung mit \Package{babel}\IndexPackage{babel} für diese Dateierweiterung nicht @@ -731,9 +709,9 @@ getrennte Aneinanderreihung von \PName{Eigenschaften}. Das Paket dass vor dem Abschalten des Absatzabstandes für die Verzeichnisse ein letztes Mal ein expliziter Absatzabstand eingefügt wird. Dies führt in der Regel dazu, dass bei Dokumenten mit Absatzabstand der Abstand zwischen - Überschrift und ersten Verzeichniseintrag kleiner wird als zwischen - Überschriften und normalem Text. Normalerweise erhält man daher ohne diese - Eigenschaft eine einheitlichere Formatierung. + Überschrift und ersten Verzeichniseintrag\index{Verzeichnis>Eintrag} kleiner + wird als zwischen Überschriften und normalem Text. Normalerweise erhält man + daher ohne diese Eigenschaft eine einheitlichere Formatierung. \item[\PValue{noprotrusion}] verhindert\ChangedAt{v3.10}{\Package{tocbasic}} das Abschalten des optischen Randausgleichs in den Verzeichnissen. Optischer Randausgleich wird standardmäßig abgeschaltet, wenn das Paket @@ -754,7 +732,35 @@ getrennte Aneinanderreihung von \PName{Eigenschaften}. Das Paket \OptionValue{listof}{numbered}\important{\OptionValue{listof}{numbered}}% \IndexOption{listof~=\PValue{numbered}} für alle Dateierweiterungen des Besitzers \Package{float}. -%% NEW FEATURE 3.01 +\item[\PValue{numberline}] \ChangedAt{v3.12}{\Package{tocbasic}}% + bedeutet, dass auch all diejenigen Einträge, die mit Hilfe der Anweisung + \Macro{addxcontentsline} oder der Anweisung + \Macro{addxcontentslinetoceachtocfile} in das Verzeichnis geschrieben werden + und bei denen das optionale Argument für die Nummer fehlt oder leer ist, mit + einer (leeren) \Macro{numberline}-Anweisung versehen werden. Das führt in + der Regel dazu, dass diese Einträge nicht linksbündig mit der Nummer, + sondern mit dem Text der nummerierten Einträge gleicher Ebene gesetzt + werden. Bei\ChangedAt{v3.20}{\Package{tocbasic}} Verwendung des + Verzeichniseintragsstils \PValue{tocline} kann die Eigenschaft weitere + Auswirkungen haben. Siehe dazu die Stil-Eigenschaften + \Option{breakafternumber} und \Option{entrynumberformat} in + \autoref{tab:tocbasic.tocstyle.attributes} ab + \autopageref{tab:tocbasic.tocstyle.attributes}. + + Die \KOMAScript-Klassen setzen diese Eigenschaft bei Verwendung der + Option \OptionValue{listof}{numberline}% + \important{\OptionValue{listof}{numberline}}% + \IndexOption{listof~=\PValue{numberline}} für die Dateierweiterungen des + Besitzers \PValue{float} und bei Verwendung der Option + \OptionValue{toc}{numberline}\important{\OptionValue{toc}{numberline}}% + \IndexOption{toc~=\PValue{numberline}} für die Dateierweiterung + \PValue{toc}. Entsprechend wird die Eigenschaft bei Verwendung von Option + \OptionValue{listof}{nonumberline}% + \important{\OptionValue{listof}{nonumberline}}% + \IndexOption{listof~=\PValue{nonumberline}} oder + \OptionValue{toc}{nonumberline}% + \important{\OptionValue{toc}{nonumberline}}% + \IndexOption{toc~=\PValue{nonumberline}} wieder zurückgesetzt. \item[\PValue{onecolumn}] \leavevmode\ChangedAt{v3.01}{\Package{tocbasic}}% bedeutet, dass für dieses Verzeichnis automatisch der \LaTeX-interne Einspaltenmodus mit \Macro{onecolumn}\IndexCmd{onecolumn} verwendet @@ -770,7 +776,6 @@ getrennte Aneinanderreihung von \PName{Eigenschaften}. Das Paket gesetzt. Der Mehrspaltenmodus des \Package{multicol}-Pakets\IndexPackage{multicol} ist von der Eigenschaft ausdrücklich nicht betroffen. -%% END NEW FEATURE 3.01 \item[\PValue{totoc}] bedeutet, dass der Titel des Verzeichnisses in das Inhaltsverzeichnis aufgenommen werden soll. Diese Eigenschaft wird von der internen Überschriftenanweisung ausgewertet. Wird\textnote{Achtung!} mit @@ -808,7 +813,6 @@ Die \KOMAScript-Klassen kennen eine weitere Eigenschaft: \begin{lstcode} \setuptoc{loa}{chapteratlist} \end{lstcode} -%% NEW FEATURE 3.01 Wollen Sie außerdem, dass bei Klassen, die \Macro{chapter} als oberste Gliederungsebene verwenden, das Verzeichnis automatisch einspaltig gesetzt wird, so verwenden Sie zusätzlich @@ -821,7 +825,6 @@ Die \KOMAScript-Klassen kennen eine weitere Eigenschaft: setzt das Paket \Package{scrbase} voraus (siehe \autoref{sec:scrbase.if}, \autopageref{desc:scrbase.cmd.ifundefinedorrelax}). -%% END NEW FEATURE 3.01 Sollte\textnote{Tipp!} Ihr Paket mit einer anderen Klasse verwendet werden, so schadet es trotzdem nicht, dass Sie diese Eigenschaften setzen, im @@ -852,6 +855,957 @@ beschriebenen Eigenschaften \PValue{totoc}, \PValue{numbered} oder \EndIndex{Cmd}{iftocfeature}% +\section{Konfiguration von Verzeichniseinträgen} +\seclabel{tocstyle} +\BeginIndex{}{Verzeichnis>Eintrag} + +Neben\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} den eigentlichen +Verzeichnissen und den zugehörigen Hilfsdateien kann man mit Paket +\Package{tocbasic} ab Version~3.20 auch Einfluss auf die Verzeichniseinträge +nehmen. Dazu können neue Stile definiert werden. Es stehen aber auch mehrere +vordefinierte Stile zur Verfügung. Mittelfristig wird \Package{tocbasic} das +nie offiziell gewordene \KOMAScript-Paket \Package{tocstyle} ablösen. Die +\KOMAScript-Klassen selbst bauen seit Version~3.20 ebenfalls vollständig auf +die von \Package{tocbasic} bereitgestellten Stile für Verzeichniseinträge. + +\begin{Declaration} + \Macro{numberline}\Parameter{Gliederungsnummer}\\ + \Macro{usetocbasicnumberline}\OParameter{Code} +\end{Declaration} +\BeginIndex{Cmd}{numberline}% +\BeginIndex{Cmd}{usetocbasicnumberline}% +Zwar\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} definiert bereits der +\LaTeX-Kern eine Anweisung \Macro{numberline}, diese ist allerdings für die +Anforderungen von \Package{tocbasic} nicht ausreichend. Deshalb definiert es +eigene Anweisungen und setzt \Macro{numberline} bei Bedarf mit Hilfe von +\Macro{usetocbasicnumberline} für die einzelnen Verzeichniseinträge +entsprechend. Eine Umdefinierung von \Macro{numberline} ist daher bei +Verwendung von \Package{tocbasic} oftmals wirkungslos und führt teilweise auch +zu Warnungen. + +Man kann auch die Definition von \Package{tobasic} generell nutzen, indem man +bereits in der Dokumentpräambel \Macro{usetocbasicnumberline} aufruft. Die +Anweisung versucht zunächst zu ermitteln, ob in der aktuellen Definition +wichtige interne Anweisungen von \Package{tocbasic} verwendet werden. Ist dies +nicht der Fall wird \Macro{numberline} entsprechend umdefiniert und zusätzlich +\PName{Code} ausgeführt. Ist kein optionales Arguments angegeben, wird +stattdessen via \Macro{PackageInfo} eine Meldung über die erfolgte +Umdefinierung ausgegeben. Diese Meldung kann man einfach unterdrücken, indem +ein leeres optionales Argument angegeben wird. + +Es\textnote{Achtung!} ist zu beachten, dass \Macro{usetocbasicnumberline} den +internen Schalter \Macro{@tempswa} global verändern kann!% +\EndIndex{Cmd}{usetocbasicnumberline}% +\EndIndex{Cmd}{numberline}% + + +\begin{Declaration} + \Macro{DeclareTOCStyleEntry}\OParameter{Optionenliste}\Parameter{Stil}% + \Parameter{Eintragsebene} +\end{Declaration} +\BeginIndex{Cmd}{DeclareTOCStyleEntry}% +Über\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} diese Anweisungen werden +die Verzeichniseinträge für eine bestimmte \PName{Eintragsebene} deklariert +oder konfiguriert. Dabei ist die \PName{Eintragsebene} der Name der jeweiligen +Eintragsebene, beispielsweise \PValue{section} für einen zur gleichnamigen +Gliederungsebene gehörenden Eintrag ins Inhaltsverzeichnis oder +\PValue{figure} für den Eintrag einer Abbildung ins +Abbildungsverzeichnis. Jeder \PName{Eintragsebene} wird ein bestimmter +\PName{Stil} zugeordnet, der zum Zeitpunkt der Deklaration bereits definiert +sein muss. Über die \PName{Optionenliste} können die verschiedenen, meist vom +\PName{Stil} abhängenden Eigenschaften des Eintrags festgelegt werden. + +Derzeit werden von \Package{tocbasic} die folgenden Eintragsstile definiert: +\begin{description} +\item[\PValue{default}] ist in der Voreinstellung ein Klon von Stil + \PValue{dottedtocline}. Klassenautoren, die \Package{tocbasic} verwenden, + wird empfohlen, diesen Stil mit Hilfe von \Macro{CloneTOCStyle} auf den + Standardverzeichniseintragsstil der Klasse zu ändern. Bei den + \KOMAScript-Klassen wird \PValue{default} beispielsweise zu einem Klon von + Stil \PValue{tocline}. +\item[\PValue{dottedtocline}] entspricht dem Stil, der von den Standardklassen + \Class{book} und \Class{report} für die Inhaltsverzeichniseinträge der + Ebenen \PValue{section} bis \PValue{subparagraph} und bei allen + Standardklassen für die Einträge in das Abbildungs- und das + Tabellenverzeichnis bekannt ist. Er kennt nur die Eigenschaften + \PValue{level}, \PValue{indent} und \PValue{numwidth}. Die Einträge werden + um \PValue{indent} von links eingezogen in der aktuellen Schrift + ausgegeben. \Macro{numberline} wird nicht umdefiniert. Die Breite der Nummer + wird von \PValue{numwidth} bestimmt. Bei mehrzeiligen Einträgen wird der + Einzug ab der zweiten Zeile um \PValue{numwidth} erhöht. Die Seitenzahl wird + mit \Macro{normalfont} ausgegeben. Eintragstext und Seitenzahl werden durch + eine punktierte Linie verbunden. \autoref{fig:tocbasic.dottedtocline} + illustriert die Eigenschaften des Stils. + \begin{figure} + \centering + \resizebox{.8\linewidth}{!}{% + \begin{tikzpicture} + \draw[color=lightgray] (0,2\baselineskip) -- (0,-2.5\baselineskip); + \draw[color=lightgray] (\linewidth,2\baselineskip) -- + (\linewidth,-2.5\baselineskip); + \node (dottedtocline) at (0,0) [anchor=west,inner sep=0,outer sep=0] + {% + \hspace*{7em}% + \parbox[t]{\dimexpr\linewidth-9.55em}{% + \setlength{\parindent}{-3.2em}% + \addtolength{\parfillskip}{-2.55em}% + \makebox[3.2em][l]{1.1.10}% + Überschrift im Verzeichniseintragsstil \PValue{dottedtocline} mit + mehr als einer Zeile% + \leaders\hbox{$\csname m@th\endcsname + \mkern 4.5mu\hbox{.}\mkern 4.5mu$}\hfill\nobreak + \makebox[1.55em][r]{12}% + }% + }; + \draw[|-|,color=gray,overlay] (0,0) -- + node [anchor=north,font=\small] { + \PValue{indent} + } + (3.8em,0); + \draw[|-|,color=gray,overlay] (3.8em,\baselineskip) -- + node [anchor=south,font=\small] { + \PValue{numwidth} + } + (7em,\baselineskip); + \draw[|-|,color=gray,overlay] (\linewidth,\ht\strutbox) -- + node [anchor=south,font=\small] { + \Macro{@tocrmarg} + } + (\linewidth-2.55em,\ht\strutbox); + \draw[|-|,color=gray,overlay] (\linewidth,-\baselineskip) -- + node [anchor=north,font=\small] { + \Macro{@pnumwidth} + } + (\linewidth-1.55em,-\baselineskip); + \end{tikzpicture}% + } + \caption{Illustration einiger Attribute des Verzeichniseintragsstils + \PValue{dottedtocline}} + \label{fig:tocbasic.dottedtocline} + \end{figure} +\item[\PValue{gobble}] ist der denkbar einfachste Stil. Einträge in diesem + Stil werden unabhängig von allen Einstellungen für + \Counter{tocdepth}\IndexCounter{tocdepth}\important{\Counter{tocdepth}} + nicht ausgegeben sondern sozusagen verschluckt. Dennoch verfügt er über die + Standardeigenschaft \PValue{level}, die jedoch nie ausgewertet wird. +\item[\PValue{largetocline}] entspricht dem Stil, der von den Standardklassen + für die Ebene \PValue{part} bekannt ist. Er kennt nur die Eigenschaften + \PName{level} und \PName{indent}. Letzteres ist gleichsam eine Abweichung + von den Standardklassen, die selbst keinen Einzug der \PValue{part}-Einträge + unterstützen. + + Vor dem Eintrag wird ein Seitenumbruch erleichtert. Die Einträge werden um + \PValue{indent} von links eingezogen in \Macro{large}\Macro{bfseries} + ausgegeben. Sollte \Macro{numberline} verwendet werden, so ist die + Nummernbreite fest auf 3\Unit{em} eingestellt. \Macro{numberline} wird nicht + umdefiniert. Die Standardklassen verwenden für \PName{part}-Einträge kein + \Macro{numberline}. Der Wert hat bei mehrzeiligen Einträgen auch keine + Auswirkung auf den Einzug ab der zweiten + Zeile. + + \autoref{fig:tocbasic.largetocline} illustriert die Eigenschaften des + Stils. Dabei wird auch auffällig, dass der Stil einige Ungereimtheiten der + Standardklassen übernommen hat, beispielsweise der fehlende Einzug ab der + zweiten Zeile bei mehrzeiligen Einträgen und zwei unterschiedliche Werte für + \Macro{@pnumwidth}, die aus einer Abhängigkeit von der Schriftgröße + resultieren. Daraus resultiert auch der Umstand, dass im Extremfall der Text + der Überschrift der Seitenzahl zu nah kommen kann. Es ist zu beachten, dass + die in der Abbildung gezeigte Breite der Gliederungsnummer nur dann + Verwendung findet, wenn auch tatsächlich \Macro{numberline} verwendet + wird. Die Standardklassen setzen hingegen einen festen Abstand von + 1\Unit{em} nach der Nummer. + \begin{figure} + \centering + \resizebox{.8\linewidth}{!}{% + \begin{tikzpicture} + \draw[color=lightgray] (0,2\baselineskip) -- (0,-2.5\baselineskip); + \draw[color=lightgray] (\linewidth,2\baselineskip) -- + (\linewidth,-2.5\baselineskip); + \node (largetocline) at (0,0) [anchor=west,inner sep=0,outer sep=0] {% + \parbox[t]{\dimexpr \linewidth-1.55em\relax}{% + \makebox[3em][l]{\large\bfseries I}% + \large\bfseries + Überschrift im Verzeichniseintragsstil \PValue{largetocline} mit + mehr als einer Zeile\hfill + \makebox[0pt][l]{\normalsize\normalfont + \makebox[1.55em][r]{\large\bfseries 1}}% + }% + }; + \draw[|-|,color=gray] (0,\baselineskip) -- + node [anchor=south] { 3\,em } + (3em,\baselineskip); + \draw[|-|,color=gray,overlay] (\linewidth,\ht\strutbox) -- + node [anchor=south] { \Macro{@pnumwidth} } + (\linewidth-1.55em,\ht\strutbox); + \large\bfseries + \draw[|-|,color=gray,overlay] (\linewidth,-\baselineskip) -- + node [anchor=north,font=\normalfont\normalsize] { + \Macro{large}\Macro{@pnumwidth} + } + (\linewidth-1.55em,-\baselineskip); + \end{tikzpicture}% + } + \caption{Illustration einiger Attribute des Verzeichniseintragsstils + \PValue{largetocline}} + \label{fig:tocbasic.largetocline} + \end{figure} +\item[\PValue{tocline}] ist ein flexibler Stil, der in der Voreinstellung für + alle Einträge der \KOMAScript-Klassen verwendet wird. Entsprechend + definieren diese Klassen auch die Klone \PValue{part}, \PValue{chapter} und + \PValue{section} beziehungsweise \PValue{section} und \PValue{subsection} + mit Hilfe dieses Stils, ändern dann jedoch den \PName{Initialisierungscode} + der Klone so ab, dass sie unterschiedliche Voreinstellungen besitzen. + + Der Stil kennt die Eigenschaften \PValue{level}, \PValue{beforeskip}, + \PValue{dynnumwidth}, \PValue{entryformat}, \PValue{entrynumberformat}, + \PValue{breakafternumber}, \PValue{indent}, \PValue{linefill}, + \PValue{numsep}, \PValue{numwidth}, \PValue{onstarthigherlevel}, + \PValue{onstartlowerlevel}, \PValue{onstartsamelevel}, + \PValue{pagenumberbox}, \PValue{pagenumberformat} und + \PValue{raggedpagenumber}. Die Voreinstellungen all dieser Eigenschaften + werden abhängig vom Namen der \PName{Eintragsebene} bestimmt und orientieren + sich dann an den Ergebnissen der Standardklassen. Es ist daher möglich, nach + Laden von \Package{tocbasic} den Stil der Inhaltsverzeichniseinträge der + Standardklassen mit \Macro{DeclareTOCEntryStyle} in \PValue{tocline} zu + ändern, ohne dass dies unmittelbar zu größeren Veränderungen im Aussehen der + Inhaltsverzeichniseinträge führt. So kann man gezielt nur die Eigenschaften + ändern, die für erwünschte Änderungen notwendig sind. Dasselbe gilt für + Abbildungs- und Tabellenverzeichnis der Standardklassen. + + Aufgrund der hohen Flexibilität kann dieser Stil prinzipiell die Stile + \PValue{dottedtocline}, \PValue{undottedtocline} und \PValue{largetocline} + ersetzen, bedarf dann jedoch teilweise eines höheren Aufwands bei der + Konfiguration. + + \autoref{fig:tocbasic.tocline} illustriert einige Längen-Eigenschaften des + Stils. Die weiteren sind in \autoref{tab:tocbasic.tocstyle.attributes}, ab + \autopageref{tab:tocbasic.tocstyle.attributes} erklärt. + \begin{figure} + \centering + \resizebox{.8\linewidth}{!}{% + \begin{tikzpicture} + \coordinate (subsection) at (0,0); + \coordinate (section) at ($(subsection)+(0,2\baselineskip)$); + \coordinate (chapter) at ($(section)+(0,2\baselineskip)$); + \coordinate (part) at ($(chapter)+(0,2.4\baselineskip+1em)$); + + \draw[color=lightgray] + ($(part)+(0,2\baselineskip)$) -- + (0,-2.5\baselineskip); + \draw[color=lightgray] + ($(part)+(\linewidth,2\baselineskip)$) -- + (\linewidth,-2.5\baselineskip); + + \coordinate (subsection) at (0,0); + + \node at (part) [anchor=west,inner sep=0,outer sep=0] + {% + \hspace*{3em}% + \parbox[t]{\dimexpr\linewidth-5.55em}{% + \setlength{\parindent}{-3em}% + \addtolength{\parfillskip}{-2.55em}% + \makebox[3em][l]{\large\bfseries I.}% + \textbf{\large Überschrift eines Teil-Eintrags im Stil + \PValue{tocline} zur Demonstration mit mehr als einer Zeile}% + \hfill + \makebox[1.55em][r]{\bfseries 12}\large + }% + }; + \draw[|-|,color=gray,overlay] + (part) -- + ($(part)+(3em,0)$) + node [anchor=north east,font=\small] { + \PValue{numwidth} + }; + \draw[|-|,color=gray,overlay] + ($(part)+(\linewidth,\ht\strutbox)$) + node [anchor=north,font=\small] { + \Macro{@tocrmarg} + } -- + ($(part)+(\linewidth-2.55em,\ht\strutbox)$); + \draw[|-|,color=gray,overlay] + ($(part)+(\linewidth,-\baselineskip)$) -- + node [anchor=north,font=\small] { + \Macro{@pnumwidth} + } + ($(part)+(\linewidth-1.55em,-\baselineskip)$); + \node at (chapter) [anchor=west,inner sep=0,outer sep=0] + {% + \hspace*{1.5em}% + \parbox[t]{\dimexpr\linewidth-4.05em}{% + \setlength{\parindent}{-1.5em}% + \addtolength{\parfillskip}{-2.55em}% + \makebox[1.5em][l]{\bfseries 1.}% + \textbf{Überschrift eines Kapiteleintrags im Stil + \PValue{tocline} zur Demonstration mit mehr als einer Zeile}% + \hfill + \makebox[1.55em][r]{\bfseries 12}% + }% + }; + \draw[|-|,color=gray,overlay] + ($(chapter)+(3em,\baselineskip)$) -- + node [anchor=west,font=\small] { + \PValue{beforeskip} + } + ($(part)+(3em,-\baselineskip)$); + \draw[|-|,color=gray,overlay] + (chapter) -- + ($(chapter)+(1.5em,0)$) + node [anchor=north east,font=\small] { + \PValue{numwidth} + }; + \draw[|-|,color=gray,overlay] + ($(chapter)+(\linewidth,\ht\strutbox)$) + node [anchor=north,font=\small] { + \Macro{@tocrmarg} + } -- + ($(chapter)+(\linewidth-2.55em,\ht\strutbox)$); + \draw[|-|,color=gray,overlay] + ($(chapter)+(\linewidth,-\baselineskip)$) + node [anchor=north,font=\small] { + \Macro{@pnumwidth} + } -- + ($(chapter)+(\linewidth-1.55em,-\baselineskip)$); + \node at (section) [anchor=west,inner sep=0,outer sep=0] + { + \hspace*{3.8em}% + \parbox[t]{\dimexpr\linewidth-6.35em}{% + \setlength{\parindent}{-2.3em}% + \addtolength{\parfillskip}{-2.55em}% + \makebox[2.3em][l]{1.1.}% + Überschrift eines Abschnitteintrags im Stil + \PValue{tocline} zur Demonstration mit mehr als einer Zeile% + \leaders\hbox{$\csname m@th\endcsname + \mkern 4.5mu\hbox{.}\mkern 4.5mu$}\hfill\nobreak + \makebox[1.55em][r]{3}% + }% + }; + \node at (subsection) [anchor=west,inner sep=0,outer sep=0] + {% + \hspace*{7em}% + \parbox[t]{\dimexpr\linewidth-9.55em}{% + \setlength{\parindent}{-3.2em}% + \addtolength{\parfillskip}{-2.55em}% + \makebox[3.2em][l]{1.1.10.}% + Überschrift eines Unterabschnitteintrags im Stil + \PValue{tocline} mit mehr als einer Zeile% + \leaders\hbox{$\csname m@th\endcsname + \mkern 4.5mu\hbox{.}\mkern 4.5mu$}\hfill\nobreak + \makebox[1.55em][r]{12}% + }% + }; + \draw[|-|,color=gray,overlay] + ($(subsection)+(0,\ht\strutbox)$) -- + node [anchor=north,font=\small] { + \PValue{indent} + } + ($(subsection)+(3.8em,\ht\strutbox)$); + \draw[|-|,color=gray,overlay] + ($(subsection)+(3.8em,0)$) -- + ($(subsection)+(7em,0)$) + node [anchor=north east,font=\small] { + \PValue{numwidth} + }; + \draw[|-|,color=gray,overlay] + ($(subsection)+(\linewidth,\ht\strutbox)$) + node [anchor=north,font=\small] { + \Macro{@tocrmarg} + } -- + ($(subsection)+(\linewidth-2.55em,\ht\strutbox)$); + \draw[|-|,color=gray,overlay] + ($(subsection)+(\linewidth,-\baselineskip)$) -- + node [anchor=north,font=\small] { + \Macro{@pnumwidth} + } + ($(subsection)+(\linewidth-1.55em,-\baselineskip)$); + \end{tikzpicture}% + } + \caption{Illustration einiger Attribute des Verzeichniseintragsstils + \PValue{tocline}} + \label{fig:tocbasic.tocline} + \end{figure} +\item[\PValue{undottedtocline}] entspricht dem Stil, der von den + Standardklassen \Class{book} und \Class{report} für die Ebene + \PValue{chapter} und von \Class{article} für die Ebene \PValue{section} + bekannt ist. Er kennt nur die Eigenschaften \PValue{level}, \PValue{indent} + und \PValue{numwidth}. Letztere ist gleichsam eine Abweichung von den + Standardklassen, die selbst keinen Einzug für die genannten Ebenen + unterstützen. + + Vor dem Eintrag wird ein Seitenumbruch erleichtert und ein vertikaler + Abstand eingefügt. Die Einträge werden um \PValue{indent} von links + eingezogen in \Macro{bfseries} ausgegeben. \Macro{numberline} wird nicht + umdefiniert. Die Breite der Nummer wird von \PValue{numwidth} bestimmt. Bei + mehrzeiligen Einträgen wird der Einzug ab der zweiten Zeile um + \PValue{numwidth} erhöht. \autoref{fig:tocbasic.undottedtocline} illustriert + die Eigenschaften des Stils. + \begin{figure} + \centering + \resizebox{.8\linewidth}{!}{% + \begin{tikzpicture} + \draw[color=lightgray] (0,2\baselineskip) -- (0,-2.5\baselineskip); + \draw[color=lightgray] (\linewidth,2\baselineskip) -- + (\linewidth,-2.5\baselineskip); + \node (undottedtocline) at (0,0) [anchor=west,inner sep=0,outer sep=0] + {% + \makebox[1.5em][l]{\bfseries 1}% + \parbox[t]{\dimexpr \linewidth-4.05em\relax}{% + \bfseries + Überschrift im Verzeichniseintragsstil \PValue{undottedtocline} mit + mehr als einer Zeile% + }% + \raisebox{-\baselineskip}{\makebox[2.55em][r]{\bfseries 3}}% + }; + \draw[|-|,color=gray,overlay] (0,\baselineskip) -- + node [anchor=south,font=\small] { + \PValue{numwidth} + } + (1.5em,\baselineskip); + \draw[|-|,color=gray,overlay] (\linewidth,\ht\strutbox) -- + node [anchor=south,font=\small] { + \Macro{@tocrmarg} + } + (\linewidth-2.55em,\ht\strutbox); + \draw[|-|,color=gray,overlay] (\linewidth,-\baselineskip) -- + node [anchor=north,font=\small] { + \Macro{@pnumwidth} + } + (\linewidth-1.55em,-\baselineskip); + \end{tikzpicture}% + } + \caption{Illustration einiger Attribute des Verzeichniseintragsstils + \PValue{undottedtocline} am Beispiel einer Kapitelüberschrift} + \label{fig:tocbasic.undottedtocline} + \end{figure} +\end{description} +Eine Erklärung zu den Eigenschaften der von \Package{tocbasic} definierten +Stile findet sich in \autoref{tab:tocbasic.tocstyle.attributes}. Bei +Verwendung der Eigenschaften als Optionen für \Macro{DeclareNewTOC} (siehe +\autopageref{desc:tocbasic.cmd.DeclareNewTOC}) oder +\Macro{DeclareSectionCommand} (siehe +\autopageref{desc:maincls-experts.cmd.DeclareSectionCommand}) und verwandten +Anweisungen sind die Namen der Eigenschaften mit dem Präfix \PValue{toc} zu +versehen, also beispielsweise \Option{toclevel} an Stelle von \PValue{level} +zu verwenden. + +Letztlich führt der Aufruf von \Macro{DeclareTOCStyleEntry} zur Definition der +Anweisung \Macro{l@\PName{Eintragsebene}}. + +\begin{desclist} + \desccaption{% + Attribute für die vordefinierten Verzeichniseintragsstile von + \Package{tocbasic}% + \label{tab:tocbasic.tocstyle.attributes}% + }{% + Attribute der Verzeichniseintragsstile (\emph{Fortsetzung})% + }% + \entry{\KOption{beforeskip}\PName{Länge}}{% + Vertikaler Abstand, der vor einem Eintrag dieser Ebene im Stil + \PValue{tocline} eingefügt wird (siehe \autoref{fig:tocbasic.tocline}). Der + Abstand wird je nach Ebene mit \Macro{vskip} oder \Macro{addvspace} + eingefügt, so dass diesbezüglich möglichst Kompatibilität zu den + Standardklassen und früheren Versionen von \KOMAScript{} besteht. + + Bei der \PName{Eintragsebene} \PValue{part} wird das Attribut mit + \texttt{2.25em plus 1pt} initialisiert, bei \PValue{chapter} mit + \texttt{1em plus 1pt}. Ist noch keine \PName{Eintragsebene} + \PValue{chapter} bekannt wird für \PValue{section} ebenfalls \texttt{1em + plus 1pt} verwendet. Alle anderen Ebenen werden mit \texttt{0pt plus + .2pt} initialisiert.% + }% + \entry{\KOption{breakafternumber}\PName{Schalter}}{% + \PName{Schalter} ist einer der Werte für einfache Schalter aus + \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}. + Ist der Schalter beim Stil \PValue{tocline} aktiviert, so wird nach der + mit \Macro{numberline}\IndexCmd{numberline} gesetzten Nummer eine neue + Zeile begonnen, die erneut linksbündig mit der Nummer beginnt. + + In der Voreinstellung ist die Eigenschaft im Stil \PValue{tocline} nicht + gesetzt. + + Ist\textnote{Achtung!} für ein Verzeichnis mit \Macro{setuptoc} die + Eigenschaft \Option{numberline} gesetzt (siehe \autoref{sec:tocbasic.toc}, + \autopageref{desc:tocbasic.cmd.setuptoc}), wie dies bei den + \KOMAScript-Klassen und Verwendung deren Option + \OptionValue{toc}{numberline}\IndexOption{toc~=\PValue{numberline}} der + Fall ist, führt dies auch dazu, dass bei nicht nummerierten Einträgen + dennoch die Zeile mit der dann leeren Nummer in der Formatierung von + \Option{entrynumberformat} gesetzt wird.% + }% + \entry{\KOption{dynnumwidth}\PName{Schalter}}{% + \PName{Schalter} ist einer der Werte für einfache Schalter aus + \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}. Ist der + Schalter beim Stil \PValue{tocline} aktiviert, wird die Eigenschaft + \PValue{numwidth} ignoriert. Stattdessen wird die beim letzten \LaTeX-Lauf + ermittelte maximale Breite der Eintragsnummern gleicher Ebene zuzüglich + des Werts von \PValue{numsep} verwendet.% + }% + \entry{\KOption{entryformat}\PName{Befehl}}{% + Über diese Eigenschaft kann die Formatierung des gesamten Eintrags + verändert werden. Der dabei als Wert angegebene \PName{Befehl} hat genau + ein Argument zu erwarten. Dieses Argument ist nicht zwingend voll + expandierbar. Befehle wie \Macro{MakeUppercase}, die ein voll + expandierbares Argument erwarten, dürfen an dieser Stelle also nicht + verwendet werden. Font-Änderungen über \Option{entryformat} erfolgen + ausgehend von \Macro{normalfont}\Macro{normalsize}. Es wird darauf + hingewiesen, dass die Ausgabe von \Option{linefill} und der Seitenzahl + unabhängig von \Option{entryformat} sind. Siehe dazu auch die Eigenschaft + \Option{pagenumberformat}. + + Initialisiert wird die Eigenschaft für die \PName{Eintragsebene} + \PValue{part} mit der Ausgabe des übergebenen Argument in + \Macro{large}\Macro{bfseries} und für \PValue{chapter} in + \Macro{bfseries}. Falls bei der Initialisierung von \PValue{section} noch + keine Ebene \PValue{chapter} existiert, wird auch für diese Ebene + \Macro{bfseries} verwendet. Bei allen anderen Ebenen wird das Argument + unverändert ausgegeben.% + }% + \entry{\KOption{entrynumberformat}\PName{Befehl}}{% + Über diese Eigenschaft kann die Formatierung der mit \Macro{numberline} + gesetzten Eintragsnummer verändert werden. Der dabei als Wert angegebene + \PName{Befehl} hat genau ein Argument zu erwarten. Font-Änderungen + erfolgen ausgehend von der Eigenschaft \Option{entryformat}. + + Initialisiert wird die Eigenschaft mit Ausgabe des übergebenen + Arguments. Die Eintragsnummer wird also unverändert ausgegeben. + + Ist\textnote{Achtung!} für ein Verzeichnis mit \Macro{setuptoc} die + Eigenschaft \Option{numberline} gesetzt (siehe \autoref{sec:tocbasic.toc}, + \autopageref{desc:tocbasic.cmd.setuptoc}), wie dies bei den + \KOMAScript-Klassen und Verwendung deren Option + \OptionValue{toc}{numberline}\IndexOption{toc~=\PValue{numberline}} der + Fall ist, führt dies auch dazu, dass bei nicht nummerierten Einträgen + \PName{Befehl} dennoch ausgeführt wird.% + }% + \entry{\KOption{indent}\PName{Länge}}{% + Horizontaler Abstand des Eintrags vom linken Rand (siehe + \autoref{fig:tocbasic.dottedtocline} und \autoref{fig:tocbasic.tocline}). + + Beim Stil \PValue{tocline} wird für alle Eintragsebenen, deren Name mit + »\texttt{sub}« beginnt, eine Initialisierung mit + \PValue{indent}+\PValue{numwidth} der gleichnamigen Eintragsebene ohne + diesen Präfix vorgenommen, falls eine solche Ebene mit entsprechenden + Eigenschaften existiert. Bei den Stilen \PValue{dottedtocline}, + \PValue{undottedtocline} und \PValue{tocline} findet für die + Eintragsebenen \PValue{part} bis \PValue{subparagraph} sowie + \PValue{figure} und \PValue{table} eine Initialisierung mit Werten + entsprechend der Standardklassen statt. Alle anderen Ebenen erhalten keine + Initialisierung. Für sie ist eine explizite Angabe daher bei der + ersten Verwendung zwingend.% + }% + \entry{\KOption{level}\PName{Integer}}{% + Nummerischer Wert der \PName{Eintragsebene}. Tatsächlich angezeigt werden + nur Einträge, deren nummerische Ebene nicht größer als Zähler + \Counter{tocdepth}\important{\Counter{tocdepth}}\IndexCounter{tocdepth} + ist. + + Diese Eigenschaft ist für alle Stile zwingend und wird bei der + Definition eines Stils automatisch definiert. + + Beim Stil \PValue{tocline} findet für alle Eintragsebenen, deren Name + mit »\texttt{sub}« beginnt, eine Initialisierung entsprechend dem + um eins erhöhten Wert einer gleichnamigen Eintragsebene ohne + diesen Präfix statt, falls eine solche Ebene existiert. Bei den Stilen + \PValue{dottedtocline}, \PValue{largetocline}, \PValue{tocline} und + \PValue{undottedtocline} findet für die \PName{Eintragsebene} + \PValue{part}, \PValue{chapter}, \PValue{section}, \PValue{subsection}, + \PValue{subsubsection}, \PValue{paragraph}, \PValue{subparagraph}, + \PValue{figure} und \PValue{table} automatisch eine Initialisierung + aufgrund des Namens statt. Für andere Ebenen findet eine Initialisierung + mit dem Wert der Gliederungsebene statt, falls kompatibel zu den + \KOMAScript-Klassen \Macro{\PName{Eintragsebene}numdepth} definiert + ist.% + }% + \entry{\KOption{linefill}\PName{Code}}{% + Beim Stil \PValue{tocline} kann zwischen dem Ende des Eintragstextes und + der Seitenzahl die Art der Füllung verändert werden. Die Eigenschaft + \PName{linefill} erhält als Wert direkt den gewünschten \PName{Code}. + Für \PName{Eintragsebene} \PValue{part} und \PValue{chapter} wird die + Eigenschaft mit \Macro{hfill} initialisiert. Dadurch rückt die Seitenzahl + an den rechten Rand. Ist bisher keine \PName{Eintragsebene} + \PValue{chapter} definiert, so gilt dies auch für \PValue{section}. Alle + anderen Ebenen werden mit \Macro{TOCLineLeaderFill} (siehe + \autopageref{desc:tocbasic.cmd.TOCLineLeaderFill}) initialisiert. + + Wird \PName{Code} angegeben, der nicht automatisch zu einer Füllung des + Abstandes führt, sollte übrigens auch die Eigenschaft + \PValue{raggedpagenumber} gesetzt werden, damit es nicht zu + »\texttt{underfull \Macro{hbox}}«-Meldungen kommt.% + }% + \entry{\KOption{numsep}\PName{Länge}}{% + Der Stil \PValue{tocline} versucht sicherzustellen, dass zwischen der + Nummer und dem Text eines Eintrags mindestens ein Abstand von + \PName{Länge} eingehalten wird. Bei aktiviertem \PValue{dynnumwidth} kann + die für die Nummer reservierte Breite \PValue{numwidth} entsprechend + korrigiert werden. Bei nicht aktiviertem \PValue{dynnumwidth} wird + hingegen lediglich eine Warnung ausgegeben, wenn diese Bedingung nicht + eingehalten wird. + + Die Eigenschaft wird mit einem Wert von 0,4\Unit{em} initialisiert.% + }% + \entry{\KOption{numwidth}\PName{Länge}}{% + Für die Nummer eines Eintrags reservierte Breite (siehe + \autoref{fig:tocbasic.dottedtocline} bis + \autoref{fig:tocbasic.undottedtocline}). Dieser Wert wird bei den + Stilen \PValue{dottedtocline}, \PValue{tocline} und + \PValue{undottedtocline} ab der zweiten Zeile eines Eintrags zum linken + Einzug hinzugerechnet. + + Beim Stil \PValue{tocline} wird für alle Eintragsebenen, deren Name mit + »\texttt{sub}« beginnt, eine Initialisierung mit dem Wert der + gleichnamigen Eintragsebene ohne diesen Präfix zuzüglich 0,9\Unit{em} + vorgenommen, falls eine solche Ebene mit entsprechender + Eigenschaften existiert. Bei den Stilen \PValue{dottedtocline}, + \PValue{undottedtocline} und \PValue{tocline} findet für die + Eintragsebenen \PValue{part} bis \PValue{subparagraph} sowie + \PValue{figure} und \PValue{table} eine Initialisierung mit Werten + entsprechend der Standardklassen statt. Alle anderen Ebenen erhalten keine + Initialisierung. Für sie ist eine explizite Angabe daher bei der + ersten Verwendung zwingend.% + }% + \entry{\KOption{onstarthigherlevel}\PName{Code}}{% + Der Stil \PValue{tocline} kann zu Beginn eines Eintrags eine Aktion in + Abhängigkeit davon ausführen, ob der zuletzt gesetzte Eintrag einen + höheren, denselben oder einen niedrigeren \PName{level}-Wert + hatte. Im Falle, dass der aktuelle Eintrag einen größeren + \PName{level}-Wert besitzt, in der Hierarchie der Einträge also tiefer + steht, wird der über diese Eigenschaft angegebene \PName{Code} ausgeführt. + + Die Erkennung funktioniert übrigens nur, solange sich \Macro{lastpenalty} + seit dem letzten Eintrag nicht geändert hat. + + Initialisiert wird die Eigenschaft mit \Macro{LastTOCLevelWasLower} (siehe + \autopageref{desc:tocbasic.cmd.LastTOCLevelWasLower}).% + }% + \entry{\KOption{onstartlowerlevel}\PName{Code}}{% + Der Stil \PValue{tocline} kann zu Beginn eines Eintrags eine Aktion in + Abhängigkeit davon ausführen, ob der zuletzt gesetzte Eintrag einen + höheren, denselben oder einen niedrigeren \PName{level}-Wert + hatte. Der im Falle, dass der aktuelle Eintrag einen kleineren + \PName{level}-Wert besitzt, in der Hierarchie der Einträge also höher + steht, wird der über diese Eigenschaft angegebene \PName{Code} ausgeführt. + + Die Erkennung funktioniert übrigens nur, solange sich \Macro{lastpenalty} + seit dem letzten Eintrag nicht geändert hat. + + Initialisiert wird die Eigenschaft mit \Macro{LastTOCLevelWasHigher} (siehe + \autopageref{desc:tocbasic.cmd.LastTOCLevelWasHigher}), was normalerweise + dazu führt, dass ein Umbruch vor dem Eintrag begünstigt wird.% + }% + \entry{\KOption{onstartsamelevel}\PName{Code}}{% + Der Stil \PValue{tocline} kann zu Beginn eines Eintrags eine Aktion in + Abhängigkeit davon ausführen, ob der zuletzt gesetzte Eintrag einen + höheren, denselben oder einen niedrigeren \PName{level}-Wert + hatte. Der im Falle, dass der aktuelle Eintrag denselben + \PName{level}-Wert besitzt, in der Hierarchie der Einträge also gleich + gestellt ist, wird der über diese Eigenschaft angegebene \PName{Code} + ausgeführt. + + Die Erkennung funktioniert übrigens nur, solange sich \Macro{lastpenalty} + seit dem letzten Eintrag nicht geändert hat. + + Initialisiert wird die Eigenschaft mit \Macro{LastTOCLevelWasSame} (siehe + \autopageref{desc:tocbasic.cmd.LastTOCLevelWasSame}), was normalerweise + dazu führt, dass ein Umbruch vor dem Eintrag begünstigt wird.% + }% + \entry{\KOption{pagenumberbox}\PName{Befehl}}{% + Normalerweise wird die zu einem Eintrag gehörende Seitenzahl rechtsbündig + in eine Box der Breite \Macro{@pnumwidth} gesetzt. Beim Stil + \PValue{tocline} kann der Befehl, der dazu verwendet wird, über diese + Eigenschaft konfiguriert werden. Der dabei anzugebende \PName{Befehl} + hat genau ein Argument zu erwarten. + + Initialisiert wird die Eigenschaft mit der bereits erwähnten Box.% + }% + \entry{\KOption{pagenumberformat}\PName{Befehl}}{% + Über diese Eigenschaft kann die Formatierung der Seitenzahl des Eintrags + verändert werden. Der dabei als Wert angegebene \PName{Befehl} hat genau + ein Argument zu erwarten. Font-Änderungen über \Option{entryformat} + erfolgen ausgehend von \Option{entryformat} gefolgt von + \Macro{normalfont}\Macro{normalsize}. + + Initialisiert wird die Eigenschaft für die \PName{Eintragsebene} + \PValue{part} mit der Ausgabe des übergebenen Arguments in + \Macro{large}\Macro{bfseries}. Für alle anderen Ebenen erfolgt die Ausgabe + in \Macro{normalfont}\Macro{normalcolor}.% + }% + \entry{\KOption{raggedpagenumber}\PName{Schalter}}{% + \PName{Schalter} ist einer der Werte für einfache Schalter aus + \autoref{tab:truefalseswitch}, \autopageref{tab:truefalseswitch}. + Ist der Schalter beim Stil \PValue{tocline} aktiviert, so wird die + Seitenzahl nicht zwingend rechtsbündig gesetzt. + + Je nach Wert der Eigenschaft \PValue{linefill} kann sich das + Setzen dieses Schalters nur im Erscheinen oder Verschwinden einer Warnung + oder auch konkret in der Formatierung der Einträge auswirken. Es ist also + wichtig, diese beiden Eigenschaften zueinander passend zu setzen. + + In der Voreinstellung ist dieser Schalter nicht gesetzt und passt damit + zur Initialisierung von \PValue{linefill} sowohl mit \Macro{hfill} als + auch mit \Macro{TOCLineLeaderFill}.% + }% +\end{desclist}% +% +\EndIndex{Cmd}{DeclareTOCStyleEntry}% + +\begin{Declaration} + \Macro{DeclareTOCEntryStyle}\Parameter{Stil}% + \OParameter{Initialisierungscode}% + \Parameter{Befehlscode}\\ + \Macro{DefineTOCEntryOption}\Parameter{Option}\OParameter{Säumniswert}% + \Parameter{Code}\\ + \Macro{DefineTOCEntryBooleanOption}\Parameter{Option}\OParameter{Säumniswert}% + \Parameter{Präfix}% + \Parameter{Postfix}% + \Parameter{Erklärung}\\% + %\OParameter{Initialisierungscode}\\ + \Macro{DefineTOCEntryCommandOption}\Parameter{Option}\OParameter{Säumniswert}% + \Parameter{Präfix}% + \Parameter{Postfix}% + \Parameter{Erklärung}\\% + %\OParameter{Initialisierungscode}\\ + \Macro{DefineTOCEntryIfOption}\Parameter{Option}\OParameter{Säumniswert}% + \Parameter{Präfix}% + \Parameter{Postfix}% + \Parameter{Erklärung}\\% + %\OParameter{Initialisierungscode}\\ + \Macro{DefineTOCEntryLengthOption}\Parameter{Option}\OParameter{Säumniswert}% + \Parameter{Präfix}% + \Parameter{Postfix}% + \Parameter{Erklärung}\\% + %\OParameter{Initialisierungscode}\\ + \Macro{DefineTOCEntryNumberOption}\Parameter{Option}\OParameter{Säumniswert}% + \Parameter{Präfix}% + \Parameter{Postfix}% + \Parameter{Erklärung}% + %\OParameter{Initialisierungscode}% +\end{Declaration} +\BeginIndex{Cmd}{DeclareTOCEntryStyle}% +\BeginIndex{Cmd}{DefineTOCEntryOption}% +\BeginIndex{Cmd}{DefineTOCEntryBooleanOption}% +\BeginIndex{Cmd}{DefineTOCEntryCommandOption}% +\BeginIndex{Cmd}{DefineTOCEntryIfOption}% +\BeginIndex{Cmd}{DefineTOCEntryLengthOption}% +\BeginIndex{Cmd}{DefineTOCEntryNumberOption}% +\Macro{DeclareTOCEntryStyle}\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} ist +eine der komplexesten Anweisungen in \KOMAScript. Sie richtet sich daher +ausdrücklich an \LaTeX-Entwickler und nicht an \LaTeX-Anwender. Mit ihrer +Hilfe ist es möglich, einen neuen \PName{Stil} für Verzeichniseinträge zu +definieren. Üblicherweise werden Verzeichniseinträge mit +\Macro{addcontentsline}\IndexCmd{addcontentsline} oder bei Verwendung von +\Package{tocbasic} vorzugsweise mit +\Macro{addxcontentsline}\IndexCmd{addxcontentsline} (siehe +\autoref{sec:tocbasic.basics}, +\autopageref{desc:tocbasic.cmd.addxcontentsline}) erzeugt. Dabei schreibt +\LaTeX{} eine zugehörige Anweisung \Macro{contentsline}\IndexCmd{contentsline} +in die jeweilige Hilfsdatei. Bei Einlesen dieser Hilfsdatei führt \LaTeX{} +dann für jedes \Macro{contentsline} eine Anweisung +\Macro{l@\PName{Eintragsebene}} aus. + +Wird später einer \PName{Eintragsebene} über \Macro{DeclareTOCStyleEntry} der +\PName{Stil} zugewiesen, so wird zunächst der optionale +\PName{Initialisierungscode} ausgeführt und dann +\Macro{l@\PName{Eintragsebene}} als \PName{Befehlscode} +definiert. \PName{Befehlscode} ist also letztlich der Code, der bei +\Macro{l@\PName{Eintragsebene}} ausgeführt wird. Dabei ist \texttt{\#1} der +Name der Eintragsebene, während \texttt{\#\#1} und \texttt{\#\#2} Platzhalter +für die beiden Argumente von \Macro{l@\PName{Eintragsebene}} sind. + +Der \PName{Initialisierungscode} dient einerseits dazu, alle Einstellungen zu +initialisieren. Entwickler sollten darauf achten, dass wirklich alle +Einstellungen hier bereits einen Wert erhalten, damit +\Macro{DeclareTOCStyleEntry} auch ohne Angabe einer \PName{Optionenliste} +fehlerfrei funktioniert. Darüber hinaus hat der \PName{Initialisierungscode} +auch alle Optionen, die der jeweilige Stil versteht, zu definieren. Zwingend +vordefiniert wird lediglich \Option{level}. Der eingestellte Wert für +\Option{level} kann in \PName{Befehlscode} mit +\Macro{@nameuse}\PParameter{\#1tocdepth}% +\important{\Macro{\PName{Eintragsebene}tocdepth}} +abgefragt werden, um ihn beispielsweise mit dem Wert des Zählers +\Counter{tocdepth}\IndexCounter{tocdepth} zu vergleichen. + +Zur Definition neuer Optionen zur Einstellung von Eigenschaften einer +Eintragsebene stehen nur innerhalb von \PName{Initialisierungscode} die +Anweisungen \Macro{DefineTOCEntryBooleanOption}, +\Macro{DefineTOCEntryCommandOption}, \Macro{DefineTOCEntryIfOption}, +\Macro{DefineTOCEntryLengthOption} und \Macro{DefineTOCEntryNumberOption}. +All diese Anweisungen definieren jeweils eine \PName{Option}, die bei ihrem +Aufruf eine Anweisung +\Macro{\PName{Präfix}\PName{Eintragsebene}\PName{Postfix}} mit dem übergebenen +Wert oder bei Fehlen einer Wertzuweisung mit dem \PName{Säumniswert} +definieren. Eine Besonderheit stellt \Macro{DefineTOCEntryIfOption} dar. Diese +definiert \Macro{\PName{Präfix}\PName{Eintragsebene}\PName{Postfix}} immer als +Anweisung mit zwei Argumenten. Ist der an die Option übergebene Wert einer der +Aktivierungswerte aus \autoref{tab:truefalseswitch}, +\autopageref{tab:truefalseswitch}, so expandiert die Anweisung zum ersten +Argument. Ist der an die Option übergebene Wert hingegen ein +Deaktivierungswert, so expandiert die Anweisung zum zweiten Argument. + +Die \PName{Erklärung} sollte ein möglichst kurzer Text sein, der den Sinn der +Option mit wenigen Schlagworten beschreibt. Er wird von \Package{tocbasic} bei +Fehlermeldungen, Warnungen und Informationen auf dem Terminal und in der +\File{log}-Datei ausgegeben. + +Der einfachste Stil von \Package{tocbasic}, \PValue{gobble}, wurde mit +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \DeclareTOCEntryStyle{gobble}{}% +\end{lstcode} +definiert. Würde man nun mit +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \DeclareTOCStyleEntry[level=1]{gobble}{dummy} +\end{lstcode} +eine Eintragsebene \PValue{dummy} in diesem Stil definieren, so würde das +unter anderem +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \def\dummytocdepth{1} + \def\l@dummy#1#2{} +\end{lstcode} +entsprechen. + +Innerhalb von Stil \PValue{tocline} wird beispielsweise +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \DefineTOCEntryCommandOption{linefill}[\TOCLineLeaderFill]% + {scr@tso@}{@linefill}{filling between text and page number}% +\end{lstcode} +verwendet, um Option \Option{linefill} mit dem \PName{Säumniswert} +\Macro{TOCLineLeaderFill} zu definieren. Ein Aufruf wie +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \RedeclareTOCStyleEntry[linefill]{tocline}{part} +\end{lstcode} +würde daher unter anderem die Definition +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \def\scr@tso@part@linefill{\TOCLineLeaderFill} +\end{lstcode} +vornehmen. + +Wer sich selbst einen Stil definieren möchte, dem sei empfohlen, zunächst die +Definition des Stils \PValue{dottedtocline} zu studieren. Nachdem dessen +Definition verstanden wurde, gibt dann die deutlich komplexere Definition von +Stil \PValue{tocline} viele Hinweise darauf, wie die Anweisungen sinnvoll zu +verwenden sind. + +In vielen Fällen wird es jedoch auch ausreichen, einen der vorhandenen Stile +mit \Macro{CloneTOCEntryStyle} zu klonen und dann dessen Initialisierungscode +mit \Macro{TOCEntryStyleInitCode} oder \Macro{TOCEntryStyleStartInitCode} +abzuändern. + +\Macro{DefineTOCEntryOption} dient eher der Definition der übrigen +Anweisungen und sollte in der Regel nicht direkt verwendet +werden. Normalerweise besteht dafür auch keine Notwendigkeit. Sie sei hier +nur der Vollständigkeit halber erwähnt.% +\EndIndex{Cmd}{DefineTOCEntryNumberOption}% +\EndIndex{Cmd}{DefineTOCEntryLengthOption}% +\EndIndex{Cmd}{DefineTOCEntryIfOption}% +\EndIndex{Cmd}{DefineTOCEntryCommandOption}% +\EndIndex{Cmd}{DefineTOCEntryBooleanOption}% +\EndIndex{Cmd}{DefineTOCEntryOption}% +\EndIndex{Cmd}{DeclareTOCEntryStyle}% + +\begin{Declaration} + \Macro{CloneTOCEntryStyle}\Parameter{Stil}\Parameter{neuer Stil}% +\end{Declaration} +\BeginIndex{Cmd}{CloneTOCEntryStyle}% +Mit\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} dieser Anweisung kann ein +existierender \PName{Stil} geklont werden. Dabei wird ein \PName{neuer Stil} +mit denselben Eigenschaften und Voreinstellungen wie der existierende +\PName{Stil} deklariert. Das Paket selbst verwendet +\Macro{CloneTOCEntryStyle}, um den Stil \PValue{default} als Klon von +\PValue{dottedtocline} zu deklarieren. Die \KOMAScript-Klassen verwenden die +Anweisung um die Stile \PValue{part}, \PValue{section} und \PValue{chapter} +oder \PValue{subsection} als Klon von \PValue{tocline} zu deklarieren und den +Stil \PValue{default} neu als Klon von \PValue{section} beziehungsweise +\PValue{subsection} zu deklarieren.% +\EndIndex{Cmd}{CloneTOCEntryStyle}% + +\begin{Declaration} + \Macro{TOCEntryStyleInitCode}\Parameter{Stil}% + \Parameter{Initialisierungscode}\\ + \Macro{TOCEntryStyleStartInitCode}\Parameter{Stil}% + \Parameter{Initialisierungscode} +\end{Declaration} +\BeginIndex{Cmd}{TOCEntryStyleInitCode}% +\BeginIndex{Cmd}{TOCEntryStyleStartInitCode}% +Jeder\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} Verzeichniseintragsstil +verfügt über einen Initialisierungscode. Dieser wird immer dann aufgerufen, +wenn einer Verzeichnisebene der entsprechende \PName{Stil} mit +\Macro{DeclareTOCEntryStyle}\IndexCmd{DeclareTOCEntryStyle} zugewiesen +wird. Dieser \PName{Initialisierungscode} sollte keine globalen Seiteneffekte +aufweisen, da er auch für lokale Initialisierungen innerhalb anderer +Anweisungen wie \Macro{DeclareNewTOC}\IndexCmd{DeclareNewTOC} verwendet +wird. Der \PName{Initialisierungscode} dient einerseits dazu, Eigenschaften +für den jeweiligen \PName{Stil} zu definieren. Er setzt aber auch die +Standardeinstellungen für diese Eigenschaften. + +Mit Hilfe von \Macro{TOCEntryStyleStartInitCode} und +\Macro{TOCEntryStyleInitCode} kann der für einen \PName{Stil} bereits +definierte Initialisierungscode um weiteren \PName{Initialisierungscode} +erweitert werden. Dabei fügt \Macro{TOCEntryStyleStartInitCode} den neuen +\PName{Intialisierungscode} vorn an, während \Macro{TOCEntryStyleInitCode} den +\PName{Initialisierungscode} hinten an den vorhandenen Code anfügt. Dies wird +beispielsweise von den \KOMAScript-Klassen verwendet, um für den von +\PValue{tocline} geklonten Stil \PValue{part} Füllung, Schrift und vertikalen +Abstand passend zu initialisieren. Die Klassen \Class{scrbook} und +\Class{scrreprt} verwenden beispielsweise +\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] + \CloneTOCEntryStyle{tocline}{section} + \TOCEntryStyleStartInitCode{section}{% + \expandafter\providecommand% + \csname scr@tso@#1@linefill\endcsname + {\TOCLineLeaderFill\relax}% + } +\end{lstcode} +um den Stil \PValue{section} als abgewandelten Klon von \PValue{tocline} zu +definieren.% +\EndIndex{Cmd}{TOCEntryStyleStartInitCode}% +\EndIndex{Cmd}{TOCEntryStyleInitCode}% + +\begin{Declaration} + \Macro{LastTOCLevelWasHigher}\\ + \Macro{LastTOCLevelWasSame}\\ + \Macro{LastTOCLevelWasLower} +\end{Declaration} +\BeginIndex{Cmd}{LastTOCLevelWasHigher}% +\BeginIndex{Cmd}{LastTOCLevelWasSame}% +\BeginIndex{Cmd}{LastTOCLevelWasLower}% +Bei\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} Einträgen im Stil +\PValue{tocline} wird am Anfang abhängig von \Macro{lastpenalty} eine dieser +drei Anweisungen ausgeführt. Dabei fügen \Macro{LastTOCLevelWasHigher} und +\Macro{LastTOCLevelWasSame} im vertikalen Modus +\Macro{addpenalty}\PParameter{\Macro{@lowpenalty}} ein und ermöglichen so +einen Umbruch vor Einträgen gleicher oder übergeordneter +Ebene. \Macro{LastTOCLevelWasLower} ist hingegen bisher leer definiert, so +dass zwischen einem Eintrag und seinem ersten Untereintrag normalerweise ein +Umbruch untersagt ist. + +Anwender sollten diese Anweisungen nicht umdefinieren. Stattdessen können und +sollten Änderungen für die jeweiligen Eintragsebenen gezielt über die +Eigenschaften \PValue{onstartlowerlevel}, \PValue{onstartsamelevel} und +\PValue{onstarthigherlevel} vorgenommen werden.% +\EndIndex{Cmd}{LastTOCLevelWasLower}% +\EndIndex{Cmd}{LastTOCLevelWasSame}% +\EndIndex{Cmd}{LastTOCLevelWasHigher}% + + +\begin{Declaration} + \Macro{TOCLineLeaderFill}\OParameter{Füllzeichen} +\end{Declaration} +\BeginIndex{Cmd}{TOCLineLeaderFill}% +Die\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} Anweisung ist dazu gedacht +als Wert für die Eigenschaft \Option{linefill} des Verzeichniseintragsstils +\PName{tocline} verwendet zu werden. Sie erzeugt dann eine Verbindung zwischen +dem Ende des Textes eines Eintrags und der zugehörigen Seitenzahl. Das +\PName{Füllzeichen}, das dazu in regelmäßigem Abstand wiederholt wird, kann +als optionales Argument angegeben werden. Voreinstellung ist ein Punkt. + +Wie der Name schon vermuten lässt, werden die Füllzeichen mit Hilfe von +\Macro{leaders} gesetzt. Als Abstand wird wie bei \Macro{@dottedtocline} aus +dem \LaTeX-Kern vor und nach dem Füllzeichen +\Macro{mkern}\Macro{@dotsep}\Unit{\texttt{mu}} verwendet.% +\EndIndex{Cmd}{TOCLineLeaderFill}% +% +\EndIndex{}{Verzeichnis>Eintrag} + + \section{Interne Anweisungen für Klassen- und Paketautoren} \seclabel{internals} @@ -1039,7 +1993,7 @@ leeren Argument wird dem \PName{Eintrag} ein \Macro{nonumberline} ohne Argument vorangestellt. Anderenfalls wird wie gewohnt \Macro{numberline} mit \PName{Gliederungsnummer} als Argument verwendet. -Die Anweisung \PName{nonumberline} wird innerhalb \Macro{listoftoc} (siehe +Die Anweisung \Macro{nonumberline} wird innerhalb \Macro{listoftoc} (siehe \autoref{sec:tocbasic.toc}, \autopageref{desc:tocbasic.cmd.listoftoc}) entsprechend der Eigenschaft \PValue{numberline} (siehe \autoref{sec:tocbasic.toc}, \autopageref{desc:tocbasic.cmd.setuptoc}) @@ -1050,6 +2004,35 @@ bereits beim nächsten \LaTeX-Lauf aus.% \EndIndex{Cmd}{tocbasic@addxcontentsline}% +\begin{Declaration} + \Macro{tocbasic@DependOnPenaltyAndTOCLevel}\Parameter{Eintragsebene}\\ + \Macro{tocbasic@SetPenaltyByTOCLevel}\Parameter{Eintragsebene} +\end{Declaration} +\BeginIndex{Cmd}{tocbasic@DependOnPenaltyAndTOCLevel}% +\BeginIndex{Cmd}{tocbasic@SetPenaltyByTOCLevel}% +Der\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} Verzeichniseintragsstil +\PValue{tocline} (siehe \autoref{sec:tocbasic.tocstyle}) setzt am Ende jedes +Eintrags \Macro{penalty} so, dass nach einem Eintrag kein Seitenumbruch +erfolgen darf. Dabei wird der genaue Wert abhängig von der +\PName{Eintragsebene} gewählt. Dies erledigt +\Macro{tocbasic@SetPenaltyByTOCLevel}. Am Anfang eines Eintrags wird dann über +\Macro{tocbasic@DependOnPenaltyAndTOCLevel} abhängig von \Macro{lastpenalty} +und der aktuellen \PName{Eintragsebene} die über die Eigenschaften +\Option{onstartlowerlevel}, \Option{onstartsamelevel} oder +\Option{onstarthigherlevel} festgelegte Aktion eines der internen Makros +\Macro{scr@tso@\PName{Eintragsebene}@LastTOCLevelWasHigher}, +\Macro{scr@tso@\PName{Eintragsebene}@LastTOCLevelWasSame} oder +\Macro{scr@tso@\PName{Eintragsebene}@LastTOCLevelWasLower} ausgeführt. In der +Voreinstellung erlauben die ersten beiden einen Umbruch, wenn sie im +vertikalen Modus ausgeführt werden. + +Entwickler, die eigene Stile kompatibel mit Stil \PValue{tocline} erstellen +wollen, sei empfohlen, dieses Verhalten zu kopieren. Zu diesem Zweck dürfen +sie auf diese eigentlich internen Makros zurückgreifen.% +\EndIndex{Cmd}{tocbasic@SetPenaltyByTOCLevel}% +\EndIndex{Cmd}{tocbasic@DependOnPenaltyAndTOCLevel}% + + \section{Ein komplettes Beispiel} \seclabel{example} @@ -1155,8 +2138,8 @@ Titel definieren und dann beispielsweise mit Hilfe des Pakets will. Siehe dazu \autoref{sec:scrbase.languageSupport}, ab \autopageref{sec:scrbase.languageSupport}. -Jetzt\textnote{Verzeichniseintrag} müssen wir nur noch definieren, wie ein -einzelner Eintrag in dem Verzeichnis aussehen soll: +Jetzt\textnote{Verzeichniseintrag}\index{Verzeichnis>Eintrag} müssen wir nur +noch definieren, wie ein einzelner Eintrag in dem Verzeichnis aussehen soll: % Umbruchkorrektur: listings korrigiert! \begin{lstcode}[belowskip=\dp\strutbox plus 1pt] \newcommand*{\l@remarkbox}{\l@figure} @@ -1203,14 +2186,15 @@ unterstützen, angepasst gesetzt. Unterstützende Klassen beachten das neue Verzeichnis sogar beim Wechsel zu einem neuen Kapitel. Sprachumschaltungen durch \Package{babel} werden in dem Verzeichnis ebenfalls berücksichtigt. -Natürlich\textnote{Verzeichniseigenschaften} kann ein Paketautor weiteres hinzufügen. So -könnte er explizit Optionen anbieten, um die Verwendung von \Macro{setuptoc} -vor dem Anwender zu verbergen. Andererseits kann er auch auf diese Anleitung -zu \Package{tocbasic} verweisen, wenn es darum geht, die entsprechenden -Möglichkeiten zu erklären. Vorteil ist dann, dass der Anwender automatisch von -etwaigen zukünftigen Erweiterungen von \Package{tocbasic} profitiert. Soll der -Anwender aber nicht mit der Tatsache belastet werden, dass für die Merksätze -die Dateierweiterung \File{lor} verwendet wird, so genügt +Natürlich\textnote{Verzeichniseigenschaften} kann ein Paketautor weiteres +hinzufügen. So könnte er explizit Optionen anbieten, um die Verwendung von +\Macro{setuptoc} vor dem Anwender zu verbergen. Andererseits kann er auch auf +diese Anleitung zu \Package{tocbasic} verweisen, wenn es darum geht, die +entsprechenden Möglichkeiten zu erklären. Vorteil ist dann, dass der Anwender +automatisch von etwaigen zukünftigen Erweiterungen von \Package{tocbasic} +profitiert. Soll der Anwender aber nicht mit der Tatsache belastet werden, +dass für die Merksätze die Dateierweiterung \File{lor} verwendet wird, so +genügt % Umbruchkorrektur: listings korrigiert! \begin{lstcode}[belowskip=\dp\strutbox plus 1pt] \newcommand*{\setupremarkboxes}{\setuptoc{lor}} @@ -1256,6 +2240,28 @@ Optionen\textnote{Achtung!} können jedoch \emph{nicht} mit \Macro{KOMAoptions}\IndexCmd{KOMAoptions} gesetzt werden! Eine Übersicht über die möglichen Optionen bietet \autoref{tab:tocbasic.DeclareNewTOC-options} ab \autopageref{tab:tocbasic.DeclareNewTOC-options}. + +Wird\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} Option +\Option{tocentrystyle} nicht gesetzt, so wird bei Bedarf der Stil +\PValue{default} verwendet. Näheres zu diesem Stil ist +\autoref{sec:tocbasic.tocstyle} zu entnehmen. Soll kein Befehl für +Verzeichniseinträge definiert werden, so kann ein leeres Argument, also +wahlweise \OptionValue{tocentrystyle}{} oder +\OptionValue{tocentrystyle}{\PParameter{}} verwendet werden. Dies birgt +allerdings das Risiko, dass bei Ausgabe des entsprechenden Verzeichnisses +diverse Fehler gemeldet werden. + +Abhängig\ChangedAt[2016/03]{v3.20}{\Package{tocbasic}} vom Stil der +Verzeichniseinträge können auch alle für diesen Stil gültigen Eigenschaften +gesetzt werden, indem die entsprechenden in +\autoref{tab:tocbasic.tocstyle.attributes} ab +\autopageref{tab:tocbasic.tocstyle.attributes} aufgeführten Namen mit dem +Präfix \PValue{toc} versehen in der \PName{Optionenliste} angegeben +werden. Nachträgliche Änderungen am Stil sind mit +\Macro{DeclareTOCStyleEntry}% +\IndexCmd{DeclareTOCStyleEntry}\important{\Macro{DeclareTOCStyleEntry}} +jederzeit möglich. Siehe dazu \autoref{sec:tocbasic.tocstyle}, +\autopageref{desc:tocbasic.cmd.DeclareTOCStyleEntry}. % \begin{Example} Das Beispiel aus \autoref{sec:tocbasic.example} kann mit Hilfe der neuen @@ -1349,7 +2355,7 @@ die möglichen Optionen bietet \autoref{tab:tocbasic.DeclareNewTOC-options} ab \label{rem:typo1} \end{remarkbox} \end{lstcode} - Ein Ausschitt aus einer Beispielseite mit dieser Umgebung könnte dann so + Ein Ausschnitt aus einer Beispielseite mit dieser Umgebung könnte dann so aussehen: \begin{center}\footnotesize \begin{tabular} @@ -1380,6 +2386,14 @@ die möglichen Optionen bietet \autoref{tab:tocbasic.DeclareNewTOC-options} ab }{% Optionen für die Anweisung \Macro{DeclareNewTOC} (\emph{Fortsetzung})% }% + \entry{\KOption{atbegin}\PName{Code}\ChangedAt{v3.09}{\Package{tocbasic}}}{% + Falls eine neue Gleitumgebung oder nicht gleitende Umgebung definiert + wird, so wird \PName{Code} jeweils am Anfang dieser Umgebung ausgeführt.% + }% + \entry{\KOption{atend}\PName{Code}\ChangedAt{v3.09}{\Package{tocbasic}}}{% + Falls eine neue Gleitumgebung oder nicht gleitende Umgebung definiert + wird, so wird \PName{Code} jeweils am Ende dieser Umgebung ausgeführt.% + }% \entry{\KOption{counterwithin}\PName{\LaTeX-Zähler}}{% Falls eine neue Gleitumgebung oder eine nicht gleitende Umgebung definiert wird, so wird für diese auch ein neuer Zähler @@ -1414,23 +2428,45 @@ die möglichen Optionen bietet \autoref{tab:tocbasic.DeclareNewTOC-options} ab \entry{\Option{forcenames}}{% Siehe Option \Option{name} und \Option{listname}.}% \entry{\KOption{hang}\PName{Einzug}}{% - Mehrzeilige Verzeichniseinträge in hierarchisch angeordneten - Verzeichnissen besitzen ab der zweiten Zeile einen Einzug von - links. Dieser Einzug wird auch für die Position des Textes in der ersten - Zeile eines nummerierten Eintrags verwendet. Der Wert des Einzugs kann - über diese Option bestimmt werden. Ohne diese Option wird als - \PName{Einzug} 1,5\Unit{em} verwendet.}% + \ChangedAt{v3.20}{\Package{tocbasic}}% + Diese Option gilt seit \KOMAScript~3.20 als überholt. Die Breite der + Nummer des Verzeichniseintrags\index{Verzeichnis>Eintrag} ist nun + stattdessen als Eigenschaft in Abhängigkeit des Verzeichniseintragsstils + von Option \Option{tocentrystyle} anzugeben. Bei den Stilen von + \KOMAScript{} wäre das beispielsweise die Eigenschaft \PValue{numwidth} + und damit Option \Option{tocnumwidth}. Besitzt ein Stil diese Eigenschaft, + so wird sie von \Macro{DeclareNewTOC} mit 1,5\Unit{em} + voreingestellt. Diese Voreinstellung kann durch explizite Angabe von + \KOption{tocnumwidth}\PName{Wert} leicht mit einem anderen \PName{Wert} + überschrieben werden. Für Abbildungen verwenden die \KOMAScript-Klassen + beispielsweise den \PName{Wert} \PValue{2.3em}.}% \entry{\KOption{indent}\PName{Einzug}}{% - In der hierarchischen Form besitzt jeder Verzeichniseintrag einen Einzug - von links. Der Wert des Einzugs kann über diese Option bestimmt - werden. Ohne diese Option wird als \PName{Einzug} 1\Unit{em} verwendet.}% + \ChangedAt{v3.20}{\Package{tocbasic}}% + Diese Option gilt seit \KOMAScript~3.20 als überholt. Der Einzug des + Verzeichniseintrags\index{Verzeichnis>Eintrag} von links ist nun + stattdessen als Eigenschaft in Abhängigkeit des Verzeichniseintragsstils + von Option \Option{tocentrystyle} anzugeben. Bei den Stilen von + \KOMAScript{} wäre das beispielsweise die Eigenschaft \PValue{indent} und + damit Option \Option{tocindent}. Besitzt ein Stil diese Eigenschaft, so + wird sie von \Macro{DeclareNewTOC} mit 1\Unit{em} voreingestellt. Diese + Voreinstellung kann durch explizite Angabe von + \KOption{tocindent}\PName{Wert} leicht mit einem anderen \PName{Wert} + überschrieben werden. Für Abbildungen verwenden die \KOMAScript-Klassen + beispielsweise den \PName{Wert} \PValue{1.5em}.}% \entry{\KOption{level}\PName{Gliederungsebene}}{% - Jeder Eintrag in ein Verzeichnis hat eine nummerische - \PName{Gliederungsebene}, die über diese Option gesetzt werden kann. Ist - diese Option nicht angegeben, so wird der Standardwert 1 verwendet.}% + \ChangedAt{v3.20}{\Package{tocbasic}}% + Diese Option gilt seit \KOMAScript~3.20 als überholt. Der nummerische Wert + der Ebene des Verzeichniseintrags\index{Verzeichnis>Eintrag} ist nun + stattdessen als Eigenschaft in Abhängigkeit des Verzeichniseintragsstils + von Option \Option{tocentrystyle} anzugeben. Nichts desto trotz haben alle + Stile die Eigenschaft \PValue{level} und damit Option + \Option{toclevel}. Die Eigenschaft wird von \Macro{DeclareNewTOC} mit 1 + voreingestellt. Diese Voreinstellung kann durch explizite Angabe von + \KOption{toclevel}\PName{Wert} leicht mit einem anderen \PName{Wert} + überschrieben werden.}% \entry{\KOption{listname}\PName{Verzeichnistitel}}{% Jedes Verzeichnis hat eine Überschrift, die durch diese Option bestimmt - werden kann. Ist die Option nicht angegeben, so wir als Verzeichnistitel + werden kann. Ist die Option nicht angegeben, so wird als Verzeichnistitel »\texttt{List of \PName{Mehrzahl des Eintragstyps}}« (siehe Option \PName{types}) verwendet, wobei das erste Zeichen der \PName{Mehrzahl des Eintragstyps} in einen Großbuchstaben gewandelt wird. Es wird auch ein @@ -1462,6 +2498,17 @@ die möglichen Optionen bietet \autoref{tab:tocbasic.DeclareNewTOC-options} ab kein Besitzer angegeben, so wird der Besitzer »\PValue{float}« verwendet, den auch die \KOMAScript-Klassen für das Abbildungs- und das Tabellenverzeichnis verwenden.}% + \entry{\KOption{tocentrystyle}\PName{Eintragsstil}}{% + \ChangedAt[2016/03]{v3.20}{\Package{tocbasic}}% + \PName{Eintragsstil} gibt den Stil an, den Einträge in das entsprechende + Verzeichnis haben sollen. Der Name der Eintragsebene wird dabei über + Option \Option{type} bestimmt. Zusätzlich zu den Optionen dieser Tabelle + können auch alle Eigenschaften des Stils als Optionen angegeben werden, + indem die Namen der Eigenschaften mit dem Präfix \PValue{toc} ergänzt + werden. So kann der nummerische Wert der Ebene beispielsweise als + \Option{toclevel} angegeben werden. Näheres zu den Stilen ist + \autoref{sec:tocbasic.tocstyle} ab \autopageref{sec:tocbasic.tocstyle} zu + entnehmen.}% \entry{\KOption{type}\PName{Eintragstyp}}{% \PName{Eintragstyp} gibt den Typ der Einträge in das entsprechende Verzeichnis an. Der Typ wird auch als Basisname für verschiedene Makros @@ -1476,7 +2523,13 @@ die möglichen Optionen bietet \autoref{tab:tocbasic.DeclareNewTOC-options} ab so wird als \PName{Mehrzahl des Eintragstyps} einfach »\PName{Eintragstyp}s« verwendet.}% \end{desclist} -% + +Benutzer von \Package{hyperref}\IndexPackage{hyperref} sollten Option +\Option{listname} übrigens immer angeben. Anderenfalls kommt es in der Regel +zu einer Fehlermeldung, weil \Package{hyperref} nicht mit dem +\Macro{MakeUppercase} im Namen des Verzeichnisses zurecht kommt, das benötigt +wird, um den ersten Buchstaben des Wert von \Option{types} in Großbuchstaben +zu wandeln.% \EndIndex{Cmd}{DeclareNewTOC}% % \EndIndex{}{Verzeichnis}% @@ -1494,3 +2547,13 @@ die möglichen Optionen bietet \autoref{tab:tocbasic.DeclareNewTOC-options} ab %%% End: % LocalWords: Verzeichnisdatei Klonquelle Absatzabstandes Absatzabstand + +% LocalWords: Verzeichniseinträge Verzeichniseintrag Eintragsstile +% LocalWords: Inhaltsverzeichniseinträge Standardklassen Nummernbreite +% LocalWords: Standardeigenschaft Eintragsebene Optionenliste expandierbar +% LocalWords: Standardverzeichniseintragsstil Verzeichniseigenschaften +% LocalWords: Verzeichniseintragsstil Verzeichniseintragsstils Eintragsstil +% LocalWords: Kapitelüberschrift Gliederungsebene expandierbares +% LocalWords: Eintragsnummer Initialisierungscode Aktivierungswerte +% LocalWords: Deaktivierungswert Verzeichnistitel Eintragstyp Eintragstyps +% LocalWords: Verzeichniseintrags 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 6395e601ecd..5d16433a2c8 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls +++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls @@ -1,6 +1,6 @@ % ====================================================================== % scrguide.cls -% Copyright (c) Markus Kohm, 2005-2015 +% Copyright (c) Markus Kohm, 2005-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrguide.cls -% Copyright (c) Markus Kohm, 2005-2015 +% Copyright (c) Markus Kohm, 2005-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -38,7 +38,7 @@ % \section{Identification} % % \begin{macrocode} -\ProvidesClass{scrguide}[2015/09/30 v1.9b internal KOMA-Script guide class] +\ProvidesClass{scrguide}[2016/04/05 v1.11 internal KOMA-Script guide class] % \end{macrocode} % % @@ -146,6 +146,8 @@ \RequirePackage{marginnote} \RequirePackage{tabularx} \RequirePackage{xcolor,tocstyle}% hyperref needs xcolor with tocstyle +\RequirePackage{tikz} +\usetikzlibrary{calc} \RequirePackage[\uselanguage]{hyperref} \RequirePackage[open,openlevel=0]{bookmark}% improved pdf bookmarks \RequirePackage{scrhack} @@ -1320,6 +1322,7 @@ onehalfspacing, PackageError,PackageInfo,PackageWarning,PassOptionsToPackage, ProcessOptions,protected@write,ProvidesFile,ProvidesPackage, + providecommand, RequirePackage,RequirePackageWithOptions,setkey,setlength, SelectInputMappings,setkeys, textsuperscript}% @@ -1348,9 +1351,12 @@ captionof,cefoot,cfoot,chapapp, chapappifchapterprefix, chapter,chapterlinesformat,chapterlineswithprefixformat, chapterformat,chaptermarkformat,chapterpagestyle,chead, + Clause, cleardoubleevenemptypage,clearscrheadfoot,closing,cofoot,Comment, + CloneTOCEntryStyle, DeclareLayer,DeclareNewLayer,DeclareNewPageStyleByLayers, DeclarePageStyleByLayers, + DeclareTOCStyleEntry,DeclareTOCEntryStyle, DeclareNewNoteColumn,DeclareNewPageStyleAlias, DeclareNewTOC,DeclareSectionCommand,DeclareNewSectionCommand, RedeclareSectionCommand,ProvideSectionCommand, @@ -1382,7 +1388,7 @@ Name,nameday,newbibstyle,newcaptionname,newkomavar,nexthead, ofoot,ohead,opening,othersectionlevelsformat, p@section,pagemark,paragraphformat,subparagraphformat, - Paragraph,parellipsis,parformat,parname,parshortname, + parellipsis,parformat,parname,parshortname, part,partformat,partname,partpagestyle,pnumfont, PreventPackageFromLoading,providecaptionname,publishers,ps, putLL,putLR,putUL,putUR,putC, @@ -1404,12 +1410,13 @@ setkomavar,setlengthtoplength,setparsizes,setpartpreamble,setuptoc, showfields,showenvelope,showISOenvelope,showUScommercial,showUScheck, storeareas,StorePreventPackageFromLoading, - subject,SubParagraph,subsectionmarkformat,subtitle,syncwithnotecolumn, + subject,SubClause,subsectionmarkformat,subtitle,syncwithnotecolumn, tableformat,tablename,tableofcontents,textsubscript,thechapter,thefigure, thefootnotemark,thepar,thepart,thesection,thesentence,thesubsection, thesubsubsection,theparagraph,thesubparagraph, thetable,thistime, titlehead,tocbasic@extend@babel,TOCclone,todaysname,typearea,% + TOCEntryStyleInitCode,TOCEntryStyleStartInitCode,TOCLineLeaderFill, UnPreventPackageFromLoading,unitfactor, unsettoc,usekomafont,useplength,usekomavar,uppertitleback% }% 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 6ab0c97f547..7fcea465d6c 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.html +++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.html @@ -11,302 +11,330 @@ <h2><a name="option">Optionen</a></h2> <ul> <li><a name="option.abstract"></a><a href="#option.abstract">abstract</a> --> <a href="scrguide.pdf#maincls.option.abstract">71</a></li> -<li><a name="option.addrfield"></a><a href="#option.addrfield">addrfield</a> --> <a href="scrguide.pdf#scrlttr2.option.addrfield">190</a></li> -<li><a name="option.adrFreeIVempty"></a><a href="#option.adrFreeIVempty">adrFreeIVempty</a> --> <a href="scrguide.pdf#scraddr.option.adrFreeIVempty">260</a></li> -<li><a name="option.adrFreeIVshow"></a><a href="#option.adrFreeIVshow">adrFreeIVshow</a> --> <a href="scrguide.pdf#scraddr.option.adrFreeIVshow">260</a></li> -<li><a name="option.adrFreeIVstop"></a><a href="#option.adrFreeIVstop">adrFreeIVstop</a> --> <a href="scrguide.pdf#scraddr.option.adrFreeIVstop">260</a></li> -<li><a name="option.adrFreeIVwarn"></a><a href="#option.adrFreeIVwarn">adrFreeIVwarn</a> --> <a href="scrguide.pdf#scraddr.option.adrFreeIVwarn">260</a></li> +<li><a name="option.addrfield"></a><a href="#option.addrfield">addrfield</a> --> <a href="scrguide.pdf#scrlttr2.option.addrfield">191</a></li> +<li><a name="option.adrFreeIVempty"></a><a href="#option.adrFreeIVempty">adrFreeIVempty</a> --> <a href="scrguide.pdf#scraddr.option.adrFreeIVempty">261</a></li> +<li><a name="option.adrFreeIVshow"></a><a href="#option.adrFreeIVshow">adrFreeIVshow</a> --> <a href="scrguide.pdf#scraddr.option.adrFreeIVshow">261</a></li> +<li><a name="option.adrFreeIVstop"></a><a href="#option.adrFreeIVstop">adrFreeIVstop</a> --> <a href="scrguide.pdf#scraddr.option.adrFreeIVstop">261</a></li> +<li><a name="option.adrFreeIVwarn"></a><a href="#option.adrFreeIVwarn">adrFreeIVwarn</a> --> <a href="scrguide.pdf#scraddr.option.adrFreeIVwarn">261</a></li> <li><a name="option.appendixprefix"></a><a href="#option.appendixprefix">appendixprefix</a> --> <a href="scrguide.pdf#maincls.option.appendixprefix">95</a></li> -<li><a name="option.autoclearnotecolumns"></a><a href="#option.autoclearnotecolumns">autoclearnotecolumns</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.option.autoclearnotecolumns">388</a></li> -<li><a name="option.automark"></a><a href="#option.automark">automark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.automark">239</a></li> -<li><a name="option.autooneside"></a><a href="#option.autooneside">autooneside</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.autooneside">239</a></li> -<li><a name="option.autoremoveinterfaces"></a><a href="#option.autoremoveinterfaces">autoremoveinterfaces</a> --> <a href="scrguide.pdf#scrlayer.option.autoremoveinterfaces">364</a></li> -<li><a name="option.backaddress"></a><a href="#option.backaddress">backaddress</a> --> <a href="scrguide.pdf#scrlttr2.option.backaddress">190</a></li> -<li><a name="option.bibliography"></a><a href="#option.bibliography">bibliography</a> --> <a href="scrguide.pdf#maincls.option.bibliography">148</a></li> +<li><a name="option.autoclearnotecolumns"></a><a href="#option.autoclearnotecolumns">autoclearnotecolumns</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.option.autoclearnotecolumns">423</a></li> +<li><a name="option.automark"></a><a href="#option.automark">automark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.automark">240</a></li> +<li><a name="option.autooneside"></a><a href="#option.autooneside">autooneside</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.autooneside">240</a></li> +<li><a name="option.autoremoveinterfaces"></a><a href="#option.autoremoveinterfaces">autoremoveinterfaces</a> --> <a href="scrguide.pdf#scrlayer.option.autoremoveinterfaces">399</a></li> +<li><a name="option.backaddress"></a><a href="#option.backaddress">backaddress</a> --> <a href="scrguide.pdf#scrlttr2.option.backaddress">191</a></li> +<li><a name="option.bibliography"></a><a href="#option.bibliography">bibliography</a> --> <a href="scrguide.pdf#maincls.option.bibliography">149</a></li> <li><a name="option.captions"></a><a href="#option.captions">captions</a> --> <a href="scrguide.pdf#maincls.option.captions">129</a></li> <li><a name="option.chapteratlists"></a><a href="#option.chapteratlists">chapteratlists</a> --> <a href="scrguide.pdf#maincls.option.chapteratlists">100</a></li> <li><a name="option.chapterentrydots"></a><a href="#option.chapterentrydots">chapterentrydots</a> --> <a href="scrguide.pdf#maincls.option.chapterentrydots">75</a></li> <li><a name="option.chapterprefix"></a><a href="#option.chapterprefix">chapterprefix</a> --> <a href="scrguide.pdf#maincls.option.chapterprefix">95</a></li> +<li><a name="option.clausemark"></a><a href="#option.clausemark">clausemark</a> --> <a href="scrguide.pdf#scrjura.option.clausemark">272</a></li> <li><a name="option.cleardoublepage"></a><a href="#option.cleardoublepage">cleardoublepage</a> --> <a href="scrguide.pdf#maincls.option.cleardoublepage">87</a></li> -<li><a name="option.clines"></a><a href="#option.clines">clines</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.clines">250</a></li> -<li><a name="option.deactivatepagestylelayers"></a><a href="#option.deactivatepagestylelayers">deactivatepagestylelayers</a> --> <a href="scrguide.pdf#scrlayer.option.deactivatepagestylelayers">357</a></li> -<li><a name="option.draft"></a><a href="#option.draft">draft</a> --> <a href="scrguide.pdf#scrlayer.option.draft">361</a>, <a href="scrguide.pdf#maincls.option.draft">56</a></li> -<li><a name="option.enlargefirstpage"></a><a href="#option.enlargefirstpage">enlargefirstpage</a> --> <a href="scrguide.pdf#scrlttr2.option.enlargefirstpage">178</a></li> -<li><a name="option.extendedfeature"></a><a href="#option.extendedfeature">extendedfeature</a> --> <a href="scrguide.pdf#scrextend.option.extendedfeature">264</a></li> -<li><a name="option.firstfoot"></a><a href="#option.firstfoot">firstfoot</a> --> <a href="scrguide.pdf#scrlttr2.option.firstfoot">203</a></li> -<li><a name="option.firsthead"></a><a href="#option.firsthead">firsthead</a> --> <a href="scrguide.pdf#scrlttr2.option.firsthead">179</a></li> +<li><a name="option.clines"></a><a href="#option.clines">clines</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.clines">251</a></li> +<li><a name="option.contract"></a><a href="#option.contract">contract</a> --> <a href="scrguide.pdf#scrjura.option.contract">269</a></li> +<li><a name="option.deactivatepagestylelayers"></a><a href="#option.deactivatepagestylelayers">deactivatepagestylelayers</a> --> <a href="scrguide.pdf#scrlayer.option.deactivatepagestylelayers">392</a></li> +<li><a name="option.draft"></a><a href="#option.draft">draft</a> --> <a href="scrguide.pdf#scrlayer.option.draft">396</a>, <a href="scrguide.pdf#maincls.option.draft">56</a></li> +<li><a name="option.enlargefirstpage"></a><a href="#option.enlargefirstpage">enlargefirstpage</a> --> <a href="scrguide.pdf#scrlttr2.option.enlargefirstpage">179</a></li> +<li><a name="option.extendedfeature"></a><a href="#option.extendedfeature">extendedfeature</a> --> <a href="scrguide.pdf#scrextend.option.extendedfeature">265</a></li> +<li><a name="option.firstfoot"></a><a href="#option.firstfoot">firstfoot</a> --> <a href="scrguide.pdf#scrlttr2.option.firstfoot">204</a></li> +<li><a name="option.firsthead"></a><a href="#option.firsthead">firsthead</a> --> <a href="scrguide.pdf#scrlttr2.option.firsthead">180</a></li> <li><a name="option.fleqn"></a><a href="#option.fleqn">fleqn</a> --> <a href="scrguide.pdf#maincls.option.fleqn">128</a></li> -<li><a name="option.foldmarks"></a><a href="#option.foldmarks">foldmarks</a> --> <a href="scrguide.pdf#scrlttr2.option.foldmarks">177</a></li> -<li><a name="option.fontsize"></a><a href="#option.fontsize">fontsize</a> --> <a href="scrguide.pdf#scrlttr2.option.fontsize">170</a>, <a href="scrguide.pdf#maincls.option.fontsize">57</a></li> -<li><a name="option.footbotline"></a><a href="#option.footbotline">footbotline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.footbotline">248</a></li> +<li><a name="option.foldmarks"></a><a href="#option.foldmarks">foldmarks</a> --> <a href="scrguide.pdf#scrlttr2.option.foldmarks">178</a></li> +<li><a name="option.fontsize"></a><a href="#option.fontsize">fontsize</a> --> <a href="scrguide.pdf#scrlttr2.option.fontsize">171</a>, <a href="scrguide.pdf#maincls.option.fontsize">57</a></li> +<li><a name="option.footbotline"></a><a href="#option.footbotline">footbotline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.footbotline">249</a></li> <li><a name="option.footnotes"></a><a href="#option.footnotes">footnotes</a> --> <a href="scrguide.pdf#maincls.option.footnotes">89</a></li> -<li><a name="option.footsepline"></a><a href="#option.footsepline">footsepline</a> --> <a href="scrguide.pdf#scrlttr2.option.footsepline">207</a>, <a href="scrguide.pdf#scrlayer-scrpage.option.footsepline">248</a>, <a href="scrguide.pdf#maincls.option.footsepline">81</a></li> -<li><a name="option.footwidth"></a><a href="#option.footwidth">footwidth</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.footwidth">247</a></li> -<li><a name="option.forceoverwrite"></a><a href="#option.forceoverwrite">forceoverwrite</a> --> <a href="scrguide.pdf#scrlayer.option.forceoverwrite">364</a></li> -<li><a name="option.fromalign"></a><a href="#option.fromalign">fromalign</a> --> <a href="scrguide.pdf#scrlttr2.option.fromalign">179</a></li> -<li><a name="option.fromemail"></a><a href="#option.fromemail">fromemail</a> --> <a href="scrguide.pdf#scrlttr2.option.fromemail">184</a></li> -<li><a name="option.fromfax"></a><a href="#option.fromfax">fromfax</a> --> <a href="scrguide.pdf#scrlttr2.option.fromfax">184</a></li> -<li><a name="option.fromlogo"></a><a href="#option.fromlogo">fromlogo</a> --> <a href="scrguide.pdf#scrlttr2.option.fromlogo">188</a></li> -<li><a name="option.frommobilephone"></a><a href="#option.frommobilephone">frommobilephone</a> --> <a href="scrguide.pdf#scrlttr2.option.frommobilephone">184</a></li> -<li><a name="option.fromphone"></a><a href="#option.fromphone">fromphone</a> --> <a href="scrguide.pdf#scrlttr2.option.fromphone">184</a></li> -<li><a name="option.fromrule"></a><a href="#option.fromrule">fromrule</a> --> <a href="scrguide.pdf#scrlttr2.option.fromrule">179</a></li> -<li><a name="option.fromurl"></a><a href="#option.fromurl">fromurl</a> --> <a href="scrguide.pdf#scrlttr2.option.fromurl">184</a></li> +<li><a name="option.footsepline"></a><a href="#option.footsepline">footsepline</a> --> <a href="scrguide.pdf#scrlttr2.option.footsepline">208</a>, <a href="scrguide.pdf#scrlayer-scrpage.option.footsepline">249</a>, <a href="scrguide.pdf#maincls.option.footsepline">81</a></li> +<li><a name="option.footwidth"></a><a href="#option.footwidth">footwidth</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.footwidth">248</a></li> +<li><a name="option.forceoverwrite"></a><a href="#option.forceoverwrite">forceoverwrite</a> --> <a href="scrguide.pdf#scrlayer.option.forceoverwrite">399</a></li> +<li><a name="option.fromalign"></a><a href="#option.fromalign">fromalign</a> --> <a href="scrguide.pdf#scrlttr2.option.fromalign">180</a></li> +<li><a name="option.fromemail"></a><a href="#option.fromemail">fromemail</a> --> <a href="scrguide.pdf#scrlttr2.option.fromemail">185</a></li> +<li><a name="option.fromfax"></a><a href="#option.fromfax">fromfax</a> --> <a href="scrguide.pdf#scrlttr2.option.fromfax">185</a></li> +<li><a name="option.fromlogo"></a><a href="#option.fromlogo">fromlogo</a> --> <a href="scrguide.pdf#scrlttr2.option.fromlogo">189</a></li> +<li><a name="option.frommobilephone"></a><a href="#option.frommobilephone">frommobilephone</a> --> <a href="scrguide.pdf#scrlttr2.option.frommobilephone">185</a></li> +<li><a name="option.fromphone"></a><a href="#option.fromphone">fromphone</a> --> <a href="scrguide.pdf#scrlttr2.option.fromphone">185</a></li> +<li><a name="option.fromrule"></a><a href="#option.fromrule">fromrule</a> --> <a href="scrguide.pdf#scrlttr2.option.fromrule">181</a></li> +<li><a name="option.fromurl"></a><a href="#option.fromurl">fromurl</a> --> <a href="scrguide.pdf#scrlttr2.option.fromurl">185</a></li> <li><a name="option.headings"></a><a href="#option.headings">headings</a> --> <a href="scrguide.pdf#maincls.option.headings">97</a></li> -<li><a name="option.headsepline"></a><a href="#option.headsepline">headsepline</a> --> <a href="scrguide.pdf#scrlttr2.option.headsepline">207</a>, <a href="scrguide.pdf#scrlayer-scrpage.option.headsepline">248</a>, <a href="scrguide.pdf#maincls.option.headsepline">81</a></li> -<li><a name="option.headtopline"></a><a href="#option.headtopline">headtopline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.headtopline">248</a></li> -<li><a name="option.headwidth"></a><a href="#option.headwidth">headwidth</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.headwidth">247</a></li> -<li><a name="option.hmode"></a><a href="#option.hmode">hmode</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.option.hmode">377</a></li> -<li><a name="option.ilines"></a><a href="#option.ilines">ilines</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.ilines">250</a></li> -<li><a name="option.index"></a><a href="#option.index">index</a> --> <a href="scrguide.pdf#maincls.option.index">151</a></li> -<li><a name="option.internalonly"></a><a href="#option.internalonly">internalonly</a> --> <a href="scrguide.pdf#scrbase.option.internalonly">269</a></li> -<li><a name="option.komastyle"></a><a href="#option.komastyle">komastyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.komastyle">239</a></li> +<li><a name="option.headsepline"></a><a href="#option.headsepline">headsepline</a> --> <a href="scrguide.pdf#scrlttr2.option.headsepline">208</a>, <a href="scrguide.pdf#scrlayer-scrpage.option.headsepline">249</a>, <a href="scrguide.pdf#maincls.option.headsepline">81</a></li> +<li><a name="option.headtopline"></a><a href="#option.headtopline">headtopline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.headtopline">249</a></li> +<li><a name="option.headwidth"></a><a href="#option.headwidth">headwidth</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.headwidth">248</a></li> +<li><a name="option.hmode"></a><a href="#option.hmode">hmode</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.option.hmode">412</a></li> +<li><a name="option.ilines"></a><a href="#option.ilines">ilines</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.ilines">251</a></li> +<li><a name="option.index"></a><a href="#option.index">index</a> --> <a href="scrguide.pdf#maincls.option.index">152</a></li> +<li><a name="option.internalonly"></a><a href="#option.internalonly">internalonly</a> --> <a href="scrguide.pdf#scrbase.option.internalonly">289</a></li> +<li><a name="option.juratitlepagebreak"></a><a href="#option.juratitlepagebreak">juratitlepagebreak</a> --> <a href="scrguide.pdf#scrjura.option.juratitlepagebreak">272</a></li> +<li><a name="option.juratocindent"></a><a href="#option.juratocindent">juratocindent</a> --> <a href="scrguide.pdf#scrjura.option.juratocindent">269</a></li> +<li><a name="option.juratocnumberwidth"></a><a href="#option.juratocnumberwidth">juratocnumberwidth</a> --> <a href="scrguide.pdf#scrjura.option.juratocnumberwidth">269</a></li> +<li><a name="option.juratotoc"></a><a href="#option.juratotoc">juratotoc</a> --> <a href="scrguide.pdf#scrjura.option.juratotoc">268</a></li> +<li><a name="option.komastyle"></a><a href="#option.komastyle">komastyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.komastyle">240</a></li> <li><a name="option.leqno"></a><a href="#option.leqno">leqno</a> --> <a href="scrguide.pdf#maincls.option.leqno">128</a></li> <li><a name="option.listof"></a><a href="#option.listof">listof</a> --> <a href="scrguide.pdf#maincls.option.listof">143</a></li> -<li><a name="option.locfield"></a><a href="#option.locfield">locfield</a> --> <a href="scrguide.pdf#scrlttr2.option.locfield">195</a></li> -<li><a name="option.manualmark"></a><a href="#option.manualmark">manualmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.manualmark">239</a></li> -<li><a name="option.markcase"></a><a href="#option.markcase">markcase</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.markcase">242</a></li> +<li><a name="option.locfield"></a><a href="#option.locfield">locfield</a> --> <a href="scrguide.pdf#scrlttr2.option.locfield">196</a></li> +<li><a name="option.manualmark"></a><a href="#option.manualmark">manualmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.manualmark">240</a></li> +<li><a name="option.markcase"></a><a href="#option.markcase">markcase</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.markcase">243</a></li> <li><a name="option.numbers"></a><a href="#option.numbers">numbers</a> --> <a href="scrguide.pdf#maincls.option.numbers">99</a></li> -<li><a name="option.numericaldate"></a><a href="#option.numericaldate">numericaldate</a> --> <a href="scrguide.pdf#scrlttr2.option.numericaldate">196</a></li> -<li><a name="option.olines"></a><a href="#option.olines">olines</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.olines">250</a></li> -<li><a name="option.onpsbackground"></a><a href="#option.onpsbackground">onpsbackground</a> --> <a href="scrguide.pdf#scrlayer.option.onpsbackground">356</a></li> -<li><a name="option.onpsevenpage"></a><a href="#option.onpsevenpage">onpsevenpage</a> --> <a href="scrguide.pdf#scrlayer.option.onpsevenpage">356</a></li> -<li><a name="option.onpsfloatpage"></a><a href="#option.onpsfloatpage">onpsfloatpage</a> --> <a href="scrguide.pdf#scrlayer.option.onpsfloatpage">356</a></li> -<li><a name="option.onpsforeground"></a><a href="#option.onpsforeground">onpsforeground</a> --> <a href="scrguide.pdf#scrlayer.option.onpsforeground">356</a></li> -<li><a name="option.onpsinit"></a><a href="#option.onpsinit">onpsinit</a> --> <a href="scrguide.pdf#scrlayer.option.onpsinit">356</a></li> -<li><a name="option.onpsnonfloatpage"></a><a href="#option.onpsnonfloatpage">onpsnonfloatpage</a> --> <a href="scrguide.pdf#scrlayer.option.onpsnonfloatpage">356</a></li> -<li><a name="option.onpsoddpage"></a><a href="#option.onpsoddpage">onpsoddpage</a> --> <a href="scrguide.pdf#scrlayer.option.onpsoddpage">356</a></li> -<li><a name="option.onpsoneside"></a><a href="#option.onpsoneside">onpsoneside</a> --> <a href="scrguide.pdf#scrlayer.option.onpsoneside">356</a></li> -<li><a name="option.onpsselect"></a><a href="#option.onpsselect">onpsselect</a> --> <a href="scrguide.pdf#scrlayer.option.onpsselect">356</a></li> -<li><a name="option.onpstwoside"></a><a href="#option.onpstwoside">onpstwoside</a> --> <a href="scrguide.pdf#scrlayer.option.onpstwoside">356</a></li> +<li><a name="option.numericaldate"></a><a href="#option.numericaldate">numericaldate</a> --> <a href="scrguide.pdf#scrlttr2.option.numericaldate">197</a></li> +<li><a name="option.olines"></a><a href="#option.olines">olines</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.olines">251</a></li> +<li><a name="option.onpsbackground"></a><a href="#option.onpsbackground">onpsbackground</a> --> <a href="scrguide.pdf#scrlayer.option.onpsbackground">391</a></li> +<li><a name="option.onpsevenpage"></a><a href="#option.onpsevenpage">onpsevenpage</a> --> <a href="scrguide.pdf#scrlayer.option.onpsevenpage">391</a></li> +<li><a name="option.onpsfloatpage"></a><a href="#option.onpsfloatpage">onpsfloatpage</a> --> <a href="scrguide.pdf#scrlayer.option.onpsfloatpage">391</a></li> +<li><a name="option.onpsforeground"></a><a href="#option.onpsforeground">onpsforeground</a> --> <a href="scrguide.pdf#scrlayer.option.onpsforeground">391</a></li> +<li><a name="option.onpsinit"></a><a href="#option.onpsinit">onpsinit</a> --> <a href="scrguide.pdf#scrlayer.option.onpsinit">391</a></li> +<li><a name="option.onpsnonfloatpage"></a><a href="#option.onpsnonfloatpage">onpsnonfloatpage</a> --> <a href="scrguide.pdf#scrlayer.option.onpsnonfloatpage">391</a></li> +<li><a name="option.onpsoddpage"></a><a href="#option.onpsoddpage">onpsoddpage</a> --> <a href="scrguide.pdf#scrlayer.option.onpsoddpage">391</a></li> +<li><a name="option.onpsoneside"></a><a href="#option.onpsoneside">onpsoneside</a> --> <a href="scrguide.pdf#scrlayer.option.onpsoneside">391</a></li> +<li><a name="option.onpsselect"></a><a href="#option.onpsselect">onpsselect</a> --> <a href="scrguide.pdf#scrlayer.option.onpsselect">391</a></li> +<li><a name="option.onpstwoside"></a><a href="#option.onpstwoside">onpstwoside</a> --> <a href="scrguide.pdf#scrlayer.option.onpstwoside">391</a></li> <li><a name="option.open"></a><a href="#option.open">open</a> --> <a href="scrguide.pdf#maincls.option.open">95</a></li> <li><a name="option.origlongtable"></a><a href="#option.origlongtable">origlongtable</a> --> <a href="scrguide.pdf#maincls.option.origlongtable">143</a></li> -<li><a name="option.pagenumber"></a><a href="#option.pagenumber">pagenumber</a> --> <a href="scrguide.pdf#scrlttr2.option.pagenumber">207</a></li> +<li><a name="option.pagenumber"></a><a href="#option.pagenumber">pagenumber</a> --> <a href="scrguide.pdf#scrlttr2.option.pagenumber">208</a></li> <li><a name="option.pagesize"></a><a href="#option.pagesize">pagesize</a> --> <a href="scrguide.pdf#typearea.option.pagesize">50</a></li> <li><a name="option.paper"></a><a href="#option.paper">paper</a> --> <a href="scrguide.pdf#typearea.option.paper">49</a></li> +<li><a name="option.parnumber"></a><a href="#option.parnumber">parnumber</a> --> <a href="scrguide.pdf#scrjura.option.parnumber">272</a></li> <li><a name="option.parskip"></a><a href="#option.parskip">parskip</a> --> <a href="scrguide.pdf#maincls.option.parskip">78</a></li> -<li><a name="option.plainfootbotline"></a><a href="#option.plainfootbotline">plainfootbotline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.plainfootbotline">250</a></li> -<li><a name="option.plainfootsepline"></a><a href="#option.plainfootsepline">plainfootsepline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.plainfootsepline">250</a></li> -<li><a name="option.plainheadsepline"></a><a href="#option.plainheadsepline">plainheadsepline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.plainheadsepline">250</a></li> -<li><a name="option.plainheadtopline"></a><a href="#option.plainheadtopline">plainheadtopline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.plainheadtopline">250</a></li> -<li><a name="option.priority"></a><a href="#option.priority">priority</a> --> <a href="scrguide.pdf#scrlttr2.option.priority">190</a></li> -<li><a name="option.refline"></a><a href="#option.refline">refline</a> --> <a href="scrguide.pdf#scrlttr2.option.refline">197</a></li> +<li><a name="option.plainfootbotline"></a><a href="#option.plainfootbotline">plainfootbotline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.plainfootbotline">251</a></li> +<li><a name="option.plainfootsepline"></a><a href="#option.plainfootsepline">plainfootsepline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.plainfootsepline">251</a></li> +<li><a name="option.plainheadsepline"></a><a href="#option.plainheadsepline">plainheadsepline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.plainheadsepline">251</a></li> +<li><a name="option.plainheadtopline"></a><a href="#option.plainheadtopline">plainheadtopline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.plainheadtopline">251</a></li> +<li><a name="option.priority"></a><a href="#option.priority">priority</a> --> <a href="scrguide.pdf#scrlttr2.option.priority">191</a></li> +<li><a name="option.ref"></a><a href="#option.ref">ref</a> --> <a href="scrguide.pdf#scrjura.option.ref">276</a></li> +<li><a name="option.refline"></a><a href="#option.refline">refline</a> --> <a href="scrguide.pdf#scrlttr2.option.refline">198</a></li> <li><a name="option.sectionentrydots"></a><a href="#option.sectionentrydots">sectionentrydots</a> --> <a href="scrguide.pdf#maincls.option.sectionentrydots">75</a></li> -<li><a name="option.standardstyle"></a><a href="#option.standardstyle">standardstyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.standardstyle">239</a></li> -<li><a name="option.subject"></a><a href="#option.subject">subject</a> --> <a href="scrguide.pdf#scrlttr2.option.subject">201</a></li> -<li><a name="option.symbolicnames"></a><a href="#option.symbolicnames">symbolicnames</a> --> <a href="scrguide.pdf#scrlttr2.option.symbolicnames">184</a></li> +<li><a name="option.standardstyle"></a><a href="#option.standardstyle">standardstyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage.option.standardstyle">240</a></li> +<li><a name="option.subject"></a><a href="#option.subject">subject</a> --> <a href="scrguide.pdf#scrlttr2.option.subject">202</a></li> +<li><a name="option.symbolicnames"></a><a href="#option.symbolicnames">symbolicnames</a> --> <a href="scrguide.pdf#scrlttr2.option.symbolicnames">185</a></li> <li><a name="option.titlepage"></a><a href="#option.titlepage">titlepage</a> --> <a href="scrguide.pdf#maincls.option.titlepage">65</a></li> <li><a name="option.toc"></a><a href="#option.toc">toc</a> --> <a href="scrguide.pdf#maincls.option.toc">72</a></li> <li><a name="option.version"></a><a href="#option.version">version</a> --> <a href="scrguide.pdf#typearea.option.version">33</a></li> -<li><a name="option.visualize"></a><a href="#option.visualize">visualize</a> --> <a href="scrguide.pdf#scrlttr2-experts.option.visualize">437</a></li> +<li><a name="option.visualize"></a><a href="#option.visualize">visualize</a> --> <a href="scrguide.pdf#scrlttr2-experts.option.visualize">473</a></li> </ul> <h2><a name="macro">Anweisungen</a></h2> <ul> -<li><a name="cmd.@addtoplength"></a><a href="#cmd.@addtoplength">\@addtoplength</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.@addtoplength">422</a></li> -<li><a name="cmd.@fontsizefilebase"></a><a href="#cmd.@fontsizefilebase">\@fontsizefilebase</a> --> <a href="scrguide.pdf#maincls-experts.cmd.@fontsizefilebase">395</a></li> -<li><a name="cmd.@mkboth"></a><a href="#cmd.@mkboth">\@mkboth</a> --> <a href="scrguide.pdf#scrlayer.cmd.@mkboth">363</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.@mkboth">369</a></li> -<li><a name="cmd.@mkdouble"></a><a href="#cmd.@mkdouble">\@mkdouble</a> --> <a href="scrguide.pdf#scrlayer.cmd.@mkdouble">363</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.@mkdouble">369</a></li> -<li><a name="cmd.@mkleft"></a><a href="#cmd.@mkleft">\@mkleft</a> --> <a href="scrguide.pdf#scrlayer.cmd.@mkleft">363</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.@mkleft">369</a></li> -<li><a name="cmd.@mkright"></a><a href="#cmd.@mkright">\@mkright</a> --> <a href="scrguide.pdf#scrlayer.cmd.@mkright">363</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.@mkright">369</a></li> -<li><a name="cmd.@newplength"></a><a href="#cmd.@newplength">\@newplength</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.@newplength">422</a></li> -<li><a name="cmd.@openbib@code"></a><a href="#cmd.@openbib@code">\@openbib@code</a> --> <a href="scrguide.pdf#maincls-experts.cmd.@openbib@code">415</a></li> -<li><a name="cmd.@setplength"></a><a href="#cmd.@setplength">\@setplength</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.@setplength">422</a></li> -<li><a name="cmd.AddLayersAtBeginOfPageStyle"></a><a href="#cmd.AddLayersAtBeginOfPageStyle">\AddLayersAtBeginOfPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddLayersAtBeginOfPageStyle">357</a></li> -<li><a name="cmd.AddLayersAtEndOfPageStyle"></a><a href="#cmd.AddLayersAtEndOfPageStyle">\AddLayersAtEndOfPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddLayersAtEndOfPageStyle">357</a></li> -<li><a name="cmd.AddLayersToPageStyle"></a><a href="#cmd.AddLayersToPageStyle">\AddLayersToPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddLayersToPageStyle">357</a></li> -<li><a name="cmd.AddLayersToPageStyleAfterLayer"></a><a href="#cmd.AddLayersToPageStyleAfterLayer">\AddLayersToPageStyleAfterLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddLayersToPageStyleAfterLayer">358</a></li> -<li><a name="cmd.AddLayersToPageStyleBeforeLayer"></a><a href="#cmd.AddLayersToPageStyleBeforeLayer">\AddLayersToPageStyleBeforeLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddLayersToPageStyleBeforeLayer">358</a></li> -<li><a name="cmd.AddToLayerPageStyleOptions"></a><a href="#cmd.AddToLayerPageStyleOptions">\AddToLayerPageStyleOptions</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddToLayerPageStyleOptions">359</a></li> -<li><a name="cmd.Address"></a><a href="#cmd.Address">\Address</a> --> <a href="scrguide.pdf#scraddr.cmd.Address">258</a></li> -<li><a name="cmd.AfterAtEndOfClass"></a><a href="#cmd.AfterAtEndOfClass">\AfterAtEndOfClass</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterAtEndOfClass">295</a></li> -<li><a name="cmd.AfterAtEndOfPackage"></a><a href="#cmd.AfterAtEndOfPackage">\AfterAtEndOfPackage</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterAtEndOfPackage">295</a></li> +<li><a name="cmd.@addtoplength"></a><a href="#cmd.@addtoplength">\@addtoplength</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.@addtoplength">458</a></li> +<li><a name="cmd.@fontsizefilebase"></a><a href="#cmd.@fontsizefilebase">\@fontsizefilebase</a> --> <a href="scrguide.pdf#maincls-experts.cmd.@fontsizefilebase">430</a></li> +<li><a name="cmd.@mkboth"></a><a href="#cmd.@mkboth">\@mkboth</a> --> <a href="scrguide.pdf#scrlayer.cmd.@mkboth">398</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.@mkboth">404</a></li> +<li><a name="cmd.@mkdouble"></a><a href="#cmd.@mkdouble">\@mkdouble</a> --> <a href="scrguide.pdf#scrlayer.cmd.@mkdouble">398</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.@mkdouble">404</a></li> +<li><a name="cmd.@mkleft"></a><a href="#cmd.@mkleft">\@mkleft</a> --> <a href="scrguide.pdf#scrlayer.cmd.@mkleft">398</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.@mkleft">404</a></li> +<li><a name="cmd.@mkright"></a><a href="#cmd.@mkright">\@mkright</a> --> <a href="scrguide.pdf#scrlayer.cmd.@mkright">398</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.@mkright">404</a></li> +<li><a name="cmd.@newplength"></a><a href="#cmd.@newplength">\@newplength</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.@newplength">458</a></li> +<li><a name="cmd.@openbib@code"></a><a href="#cmd.@openbib@code">\@openbib@code</a> --> <a href="scrguide.pdf#maincls-experts.cmd.@openbib@code">451</a></li> +<li><a name="cmd.@setplength"></a><a href="#cmd.@setplength">\@setplength</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.@setplength">458</a></li> +<li><a name="cmd.AddLayersAtBeginOfPageStyle"></a><a href="#cmd.AddLayersAtBeginOfPageStyle">\AddLayersAtBeginOfPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddLayersAtBeginOfPageStyle">392</a></li> +<li><a name="cmd.AddLayersAtEndOfPageStyle"></a><a href="#cmd.AddLayersAtEndOfPageStyle">\AddLayersAtEndOfPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddLayersAtEndOfPageStyle">392</a></li> +<li><a name="cmd.AddLayersToPageStyle"></a><a href="#cmd.AddLayersToPageStyle">\AddLayersToPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddLayersToPageStyle">392</a></li> +<li><a name="cmd.AddLayersToPageStyleAfterLayer"></a><a href="#cmd.AddLayersToPageStyleAfterLayer">\AddLayersToPageStyleAfterLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddLayersToPageStyleAfterLayer">393</a></li> +<li><a name="cmd.AddLayersToPageStyleBeforeLayer"></a><a href="#cmd.AddLayersToPageStyleBeforeLayer">\AddLayersToPageStyleBeforeLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddLayersToPageStyleBeforeLayer">393</a></li> +<li><a name="cmd.AddToLayerPageStyleOptions"></a><a href="#cmd.AddToLayerPageStyleOptions">\AddToLayerPageStyleOptions</a> --> <a href="scrguide.pdf#scrlayer.cmd.AddToLayerPageStyleOptions">394</a></li> +<li><a name="cmd.Address"></a><a href="#cmd.Address">\Address</a> --> <a href="scrguide.pdf#scraddr.cmd.Address">259</a></li> +<li><a name="cmd.AfterAtEndOfClass"></a><a href="#cmd.AfterAtEndOfClass">\AfterAtEndOfClass</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterAtEndOfClass">315</a></li> +<li><a name="cmd.AfterAtEndOfPackage"></a><a href="#cmd.AfterAtEndOfPackage">\AfterAtEndOfPackage</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterAtEndOfPackage">315</a></li> <li><a name="cmd.AfterBibliographyPreamble"></a><a href="#cmd.AfterBibliographyPreamble">\AfterBibliographyPreamble</a> --> <a href="scrguide.pdf#maincls.cmd.AfterBibliographyPreamble">151</a></li> -<li><a name="cmd.AfterCalculatingTypearea"></a><a href="#cmd.AfterCalculatingTypearea">\AfterCalculatingTypearea</a> --> <a href="scrguide.pdf#typearea-experts.cmd.AfterCalculatingTypearea">391</a></li> -<li><a name="cmd.AfterClass!"></a><a href="#cmd.AfterClass!">\AfterClass!</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterClass!">295</a></li> -<li><a name="cmd.AfterClass*"></a><a href="#cmd.AfterClass*">\AfterClass*</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterClass*">295</a></li> -<li><a name="cmd.AfterClass+"></a><a href="#cmd.AfterClass+">\AfterClass+</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterClass+">295</a></li> -<li><a name="cmd.AfterClass"></a><a href="#cmd.AfterClass">\AfterClass</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterClass">295</a></li> -<li><a name="cmd.AfterFile"></a><a href="#cmd.AfterFile">\AfterFile</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterFile">295</a></li> -<li><a name="cmd.AfterPackage!"></a><a href="#cmd.AfterPackage!">\AfterPackage!</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterPackage!">295</a></li> -<li><a name="cmd.AfterPackage*"></a><a href="#cmd.AfterPackage*">\AfterPackage*</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterPackage*">295</a></li> -<li><a name="cmd.AfterPackage+"></a><a href="#cmd.AfterPackage+">\AfterPackage+</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterPackage+">295</a></li> -<li><a name="cmd.AfterPackage"></a><a href="#cmd.AfterPackage">\AfterPackage</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterPackage">295</a></li> -<li><a name="cmd.AfterReadingMainAux"></a><a href="#cmd.AfterReadingMainAux">\AfterReadingMainAux</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterReadingMainAux">298</a></li> -<li><a name="cmd.AfterRestoreareas*"></a><a href="#cmd.AfterRestoreareas*">\AfterRestoreareas*</a> --> <a href="scrguide.pdf#typearea-experts.cmd.AfterRestoreareas*">390</a></li> -<li><a name="cmd.AfterRestoreareas"></a><a href="#cmd.AfterRestoreareas">\AfterRestoreareas</a> --> <a href="scrguide.pdf#typearea-experts.cmd.AfterRestoreareas">390</a></li> -<li><a name="cmd.AfterSelectAnyPageStyle"></a><a href="#cmd.AfterSelectAnyPageStyle">\AfterSelectAnyPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.AfterSelectAnyPageStyle">351</a></li> -<li><a name="cmd.AfterStartingTOC"></a><a href="#cmd.AfterStartingTOC">\AfterStartingTOC</a> --> <a href="scrguide.pdf#tocbasic.cmd.AfterStartingTOC">317</a></li> -<li><a name="cmd.AfterTOCHead"></a><a href="#cmd.AfterTOCHead">\AfterTOCHead</a> --> <a href="scrguide.pdf#tocbasic.cmd.AfterTOCHead">318</a></li> -<li><a name="cmd.At@startsection"></a><a href="#cmd.At@startsection">\At@startsection</a> --> <a href="scrguide.pdf#maincls-experts.cmd.At@startsection">413</a></li> -<li><a name="cmd.AtAddToTocList"></a><a href="#cmd.AtAddToTocList">\AtAddToTocList</a> --> <a href="scrguide.pdf#tocbasic.cmd.AtAddToTocList">312</a></li> -<li><a name="cmd.AtBeginLetter"></a><a href="#cmd.AtBeginLetter">\AtBeginLetter</a> --> <a href="scrguide.pdf#scrlttr2.cmd.AtBeginLetter">162</a></li> +<li><a name="cmd.AfterCalculatingTypearea"></a><a href="#cmd.AfterCalculatingTypearea">\AfterCalculatingTypearea</a> --> <a href="scrguide.pdf#typearea-experts.cmd.AfterCalculatingTypearea">426</a></li> +<li><a name="cmd.AfterClass!"></a><a href="#cmd.AfterClass!">\AfterClass!</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterClass!">315</a></li> +<li><a name="cmd.AfterClass*"></a><a href="#cmd.AfterClass*">\AfterClass*</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterClass*">315</a></li> +<li><a name="cmd.AfterClass+"></a><a href="#cmd.AfterClass+">\AfterClass+</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterClass+">315</a></li> +<li><a name="cmd.AfterClass"></a><a href="#cmd.AfterClass">\AfterClass</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterClass">315</a></li> +<li><a name="cmd.AfterFile"></a><a href="#cmd.AfterFile">\AfterFile</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterFile">315</a></li> +<li><a name="cmd.AfterPackage!"></a><a href="#cmd.AfterPackage!">\AfterPackage!</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterPackage!">315</a></li> +<li><a name="cmd.AfterPackage*"></a><a href="#cmd.AfterPackage*">\AfterPackage*</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterPackage*">315</a></li> +<li><a name="cmd.AfterPackage+"></a><a href="#cmd.AfterPackage+">\AfterPackage+</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterPackage+">315</a></li> +<li><a name="cmd.AfterPackage"></a><a href="#cmd.AfterPackage">\AfterPackage</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterPackage">315</a></li> +<li><a name="cmd.AfterReadingMainAux"></a><a href="#cmd.AfterReadingMainAux">\AfterReadingMainAux</a> --> <a href="scrguide.pdf#scrlfile.cmd.AfterReadingMainAux">318</a></li> +<li><a name="cmd.AfterRestoreareas*"></a><a href="#cmd.AfterRestoreareas*">\AfterRestoreareas*</a> --> <a href="scrguide.pdf#typearea-experts.cmd.AfterRestoreareas*">425</a></li> +<li><a name="cmd.AfterRestoreareas"></a><a href="#cmd.AfterRestoreareas">\AfterRestoreareas</a> --> <a href="scrguide.pdf#typearea-experts.cmd.AfterRestoreareas">425</a></li> +<li><a name="cmd.AfterSelectAnyPageStyle"></a><a href="#cmd.AfterSelectAnyPageStyle">\AfterSelectAnyPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.AfterSelectAnyPageStyle">386</a></li> +<li><a name="cmd.AfterStartingTOC"></a><a href="#cmd.AfterStartingTOC">\AfterStartingTOC</a> --> <a href="scrguide.pdf#tocbasic.cmd.AfterStartingTOC">337</a></li> +<li><a name="cmd.AfterTOCHead"></a><a href="#cmd.AfterTOCHead">\AfterTOCHead</a> --> <a href="scrguide.pdf#tocbasic.cmd.AfterTOCHead">338</a></li> +<li><a name="cmd.At@startsection"></a><a href="#cmd.At@startsection">\At@startsection</a> --> <a href="scrguide.pdf#maincls-experts.cmd.At@startsection">449</a></li> +<li><a name="cmd.AtAddToTocList"></a><a href="#cmd.AtAddToTocList">\AtAddToTocList</a> --> <a href="scrguide.pdf#tocbasic.cmd.AtAddToTocList">332</a></li> +<li><a name="cmd.AtBeginLetter"></a><a href="#cmd.AtBeginLetter">\AtBeginLetter</a> --> <a href="scrguide.pdf#scrlttr2.cmd.AtBeginLetter">163</a></li> <li><a name="cmd.AtEndBibliography"></a><a href="#cmd.AtEndBibliography">\AtEndBibliography</a> --> <a href="scrguide.pdf#maincls.cmd.AtEndBibliography">151</a></li> -<li><a name="cmd.AtEndLetter"></a><a href="#cmd.AtEndLetter">\AtEndLetter</a> --> <a href="scrguide.pdf#scrlttr2.cmd.AtEndLetter">162</a></li> -<li><a name="cmd.AtEndOfFamilyOptions"></a><a href="#cmd.AtEndOfFamilyOptions">\AtEndOfFamilyOptions</a> --> <a href="scrguide.pdf#scrbase.cmd.AtEndOfFamilyOptions">277</a></li> -<li><a name="cmd.Before@sect"></a><a href="#cmd.Before@sect">\Before@sect</a> --> <a href="scrguide.pdf#maincls-experts.cmd.Before@sect">413</a></li> -<li><a name="cmd.Before@ssect"></a><a href="#cmd.Before@ssect">\Before@ssect</a> --> <a href="scrguide.pdf#maincls-experts.cmd.Before@ssect">413</a></li> -<li><a name="cmd.BeforeClass"></a><a href="#cmd.BeforeClass">\BeforeClass</a> --> <a href="scrguide.pdf#scrlfile.cmd.BeforeClass">295</a></li> -<li><a name="cmd.BeforeClosingMainAux"></a><a href="#cmd.BeforeClosingMainAux">\BeforeClosingMainAux</a> --> <a href="scrguide.pdf#scrlfile.cmd.BeforeClosingMainAux">298</a></li> -<li><a name="cmd.BeforeFamilyProcessOptions"></a><a href="#cmd.BeforeFamilyProcessOptions">\BeforeFamilyProcessOptions</a> --> <a href="scrguide.pdf#scrbase.cmd.BeforeFamilyProcessOptions">273</a></li> -<li><a name="cmd.BeforeFile"></a><a href="#cmd.BeforeFile">\BeforeFile</a> --> <a href="scrguide.pdf#scrlfile.cmd.BeforeFile">295</a></li> -<li><a name="cmd.BeforePackage"></a><a href="#cmd.BeforePackage">\BeforePackage</a> --> <a href="scrguide.pdf#scrlfile.cmd.BeforePackage">295</a></li> -<li><a name="cmd.BeforeRestoreareas*"></a><a href="#cmd.BeforeRestoreareas*">\BeforeRestoreareas*</a> --> <a href="scrguide.pdf#typearea-experts.cmd.BeforeRestoreareas*">390</a></li> -<li><a name="cmd.BeforeRestoreareas"></a><a href="#cmd.BeforeRestoreareas">\BeforeRestoreareas</a> --> <a href="scrguide.pdf#typearea-experts.cmd.BeforeRestoreareas">390</a></li> -<li><a name="cmd.BeforeSelectAnyPageStyle"></a><a href="#cmd.BeforeSelectAnyPageStyle">\BeforeSelectAnyPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.BeforeSelectAnyPageStyle">351</a></li> -<li><a name="cmd.BeforeStartingTOC"></a><a href="#cmd.BeforeStartingTOC">\BeforeStartingTOC</a> --> <a href="scrguide.pdf#tocbasic.cmd.BeforeStartingTOC">317</a></li> -<li><a name="cmd.BeforeTOCHead"></a><a href="#cmd.BeforeTOCHead">\BeforeTOCHead</a> --> <a href="scrguide.pdf#tocbasic.cmd.BeforeTOCHead">318</a></li> +<li><a name="cmd.AtEndLetter"></a><a href="#cmd.AtEndLetter">\AtEndLetter</a> --> <a href="scrguide.pdf#scrlttr2.cmd.AtEndLetter">163</a></li> +<li><a name="cmd.AtEndOfFamilyOptions"></a><a href="#cmd.AtEndOfFamilyOptions">\AtEndOfFamilyOptions</a> --> <a href="scrguide.pdf#scrbase.cmd.AtEndOfFamilyOptions">297</a></li> +<li><a name="cmd.Before@sect"></a><a href="#cmd.Before@sect">\Before@sect</a> --> <a href="scrguide.pdf#maincls-experts.cmd.Before@sect">449</a></li> +<li><a name="cmd.Before@ssect"></a><a href="#cmd.Before@ssect">\Before@ssect</a> --> <a href="scrguide.pdf#maincls-experts.cmd.Before@ssect">449</a></li> +<li><a name="cmd.BeforeClass"></a><a href="#cmd.BeforeClass">\BeforeClass</a> --> <a href="scrguide.pdf#scrlfile.cmd.BeforeClass">315</a></li> +<li><a name="cmd.BeforeClosingMainAux"></a><a href="#cmd.BeforeClosingMainAux">\BeforeClosingMainAux</a> --> <a href="scrguide.pdf#scrlfile.cmd.BeforeClosingMainAux">318</a></li> +<li><a name="cmd.BeforeFamilyProcessOptions"></a><a href="#cmd.BeforeFamilyProcessOptions">\BeforeFamilyProcessOptions</a> --> <a href="scrguide.pdf#scrbase.cmd.BeforeFamilyProcessOptions">293</a></li> +<li><a name="cmd.BeforeFile"></a><a href="#cmd.BeforeFile">\BeforeFile</a> --> <a href="scrguide.pdf#scrlfile.cmd.BeforeFile">315</a></li> +<li><a name="cmd.BeforePackage"></a><a href="#cmd.BeforePackage">\BeforePackage</a> --> <a href="scrguide.pdf#scrlfile.cmd.BeforePackage">315</a></li> +<li><a name="cmd.BeforeRestoreareas*"></a><a href="#cmd.BeforeRestoreareas*">\BeforeRestoreareas*</a> --> <a href="scrguide.pdf#typearea-experts.cmd.BeforeRestoreareas*">425</a></li> +<li><a name="cmd.BeforeRestoreareas"></a><a href="#cmd.BeforeRestoreareas">\BeforeRestoreareas</a> --> <a href="scrguide.pdf#typearea-experts.cmd.BeforeRestoreareas">425</a></li> +<li><a name="cmd.BeforeSelectAnyPageStyle"></a><a href="#cmd.BeforeSelectAnyPageStyle">\BeforeSelectAnyPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.BeforeSelectAnyPageStyle">386</a></li> +<li><a name="cmd.BeforeStartingTOC"></a><a href="#cmd.BeforeStartingTOC">\BeforeStartingTOC</a> --> <a href="scrguide.pdf#tocbasic.cmd.BeforeStartingTOC">337</a></li> +<li><a name="cmd.BeforeTOCHead"></a><a href="#cmd.BeforeTOCHead">\BeforeTOCHead</a> --> <a href="scrguide.pdf#tocbasic.cmd.BeforeTOCHead">338</a></li> <li><a name="cmd.BreakBibliography"></a><a href="#cmd.BreakBibliography">\BreakBibliography</a> --> <a href="scrguide.pdf#maincls.cmd.BreakBibliography">151</a></li> -<li><a name="cmd.ClassInfoNoLine"></a><a href="#cmd.ClassInfoNoLine">\ClassInfoNoLine</a> --> <a href="scrguide.pdf#scrbase.cmd.ClassInfoNoLine">292</a></li> -<li><a name="cmd.ClassName"></a><a href="#cmd.ClassName">\ClassName</a> --> <a href="scrguide.pdf#maincls-experts.cmd.ClassName">393</a></li> -<li><a name="cmd.Comment"></a><a href="#cmd.Comment">\Comment</a> --> <a href="scrguide.pdf#scraddr.cmd.Comment">258</a></li> -<li><a name="cmd.DeclareLayer"></a><a href="#cmd.DeclareLayer">\DeclareLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclareLayer">339</a></li> -<li><a name="cmd.DeclareNewLayer"></a><a href="#cmd.DeclareNewLayer">\DeclareNewLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclareNewLayer">339</a></li> -<li><a name="cmd.DeclareNewNoteColumn"></a><a href="#cmd.DeclareNewNoteColumn">\DeclareNewNoteColumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.DeclareNewNoteColumn">379</a></li> -<li><a name="cmd.DeclareNewPageStyleAlias"></a><a href="#cmd.DeclareNewPageStyleAlias">\DeclareNewPageStyleAlias</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclareNewPageStyleAlias">352</a></li> -<li><a name="cmd.DeclareNewPageStyleByLayers"></a><a href="#cmd.DeclareNewPageStyleByLayers">\DeclareNewPageStyleByLayers</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclareNewPageStyleByLayers">353</a></li> -<li><a name="cmd.DeclareNewSectionCommand"></a><a href="#cmd.DeclareNewSectionCommand">\DeclareNewSectionCommand</a> --> <a href="scrguide.pdf#maincls-experts.cmd.DeclareNewSectionCommand">398</a></li> -<li><a name="cmd.DeclareNewSectionCommands"></a><a href="#cmd.DeclareNewSectionCommands">\DeclareNewSectionCommands</a> --> <a href="scrguide.pdf#maincls-experts.cmd.DeclareNewSectionCommands">406</a></li> -<li><a name="cmd.DeclareNewTOC"></a><a href="#cmd.DeclareNewTOC">\DeclareNewTOC</a> --> <a href="scrguide.pdf#tocbasic.cmd.DeclareNewTOC">327</a></li> -<li><a name="cmd.DeclareNoteColumn"></a><a href="#cmd.DeclareNoteColumn">\DeclareNoteColumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.DeclareNoteColumn">379</a></li> -<li><a name="cmd.DeclarePageStyleAlias"></a><a href="#cmd.DeclarePageStyleAlias">\DeclarePageStyleAlias</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclarePageStyleAlias">352</a></li> -<li><a name="cmd.DeclarePageStyleByLayers"></a><a href="#cmd.DeclarePageStyleByLayers">\DeclarePageStyleByLayers</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclarePageStyleByLayers">353</a></li> -<li><a name="cmd.DeclareSectionCommand"></a><a href="#cmd.DeclareSectionCommand">\DeclareSectionCommand</a> --> <a href="scrguide.pdf#maincls-experts.cmd.DeclareSectionCommand">398</a></li> -<li><a name="cmd.DeclareSectionCommands"></a><a href="#cmd.DeclareSectionCommands">\DeclareSectionCommands</a> --> <a href="scrguide.pdf#maincls-experts.cmd.DeclareSectionCommands">406</a></li> -<li><a name="cmd.DeclareSectionNumberDepth"></a><a href="#cmd.DeclareSectionNumberDepth">\DeclareSectionNumberDepth</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclareSectionNumberDepth">337</a></li> -<li><a name="cmd.DefineFamily"></a><a href="#cmd.DefineFamily">\DefineFamily</a> --> <a href="scrguide.pdf#scrbase.cmd.DefineFamily">270</a></li> -<li><a name="cmd.DefineFamilyKey"></a><a href="#cmd.DefineFamilyKey">\DefineFamilyKey</a> --> <a href="scrguide.pdf#scrbase.cmd.DefineFamilyKey">271</a></li> -<li><a name="cmd.DefineFamilyMember"></a><a href="#cmd.DefineFamilyMember">\DefineFamilyMember</a> --> <a href="scrguide.pdf#scrbase.cmd.DefineFamilyMember">270</a></li> -<li><a name="cmd.DestroyLayer"></a><a href="#cmd.DestroyLayer">\DestroyLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.DestroyLayer">349</a></li> -<li><a name="cmd.DestroyPageStyleAlias"></a><a href="#cmd.DestroyPageStyleAlias">\DestroyPageStyleAlias</a> --> <a href="scrguide.pdf#scrlayer.cmd.DestroyPageStyleAlias">352</a></li> -<li><a name="cmd.DestroyRealLayerPageStyle"></a><a href="#cmd.DestroyRealLayerPageStyle">\DestroyRealLayerPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.DestroyRealLayerPageStyle">360</a></li> -<li><a name="cmd.FamilyBoolKey"></a><a href="#cmd.FamilyBoolKey">\FamilyBoolKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyBoolKey">277</a></li> -<li><a name="cmd.FamilyCounterKey"></a><a href="#cmd.FamilyCounterKey">\FamilyCounterKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyCounterKey">280</a></li> -<li><a name="cmd.FamilyCounterMacroKey"></a><a href="#cmd.FamilyCounterMacroKey">\FamilyCounterMacroKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyCounterMacroKey">280</a></li> -<li><a name="cmd.FamilyElseValues"></a><a href="#cmd.FamilyElseValues">\FamilyElseValues</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyElseValues">283</a></li> -<li><a name="cmd.FamilyExecuteOptions"></a><a href="#cmd.FamilyExecuteOptions">\FamilyExecuteOptions</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyExecuteOptions">274</a></li> -<li><a name="cmd.FamilyKeyState"></a><a href="#cmd.FamilyKeyState">\FamilyKeyState</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyKeyState">271</a></li> -<li><a name="cmd.FamilyKeyStateNeedValue"></a><a href="#cmd.FamilyKeyStateNeedValue">\FamilyKeyStateNeedValue</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyKeyStateNeedValue">271</a></li> -<li><a name="cmd.FamilyKeyStateProcessed"></a><a href="#cmd.FamilyKeyStateProcessed">\FamilyKeyStateProcessed</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyKeyStateProcessed">271</a></li> -<li><a name="cmd.FamilyKeyStateUnknown"></a><a href="#cmd.FamilyKeyStateUnknown">\FamilyKeyStateUnknown</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyKeyStateUnknown">271</a></li> -<li><a name="cmd.FamilyKeyStateUnknownValue"></a><a href="#cmd.FamilyKeyStateUnknownValue">\FamilyKeyStateUnknownValue</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyKeyStateUnknownValue">271</a></li> -<li><a name="cmd.FamilyLengthKey"></a><a href="#cmd.FamilyLengthKey">\FamilyLengthKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyLengthKey">281</a></li> -<li><a name="cmd.FamilyLengthMacroKey"></a><a href="#cmd.FamilyLengthMacroKey">\FamilyLengthMacroKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyLengthMacroKey">281</a></li> -<li><a name="cmd.FamilyNumericalKey"></a><a href="#cmd.FamilyNumericalKey">\FamilyNumericalKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyNumericalKey">278</a></li> -<li><a name="cmd.FamilyOption"></a><a href="#cmd.FamilyOption">\FamilyOption</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyOption">276</a></li> -<li><a name="cmd.FamilyOptions"></a><a href="#cmd.FamilyOptions">\FamilyOptions</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyOptions">275</a></li> -<li><a name="cmd.FamilyProcessOptions"></a><a href="#cmd.FamilyProcessOptions">\FamilyProcessOptions</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyProcessOptions">273</a></li> -<li><a name="cmd.FamilySetBool"></a><a href="#cmd.FamilySetBool">\FamilySetBool</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetBool">277</a></li> -<li><a name="cmd.FamilySetCounter"></a><a href="#cmd.FamilySetCounter">\FamilySetCounter</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetCounter">280</a></li> -<li><a name="cmd.FamilySetCounterMacro"></a><a href="#cmd.FamilySetCounterMacro">\FamilySetCounterMacro</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetCounterMacro">280</a></li> -<li><a name="cmd.FamilySetLength"></a><a href="#cmd.FamilySetLength">\FamilySetLength</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetLength">281</a></li> -<li><a name="cmd.FamilySetLengthMacro"></a><a href="#cmd.FamilySetLengthMacro">\FamilySetLengthMacro</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetLengthMacro">281</a></li> -<li><a name="cmd.FamilySetNumerical"></a><a href="#cmd.FamilySetNumerical">\FamilySetNumerical</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetNumerical">278</a></li> -<li><a name="cmd.FamilyStringKey"></a><a href="#cmd.FamilyStringKey">\FamilyStringKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyStringKey">281</a></li> -<li><a name="cmd.FamilyUnknownKeyValue"></a><a href="#cmd.FamilyUnknownKeyValue">\FamilyUnknownKeyValue</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyUnknownKeyValue">282</a></li> -<li><a name="cmd.FirstName"></a><a href="#cmd.FirstName">\FirstName</a> --> <a href="scrguide.pdf#scraddr.cmd.FirstName">258</a></li> -<li><a name="cmd.ForEachLayerOfPageStyle*"></a><a href="#cmd.ForEachLayerOfPageStyle*">\ForEachLayerOfPageStyle*</a> --> <a href="scrguide.pdf#scrlayer.cmd.ForEachLayerOfPageStyle*">357</a></li> -<li><a name="cmd.ForEachLayerOfPageStyle"></a><a href="#cmd.ForEachLayerOfPageStyle">\ForEachLayerOfPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.ForEachLayerOfPageStyle">357</a></li> -<li><a name="cmd.FreeI"></a><a href="#cmd.FreeI">\FreeI</a> --> <a href="scrguide.pdf#scraddr.cmd.FreeI">258</a></li> -<li><a name="cmd.FreeII"></a><a href="#cmd.FreeII">\FreeII</a> --> <a href="scrguide.pdf#scraddr.cmd.FreeII">258</a></li> -<li><a name="cmd.FreeIII"></a><a href="#cmd.FreeIII">\FreeIII</a> --> <a href="scrguide.pdf#scraddr.cmd.FreeIII">258</a></li> -<li><a name="cmd.FreeIV"></a><a href="#cmd.FreeIV">\FreeIV</a> --> <a href="scrguide.pdf#scraddr.cmd.FreeIV">258</a></li> -<li><a name="cmd.GenericMarkFormat"></a><a href="#cmd.GenericMarkFormat">\GenericMarkFormat</a> --> <a href="scrguide.pdf#scrlayer.cmd.GenericMarkFormat">361</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.GenericMarkFormat">366</a></li> -<li><a name="cmd.GetLayerContents"></a><a href="#cmd.GetLayerContents">\GetLayerContents</a> --> <a href="scrguide.pdf#scrlayer.cmd.GetLayerContents">349</a></li> -<li><a name="cmd.GetRealPageStyle"></a><a href="#cmd.GetRealPageStyle">\GetRealPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.GetRealPageStyle">352</a></li> +<li><a name="cmd.ClassInfoNoLine"></a><a href="#cmd.ClassInfoNoLine">\ClassInfoNoLine</a> --> <a href="scrguide.pdf#scrbase.cmd.ClassInfoNoLine">312</a></li> +<li><a name="cmd.ClassName"></a><a href="#cmd.ClassName">\ClassName</a> --> <a href="scrguide.pdf#maincls-experts.cmd.ClassName">428</a></li> +<li><a name="cmd.Clause"></a><a href="#cmd.Clause">\Clause</a> --> <a href="scrguide.pdf#scrjura.cmd.Clause">270</a></li> +<li><a name="cmd.Clauseformat"></a><a href="#cmd.Clauseformat">\Clauseformat</a> --> <a href="scrguide.pdf#scrjura.cmd.Clauseformat">272</a></li> +<li><a name="cmd.CloneTOCEntryStyle"></a><a href="#cmd.CloneTOCEntryStyle">\CloneTOCEntryStyle</a> --> <a href="scrguide.pdf#tocbasic.cmd.CloneTOCEntryStyle">353</a></li> +<li><a name="cmd.Comment"></a><a href="#cmd.Comment">\Comment</a> --> <a href="scrguide.pdf#scraddr.cmd.Comment">259</a></li> +<li><a name="cmd.DeclareLayer"></a><a href="#cmd.DeclareLayer">\DeclareLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclareLayer">374</a></li> +<li><a name="cmd.DeclareNewJuraEnvironment"></a><a href="#cmd.DeclareNewJuraEnvironment">\DeclareNewJuraEnvironment</a> --> <a href="scrguide.pdf#scrjura.cmd.DeclareNewJuraEnvironment">278</a></li> +<li><a name="cmd.DeclareNewLayer"></a><a href="#cmd.DeclareNewLayer">\DeclareNewLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclareNewLayer">374</a></li> +<li><a name="cmd.DeclareNewNoteColumn"></a><a href="#cmd.DeclareNewNoteColumn">\DeclareNewNoteColumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.DeclareNewNoteColumn">414</a></li> +<li><a name="cmd.DeclareNewPageStyleAlias"></a><a href="#cmd.DeclareNewPageStyleAlias">\DeclareNewPageStyleAlias</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclareNewPageStyleAlias">387</a></li> +<li><a name="cmd.DeclareNewPageStyleByLayers"></a><a href="#cmd.DeclareNewPageStyleByLayers">\DeclareNewPageStyleByLayers</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclareNewPageStyleByLayers">388</a></li> +<li><a name="cmd.DeclareNewSectionCommand"></a><a href="#cmd.DeclareNewSectionCommand">\DeclareNewSectionCommand</a> --> <a href="scrguide.pdf#maincls-experts.cmd.DeclareNewSectionCommand">433</a></li> +<li><a name="cmd.DeclareNewSectionCommands"></a><a href="#cmd.DeclareNewSectionCommands">\DeclareNewSectionCommands</a> --> <a href="scrguide.pdf#maincls-experts.cmd.DeclareNewSectionCommands">443</a></li> +<li><a name="cmd.DeclareNewTOC"></a><a href="#cmd.DeclareNewTOC">\DeclareNewTOC</a> --> <a href="scrguide.pdf#tocbasic.cmd.DeclareNewTOC">360</a></li> +<li><a name="cmd.DeclareNoteColumn"></a><a href="#cmd.DeclareNoteColumn">\DeclareNoteColumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.DeclareNoteColumn">414</a></li> +<li><a name="cmd.DeclarePageStyleAlias"></a><a href="#cmd.DeclarePageStyleAlias">\DeclarePageStyleAlias</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclarePageStyleAlias">387</a></li> +<li><a name="cmd.DeclarePageStyleByLayers"></a><a href="#cmd.DeclarePageStyleByLayers">\DeclarePageStyleByLayers</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclarePageStyleByLayers">388</a></li> +<li><a name="cmd.DeclareSectionCommand"></a><a href="#cmd.DeclareSectionCommand">\DeclareSectionCommand</a> --> <a href="scrguide.pdf#maincls-experts.cmd.DeclareSectionCommand">433</a></li> +<li><a name="cmd.DeclareSectionCommands"></a><a href="#cmd.DeclareSectionCommands">\DeclareSectionCommands</a> --> <a href="scrguide.pdf#maincls-experts.cmd.DeclareSectionCommands">443</a></li> +<li><a name="cmd.DeclareSectionNumberDepth"></a><a href="#cmd.DeclareSectionNumberDepth">\DeclareSectionNumberDepth</a> --> <a href="scrguide.pdf#scrlayer.cmd.DeclareSectionNumberDepth">372</a></li> +<li><a name="cmd.DeclareTOCEntryStyle"></a><a href="#cmd.DeclareTOCEntryStyle">\DeclareTOCEntryStyle</a> --> <a href="scrguide.pdf#tocbasic.cmd.DeclareTOCEntryStyle">351</a></li> +<li><a name="cmd.DeclareTOCStyleEntry"></a><a href="#cmd.DeclareTOCStyleEntry">\DeclareTOCStyleEntry</a> --> <a href="scrguide.pdf#tocbasic.cmd.DeclareTOCStyleEntry">342</a></li> +<li><a name="cmd.DefineFamily"></a><a href="#cmd.DefineFamily">\DefineFamily</a> --> <a href="scrguide.pdf#scrbase.cmd.DefineFamily">290</a></li> +<li><a name="cmd.DefineFamilyKey"></a><a href="#cmd.DefineFamilyKey">\DefineFamilyKey</a> --> <a href="scrguide.pdf#scrbase.cmd.DefineFamilyKey">291</a></li> +<li><a name="cmd.DefineFamilyMember"></a><a href="#cmd.DefineFamilyMember">\DefineFamilyMember</a> --> <a href="scrguide.pdf#scrbase.cmd.DefineFamilyMember">290</a></li> +<li><a name="cmd.DefineTOCEntryBooleanOption"></a><a href="#cmd.DefineTOCEntryBooleanOption">\DefineTOCEntryBooleanOption</a> --> <a href="scrguide.pdf#tocbasic.cmd.DefineTOCEntryBooleanOption">351</a></li> +<li><a name="cmd.DefineTOCEntryCommandOption"></a><a href="#cmd.DefineTOCEntryCommandOption">\DefineTOCEntryCommandOption</a> --> <a href="scrguide.pdf#tocbasic.cmd.DefineTOCEntryCommandOption">351</a></li> +<li><a name="cmd.DefineTOCEntryIfOption"></a><a href="#cmd.DefineTOCEntryIfOption">\DefineTOCEntryIfOption</a> --> <a href="scrguide.pdf#tocbasic.cmd.DefineTOCEntryIfOption">351</a></li> +<li><a name="cmd.DefineTOCEntryLengthOption"></a><a href="#cmd.DefineTOCEntryLengthOption">\DefineTOCEntryLengthOption</a> --> <a href="scrguide.pdf#tocbasic.cmd.DefineTOCEntryLengthOption">351</a></li> +<li><a name="cmd.DefineTOCEntryNumberOption"></a><a href="#cmd.DefineTOCEntryNumberOption">\DefineTOCEntryNumberOption</a> --> <a href="scrguide.pdf#tocbasic.cmd.DefineTOCEntryNumberOption">351</a></li> +<li><a name="cmd.DefineTOCEntryOption"></a><a href="#cmd.DefineTOCEntryOption">\DefineTOCEntryOption</a> --> <a href="scrguide.pdf#tocbasic.cmd.DefineTOCEntryOption">351</a></li> +<li><a name="cmd.DestroyLayer"></a><a href="#cmd.DestroyLayer">\DestroyLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.DestroyLayer">384</a></li> +<li><a name="cmd.DestroyPageStyleAlias"></a><a href="#cmd.DestroyPageStyleAlias">\DestroyPageStyleAlias</a> --> <a href="scrguide.pdf#scrlayer.cmd.DestroyPageStyleAlias">387</a></li> +<li><a name="cmd.DestroyRealLayerPageStyle"></a><a href="#cmd.DestroyRealLayerPageStyle">\DestroyRealLayerPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.DestroyRealLayerPageStyle">395</a></li> +<li><a name="cmd.FamilyBoolKey"></a><a href="#cmd.FamilyBoolKey">\FamilyBoolKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyBoolKey">297</a></li> +<li><a name="cmd.FamilyCounterKey"></a><a href="#cmd.FamilyCounterKey">\FamilyCounterKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyCounterKey">300</a></li> +<li><a name="cmd.FamilyCounterMacroKey"></a><a href="#cmd.FamilyCounterMacroKey">\FamilyCounterMacroKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyCounterMacroKey">301</a></li> +<li><a name="cmd.FamilyElseValues"></a><a href="#cmd.FamilyElseValues">\FamilyElseValues</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyElseValues">303</a></li> +<li><a name="cmd.FamilyExecuteOptions"></a><a href="#cmd.FamilyExecuteOptions">\FamilyExecuteOptions</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyExecuteOptions">294</a></li> +<li><a name="cmd.FamilyKeyState"></a><a href="#cmd.FamilyKeyState">\FamilyKeyState</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyKeyState">291</a></li> +<li><a name="cmd.FamilyKeyStateNeedValue"></a><a href="#cmd.FamilyKeyStateNeedValue">\FamilyKeyStateNeedValue</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyKeyStateNeedValue">291</a></li> +<li><a name="cmd.FamilyKeyStateProcessed"></a><a href="#cmd.FamilyKeyStateProcessed">\FamilyKeyStateProcessed</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyKeyStateProcessed">291</a></li> +<li><a name="cmd.FamilyKeyStateUnknown"></a><a href="#cmd.FamilyKeyStateUnknown">\FamilyKeyStateUnknown</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyKeyStateUnknown">291</a></li> +<li><a name="cmd.FamilyKeyStateUnknownValue"></a><a href="#cmd.FamilyKeyStateUnknownValue">\FamilyKeyStateUnknownValue</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyKeyStateUnknownValue">291</a></li> +<li><a name="cmd.FamilyLengthKey"></a><a href="#cmd.FamilyLengthKey">\FamilyLengthKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyLengthKey">301</a></li> +<li><a name="cmd.FamilyLengthMacroKey"></a><a href="#cmd.FamilyLengthMacroKey">\FamilyLengthMacroKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyLengthMacroKey">301</a></li> +<li><a name="cmd.FamilyNumericalKey"></a><a href="#cmd.FamilyNumericalKey">\FamilyNumericalKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyNumericalKey">299</a></li> +<li><a name="cmd.FamilyOption"></a><a href="#cmd.FamilyOption">\FamilyOption</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyOption">296</a></li> +<li><a name="cmd.FamilyOptions"></a><a href="#cmd.FamilyOptions">\FamilyOptions</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyOptions">295</a></li> +<li><a name="cmd.FamilyProcessOptions"></a><a href="#cmd.FamilyProcessOptions">\FamilyProcessOptions</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyProcessOptions">293</a></li> +<li><a name="cmd.FamilySetBool"></a><a href="#cmd.FamilySetBool">\FamilySetBool</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetBool">297</a></li> +<li><a name="cmd.FamilySetCounter"></a><a href="#cmd.FamilySetCounter">\FamilySetCounter</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetCounter">300</a></li> +<li><a name="cmd.FamilySetCounterMacro"></a><a href="#cmd.FamilySetCounterMacro">\FamilySetCounterMacro</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetCounterMacro">301</a></li> +<li><a name="cmd.FamilySetLength"></a><a href="#cmd.FamilySetLength">\FamilySetLength</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetLength">301</a></li> +<li><a name="cmd.FamilySetLengthMacro"></a><a href="#cmd.FamilySetLengthMacro">\FamilySetLengthMacro</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetLengthMacro">301</a></li> +<li><a name="cmd.FamilySetNumerical"></a><a href="#cmd.FamilySetNumerical">\FamilySetNumerical</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilySetNumerical">299</a></li> +<li><a name="cmd.FamilyStringKey"></a><a href="#cmd.FamilyStringKey">\FamilyStringKey</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyStringKey">301</a></li> +<li><a name="cmd.FamilyUnknownKeyValue"></a><a href="#cmd.FamilyUnknownKeyValue">\FamilyUnknownKeyValue</a> --> <a href="scrguide.pdf#scrbase.cmd.FamilyUnknownKeyValue">302</a></li> +<li><a name="cmd.FirstName"></a><a href="#cmd.FirstName">\FirstName</a> --> <a href="scrguide.pdf#scraddr.cmd.FirstName">259</a></li> +<li><a name="cmd.ForEachLayerOfPageStyle*"></a><a href="#cmd.ForEachLayerOfPageStyle*">\ForEachLayerOfPageStyle*</a> --> <a href="scrguide.pdf#scrlayer.cmd.ForEachLayerOfPageStyle*">392</a></li> +<li><a name="cmd.ForEachLayerOfPageStyle"></a><a href="#cmd.ForEachLayerOfPageStyle">\ForEachLayerOfPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.ForEachLayerOfPageStyle">392</a></li> +<li><a name="cmd.FreeI"></a><a href="#cmd.FreeI">\FreeI</a> --> <a href="scrguide.pdf#scraddr.cmd.FreeI">259</a></li> +<li><a name="cmd.FreeII"></a><a href="#cmd.FreeII">\FreeII</a> --> <a href="scrguide.pdf#scraddr.cmd.FreeII">259</a></li> +<li><a name="cmd.FreeIII"></a><a href="#cmd.FreeIII">\FreeIII</a> --> <a href="scrguide.pdf#scraddr.cmd.FreeIII">259</a></li> +<li><a name="cmd.FreeIV"></a><a href="#cmd.FreeIV">\FreeIV</a> --> <a href="scrguide.pdf#scraddr.cmd.FreeIV">259</a></li> +<li><a name="cmd.GenericMarkFormat"></a><a href="#cmd.GenericMarkFormat">\GenericMarkFormat</a> --> <a href="scrguide.pdf#scrlayer.cmd.GenericMarkFormat">396</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.GenericMarkFormat">401</a></li> +<li><a name="cmd.GetLayerContents"></a><a href="#cmd.GetLayerContents">\GetLayerContents</a> --> <a href="scrguide.pdf#scrlayer.cmd.GetLayerContents">384</a></li> +<li><a name="cmd.GetRealPageStyle"></a><a href="#cmd.GetRealPageStyle">\GetRealPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.GetRealPageStyle">388</a></li> <li><a name="cmd.IfChapterUsesPrefixLine"></a><a href="#cmd.IfChapterUsesPrefixLine">\IfChapterUsesPrefixLine</a> --> <a href="scrguide.pdf#maincls.cmd.IfChapterUsesPrefixLine">95</a></li> -<li><a name="cmd.IfExistskomafont"></a><a href="#cmd.IfExistskomafont">\IfExistskomafont</a> --> <a href="scrguide.pdf#maincls-experts.cmd.IfExistskomafont">397</a></li> -<li><a name="cmd.IfLayerAtPageStyle"></a><a href="#cmd.IfLayerAtPageStyle">\IfLayerAtPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfLayerAtPageStyle">359</a></li> -<li><a name="cmd.IfLayerExists"></a><a href="#cmd.IfLayerExists">\IfLayerExists</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfLayerExists">349</a></li> -<li><a name="cmd.IfLayerPageStyleExists"></a><a href="#cmd.IfLayerPageStyleExists">\IfLayerPageStyleExists</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfLayerPageStyleExists">359</a></li> -<li><a name="cmd.IfLayersAtPageStyle"></a><a href="#cmd.IfLayersAtPageStyle">\IfLayersAtPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfLayersAtPageStyle">359</a></li> -<li><a name="cmd.IfRealLayerPageStyleExists"></a><a href="#cmd.IfRealLayerPageStyleExists">\IfRealLayerPageStyleExists</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfRealLayerPageStyleExists">359</a></li> -<li><a name="cmd.IfSomeLayersAtPageStyle"></a><a href="#cmd.IfSomeLayersAtPageStyle">\IfSomeLayersAtPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfSomeLayersAtPageStyle">359</a></li> +<li><a name="cmd.IfExistskomafont"></a><a href="#cmd.IfExistskomafont">\IfExistskomafont</a> --> <a href="scrguide.pdf#maincls-experts.cmd.IfExistskomafont">432</a></li> +<li><a name="cmd.IfLayerAtPageStyle"></a><a href="#cmd.IfLayerAtPageStyle">\IfLayerAtPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfLayerAtPageStyle">394</a></li> +<li><a name="cmd.IfLayerExists"></a><a href="#cmd.IfLayerExists">\IfLayerExists</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfLayerExists">384</a></li> +<li><a name="cmd.IfLayerPageStyleExists"></a><a href="#cmd.IfLayerPageStyleExists">\IfLayerPageStyleExists</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfLayerPageStyleExists">394</a></li> +<li><a name="cmd.IfLayersAtPageStyle"></a><a href="#cmd.IfLayersAtPageStyle">\IfLayersAtPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfLayersAtPageStyle">394</a></li> +<li><a name="cmd.IfRealLayerPageStyleExists"></a><a href="#cmd.IfRealLayerPageStyleExists">\IfRealLayerPageStyleExists</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfRealLayerPageStyleExists">394</a></li> +<li><a name="cmd.IfSomeLayersAtPageStyle"></a><a href="#cmd.IfSomeLayersAtPageStyle">\IfSomeLayersAtPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.IfSomeLayersAtPageStyle">394</a></li> <li><a name="cmd.IfUsePrefixLine"></a><a href="#cmd.IfUsePrefixLine">\IfUsePrefixLine</a> --> <a href="scrguide.pdf#maincls.cmd.IfUsePrefixLine">110</a></li> -<li><a name="cmd.InputAddressFile"></a><a href="#cmd.InputAddressFile">\InputAddressFile</a> --> <a href="scrguide.pdf#scraddr.cmd.InputAddressFile">258</a></li> -<li><a name="cmd.KOMAClassName"></a><a href="#cmd.KOMAClassName">\KOMAClassName</a> --> <a href="scrguide.pdf#maincls-experts.cmd.KOMAClassName">393</a></li> -<li><a name="cmd.KOMAScript"></a><a href="#cmd.KOMAScript">\KOMAScript</a> --> <a href="scrguide.pdf#scrbase.cmd.KOMAScript">291</a></li> -<li><a name="cmd.KOMAScriptVersion"></a><a href="#cmd.KOMAScriptVersion">\KOMAScriptVersion</a> --> <a href="scrguide.pdf#scrbase.cmd.KOMAScriptVersion">291</a></li> +<li><a name="cmd.InputAddressFile"></a><a href="#cmd.InputAddressFile">\InputAddressFile</a> --> <a href="scrguide.pdf#scraddr.cmd.InputAddressFile">259</a></li> +<li><a name="cmd.KOMAClassName"></a><a href="#cmd.KOMAClassName">\KOMAClassName</a> --> <a href="scrguide.pdf#maincls-experts.cmd.KOMAClassName">428</a></li> +<li><a name="cmd.KOMAScript"></a><a href="#cmd.KOMAScript">\KOMAScript</a> --> <a href="scrguide.pdf#scrbase.cmd.KOMAScript">311</a></li> +<li><a name="cmd.KOMAScriptVersion"></a><a href="#cmd.KOMAScriptVersion">\KOMAScriptVersion</a> --> <a href="scrguide.pdf#scrbase.cmd.KOMAScriptVersion">311</a></li> <li><a name="cmd.KOMAoption"></a><a href="#cmd.KOMAoption">\KOMAoption</a> --> <a href="scrguide.pdf#typearea.cmd.KOMAoption">32</a></li> <li><a name="cmd.KOMAoptions"></a><a href="#cmd.KOMAoptions">\KOMAoptions</a> --> <a href="scrguide.pdf#typearea.cmd.KOMAoptions">32</a></li> -<li><a name="cmd.LastName"></a><a href="#cmd.LastName">\LastName</a> --> <a href="scrguide.pdf#scraddr.cmd.LastName">258</a></li> -<li><a name="cmd.LenToUnit"></a><a href="#cmd.LenToUnit">\LenToUnit</a> --> <a href="scrguide.pdf#scrlayer.cmd.LenToUnit">348</a></li> -<li><a name="cmd.LetterOptionNeedsPapersize"></a><a href="#cmd.LetterOptionNeedsPapersize">\LetterOptionNeedsPapersize</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.LetterOptionNeedsPapersize">436</a></li> -<li><a name="cmd.MakeMarkcase"></a><a href="#cmd.MakeMarkcase">\MakeMarkcase</a> --> <a href="scrguide.pdf#tocbasic.cmd.MakeMarkcase">318</a>, <a href="scrguide.pdf#scrlayer.cmd.MakeMarkcase">361</a></li> -<li><a name="cmd.ModifyLayer"></a><a href="#cmd.ModifyLayer">\ModifyLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.ModifyLayer">339</a></li> -<li><a name="cmd.ModifyLayerPageStyleOptions"></a><a href="#cmd.ModifyLayerPageStyleOptions">\ModifyLayerPageStyleOptions</a> --> <a href="scrguide.pdf#scrlayer.cmd.ModifyLayerPageStyleOptions">359</a></li> -<li><a name="cmd.Name"></a><a href="#cmd.Name">\Name</a> --> <a href="scrguide.pdf#scraddr.cmd.Name">258</a></li> -<li><a name="cmd.PackageInfoNoLine"></a><a href="#cmd.PackageInfoNoLine">\PackageInfoNoLine</a> --> <a href="scrguide.pdf#scrbase.cmd.PackageInfoNoLine">292</a></li> -<li><a name="cmd.PreventPackageFromLoading*"></a><a href="#cmd.PreventPackageFromLoading*">\PreventPackageFromLoading*</a> --> <a href="scrguide.pdf#scrlfile.cmd.PreventPackageFromLoading*">303</a></li> -<li><a name="cmd.PreventPackageFromLoading"></a><a href="#cmd.PreventPackageFromLoading">\PreventPackageFromLoading</a> --> <a href="scrguide.pdf#scrlfile.cmd.PreventPackageFromLoading">303</a></li> -<li><a name="cmd.ProvideLayer"></a><a href="#cmd.ProvideLayer">\ProvideLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.ProvideLayer">339</a></li> -<li><a name="cmd.ProvideNoteColumn"></a><a href="#cmd.ProvideNoteColumn">\ProvideNoteColumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.ProvideNoteColumn">379</a></li> -<li><a name="cmd.ProvidePageStyleAlias"></a><a href="#cmd.ProvidePageStyleAlias">\ProvidePageStyleAlias</a> --> <a href="scrguide.pdf#scrlayer.cmd.ProvidePageStyleAlias">352</a></li> -<li><a name="cmd.ProvidePageStyleByLayers"></a><a href="#cmd.ProvidePageStyleByLayers">\ProvidePageStyleByLayers</a> --> <a href="scrguide.pdf#scrlayer.cmd.ProvidePageStyleByLayers">353</a></li> -<li><a name="cmd.ProvideSectionCommand"></a><a href="#cmd.ProvideSectionCommand">\ProvideSectionCommand</a> --> <a href="scrguide.pdf#maincls-experts.cmd.ProvideSectionCommand">398</a></li> -<li><a name="cmd.ProvideSectionCommands"></a><a href="#cmd.ProvideSectionCommands">\ProvideSectionCommands</a> --> <a href="scrguide.pdf#maincls-experts.cmd.ProvideSectionCommands">406</a></li> -<li><a name="cmd.RedeclareLayer"></a><a href="#cmd.RedeclareLayer">\RedeclareLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.RedeclareLayer">339</a></li> -<li><a name="cmd.RedeclareNoteColumn"></a><a href="#cmd.RedeclareNoteColumn">\RedeclareNoteColumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.RedeclareNoteColumn">379</a></li> -<li><a name="cmd.RedeclarePageStyleAlias"></a><a href="#cmd.RedeclarePageStyleAlias">\RedeclarePageStyleAlias</a> --> <a href="scrguide.pdf#scrlayer.cmd.RedeclarePageStyleAlias">352</a></li> -<li><a name="cmd.RedeclarePageStyleByLayers"></a><a href="#cmd.RedeclarePageStyleByLayers">\RedeclarePageStyleByLayers</a> --> <a href="scrguide.pdf#scrlayer.cmd.RedeclarePageStyleByLayers">353</a></li> -<li><a name="cmd.RedeclareSectionCommand"></a><a href="#cmd.RedeclareSectionCommand">\RedeclareSectionCommand</a> --> <a href="scrguide.pdf#maincls-experts.cmd.RedeclareSectionCommand">398</a></li> -<li><a name="cmd.RedeclareSectionCommands"></a><a href="#cmd.RedeclareSectionCommands">\RedeclareSectionCommands</a> --> <a href="scrguide.pdf#maincls-experts.cmd.RedeclareSectionCommands">406</a></li> -<li><a name="cmd.RelaxFamilyKey"></a><a href="#cmd.RelaxFamilyKey">\RelaxFamilyKey</a> --> <a href="scrguide.pdf#scrbase.cmd.RelaxFamilyKey">272</a></li> -<li><a name="cmd.RemoveLayersFromPageStyle"></a><a href="#cmd.RemoveLayersFromPageStyle">\RemoveLayersFromPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.RemoveLayersFromPageStyle">357</a></li> -<li><a name="cmd.ReplaceClass"></a><a href="#cmd.ReplaceClass">\ReplaceClass</a> --> <a href="scrguide.pdf#scrlfile.cmd.ReplaceClass">301</a></li> -<li><a name="cmd.ReplaceInput"></a><a href="#cmd.ReplaceInput">\ReplaceInput</a> --> <a href="scrguide.pdf#scrlfile.cmd.ReplaceInput">300</a></li> -<li><a name="cmd.ReplacePackage"></a><a href="#cmd.ReplacePackage">\ReplacePackage</a> --> <a href="scrguide.pdf#scrlfile.cmd.ReplacePackage">301</a></li> -<li><a name="cmd.ResetPreventPackageFromLoading"></a><a href="#cmd.ResetPreventPackageFromLoading">\ResetPreventPackageFromLoading</a> --> <a href="scrguide.pdf#scrlfile.cmd.ResetPreventPackageFromLoading">304</a></li> -<li><a name="cmd.StorePreventPackageFromLoading"></a><a href="#cmd.StorePreventPackageFromLoading">\StorePreventPackageFromLoading</a> --> <a href="scrguide.pdf#scrlfile.cmd.StorePreventPackageFromLoading">304</a></li> -<li><a name="cmd.TOCclone"></a><a href="#cmd.TOCclone">\TOCclone</a> --> <a href="scrguide.pdf#scrwfile.cmd.TOCclone">307</a></li> -<li><a name="cmd.Telephone"></a><a href="#cmd.Telephone">\Telephone</a> --> <a href="scrguide.pdf#scraddr.cmd.Telephone">258</a></li> -<li><a name="cmd.UnPreventPackageFromLoading*"></a><a href="#cmd.UnPreventPackageFromLoading*">\UnPreventPackageFromLoading*</a> --> <a href="scrguide.pdf#scrlfile.cmd.UnPreventPackageFromLoading*">304</a></li> -<li><a name="cmd.UnPreventPackageFromLoading"></a><a href="#cmd.UnPreventPackageFromLoading">\UnPreventPackageFromLoading</a> --> <a href="scrguide.pdf#scrlfile.cmd.UnPreventPackageFromLoading">304</a></li> -<li><a name="cmd.UnReplaceClass"></a><a href="#cmd.UnReplaceClass">\UnReplaceClass</a> --> <a href="scrguide.pdf#scrlfile.cmd.UnReplaceClass">302</a></li> -<li><a name="cmd.UnReplaceInput"></a><a href="#cmd.UnReplaceInput">\UnReplaceInput</a> --> <a href="scrguide.pdf#scrlfile.cmd.UnReplaceInput">302</a></li> -<li><a name="cmd.UnReplacePackage"></a><a href="#cmd.UnReplacePackage">\UnReplacePackage</a> --> <a href="scrguide.pdf#scrlfile.cmd.UnReplacePackage">302</a></li> -<li><a name="cmd.UnifyLayersAtPageStyle"></a><a href="#cmd.UnifyLayersAtPageStyle">\UnifyLayersAtPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.UnifyLayersAtPageStyle">358</a></li> -<li><a name="cmd.XdivY"></a><a href="#cmd.XdivY">\XdivY</a> --> <a href="scrguide.pdf#scrbase.cmd.XdivY">292</a></li> -<li><a name="cmd.XmodY"></a><a href="#cmd.XmodY">\XmodY</a> --> <a href="scrguide.pdf#scrbase.cmd.XmodY">292</a></li> -<li><a name="cmd.activateareas"></a><a href="#cmd.activateareas">\activateareas</a> --> <a href="scrguide.pdf#typearea-experts.cmd.activateareas">390</a></li> +<li><a name="cmd.LastName"></a><a href="#cmd.LastName">\LastName</a> --> <a href="scrguide.pdf#scraddr.cmd.LastName">259</a></li> +<li><a name="cmd.LastTOCLevelWasHigher"></a><a href="#cmd.LastTOCLevelWasHigher">\LastTOCLevelWasHigher</a> --> <a href="scrguide.pdf#tocbasic.cmd.LastTOCLevelWasHigher">354</a></li> +<li><a name="cmd.LastTOCLevelWasLower"></a><a href="#cmd.LastTOCLevelWasLower">\LastTOCLevelWasLower</a> --> <a href="scrguide.pdf#tocbasic.cmd.LastTOCLevelWasLower">354</a></li> +<li><a name="cmd.LastTOCLevelWasSame"></a><a href="#cmd.LastTOCLevelWasSame">\LastTOCLevelWasSame</a> --> <a href="scrguide.pdf#tocbasic.cmd.LastTOCLevelWasSame">354</a></li> +<li><a name="cmd.LenToUnit"></a><a href="#cmd.LenToUnit">\LenToUnit</a> --> <a href="scrguide.pdf#scrlayer.cmd.LenToUnit">383</a></li> +<li><a name="cmd.LetterOptionNeedsPapersize"></a><a href="#cmd.LetterOptionNeedsPapersize">\LetterOptionNeedsPapersize</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.LetterOptionNeedsPapersize">472</a></li> +<li><a name="cmd.MakeMarkcase"></a><a href="#cmd.MakeMarkcase">\MakeMarkcase</a> --> <a href="scrguide.pdf#tocbasic.cmd.MakeMarkcase">338</a>, <a href="scrguide.pdf#scrlayer.cmd.MakeMarkcase">396</a></li> +<li><a name="cmd.ModifyLayer"></a><a href="#cmd.ModifyLayer">\ModifyLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.ModifyLayer">374</a></li> +<li><a name="cmd.ModifyLayerPageStyleOptions"></a><a href="#cmd.ModifyLayerPageStyleOptions">\ModifyLayerPageStyleOptions</a> --> <a href="scrguide.pdf#scrlayer.cmd.ModifyLayerPageStyleOptions">394</a></li> +<li><a name="cmd.Name"></a><a href="#cmd.Name">\Name</a> --> <a href="scrguide.pdf#scraddr.cmd.Name">259</a></li> +<li><a name="cmd.PackageInfoNoLine"></a><a href="#cmd.PackageInfoNoLine">\PackageInfoNoLine</a> --> <a href="scrguide.pdf#scrbase.cmd.PackageInfoNoLine">312</a></li> +<li><a name="cmd.PreventPackageFromLoading*"></a><a href="#cmd.PreventPackageFromLoading*">\PreventPackageFromLoading*</a> --> <a href="scrguide.pdf#scrlfile.cmd.PreventPackageFromLoading*">323</a></li> +<li><a name="cmd.PreventPackageFromLoading"></a><a href="#cmd.PreventPackageFromLoading">\PreventPackageFromLoading</a> --> <a href="scrguide.pdf#scrlfile.cmd.PreventPackageFromLoading">323</a></li> +<li><a name="cmd.ProvideLayer"></a><a href="#cmd.ProvideLayer">\ProvideLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.ProvideLayer">374</a></li> +<li><a name="cmd.ProvideNoteColumn"></a><a href="#cmd.ProvideNoteColumn">\ProvideNoteColumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.ProvideNoteColumn">414</a></li> +<li><a name="cmd.ProvidePageStyleAlias"></a><a href="#cmd.ProvidePageStyleAlias">\ProvidePageStyleAlias</a> --> <a href="scrguide.pdf#scrlayer.cmd.ProvidePageStyleAlias">387</a></li> +<li><a name="cmd.ProvidePageStyleByLayers"></a><a href="#cmd.ProvidePageStyleByLayers">\ProvidePageStyleByLayers</a> --> <a href="scrguide.pdf#scrlayer.cmd.ProvidePageStyleByLayers">388</a></li> +<li><a name="cmd.ProvideSectionCommand"></a><a href="#cmd.ProvideSectionCommand">\ProvideSectionCommand</a> --> <a href="scrguide.pdf#maincls-experts.cmd.ProvideSectionCommand">433</a></li> +<li><a name="cmd.ProvideSectionCommands"></a><a href="#cmd.ProvideSectionCommands">\ProvideSectionCommands</a> --> <a href="scrguide.pdf#maincls-experts.cmd.ProvideSectionCommands">443</a></li> +<li><a name="cmd.RedeclareLayer"></a><a href="#cmd.RedeclareLayer">\RedeclareLayer</a> --> <a href="scrguide.pdf#scrlayer.cmd.RedeclareLayer">374</a></li> +<li><a name="cmd.RedeclareNoteColumn"></a><a href="#cmd.RedeclareNoteColumn">\RedeclareNoteColumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.RedeclareNoteColumn">414</a></li> +<li><a name="cmd.RedeclarePageStyleAlias"></a><a href="#cmd.RedeclarePageStyleAlias">\RedeclarePageStyleAlias</a> --> <a href="scrguide.pdf#scrlayer.cmd.RedeclarePageStyleAlias">387</a></li> +<li><a name="cmd.RedeclarePageStyleByLayers"></a><a href="#cmd.RedeclarePageStyleByLayers">\RedeclarePageStyleByLayers</a> --> <a href="scrguide.pdf#scrlayer.cmd.RedeclarePageStyleByLayers">388</a></li> +<li><a name="cmd.RedeclareSectionCommand"></a><a href="#cmd.RedeclareSectionCommand">\RedeclareSectionCommand</a> --> <a href="scrguide.pdf#maincls-experts.cmd.RedeclareSectionCommand">433</a></li> +<li><a name="cmd.RedeclareSectionCommands"></a><a href="#cmd.RedeclareSectionCommands">\RedeclareSectionCommands</a> --> <a href="scrguide.pdf#maincls-experts.cmd.RedeclareSectionCommands">443</a></li> +<li><a name="cmd.RelaxFamilyKey"></a><a href="#cmd.RelaxFamilyKey">\RelaxFamilyKey</a> --> <a href="scrguide.pdf#scrbase.cmd.RelaxFamilyKey">292</a></li> +<li><a name="cmd.RemoveLayersFromPageStyle"></a><a href="#cmd.RemoveLayersFromPageStyle">\RemoveLayersFromPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.RemoveLayersFromPageStyle">392</a></li> +<li><a name="cmd.ReplaceClass"></a><a href="#cmd.ReplaceClass">\ReplaceClass</a> --> <a href="scrguide.pdf#scrlfile.cmd.ReplaceClass">321</a></li> +<li><a name="cmd.ReplaceInput"></a><a href="#cmd.ReplaceInput">\ReplaceInput</a> --> <a href="scrguide.pdf#scrlfile.cmd.ReplaceInput">320</a></li> +<li><a name="cmd.ReplacePackage"></a><a href="#cmd.ReplacePackage">\ReplacePackage</a> --> <a href="scrguide.pdf#scrlfile.cmd.ReplacePackage">321</a></li> +<li><a name="cmd.ResetPreventPackageFromLoading"></a><a href="#cmd.ResetPreventPackageFromLoading">\ResetPreventPackageFromLoading</a> --> <a href="scrguide.pdf#scrlfile.cmd.ResetPreventPackageFromLoading">324</a></li> +<li><a name="cmd.Sentence"></a><a href="#cmd.Sentence">\Sentence</a> --> <a href="scrguide.pdf#scrjura.cmd.Sentence">275</a></li> +<li><a name="cmd.StorePreventPackageFromLoading"></a><a href="#cmd.StorePreventPackageFromLoading">\StorePreventPackageFromLoading</a> --> <a href="scrguide.pdf#scrlfile.cmd.StorePreventPackageFromLoading">324</a></li> +<li><a name="cmd.SubClause"></a><a href="#cmd.SubClause">\SubClause</a> --> <a href="scrguide.pdf#scrjura.cmd.SubClause">270</a></li> +<li><a name="cmd.TOCEntryStyleInitCode"></a><a href="#cmd.TOCEntryStyleInitCode">\TOCEntryStyleInitCode</a> --> <a href="scrguide.pdf#tocbasic.cmd.TOCEntryStyleInitCode">353</a></li> +<li><a name="cmd.TOCEntryStyleStartInitCode"></a><a href="#cmd.TOCEntryStyleStartInitCode">\TOCEntryStyleStartInitCode</a> --> <a href="scrguide.pdf#tocbasic.cmd.TOCEntryStyleStartInitCode">353</a></li> +<li><a name="cmd.TOCLineLeaderFill"></a><a href="#cmd.TOCLineLeaderFill">\TOCLineLeaderFill</a> --> <a href="scrguide.pdf#tocbasic.cmd.TOCLineLeaderFill">354</a></li> +<li><a name="cmd.TOCclone"></a><a href="#cmd.TOCclone">\TOCclone</a> --> <a href="scrguide.pdf#scrwfile.cmd.TOCclone">327</a></li> +<li><a name="cmd.Telephone"></a><a href="#cmd.Telephone">\Telephone</a> --> <a href="scrguide.pdf#scraddr.cmd.Telephone">259</a></li> +<li><a name="cmd.UnPreventPackageFromLoading*"></a><a href="#cmd.UnPreventPackageFromLoading*">\UnPreventPackageFromLoading*</a> --> <a href="scrguide.pdf#scrlfile.cmd.UnPreventPackageFromLoading*">324</a></li> +<li><a name="cmd.UnPreventPackageFromLoading"></a><a href="#cmd.UnPreventPackageFromLoading">\UnPreventPackageFromLoading</a> --> <a href="scrguide.pdf#scrlfile.cmd.UnPreventPackageFromLoading">324</a></li> +<li><a name="cmd.UnReplaceClass"></a><a href="#cmd.UnReplaceClass">\UnReplaceClass</a> --> <a href="scrguide.pdf#scrlfile.cmd.UnReplaceClass">322</a></li> +<li><a name="cmd.UnReplaceInput"></a><a href="#cmd.UnReplaceInput">\UnReplaceInput</a> --> <a href="scrguide.pdf#scrlfile.cmd.UnReplaceInput">322</a></li> +<li><a name="cmd.UnReplacePackage"></a><a href="#cmd.UnReplacePackage">\UnReplacePackage</a> --> <a href="scrguide.pdf#scrlfile.cmd.UnReplacePackage">322</a></li> +<li><a name="cmd.UnifyLayersAtPageStyle"></a><a href="#cmd.UnifyLayersAtPageStyle">\UnifyLayersAtPageStyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.UnifyLayersAtPageStyle">393</a></li> +<li><a name="cmd.XdivY"></a><a href="#cmd.XdivY">\XdivY</a> --> <a href="scrguide.pdf#scrbase.cmd.XdivY">312</a></li> +<li><a name="cmd.XmodY"></a><a href="#cmd.XmodY">\XmodY</a> --> <a href="scrguide.pdf#scrbase.cmd.XmodY">312</a></li> +<li><a name="cmd.activateareas"></a><a href="#cmd.activateareas">\activateareas</a> --> <a href="scrguide.pdf#typearea-experts.cmd.activateareas">425</a></li> <li><a name="cmd.addchap*"></a><a href="#cmd.addchap*">\addchap*</a> --> <a href="scrguide.pdf#maincls.cmd.addchap*">106</a></li> <li><a name="cmd.addchap"></a><a href="#cmd.addchap">\addchap</a> --> <a href="scrguide.pdf#maincls.cmd.addchap">106</a></li> <li><a name="cmd.addchapmark"></a><a href="#cmd.addchapmark">\addchapmark</a> --> <a href="scrguide.pdf#maincls.cmd.addchapmark">113</a></li> -<li><a name="cmd.addchaptertocentry"></a><a href="#cmd.addchaptertocentry">\addchaptertocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addchaptertocentry">395</a></li> -<li><a name="cmd.addcontentslinetoeachtocfile"></a><a href="#cmd.addcontentslinetoeachtocfile">\addcontentslinetoeachtocfile</a> --> <a href="scrguide.pdf#tocbasic.cmd.addcontentslinetoeachtocfile">315</a></li> -<li><a name="cmd.addparagraphtocentry"></a><a href="#cmd.addparagraphtocentry">\addparagraphtocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addparagraphtocentry">395</a></li> +<li><a name="cmd.addchaptertocentry"></a><a href="#cmd.addchaptertocentry">\addchaptertocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addchaptertocentry">430</a></li> +<li><a name="cmd.addcontentslinetoeachtocfile"></a><a href="#cmd.addcontentslinetoeachtocfile">\addcontentslinetoeachtocfile</a> --> <a href="scrguide.pdf#tocbasic.cmd.addcontentslinetoeachtocfile">335</a></li> +<li><a name="cmd.addparagraphtocentry"></a><a href="#cmd.addparagraphtocentry">\addparagraphtocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addparagraphtocentry">430</a></li> <li><a name="cmd.addpart*"></a><a href="#cmd.addpart*">\addpart*</a> --> <a href="scrguide.pdf#maincls.cmd.addpart*">106</a></li> <li><a name="cmd.addpart"></a><a href="#cmd.addpart">\addpart</a> --> <a href="scrguide.pdf#maincls.cmd.addpart">106</a></li> -<li><a name="cmd.addparttocentry"></a><a href="#cmd.addparttocentry">\addparttocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addparttocentry">395</a></li> -<li><a name="cmd.addrchar"></a><a href="#cmd.addrchar">\addrchar</a> --> <a href="scrguide.pdf#scrlttr2.cmd.addrchar">222</a></li> -<li><a name="cmd.addrentry"></a><a href="#cmd.addrentry">\addrentry</a> --> <a href="scrguide.pdf#scrlttr2.cmd.addrentry">221</a></li> +<li><a name="cmd.addparttocentry"></a><a href="#cmd.addparttocentry">\addparttocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addparttocentry">430</a></li> +<li><a name="cmd.addrchar"></a><a href="#cmd.addrchar">\addrchar</a> --> <a href="scrguide.pdf#scrlttr2.cmd.addrchar">223</a></li> +<li><a name="cmd.addrentry"></a><a href="#cmd.addrentry">\addrentry</a> --> <a href="scrguide.pdf#scrlttr2.cmd.addrentry">222</a></li> <li><a name="cmd.addsec*"></a><a href="#cmd.addsec*">\addsec*</a> --> <a href="scrguide.pdf#maincls.cmd.addsec*">106</a></li> <li><a name="cmd.addsec"></a><a href="#cmd.addsec">\addsec</a> --> <a href="scrguide.pdf#maincls.cmd.addsec">106</a></li> <li><a name="cmd.addsecmark"></a><a href="#cmd.addsecmark">\addsecmark</a> --> <a href="scrguide.pdf#maincls.cmd.addsecmark">113</a></li> -<li><a name="cmd.addsectiontocentry"></a><a href="#cmd.addsectiontocentry">\addsectiontocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addsectiontocentry">395</a></li> -<li><a name="cmd.addsubparagraphtocentry"></a><a href="#cmd.addsubparagraphtocentry">\addsubparagraphtocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addsubparagraphtocentry">395</a></li> -<li><a name="cmd.addsubsectiontocentry"></a><a href="#cmd.addsubsectiontocentry">\addsubsectiontocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addsubsectiontocentry">395</a></li> -<li><a name="cmd.addsubsubsectiontocentry"></a><a href="#cmd.addsubsubsectiontocentry">\addsubsubsectiontocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addsubsubsectiontocentry">395</a></li> -<li><a name="cmd.addtocentrydefault"></a><a href="#cmd.addtocentrydefault">\addtocentrydefault</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addtocentrydefault">394</a></li> -<li><a name="cmd.addtoeachtocfile"></a><a href="#cmd.addtoeachtocfile">\addtoeachtocfile</a> --> <a href="scrguide.pdf#tocbasic.cmd.addtoeachtocfile">314</a></li> +<li><a name="cmd.addsectiontocentry"></a><a href="#cmd.addsectiontocentry">\addsectiontocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addsectiontocentry">430</a></li> +<li><a name="cmd.addsubparagraphtocentry"></a><a href="#cmd.addsubparagraphtocentry">\addsubparagraphtocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addsubparagraphtocentry">430</a></li> +<li><a name="cmd.addsubsectiontocentry"></a><a href="#cmd.addsubsectiontocentry">\addsubsectiontocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addsubsectiontocentry">430</a></li> +<li><a name="cmd.addsubsubsectiontocentry"></a><a href="#cmd.addsubsubsectiontocentry">\addsubsubsectiontocentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addsubsubsectiontocentry">430</a></li> +<li><a name="cmd.addtocentrydefault"></a><a href="#cmd.addtocentrydefault">\addtocentrydefault</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addtocentrydefault">429</a></li> +<li><a name="cmd.addtoeachtocfile"></a><a href="#cmd.addtoeachtocfile">\addtoeachtocfile</a> --> <a href="scrguide.pdf#tocbasic.cmd.addtoeachtocfile">334</a></li> <li><a name="cmd.addtokomafont"></a><a href="#cmd.addtokomafont">\addtokomafont</a> --> <a href="scrguide.pdf#maincls.cmd.addtokomafont">59</a></li> -<li><a name="cmd.addtokomafontgobblelist"></a><a href="#cmd.addtokomafontgobblelist">\addtokomafontgobblelist</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addtokomafontgobblelist">396</a></li> -<li><a name="cmd.addtokomafontrelaxlist"></a><a href="#cmd.addtokomafontrelaxlist">\addtokomafontrelaxlist</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addtokomafontrelaxlist">396</a></li> -<li><a name="cmd.addtolengthplength"></a><a href="#cmd.addtolengthplength">\addtolengthplength</a> --> <a href="scrguide.pdf#scrlttr2.cmd.addtolengthplength">159</a></li> -<li><a name="cmd.addtoreffields"></a><a href="#cmd.addtoreffields">\addtoreffields</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.addtoreffields">433</a></li> -<li><a name="cmd.addtotoclist"></a><a href="#cmd.addtotoclist">\addtotoclist</a> --> <a href="scrguide.pdf#tocbasic.cmd.addtotoclist">311</a></li> -<li><a name="cmd.addxcontentsline"></a><a href="#cmd.addxcontentsline">\addxcontentsline</a> --> <a href="scrguide.pdf#tocbasic.cmd.addxcontentsline">315</a></li> -<li><a name="cmd.adrchar"></a><a href="#cmd.adrchar">\adrchar</a> --> <a href="scrguide.pdf#scrlttr2.cmd.adrchar">222</a></li> -<li><a name="cmd.adrentry"></a><a href="#cmd.adrentry">\adrentry</a> --> <a href="scrguide.pdf#scrlttr2.cmd.adrentry">220</a></li> -<li><a name="cmd.aliaskomafont"></a><a href="#cmd.aliaskomafont">\aliaskomafont</a> --> <a href="scrguide.pdf#maincls-experts.cmd.aliaskomafont">395</a></li> +<li><a name="cmd.addtokomafontgobblelist"></a><a href="#cmd.addtokomafontgobblelist">\addtokomafontgobblelist</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addtokomafontgobblelist">431</a></li> +<li><a name="cmd.addtokomafontrelaxlist"></a><a href="#cmd.addtokomafontrelaxlist">\addtokomafontrelaxlist</a> --> <a href="scrguide.pdf#maincls-experts.cmd.addtokomafontrelaxlist">431</a></li> +<li><a name="cmd.addtolengthplength"></a><a href="#cmd.addtolengthplength">\addtolengthplength</a> --> <a href="scrguide.pdf#scrlttr2.cmd.addtolengthplength">160</a></li> +<li><a name="cmd.addtoreffields"></a><a href="#cmd.addtoreffields">\addtoreffields</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.addtoreffields">469</a></li> +<li><a name="cmd.addtotoclist"></a><a href="#cmd.addtotoclist">\addtotoclist</a> --> <a href="scrguide.pdf#tocbasic.cmd.addtotoclist">331</a></li> +<li><a name="cmd.addxcontentsline"></a><a href="#cmd.addxcontentsline">\addxcontentsline</a> --> <a href="scrguide.pdf#tocbasic.cmd.addxcontentsline">335</a></li> +<li><a name="cmd.adrchar"></a><a href="#cmd.adrchar">\adrchar</a> --> <a href="scrguide.pdf#scrlttr2.cmd.adrchar">223</a></li> +<li><a name="cmd.adrentry"></a><a href="#cmd.adrentry">\adrentry</a> --> <a href="scrguide.pdf#scrlttr2.cmd.adrentry">221</a></li> +<li><a name="cmd.aliaskomafont"></a><a href="#cmd.aliaskomafont">\aliaskomafont</a> --> <a href="scrguide.pdf#maincls-experts.cmd.aliaskomafont">430</a></li> <li><a name="cmd.and"></a><a href="#cmd.and">\and</a> --> <a href="scrguide.pdf#maincls.cmd.and">67</a></li> <li><a name="cmd.appendix"></a><a href="#cmd.appendix">\appendix</a> --> <a href="scrguide.pdf#maincls.cmd.appendix">148</a></li> -<li><a name="cmd.appendixmore"></a><a href="#cmd.appendixmore">\appendixmore</a> --> <a href="scrguide.pdf#maincls-experts.cmd.appendixmore">414</a></li> +<li><a name="cmd.appendixmore"></a><a href="#cmd.appendixmore">\appendixmore</a> --> <a href="scrguide.pdf#maincls-experts.cmd.appendixmore">450</a></li> <li><a name="cmd.author"></a><a href="#cmd.author">\author</a> --> <a href="scrguide.pdf#maincls.cmd.author">67</a></li> <li><a name="cmd.autodot"></a><a href="#cmd.autodot">\autodot</a> --> <a href="scrguide.pdf#maincls.cmd.autodot">110</a></li> -<li><a name="cmd.automark"></a><a href="#cmd.automark">\automark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.automark">239</a></li> +<li><a name="cmd.automark"></a><a href="#cmd.automark">\automark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.automark">240</a></li> <li><a name="cmd.backmatter"></a><a href="#cmd.backmatter">\backmatter</a> --> <a href="scrguide.pdf#maincls.cmd.backmatter">94</a></li> -<li><a name="cmd.bankname"></a><a href="#cmd.bankname">\bankname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.bankname">444</a></li> -<li><a name="cmd.bib@beginhook"></a><a href="#cmd.bib@beginhook">\bib@beginhook</a> --> <a href="scrguide.pdf#maincls-experts.cmd.bib@beginhook">415</a></li> -<li><a name="cmd.bib@endhook"></a><a href="#cmd.bib@endhook">\bib@endhook</a> --> <a href="scrguide.pdf#maincls-experts.cmd.bib@endhook">415</a></li> +<li><a name="cmd.bankname"></a><a href="#cmd.bankname">\bankname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.bankname">480</a></li> +<li><a name="cmd.bib@beginhook"></a><a href="#cmd.bib@beginhook">\bib@beginhook</a> --> <a href="scrguide.pdf#maincls-experts.cmd.bib@beginhook">451</a></li> +<li><a name="cmd.bib@endhook"></a><a href="#cmd.bib@endhook">\bib@endhook</a> --> <a href="scrguide.pdf#maincls-experts.cmd.bib@endhook">451</a></li> <li><a name="cmd.caption"></a><a href="#cmd.caption">\caption</a> --> <a href="scrguide.pdf#maincls.cmd.caption">132</a></li> <li><a name="cmd.captionabove"></a><a href="#cmd.captionabove">\captionabove</a> --> <a href="scrguide.pdf#maincls.cmd.captionabove">132</a></li> <li><a name="cmd.captionaboveof"></a><a href="#cmd.captionaboveof">\captionaboveof</a> --> <a href="scrguide.pdf#maincls.cmd.captionaboveof">134</a></li> @@ -314,59 +342,59 @@ <li><a name="cmd.captionbelowof"></a><a href="#cmd.captionbelowof">\captionbelowof</a> --> <a href="scrguide.pdf#maincls.cmd.captionbelowof">134</a></li> <li><a name="cmd.captionformat"></a><a href="#cmd.captionformat">\captionformat</a> --> <a href="scrguide.pdf#maincls.cmd.captionformat">140</a></li> <li><a name="cmd.captionof"></a><a href="#cmd.captionof">\captionof</a> --> <a href="scrguide.pdf#maincls.cmd.captionof">134</a></li> -<li><a name="cmd.captionsUKenglish"></a><a href="#cmd.captionsUKenglish">\captionsUKenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsUKenglish">441</a></li> -<li><a name="cmd.captionsUSenglish"></a><a href="#cmd.captionsUSenglish">\captionsUSenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsUSenglish">441</a></li> -<li><a name="cmd.captionsacadian"></a><a href="#cmd.captionsacadian">\captionsacadian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsacadian">441</a></li> -<li><a name="cmd.captionsamerican"></a><a href="#cmd.captionsamerican">\captionsamerican</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsamerican">441</a></li> -<li><a name="cmd.captionsaustralien"></a><a href="#cmd.captionsaustralien">\captionsaustralien</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsaustralien">441</a></li> -<li><a name="cmd.captionsaustrian"></a><a href="#cmd.captionsaustrian">\captionsaustrian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsaustrian">441</a></li> -<li><a name="cmd.captionsbritish"></a><a href="#cmd.captionsbritish">\captionsbritish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsbritish">441</a></li> -<li><a name="cmd.captionscanadian"></a><a href="#cmd.captionscanadian">\captionscanadian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionscanadian">441</a></li> -<li><a name="cmd.captionscanadien"></a><a href="#cmd.captionscanadien">\captionscanadien</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionscanadien">441</a></li> -<li><a name="cmd.captionscroatian"></a><a href="#cmd.captionscroatian">\captionscroatian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionscroatian">441</a></li> -<li><a name="cmd.captionsczech"></a><a href="#cmd.captionsczech">\captionsczech</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsczech">441</a></li> -<li><a name="cmd.captionsdutch"></a><a href="#cmd.captionsdutch">\captionsdutch</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsdutch">441</a></li> -<li><a name="cmd.captionsenglish"></a><a href="#cmd.captionsenglish">\captionsenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsenglish">441</a></li> -<li><a name="cmd.captionsfinnish"></a><a href="#cmd.captionsfinnish">\captionsfinnish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsfinnish">441</a></li> -<li><a name="cmd.captionsfrancais"></a><a href="#cmd.captionsfrancais">\captionsfrancais</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsfrancais">441</a></li> -<li><a name="cmd.captionsfrench"></a><a href="#cmd.captionsfrench">\captionsfrench</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsfrench">441</a></li> -<li><a name="cmd.captionsgerman"></a><a href="#cmd.captionsgerman">\captionsgerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsgerman">441</a></li> -<li><a name="cmd.captionsitalian"></a><a href="#cmd.captionsitalian">\captionsitalian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsitalian">441</a></li> -<li><a name="cmd.captionsnaustrian"></a><a href="#cmd.captionsnaustrian">\captionsnaustrian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsnaustrian">441</a></li> -<li><a name="cmd.captionsnewzealand"></a><a href="#cmd.captionsnewzealand">\captionsnewzealand</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsnewzealand">441</a></li> -<li><a name="cmd.captionsngerman"></a><a href="#cmd.captionsngerman">\captionsngerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsngerman">441</a></li> -<li><a name="cmd.captionsnorsk"></a><a href="#cmd.captionsnorsk">\captionsnorsk</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsnorsk">441</a></li> -<li><a name="cmd.captionsnswissgerman"></a><a href="#cmd.captionsnswissgerman">\captionsnswissgerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsnswissgerman">441</a></li> -<li><a name="cmd.captionspolish"></a><a href="#cmd.captionspolish">\captionspolish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionspolish">441</a></li> -<li><a name="cmd.captionsslovak"></a><a href="#cmd.captionsslovak">\captionsslovak</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsslovak">441</a></li> -<li><a name="cmd.captionsspanish"></a><a href="#cmd.captionsspanish">\captionsspanish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsspanish">441</a></li> -<li><a name="cmd.captionsswedish"></a><a href="#cmd.captionsswedish">\captionsswedish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsswedish">441</a></li> -<li><a name="cmd.captionsswissgerman"></a><a href="#cmd.captionsswissgerman">\captionsswissgerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsswissgerman">441</a></li> -<li><a name="cmd.cc"></a><a href="#cmd.cc">\cc</a> --> <a href="scrguide.pdf#scrlttr2.cmd.cc">168</a></li> -<li><a name="cmd.ccname"></a><a href="#cmd.ccname">\ccname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.ccname">444</a></li> -<li><a name="cmd.cefoot*"></a><a href="#cmd.cefoot*">\cefoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cefoot*">235</a></li> -<li><a name="cmd.cefoot"></a><a href="#cmd.cefoot">\cefoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cefoot">232</a></li> -<li><a name="cmd.cehead*"></a><a href="#cmd.cehead*">\cehead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cehead*">232</a></li> -<li><a name="cmd.cehead"></a><a href="#cmd.cehead">\cehead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cehead">229</a></li> -<li><a name="cmd.cfoot*"></a><a href="#cmd.cfoot*">\cfoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cfoot*">237</a></li> -<li><a name="cmd.cfoot"></a><a href="#cmd.cfoot">\cfoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cfoot">236</a></li> -<li><a name="cmd.changefontsizes"></a><a href="#cmd.changefontsizes">\changefontsizes</a> --> <a href="scrguide.pdf#maincls-experts.cmd.changefontsizes">395</a></li> +<li><a name="cmd.captionsUKenglish"></a><a href="#cmd.captionsUKenglish">\captionsUKenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsUKenglish">477</a></li> +<li><a name="cmd.captionsUSenglish"></a><a href="#cmd.captionsUSenglish">\captionsUSenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsUSenglish">477</a></li> +<li><a name="cmd.captionsacadian"></a><a href="#cmd.captionsacadian">\captionsacadian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsacadian">477</a></li> +<li><a name="cmd.captionsamerican"></a><a href="#cmd.captionsamerican">\captionsamerican</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsamerican">477</a></li> +<li><a name="cmd.captionsaustralien"></a><a href="#cmd.captionsaustralien">\captionsaustralien</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsaustralien">477</a></li> +<li><a name="cmd.captionsaustrian"></a><a href="#cmd.captionsaustrian">\captionsaustrian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsaustrian">477</a></li> +<li><a name="cmd.captionsbritish"></a><a href="#cmd.captionsbritish">\captionsbritish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsbritish">477</a></li> +<li><a name="cmd.captionscanadian"></a><a href="#cmd.captionscanadian">\captionscanadian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionscanadian">477</a></li> +<li><a name="cmd.captionscanadien"></a><a href="#cmd.captionscanadien">\captionscanadien</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionscanadien">477</a></li> +<li><a name="cmd.captionscroatian"></a><a href="#cmd.captionscroatian">\captionscroatian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionscroatian">477</a></li> +<li><a name="cmd.captionsczech"></a><a href="#cmd.captionsczech">\captionsczech</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsczech">477</a></li> +<li><a name="cmd.captionsdutch"></a><a href="#cmd.captionsdutch">\captionsdutch</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsdutch">477</a></li> +<li><a name="cmd.captionsenglish"></a><a href="#cmd.captionsenglish">\captionsenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsenglish">477</a></li> +<li><a name="cmd.captionsfinnish"></a><a href="#cmd.captionsfinnish">\captionsfinnish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsfinnish">477</a></li> +<li><a name="cmd.captionsfrancais"></a><a href="#cmd.captionsfrancais">\captionsfrancais</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsfrancais">477</a></li> +<li><a name="cmd.captionsfrench"></a><a href="#cmd.captionsfrench">\captionsfrench</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsfrench">477</a></li> +<li><a name="cmd.captionsgerman"></a><a href="#cmd.captionsgerman">\captionsgerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsgerman">477</a></li> +<li><a name="cmd.captionsitalian"></a><a href="#cmd.captionsitalian">\captionsitalian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsitalian">477</a></li> +<li><a name="cmd.captionsnaustrian"></a><a href="#cmd.captionsnaustrian">\captionsnaustrian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsnaustrian">477</a></li> +<li><a name="cmd.captionsnewzealand"></a><a href="#cmd.captionsnewzealand">\captionsnewzealand</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsnewzealand">477</a></li> +<li><a name="cmd.captionsngerman"></a><a href="#cmd.captionsngerman">\captionsngerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsngerman">477</a></li> +<li><a name="cmd.captionsnorsk"></a><a href="#cmd.captionsnorsk">\captionsnorsk</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsnorsk">477</a></li> +<li><a name="cmd.captionsnswissgerman"></a><a href="#cmd.captionsnswissgerman">\captionsnswissgerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsnswissgerman">477</a></li> +<li><a name="cmd.captionspolish"></a><a href="#cmd.captionspolish">\captionspolish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionspolish">477</a></li> +<li><a name="cmd.captionsslovak"></a><a href="#cmd.captionsslovak">\captionsslovak</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsslovak">477</a></li> +<li><a name="cmd.captionsspanish"></a><a href="#cmd.captionsspanish">\captionsspanish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsspanish">477</a></li> +<li><a name="cmd.captionsswedish"></a><a href="#cmd.captionsswedish">\captionsswedish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsswedish">477</a></li> +<li><a name="cmd.captionsswissgerman"></a><a href="#cmd.captionsswissgerman">\captionsswissgerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.captionsswissgerman">477</a></li> +<li><a name="cmd.cc"></a><a href="#cmd.cc">\cc</a> --> <a href="scrguide.pdf#scrlttr2.cmd.cc">169</a></li> +<li><a name="cmd.ccname"></a><a href="#cmd.ccname">\ccname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.ccname">480</a></li> +<li><a name="cmd.cefoot*"></a><a href="#cmd.cefoot*">\cefoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cefoot*">236</a></li> +<li><a name="cmd.cefoot"></a><a href="#cmd.cefoot">\cefoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cefoot">233</a></li> +<li><a name="cmd.cehead*"></a><a href="#cmd.cehead*">\cehead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cehead*">233</a></li> +<li><a name="cmd.cehead"></a><a href="#cmd.cehead">\cehead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cehead">230</a></li> +<li><a name="cmd.cfoot*"></a><a href="#cmd.cfoot*">\cfoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cfoot*">238</a></li> +<li><a name="cmd.cfoot"></a><a href="#cmd.cfoot">\cfoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cfoot">237</a></li> +<li><a name="cmd.changefontsizes"></a><a href="#cmd.changefontsizes">\changefontsizes</a> --> <a href="scrguide.pdf#maincls-experts.cmd.changefontsizes">430</a></li> <li><a name="cmd.chapapp"></a><a href="#cmd.chapapp">\chapapp</a> --> <a href="scrguide.pdf#maincls.cmd.chapapp">112</a></li> <li><a name="cmd.chapappifchapterprefix"></a><a href="#cmd.chapappifchapterprefix">\chapappifchapterprefix</a> --> <a href="scrguide.pdf#maincls.cmd.chapappifchapterprefix">112</a></li> <li><a name="cmd.chapter*"></a><a href="#cmd.chapter*">\chapter*</a> --> <a href="scrguide.pdf#maincls.cmd.chapter*">106</a></li> <li><a name="cmd.chapter"></a><a href="#cmd.chapter">\chapter</a> --> <a href="scrguide.pdf#maincls.cmd.chapter">101</a></li> <li><a name="cmd.chapterformat"></a><a href="#cmd.chapterformat">\chapterformat</a> --> <a href="scrguide.pdf#maincls.cmd.chapterformat">110</a></li> -<li><a name="cmd.chapterheadendvskip"></a><a href="#cmd.chapterheadendvskip">\chapterheadendvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.chapterheadendvskip">408</a></li> -<li><a name="cmd.chapterheadsmidvskip"></a><a href="#cmd.chapterheadsmidvskip">\chapterheadsmidvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.chapterheadsmidvskip">408</a></li> -<li><a name="cmd.chapterheadstartvskip"></a><a href="#cmd.chapterheadstartvskip">\chapterheadstartvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.chapterheadstartvskip">408</a></li> -<li><a name="cmd.chapterlinesformat"></a><a href="#cmd.chapterlinesformat">\chapterlinesformat</a> --> <a href="scrguide.pdf#maincls-experts.cmd.chapterlinesformat">409</a></li> -<li><a name="cmd.chapterlineswithprefixformat"></a><a href="#cmd.chapterlineswithprefixformat">\chapterlineswithprefixformat</a> --> <a href="scrguide.pdf#maincls-experts.cmd.chapterlineswithprefixformat">409</a></li> -<li><a name="cmd.chaptermark"></a><a href="#cmd.chaptermark">\chaptermark</a> --> <a href="scrguide.pdf#maincls.cmd.chaptermark">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.chaptermark">245</a></li> -<li><a name="cmd.chaptermarkformat"></a><a href="#cmd.chaptermarkformat">\chaptermarkformat</a> --> <a href="scrguide.pdf#maincls.cmd.chaptermarkformat">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.chaptermarkformat">245</a></li> +<li><a name="cmd.chapterheadendvskip"></a><a href="#cmd.chapterheadendvskip">\chapterheadendvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.chapterheadendvskip">444</a></li> +<li><a name="cmd.chapterheadsmidvskip"></a><a href="#cmd.chapterheadsmidvskip">\chapterheadsmidvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.chapterheadsmidvskip">444</a></li> +<li><a name="cmd.chapterheadstartvskip"></a><a href="#cmd.chapterheadstartvskip">\chapterheadstartvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.chapterheadstartvskip">444</a></li> +<li><a name="cmd.chapterlinesformat"></a><a href="#cmd.chapterlinesformat">\chapterlinesformat</a> --> <a href="scrguide.pdf#maincls-experts.cmd.chapterlinesformat">445</a></li> +<li><a name="cmd.chapterlineswithprefixformat"></a><a href="#cmd.chapterlineswithprefixformat">\chapterlineswithprefixformat</a> --> <a href="scrguide.pdf#maincls-experts.cmd.chapterlineswithprefixformat">445</a></li> +<li><a name="cmd.chaptermark"></a><a href="#cmd.chaptermark">\chaptermark</a> --> <a href="scrguide.pdf#maincls.cmd.chaptermark">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.chaptermark">246</a></li> +<li><a name="cmd.chaptermarkformat"></a><a href="#cmd.chaptermarkformat">\chaptermarkformat</a> --> <a href="scrguide.pdf#maincls.cmd.chaptermarkformat">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.chaptermarkformat">246</a></li> <li><a name="cmd.chapternumdepth"></a><a href="#cmd.chapternumdepth">\chapternumdepth</a> --> <a href="scrguide.pdf#maincls.cmd.chapternumdepth">114</a></li> <li><a name="cmd.chapterpagestyle"></a><a href="#cmd.chapterpagestyle">\chapterpagestyle</a> --> <a href="scrguide.pdf#maincls.cmd.chapterpagestyle">84</a></li> -<li><a name="cmd.chead*"></a><a href="#cmd.chead*">\chead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.chead*">237</a></li> -<li><a name="cmd.chead"></a><a href="#cmd.chead">\chead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.chead">236</a></li> +<li><a name="cmd.chead*"></a><a href="#cmd.chead*">\chead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.chead*">238</a></li> +<li><a name="cmd.chead"></a><a href="#cmd.chead">\chead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.chead">237</a></li> <li><a name="cmd.cleardoubleemptypage"></a><a href="#cmd.cleardoubleemptypage">\cleardoubleemptypage</a> --> <a href="scrguide.pdf#maincls.cmd.cleardoubleemptypage">88</a></li> <li><a name="cmd.cleardoubleevenemptypage"></a><a href="#cmd.cleardoubleevenemptypage">\cleardoubleevenemptypage</a> --> <a href="scrguide.pdf#maincls.cmd.cleardoubleevenemptypage">88</a>, <a href="scrguide.pdf#maincls.cmd.cleardoubleevenemptypage">89</a></li> <li><a name="cmd.cleardoubleevenpageusingstyle"></a><a href="#cmd.cleardoubleevenpageusingstyle">\cleardoubleevenpageusingstyle</a> --> <a href="scrguide.pdf#maincls.cmd.cleardoubleevenpageusingstyle">88</a></li> @@ -380,123 +408,124 @@ <li><a name="cmd.cleardoublepageusingstyle"></a><a href="#cmd.cleardoublepageusingstyle">\cleardoublepageusingstyle</a> --> <a href="scrguide.pdf#maincls.cmd.cleardoublepageusingstyle">88</a></li> <li><a name="cmd.cleardoubleplainpage"></a><a href="#cmd.cleardoubleplainpage">\cleardoubleplainpage</a> --> <a href="scrguide.pdf#maincls.cmd.cleardoubleplainpage">88</a></li> <li><a name="cmd.cleardoublestandardpage"></a><a href="#cmd.cleardoublestandardpage">\cleardoublestandardpage</a> --> <a href="scrguide.pdf#maincls.cmd.cleardoublestandardpage">88</a></li> -<li><a name="cmd.clearmainofpairofpagestyles"></a><a href="#cmd.clearmainofpairofpagestyles">\clearmainofpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearmainofpairofpagestyles">371</a></li> -<li><a name="cmd.clearnotecolumn"></a><a href="#cmd.clearnotecolumn">\clearnotecolumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.clearnotecolumn">387</a></li> -<li><a name="cmd.clearnotecolumns"></a><a href="#cmd.clearnotecolumns">\clearnotecolumns</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.clearnotecolumns">388</a></li> +<li><a name="cmd.clearmainofpairofpagestyles"></a><a href="#cmd.clearmainofpairofpagestyles">\clearmainofpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearmainofpairofpagestyles">406</a></li> +<li><a name="cmd.clearnotecolumn"></a><a href="#cmd.clearnotecolumn">\clearnotecolumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.clearnotecolumn">422</a></li> +<li><a name="cmd.clearnotecolumns"></a><a href="#cmd.clearnotecolumns">\clearnotecolumns</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.clearnotecolumns">423</a></li> <li><a name="cmd.clearpage"></a><a href="#cmd.clearpage">\clearpage</a> --> <a href="scrguide.pdf#maincls.cmd.clearpage">88</a></li> -<li><a name="cmd.clearpairofpagestyles"></a><a href="#cmd.clearpairofpagestyles">\clearpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearpairofpagestyles">371</a></li> -<li><a name="cmd.clearplainofpairofpagestyles"></a><a href="#cmd.clearplainofpairofpagestyles">\clearplainofpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearplainofpairofpagestyles">371</a></li> -<li><a name="cmd.clearscrheadfoot"></a><a href="#cmd.clearscrheadfoot">\clearscrheadfoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearscrheadfoot">371</a></li> -<li><a name="cmd.clearscrheadings"></a><a href="#cmd.clearscrheadings">\clearscrheadings</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearscrheadings">371</a></li> -<li><a name="cmd.clearscrplain"></a><a href="#cmd.clearscrplain">\clearscrplain</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearscrplain">371</a></li> -<li><a name="cmd.closing"></a><a href="#cmd.closing">\closing</a> --> <a href="scrguide.pdf#scrlttr2.cmd.closing">165</a></li> -<li><a name="cmd.cofoot*"></a><a href="#cmd.cofoot*">\cofoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cofoot*">235</a></li> -<li><a name="cmd.cofoot"></a><a href="#cmd.cofoot">\cofoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cofoot">232</a></li> -<li><a name="cmd.cohead*"></a><a href="#cmd.cohead*">\cohead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cohead*">232</a></li> -<li><a name="cmd.cohead"></a><a href="#cmd.cohead">\cohead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cohead">229</a></li> -<li><a name="cmd.currentpagestyle"></a><a href="#cmd.currentpagestyle">\currentpagestyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.currentpagestyle">351</a></li> -<li><a name="cmd.customername"></a><a href="#cmd.customername">\customername</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.customername">444</a></li> +<li><a name="cmd.clearpairofpagestyles"></a><a href="#cmd.clearpairofpagestyles">\clearpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearpairofpagestyles">406</a></li> +<li><a name="cmd.clearplainofpairofpagestyles"></a><a href="#cmd.clearplainofpairofpagestyles">\clearplainofpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearplainofpairofpagestyles">406</a></li> +<li><a name="cmd.clearscrheadfoot"></a><a href="#cmd.clearscrheadfoot">\clearscrheadfoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearscrheadfoot">406</a></li> +<li><a name="cmd.clearscrheadings"></a><a href="#cmd.clearscrheadings">\clearscrheadings</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearscrheadings">406</a></li> +<li><a name="cmd.clearscrplain"></a><a href="#cmd.clearscrplain">\clearscrplain</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.clearscrplain">406</a></li> +<li><a name="cmd.closing"></a><a href="#cmd.closing">\closing</a> --> <a href="scrguide.pdf#scrlttr2.cmd.closing">166</a></li> +<li><a name="cmd.cofoot*"></a><a href="#cmd.cofoot*">\cofoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cofoot*">236</a></li> +<li><a name="cmd.cofoot"></a><a href="#cmd.cofoot">\cofoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cofoot">233</a></li> +<li><a name="cmd.cohead*"></a><a href="#cmd.cohead*">\cohead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cohead*">233</a></li> +<li><a name="cmd.cohead"></a><a href="#cmd.cohead">\cohead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.cohead">230</a></li> +<li><a name="cmd.currentpagestyle"></a><a href="#cmd.currentpagestyle">\currentpagestyle</a> --> <a href="scrguide.pdf#scrlayer.cmd.currentpagestyle">386</a></li> +<li><a name="cmd.customername"></a><a href="#cmd.customername">\customername</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.customername">480</a></li> <li><a name="cmd.date"></a><a href="#cmd.date">\date</a> --> <a href="scrguide.pdf#maincls.cmd.date">67</a></li> -<li><a name="cmd.dateUKenglish"></a><a href="#cmd.dateUKenglish">\dateUKenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateUKenglish">442</a></li> -<li><a name="cmd.dateUSenglish"></a><a href="#cmd.dateUSenglish">\dateUSenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateUSenglish">442</a></li> -<li><a name="cmd.dateacadian"></a><a href="#cmd.dateacadian">\dateacadian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateacadian">442</a></li> -<li><a name="cmd.dateamerican"></a><a href="#cmd.dateamerican">\dateamerican</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateamerican">442</a></li> -<li><a name="cmd.dateaustralien"></a><a href="#cmd.dateaustralien">\dateaustralien</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateaustralien">442</a></li> -<li><a name="cmd.dateaustrian"></a><a href="#cmd.dateaustrian">\dateaustrian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateaustrian">442</a></li> -<li><a name="cmd.datebritish"></a><a href="#cmd.datebritish">\datebritish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datebritish">442</a></li> -<li><a name="cmd.datecanadian"></a><a href="#cmd.datecanadian">\datecanadian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datecanadian">442</a></li> -<li><a name="cmd.datecanadien"></a><a href="#cmd.datecanadien">\datecanadien</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datecanadien">442</a></li> -<li><a name="cmd.datecroatian"></a><a href="#cmd.datecroatian">\datecroatian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datecroatian">442</a></li> -<li><a name="cmd.dateczech"></a><a href="#cmd.dateczech">\dateczech</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateczech">442</a></li> -<li><a name="cmd.datedutch"></a><a href="#cmd.datedutch">\datedutch</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datedutch">442</a></li> -<li><a name="cmd.dateenglish"></a><a href="#cmd.dateenglish">\dateenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateenglish">442</a></li> -<li><a name="cmd.datefinnish"></a><a href="#cmd.datefinnish">\datefinnish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datefinnish">442</a></li> -<li><a name="cmd.datefrancais"></a><a href="#cmd.datefrancais">\datefrancais</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datefrancais">442</a></li> -<li><a name="cmd.datefrench"></a><a href="#cmd.datefrench">\datefrench</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datefrench">442</a></li> -<li><a name="cmd.dategerman"></a><a href="#cmd.dategerman">\dategerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dategerman">442</a></li> -<li><a name="cmd.dateitalian"></a><a href="#cmd.dateitalian">\dateitalian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateitalian">442</a></li> -<li><a name="cmd.datename"></a><a href="#cmd.datename">\datename</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datename">444</a></li> -<li><a name="cmd.datenaustrian"></a><a href="#cmd.datenaustrian">\datenaustrian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datenaustrian">442</a></li> -<li><a name="cmd.datenewzealand"></a><a href="#cmd.datenewzealand">\datenewzealand</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datenewzealand">442</a></li> -<li><a name="cmd.datengerman"></a><a href="#cmd.datengerman">\datengerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datengerman">442</a></li> -<li><a name="cmd.datenorsk"></a><a href="#cmd.datenorsk">\datenorsk</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datenorsk">442</a></li> -<li><a name="cmd.datenswissgerman"></a><a href="#cmd.datenswissgerman">\datenswissgerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datenswissgerman">442</a></li> -<li><a name="cmd.datepolish"></a><a href="#cmd.datepolish">\datepolish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datepolish">442</a></li> -<li><a name="cmd.dateslovak"></a><a href="#cmd.dateslovak">\dateslovak</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateslovak">442</a></li> -<li><a name="cmd.datespanish"></a><a href="#cmd.datespanish">\datespanish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datespanish">442</a></li> -<li><a name="cmd.dateswedish"></a><a href="#cmd.dateswedish">\dateswedish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateswedish">442</a></li> -<li><a name="cmd.dateswissgerman"></a><a href="#cmd.dateswissgerman">\dateswissgerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateswissgerman">442</a></li> +<li><a name="cmd.dateUKenglish"></a><a href="#cmd.dateUKenglish">\dateUKenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateUKenglish">478</a></li> +<li><a name="cmd.dateUSenglish"></a><a href="#cmd.dateUSenglish">\dateUSenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateUSenglish">478</a></li> +<li><a name="cmd.dateacadian"></a><a href="#cmd.dateacadian">\dateacadian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateacadian">478</a></li> +<li><a name="cmd.dateamerican"></a><a href="#cmd.dateamerican">\dateamerican</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateamerican">478</a></li> +<li><a name="cmd.dateaustralien"></a><a href="#cmd.dateaustralien">\dateaustralien</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateaustralien">478</a></li> +<li><a name="cmd.dateaustrian"></a><a href="#cmd.dateaustrian">\dateaustrian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateaustrian">478</a></li> +<li><a name="cmd.datebritish"></a><a href="#cmd.datebritish">\datebritish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datebritish">478</a></li> +<li><a name="cmd.datecanadian"></a><a href="#cmd.datecanadian">\datecanadian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datecanadian">478</a></li> +<li><a name="cmd.datecanadien"></a><a href="#cmd.datecanadien">\datecanadien</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datecanadien">478</a></li> +<li><a name="cmd.datecroatian"></a><a href="#cmd.datecroatian">\datecroatian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datecroatian">478</a></li> +<li><a name="cmd.dateczech"></a><a href="#cmd.dateczech">\dateczech</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateczech">478</a></li> +<li><a name="cmd.datedutch"></a><a href="#cmd.datedutch">\datedutch</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datedutch">478</a></li> +<li><a name="cmd.dateenglish"></a><a href="#cmd.dateenglish">\dateenglish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateenglish">478</a></li> +<li><a name="cmd.datefinnish"></a><a href="#cmd.datefinnish">\datefinnish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datefinnish">478</a></li> +<li><a name="cmd.datefrancais"></a><a href="#cmd.datefrancais">\datefrancais</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datefrancais">478</a></li> +<li><a name="cmd.datefrench"></a><a href="#cmd.datefrench">\datefrench</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datefrench">478</a></li> +<li><a name="cmd.dategerman"></a><a href="#cmd.dategerman">\dategerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dategerman">478</a></li> +<li><a name="cmd.dateitalian"></a><a href="#cmd.dateitalian">\dateitalian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateitalian">478</a></li> +<li><a name="cmd.datename"></a><a href="#cmd.datename">\datename</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datename">480</a></li> +<li><a name="cmd.datenaustrian"></a><a href="#cmd.datenaustrian">\datenaustrian</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datenaustrian">478</a></li> +<li><a name="cmd.datenewzealand"></a><a href="#cmd.datenewzealand">\datenewzealand</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datenewzealand">478</a></li> +<li><a name="cmd.datengerman"></a><a href="#cmd.datengerman">\datengerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datengerman">478</a></li> +<li><a name="cmd.datenorsk"></a><a href="#cmd.datenorsk">\datenorsk</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datenorsk">478</a></li> +<li><a name="cmd.datenswissgerman"></a><a href="#cmd.datenswissgerman">\datenswissgerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datenswissgerman">478</a></li> +<li><a name="cmd.datepolish"></a><a href="#cmd.datepolish">\datepolish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datepolish">478</a></li> +<li><a name="cmd.dateslovak"></a><a href="#cmd.dateslovak">\dateslovak</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateslovak">478</a></li> +<li><a name="cmd.datespanish"></a><a href="#cmd.datespanish">\datespanish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.datespanish">478</a></li> +<li><a name="cmd.dateswedish"></a><a href="#cmd.dateswedish">\dateswedish</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateswedish">478</a></li> +<li><a name="cmd.dateswissgerman"></a><a href="#cmd.dateswissgerman">\dateswissgerman</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.dateswissgerman">478</a></li> <li><a name="cmd.dedication"></a><a href="#cmd.dedication">\dedication</a> --> <a href="scrguide.pdf#maincls.cmd.dedication">70</a></li> -<li><a name="cmd.defaultreffields"></a><a href="#cmd.defaultreffields">\defaultreffields</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.defaultreffields">433</a></li> -<li><a name="cmd.defcaptionname"></a><a href="#cmd.defcaptionname">\defcaptionname</a> --> <a href="scrguide.pdf#scrbase.cmd.defcaptionname">288</a></li> +<li><a name="cmd.defaultreffields"></a><a href="#cmd.defaultreffields">\defaultreffields</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.defaultreffields">469</a></li> +<li><a name="cmd.defcaptionname"></a><a href="#cmd.defcaptionname">\defcaptionname</a> --> <a href="scrguide.pdf#scrbase.cmd.defcaptionname">308</a></li> <li><a name="cmd.deffootnote"></a><a href="#cmd.deffootnote">\deffootnote</a> --> <a href="scrguide.pdf#maincls.cmd.deffootnote">92</a></li> <li><a name="cmd.deffootnotemark"></a><a href="#cmd.deffootnotemark">\deffootnotemark</a> --> <a href="scrguide.pdf#maincls.cmd.deffootnotemark">92</a></li> -<li><a name="cmd.defpagestyle"></a><a href="#cmd.defpagestyle">\defpagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.defpagestyle">374</a></li> -<li><a name="cmd.defpairofpagestyles"></a><a href="#cmd.defpairofpagestyles">\defpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.defpairofpagestyles">370</a></li> -<li><a name="cmd.deftocheading"></a><a href="#cmd.deftocheading">\deftocheading</a> --> <a href="scrguide.pdf#tocbasic.cmd.deftocheading">319</a></li> -<li><a name="cmd.deftriplepagestyle"></a><a href="#cmd.deftriplepagestyle">\deftriplepagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.deftriplepagestyle">372</a></li> -<li><a name="cmd.deftripstyle"></a><a href="#cmd.deftripstyle">\deftripstyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.deftripstyle">373</a></li> +<li><a name="cmd.defpagestyle"></a><a href="#cmd.defpagestyle">\defpagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.defpagestyle">410</a></li> +<li><a name="cmd.defpairofpagestyles"></a><a href="#cmd.defpairofpagestyles">\defpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.defpairofpagestyles">405</a></li> +<li><a name="cmd.deftocheading"></a><a href="#cmd.deftocheading">\deftocheading</a> --> <a href="scrguide.pdf#tocbasic.cmd.deftocheading">339</a></li> +<li><a name="cmd.deftriplepagestyle"></a><a href="#cmd.deftriplepagestyle">\deftriplepagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.deftriplepagestyle">407</a></li> +<li><a name="cmd.deftripstyle"></a><a href="#cmd.deftripstyle">\deftripstyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.deftripstyle">408</a></li> <li><a name="cmd.dictum"></a><a href="#cmd.dictum">\dictum</a> --> <a href="scrguide.pdf#maincls.cmd.dictum">116</a></li> <li><a name="cmd.dictumauthorformat"></a><a href="#cmd.dictumauthorformat">\dictumauthorformat</a> --> <a href="scrguide.pdf#maincls.cmd.dictumauthorformat">116</a></li> <li><a name="cmd.dictumrule"></a><a href="#cmd.dictumrule">\dictumrule</a> --> <a href="scrguide.pdf#maincls.cmd.dictumrule">116</a></li> <li><a name="cmd.dictumwidth"></a><a href="#cmd.dictumwidth">\dictumwidth</a> --> <a href="scrguide.pdf#maincls.cmd.dictumwidth">116</a></li> <li><a name="cmd.documentclass"></a><a href="#cmd.documentclass">\documentclass</a> --> <a href="scrguide.pdf#typearea.cmd.documentclass">32</a></li> -<li><a name="cmd.doforeachtocfile"></a><a href="#cmd.doforeachtocfile">\doforeachtocfile</a> --> <a href="scrguide.pdf#tocbasic.cmd.doforeachtocfile">313</a></li> -<li><a name="cmd.edgesize"></a><a href="#cmd.edgesize">\edgesize</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.edgesize">438</a></li> -<li><a name="cmd.emailname"></a><a href="#cmd.emailname">\emailname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.emailname">444</a></li> -<li><a name="cmd.encl"></a><a href="#cmd.encl">\encl</a> --> <a href="scrguide.pdf#scrlttr2.cmd.encl">168</a></li> -<li><a name="cmd.enclname"></a><a href="#cmd.enclname">\enclname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.enclname">444</a></li> +<li><a name="cmd.doforeachtocfile"></a><a href="#cmd.doforeachtocfile">\doforeachtocfile</a> --> <a href="scrguide.pdf#tocbasic.cmd.doforeachtocfile">333</a></li> +<li><a name="cmd.edgesize"></a><a href="#cmd.edgesize">\edgesize</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.edgesize">474</a></li> +<li><a name="cmd.ellipsispar"></a><a href="#cmd.ellipsispar">\ellipsispar</a> --> <a href="scrguide.pdf#scrjura.cmd.ellipsispar">274</a></li> +<li><a name="cmd.emailname"></a><a href="#cmd.emailname">\emailname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.emailname">480</a></li> +<li><a name="cmd.encl"></a><a href="#cmd.encl">\encl</a> --> <a href="scrguide.pdf#scrlttr2.cmd.encl">169</a></li> +<li><a name="cmd.enclname"></a><a href="#cmd.enclname">\enclname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.enclname">480</a></li> <li><a name="cmd.extratitle"></a><a href="#cmd.extratitle">\extratitle</a> --> <a href="scrguide.pdf#maincls.cmd.extratitle">66</a></li> -<li><a name="cmd.faxname"></a><a href="#cmd.faxname">\faxname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.faxname">444</a></li> +<li><a name="cmd.faxname"></a><a href="#cmd.faxname">\faxname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.faxname">480</a></li> <li><a name="cmd.figureformat"></a><a href="#cmd.figureformat">\figureformat</a> --> <a href="scrguide.pdf#maincls.cmd.figureformat">140</a></li> <li><a name="cmd.footnote"></a><a href="#cmd.footnote">\footnote</a> --> <a href="scrguide.pdf#maincls.cmd.footnote">90</a></li> <li><a name="cmd.footnotemark"></a><a href="#cmd.footnotemark">\footnotemark</a> --> <a href="scrguide.pdf#maincls.cmd.footnotemark">90</a></li> <li><a name="cmd.footnotetext"></a><a href="#cmd.footnotetext">\footnotetext</a> --> <a href="scrguide.pdf#maincls.cmd.footnotetext">90</a></li> <li><a name="cmd.footref"></a><a href="#cmd.footref">\footref</a> --> <a href="scrguide.pdf#maincls.cmd.footref">91</a></li> <li><a name="cmd.frontmatter"></a><a href="#cmd.frontmatter">\frontmatter</a> --> <a href="scrguide.pdf#maincls.cmd.frontmatter">94</a></li> -<li><a name="cmd.headfromname"></a><a href="#cmd.headfromname">\headfromname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.headfromname">444</a></li> -<li><a name="cmd.headmark"></a><a href="#cmd.headmark">\headmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.headmark">243</a></li> -<li><a name="cmd.headtoname"></a><a href="#cmd.headtoname">\headtoname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.headtoname">444</a></li> -<li><a name="cmd.if@atdocument"></a><a href="#cmd.if@atdocument">\if@atdocument</a> --> <a href="scrguide.pdf#scrbase.cmd.if@atdocument">287</a></li> -<li><a name="cmd.if@chapter"></a><a href="#cmd.if@chapter">\if@chapter</a> --> <a href="scrguide.pdf#scrlayer.cmd.if@chapter">336</a></li> -<li><a name="cmd.if@mainmatter"></a><a href="#cmd.if@mainmatter">\if@mainmatter</a> --> <a href="scrguide.pdf#scrlayer.cmd.if@mainmatter">336</a></li> -<li><a name="cmd.ifVTeX"></a><a href="#cmd.ifVTeX">\ifVTeX</a> --> <a href="scrguide.pdf#scrbase.cmd.ifVTeX">284</a></li> -<li><a name="cmd.ifattoclist"></a><a href="#cmd.ifattoclist">\ifattoclist</a> --> <a href="scrguide.pdf#tocbasic.cmd.ifattoclist">310</a></li> -<li><a name="cmd.ifdimen"></a><a href="#cmd.ifdimen">\ifdimen</a> --> <a href="scrguide.pdf#scrbase.cmd.ifdimen">287</a></li> -<li><a name="cmd.ifdvioutput"></a><a href="#cmd.ifdvioutput">\ifdvioutput</a> --> <a href="scrguide.pdf#scrbase.cmd.ifdvioutput">285</a></li> -<li><a name="cmd.ifiscount"></a><a href="#cmd.ifiscount">\ifiscount</a> --> <a href="scrguide.pdf#scrbase.cmd.ifiscount">286</a></li> -<li><a name="cmd.ifiscounter"></a><a href="#cmd.ifiscounter">\ifiscounter</a> --> <a href="scrguide.pdf#scrbase.cmd.ifiscounter">287</a></li> -<li><a name="cmd.ifisdimen"></a><a href="#cmd.ifisdimen">\ifisdimen</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisdimen">285</a></li> -<li><a name="cmd.ifisdimension"></a><a href="#cmd.ifisdimension">\ifisdimension</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisdimension">285</a></li> -<li><a name="cmd.ifisdimexpr"></a><a href="#cmd.ifisdimexpr">\ifisdimexpr</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisdimexpr">286</a></li> -<li><a name="cmd.ifisglue"></a><a href="#cmd.ifisglue">\ifisglue</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisglue">286</a></li> -<li><a name="cmd.ifisglueexpr"></a><a href="#cmd.ifisglueexpr">\ifisglueexpr</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisglueexpr">286</a></li> -<li><a name="cmd.ifisinteger"></a><a href="#cmd.ifisinteger">\ifisinteger</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisinteger">286</a></li> -<li><a name="cmd.ifisnumexpr"></a><a href="#cmd.ifisnumexpr">\ifisnumexpr</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisnumexpr">286</a></li> -<li><a name="cmd.ifisskip"></a><a href="#cmd.ifisskip">\ifisskip</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisskip">286</a></li> -<li><a name="cmd.ifkomavar"></a><a href="#cmd.ifkomavar">\ifkomavar</a> --> <a href="scrguide.pdf#scrlttr2.cmd.ifkomavar">158</a></li> -<li><a name="cmd.ifkomavarempty*"></a><a href="#cmd.ifkomavarempty*">\ifkomavarempty*</a> --> <a href="scrguide.pdf#scrlttr2.cmd.ifkomavarempty*">158</a>, <a href="scrguide.pdf#scrlttr2-experts.cmd.ifkomavarempty*">434</a></li> -<li><a name="cmd.ifkomavarempty"></a><a href="#cmd.ifkomavarempty">\ifkomavarempty</a> --> <a href="scrguide.pdf#scrlttr2.cmd.ifkomavarempty">158</a>, <a href="scrguide.pdf#scrlttr2-experts.cmd.ifkomavarempty">434</a></li> -<li><a name="cmd.ifnotundefined"></a><a href="#cmd.ifnotundefined">\ifnotundefined</a> --> <a href="scrguide.pdf#scrbase.cmd.ifnotundefined">285</a></li> -<li><a name="cmd.ifnumber"></a><a href="#cmd.ifnumber">\ifnumber</a> --> <a href="scrguide.pdf#scrbase.cmd.ifnumber">287</a></li> +<li><a name="cmd.headfromname"></a><a href="#cmd.headfromname">\headfromname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.headfromname">480</a></li> +<li><a name="cmd.headmark"></a><a href="#cmd.headmark">\headmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.headmark">244</a></li> +<li><a name="cmd.headtoname"></a><a href="#cmd.headtoname">\headtoname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.headtoname">480</a></li> +<li><a name="cmd.if@atdocument"></a><a href="#cmd.if@atdocument">\if@atdocument</a> --> <a href="scrguide.pdf#scrbase.cmd.if@atdocument">307</a></li> +<li><a name="cmd.if@chapter"></a><a href="#cmd.if@chapter">\if@chapter</a> --> <a href="scrguide.pdf#scrlayer.cmd.if@chapter">371</a></li> +<li><a name="cmd.if@mainmatter"></a><a href="#cmd.if@mainmatter">\if@mainmatter</a> --> <a href="scrguide.pdf#scrlayer.cmd.if@mainmatter">371</a></li> +<li><a name="cmd.ifVTeX"></a><a href="#cmd.ifVTeX">\ifVTeX</a> --> <a href="scrguide.pdf#scrbase.cmd.ifVTeX">304</a></li> +<li><a name="cmd.ifattoclist"></a><a href="#cmd.ifattoclist">\ifattoclist</a> --> <a href="scrguide.pdf#tocbasic.cmd.ifattoclist">330</a></li> +<li><a name="cmd.ifdimen"></a><a href="#cmd.ifdimen">\ifdimen</a> --> <a href="scrguide.pdf#scrbase.cmd.ifdimen">307</a></li> +<li><a name="cmd.ifdvioutput"></a><a href="#cmd.ifdvioutput">\ifdvioutput</a> --> <a href="scrguide.pdf#scrbase.cmd.ifdvioutput">305</a></li> +<li><a name="cmd.ifiscount"></a><a href="#cmd.ifiscount">\ifiscount</a> --> <a href="scrguide.pdf#scrbase.cmd.ifiscount">306</a></li> +<li><a name="cmd.ifiscounter"></a><a href="#cmd.ifiscounter">\ifiscounter</a> --> <a href="scrguide.pdf#scrbase.cmd.ifiscounter">307</a></li> +<li><a name="cmd.ifisdimen"></a><a href="#cmd.ifisdimen">\ifisdimen</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisdimen">305</a></li> +<li><a name="cmd.ifisdimension"></a><a href="#cmd.ifisdimension">\ifisdimension</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisdimension">305</a></li> +<li><a name="cmd.ifisdimexpr"></a><a href="#cmd.ifisdimexpr">\ifisdimexpr</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisdimexpr">306</a></li> +<li><a name="cmd.ifisglue"></a><a href="#cmd.ifisglue">\ifisglue</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisglue">306</a></li> +<li><a name="cmd.ifisglueexpr"></a><a href="#cmd.ifisglueexpr">\ifisglueexpr</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisglueexpr">306</a></li> +<li><a name="cmd.ifisinteger"></a><a href="#cmd.ifisinteger">\ifisinteger</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisinteger">306</a></li> +<li><a name="cmd.ifisnumexpr"></a><a href="#cmd.ifisnumexpr">\ifisnumexpr</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisnumexpr">306</a></li> +<li><a name="cmd.ifisskip"></a><a href="#cmd.ifisskip">\ifisskip</a> --> <a href="scrguide.pdf#scrbase.cmd.ifisskip">306</a></li> +<li><a name="cmd.ifkomavar"></a><a href="#cmd.ifkomavar">\ifkomavar</a> --> <a href="scrguide.pdf#scrlttr2.cmd.ifkomavar">159</a></li> +<li><a name="cmd.ifkomavarempty*"></a><a href="#cmd.ifkomavarempty*">\ifkomavarempty*</a> --> <a href="scrguide.pdf#scrlttr2.cmd.ifkomavarempty*">159</a>, <a href="scrguide.pdf#scrlttr2-experts.cmd.ifkomavarempty*">470</a></li> +<li><a name="cmd.ifkomavarempty"></a><a href="#cmd.ifkomavarempty">\ifkomavarempty</a> --> <a href="scrguide.pdf#scrlttr2.cmd.ifkomavarempty">159</a>, <a href="scrguide.pdf#scrlttr2-experts.cmd.ifkomavarempty">470</a></li> +<li><a name="cmd.ifnotundefined"></a><a href="#cmd.ifnotundefined">\ifnotundefined</a> --> <a href="scrguide.pdf#scrbase.cmd.ifnotundefined">305</a></li> +<li><a name="cmd.ifnumber"></a><a href="#cmd.ifnumber">\ifnumber</a> --> <a href="scrguide.pdf#scrbase.cmd.ifnumber">307</a></li> <li><a name="cmd.ifnumbered"></a><a href="#cmd.ifnumbered">\ifnumbered</a> --> <a href="scrguide.pdf#maincls.cmd.ifnumbered">114</a></li> -<li><a name="cmd.ifoot*"></a><a href="#cmd.ifoot*">\ifoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ifoot*">237</a></li> -<li><a name="cmd.ifoot"></a><a href="#cmd.ifoot">\ifoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ifoot">236</a></li> -<li><a name="cmd.ifpdfoutput"></a><a href="#cmd.ifpdfoutput">\ifpdfoutput</a> --> <a href="scrguide.pdf#scrbase.cmd.ifpdfoutput">284</a></li> -<li><a name="cmd.ifpdftex"></a><a href="#cmd.ifpdftex">\ifpdftex</a> --> <a href="scrguide.pdf#scrbase.cmd.ifpdftex">284</a></li> -<li><a name="cmd.ifpsoutput"></a><a href="#cmd.ifpsoutput">\ifpsoutput</a> --> <a href="scrguide.pdf#scrbase.cmd.ifpsoutput">285</a></li> -<li><a name="cmd.ifstr"></a><a href="#cmd.ifstr">\ifstr</a> --> <a href="scrguide.pdf#scrbase.cmd.ifstr">285</a></li> -<li><a name="cmd.ifstrstart"></a><a href="#cmd.ifstrstart">\ifstrstart</a> --> <a href="scrguide.pdf#scrbase.cmd.ifstrstart">285</a></li> +<li><a name="cmd.ifoot*"></a><a href="#cmd.ifoot*">\ifoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ifoot*">238</a></li> +<li><a name="cmd.ifoot"></a><a href="#cmd.ifoot">\ifoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ifoot">237</a></li> +<li><a name="cmd.ifpdfoutput"></a><a href="#cmd.ifpdfoutput">\ifpdfoutput</a> --> <a href="scrguide.pdf#scrbase.cmd.ifpdfoutput">304</a></li> +<li><a name="cmd.ifpdftex"></a><a href="#cmd.ifpdftex">\ifpdftex</a> --> <a href="scrguide.pdf#scrbase.cmd.ifpdftex">304</a></li> +<li><a name="cmd.ifpsoutput"></a><a href="#cmd.ifpsoutput">\ifpsoutput</a> --> <a href="scrguide.pdf#scrbase.cmd.ifpsoutput">305</a></li> +<li><a name="cmd.ifstr"></a><a href="#cmd.ifstr">\ifstr</a> --> <a href="scrguide.pdf#scrbase.cmd.ifstr">305</a></li> +<li><a name="cmd.ifstrstart"></a><a href="#cmd.ifstrstart">\ifstrstart</a> --> <a href="scrguide.pdf#scrbase.cmd.ifstrstart">305</a></li> <li><a name="cmd.ifthispageodd"></a><a href="#cmd.ifthispageodd">\ifthispageodd</a> --> <a href="scrguide.pdf#maincls.cmd.ifthispageodd">80</a></li> -<li><a name="cmd.iftocfeature"></a><a href="#cmd.iftocfeature">\iftocfeature</a> --> <a href="scrguide.pdf#tocbasic.cmd.iftocfeature">321</a></li> -<li><a name="cmd.ifundefinedorrelax"></a><a href="#cmd.ifundefinedorrelax">\ifundefinedorrelax</a> --> <a href="scrguide.pdf#scrbase.cmd.ifundefinedorrelax">284</a></li> +<li><a name="cmd.iftocfeature"></a><a href="#cmd.iftocfeature">\iftocfeature</a> --> <a href="scrguide.pdf#tocbasic.cmd.iftocfeature">342</a></li> +<li><a name="cmd.ifundefinedorrelax"></a><a href="#cmd.ifundefinedorrelax">\ifundefinedorrelax</a> --> <a href="scrguide.pdf#scrbase.cmd.ifundefinedorrelax">304</a></li> <li><a name="cmd.ifunnumbered"></a><a href="#cmd.ifunnumbered">\ifunnumbered</a> --> <a href="scrguide.pdf#maincls.cmd.ifunnumbered">114</a></li> -<li><a name="cmd.ihead*"></a><a href="#cmd.ihead*">\ihead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ihead*">237</a></li> -<li><a name="cmd.ihead"></a><a href="#cmd.ihead">\ihead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ihead">236</a></li> +<li><a name="cmd.ihead*"></a><a href="#cmd.ihead*">\ihead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ihead*">238</a></li> +<li><a name="cmd.ihead"></a><a href="#cmd.ihead">\ihead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ihead">237</a></li> <li><a name="cmd.indexpagestyle"></a><a href="#cmd.indexpagestyle">\indexpagestyle</a> --> <a href="scrguide.pdf#maincls.cmd.indexpagestyle">84</a></li> -<li><a name="cmd.invoicename"></a><a href="#cmd.invoicename">\invoicename</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.invoicename">444</a></li> +<li><a name="cmd.invoicename"></a><a href="#cmd.invoicename">\invoicename</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.invoicename">480</a></li> <li><a name="cmd.item"></a><a href="#cmd.item">\item</a> --> <a href="scrguide.pdf#maincls.cmd.item">119</a></li> -<li><a name="cmd.l@addto@macro"></a><a href="#cmd.l@addto@macro">\l@addto@macro</a> --> <a href="scrguide.pdf#scrbase.cmd.l@addto@macro">292</a></li> +<li><a name="cmd.l@addto@macro"></a><a href="#cmd.l@addto@macro">\l@addto@macro</a> --> <a href="scrguide.pdf#scrbase.cmd.l@addto@macro">312</a></li> <li><a name="cmd.labelenumi"></a><a href="#cmd.labelenumi">\labelenumi</a> --> <a href="scrguide.pdf#maincls.cmd.labelenumi">120</a></li> <li><a name="cmd.labelenumii"></a><a href="#cmd.labelenumii">\labelenumii</a> --> <a href="scrguide.pdf#maincls.cmd.labelenumii">120</a></li> <li><a name="cmd.labelenumiii"></a><a href="#cmd.labelenumiii">\labelenumiii</a> --> <a href="scrguide.pdf#maincls.cmd.labelenumiii">120</a></li> @@ -505,142 +534,165 @@ <li><a name="cmd.labelitemii"></a><a href="#cmd.labelitemii">\labelitemii</a> --> <a href="scrguide.pdf#maincls.cmd.labelitemii">119</a></li> <li><a name="cmd.labelitemiii"></a><a href="#cmd.labelitemiii">\labelitemiii</a> --> <a href="scrguide.pdf#maincls.cmd.labelitemiii">119</a></li> <li><a name="cmd.labelitemiv"></a><a href="#cmd.labelitemiv">\labelitemiv</a> --> <a href="scrguide.pdf#maincls.cmd.labelitemiv">119</a></li> -<li><a name="cmd.layercontentsmeasure"></a><a href="#cmd.layercontentsmeasure">\layercontentsmeasure</a> --> <a href="scrguide.pdf#scrlayer.cmd.layercontentsmeasure">350</a></li> -<li><a name="cmd.layerhalign"></a><a href="#cmd.layerhalign">\layerhalign</a> --> <a href="scrguide.pdf#scrlayer.cmd.layerhalign">347</a></li> -<li><a name="cmd.layerheight"></a><a href="#cmd.layerheight">\layerheight</a> --> <a href="scrguide.pdf#scrlayer.cmd.layerheight">347</a></li> -<li><a name="cmd.layervalign"></a><a href="#cmd.layervalign">\layervalign</a> --> <a href="scrguide.pdf#scrlayer.cmd.layervalign">347</a></li> -<li><a name="cmd.layerwidth"></a><a href="#cmd.layerwidth">\layerwidth</a> --> <a href="scrguide.pdf#scrlayer.cmd.layerwidth">347</a></li> -<li><a name="cmd.layerxoffset"></a><a href="#cmd.layerxoffset">\layerxoffset</a> --> <a href="scrguide.pdf#scrlayer.cmd.layerxoffset">347</a></li> -<li><a name="cmd.layeryoffset"></a><a href="#cmd.layeryoffset">\layeryoffset</a> --> <a href="scrguide.pdf#scrlayer.cmd.layeryoffset">347</a></li> -<li><a name="cmd.lefoot*"></a><a href="#cmd.lefoot*">\lefoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lefoot*">235</a></li> -<li><a name="cmd.lefoot"></a><a href="#cmd.lefoot">\lefoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lefoot">232</a></li> -<li><a name="cmd.leftbotmark"></a><a href="#cmd.leftbotmark">\leftbotmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.leftbotmark">362</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.leftbotmark">368</a></li> -<li><a name="cmd.leftfirstmark"></a><a href="#cmd.leftfirstmark">\leftfirstmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.leftfirstmark">362</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.leftfirstmark">368</a></li> -<li><a name="cmd.leftmark"></a><a href="#cmd.leftmark">\leftmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.leftmark">243</a></li> -<li><a name="cmd.lefttopmark"></a><a href="#cmd.lefttopmark">\lefttopmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.lefttopmark">362</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.lefttopmark">368</a></li> -<li><a name="cmd.lehead*"></a><a href="#cmd.lehead*">\lehead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lehead*">232</a></li> -<li><a name="cmd.lehead"></a><a href="#cmd.lehead">\lehead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lehead">229</a></li> -<li><a name="cmd.letterlastpage"></a><a href="#cmd.letterlastpage">\letterlastpage</a> --> <a href="scrguide.pdf#scrlttr2.cmd.letterlastpage">163</a></li> -<li><a name="cmd.letterpagestyle"></a><a href="#cmd.letterpagestyle">\letterpagestyle</a> --> <a href="scrguide.pdf#scrlttr2.cmd.letterpagestyle">206</a></li> -<li><a name="cmd.listofeachtoc"></a><a href="#cmd.listofeachtoc">\listofeachtoc</a> --> <a href="scrguide.pdf#tocbasic.cmd.listofeachtoc">316</a></li> -<li><a name="cmd.listoffigures"></a><a href="#cmd.listoffigures">\listoffigures</a> --> <a href="scrguide.pdf#maincls.cmd.listoffigures">146</a></li> -<li><a name="cmd.listofname"></a><a href="#cmd.listofname">\listofname</a> --> <a href="scrguide.pdf#tocbasic.cmd.listofname">316</a></li> -<li><a name="cmd.listoftables"></a><a href="#cmd.listoftables">\listoftables</a> --> <a href="scrguide.pdf#maincls.cmd.listoftables">146</a></li> -<li><a name="cmd.listoftoc*"></a><a href="#cmd.listoftoc*">\listoftoc*</a> --> <a href="scrguide.pdf#tocbasic.cmd.listoftoc*">316</a></li> -<li><a name="cmd.listoftoc"></a><a href="#cmd.listoftoc">\listoftoc</a> --> <a href="scrguide.pdf#tocbasic.cmd.listoftoc">316</a></li> -<li><a name="cmd.lofoot*"></a><a href="#cmd.lofoot*">\lofoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lofoot*">235</a></li> -<li><a name="cmd.lofoot"></a><a href="#cmd.lofoot">\lofoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lofoot">232</a></li> -<li><a name="cmd.lohead*"></a><a href="#cmd.lohead*">\lohead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lohead*">232</a></li> -<li><a name="cmd.lohead"></a><a href="#cmd.lohead">\lohead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lohead">229</a></li> +<li><a name="cmd.layercontentsmeasure"></a><a href="#cmd.layercontentsmeasure">\layercontentsmeasure</a> --> <a href="scrguide.pdf#scrlayer.cmd.layercontentsmeasure">385</a></li> +<li><a name="cmd.layerhalign"></a><a href="#cmd.layerhalign">\layerhalign</a> --> <a href="scrguide.pdf#scrlayer.cmd.layerhalign">382</a></li> +<li><a name="cmd.layerheight"></a><a href="#cmd.layerheight">\layerheight</a> --> <a href="scrguide.pdf#scrlayer.cmd.layerheight">382</a></li> +<li><a name="cmd.layervalign"></a><a href="#cmd.layervalign">\layervalign</a> --> <a href="scrguide.pdf#scrlayer.cmd.layervalign">382</a></li> +<li><a name="cmd.layerwidth"></a><a href="#cmd.layerwidth">\layerwidth</a> --> <a href="scrguide.pdf#scrlayer.cmd.layerwidth">382</a></li> +<li><a name="cmd.layerxoffset"></a><a href="#cmd.layerxoffset">\layerxoffset</a> --> <a href="scrguide.pdf#scrlayer.cmd.layerxoffset">382</a></li> +<li><a name="cmd.layeryoffset"></a><a href="#cmd.layeryoffset">\layeryoffset</a> --> <a href="scrguide.pdf#scrlayer.cmd.layeryoffset">382</a></li> +<li><a name="cmd.lefoot*"></a><a href="#cmd.lefoot*">\lefoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lefoot*">236</a></li> +<li><a name="cmd.lefoot"></a><a href="#cmd.lefoot">\lefoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lefoot">233</a></li> +<li><a name="cmd.leftbotmark"></a><a href="#cmd.leftbotmark">\leftbotmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.leftbotmark">397</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.leftbotmark">403</a></li> +<li><a name="cmd.leftfirstmark"></a><a href="#cmd.leftfirstmark">\leftfirstmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.leftfirstmark">397</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.leftfirstmark">403</a></li> +<li><a name="cmd.leftmark"></a><a href="#cmd.leftmark">\leftmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.leftmark">244</a></li> +<li><a name="cmd.lefttopmark"></a><a href="#cmd.lefttopmark">\lefttopmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.lefttopmark">397</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.lefttopmark">403</a></li> +<li><a name="cmd.lehead*"></a><a href="#cmd.lehead*">\lehead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lehead*">233</a></li> +<li><a name="cmd.lehead"></a><a href="#cmd.lehead">\lehead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lehead">230</a></li> +<li><a name="cmd.letterlastpage"></a><a href="#cmd.letterlastpage">\letterlastpage</a> --> <a href="scrguide.pdf#scrlttr2.cmd.letterlastpage">164</a></li> +<li><a name="cmd.letterpagestyle"></a><a href="#cmd.letterpagestyle">\letterpagestyle</a> --> <a href="scrguide.pdf#scrlttr2.cmd.letterpagestyle">207</a></li> +<li><a name="cmd.listofeachtoc"></a><a href="#cmd.listofeachtoc">\listofeachtoc</a> --> <a href="scrguide.pdf#tocbasic.cmd.listofeachtoc">336</a></li> +<li><a name="cmd.listoffigures"></a><a href="#cmd.listoffigures">\listoffigures</a> --> <a href="scrguide.pdf#maincls.cmd.listoffigures">147</a></li> +<li><a name="cmd.listofname"></a><a href="#cmd.listofname">\listofname</a> --> <a href="scrguide.pdf#tocbasic.cmd.listofname">336</a></li> +<li><a name="cmd.listoftables"></a><a href="#cmd.listoftables">\listoftables</a> --> <a href="scrguide.pdf#maincls.cmd.listoftables">147</a></li> +<li><a name="cmd.listoftoc*"></a><a href="#cmd.listoftoc*">\listoftoc*</a> --> <a href="scrguide.pdf#tocbasic.cmd.listoftoc*">336</a></li> +<li><a name="cmd.listoftoc"></a><a href="#cmd.listoftoc">\listoftoc</a> --> <a href="scrguide.pdf#tocbasic.cmd.listoftoc">336</a></li> +<li><a name="cmd.lofoot*"></a><a href="#cmd.lofoot*">\lofoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lofoot*">236</a></li> +<li><a name="cmd.lofoot"></a><a href="#cmd.lofoot">\lofoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lofoot">233</a></li> +<li><a name="cmd.lohead*"></a><a href="#cmd.lohead*">\lohead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lohead*">233</a></li> +<li><a name="cmd.lohead"></a><a href="#cmd.lohead">\lohead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.lohead">230</a></li> <li><a name="cmd.lowertitleback"></a><a href="#cmd.lowertitleback">\lowertitleback</a> --> <a href="scrguide.pdf#maincls.cmd.lowertitleback">70</a></li> <li><a name="cmd.mainmatter"></a><a href="#cmd.mainmatter">\mainmatter</a> --> <a href="scrguide.pdf#maincls.cmd.mainmatter">94</a></li> -<li><a name="cmd.makenote"></a><a href="#cmd.makenote">\makenote</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.makenote">384</a></li> +<li><a name="cmd.makenote"></a><a href="#cmd.makenote">\makenote</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.makenote">419</a></li> <li><a name="cmd.maketitle"></a><a href="#cmd.maketitle">\maketitle</a> --> <a href="scrguide.pdf#maincls.cmd.maketitle">66</a></li> -<li><a name="cmd.manualmark"></a><a href="#cmd.manualmark">\manualmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.manualmark">239</a></li> +<li><a name="cmd.manualmark"></a><a href="#cmd.manualmark">\manualmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.manualmark">240</a></li> <li><a name="cmd.marginline"></a><a href="#cmd.marginline">\marginline</a> --> <a href="scrguide.pdf#maincls.cmd.marginline">147</a></li> <li><a name="cmd.marginpar"></a><a href="#cmd.marginpar">\marginpar</a> --> <a href="scrguide.pdf#maincls.cmd.marginpar">147</a></li> -<li><a name="cmd.markboth"></a><a href="#cmd.markboth">\markboth</a> --> <a href="scrguide.pdf#scrlttr2.cmd.markboth">209</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.markboth">246</a>, <a href="scrguide.pdf#maincls.cmd.markboth">84</a></li> -<li><a name="cmd.markleft"></a><a href="#cmd.markleft">\markleft</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.markleft">246</a></li> -<li><a name="cmd.markright"></a><a href="#cmd.markright">\markright</a> --> <a href="scrguide.pdf#scrlttr2.cmd.markright">209</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.markright">246</a>, <a href="scrguide.pdf#maincls.cmd.markright">84</a></li> +<li><a name="cmd.markboth"></a><a href="#cmd.markboth">\markboth</a> --> <a href="scrguide.pdf#scrlttr2.cmd.markboth">210</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.markboth">247</a>, <a href="scrguide.pdf#maincls.cmd.markboth">84</a></li> +<li><a name="cmd.markleft"></a><a href="#cmd.markleft">\markleft</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.markleft">247</a></li> +<li><a name="cmd.markright"></a><a href="#cmd.markright">\markright</a> --> <a href="scrguide.pdf#scrlttr2.cmd.markright">210</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.markright">247</a>, <a href="scrguide.pdf#maincls.cmd.markright">84</a></li> <li><a name="cmd.minisec"></a><a href="#cmd.minisec">\minisec</a> --> <a href="scrguide.pdf#maincls.cmd.minisec">107</a></li> <li><a name="cmd.multfootsep"></a><a href="#cmd.multfootsep">\multfootsep</a> --> <a href="scrguide.pdf#maincls.cmd.multfootsep">90</a></li> <li><a name="cmd.multiplefootnoteseparator"></a><a href="#cmd.multiplefootnoteseparator">\multiplefootnoteseparator</a> --> <a href="scrguide.pdf#maincls.cmd.multiplefootnoteseparator">90</a></li> -<li><a name="cmd.myrefname"></a><a href="#cmd.myrefname">\myrefname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.myrefname">444</a></li> -<li><a name="cmd.newbibstyle"></a><a href="#cmd.newbibstyle">\newbibstyle</a> --> <a href="scrguide.pdf#maincls-experts.cmd.newbibstyle">415</a></li> -<li><a name="cmd.newblock"></a><a href="#cmd.newblock">\newblock</a> --> <a href="scrguide.pdf#maincls-experts.cmd.newblock">415</a></li> -<li><a name="cmd.newcaptionname"></a><a href="#cmd.newcaptionname">\newcaptionname</a> --> <a href="scrguide.pdf#scrbase.cmd.newcaptionname">288</a></li> -<li><a name="cmd.newkomafont"></a><a href="#cmd.newkomafont">\newkomafont</a> --> <a href="scrguide.pdf#maincls-experts.cmd.newkomafont">395</a></li> -<li><a name="cmd.newkomavar*"></a><a href="#cmd.newkomavar*">\newkomavar*</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.newkomavar*">433</a></li> -<li><a name="cmd.newkomavar"></a><a href="#cmd.newkomavar">\newkomavar</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.newkomavar">433</a></li> -<li><a name="cmd.newpagestyle"></a><a href="#cmd.newpagestyle">\newpagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.newpagestyle">374</a></li> -<li><a name="cmd.newpairofpagestyles"></a><a href="#cmd.newpairofpagestyles">\newpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.newpairofpagestyles">370</a></li> -<li><a name="cmd.newtriplepagestyle"></a><a href="#cmd.newtriplepagestyle">\newtriplepagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.newtriplepagestyle">372</a></li> -<li><a name="cmd.nonumberline"></a><a href="#cmd.nonumberline">\nonumberline</a> --> <a href="scrguide.pdf#tocbasic.cmd.nonumberline">324</a></li> -<li><a name="cmd.ofoot*"></a><a href="#cmd.ofoot*">\ofoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ofoot*">237</a></li> -<li><a name="cmd.ofoot"></a><a href="#cmd.ofoot">\ofoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ofoot">236</a></li> -<li><a name="cmd.ohead*"></a><a href="#cmd.ohead*">\ohead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ohead*">237</a></li> -<li><a name="cmd.ohead"></a><a href="#cmd.ohead">\ohead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ohead">236</a></li> -<li><a name="cmd.opening"></a><a href="#cmd.opening">\opening</a> --> <a href="scrguide.pdf#scrlttr2.cmd.opening">164</a></li> +<li><a name="cmd.myrefname"></a><a href="#cmd.myrefname">\myrefname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.myrefname">480</a></li> +<li><a name="cmd.newbibstyle"></a><a href="#cmd.newbibstyle">\newbibstyle</a> --> <a href="scrguide.pdf#maincls-experts.cmd.newbibstyle">451</a></li> +<li><a name="cmd.newblock"></a><a href="#cmd.newblock">\newblock</a> --> <a href="scrguide.pdf#maincls-experts.cmd.newblock">451</a></li> +<li><a name="cmd.newcaptionname"></a><a href="#cmd.newcaptionname">\newcaptionname</a> --> <a href="scrguide.pdf#scrbase.cmd.newcaptionname">308</a></li> +<li><a name="cmd.newkomafont"></a><a href="#cmd.newkomafont">\newkomafont</a> --> <a href="scrguide.pdf#maincls-experts.cmd.newkomafont">430</a></li> +<li><a name="cmd.newkomavar*"></a><a href="#cmd.newkomavar*">\newkomavar*</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.newkomavar*">469</a></li> +<li><a name="cmd.newkomavar"></a><a href="#cmd.newkomavar">\newkomavar</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.newkomavar">469</a></li> +<li><a name="cmd.newpagestyle"></a><a href="#cmd.newpagestyle">\newpagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.newpagestyle">410</a></li> +<li><a name="cmd.newpairofpagestyles"></a><a href="#cmd.newpairofpagestyles">\newpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.newpairofpagestyles">405</a></li> +<li><a name="cmd.newtriplepagestyle"></a><a href="#cmd.newtriplepagestyle">\newtriplepagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.newtriplepagestyle">407</a></li> +<li><a name="cmd.nonumberline"></a><a href="#cmd.nonumberline">\nonumberline</a> --> <a href="scrguide.pdf#tocbasic.cmd.nonumberline">356</a></li> +<li><a name="cmd.numberline"></a><a href="#cmd.numberline">\numberline</a> --> <a href="scrguide.pdf#tocbasic.cmd.numberline">342</a></li> +<li><a name="cmd.ofoot*"></a><a href="#cmd.ofoot*">\ofoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ofoot*">238</a></li> +<li><a name="cmd.ofoot"></a><a href="#cmd.ofoot">\ofoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ofoot">237</a></li> +<li><a name="cmd.ohead*"></a><a href="#cmd.ohead*">\ohead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ohead*">238</a></li> +<li><a name="cmd.ohead"></a><a href="#cmd.ohead">\ohead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.ohead">237</a></li> +<li><a name="cmd.opening"></a><a href="#cmd.opening">\opening</a> --> <a href="scrguide.pdf#scrlttr2.cmd.opening">165</a></li> <li><a name="cmd.othersectionlevelsformat"></a><a href="#cmd.othersectionlevelsformat">\othersectionlevelsformat</a> --> <a href="scrguide.pdf#maincls.cmd.othersectionlevelsformat">110</a></li> -<li><a name="cmd.pagemark"></a><a href="#cmd.pagemark">\pagemark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.pagemark">243</a></li> -<li><a name="cmd.pagename"></a><a href="#cmd.pagename">\pagename</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.pagename">444</a></li> +<li><a name="cmd.pagemark"></a><a href="#cmd.pagemark">\pagemark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.pagemark">244</a></li> +<li><a name="cmd.pagename"></a><a href="#cmd.pagename">\pagename</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.pagename">480</a></li> <li><a name="cmd.pagenumbering"></a><a href="#cmd.pagenumbering">\pagenumbering</a> --> <a href="scrguide.pdf#maincls.cmd.pagenumbering">86</a></li> -<li><a name="cmd.pagestyle"></a><a href="#cmd.pagestyle">\pagestyle</a> --> <a href="scrguide.pdf#scrlttr2.cmd.pagestyle">207</a>, <a href="scrguide.pdf#maincls.cmd.pagestyle">82</a></li> +<li><a name="cmd.pagestyle"></a><a href="#cmd.pagestyle">\pagestyle</a> --> <a href="scrguide.pdf#scrlttr2.cmd.pagestyle">208</a>, <a href="scrguide.pdf#maincls.cmd.pagestyle">82</a></li> <li><a name="cmd.paragraph*"></a><a href="#cmd.paragraph*">\paragraph*</a> --> <a href="scrguide.pdf#maincls.cmd.paragraph*">106</a></li> <li><a name="cmd.paragraph"></a><a href="#cmd.paragraph">\paragraph</a> --> <a href="scrguide.pdf#maincls.cmd.paragraph">101</a></li> <li><a name="cmd.paragraphformat"></a><a href="#cmd.paragraphformat">\paragraphformat</a> --> <a href="scrguide.pdf#maincls.cmd.paragraphformat">110</a></li> -<li><a name="cmd.paragraphmark"></a><a href="#cmd.paragraphmark">\paragraphmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.paragraphmark">245</a></li> -<li><a name="cmd.paragraphmarkformat"></a><a href="#cmd.paragraphmarkformat">\paragraphmarkformat</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.paragraphmarkformat">245</a></li> +<li><a name="cmd.paragraphmark"></a><a href="#cmd.paragraphmark">\paragraphmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.paragraphmark">246</a></li> +<li><a name="cmd.paragraphmarkformat"></a><a href="#cmd.paragraphmarkformat">\paragraphmarkformat</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.paragraphmarkformat">246</a></li> <li><a name="cmd.paragraphnumdepth"></a><a href="#cmd.paragraphnumdepth">\paragraphnumdepth</a> --> <a href="scrguide.pdf#maincls.cmd.paragraphnumdepth">114</a></li> +<li><a name="cmd.parellipsis"></a><a href="#cmd.parellipsis">\parellipsis</a> --> <a href="scrguide.pdf#scrjura.cmd.parellipsis">274</a></li> +<li><a name="cmd.parformat"></a><a href="#cmd.parformat">\parformat</a> --> <a href="scrguide.pdf#scrjura.cmd.parformat">273</a></li> +<li><a name="cmd.parformatseparation"></a><a href="#cmd.parformatseparation">\parformatseparation</a> --> <a href="scrguide.pdf#scrjura.cmd.parformatseparation">273</a></li> +<li><a name="cmd.parname"></a><a href="#cmd.parname">\parname</a> --> <a href="scrguide.pdf#scrjura.cmd.parname">280</a></li> +<li><a name="cmd.parshortname"></a><a href="#cmd.parshortname">\parshortname</a> --> <a href="scrguide.pdf#scrjura.cmd.parshortname">280</a></li> <li><a name="cmd.part*"></a><a href="#cmd.part*">\part*</a> --> <a href="scrguide.pdf#maincls.cmd.part*">106</a></li> <li><a name="cmd.part"></a><a href="#cmd.part">\part</a> --> <a href="scrguide.pdf#maincls.cmd.part">101</a></li> <li><a name="cmd.partformat"></a><a href="#cmd.partformat">\partformat</a> --> <a href="scrguide.pdf#maincls.cmd.partformat">110</a></li> -<li><a name="cmd.partheademptypage"></a><a href="#cmd.partheademptypage">\partheademptypage</a> --> <a href="scrguide.pdf#maincls-experts.cmd.partheademptypage">408</a></li> -<li><a name="cmd.partheadendvskip"></a><a href="#cmd.partheadendvskip">\partheadendvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.partheadendvskip">408</a></li> -<li><a name="cmd.partheadmidvskip"></a><a href="#cmd.partheadmidvskip">\partheadmidvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.partheadmidvskip">408</a></li> -<li><a name="cmd.partheadstartvskip"></a><a href="#cmd.partheadstartvskip">\partheadstartvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.partheadstartvskip">408</a></li> -<li><a name="cmd.partmark"></a><a href="#cmd.partmark">\partmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.partmark">245</a></li> -<li><a name="cmd.partmarkformat"></a><a href="#cmd.partmarkformat">\partmarkformat</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.partmarkformat">245</a></li> +<li><a name="cmd.partheademptypage"></a><a href="#cmd.partheademptypage">\partheademptypage</a> --> <a href="scrguide.pdf#maincls-experts.cmd.partheademptypage">444</a></li> +<li><a name="cmd.partheadendvskip"></a><a href="#cmd.partheadendvskip">\partheadendvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.partheadendvskip">444</a></li> +<li><a name="cmd.partheadmidvskip"></a><a href="#cmd.partheadmidvskip">\partheadmidvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.partheadmidvskip">444</a></li> +<li><a name="cmd.partheadstartvskip"></a><a href="#cmd.partheadstartvskip">\partheadstartvskip</a> --> <a href="scrguide.pdf#maincls-experts.cmd.partheadstartvskip">444</a></li> +<li><a name="cmd.partmark"></a><a href="#cmd.partmark">\partmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.partmark">246</a></li> +<li><a name="cmd.partmarkformat"></a><a href="#cmd.partmarkformat">\partmarkformat</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.partmarkformat">246</a></li> <li><a name="cmd.partnumdepth"></a><a href="#cmd.partnumdepth">\partnumdepth</a> --> <a href="scrguide.pdf#maincls.cmd.partnumdepth">114</a></li> <li><a name="cmd.partpagestyle"></a><a href="#cmd.partpagestyle">\partpagestyle</a> --> <a href="scrguide.pdf#maincls.cmd.partpagestyle">84</a></li> -<li><a name="cmd.phonename"></a><a href="#cmd.phonename">\phonename</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.phonename">444</a></li> -<li><a name="cmd.providecaptionname"></a><a href="#cmd.providecaptionname">\providecaptionname</a> --> <a href="scrguide.pdf#scrbase.cmd.providecaptionname">288</a></li> -<li><a name="cmd.providepagestyle"></a><a href="#cmd.providepagestyle">\providepagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.providepagestyle">374</a></li> -<li><a name="cmd.providepairofpagestyles"></a><a href="#cmd.providepairofpagestyles">\providepairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.providepairofpagestyles">370</a></li> -<li><a name="cmd.providetriplepagestyle"></a><a href="#cmd.providetriplepagestyle">\providetriplepagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.providetriplepagestyle">372</a></li> -<li><a name="cmd.ps"></a><a href="#cmd.ps">\ps</a> --> <a href="scrguide.pdf#scrlttr2.cmd.ps">166</a></li> +<li><a name="cmd.phonename"></a><a href="#cmd.phonename">\phonename</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.phonename">480</a></li> +<li><a name="cmd.providecaptionname"></a><a href="#cmd.providecaptionname">\providecaptionname</a> --> <a href="scrguide.pdf#scrbase.cmd.providecaptionname">308</a></li> +<li><a name="cmd.providepagestyle"></a><a href="#cmd.providepagestyle">\providepagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.providepagestyle">410</a></li> +<li><a name="cmd.providepairofpagestyles"></a><a href="#cmd.providepairofpagestyles">\providepairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.providepairofpagestyles">405</a></li> +<li><a name="cmd.providetriplepagestyle"></a><a href="#cmd.providetriplepagestyle">\providetriplepagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.providetriplepagestyle">407</a></li> +<li><a name="cmd.ps"></a><a href="#cmd.ps">\ps</a> --> <a href="scrguide.pdf#scrlttr2.cmd.ps">167</a></li> <li><a name="cmd.publishers"></a><a href="#cmd.publishers">\publishers</a> --> <a href="scrguide.pdf#maincls.cmd.publishers">67</a></li> -<li><a name="cmd.putC"></a><a href="#cmd.putC">\putC</a> --> <a href="scrguide.pdf#scrlayer.cmd.putC">348</a></li> -<li><a name="cmd.putLL"></a><a href="#cmd.putLL">\putLL</a> --> <a href="scrguide.pdf#scrlayer.cmd.putLL">348</a></li> -<li><a name="cmd.putLR"></a><a href="#cmd.putLR">\putLR</a> --> <a href="scrguide.pdf#scrlayer.cmd.putLR">348</a></li> -<li><a name="cmd.putUL"></a><a href="#cmd.putUL">\putUL</a> --> <a href="scrguide.pdf#scrlayer.cmd.putUL">348</a></li> -<li><a name="cmd.putUR"></a><a href="#cmd.putUR">\putUR</a> --> <a href="scrguide.pdf#scrlayer.cmd.putUR">348</a></li> +<li><a name="cmd.putC"></a><a href="#cmd.putC">\putC</a> --> <a href="scrguide.pdf#scrlayer.cmd.putC">383</a></li> +<li><a name="cmd.putLL"></a><a href="#cmd.putLL">\putLL</a> --> <a href="scrguide.pdf#scrlayer.cmd.putLL">383</a></li> +<li><a name="cmd.putLR"></a><a href="#cmd.putLR">\putLR</a> --> <a href="scrguide.pdf#scrlayer.cmd.putLR">383</a></li> +<li><a name="cmd.putUL"></a><a href="#cmd.putUL">\putUL</a> --> <a href="scrguide.pdf#scrlayer.cmd.putUL">383</a></li> +<li><a name="cmd.putUR"></a><a href="#cmd.putUR">\putUR</a> --> <a href="scrguide.pdf#scrlayer.cmd.putUR">383</a></li> <li><a name="cmd.raggedchapter"></a><a href="#cmd.raggedchapter">\raggedchapter</a> --> <a href="scrguide.pdf#maincls.cmd.raggedchapter">109</a></li> -<li><a name="cmd.raggedchapterentry"></a><a href="#cmd.raggedchapterentry">\raggedchapterentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.raggedchapterentry">395</a></li> +<li><a name="cmd.raggedchapterentry"></a><a href="#cmd.raggedchapterentry">\raggedchapterentry</a> --> <a href="scrguide.pdf#maincls-experts.cmd.raggedchapterentry">430</a></li> <li><a name="cmd.raggeddictum"></a><a href="#cmd.raggeddictum">\raggeddictum</a> --> <a href="scrguide.pdf#maincls.cmd.raggeddictum">116</a></li> <li><a name="cmd.raggeddictumauthor"></a><a href="#cmd.raggeddictumauthor">\raggeddictumauthor</a> --> <a href="scrguide.pdf#maincls.cmd.raggeddictumauthor">116</a></li> <li><a name="cmd.raggeddictumtext"></a><a href="#cmd.raggeddictumtext">\raggeddictumtext</a> --> <a href="scrguide.pdf#maincls.cmd.raggeddictumtext">116</a></li> <li><a name="cmd.raggedpart"></a><a href="#cmd.raggedpart">\raggedpart</a> --> <a href="scrguide.pdf#maincls.cmd.raggedpart">109</a></li> <li><a name="cmd.raggedsection"></a><a href="#cmd.raggedsection">\raggedsection</a> --> <a href="scrguide.pdf#maincls.cmd.raggedsection">109</a></li> -<li><a name="cmd.raggedsignature"></a><a href="#cmd.raggedsignature">\raggedsignature</a> --> <a href="scrguide.pdf#scrlttr2.cmd.raggedsignature">211</a></li> -<li><a name="cmd.refoot*"></a><a href="#cmd.refoot*">\refoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.refoot*">235</a></li> -<li><a name="cmd.refoot"></a><a href="#cmd.refoot">\refoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.refoot">232</a></li> -<li><a name="cmd.rehead*"></a><a href="#cmd.rehead*">\rehead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rehead*">232</a></li> -<li><a name="cmd.rehead"></a><a href="#cmd.rehead">\rehead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rehead">229</a></li> -<li><a name="cmd.removefromtoclist"></a><a href="#cmd.removefromtoclist">\removefromtoclist</a> --> <a href="scrguide.pdf#tocbasic.cmd.removefromtoclist">313</a></li> -<li><a name="cmd.removereffields"></a><a href="#cmd.removereffields">\removereffields</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.removereffields">433</a></li> -<li><a name="cmd.renewcaptionname"></a><a href="#cmd.renewcaptionname">\renewcaptionname</a> --> <a href="scrguide.pdf#scrbase.cmd.renewcaptionname">288</a></li> -<li><a name="cmd.renewpagestyle"></a><a href="#cmd.renewpagestyle">\renewpagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.renewpagestyle">374</a></li> -<li><a name="cmd.renewpairofpagestyles"></a><a href="#cmd.renewpairofpagestyles">\renewpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.renewpairofpagestyles">370</a></li> -<li><a name="cmd.renewtriplepagestyle"></a><a href="#cmd.renewtriplepagestyle">\renewtriplepagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.renewtriplepagestyle">372</a></li> -<li><a name="cmd.rightbotmark"></a><a href="#cmd.rightbotmark">\rightbotmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.rightbotmark">362</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.rightbotmark">368</a></li> -<li><a name="cmd.rightfirstmark"></a><a href="#cmd.rightfirstmark">\rightfirstmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.rightfirstmark">362</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.rightfirstmark">368</a></li> -<li><a name="cmd.rightmark"></a><a href="#cmd.rightmark">\rightmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rightmark">243</a></li> -<li><a name="cmd.righttopmark"></a><a href="#cmd.righttopmark">\righttopmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.righttopmark">362</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.righttopmark">368</a></li> -<li><a name="cmd.rofoot*"></a><a href="#cmd.rofoot*">\rofoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rofoot*">235</a></li> -<li><a name="cmd.rofoot"></a><a href="#cmd.rofoot">\rofoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rofoot">232</a></li> -<li><a name="cmd.rohead*"></a><a href="#cmd.rohead*">\rohead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rohead*">232</a></li> -<li><a name="cmd.rohead"></a><a href="#cmd.rohead">\rohead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rohead">229</a></li> -<li><a name="cmd.scr@ifVTeX"></a><a href="#cmd.scr@ifVTeX">\scr@ifVTeX</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifVTeX">284</a></li> -<li><a name="cmd.scr@ifdvioutput"></a><a href="#cmd.scr@ifdvioutput">\scr@ifdvioutput</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifdvioutput">285</a></li> -<li><a name="cmd.scr@ifpdfoutput"></a><a href="#cmd.scr@ifpdfoutput">\scr@ifpdfoutput</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifpdfoutput">284</a></li> -<li><a name="cmd.scr@ifpdftex"></a><a href="#cmd.scr@ifpdftex">\scr@ifpdftex</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifpdftex">284</a></li> -<li><a name="cmd.scr@ifpsoutput"></a><a href="#cmd.scr@ifpsoutput">\scr@ifpsoutput</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifpsoutput">285</a></li> -<li><a name="cmd.scr@ifundefinedorrelax"></a><a href="#cmd.scr@ifundefinedorrelax">\scr@ifundefinedorrelax</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifundefinedorrelax">284</a></li> -<li><a name="cmd.scr@startsection"></a><a href="#cmd.scr@startsection">\scr@startsection</a> --> <a href="scrguide.pdf#maincls-experts.cmd.scr@startsection">413</a></li> -<li><a name="cmd.scrlayerAddCsToInterface"></a><a href="#cmd.scrlayerAddCsToInterface">\scrlayerAddCsToInterface</a> --> <a href="scrguide.pdf#scrlayer.cmd.scrlayerAddCsToInterface">364</a></li> -<li><a name="cmd.scrlayerAddToInterface"></a><a href="#cmd.scrlayerAddToInterface">\scrlayerAddToInterface</a> --> <a href="scrguide.pdf#scrlayer.cmd.scrlayerAddToInterface">364</a></li> -<li><a name="cmd.scrlayerInitInterface"></a><a href="#cmd.scrlayerInitInterface">\scrlayerInitInterface</a> --> <a href="scrguide.pdf#scrlayer.cmd.scrlayerInitInterface">364</a></li> -<li><a name="cmd.scrlayerOnAutoRemoveInterface"></a><a href="#cmd.scrlayerOnAutoRemoveInterface">\scrlayerOnAutoRemoveInterface</a> --> <a href="scrguide.pdf#scrlayer.cmd.scrlayerOnAutoRemoveInterface">365</a></li> +<li><a name="cmd.raggedsignature"></a><a href="#cmd.raggedsignature">\raggedsignature</a> --> <a href="scrguide.pdf#scrlttr2.cmd.raggedsignature">212</a></li> +<li><a name="cmd.ref"></a><a href="#cmd.ref">\ref</a> --> <a href="scrguide.pdf#scrjura.cmd.ref">275</a></li> +<li><a name="cmd.refClause"></a><a href="#cmd.refClause">\refClause</a> --> <a href="scrguide.pdf#scrjura.cmd.refClause">276</a></li> +<li><a name="cmd.refClauseN"></a><a href="#cmd.refClauseN">\refClauseN</a> --> <a href="scrguide.pdf#scrjura.cmd.refClauseN">276</a></li> +<li><a name="cmd.refL"></a><a href="#cmd.refL">\refL</a> --> <a href="scrguide.pdf#scrjura.cmd.refL">275</a></li> +<li><a name="cmd.refN"></a><a href="#cmd.refN">\refN</a> --> <a href="scrguide.pdf#scrjura.cmd.refN">275</a></li> +<li><a name="cmd.refPar"></a><a href="#cmd.refPar">\refPar</a> --> <a href="scrguide.pdf#scrjura.cmd.refPar">276</a></li> +<li><a name="cmd.refParL"></a><a href="#cmd.refParL">\refParL</a> --> <a href="scrguide.pdf#scrjura.cmd.refParL">276</a></li> +<li><a name="cmd.refParN"></a><a href="#cmd.refParN">\refParN</a> --> <a href="scrguide.pdf#scrjura.cmd.refParN">276</a></li> +<li><a name="cmd.refParS"></a><a href="#cmd.refParS">\refParS</a> --> <a href="scrguide.pdf#scrjura.cmd.refParS">276</a></li> +<li><a name="cmd.refS"></a><a href="#cmd.refS">\refS</a> --> <a href="scrguide.pdf#scrjura.cmd.refS">275</a></li> +<li><a name="cmd.refSentence"></a><a href="#cmd.refSentence">\refSentence</a> --> <a href="scrguide.pdf#scrjura.cmd.refSentence">276</a></li> +<li><a name="cmd.refSentenceL"></a><a href="#cmd.refSentenceL">\refSentenceL</a> --> <a href="scrguide.pdf#scrjura.cmd.refSentenceL">276</a></li> +<li><a name="cmd.refSentenceN"></a><a href="#cmd.refSentenceN">\refSentenceN</a> --> <a href="scrguide.pdf#scrjura.cmd.refSentenceN">276</a></li> +<li><a name="cmd.refSentenceS"></a><a href="#cmd.refSentenceS">\refSentenceS</a> --> <a href="scrguide.pdf#scrjura.cmd.refSentenceS">276</a></li> +<li><a name="cmd.refoot*"></a><a href="#cmd.refoot*">\refoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.refoot*">236</a></li> +<li><a name="cmd.refoot"></a><a href="#cmd.refoot">\refoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.refoot">233</a></li> +<li><a name="cmd.rehead*"></a><a href="#cmd.rehead*">\rehead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rehead*">233</a></li> +<li><a name="cmd.rehead"></a><a href="#cmd.rehead">\rehead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rehead">230</a></li> +<li><a name="cmd.removefromtoclist"></a><a href="#cmd.removefromtoclist">\removefromtoclist</a> --> <a href="scrguide.pdf#tocbasic.cmd.removefromtoclist">333</a></li> +<li><a name="cmd.removereffields"></a><a href="#cmd.removereffields">\removereffields</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.removereffields">469</a></li> +<li><a name="cmd.renewcaptionname"></a><a href="#cmd.renewcaptionname">\renewcaptionname</a> --> <a href="scrguide.pdf#scrbase.cmd.renewcaptionname">308</a></li> +<li><a name="cmd.renewpagestyle"></a><a href="#cmd.renewpagestyle">\renewpagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.renewpagestyle">410</a></li> +<li><a name="cmd.renewpairofpagestyles"></a><a href="#cmd.renewpairofpagestyles">\renewpairofpagestyles</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.renewpairofpagestyles">405</a></li> +<li><a name="cmd.renewtriplepagestyle"></a><a href="#cmd.renewtriplepagestyle">\renewtriplepagestyle</a> --> <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.renewtriplepagestyle">407</a></li> +<li><a name="cmd.rightbotmark"></a><a href="#cmd.rightbotmark">\rightbotmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.rightbotmark">397</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.rightbotmark">403</a></li> +<li><a name="cmd.rightfirstmark"></a><a href="#cmd.rightfirstmark">\rightfirstmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.rightfirstmark">397</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.rightfirstmark">403</a></li> +<li><a name="cmd.rightmark"></a><a href="#cmd.rightmark">\rightmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rightmark">244</a></li> +<li><a name="cmd.righttopmark"></a><a href="#cmd.righttopmark">\righttopmark</a> --> <a href="scrguide.pdf#scrlayer.cmd.righttopmark">397</a>, <a href="scrguide.pdf#scrlayer-scrpage-experts.cmd.righttopmark">403</a></li> +<li><a name="cmd.rofoot*"></a><a href="#cmd.rofoot*">\rofoot*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rofoot*">236</a></li> +<li><a name="cmd.rofoot"></a><a href="#cmd.rofoot">\rofoot</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rofoot">233</a></li> +<li><a name="cmd.rohead*"></a><a href="#cmd.rohead*">\rohead*</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rohead*">233</a></li> +<li><a name="cmd.rohead"></a><a href="#cmd.rohead">\rohead</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.rohead">230</a></li> +<li><a name="cmd.scr@ifVTeX"></a><a href="#cmd.scr@ifVTeX">\scr@ifVTeX</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifVTeX">304</a></li> +<li><a name="cmd.scr@ifdvioutput"></a><a href="#cmd.scr@ifdvioutput">\scr@ifdvioutput</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifdvioutput">305</a></li> +<li><a name="cmd.scr@ifpdfoutput"></a><a href="#cmd.scr@ifpdfoutput">\scr@ifpdfoutput</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifpdfoutput">304</a></li> +<li><a name="cmd.scr@ifpdftex"></a><a href="#cmd.scr@ifpdftex">\scr@ifpdftex</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifpdftex">304</a></li> +<li><a name="cmd.scr@ifpsoutput"></a><a href="#cmd.scr@ifpsoutput">\scr@ifpsoutput</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifpsoutput">305</a></li> +<li><a name="cmd.scr@ifundefinedorrelax"></a><a href="#cmd.scr@ifundefinedorrelax">\scr@ifundefinedorrelax</a> --> <a href="scrguide.pdf#scrbase.cmd.scr@ifundefinedorrelax">304</a></li> +<li><a name="cmd.scr@startsection"></a><a href="#cmd.scr@startsection">\scr@startsection</a> --> <a href="scrguide.pdf#maincls-experts.cmd.scr@startsection">449</a></li> +<li><a name="cmd.scrlayerAddCsToInterface"></a><a href="#cmd.scrlayerAddCsToInterface">\scrlayerAddCsToInterface</a> --> <a href="scrguide.pdf#scrlayer.cmd.scrlayerAddCsToInterface">399</a></li> +<li><a name="cmd.scrlayerAddToInterface"></a><a href="#cmd.scrlayerAddToInterface">\scrlayerAddToInterface</a> --> <a href="scrguide.pdf#scrlayer.cmd.scrlayerAddToInterface">399</a></li> +<li><a name="cmd.scrlayerInitInterface"></a><a href="#cmd.scrlayerInitInterface">\scrlayerInitInterface</a> --> <a href="scrguide.pdf#scrlayer.cmd.scrlayerInitInterface">399</a></li> +<li><a name="cmd.scrlayerOnAutoRemoveInterface"></a><a href="#cmd.scrlayerOnAutoRemoveInterface">\scrlayerOnAutoRemoveInterface</a> --> <a href="scrguide.pdf#scrlayer.cmd.scrlayerOnAutoRemoveInterface">400</a></li> <li><a name="cmd.section*"></a><a href="#cmd.section*">\section*</a> --> <a href="scrguide.pdf#maincls.cmd.section*">106</a></li> <li><a name="cmd.section"></a><a href="#cmd.section">\section</a> --> <a href="scrguide.pdf#maincls.cmd.section">101</a></li> -<li><a name="cmd.sectioncatchphraseformat"></a><a href="#cmd.sectioncatchphraseformat">\sectioncatchphraseformat</a> --> <a href="scrguide.pdf#maincls-experts.cmd.sectioncatchphraseformat">411</a></li> +<li><a name="cmd.sectioncatchphraseformat"></a><a href="#cmd.sectioncatchphraseformat">\sectioncatchphraseformat</a> --> <a href="scrguide.pdf#maincls-experts.cmd.sectioncatchphraseformat">447</a></li> <li><a name="cmd.sectionformat"></a><a href="#cmd.sectionformat">\sectionformat</a> --> <a href="scrguide.pdf#maincls.cmd.sectionformat">110</a></li> -<li><a name="cmd.sectionlinesformat"></a><a href="#cmd.sectionlinesformat">\sectionlinesformat</a> --> <a href="scrguide.pdf#maincls-experts.cmd.sectionlinesformat">411</a></li> -<li><a name="cmd.sectionmark"></a><a href="#cmd.sectionmark">\sectionmark</a> --> <a href="scrguide.pdf#maincls.cmd.sectionmark">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.sectionmark">245</a></li> -<li><a name="cmd.sectionmarkformat"></a><a href="#cmd.sectionmarkformat">\sectionmarkformat</a> --> <a href="scrguide.pdf#maincls.cmd.sectionmarkformat">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.sectionmarkformat">245</a></li> +<li><a name="cmd.sectionlinesformat"></a><a href="#cmd.sectionlinesformat">\sectionlinesformat</a> --> <a href="scrguide.pdf#maincls-experts.cmd.sectionlinesformat">447</a></li> +<li><a name="cmd.sectionmark"></a><a href="#cmd.sectionmark">\sectionmark</a> --> <a href="scrguide.pdf#maincls.cmd.sectionmark">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.sectionmark">246</a></li> +<li><a name="cmd.sectionmarkformat"></a><a href="#cmd.sectionmarkformat">\sectionmarkformat</a> --> <a href="scrguide.pdf#maincls.cmd.sectionmarkformat">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.sectionmarkformat">246</a></li> <li><a name="cmd.sectionnumdepth"></a><a href="#cmd.sectionnumdepth">\sectionnumdepth</a> --> <a href="scrguide.pdf#maincls.cmd.sectionnumdepth">114</a></li> -<li><a name="cmd.setbibpreamble"></a><a href="#cmd.setbibpreamble">\setbibpreamble</a> --> <a href="scrguide.pdf#maincls.cmd.setbibpreamble">149</a></li> +<li><a name="cmd.sentencename"></a><a href="#cmd.sentencename">\sentencename</a> --> <a href="scrguide.pdf#scrjura.cmd.sentencename">280</a></li> +<li><a name="cmd.sentenceshortname"></a><a href="#cmd.sentenceshortname">\sentenceshortname</a> --> <a href="scrguide.pdf#scrjura.cmd.sentenceshortname">280</a></li> +<li><a name="cmd.setbibpreamble"></a><a href="#cmd.setbibpreamble">\setbibpreamble</a> --> <a href="scrguide.pdf#maincls.cmd.setbibpreamble">150</a></li> +<li><a name="cmd.setcapdynwidth"></a><a href="#cmd.setcapdynwidth">\setcapdynwidth</a> --> <a href="scrguide.pdf#maincls.cmd.setcapdynwidth">142</a></li> <li><a name="cmd.setcaphanging"></a><a href="#cmd.setcaphanging">\setcaphanging</a> --> <a href="scrguide.pdf#maincls.cmd.setcaphanging">141</a></li> <li><a name="cmd.setcapindent*"></a><a href="#cmd.setcapindent*">\setcapindent*</a> --> <a href="scrguide.pdf#maincls.cmd.setcapindent*">141</a></li> <li><a name="cmd.setcapindent"></a><a href="#cmd.setcapindent">\setcapindent</a> --> <a href="scrguide.pdf#maincls.cmd.setcapindent">141</a></li> @@ -648,53 +700,53 @@ <li><a name="cmd.setcapmargin"></a><a href="#cmd.setcapmargin">\setcapmargin</a> --> <a href="scrguide.pdf#maincls.cmd.setcapmargin">142</a></li> <li><a name="cmd.setcapwidth"></a><a href="#cmd.setcapwidth">\setcapwidth</a> --> <a href="scrguide.pdf#maincls.cmd.setcapwidth">142</a></li> <li><a name="cmd.setchapterpreamble"></a><a href="#cmd.setchapterpreamble">\setchapterpreamble</a> --> <a href="scrguide.pdf#maincls.cmd.setchapterpreamble">115</a></li> -<li><a name="cmd.setfootbotline"></a><a href="#cmd.setfootbotline">\setfootbotline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.setfootbotline">248</a></li> +<li><a name="cmd.setfootbotline"></a><a href="#cmd.setfootbotline">\setfootbotline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.setfootbotline">249</a></li> <li><a name="cmd.setfootnoterule"></a><a href="#cmd.setfootnoterule">\setfootnoterule</a> --> <a href="scrguide.pdf#maincls.cmd.setfootnoterule">93</a></li> -<li><a name="cmd.setfootsepline"></a><a href="#cmd.setfootsepline">\setfootsepline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.setfootsepline">248</a></li> -<li><a name="cmd.setheadsepline"></a><a href="#cmd.setheadsepline">\setheadsepline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.setheadsepline">248</a></li> -<li><a name="cmd.setheadtopline"></a><a href="#cmd.setheadtopline">\setheadtopline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.setheadtopline">248</a></li> +<li><a name="cmd.setfootsepline"></a><a href="#cmd.setfootsepline">\setfootsepline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.setfootsepline">249</a></li> +<li><a name="cmd.setheadsepline"></a><a href="#cmd.setheadsepline">\setheadsepline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.setheadsepline">249</a></li> +<li><a name="cmd.setheadtopline"></a><a href="#cmd.setheadtopline">\setheadtopline</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.setheadtopline">249</a></li> <li><a name="cmd.setindexpreamble"></a><a href="#cmd.setindexpreamble">\setindexpreamble</a> --> <a href="scrguide.pdf#maincls.cmd.setindexpreamble">152</a></li> <li><a name="cmd.setkomafont"></a><a href="#cmd.setkomafont">\setkomafont</a> --> <a href="scrguide.pdf#maincls.cmd.setkomafont">59</a></li> -<li><a name="cmd.setkomavar*"></a><a href="#cmd.setkomavar*">\setkomavar*</a> --> <a href="scrguide.pdf#scrlttr2.cmd.setkomavar*">157</a></li> -<li><a name="cmd.setkomavar"></a><a href="#cmd.setkomavar">\setkomavar</a> --> <a href="scrguide.pdf#scrlttr2.cmd.setkomavar">157</a></li> -<li><a name="cmd.setlengthtoplength"></a><a href="#cmd.setlengthtoplength">\setlengthtoplength</a> --> <a href="scrguide.pdf#scrlttr2.cmd.setlengthtoplength">159</a></li> -<li><a name="cmd.setparsizes"></a><a href="#cmd.setparsizes">\setparsizes</a> --> <a href="scrguide.pdf#maincls-experts.cmd.setparsizes">397</a></li> +<li><a name="cmd.setkomavar*"></a><a href="#cmd.setkomavar*">\setkomavar*</a> --> <a href="scrguide.pdf#scrlttr2.cmd.setkomavar*">158</a></li> +<li><a name="cmd.setkomavar"></a><a href="#cmd.setkomavar">\setkomavar</a> --> <a href="scrguide.pdf#scrlttr2.cmd.setkomavar">158</a></li> +<li><a name="cmd.setlengthtoplength"></a><a href="#cmd.setlengthtoplength">\setlengthtoplength</a> --> <a href="scrguide.pdf#scrlttr2.cmd.setlengthtoplength">160</a></li> +<li><a name="cmd.setparsizes"></a><a href="#cmd.setparsizes">\setparsizes</a> --> <a href="scrguide.pdf#maincls-experts.cmd.setparsizes">432</a></li> <li><a name="cmd.setpartpreamble"></a><a href="#cmd.setpartpreamble">\setpartpreamble</a> --> <a href="scrguide.pdf#maincls.cmd.setpartpreamble">115</a></li> -<li><a name="cmd.setshowstyle"></a><a href="#cmd.setshowstyle">\setshowstyle</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.setshowstyle">438</a></li> -<li><a name="cmd.setuptoc"></a><a href="#cmd.setuptoc">\setuptoc</a> --> <a href="scrguide.pdf#tocbasic.cmd.setuptoc">319</a></li> -<li><a name="cmd.showISOenvelope"></a><a href="#cmd.showISOenvelope">\showISOenvelope</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.showISOenvelope">438</a></li> -<li><a name="cmd.showUScheck"></a><a href="#cmd.showUScheck">\showUScheck</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.showUScheck">438</a></li> -<li><a name="cmd.showUScommercial"></a><a href="#cmd.showUScommercial">\showUScommercial</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.showUScommercial">438</a></li> -<li><a name="cmd.showenvelope"></a><a href="#cmd.showenvelope">\showenvelope</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.showenvelope">438</a></li> -<li><a name="cmd.showfields"></a><a href="#cmd.showfields">\showfields</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.showfields">437</a></li> -<li><a name="cmd.storeareas"></a><a href="#cmd.storeareas">\storeareas</a> --> <a href="scrguide.pdf#typearea-experts.cmd.storeareas">390</a></li> +<li><a name="cmd.setshowstyle"></a><a href="#cmd.setshowstyle">\setshowstyle</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.setshowstyle">474</a></li> +<li><a name="cmd.setuptoc"></a><a href="#cmd.setuptoc">\setuptoc</a> --> <a href="scrguide.pdf#tocbasic.cmd.setuptoc">339</a></li> +<li><a name="cmd.showISOenvelope"></a><a href="#cmd.showISOenvelope">\showISOenvelope</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.showISOenvelope">474</a></li> +<li><a name="cmd.showUScheck"></a><a href="#cmd.showUScheck">\showUScheck</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.showUScheck">474</a></li> +<li><a name="cmd.showUScommercial"></a><a href="#cmd.showUScommercial">\showUScommercial</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.showUScommercial">474</a></li> +<li><a name="cmd.showenvelope"></a><a href="#cmd.showenvelope">\showenvelope</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.showenvelope">474</a></li> +<li><a name="cmd.showfields"></a><a href="#cmd.showfields">\showfields</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.showfields">473</a></li> +<li><a name="cmd.storeareas"></a><a href="#cmd.storeareas">\storeareas</a> --> <a href="scrguide.pdf#typearea-experts.cmd.storeareas">425</a></li> <li><a name="cmd.subject"></a><a href="#cmd.subject">\subject</a> --> <a href="scrguide.pdf#maincls.cmd.subject">67</a></li> -<li><a name="cmd.subjectname"></a><a href="#cmd.subjectname">\subjectname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.subjectname">444</a></li> +<li><a name="cmd.subjectname"></a><a href="#cmd.subjectname">\subjectname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.subjectname">480</a></li> <li><a name="cmd.subparagraph*"></a><a href="#cmd.subparagraph*">\subparagraph*</a> --> <a href="scrguide.pdf#maincls.cmd.subparagraph*">106</a></li> <li><a name="cmd.subparagraph"></a><a href="#cmd.subparagraph">\subparagraph</a> --> <a href="scrguide.pdf#maincls.cmd.subparagraph">101</a></li> <li><a name="cmd.subparagraphformat"></a><a href="#cmd.subparagraphformat">\subparagraphformat</a> --> <a href="scrguide.pdf#maincls.cmd.subparagraphformat">110</a></li> -<li><a name="cmd.subparagraphmark"></a><a href="#cmd.subparagraphmark">\subparagraphmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.subparagraphmark">245</a></li> -<li><a name="cmd.subparagraphmarkformat"></a><a href="#cmd.subparagraphmarkformat">\subparagraphmarkformat</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.subparagraphmarkformat">245</a></li> +<li><a name="cmd.subparagraphmark"></a><a href="#cmd.subparagraphmark">\subparagraphmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.subparagraphmark">246</a></li> +<li><a name="cmd.subparagraphmarkformat"></a><a href="#cmd.subparagraphmarkformat">\subparagraphmarkformat</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.subparagraphmarkformat">246</a></li> <li><a name="cmd.subparagraphnumdepth"></a><a href="#cmd.subparagraphnumdepth">\subparagraphnumdepth</a> --> <a href="scrguide.pdf#maincls.cmd.subparagraphnumdepth">114</a></li> <li><a name="cmd.subsection*"></a><a href="#cmd.subsection*">\subsection*</a> --> <a href="scrguide.pdf#maincls.cmd.subsection*">106</a></li> <li><a name="cmd.subsection"></a><a href="#cmd.subsection">\subsection</a> --> <a href="scrguide.pdf#maincls.cmd.subsection">101</a></li> <li><a name="cmd.subsectionformat"></a><a href="#cmd.subsectionformat">\subsectionformat</a> --> <a href="scrguide.pdf#maincls.cmd.subsectionformat">110</a></li> -<li><a name="cmd.subsectionmark"></a><a href="#cmd.subsectionmark">\subsectionmark</a> --> <a href="scrguide.pdf#maincls.cmd.subsectionmark">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.subsectionmark">245</a></li> -<li><a name="cmd.subsectionmarkformat"></a><a href="#cmd.subsectionmarkformat">\subsectionmarkformat</a> --> <a href="scrguide.pdf#maincls.cmd.subsectionmarkformat">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.subsectionmarkformat">245</a></li> +<li><a name="cmd.subsectionmark"></a><a href="#cmd.subsectionmark">\subsectionmark</a> --> <a href="scrguide.pdf#maincls.cmd.subsectionmark">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.subsectionmark">246</a></li> +<li><a name="cmd.subsectionmarkformat"></a><a href="#cmd.subsectionmarkformat">\subsectionmarkformat</a> --> <a href="scrguide.pdf#maincls.cmd.subsectionmarkformat">113</a>, <a href="scrguide.pdf#scrlayer-scrpage.cmd.subsectionmarkformat">246</a></li> <li><a name="cmd.subsectionnumdepth"></a><a href="#cmd.subsectionnumdepth">\subsectionnumdepth</a> --> <a href="scrguide.pdf#maincls.cmd.subsectionnumdepth">114</a></li> <li><a name="cmd.subsubsection*"></a><a href="#cmd.subsubsection*">\subsubsection*</a> --> <a href="scrguide.pdf#maincls.cmd.subsubsection*">106</a></li> <li><a name="cmd.subsubsection"></a><a href="#cmd.subsubsection">\subsubsection</a> --> <a href="scrguide.pdf#maincls.cmd.subsubsection">101</a></li> <li><a name="cmd.subsubsectionformat"></a><a href="#cmd.subsubsectionformat">\subsubsectionformat</a> --> <a href="scrguide.pdf#maincls.cmd.subsubsectionformat">110</a></li> -<li><a name="cmd.subsubsectionmark"></a><a href="#cmd.subsubsectionmark">\subsubsectionmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.subsubsectionmark">245</a></li> -<li><a name="cmd.subsubsectionmarkformat"></a><a href="#cmd.subsubsectionmarkformat">\subsubsectionmarkformat</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.subsubsectionmarkformat">245</a></li> +<li><a name="cmd.subsubsectionmark"></a><a href="#cmd.subsubsectionmark">\subsubsectionmark</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.subsubsectionmark">246</a></li> +<li><a name="cmd.subsubsectionmarkformat"></a><a href="#cmd.subsubsectionmarkformat">\subsubsectionmarkformat</a> --> <a href="scrguide.pdf#scrlayer-scrpage.cmd.subsubsectionmarkformat">246</a></li> <li><a name="cmd.subsubsectionnumdepth"></a><a href="#cmd.subsubsectionnumdepth">\subsubsectionnumdepth</a> --> <a href="scrguide.pdf#maincls.cmd.subsubsectionnumdepth">114</a></li> <li><a name="cmd.subtitle"></a><a href="#cmd.subtitle">\subtitle</a> --> <a href="scrguide.pdf#maincls.cmd.subtitle">67</a></li> -<li><a name="cmd.syncwithnotecolumn"></a><a href="#cmd.syncwithnotecolumn">\syncwithnotecolumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.syncwithnotecolumn">385</a></li> -<li><a name="cmd.syncwithnotecolumns"></a><a href="#cmd.syncwithnotecolumns">\syncwithnotecolumns</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.syncwithnotecolumns">387</a></li> +<li><a name="cmd.syncwithnotecolumn"></a><a href="#cmd.syncwithnotecolumn">\syncwithnotecolumn</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.syncwithnotecolumn">420</a></li> +<li><a name="cmd.syncwithnotecolumns"></a><a href="#cmd.syncwithnotecolumns">\syncwithnotecolumns</a> --> <a href="scrguide.pdf#scrlayer-notecolumn.cmd.syncwithnotecolumns">422</a></li> <li><a name="cmd.tableformat"></a><a href="#cmd.tableformat">\tableformat</a> --> <a href="scrguide.pdf#maincls.cmd.tableformat">140</a></li> <li><a name="cmd.tableofcontents"></a><a href="#cmd.tableofcontents">\tableofcontents</a> --> <a href="scrguide.pdf#maincls.cmd.tableofcontents">76</a></li> -<li><a name="cmd.tb@@after@hook"></a><a href="#cmd.tb@@after@hook">\tb@@after@hook</a> --> <a href="scrguide.pdf#tocbasic.cmd.tb@@after@hook">323</a></li> -<li><a name="cmd.tb@@before@hook"></a><a href="#cmd.tb@@before@hook">\tb@@before@hook</a> --> <a href="scrguide.pdf#tocbasic.cmd.tb@@before@hook">323</a></li> +<li><a name="cmd.tb@@after@hook"></a><a href="#cmd.tb@@after@hook">\tb@@after@hook</a> --> <a href="scrguide.pdf#tocbasic.cmd.tb@@after@hook">356</a></li> +<li><a name="cmd.tb@@before@hook"></a><a href="#cmd.tb@@before@hook">\tb@@before@hook</a> --> <a href="scrguide.pdf#tocbasic.cmd.tb@@before@hook">356</a></li> <li><a name="cmd.textsubscript"></a><a href="#cmd.textsubscript">\textsubscript</a> --> <a href="scrguide.pdf#maincls.cmd.textsubscript">58</a></li> <li><a name="cmd.textsuperscript"></a><a href="#cmd.textsuperscript">\textsuperscript</a> --> <a href="scrguide.pdf#maincls.cmd.textsuperscript">58</a></li> <li><a name="cmd.thanks"></a><a href="#cmd.thanks">\thanks</a> --> <a href="scrguide.pdf#maincls.cmd.thanks">67</a></li> @@ -703,36 +755,41 @@ <li><a name="cmd.theenumiii"></a><a href="#cmd.theenumiii">\theenumiii</a> --> <a href="scrguide.pdf#maincls.cmd.theenumiii">120</a></li> <li><a name="cmd.theenumiv"></a><a href="#cmd.theenumiv">\theenumiv</a> --> <a href="scrguide.pdf#maincls.cmd.theenumiv">120</a></li> <li><a name="cmd.thefootnotemark"></a><a href="#cmd.thefootnotemark">\thefootnotemark</a> --> <a href="scrguide.pdf#maincls.cmd.thefootnotemark">92</a></li> -<li><a name="cmd.thisletter"></a><a href="#cmd.thisletter">\thisletter</a> --> <a href="scrguide.pdf#scrlttr2.cmd.thisletter">163</a></li> -<li><a name="cmd.thispagestyle"></a><a href="#cmd.thispagestyle">\thispagestyle</a> --> <a href="scrguide.pdf#scrlttr2.cmd.thispagestyle">207</a>, <a href="scrguide.pdf#maincls.cmd.thispagestyle">82</a></li> +<li><a name="cmd.thepar"></a><a href="#cmd.thepar">\thepar</a> --> <a href="scrguide.pdf#scrjura.cmd.thepar">273</a></li> +<li><a name="cmd.thesentence"></a><a href="#cmd.thesentence">\thesentence</a> --> <a href="scrguide.pdf#scrjura.cmd.thesentence">275</a></li> +<li><a name="cmd.thisletter"></a><a href="#cmd.thisletter">\thisletter</a> --> <a href="scrguide.pdf#scrlttr2.cmd.thisletter">164</a></li> +<li><a name="cmd.thispagestyle"></a><a href="#cmd.thispagestyle">\thispagestyle</a> --> <a href="scrguide.pdf#scrlttr2.cmd.thispagestyle">208</a>, <a href="scrguide.pdf#maincls.cmd.thispagestyle">82</a></li> <li><a name="cmd.title"></a><a href="#cmd.title">\title</a> --> <a href="scrguide.pdf#maincls.cmd.title">67</a></li> <li><a name="cmd.titlehead"></a><a href="#cmd.titlehead">\titlehead</a> --> <a href="scrguide.pdf#maincls.cmd.titlehead">67</a></li> -<li><a name="cmd.titlepagestyle"></a><a href="#cmd.titlepagestyle">\titlepagestyle</a> --> <a href="scrguide.pdf#scrextend.cmd.titlepagestyle">265</a>, <a href="scrguide.pdf#maincls.cmd.titlepagestyle">84</a></li> -<li><a name="cmd.tocbasic@@after@hook"></a><a href="#cmd.tocbasic@@after@hook">\tocbasic@@after@hook</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@@after@hook">323</a></li> -<li><a name="cmd.tocbasic@@before@hook"></a><a href="#cmd.tocbasic@@before@hook">\tocbasic@@before@hook</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@@before@hook">323</a></li> -<li><a name="cmd.tocbasic@addxcontentsline"></a><a href="#cmd.tocbasic@addxcontentsline">\tocbasic@addxcontentsline</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@addxcontentsline">324</a></li> -<li><a name="cmd.tocbasic@extend@babel"></a><a href="#cmd.tocbasic@extend@babel">\tocbasic@extend@babel</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@extend@babel">322</a></li> -<li><a name="cmd.tocbasic@listhead"></a><a href="#cmd.tocbasic@listhead">\tocbasic@listhead</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@listhead">323</a></li> -<li><a name="cmd.tocbasic@listhead@"></a><a href="#cmd.tocbasic@listhead@">\tocbasic@listhead@</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@listhead@">324</a></li> -<li><a name="cmd.tocbasic@starttoc"></a><a href="#cmd.tocbasic@starttoc">\tocbasic@starttoc</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@starttoc">322</a></li> -<li><a name="cmd.tocbasicautomode"></a><a href="#cmd.tocbasicautomode">\tocbasicautomode</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasicautomode">314</a></li> -<li><a name="cmd.unitfactor"></a><a href="#cmd.unitfactor">\unitfactor</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.unitfactor">438</a></li> -<li><a name="cmd.unsettoc"></a><a href="#cmd.unsettoc">\unsettoc</a> --> <a href="scrguide.pdf#tocbasic.cmd.unsettoc">319</a></li> +<li><a name="cmd.titlepagestyle"></a><a href="#cmd.titlepagestyle">\titlepagestyle</a> --> <a href="scrguide.pdf#scrextend.cmd.titlepagestyle">266</a>, <a href="scrguide.pdf#maincls.cmd.titlepagestyle">84</a></li> +<li><a name="cmd.tocbasic@@after@hook"></a><a href="#cmd.tocbasic@@after@hook">\tocbasic@@after@hook</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@@after@hook">355</a></li> +<li><a name="cmd.tocbasic@@before@hook"></a><a href="#cmd.tocbasic@@before@hook">\tocbasic@@before@hook</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@@before@hook">355</a></li> +<li><a name="cmd.tocbasic@DependOnPenaltyAndTOCLevel"></a><a href="#cmd.tocbasic@DependOnPenaltyAndTOCLevel">\tocbasic@DependOnPenaltyAndTOCLevel</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@DependOnPenaltyAndTOCLevel">357</a></li> +<li><a name="cmd.tocbasic@SetPenaltyByTOCLevel"></a><a href="#cmd.tocbasic@SetPenaltyByTOCLevel">\tocbasic@SetPenaltyByTOCLevel</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@SetPenaltyByTOCLevel">357</a></li> +<li><a name="cmd.tocbasic@addxcontentsline"></a><a href="#cmd.tocbasic@addxcontentsline">\tocbasic@addxcontentsline</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@addxcontentsline">356</a></li> +<li><a name="cmd.tocbasic@extend@babel"></a><a href="#cmd.tocbasic@extend@babel">\tocbasic@extend@babel</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@extend@babel">354</a></li> +<li><a name="cmd.tocbasic@listhead"></a><a href="#cmd.tocbasic@listhead">\tocbasic@listhead</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@listhead">356</a></li> +<li><a name="cmd.tocbasic@listhead@"></a><a href="#cmd.tocbasic@listhead@">\tocbasic@listhead@</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@listhead@">356</a></li> +<li><a name="cmd.tocbasic@starttoc"></a><a href="#cmd.tocbasic@starttoc">\tocbasic@starttoc</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasic@starttoc">355</a></li> +<li><a name="cmd.tocbasicautomode"></a><a href="#cmd.tocbasicautomode">\tocbasicautomode</a> --> <a href="scrguide.pdf#tocbasic.cmd.tocbasicautomode">334</a></li> +<li><a name="cmd.unitfactor"></a><a href="#cmd.unitfactor">\unitfactor</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.unitfactor">474</a></li> +<li><a name="cmd.unsettoc"></a><a href="#cmd.unsettoc">\unsettoc</a> --> <a href="scrguide.pdf#tocbasic.cmd.unsettoc">339</a></li> <li><a name="cmd.uppertitleback"></a><a href="#cmd.uppertitleback">\uppertitleback</a> --> <a href="scrguide.pdf#maincls.cmd.uppertitleback">70</a></li> <li><a name="cmd.useencodingofkomafont"></a><a href="#cmd.useencodingofkomafont">\useencodingofkomafont</a> --> <a href="scrguide.pdf#maincls.cmd.useencodingofkomafont">64</a></li> <li><a name="cmd.usefamilyofkomafont"></a><a href="#cmd.usefamilyofkomafont">\usefamilyofkomafont</a> --> <a href="scrguide.pdf#maincls.cmd.usefamilyofkomafont">64</a></li> <li><a name="cmd.usefontofkomafont"></a><a href="#cmd.usefontofkomafont">\usefontofkomafont</a> --> <a href="scrguide.pdf#maincls.cmd.usefontofkomafont">64</a></li> <li><a name="cmd.usekomafont"></a><a href="#cmd.usekomafont">\usekomafont</a> --> <a href="scrguide.pdf#maincls.cmd.usekomafont">59</a></li> -<li><a name="cmd.usekomavar*"></a><a href="#cmd.usekomavar*">\usekomavar*</a> --> <a href="scrguide.pdf#scrlttr2.cmd.usekomavar*">157</a>, <a href="scrguide.pdf#scrlttr2-experts.cmd.usekomavar*">434</a></li> -<li><a name="cmd.usekomavar"></a><a href="#cmd.usekomavar">\usekomavar</a> --> <a href="scrguide.pdf#scrlttr2.cmd.usekomavar">157</a>, <a href="scrguide.pdf#scrlttr2-experts.cmd.usekomavar">434</a></li> +<li><a name="cmd.usekomavar*"></a><a href="#cmd.usekomavar*">\usekomavar*</a> --> <a href="scrguide.pdf#scrlttr2.cmd.usekomavar*">158</a>, <a href="scrguide.pdf#scrlttr2-experts.cmd.usekomavar*">470</a></li> +<li><a name="cmd.usekomavar"></a><a href="#cmd.usekomavar">\usekomavar</a> --> <a href="scrguide.pdf#scrlttr2.cmd.usekomavar">158</a>, <a href="scrguide.pdf#scrlttr2-experts.cmd.usekomavar">470</a></li> <li><a name="cmd.usepackage"></a><a href="#cmd.usepackage">\usepackage</a> --> <a href="scrguide.pdf#typearea.cmd.usepackage">32</a></li> -<li><a name="cmd.useplength"></a><a href="#cmd.useplength">\useplength</a> --> <a href="scrguide.pdf#scrlttr2.cmd.useplength">159</a></li> +<li><a name="cmd.useplength"></a><a href="#cmd.useplength">\useplength</a> --> <a href="scrguide.pdf#scrlttr2.cmd.useplength">160</a></li> <li><a name="cmd.useseriesofkomafont"></a><a href="#cmd.useseriesofkomafont">\useseriesofkomafont</a> --> <a href="scrguide.pdf#maincls.cmd.useseriesofkomafont">64</a></li> <li><a name="cmd.useshapeofkomafont"></a><a href="#cmd.useshapeofkomafont">\useshapeofkomafont</a> --> <a href="scrguide.pdf#maincls.cmd.useshapeofkomafont">64</a></li> <li><a name="cmd.usesizeofkomafont"></a><a href="#cmd.usesizeofkomafont">\usesizeofkomafont</a> --> <a href="scrguide.pdf#maincls.cmd.usesizeofkomafont">64</a></li> -<li><a name="cmd.wwwname"></a><a href="#cmd.wwwname">\wwwname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.wwwname">444</a></li> -<li><a name="cmd.yourmailname"></a><a href="#cmd.yourmailname">\yourmailname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.yourmailname">444</a></li> -<li><a name="cmd.yourrefname"></a><a href="#cmd.yourrefname">\yourrefname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.yourrefname">444</a></li> +<li><a name="cmd.usetocbasicnumberline"></a><a href="#cmd.usetocbasicnumberline">\usetocbasicnumberline</a> --> <a href="scrguide.pdf#tocbasic.cmd.usetocbasicnumberline">342</a></li> +<li><a name="cmd.wwwname"></a><a href="#cmd.wwwname">\wwwname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.wwwname">480</a></li> +<li><a name="cmd.yourmailname"></a><a href="#cmd.yourmailname">\yourmailname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.yourmailname">480</a></li> +<li><a name="cmd.yourrefname"></a><a href="#cmd.yourrefname">\yourrefname</a> --> <a href="scrguide.pdf#scrlttr2-experts.cmd.yourrefname">480</a></li> </ul> <h2><a name="environment">Umgebungen</a></h2> <ul> @@ -741,11 +798,12 @@ <li><a name="env.addmargin"></a><a href="#env.addmargin">addmargin</a> --> <a href="scrguide.pdf#maincls.env.addmargin">126</a></li> <li><a name="env.captionbeside"></a><a href="#env.captionbeside">captionbeside</a> --> <a href="scrguide.pdf#maincls.env.captionbeside">136</a></li> <li><a name="env.captionofbeside"></a><a href="#env.captionofbeside">captionofbeside</a> --> <a href="scrguide.pdf#maincls.env.captionofbeside">139</a></li> +<li><a name="env.contract"></a><a href="#env.contract">contract</a> --> <a href="scrguide.pdf#scrjura.env.contract">269</a></li> <li><a name="env.description"></a><a href="#env.description">description</a> --> <a href="scrguide.pdf#maincls.env.description">121</a></li> <li><a name="env.enumerate"></a><a href="#env.enumerate">enumerate</a> --> <a href="scrguide.pdf#maincls.env.enumerate">120</a></li> <li><a name="env.itemize"></a><a href="#env.itemize">itemize</a> --> <a href="scrguide.pdf#maincls.env.itemize">119</a></li> <li><a name="env.labeling"></a><a href="#env.labeling">labeling</a> --> <a href="scrguide.pdf#maincls.env.labeling">122</a></li> -<li><a name="env.letter"></a><a href="#env.letter">letter</a> --> <a href="scrguide.pdf#scrlttr2.env.letter">162</a></li> +<li><a name="env.letter"></a><a href="#env.letter">letter</a> --> <a href="scrguide.pdf#scrlttr2.env.letter">163</a></li> <li><a name="env.quotation"></a><a href="#env.quotation">quotation</a> --> <a href="scrguide.pdf#maincls.env.quotation">125</a></li> <li><a name="env.quote"></a><a href="#env.quote">quote</a> --> <a href="scrguide.pdf#maincls.env.quote">125</a></li> <li><a name="env.titlepage"></a><a href="#env.titlepage">titlepage</a> --> <a href="scrguide.pdf#maincls.env.titlepage">65</a></li> @@ -753,115 +811,117 @@ </ul> <h2><a name="length">Längen</a></h2> <ul> -<li><a name="length.footheight"></a><a href="#length.footheight">footheight</a> --> <a href="scrguide.pdf#scrlayer-scrpage.length.footheight">226</a></li> -<li><a name="length.headheight"></a><a href="#length.headheight">headheight</a> --> <a href="scrguide.pdf#scrlayer-scrpage.length.headheight">226</a></li> +<li><a name="length.footheight"></a><a href="#length.footheight">footheight</a> --> <a href="scrguide.pdf#scrlayer-scrpage.length.footheight">227</a></li> +<li><a name="length.headheight"></a><a href="#length.headheight">headheight</a> --> <a href="scrguide.pdf#scrlayer-scrpage.length.headheight">227</a></li> </ul> <h2><a name="plength">Pseudolängen</a></h2> <ul> -<li><a name="plength.PPdatamatrixvskip"></a><a href="#plength.PPdatamatrixvskip">PPdatamatrixvskip</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.PPdatamatrixvskip">428</a></li> -<li><a name="plength.PPheadheight"></a><a href="#plength.PPheadheight">PPheadheight</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.PPheadheight">428</a></li> -<li><a name="plength.PPheadwidth"></a><a href="#plength.PPheadwidth">PPheadwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.PPheadwidth">428</a></li> -<li><a name="plength.backaddrheight"></a><a href="#plength.backaddrheight">backaddrheight</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.backaddrheight">428</a></li> -<li><a name="plength.bfoldmarklength"></a><a href="#plength.bfoldmarklength">bfoldmarklength</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.bfoldmarklength">424</a></li> -<li><a name="plength.bfoldmarkvpos"></a><a href="#plength.bfoldmarkvpos">bfoldmarkvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.bfoldmarkvpos">424</a></li> -<li><a name="plength.firstfoothpos"></a><a href="#plength.firstfoothpos">firstfoothpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstfoothpos">432</a></li> -<li><a name="plength.firstfootvpos"></a><a href="#plength.firstfootvpos">firstfootvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstfootvpos">432</a></li> -<li><a name="plength.firstfootwidth"></a><a href="#plength.firstfootwidth">firstfootwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstfootwidth">432</a></li> -<li><a name="plength.firstheadhpos"></a><a href="#plength.firstheadhpos">firstheadhpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstheadhpos">426</a></li> -<li><a name="plength.firstheadvpos"></a><a href="#plength.firstheadvpos">firstheadvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstheadvpos">425</a></li> -<li><a name="plength.firstheadwidth"></a><a href="#plength.firstheadwidth">firstheadwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstheadwidth">426</a></li> -<li><a name="plength.foldmarkhpos"></a><a href="#plength.foldmarkhpos">foldmarkhpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.foldmarkhpos">424</a></li> -<li><a name="plength.foldmarkthickness"></a><a href="#plength.foldmarkthickness">foldmarkthickness</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.foldmarkthickness">425</a></li> -<li><a name="plength.foldmarkvpos"></a><a href="#plength.foldmarkvpos">foldmarkvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.foldmarkvpos">425</a></li> -<li><a name="plength.fromrulethickness"></a><a href="#plength.fromrulethickness">fromrulethickness</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.fromrulethickness">426</a></li> -<li><a name="plength.fromrulewidth"></a><a href="#plength.fromrulewidth">fromrulewidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.fromrulewidth">426</a></li> -<li><a name="plength.lfoldmarkhpos"></a><a href="#plength.lfoldmarkhpos">lfoldmarkhpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.lfoldmarkhpos">425</a></li> -<li><a name="plength.lfoldmarklength"></a><a href="#plength.lfoldmarklength">lfoldmarklength</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.lfoldmarklength">425</a></li> -<li><a name="plength.locheight"></a><a href="#plength.locheight">locheight</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.locheight">429</a></li> -<li><a name="plength.lochpos"></a><a href="#plength.lochpos">lochpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.lochpos">429</a></li> -<li><a name="plength.locvpos"></a><a href="#plength.locvpos">locvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.locvpos">429</a></li> -<li><a name="plength.locwidth"></a><a href="#plength.locwidth">locwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.locwidth">429</a></li> -<li><a name="plength.mfoldmarklength"></a><a href="#plength.mfoldmarklength">mfoldmarklength</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.mfoldmarklength">424</a></li> -<li><a name="plength.mfoldmarkvpos"></a><a href="#plength.mfoldmarkvpos">mfoldmarkvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.mfoldmarkvpos">424</a></li> -<li><a name="plength.pfoldmarklength"></a><a href="#plength.pfoldmarklength">pfoldmarklength</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.pfoldmarklength">424</a></li> -<li><a name="plength.refaftervskip"></a><a href="#plength.refaftervskip">refaftervskip</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.refaftervskip">430</a></li> -<li><a name="plength.refhpos"></a><a href="#plength.refhpos">refhpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.refhpos">430</a></li> -<li><a name="plength.refvpos"></a><a href="#plength.refvpos">refvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.refvpos">429</a></li> -<li><a name="plength.refwidth"></a><a href="#plength.refwidth">refwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.refwidth">430</a></li> -<li><a name="plength.sigbeforevskip"></a><a href="#plength.sigbeforevskip">sigbeforevskip</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.sigbeforevskip">431</a></li> -<li><a name="plength.sigindent"></a><a href="#plength.sigindent">sigindent</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.sigindent">431</a></li> -<li><a name="plength.specialmailindent"></a><a href="#plength.specialmailindent">specialmailindent</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.specialmailindent">428</a></li> -<li><a name="plength.specialmailrightindent"></a><a href="#plength.specialmailrightindent">specialmailrightindent</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.specialmailrightindent">428</a></li> -<li><a name="plength.subjectaftervskip"></a><a href="#plength.subjectaftervskip">subjectaftervskip</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.subjectaftervskip">431</a></li> -<li><a name="plength.subjectbeforevskip"></a><a href="#plength.subjectbeforevskip">subjectbeforevskip</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.subjectbeforevskip">431</a></li> -<li><a name="plength.subjectvpos"></a><a href="#plength.subjectvpos">subjectvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.subjectvpos">430</a></li> -<li><a name="plength.tfoldmarklength"></a><a href="#plength.tfoldmarklength">tfoldmarklength</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.tfoldmarklength">424</a></li> -<li><a name="plength.tfoldmarkvpos"></a><a href="#plength.tfoldmarkvpos">tfoldmarkvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.tfoldmarkvpos">424</a></li> -<li><a name="plength.toaddrheight"></a><a href="#plength.toaddrheight">toaddrheight</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.toaddrheight">427</a></li> -<li><a name="plength.toaddrhpos"></a><a href="#plength.toaddrhpos">toaddrhpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.toaddrhpos">426</a></li> -<li><a name="plength.toaddrindent"></a><a href="#plength.toaddrindent">toaddrindent</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.toaddrindent">427</a></li> -<li><a name="plength.toaddrvpos"></a><a href="#plength.toaddrvpos">toaddrvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.toaddrvpos">426</a></li> -<li><a name="plength.toaddrwidth"></a><a href="#plength.toaddrwidth">toaddrwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.toaddrwidth">427</a></li> +<li><a name="plength.PPdatamatrixvskip"></a><a href="#plength.PPdatamatrixvskip">PPdatamatrixvskip</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.PPdatamatrixvskip">464</a></li> +<li><a name="plength.PPheadheight"></a><a href="#plength.PPheadheight">PPheadheight</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.PPheadheight">464</a></li> +<li><a name="plength.PPheadwidth"></a><a href="#plength.PPheadwidth">PPheadwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.PPheadwidth">464</a></li> +<li><a name="plength.backaddrheight"></a><a href="#plength.backaddrheight">backaddrheight</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.backaddrheight">464</a></li> +<li><a name="plength.bfoldmarklength"></a><a href="#plength.bfoldmarklength">bfoldmarklength</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.bfoldmarklength">460</a></li> +<li><a name="plength.bfoldmarkvpos"></a><a href="#plength.bfoldmarkvpos">bfoldmarkvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.bfoldmarkvpos">460</a></li> +<li><a name="plength.firstfoothpos"></a><a href="#plength.firstfoothpos">firstfoothpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstfoothpos">468</a></li> +<li><a name="plength.firstfootvpos"></a><a href="#plength.firstfootvpos">firstfootvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstfootvpos">468</a></li> +<li><a name="plength.firstfootwidth"></a><a href="#plength.firstfootwidth">firstfootwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstfootwidth">468</a></li> +<li><a name="plength.firstheadhpos"></a><a href="#plength.firstheadhpos">firstheadhpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstheadhpos">462</a></li> +<li><a name="plength.firstheadvpos"></a><a href="#plength.firstheadvpos">firstheadvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstheadvpos">461</a></li> +<li><a name="plength.firstheadwidth"></a><a href="#plength.firstheadwidth">firstheadwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.firstheadwidth">462</a></li> +<li><a name="plength.foldmarkhpos"></a><a href="#plength.foldmarkhpos">foldmarkhpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.foldmarkhpos">460</a></li> +<li><a name="plength.foldmarkthickness"></a><a href="#plength.foldmarkthickness">foldmarkthickness</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.foldmarkthickness">461</a></li> +<li><a name="plength.foldmarkvpos"></a><a href="#plength.foldmarkvpos">foldmarkvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.foldmarkvpos">461</a></li> +<li><a name="plength.fromrulethickness"></a><a href="#plength.fromrulethickness">fromrulethickness</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.fromrulethickness">462</a></li> +<li><a name="plength.fromrulewidth"></a><a href="#plength.fromrulewidth">fromrulewidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.fromrulewidth">462</a></li> +<li><a name="plength.lfoldmarkhpos"></a><a href="#plength.lfoldmarkhpos">lfoldmarkhpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.lfoldmarkhpos">461</a></li> +<li><a name="plength.lfoldmarklength"></a><a href="#plength.lfoldmarklength">lfoldmarklength</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.lfoldmarklength">461</a></li> +<li><a name="plength.locheight"></a><a href="#plength.locheight">locheight</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.locheight">465</a></li> +<li><a name="plength.lochpos"></a><a href="#plength.lochpos">lochpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.lochpos">465</a></li> +<li><a name="plength.locvpos"></a><a href="#plength.locvpos">locvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.locvpos">465</a></li> +<li><a name="plength.locwidth"></a><a href="#plength.locwidth">locwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.locwidth">465</a></li> +<li><a name="plength.mfoldmarklength"></a><a href="#plength.mfoldmarklength">mfoldmarklength</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.mfoldmarklength">460</a></li> +<li><a name="plength.mfoldmarkvpos"></a><a href="#plength.mfoldmarkvpos">mfoldmarkvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.mfoldmarkvpos">460</a></li> +<li><a name="plength.pfoldmarklength"></a><a href="#plength.pfoldmarklength">pfoldmarklength</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.pfoldmarklength">460</a></li> +<li><a name="plength.refaftervskip"></a><a href="#plength.refaftervskip">refaftervskip</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.refaftervskip">466</a></li> +<li><a name="plength.refhpos"></a><a href="#plength.refhpos">refhpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.refhpos">466</a></li> +<li><a name="plength.refvpos"></a><a href="#plength.refvpos">refvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.refvpos">465</a></li> +<li><a name="plength.refwidth"></a><a href="#plength.refwidth">refwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.refwidth">466</a></li> +<li><a name="plength.sigbeforevskip"></a><a href="#plength.sigbeforevskip">sigbeforevskip</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.sigbeforevskip">467</a></li> +<li><a name="plength.sigindent"></a><a href="#plength.sigindent">sigindent</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.sigindent">467</a></li> +<li><a name="plength.specialmailindent"></a><a href="#plength.specialmailindent">specialmailindent</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.specialmailindent">464</a></li> +<li><a name="plength.specialmailrightindent"></a><a href="#plength.specialmailrightindent">specialmailrightindent</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.specialmailrightindent">464</a></li> +<li><a name="plength.subjectaftervskip"></a><a href="#plength.subjectaftervskip">subjectaftervskip</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.subjectaftervskip">467</a></li> +<li><a name="plength.subjectbeforevskip"></a><a href="#plength.subjectbeforevskip">subjectbeforevskip</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.subjectbeforevskip">467</a></li> +<li><a name="plength.subjectvpos"></a><a href="#plength.subjectvpos">subjectvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.subjectvpos">466</a></li> +<li><a name="plength.tfoldmarklength"></a><a href="#plength.tfoldmarklength">tfoldmarklength</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.tfoldmarklength">460</a></li> +<li><a name="plength.tfoldmarkvpos"></a><a href="#plength.tfoldmarkvpos">tfoldmarkvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.tfoldmarkvpos">460</a></li> +<li><a name="plength.toaddrheight"></a><a href="#plength.toaddrheight">toaddrheight</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.toaddrheight">463</a></li> +<li><a name="plength.toaddrhpos"></a><a href="#plength.toaddrhpos">toaddrhpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.toaddrhpos">462</a></li> +<li><a name="plength.toaddrindent"></a><a href="#plength.toaddrindent">toaddrindent</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.toaddrindent">463</a></li> +<li><a name="plength.toaddrvpos"></a><a href="#plength.toaddrvpos">toaddrvpos</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.toaddrvpos">462</a></li> +<li><a name="plength.toaddrwidth"></a><a href="#plength.toaddrwidth">toaddrwidth</a> --> <a href="scrguide.pdf#scrlttr2-experts.plength.toaddrwidth">463</a></li> </ul> <h2><a name="variable">Variablen</a></h2> <ul> -<li><a name="variable.PPcode"></a><a href="#variable.PPcode">PPcode</a> --> <a href="scrguide.pdf#scrlttr2.variable.PPcode">190</a></li> -<li><a name="variable.PPdatamatrix"></a><a href="#variable.PPdatamatrix">PPdatamatrix</a> --> <a href="scrguide.pdf#scrlttr2.variable.PPdatamatrix">190</a></li> -<li><a name="variable.addresseeimage"></a><a href="#variable.addresseeimage">addresseeimage</a> --> <a href="scrguide.pdf#scrlttr2.variable.addresseeimage">190</a></li> -<li><a name="variable.backaddress"></a><a href="#variable.backaddress">backaddress</a> --> <a href="scrguide.pdf#scrlttr2.variable.backaddress">190</a></li> -<li><a name="variable.backaddressseparator"></a><a href="#variable.backaddressseparator">backaddressseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.backaddressseparator">190</a></li> -<li><a name="variable.ccseparator"></a><a href="#variable.ccseparator">ccseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.ccseparator">168</a></li> -<li><a name="variable.customer"></a><a href="#variable.customer">customer</a> --> <a href="scrguide.pdf#scrlttr2.variable.customer">197</a></li> -<li><a name="variable.date"></a><a href="#variable.date">date</a> --> <a href="scrguide.pdf#scrlttr2.variable.date">196</a></li> -<li><a name="variable.emailseparator"></a><a href="#variable.emailseparator">emailseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.emailseparator">184</a></li> -<li><a name="variable.enclseparator"></a><a href="#variable.enclseparator">enclseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.enclseparator">168</a></li> -<li><a name="variable.faxseparator"></a><a href="#variable.faxseparator">faxseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.faxseparator">184</a></li> -<li><a name="variable.firstfoot"></a><a href="#variable.firstfoot">firstfoot</a> --> <a href="scrguide.pdf#scrlttr2.variable.firstfoot">203</a></li> -<li><a name="variable.firsthead"></a><a href="#variable.firsthead">firsthead</a> --> <a href="scrguide.pdf#scrlttr2.variable.firsthead">190</a></li> -<li><a name="variable.fromaddress"></a><a href="#variable.fromaddress">fromaddress</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromaddress">179</a></li> -<li><a name="variable.frombank"></a><a href="#variable.frombank">frombank</a> --> <a href="scrguide.pdf#scrlttr2.variable.frombank">203</a></li> -<li><a name="variable.fromemail"></a><a href="#variable.fromemail">fromemail</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromemail">184</a></li> -<li><a name="variable.fromfax"></a><a href="#variable.fromfax">fromfax</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromfax">184</a></li> -<li><a name="variable.fromlogo"></a><a href="#variable.fromlogo">fromlogo</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromlogo">188</a></li> -<li><a name="variable.frommobilephone"></a><a href="#variable.frommobilephone">frommobilephone</a> --> <a href="scrguide.pdf#scrlttr2.variable.frommobilephone">184</a></li> -<li><a name="variable.fromname"></a><a href="#variable.fromname">fromname</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromname">179</a></li> -<li><a name="variable.fromphone"></a><a href="#variable.fromphone">fromphone</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromphone">184</a></li> -<li><a name="variable.fromurl"></a><a href="#variable.fromurl">fromurl</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromurl">184</a></li> -<li><a name="variable.fromzipcode"></a><a href="#variable.fromzipcode">fromzipcode</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromzipcode">190</a></li> -<li><a name="variable.invoice"></a><a href="#variable.invoice">invoice</a> --> <a href="scrguide.pdf#scrlttr2.variable.invoice">197</a></li> -<li><a name="variable.location"></a><a href="#variable.location">location</a> --> <a href="scrguide.pdf#scrlttr2.variable.location">195</a></li> -<li><a name="variable.mobilephoneseparator"></a><a href="#variable.mobilephoneseparator">mobilephoneseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.mobilephoneseparator">184</a></li> -<li><a name="variable.myref"></a><a href="#variable.myref">myref</a> --> <a href="scrguide.pdf#scrlttr2.variable.myref">197</a></li> -<li><a name="variable.nextfoot"></a><a href="#variable.nextfoot">nextfoot</a> --> <a href="scrguide.pdf#scrlttr2.variable.nextfoot">209</a></li> -<li><a name="variable.nexthead"></a><a href="#variable.nexthead">nexthead</a> --> <a href="scrguide.pdf#scrlttr2.variable.nexthead">209</a></li> -<li><a name="variable.phoneseparator"></a><a href="#variable.phoneseparator">phoneseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.phoneseparator">184</a></li> -<li><a name="variable.place"></a><a href="#variable.place">place</a> --> <a href="scrguide.pdf#scrlttr2.variable.place">190</a></li> -<li><a name="variable.placeseparator"></a><a href="#variable.placeseparator">placeseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.placeseparator">198</a></li> -<li><a name="variable.signature"></a><a href="#variable.signature">signature</a> --> <a href="scrguide.pdf#scrlttr2.variable.signature">211</a></li> -<li><a name="variable.specialmail"></a><a href="#variable.specialmail">specialmail</a> --> <a href="scrguide.pdf#scrlttr2.variable.specialmail">190</a></li> -<li><a name="variable.subject"></a><a href="#variable.subject">subject</a> --> <a href="scrguide.pdf#scrlttr2.variable.subject">201</a></li> -<li><a name="variable.subjectseparator"></a><a href="#variable.subjectseparator">subjectseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.subjectseparator">201</a></li> -<li><a name="variable.title"></a><a href="#variable.title">title</a> --> <a href="scrguide.pdf#scrlttr2.variable.title">200</a></li> -<li><a name="variable.toaddress"></a><a href="#variable.toaddress">toaddress</a> --> <a href="scrguide.pdf#scrlttr2.variable.toaddress">190</a></li> -<li><a name="variable.toname"></a><a href="#variable.toname">toname</a> --> <a href="scrguide.pdf#scrlttr2.variable.toname">190</a></li> -<li><a name="variable.urlseparator"></a><a href="#variable.urlseparator">urlseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.urlseparator">184</a></li> -<li><a name="variable.yourmail"></a><a href="#variable.yourmail">yourmail</a> --> <a href="scrguide.pdf#scrlttr2.variable.yourmail">197</a></li> -<li><a name="variable.yourref"></a><a href="#variable.yourref">yourref</a> --> <a href="scrguide.pdf#scrlttr2.variable.yourref">197</a></li> -<li><a name="variable.zipcodeseparator"></a><a href="#variable.zipcodeseparator">zipcodeseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.zipcodeseparator">190</a></li> +<li><a name="variable.PPcode"></a><a href="#variable.PPcode">PPcode</a> --> <a href="scrguide.pdf#scrlttr2.variable.PPcode">191</a></li> +<li><a name="variable.PPdatamatrix"></a><a href="#variable.PPdatamatrix">PPdatamatrix</a> --> <a href="scrguide.pdf#scrlttr2.variable.PPdatamatrix">191</a></li> +<li><a name="variable.addresseeimage"></a><a href="#variable.addresseeimage">addresseeimage</a> --> <a href="scrguide.pdf#scrlttr2.variable.addresseeimage">191</a></li> +<li><a name="variable.backaddress"></a><a href="#variable.backaddress">backaddress</a> --> <a href="scrguide.pdf#scrlttr2.variable.backaddress">191</a></li> +<li><a name="variable.backaddressseparator"></a><a href="#variable.backaddressseparator">backaddressseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.backaddressseparator">191</a></li> +<li><a name="variable.ccseparator"></a><a href="#variable.ccseparator">ccseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.ccseparator">169</a></li> +<li><a name="variable.customer"></a><a href="#variable.customer">customer</a> --> <a href="scrguide.pdf#scrlttr2.variable.customer">199</a></li> +<li><a name="variable.date"></a><a href="#variable.date">date</a> --> <a href="scrguide.pdf#scrlttr2.variable.date">197</a></li> +<li><a name="variable.emailseparator"></a><a href="#variable.emailseparator">emailseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.emailseparator">185</a></li> +<li><a name="variable.enclseparator"></a><a href="#variable.enclseparator">enclseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.enclseparator">169</a></li> +<li><a name="variable.faxseparator"></a><a href="#variable.faxseparator">faxseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.faxseparator">185</a></li> +<li><a name="variable.firstfoot"></a><a href="#variable.firstfoot">firstfoot</a> --> <a href="scrguide.pdf#scrlttr2.variable.firstfoot">204</a></li> +<li><a name="variable.firsthead"></a><a href="#variable.firsthead">firsthead</a> --> <a href="scrguide.pdf#scrlttr2.variable.firsthead">191</a></li> +<li><a name="variable.fromaddress"></a><a href="#variable.fromaddress">fromaddress</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromaddress">181</a></li> +<li><a name="variable.frombank"></a><a href="#variable.frombank">frombank</a> --> <a href="scrguide.pdf#scrlttr2.variable.frombank">205</a></li> +<li><a name="variable.fromemail"></a><a href="#variable.fromemail">fromemail</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromemail">185</a></li> +<li><a name="variable.fromfax"></a><a href="#variable.fromfax">fromfax</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromfax">185</a></li> +<li><a name="variable.fromlogo"></a><a href="#variable.fromlogo">fromlogo</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromlogo">189</a></li> +<li><a name="variable.frommobilephone"></a><a href="#variable.frommobilephone">frommobilephone</a> --> <a href="scrguide.pdf#scrlttr2.variable.frommobilephone">185</a></li> +<li><a name="variable.fromname"></a><a href="#variable.fromname">fromname</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromname">181</a></li> +<li><a name="variable.fromphone"></a><a href="#variable.fromphone">fromphone</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromphone">185</a></li> +<li><a name="variable.fromurl"></a><a href="#variable.fromurl">fromurl</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromurl">185</a></li> +<li><a name="variable.fromzipcode"></a><a href="#variable.fromzipcode">fromzipcode</a> --> <a href="scrguide.pdf#scrlttr2.variable.fromzipcode">191</a></li> +<li><a name="variable.invoice"></a><a href="#variable.invoice">invoice</a> --> <a href="scrguide.pdf#scrlttr2.variable.invoice">199</a></li> +<li><a name="variable.location"></a><a href="#variable.location">location</a> --> <a href="scrguide.pdf#scrlttr2.variable.location">196</a></li> +<li><a name="variable.mobilephoneseparator"></a><a href="#variable.mobilephoneseparator">mobilephoneseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.mobilephoneseparator">185</a></li> +<li><a name="variable.myref"></a><a href="#variable.myref">myref</a> --> <a href="scrguide.pdf#scrlttr2.variable.myref">199</a></li> +<li><a name="variable.nextfoot"></a><a href="#variable.nextfoot">nextfoot</a> --> <a href="scrguide.pdf#scrlttr2.variable.nextfoot">211</a></li> +<li><a name="variable.nexthead"></a><a href="#variable.nexthead">nexthead</a> --> <a href="scrguide.pdf#scrlttr2.variable.nexthead">211</a></li> +<li><a name="variable.phoneseparator"></a><a href="#variable.phoneseparator">phoneseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.phoneseparator">185</a></li> +<li><a name="variable.place"></a><a href="#variable.place">place</a> --> <a href="scrguide.pdf#scrlttr2.variable.place">191</a></li> +<li><a name="variable.placeseparator"></a><a href="#variable.placeseparator">placeseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.placeseparator">200</a></li> +<li><a name="variable.signature"></a><a href="#variable.signature">signature</a> --> <a href="scrguide.pdf#scrlttr2.variable.signature">212</a></li> +<li><a name="variable.specialmail"></a><a href="#variable.specialmail">specialmail</a> --> <a href="scrguide.pdf#scrlttr2.variable.specialmail">191</a></li> +<li><a name="variable.subject"></a><a href="#variable.subject">subject</a> --> <a href="scrguide.pdf#scrlttr2.variable.subject">202</a></li> +<li><a name="variable.subjectseparator"></a><a href="#variable.subjectseparator">subjectseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.subjectseparator">202</a></li> +<li><a name="variable.title"></a><a href="#variable.title">title</a> --> <a href="scrguide.pdf#scrlttr2.variable.title">201</a></li> +<li><a name="variable.toaddress"></a><a href="#variable.toaddress">toaddress</a> --> <a href="scrguide.pdf#scrlttr2.variable.toaddress">191</a></li> +<li><a name="variable.toname"></a><a href="#variable.toname">toname</a> --> <a href="scrguide.pdf#scrlttr2.variable.toname">191</a></li> +<li><a name="variable.urlseparator"></a><a href="#variable.urlseparator">urlseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.urlseparator">185</a></li> +<li><a name="variable.yourmail"></a><a href="#variable.yourmail">yourmail</a> --> <a href="scrguide.pdf#scrlttr2.variable.yourmail">199</a></li> +<li><a name="variable.yourref"></a><a href="#variable.yourref">yourref</a> --> <a href="scrguide.pdf#scrlttr2.variable.yourref">199</a></li> +<li><a name="variable.zipcodeseparator"></a><a href="#variable.zipcodeseparator">zipcodeseparator</a> --> <a href="scrguide.pdf#scrlttr2.variable.zipcodeseparator">191</a></li> </ul> <h2><a name="pagestyle">Seitenstile</a></h2> <ul> -<li><a name="pagestyle.@everystyle@"></a><a href="#pagestyle.@everystyle@">@everystyle@</a> --> <a href="scrguide.pdf#scrlayer.pagestyle.@everystyle@">355</a></li> -<li><a name="pagestyle.empty"></a><a href="#pagestyle.empty">empty</a> --> <a href="scrguide.pdf#scrlttr2.pagestyle.empty">207</a>, <a href="scrguide.pdf#scrlayer.pagestyle.empty">355</a></li> -<li><a name="pagestyle.headings"></a><a href="#pagestyle.headings">headings</a> --> <a href="scrguide.pdf#scrlttr2.pagestyle.headings">207</a></li> -<li><a name="pagestyle.myheadings"></a><a href="#pagestyle.myheadings">myheadings</a> --> <a href="scrguide.pdf#scrlttr2.pagestyle.myheadings">207</a></li> -<li><a name="pagestyle.plain"></a><a href="#pagestyle.plain">plain</a> --> <a href="scrguide.pdf#scrlttr2.pagestyle.plain">207</a></li> -<li><a name="pagestyle.scrheadings"></a><a href="#pagestyle.scrheadings">scrheadings</a> --> <a href="scrguide.pdf#scrlayer-scrpage.pagestyle.scrheadings">228</a></li> +<li><a name="pagestyle.@everystyle@"></a><a href="#pagestyle.@everystyle@">@everystyle@</a> --> <a href="scrguide.pdf#scrlayer.pagestyle.@everystyle@">390</a></li> +<li><a name="pagestyle.empty"></a><a href="#pagestyle.empty">empty</a> --> <a href="scrguide.pdf#scrlttr2.pagestyle.empty">208</a>, <a href="scrguide.pdf#scrlayer.pagestyle.empty">390</a></li> +<li><a name="pagestyle.headings"></a><a href="#pagestyle.headings">headings</a> --> <a href="scrguide.pdf#scrlttr2.pagestyle.headings">208</a></li> +<li><a name="pagestyle.myheadings"></a><a href="#pagestyle.myheadings">myheadings</a> --> <a href="scrguide.pdf#scrlttr2.pagestyle.myheadings">208</a></li> +<li><a name="pagestyle.plain"></a><a href="#pagestyle.plain">plain</a> --> <a href="scrguide.pdf#scrlttr2.pagestyle.plain">208</a></li> +<li><a name="pagestyle.scrheadings"></a><a href="#pagestyle.scrheadings">scrheadings</a> --> <a href="scrguide.pdf#scrlayer-scrpage.pagestyle.scrheadings">229</a></li> </ul> <h2><a name="counter">Zähler</a></h2> <ul> -<li><a name="counter.letter"></a><a href="#counter.letter">letter</a> --> <a href="scrguide.pdf#scrlttr2.counter.letter">163</a></li> +<li><a name="counter.letter"></a><a href="#counter.letter">letter</a> --> <a href="scrguide.pdf#scrlttr2.counter.letter">164</a></li> +<li><a name="counter.par"></a><a href="#counter.par">par</a> --> <a href="scrguide.pdf#scrjura.counter.par">273</a></li> <li><a name="counter.secnumdepth"></a><a href="#counter.secnumdepth">secnumdepth</a> --> <a href="scrguide.pdf#maincls.counter.secnumdepth">114</a></li> +<li><a name="counter.sentence"></a><a href="#counter.sentence">sentence</a> --> <a href="scrguide.pdf#scrjura.counter.sentence">275</a></li> <li><a name="counter.tocdepth"></a><a href="#counter.tocdepth">tocdepth</a> --> <a href="scrguide.pdf#maincls.counter.tocdepth">76</a></li> </ul> <h2><a name="floatstyle">Stile für das float-Paket</a></h2> diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf Binary files differindex 160b05676ab..35e4bf2e0a2 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf +++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf 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 d743a872ad1..6e2c3a303ce 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/scrguien.html +++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguien.html @@ -19,20 +19,22 @@ <li><a name="option.adrFreeIVstop"></a><a href="#option.adrFreeIVstop">adrFreeIVstop</a> --> <a href="scrguien.pdf#scraddr.option.adrFreeIVstop">239</a></li> <li><a name="option.adrFreeIVwarn"></a><a href="#option.adrFreeIVwarn">adrFreeIVwarn</a> --> <a href="scrguien.pdf#scraddr.option.adrFreeIVwarn">239</a></li> <li><a name="option.appendixprefix"></a><a href="#option.appendixprefix">appendixprefix</a> --> <a href="scrguien.pdf#maincls.option.appendixprefix">86</a></li> -<li><a name="option.autoclearnotecolumns"></a><a href="#option.autoclearnotecolumns">autoclearnotecolumns</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.option.autoclearnotecolumns">352</a></li> +<li><a name="option.autoclearnotecolumns"></a><a href="#option.autoclearnotecolumns">autoclearnotecolumns</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.option.autoclearnotecolumns">381</a></li> <li><a name="option.automark"></a><a href="#option.automark">automark</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.automark">219</a></li> <li><a name="option.autooneside"></a><a href="#option.autooneside">autooneside</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.autooneside">219</a></li> -<li><a name="option.autoremoveinterfaces"></a><a href="#option.autoremoveinterfaces">autoremoveinterfaces</a> --> <a href="scrguien.pdf#scrlayer.option.autoremoveinterfaces">330</a></li> +<li><a name="option.autoremoveinterfaces"></a><a href="#option.autoremoveinterfaces">autoremoveinterfaces</a> --> <a href="scrguien.pdf#scrlayer.option.autoremoveinterfaces">359</a></li> <li><a name="option.backaddress"></a><a href="#option.backaddress">backaddress</a> --> <a href="scrguien.pdf#scrlttr2.option.backaddress">174</a></li> <li><a name="option.bibliography"></a><a href="#option.bibliography">bibliography</a> --> <a href="scrguien.pdf#maincls.option.bibliography">133</a></li> <li><a name="option.captions"></a><a href="#option.captions">captions</a> --> <a href="scrguien.pdf#maincls.option.captions">115</a></li> <li><a name="option.chapteratlists"></a><a href="#option.chapteratlists">chapteratlists</a> --> <a href="scrguien.pdf#maincls.option.chapteratlists">89</a></li> <li><a name="option.chapterentrydots"></a><a href="#option.chapterentrydots">chapterentrydots</a> --> <a href="scrguien.pdf#maincls.option.chapterentrydots">68</a></li> <li><a name="option.chapterprefix"></a><a href="#option.chapterprefix">chapterprefix</a> --> <a href="scrguien.pdf#maincls.option.chapterprefix">86</a></li> +<li><a name="option.clausemark"></a><a href="#option.clausemark">clausemark</a> --> <a href="scrguien.pdf#scrjura.option.clausemark">248</a></li> <li><a name="option.cleardoublepage"></a><a href="#option.cleardoublepage">cleardoublepage</a> --> <a href="scrguien.pdf#maincls.option.cleardoublepage">78</a></li> <li><a name="option.clines"></a><a href="#option.clines">clines</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.clines">229</a></li> -<li><a name="option.deactivatepagestylelayers"></a><a href="#option.deactivatepagestylelayers">deactivatepagestylelayers</a> --> <a href="scrguien.pdf#scrlayer.option.deactivatepagestylelayers">324</a></li> -<li><a name="option.draft"></a><a href="#option.draft">draft</a> --> <a href="scrguien.pdf#scrlayer.option.draft">327</a>, <a href="scrguien.pdf#maincls.option.draft">51</a></li> +<li><a name="option.contract"></a><a href="#option.contract">contract</a> --> <a href="scrguien.pdf#scrjura.option.contract">246</a></li> +<li><a name="option.deactivatepagestylelayers"></a><a href="#option.deactivatepagestylelayers">deactivatepagestylelayers</a> --> <a href="scrguien.pdf#scrlayer.option.deactivatepagestylelayers">353</a></li> +<li><a name="option.draft"></a><a href="#option.draft">draft</a> --> <a href="scrguien.pdf#scrlayer.option.draft">356</a>, <a href="scrguien.pdf#maincls.option.draft">51</a></li> <li><a name="option.enlargefirstpage"></a><a href="#option.enlargefirstpage">enlargefirstpage</a> --> <a href="scrguien.pdf#scrlttr2.option.enlargefirstpage">161</a></li> <li><a name="option.extendedfeature"></a><a href="#option.extendedfeature">extendedfeature</a> --> <a href="scrguien.pdf#scrextend.option.extendedfeature">242</a></li> <li><a name="option.firstfoot"></a><a href="#option.firstfoot">firstfoot</a> --> <a href="scrguien.pdf#scrlttr2.option.firstfoot">185</a></li> @@ -42,12 +44,12 @@ <li><a name="option.fontsize"></a><a href="#option.fontsize">fontsize</a> --> <a href="scrguien.pdf#scrlttr2.option.fontsize">153</a>, <a href="scrguien.pdf#maincls.option.fontsize">52</a></li> <li><a name="option.footbotline"></a><a href="#option.footbotline">footbotline</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.footbotline">227</a></li> <li><a name="option.footheight"></a><a href="#option.footheight">footheight</a> --> <a href="scrguien.pdf#typearea.option.footheight">42</a></li> -<li><a name="option.footinclude"></a><a href="#option.footinclude">footinclude</a> --> <a href="scrguien.pdf#typearea.option.footinclude">39</a></li> +<li><a name="option.footinclude"></a><a href="#option.footinclude">footinclude</a> --> <a href="scrguien.pdf#typearea.option.footinclude">38</a></li> <li><a name="option.footlines"></a><a href="#option.footlines">footlines</a> --> <a href="scrguien.pdf#typearea.option.footlines">42</a></li> <li><a name="option.footnotes"></a><a href="#option.footnotes">footnotes</a> --> <a href="scrguien.pdf#maincls.option.footnotes">80</a></li> <li><a name="option.footsepline"></a><a href="#option.footsepline">footsepline</a> --> <a href="scrguien.pdf#scrlttr2.option.footsepline">189</a>, <a href="scrguien.pdf#scrlayer-scrpage.option.footsepline">227</a>, <a href="scrguien.pdf#maincls.option.footsepline">73</a></li> <li><a name="option.footwidth"></a><a href="#option.footwidth">footwidth</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.footwidth">226</a></li> -<li><a name="option.forceoverwrite"></a><a href="#option.forceoverwrite">forceoverwrite</a> --> <a href="scrguien.pdf#scrlayer.option.forceoverwrite">330</a></li> +<li><a name="option.forceoverwrite"></a><a href="#option.forceoverwrite">forceoverwrite</a> --> <a href="scrguien.pdf#scrlayer.option.forceoverwrite">359</a></li> <li><a name="option.fromalign"></a><a href="#option.fromalign">fromalign</a> --> <a href="scrguien.pdf#scrlttr2.option.fromalign">162</a></li> <li><a name="option.fromemail"></a><a href="#option.fromemail">fromemail</a> --> <a href="scrguien.pdf#scrlttr2.option.fromemail">167</a></li> <li><a name="option.fromfax"></a><a href="#option.fromfax">fromfax</a> --> <a href="scrguien.pdf#scrlttr2.option.fromfax">167</a></li> @@ -57,16 +59,20 @@ <li><a name="option.fromrule"></a><a href="#option.fromrule">fromrule</a> --> <a href="scrguien.pdf#scrlttr2.option.fromrule">162</a></li> <li><a name="option.fromurl"></a><a href="#option.fromurl">fromurl</a> --> <a href="scrguien.pdf#scrlttr2.option.fromurl">167</a></li> <li><a name="option.headheight"></a><a href="#option.headheight">headheight</a> --> <a href="scrguien.pdf#typearea.option.headheight">41</a></li> -<li><a name="option.headinclude"></a><a href="#option.headinclude">headinclude</a> --> <a href="scrguien.pdf#typearea.option.headinclude">39</a></li> +<li><a name="option.headinclude"></a><a href="#option.headinclude">headinclude</a> --> <a href="scrguien.pdf#typearea.option.headinclude">38</a></li> <li><a name="option.headings"></a><a href="#option.headings">headings</a> --> <a href="scrguien.pdf#maincls.option.headings">87</a></li> <li><a name="option.headlines"></a><a href="#option.headlines">headlines</a> --> <a href="scrguien.pdf#typearea.option.headlines">41</a></li> <li><a name="option.headsepline"></a><a href="#option.headsepline">headsepline</a> --> <a href="scrguien.pdf#scrlttr2.option.headsepline">189</a>, <a href="scrguien.pdf#scrlayer-scrpage.option.headsepline">227</a>, <a href="scrguien.pdf#maincls.option.headsepline">73</a></li> <li><a name="option.headtopline"></a><a href="#option.headtopline">headtopline</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.headtopline">227</a></li> <li><a name="option.headwidth"></a><a href="#option.headwidth">headwidth</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.headwidth">226</a></li> -<li><a name="option.hmode"></a><a href="#option.hmode">hmode</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.option.hmode">341</a></li> +<li><a name="option.hmode"></a><a href="#option.hmode">hmode</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.option.hmode">370</a></li> <li><a name="option.ilines"></a><a href="#option.ilines">ilines</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.ilines">229</a></li> <li><a name="option.index"></a><a href="#option.index">index</a> --> <a href="scrguien.pdf#maincls.option.index">135</a></li> -<li><a name="option.internalonly"></a><a href="#option.internalonly">internalonly</a> --> <a href="scrguien.pdf#scrbase.option.internalonly">247</a></li> +<li><a name="option.internalonly"></a><a href="#option.internalonly">internalonly</a> --> <a href="scrguien.pdf#scrbase.option.internalonly">264</a></li> +<li><a name="option.juratitlepagebreak"></a><a href="#option.juratitlepagebreak">juratitlepagebreak</a> --> <a href="scrguien.pdf#scrjura.option.juratitlepagebreak">248</a></li> +<li><a name="option.juratocindent"></a><a href="#option.juratocindent">juratocindent</a> --> <a href="scrguien.pdf#scrjura.option.juratocindent">245</a></li> +<li><a name="option.juratocnumberwidth"></a><a href="#option.juratocnumberwidth">juratocnumberwidth</a> --> <a href="scrguien.pdf#scrjura.option.juratocnumberwidth">245</a></li> +<li><a name="option.juratotoc"></a><a href="#option.juratotoc">juratotoc</a> --> <a href="scrguien.pdf#scrjura.option.juratotoc">245</a></li> <li><a name="option.komastyle"></a><a href="#option.komastyle">komastyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.komastyle">219</a></li> <li><a name="option.leqno"></a><a href="#option.leqno">leqno</a> --> <a href="scrguien.pdf#maincls.option.leqno">114</a></li> <li><a name="option.listof"></a><a href="#option.listof">listof</a> --> <a href="scrguien.pdf#maincls.option.listof">128</a></li> @@ -77,27 +83,29 @@ <li><a name="option.numbers"></a><a href="#option.numbers">numbers</a> --> <a href="scrguien.pdf#maincls.option.numbers">89</a></li> <li><a name="option.numericaldate"></a><a href="#option.numericaldate">numericaldate</a> --> <a href="scrguien.pdf#scrlttr2.option.numericaldate">179</a></li> <li><a name="option.olines"></a><a href="#option.olines">olines</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.olines">229</a></li> -<li><a name="option.onpsbackground"></a><a href="#option.onpsbackground">onpsbackground</a> --> <a href="scrguien.pdf#scrlayer.option.onpsbackground">323</a></li> -<li><a name="option.onpsevenpage"></a><a href="#option.onpsevenpage">onpsevenpage</a> --> <a href="scrguien.pdf#scrlayer.option.onpsevenpage">323</a></li> -<li><a name="option.onpsfloatpage"></a><a href="#option.onpsfloatpage">onpsfloatpage</a> --> <a href="scrguien.pdf#scrlayer.option.onpsfloatpage">323</a></li> -<li><a name="option.onpsforeground"></a><a href="#option.onpsforeground">onpsforeground</a> --> <a href="scrguien.pdf#scrlayer.option.onpsforeground">323</a></li> -<li><a name="option.onpsinit"></a><a href="#option.onpsinit">onpsinit</a> --> <a href="scrguien.pdf#scrlayer.option.onpsinit">323</a></li> -<li><a name="option.onpsnonfloatpage"></a><a href="#option.onpsnonfloatpage">onpsnonfloatpage</a> --> <a href="scrguien.pdf#scrlayer.option.onpsnonfloatpage">323</a></li> -<li><a name="option.onpsoddpage"></a><a href="#option.onpsoddpage">onpsoddpage</a> --> <a href="scrguien.pdf#scrlayer.option.onpsoddpage">323</a></li> -<li><a name="option.onpsoneside"></a><a href="#option.onpsoneside">onpsoneside</a> --> <a href="scrguien.pdf#scrlayer.option.onpsoneside">323</a></li> -<li><a name="option.onpsselect"></a><a href="#option.onpsselect">onpsselect</a> --> <a href="scrguien.pdf#scrlayer.option.onpsselect">323</a></li> -<li><a name="option.onpstwoside"></a><a href="#option.onpstwoside">onpstwoside</a> --> <a href="scrguien.pdf#scrlayer.option.onpstwoside">323</a></li> +<li><a name="option.onpsbackground"></a><a href="#option.onpsbackground">onpsbackground</a> --> <a href="scrguien.pdf#scrlayer.option.onpsbackground">352</a></li> +<li><a name="option.onpsevenpage"></a><a href="#option.onpsevenpage">onpsevenpage</a> --> <a href="scrguien.pdf#scrlayer.option.onpsevenpage">352</a></li> +<li><a name="option.onpsfloatpage"></a><a href="#option.onpsfloatpage">onpsfloatpage</a> --> <a href="scrguien.pdf#scrlayer.option.onpsfloatpage">352</a></li> +<li><a name="option.onpsforeground"></a><a href="#option.onpsforeground">onpsforeground</a> --> <a href="scrguien.pdf#scrlayer.option.onpsforeground">352</a></li> +<li><a name="option.onpsinit"></a><a href="#option.onpsinit">onpsinit</a> --> <a href="scrguien.pdf#scrlayer.option.onpsinit">352</a></li> +<li><a name="option.onpsnonfloatpage"></a><a href="#option.onpsnonfloatpage">onpsnonfloatpage</a> --> <a href="scrguien.pdf#scrlayer.option.onpsnonfloatpage">352</a></li> +<li><a name="option.onpsoddpage"></a><a href="#option.onpsoddpage">onpsoddpage</a> --> <a href="scrguien.pdf#scrlayer.option.onpsoddpage">352</a></li> +<li><a name="option.onpsoneside"></a><a href="#option.onpsoneside">onpsoneside</a> --> <a href="scrguien.pdf#scrlayer.option.onpsoneside">352</a></li> +<li><a name="option.onpsselect"></a><a href="#option.onpsselect">onpsselect</a> --> <a href="scrguien.pdf#scrlayer.option.onpsselect">352</a></li> +<li><a name="option.onpstwoside"></a><a href="#option.onpstwoside">onpstwoside</a> --> <a href="scrguien.pdf#scrlayer.option.onpstwoside">352</a></li> <li><a name="option.open"></a><a href="#option.open">open</a> --> <a href="scrguien.pdf#maincls.option.open">85</a></li> <li><a name="option.origlongtable"></a><a href="#option.origlongtable">origlongtable</a> --> <a href="scrguien.pdf#maincls.option.origlongtable">128</a></li> <li><a name="option.pagenumber"></a><a href="#option.pagenumber">pagenumber</a> --> <a href="scrguien.pdf#scrlttr2.option.pagenumber">189</a></li> <li><a name="option.pagesize"></a><a href="#option.pagesize">pagesize</a> --> <a href="scrguien.pdf#typearea.option.pagesize">45</a></li> <li><a name="option.paper"></a><a href="#option.paper">paper</a> --> <a href="scrguien.pdf#typearea.option.paper">44</a></li> +<li><a name="option.parnumber"></a><a href="#option.parnumber">parnumber</a> --> <a href="scrguien.pdf#scrjura.option.parnumber">249</a></li> <li><a name="option.parskip"></a><a href="#option.parskip">parskip</a> --> <a href="scrguien.pdf#maincls.option.parskip">70</a></li> <li><a name="option.plainfootbotline"></a><a href="#option.plainfootbotline">plainfootbotline</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.plainfootbotline">229</a></li> <li><a name="option.plainfootsepline"></a><a href="#option.plainfootsepline">plainfootsepline</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.plainfootsepline">229</a></li> <li><a name="option.plainheadsepline"></a><a href="#option.plainheadsepline">plainheadsepline</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.plainheadsepline">229</a></li> <li><a name="option.plainheadtopline"></a><a href="#option.plainheadtopline">plainheadtopline</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.plainheadtopline">229</a></li> <li><a name="option.priority"></a><a href="#option.priority">priority</a> --> <a href="scrguien.pdf#scrlttr2.option.priority">174</a></li> +<li><a name="option.ref"></a><a href="#option.ref">ref</a> --> <a href="scrguien.pdf#scrjura.option.ref">252</a></li> <li><a name="option.refline"></a><a href="#option.refline">refline</a> --> <a href="scrguien.pdf#scrlttr2.option.refline">179</a></li> <li><a name="option.sectionentrydots"></a><a href="#option.sectionentrydots">sectionentrydots</a> --> <a href="scrguien.pdf#maincls.option.sectionentrydots">68</a></li> <li><a name="option.standardstyle"></a><a href="#option.standardstyle">standardstyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage.option.standardstyle">219</a></li> @@ -108,218 +116,238 @@ <li><a name="option.twocolumn"></a><a href="#option.twocolumn">twocolumn</a> --> <a href="scrguien.pdf#typearea.option.twocolumn">38</a></li> <li><a name="option.twoside"></a><a href="#option.twoside">twoside</a> --> <a href="scrguien.pdf#typearea.option.twoside">37</a></li> <li><a name="option.version"></a><a href="#option.version">version</a> --> <a href="scrguien.pdf#typearea.option.version">29</a></li> -<li><a name="option.visualize"></a><a href="#option.visualize">visualize</a> --> <a href="scrguien.pdf#scrlttr2-experts.option.visualize">397</a></li> +<li><a name="option.visualize"></a><a href="#option.visualize">visualize</a> --> <a href="scrguien.pdf#scrlttr2-experts.option.visualize">426</a></li> </ul> <h2><a name="macro">Commands</a></h2> <ul> -<li><a name="cmd.@addtoplength"></a><a href="#cmd.@addtoplength">\@addtoplength</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.@addtoplength">383</a></li> -<li><a name="cmd.@fontsizefilebase"></a><a href="#cmd.@fontsizefilebase">\@fontsizefilebase</a> --> <a href="scrguien.pdf#maincls-experts.cmd.@fontsizefilebase">359</a></li> -<li><a name="cmd.@mkboth"></a><a href="#cmd.@mkboth">\@mkboth</a> --> <a href="scrguien.pdf#scrlayer.cmd.@mkboth">329</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.@mkboth">334</a></li> -<li><a name="cmd.@mkdouble"></a><a href="#cmd.@mkdouble">\@mkdouble</a> --> <a href="scrguien.pdf#scrlayer.cmd.@mkdouble">329</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.@mkdouble">334</a></li> -<li><a name="cmd.@mkleft"></a><a href="#cmd.@mkleft">\@mkleft</a> --> <a href="scrguien.pdf#scrlayer.cmd.@mkleft">329</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.@mkleft">334</a></li> -<li><a name="cmd.@mkright"></a><a href="#cmd.@mkright">\@mkright</a> --> <a href="scrguien.pdf#scrlayer.cmd.@mkright">329</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.@mkright">334</a></li> -<li><a name="cmd.@newplength"></a><a href="#cmd.@newplength">\@newplength</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.@newplength">383</a></li> -<li><a name="cmd.@openbib@code"></a><a href="#cmd.@openbib@code">\@openbib@code</a> --> <a href="scrguien.pdf#maincls-experts.cmd.@openbib@code">376</a></li> -<li><a name="cmd.@setplength"></a><a href="#cmd.@setplength">\@setplength</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.@setplength">383</a></li> -<li><a name="cmd.AddLayersAtBeginOfPageStyle"></a><a href="#cmd.AddLayersAtBeginOfPageStyle">\AddLayersAtBeginOfPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddLayersAtBeginOfPageStyle">324</a></li> -<li><a name="cmd.AddLayersAtEndOfPageStyle"></a><a href="#cmd.AddLayersAtEndOfPageStyle">\AddLayersAtEndOfPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddLayersAtEndOfPageStyle">324</a></li> -<li><a name="cmd.AddLayersToPageStyle"></a><a href="#cmd.AddLayersToPageStyle">\AddLayersToPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddLayersToPageStyle">324</a></li> -<li><a name="cmd.AddLayersToPageStyleAfterLayer"></a><a href="#cmd.AddLayersToPageStyleAfterLayer">\AddLayersToPageStyleAfterLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddLayersToPageStyleAfterLayer">325</a></li> -<li><a name="cmd.AddLayersToPageStyleBeforeLayer"></a><a href="#cmd.AddLayersToPageStyleBeforeLayer">\AddLayersToPageStyleBeforeLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddLayersToPageStyleBeforeLayer">325</a></li> -<li><a name="cmd.AddToLayerPageStyleOptions"></a><a href="#cmd.AddToLayerPageStyleOptions">\AddToLayerPageStyleOptions</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddToLayerPageStyleOptions">325</a></li> +<li><a name="cmd.@addtoplength"></a><a href="#cmd.@addtoplength">\@addtoplength</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.@addtoplength">412</a></li> +<li><a name="cmd.@fontsizefilebase"></a><a href="#cmd.@fontsizefilebase">\@fontsizefilebase</a> --> <a href="scrguien.pdf#maincls-experts.cmd.@fontsizefilebase">388</a></li> +<li><a name="cmd.@mkboth"></a><a href="#cmd.@mkboth">\@mkboth</a> --> <a href="scrguien.pdf#scrlayer.cmd.@mkboth">358</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.@mkboth">363</a></li> +<li><a name="cmd.@mkdouble"></a><a href="#cmd.@mkdouble">\@mkdouble</a> --> <a href="scrguien.pdf#scrlayer.cmd.@mkdouble">358</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.@mkdouble">363</a></li> +<li><a name="cmd.@mkleft"></a><a href="#cmd.@mkleft">\@mkleft</a> --> <a href="scrguien.pdf#scrlayer.cmd.@mkleft">358</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.@mkleft">363</a></li> +<li><a name="cmd.@mkright"></a><a href="#cmd.@mkright">\@mkright</a> --> <a href="scrguien.pdf#scrlayer.cmd.@mkright">358</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.@mkright">363</a></li> +<li><a name="cmd.@newplength"></a><a href="#cmd.@newplength">\@newplength</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.@newplength">412</a></li> +<li><a name="cmd.@openbib@code"></a><a href="#cmd.@openbib@code">\@openbib@code</a> --> <a href="scrguien.pdf#maincls-experts.cmd.@openbib@code">406</a></li> +<li><a name="cmd.@setplength"></a><a href="#cmd.@setplength">\@setplength</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.@setplength">412</a></li> +<li><a name="cmd.AddLayersAtBeginOfPageStyle"></a><a href="#cmd.AddLayersAtBeginOfPageStyle">\AddLayersAtBeginOfPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddLayersAtBeginOfPageStyle">353</a></li> +<li><a name="cmd.AddLayersAtEndOfPageStyle"></a><a href="#cmd.AddLayersAtEndOfPageStyle">\AddLayersAtEndOfPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddLayersAtEndOfPageStyle">353</a></li> +<li><a name="cmd.AddLayersToPageStyle"></a><a href="#cmd.AddLayersToPageStyle">\AddLayersToPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddLayersToPageStyle">353</a></li> +<li><a name="cmd.AddLayersToPageStyleAfterLayer"></a><a href="#cmd.AddLayersToPageStyleAfterLayer">\AddLayersToPageStyleAfterLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddLayersToPageStyleAfterLayer">354</a></li> +<li><a name="cmd.AddLayersToPageStyleBeforeLayer"></a><a href="#cmd.AddLayersToPageStyleBeforeLayer">\AddLayersToPageStyleBeforeLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddLayersToPageStyleBeforeLayer">354</a></li> +<li><a name="cmd.AddToLayerPageStyleOptions"></a><a href="#cmd.AddToLayerPageStyleOptions">\AddToLayerPageStyleOptions</a> --> <a href="scrguien.pdf#scrlayer.cmd.AddToLayerPageStyleOptions">354</a></li> <li><a name="cmd.Address"></a><a href="#cmd.Address">\Address</a> --> <a href="scrguien.pdf#scraddr.cmd.Address">237</a></li> -<li><a name="cmd.AfterAtEndOfClass"></a><a href="#cmd.AfterAtEndOfClass">\AfterAtEndOfClass</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterAtEndOfClass">271</a></li> -<li><a name="cmd.AfterAtEndOfPackage"></a><a href="#cmd.AfterAtEndOfPackage">\AfterAtEndOfPackage</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterAtEndOfPackage">271</a></li> +<li><a name="cmd.AfterAtEndOfClass"></a><a href="#cmd.AfterAtEndOfClass">\AfterAtEndOfClass</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterAtEndOfClass">288</a></li> +<li><a name="cmd.AfterAtEndOfPackage"></a><a href="#cmd.AfterAtEndOfPackage">\AfterAtEndOfPackage</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterAtEndOfPackage">288</a></li> <li><a name="cmd.AfterBibliographyPreamble"></a><a href="#cmd.AfterBibliographyPreamble">\AfterBibliographyPreamble</a> --> <a href="scrguien.pdf#maincls.cmd.AfterBibliographyPreamble">135</a></li> -<li><a name="cmd.AfterCalculatingTypearea"></a><a href="#cmd.AfterCalculatingTypearea">\AfterCalculatingTypearea</a> --> <a href="scrguien.pdf#typearea-experts.cmd.AfterCalculatingTypearea">355</a></li> -<li><a name="cmd.AfterClass!"></a><a href="#cmd.AfterClass!">\AfterClass!</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterClass!">271</a></li> -<li><a name="cmd.AfterClass*"></a><a href="#cmd.AfterClass*">\AfterClass*</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterClass*">271</a></li> -<li><a name="cmd.AfterClass+"></a><a href="#cmd.AfterClass+">\AfterClass+</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterClass+">271</a></li> -<li><a name="cmd.AfterClass"></a><a href="#cmd.AfterClass">\AfterClass</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterClass">271</a></li> -<li><a name="cmd.AfterFile"></a><a href="#cmd.AfterFile">\AfterFile</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterFile">270</a></li> -<li><a name="cmd.AfterPackage!"></a><a href="#cmd.AfterPackage!">\AfterPackage!</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterPackage!">271</a></li> -<li><a name="cmd.AfterPackage*"></a><a href="#cmd.AfterPackage*">\AfterPackage*</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterPackage*">271</a></li> -<li><a name="cmd.AfterPackage+"></a><a href="#cmd.AfterPackage+">\AfterPackage+</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterPackage+">271</a></li> -<li><a name="cmd.AfterPackage"></a><a href="#cmd.AfterPackage">\AfterPackage</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterPackage">271</a></li> -<li><a name="cmd.AfterReadingMainAux"></a><a href="#cmd.AfterReadingMainAux">\AfterReadingMainAux</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterReadingMainAux">273</a></li> -<li><a name="cmd.AfterRestoreareas*"></a><a href="#cmd.AfterRestoreareas*">\AfterRestoreareas*</a> --> <a href="scrguien.pdf#typearea-experts.cmd.AfterRestoreareas*">354</a></li> -<li><a name="cmd.AfterRestoreareas"></a><a href="#cmd.AfterRestoreareas">\AfterRestoreareas</a> --> <a href="scrguien.pdf#typearea-experts.cmd.AfterRestoreareas">354</a></li> -<li><a name="cmd.AfterSelectAnyPageStyle"></a><a href="#cmd.AfterSelectAnyPageStyle">\AfterSelectAnyPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.AfterSelectAnyPageStyle">320</a></li> -<li><a name="cmd.AfterStartingTOC"></a><a href="#cmd.AfterStartingTOC">\AfterStartingTOC</a> --> <a href="scrguien.pdf#tocbasic.cmd.AfterStartingTOC">290</a></li> -<li><a name="cmd.AfterTOCHead"></a><a href="#cmd.AfterTOCHead">\AfterTOCHead</a> --> <a href="scrguien.pdf#tocbasic.cmd.AfterTOCHead">291</a></li> -<li><a name="cmd.At@startsection"></a><a href="#cmd.At@startsection">\At@startsection</a> --> <a href="scrguien.pdf#maincls-experts.cmd.At@startsection">375</a></li> -<li><a name="cmd.AtAddToTocList"></a><a href="#cmd.AtAddToTocList">\AtAddToTocList</a> --> <a href="scrguien.pdf#tocbasic.cmd.AtAddToTocList">286</a></li> +<li><a name="cmd.AfterCalculatingTypearea"></a><a href="#cmd.AfterCalculatingTypearea">\AfterCalculatingTypearea</a> --> <a href="scrguien.pdf#typearea-experts.cmd.AfterCalculatingTypearea">384</a></li> +<li><a name="cmd.AfterClass!"></a><a href="#cmd.AfterClass!">\AfterClass!</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterClass!">288</a></li> +<li><a name="cmd.AfterClass*"></a><a href="#cmd.AfterClass*">\AfterClass*</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterClass*">288</a></li> +<li><a name="cmd.AfterClass+"></a><a href="#cmd.AfterClass+">\AfterClass+</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterClass+">288</a></li> +<li><a name="cmd.AfterClass"></a><a href="#cmd.AfterClass">\AfterClass</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterClass">288</a></li> +<li><a name="cmd.AfterFile"></a><a href="#cmd.AfterFile">\AfterFile</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterFile">287</a></li> +<li><a name="cmd.AfterPackage!"></a><a href="#cmd.AfterPackage!">\AfterPackage!</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterPackage!">288</a></li> +<li><a name="cmd.AfterPackage*"></a><a href="#cmd.AfterPackage*">\AfterPackage*</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterPackage*">288</a></li> +<li><a name="cmd.AfterPackage+"></a><a href="#cmd.AfterPackage+">\AfterPackage+</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterPackage+">288</a></li> +<li><a name="cmd.AfterPackage"></a><a href="#cmd.AfterPackage">\AfterPackage</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterPackage">288</a></li> +<li><a name="cmd.AfterReadingMainAux"></a><a href="#cmd.AfterReadingMainAux">\AfterReadingMainAux</a> --> <a href="scrguien.pdf#scrlfile.cmd.AfterReadingMainAux">290</a></li> +<li><a name="cmd.AfterRestoreareas*"></a><a href="#cmd.AfterRestoreareas*">\AfterRestoreareas*</a> --> <a href="scrguien.pdf#typearea-experts.cmd.AfterRestoreareas*">383</a></li> +<li><a name="cmd.AfterRestoreareas"></a><a href="#cmd.AfterRestoreareas">\AfterRestoreareas</a> --> <a href="scrguien.pdf#typearea-experts.cmd.AfterRestoreareas">383</a></li> +<li><a name="cmd.AfterSelectAnyPageStyle"></a><a href="#cmd.AfterSelectAnyPageStyle">\AfterSelectAnyPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.AfterSelectAnyPageStyle">349</a></li> +<li><a name="cmd.AfterStartingTOC"></a><a href="#cmd.AfterStartingTOC">\AfterStartingTOC</a> --> <a href="scrguien.pdf#tocbasic.cmd.AfterStartingTOC">307</a></li> +<li><a name="cmd.AfterTOCHead"></a><a href="#cmd.AfterTOCHead">\AfterTOCHead</a> --> <a href="scrguien.pdf#tocbasic.cmd.AfterTOCHead">308</a></li> +<li><a name="cmd.At@startsection"></a><a href="#cmd.At@startsection">\At@startsection</a> --> <a href="scrguien.pdf#maincls-experts.cmd.At@startsection">404</a></li> +<li><a name="cmd.AtAddToTocList"></a><a href="#cmd.AtAddToTocList">\AtAddToTocList</a> --> <a href="scrguien.pdf#tocbasic.cmd.AtAddToTocList">303</a></li> <li><a name="cmd.AtBeginLetter"></a><a href="#cmd.AtBeginLetter">\AtBeginLetter</a> --> <a href="scrguien.pdf#scrlttr2.cmd.AtBeginLetter">146</a></li> <li><a name="cmd.AtEndBibliography"></a><a href="#cmd.AtEndBibliography">\AtEndBibliography</a> --> <a href="scrguien.pdf#maincls.cmd.AtEndBibliography">135</a></li> <li><a name="cmd.AtEndLetter"></a><a href="#cmd.AtEndLetter">\AtEndLetter</a> --> <a href="scrguien.pdf#scrlttr2.cmd.AtEndLetter">146</a></li> -<li><a name="cmd.AtEndOfFamilyOptions"></a><a href="#cmd.AtEndOfFamilyOptions">\AtEndOfFamilyOptions</a> --> <a href="scrguien.pdf#scrbase.cmd.AtEndOfFamilyOptions">254</a></li> -<li><a name="cmd.Before@sect"></a><a href="#cmd.Before@sect">\Before@sect</a> --> <a href="scrguien.pdf#maincls-experts.cmd.Before@sect">375</a></li> -<li><a name="cmd.Before@ssect"></a><a href="#cmd.Before@ssect">\Before@ssect</a> --> <a href="scrguien.pdf#maincls-experts.cmd.Before@ssect">375</a></li> -<li><a name="cmd.BeforeClass"></a><a href="#cmd.BeforeClass">\BeforeClass</a> --> <a href="scrguien.pdf#scrlfile.cmd.BeforeClass">270</a></li> -<li><a name="cmd.BeforeClosingMainAux"></a><a href="#cmd.BeforeClosingMainAux">\BeforeClosingMainAux</a> --> <a href="scrguien.pdf#scrlfile.cmd.BeforeClosingMainAux">273</a></li> -<li><a name="cmd.BeforeFamilyProcessOptions"></a><a href="#cmd.BeforeFamilyProcessOptions">\BeforeFamilyProcessOptions</a> --> <a href="scrguien.pdf#scrbase.cmd.BeforeFamilyProcessOptions">251</a></li> -<li><a name="cmd.BeforeFile"></a><a href="#cmd.BeforeFile">\BeforeFile</a> --> <a href="scrguien.pdf#scrlfile.cmd.BeforeFile">270</a></li> -<li><a name="cmd.BeforePackage"></a><a href="#cmd.BeforePackage">\BeforePackage</a> --> <a href="scrguien.pdf#scrlfile.cmd.BeforePackage">270</a></li> -<li><a name="cmd.BeforeRestoreareas*"></a><a href="#cmd.BeforeRestoreareas*">\BeforeRestoreareas*</a> --> <a href="scrguien.pdf#typearea-experts.cmd.BeforeRestoreareas*">354</a></li> -<li><a name="cmd.BeforeRestoreareas"></a><a href="#cmd.BeforeRestoreareas">\BeforeRestoreareas</a> --> <a href="scrguien.pdf#typearea-experts.cmd.BeforeRestoreareas">354</a></li> -<li><a name="cmd.BeforeSelectAnyPageStyle"></a><a href="#cmd.BeforeSelectAnyPageStyle">\BeforeSelectAnyPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.BeforeSelectAnyPageStyle">320</a></li> -<li><a name="cmd.BeforeStartingTOC"></a><a href="#cmd.BeforeStartingTOC">\BeforeStartingTOC</a> --> <a href="scrguien.pdf#tocbasic.cmd.BeforeStartingTOC">290</a></li> -<li><a name="cmd.BeforeTOCHead"></a><a href="#cmd.BeforeTOCHead">\BeforeTOCHead</a> --> <a href="scrguien.pdf#tocbasic.cmd.BeforeTOCHead">291</a></li> +<li><a name="cmd.AtEndOfFamilyOptions"></a><a href="#cmd.AtEndOfFamilyOptions">\AtEndOfFamilyOptions</a> --> <a href="scrguien.pdf#scrbase.cmd.AtEndOfFamilyOptions">271</a></li> +<li><a name="cmd.Before@sect"></a><a href="#cmd.Before@sect">\Before@sect</a> --> <a href="scrguien.pdf#maincls-experts.cmd.Before@sect">404</a></li> +<li><a name="cmd.Before@ssect"></a><a href="#cmd.Before@ssect">\Before@ssect</a> --> <a href="scrguien.pdf#maincls-experts.cmd.Before@ssect">404</a></li> +<li><a name="cmd.BeforeClass"></a><a href="#cmd.BeforeClass">\BeforeClass</a> --> <a href="scrguien.pdf#scrlfile.cmd.BeforeClass">287</a></li> +<li><a name="cmd.BeforeClosingMainAux"></a><a href="#cmd.BeforeClosingMainAux">\BeforeClosingMainAux</a> --> <a href="scrguien.pdf#scrlfile.cmd.BeforeClosingMainAux">290</a></li> +<li><a name="cmd.BeforeFamilyProcessOptions"></a><a href="#cmd.BeforeFamilyProcessOptions">\BeforeFamilyProcessOptions</a> --> <a href="scrguien.pdf#scrbase.cmd.BeforeFamilyProcessOptions">268</a></li> +<li><a name="cmd.BeforeFile"></a><a href="#cmd.BeforeFile">\BeforeFile</a> --> <a href="scrguien.pdf#scrlfile.cmd.BeforeFile">287</a></li> +<li><a name="cmd.BeforePackage"></a><a href="#cmd.BeforePackage">\BeforePackage</a> --> <a href="scrguien.pdf#scrlfile.cmd.BeforePackage">287</a></li> +<li><a name="cmd.BeforeRestoreareas*"></a><a href="#cmd.BeforeRestoreareas*">\BeforeRestoreareas*</a> --> <a href="scrguien.pdf#typearea-experts.cmd.BeforeRestoreareas*">383</a></li> +<li><a name="cmd.BeforeRestoreareas"></a><a href="#cmd.BeforeRestoreareas">\BeforeRestoreareas</a> --> <a href="scrguien.pdf#typearea-experts.cmd.BeforeRestoreareas">383</a></li> +<li><a name="cmd.BeforeSelectAnyPageStyle"></a><a href="#cmd.BeforeSelectAnyPageStyle">\BeforeSelectAnyPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.BeforeSelectAnyPageStyle">349</a></li> +<li><a name="cmd.BeforeStartingTOC"></a><a href="#cmd.BeforeStartingTOC">\BeforeStartingTOC</a> --> <a href="scrguien.pdf#tocbasic.cmd.BeforeStartingTOC">307</a></li> +<li><a name="cmd.BeforeTOCHead"></a><a href="#cmd.BeforeTOCHead">\BeforeTOCHead</a> --> <a href="scrguien.pdf#tocbasic.cmd.BeforeTOCHead">308</a></li> <li><a name="cmd.BreakBibliography"></a><a href="#cmd.BreakBibliography">\BreakBibliography</a> --> <a href="scrguien.pdf#maincls.cmd.BreakBibliography">135</a></li> -<li><a name="cmd.ClassName"></a><a href="#cmd.ClassName">\ClassName</a> --> <a href="scrguien.pdf#maincls-experts.cmd.ClassName">357</a></li> +<li><a name="cmd.ClassName"></a><a href="#cmd.ClassName">\ClassName</a> --> <a href="scrguien.pdf#maincls-experts.cmd.ClassName">386</a></li> +<li><a name="cmd.Clause"></a><a href="#cmd.Clause">\Clause</a> --> <a href="scrguien.pdf#scrjura.cmd.Clause">246</a></li> +<li><a name="cmd.Clauseformat"></a><a href="#cmd.Clauseformat">\Clauseformat</a> --> <a href="scrguien.pdf#scrjura.cmd.Clauseformat">248</a></li> +<li><a name="cmd.CloneTOCEntryStyle"></a><a href="#cmd.CloneTOCEntryStyle">\CloneTOCEntryStyle</a> --> <a href="scrguien.pdf#tocbasic.cmd.CloneTOCEntryStyle">320</a></li> <li><a name="cmd.Comment"></a><a href="#cmd.Comment">\Comment</a> --> <a href="scrguien.pdf#scraddr.cmd.Comment">237</a></li> -<li><a name="cmd.DeclareLayer"></a><a href="#cmd.DeclareLayer">\DeclareLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclareLayer">309</a></li> -<li><a name="cmd.DeclareNewLayer"></a><a href="#cmd.DeclareNewLayer">\DeclareNewLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclareNewLayer">309</a></li> -<li><a name="cmd.DeclareNewNoteColumn"></a><a href="#cmd.DeclareNewNoteColumn">\DeclareNewNoteColumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.DeclareNewNoteColumn">344</a></li> -<li><a name="cmd.DeclareNewPageStyleAlias"></a><a href="#cmd.DeclareNewPageStyleAlias">\DeclareNewPageStyleAlias</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclareNewPageStyleAlias">320</a></li> -<li><a name="cmd.DeclareNewPageStyleByLayers"></a><a href="#cmd.DeclareNewPageStyleByLayers">\DeclareNewPageStyleByLayers</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclareNewPageStyleByLayers">321</a></li> -<li><a name="cmd.DeclareNewSectionCommand"></a><a href="#cmd.DeclareNewSectionCommand">\DeclareNewSectionCommand</a> --> <a href="scrguien.pdf#maincls-experts.cmd.DeclareNewSectionCommand">361</a></li> -<li><a name="cmd.DeclareNewSectionCommands"></a><a href="#cmd.DeclareNewSectionCommands">\DeclareNewSectionCommands</a> --> <a href="scrguien.pdf#maincls-experts.cmd.DeclareNewSectionCommands">369</a></li> -<li><a name="cmd.DeclareNewTOC"></a><a href="#cmd.DeclareNewTOC">\DeclareNewTOC</a> --> <a href="scrguien.pdf#tocbasic.cmd.DeclareNewTOC">298</a></li> -<li><a name="cmd.DeclareNoteColumn"></a><a href="#cmd.DeclareNoteColumn">\DeclareNoteColumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.DeclareNoteColumn">344</a></li> -<li><a name="cmd.DeclarePageStyleAlias"></a><a href="#cmd.DeclarePageStyleAlias">\DeclarePageStyleAlias</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclarePageStyleAlias">320</a></li> -<li><a name="cmd.DeclarePageStyleByLayers"></a><a href="#cmd.DeclarePageStyleByLayers">\DeclarePageStyleByLayers</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclarePageStyleByLayers">321</a></li> -<li><a name="cmd.DeclareSectionCommand"></a><a href="#cmd.DeclareSectionCommand">\DeclareSectionCommand</a> --> <a href="scrguien.pdf#maincls-experts.cmd.DeclareSectionCommand">361</a></li> -<li><a name="cmd.DeclareSectionCommands"></a><a href="#cmd.DeclareSectionCommands">\DeclareSectionCommands</a> --> <a href="scrguien.pdf#maincls-experts.cmd.DeclareSectionCommands">369</a></li> -<li><a name="cmd.DeclareSectionNumberDepth"></a><a href="#cmd.DeclareSectionNumberDepth">\DeclareSectionNumberDepth</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclareSectionNumberDepth">307</a></li> -<li><a name="cmd.DefineFamily"></a><a href="#cmd.DefineFamily">\DefineFamily</a> --> <a href="scrguien.pdf#scrbase.cmd.DefineFamily">248</a></li> -<li><a name="cmd.DefineFamilyKey"></a><a href="#cmd.DefineFamilyKey">\DefineFamilyKey</a> --> <a href="scrguien.pdf#scrbase.cmd.DefineFamilyKey">249</a></li> -<li><a name="cmd.DefineFamilyMember"></a><a href="#cmd.DefineFamilyMember">\DefineFamilyMember</a> --> <a href="scrguien.pdf#scrbase.cmd.DefineFamilyMember">248</a></li> -<li><a name="cmd.DestroyLayer"></a><a href="#cmd.DestroyLayer">\DestroyLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.DestroyLayer">318</a></li> -<li><a name="cmd.DestroyPageStyleAlias"></a><a href="#cmd.DestroyPageStyleAlias">\DestroyPageStyleAlias</a> --> <a href="scrguien.pdf#scrlayer.cmd.DestroyPageStyleAlias">320</a></li> -<li><a name="cmd.DestroyRealLayerPageStyle"></a><a href="#cmd.DestroyRealLayerPageStyle">\DestroyRealLayerPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.DestroyRealLayerPageStyle">326</a></li> -<li><a name="cmd.FamilyBoolKey"></a><a href="#cmd.FamilyBoolKey">\FamilyBoolKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyBoolKey">254</a></li> -<li><a name="cmd.FamilyCounterKey"></a><a href="#cmd.FamilyCounterKey">\FamilyCounterKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyCounterKey">256</a></li> -<li><a name="cmd.FamilyCounterMacroKey"></a><a href="#cmd.FamilyCounterMacroKey">\FamilyCounterMacroKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyCounterMacroKey">257</a></li> -<li><a name="cmd.FamilyElseValues"></a><a href="#cmd.FamilyElseValues">\FamilyElseValues</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyElseValues">258</a></li> -<li><a name="cmd.FamilyExecuteOptions"></a><a href="#cmd.FamilyExecuteOptions">\FamilyExecuteOptions</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyExecuteOptions">251</a></li> -<li><a name="cmd.FamilyKeyState"></a><a href="#cmd.FamilyKeyState">\FamilyKeyState</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyKeyState">249</a></li> -<li><a name="cmd.FamilyKeyStateNeedValue"></a><a href="#cmd.FamilyKeyStateNeedValue">\FamilyKeyStateNeedValue</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyKeyStateNeedValue">249</a></li> -<li><a name="cmd.FamilyKeyStateProcessed"></a><a href="#cmd.FamilyKeyStateProcessed">\FamilyKeyStateProcessed</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyKeyStateProcessed">249</a></li> -<li><a name="cmd.FamilyKeyStateUnknown"></a><a href="#cmd.FamilyKeyStateUnknown">\FamilyKeyStateUnknown</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyKeyStateUnknown">249</a></li> -<li><a name="cmd.FamilyKeyStateUnknownValue"></a><a href="#cmd.FamilyKeyStateUnknownValue">\FamilyKeyStateUnknownValue</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyKeyStateUnknownValue">249</a></li> -<li><a name="cmd.FamilyLengthKey"></a><a href="#cmd.FamilyLengthKey">\FamilyLengthKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyLengthKey">257</a></li> -<li><a name="cmd.FamilyLengthMacroKey"></a><a href="#cmd.FamilyLengthMacroKey">\FamilyLengthMacroKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyLengthMacroKey">257</a></li> -<li><a name="cmd.FamilyNumericalKey"></a><a href="#cmd.FamilyNumericalKey">\FamilyNumericalKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyNumericalKey">255</a></li> -<li><a name="cmd.FamilyOption"></a><a href="#cmd.FamilyOption">\FamilyOption</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyOption">253</a></li> -<li><a name="cmd.FamilyOptions"></a><a href="#cmd.FamilyOptions">\FamilyOptions</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyOptions">252</a></li> -<li><a name="cmd.FamilyProcessOptions"></a><a href="#cmd.FamilyProcessOptions">\FamilyProcessOptions</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyProcessOptions">250</a></li> -<li><a name="cmd.FamilySetBool"></a><a href="#cmd.FamilySetBool">\FamilySetBool</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetBool">254</a></li> -<li><a name="cmd.FamilySetCounter"></a><a href="#cmd.FamilySetCounter">\FamilySetCounter</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetCounter">256</a></li> -<li><a name="cmd.FamilySetCounterMacro"></a><a href="#cmd.FamilySetCounterMacro">\FamilySetCounterMacro</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetCounterMacro">257</a></li> -<li><a name="cmd.FamilySetLength"></a><a href="#cmd.FamilySetLength">\FamilySetLength</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetLength">257</a></li> -<li><a name="cmd.FamilySetLengthMacro"></a><a href="#cmd.FamilySetLengthMacro">\FamilySetLengthMacro</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetLengthMacro">257</a></li> -<li><a name="cmd.FamilySetNumerical"></a><a href="#cmd.FamilySetNumerical">\FamilySetNumerical</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetNumerical">255</a></li> -<li><a name="cmd.FamilyStringKey"></a><a href="#cmd.FamilyStringKey">\FamilyStringKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyStringKey">257</a></li> -<li><a name="cmd.FamilyUnkownKeyValue"></a><a href="#cmd.FamilyUnkownKeyValue">\FamilyUnkownKeyValue</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyUnkownKeyValue">258</a></li> +<li><a name="cmd.DeclareLayer"></a><a href="#cmd.DeclareLayer">\DeclareLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclareLayer">338</a></li> +<li><a name="cmd.DeclareNewJuraEnvironment"></a><a href="#cmd.DeclareNewJuraEnvironment">\DeclareNewJuraEnvironment</a> --> <a href="scrguien.pdf#scrjura.cmd.DeclareNewJuraEnvironment">254</a></li> +<li><a name="cmd.DeclareNewLayer"></a><a href="#cmd.DeclareNewLayer">\DeclareNewLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclareNewLayer">338</a></li> +<li><a name="cmd.DeclareNewNoteColumn"></a><a href="#cmd.DeclareNewNoteColumn">\DeclareNewNoteColumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.DeclareNewNoteColumn">373</a></li> +<li><a name="cmd.DeclareNewPageStyleAlias"></a><a href="#cmd.DeclareNewPageStyleAlias">\DeclareNewPageStyleAlias</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclareNewPageStyleAlias">349</a></li> +<li><a name="cmd.DeclareNewPageStyleByLayers"></a><a href="#cmd.DeclareNewPageStyleByLayers">\DeclareNewPageStyleByLayers</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclareNewPageStyleByLayers">350</a></li> +<li><a name="cmd.DeclareNewSectionCommand"></a><a href="#cmd.DeclareNewSectionCommand">\DeclareNewSectionCommand</a> --> <a href="scrguien.pdf#maincls-experts.cmd.DeclareNewSectionCommand">390</a></li> +<li><a name="cmd.DeclareNewSectionCommands"></a><a href="#cmd.DeclareNewSectionCommands">\DeclareNewSectionCommands</a> --> <a href="scrguien.pdf#maincls-experts.cmd.DeclareNewSectionCommands">399</a></li> +<li><a name="cmd.DeclareNewTOC"></a><a href="#cmd.DeclareNewTOC">\DeclareNewTOC</a> --> <a href="scrguien.pdf#tocbasic.cmd.DeclareNewTOC">327</a></li> +<li><a name="cmd.DeclareNoteColumn"></a><a href="#cmd.DeclareNoteColumn">\DeclareNoteColumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.DeclareNoteColumn">373</a></li> +<li><a name="cmd.DeclarePageStyleAlias"></a><a href="#cmd.DeclarePageStyleAlias">\DeclarePageStyleAlias</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclarePageStyleAlias">349</a></li> +<li><a name="cmd.DeclarePageStyleByLayers"></a><a href="#cmd.DeclarePageStyleByLayers">\DeclarePageStyleByLayers</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclarePageStyleByLayers">350</a></li> +<li><a name="cmd.DeclareSectionCommand"></a><a href="#cmd.DeclareSectionCommand">\DeclareSectionCommand</a> --> <a href="scrguien.pdf#maincls-experts.cmd.DeclareSectionCommand">390</a></li> +<li><a name="cmd.DeclareSectionCommands"></a><a href="#cmd.DeclareSectionCommands">\DeclareSectionCommands</a> --> <a href="scrguien.pdf#maincls-experts.cmd.DeclareSectionCommands">399</a></li> +<li><a name="cmd.DeclareSectionNumberDepth"></a><a href="#cmd.DeclareSectionNumberDepth">\DeclareSectionNumberDepth</a> --> <a href="scrguien.pdf#scrlayer.cmd.DeclareSectionNumberDepth">336</a></li> +<li><a name="cmd.DeclareTOCEntryStyle"></a><a href="#cmd.DeclareTOCEntryStyle">\DeclareTOCEntryStyle</a> --> <a href="scrguien.pdf#tocbasic.cmd.DeclareTOCEntryStyle">319</a></li> +<li><a name="cmd.DeclareTOCStyleEntry"></a><a href="#cmd.DeclareTOCStyleEntry">\DeclareTOCStyleEntry</a> --> <a href="scrguien.pdf#tocbasic.cmd.DeclareTOCStyleEntry">312</a></li> +<li><a name="cmd.DefineFamily"></a><a href="#cmd.DefineFamily">\DefineFamily</a> --> <a href="scrguien.pdf#scrbase.cmd.DefineFamily">265</a></li> +<li><a name="cmd.DefineFamilyKey"></a><a href="#cmd.DefineFamilyKey">\DefineFamilyKey</a> --> <a href="scrguien.pdf#scrbase.cmd.DefineFamilyKey">266</a></li> +<li><a name="cmd.DefineFamilyMember"></a><a href="#cmd.DefineFamilyMember">\DefineFamilyMember</a> --> <a href="scrguien.pdf#scrbase.cmd.DefineFamilyMember">265</a></li> +<li><a name="cmd.DefineTOCEntryBooleanOption"></a><a href="#cmd.DefineTOCEntryBooleanOption">\DefineTOCEntryBooleanOption</a> --> <a href="scrguien.pdf#tocbasic.cmd.DefineTOCEntryBooleanOption">319</a></li> +<li><a name="cmd.DefineTOCEntryCommandOption"></a><a href="#cmd.DefineTOCEntryCommandOption">\DefineTOCEntryCommandOption</a> --> <a href="scrguien.pdf#tocbasic.cmd.DefineTOCEntryCommandOption">319</a></li> +<li><a name="cmd.DefineTOCEntryIfOption"></a><a href="#cmd.DefineTOCEntryIfOption">\DefineTOCEntryIfOption</a> --> <a href="scrguien.pdf#tocbasic.cmd.DefineTOCEntryIfOption">319</a></li> +<li><a name="cmd.DefineTOCEntryLengthOption"></a><a href="#cmd.DefineTOCEntryLengthOption">\DefineTOCEntryLengthOption</a> --> <a href="scrguien.pdf#tocbasic.cmd.DefineTOCEntryLengthOption">319</a></li> +<li><a name="cmd.DefineTOCEntryNumberOption"></a><a href="#cmd.DefineTOCEntryNumberOption">\DefineTOCEntryNumberOption</a> --> <a href="scrguien.pdf#tocbasic.cmd.DefineTOCEntryNumberOption">319</a></li> +<li><a name="cmd.DefineTOCEntryOption"></a><a href="#cmd.DefineTOCEntryOption">\DefineTOCEntryOption</a> --> <a href="scrguien.pdf#tocbasic.cmd.DefineTOCEntryOption">319</a></li> +<li><a name="cmd.DestroyLayer"></a><a href="#cmd.DestroyLayer">\DestroyLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.DestroyLayer">347</a></li> +<li><a name="cmd.DestroyPageStyleAlias"></a><a href="#cmd.DestroyPageStyleAlias">\DestroyPageStyleAlias</a> --> <a href="scrguien.pdf#scrlayer.cmd.DestroyPageStyleAlias">349</a></li> +<li><a name="cmd.DestroyRealLayerPageStyle"></a><a href="#cmd.DestroyRealLayerPageStyle">\DestroyRealLayerPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.DestroyRealLayerPageStyle">355</a></li> +<li><a name="cmd.FamilyBoolKey"></a><a href="#cmd.FamilyBoolKey">\FamilyBoolKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyBoolKey">271</a></li> +<li><a name="cmd.FamilyCounterKey"></a><a href="#cmd.FamilyCounterKey">\FamilyCounterKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyCounterKey">274</a></li> +<li><a name="cmd.FamilyCounterMacroKey"></a><a href="#cmd.FamilyCounterMacroKey">\FamilyCounterMacroKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyCounterMacroKey">274</a></li> +<li><a name="cmd.FamilyElseValues"></a><a href="#cmd.FamilyElseValues">\FamilyElseValues</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyElseValues">275</a></li> +<li><a name="cmd.FamilyExecuteOptions"></a><a href="#cmd.FamilyExecuteOptions">\FamilyExecuteOptions</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyExecuteOptions">268</a></li> +<li><a name="cmd.FamilyKeyState"></a><a href="#cmd.FamilyKeyState">\FamilyKeyState</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyKeyState">266</a></li> +<li><a name="cmd.FamilyKeyStateNeedValue"></a><a href="#cmd.FamilyKeyStateNeedValue">\FamilyKeyStateNeedValue</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyKeyStateNeedValue">266</a></li> +<li><a name="cmd.FamilyKeyStateProcessed"></a><a href="#cmd.FamilyKeyStateProcessed">\FamilyKeyStateProcessed</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyKeyStateProcessed">266</a></li> +<li><a name="cmd.FamilyKeyStateUnknown"></a><a href="#cmd.FamilyKeyStateUnknown">\FamilyKeyStateUnknown</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyKeyStateUnknown">266</a></li> +<li><a name="cmd.FamilyKeyStateUnknownValue"></a><a href="#cmd.FamilyKeyStateUnknownValue">\FamilyKeyStateUnknownValue</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyKeyStateUnknownValue">266</a></li> +<li><a name="cmd.FamilyLengthKey"></a><a href="#cmd.FamilyLengthKey">\FamilyLengthKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyLengthKey">274</a></li> +<li><a name="cmd.FamilyLengthMacroKey"></a><a href="#cmd.FamilyLengthMacroKey">\FamilyLengthMacroKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyLengthMacroKey">274</a></li> +<li><a name="cmd.FamilyNumericalKey"></a><a href="#cmd.FamilyNumericalKey">\FamilyNumericalKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyNumericalKey">272</a></li> +<li><a name="cmd.FamilyOption"></a><a href="#cmd.FamilyOption">\FamilyOption</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyOption">270</a></li> +<li><a name="cmd.FamilyOptions"></a><a href="#cmd.FamilyOptions">\FamilyOptions</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyOptions">269</a></li> +<li><a name="cmd.FamilyProcessOptions"></a><a href="#cmd.FamilyProcessOptions">\FamilyProcessOptions</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyProcessOptions">267</a></li> +<li><a name="cmd.FamilySetBool"></a><a href="#cmd.FamilySetBool">\FamilySetBool</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetBool">271</a></li> +<li><a name="cmd.FamilySetCounter"></a><a href="#cmd.FamilySetCounter">\FamilySetCounter</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetCounter">274</a></li> +<li><a name="cmd.FamilySetCounterMacro"></a><a href="#cmd.FamilySetCounterMacro">\FamilySetCounterMacro</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetCounterMacro">274</a></li> +<li><a name="cmd.FamilySetLength"></a><a href="#cmd.FamilySetLength">\FamilySetLength</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetLength">274</a></li> +<li><a name="cmd.FamilySetLengthMacro"></a><a href="#cmd.FamilySetLengthMacro">\FamilySetLengthMacro</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetLengthMacro">274</a></li> +<li><a name="cmd.FamilySetNumerical"></a><a href="#cmd.FamilySetNumerical">\FamilySetNumerical</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilySetNumerical">272</a></li> +<li><a name="cmd.FamilyStringKey"></a><a href="#cmd.FamilyStringKey">\FamilyStringKey</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyStringKey">275</a></li> +<li><a name="cmd.FamilyUnkownKeyValue"></a><a href="#cmd.FamilyUnkownKeyValue">\FamilyUnkownKeyValue</a> --> <a href="scrguien.pdf#scrbase.cmd.FamilyUnkownKeyValue">275</a></li> <li><a name="cmd.FirstName"></a><a href="#cmd.FirstName">\FirstName</a> --> <a href="scrguien.pdf#scraddr.cmd.FirstName">237</a></li> -<li><a name="cmd.ForEachLayerOfPageStyle*"></a><a href="#cmd.ForEachLayerOfPageStyle*">\ForEachLayerOfPageStyle*</a> --> <a href="scrguien.pdf#scrlayer.cmd.ForEachLayerOfPageStyle*">324</a></li> -<li><a name="cmd.ForEachLayerOfPageStyle"></a><a href="#cmd.ForEachLayerOfPageStyle">\ForEachLayerOfPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.ForEachLayerOfPageStyle">324</a></li> +<li><a name="cmd.ForEachLayerOfPageStyle*"></a><a href="#cmd.ForEachLayerOfPageStyle*">\ForEachLayerOfPageStyle*</a> --> <a href="scrguien.pdf#scrlayer.cmd.ForEachLayerOfPageStyle*">353</a></li> +<li><a name="cmd.ForEachLayerOfPageStyle"></a><a href="#cmd.ForEachLayerOfPageStyle">\ForEachLayerOfPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.ForEachLayerOfPageStyle">353</a></li> <li><a name="cmd.FreeI"></a><a href="#cmd.FreeI">\FreeI</a> --> <a href="scrguien.pdf#scraddr.cmd.FreeI">237</a></li> <li><a name="cmd.FreeII"></a><a href="#cmd.FreeII">\FreeII</a> --> <a href="scrguien.pdf#scraddr.cmd.FreeII">237</a></li> <li><a name="cmd.FreeIII"></a><a href="#cmd.FreeIII">\FreeIII</a> --> <a href="scrguien.pdf#scraddr.cmd.FreeIII">237</a></li> <li><a name="cmd.FreeIV"></a><a href="#cmd.FreeIV">\FreeIV</a> --> <a href="scrguien.pdf#scraddr.cmd.FreeIV">237</a></li> -<li><a name="cmd.GenericMarkFormat"></a><a href="#cmd.GenericMarkFormat">\GenericMarkFormat</a> --> <a href="scrguien.pdf#scrlayer.cmd.GenericMarkFormat">327</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.GenericMarkFormat">332</a></li> -<li><a name="cmd.GetLayerContents"></a><a href="#cmd.GetLayerContents">\GetLayerContents</a> --> <a href="scrguien.pdf#scrlayer.cmd.GetLayerContents">318</a></li> -<li><a name="cmd.GetRealPageStyle"></a><a href="#cmd.GetRealPageStyle">\GetRealPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.GetRealPageStyle">321</a></li> +<li><a name="cmd.GenericMarkFormat"></a><a href="#cmd.GenericMarkFormat">\GenericMarkFormat</a> --> <a href="scrguien.pdf#scrlayer.cmd.GenericMarkFormat">356</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.GenericMarkFormat">361</a></li> +<li><a name="cmd.GetLayerContents"></a><a href="#cmd.GetLayerContents">\GetLayerContents</a> --> <a href="scrguien.pdf#scrlayer.cmd.GetLayerContents">347</a></li> +<li><a name="cmd.GetRealPageStyle"></a><a href="#cmd.GetRealPageStyle">\GetRealPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.GetRealPageStyle">350</a></li> <li><a name="cmd.IfChapterUsesPrefixLine"></a><a href="#cmd.IfChapterUsesPrefixLine">\IfChapterUsesPrefixLine</a> --> <a href="scrguien.pdf#maincls.cmd.IfChapterUsesPrefixLine">86</a></li> -<li><a name="cmd.IfExistskomafont"></a><a href="#cmd.IfExistskomafont">\IfExistskomafont</a> --> <a href="scrguien.pdf#maincls-experts.cmd.IfExistskomafont">360</a></li> -<li><a name="cmd.IfLayerAtPageStyle"></a><a href="#cmd.IfLayerAtPageStyle">\IfLayerAtPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfLayerAtPageStyle">326</a></li> -<li><a name="cmd.IfLayerExists"></a><a href="#cmd.IfLayerExists">\IfLayerExists</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfLayerExists">318</a></li> -<li><a name="cmd.IfLayerPageStyleExists"></a><a href="#cmd.IfLayerPageStyleExists">\IfLayerPageStyleExists</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfLayerPageStyleExists">326</a></li> -<li><a name="cmd.IfLayersAtPageStyle"></a><a href="#cmd.IfLayersAtPageStyle">\IfLayersAtPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfLayersAtPageStyle">326</a></li> -<li><a name="cmd.IfRealLayerPageStyleExists"></a><a href="#cmd.IfRealLayerPageStyleExists">\IfRealLayerPageStyleExists</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfRealLayerPageStyleExists">326</a></li> -<li><a name="cmd.IfSomeLayersAtPageStyle"></a><a href="#cmd.IfSomeLayersAtPageStyle">\IfSomeLayersAtPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfSomeLayersAtPageStyle">326</a></li> +<li><a name="cmd.IfExistskomafont"></a><a href="#cmd.IfExistskomafont">\IfExistskomafont</a> --> <a href="scrguien.pdf#maincls-experts.cmd.IfExistskomafont">389</a></li> +<li><a name="cmd.IfLayerAtPageStyle"></a><a href="#cmd.IfLayerAtPageStyle">\IfLayerAtPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfLayerAtPageStyle">355</a></li> +<li><a name="cmd.IfLayerExists"></a><a href="#cmd.IfLayerExists">\IfLayerExists</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfLayerExists">347</a></li> +<li><a name="cmd.IfLayerPageStyleExists"></a><a href="#cmd.IfLayerPageStyleExists">\IfLayerPageStyleExists</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfLayerPageStyleExists">355</a></li> +<li><a name="cmd.IfLayersAtPageStyle"></a><a href="#cmd.IfLayersAtPageStyle">\IfLayersAtPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfLayersAtPageStyle">355</a></li> +<li><a name="cmd.IfRealLayerPageStyleExists"></a><a href="#cmd.IfRealLayerPageStyleExists">\IfRealLayerPageStyleExists</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfRealLayerPageStyleExists">355</a></li> +<li><a name="cmd.IfSomeLayersAtPageStyle"></a><a href="#cmd.IfSomeLayersAtPageStyle">\IfSomeLayersAtPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.IfSomeLayersAtPageStyle">355</a></li> <li><a name="cmd.IfUsePrefixLine"></a><a href="#cmd.IfUsePrefixLine">\IfUsePrefixLine</a> --> <a href="scrguien.pdf#maincls.cmd.IfUsePrefixLine">98</a></li> <li><a name="cmd.InputAddressFile"></a><a href="#cmd.InputAddressFile">\InputAddressFile</a> --> <a href="scrguien.pdf#scraddr.cmd.InputAddressFile">237</a></li> -<li><a name="cmd.KOMAClassName"></a><a href="#cmd.KOMAClassName">\KOMAClassName</a> --> <a href="scrguien.pdf#maincls-experts.cmd.KOMAClassName">357</a></li> -<li><a name="cmd.KOMAScript"></a><a href="#cmd.KOMAScript">\KOMAScript</a> --> <a href="scrguien.pdf#scrbase.cmd.KOMAScript">267</a></li> -<li><a name="cmd.KOMAScriptVersion"></a><a href="#cmd.KOMAScriptVersion">\KOMAScriptVersion</a> --> <a href="scrguien.pdf#scrbase.cmd.KOMAScriptVersion">267</a></li> +<li><a name="cmd.KOMAClassName"></a><a href="#cmd.KOMAClassName">\KOMAClassName</a> --> <a href="scrguien.pdf#maincls-experts.cmd.KOMAClassName">386</a></li> +<li><a name="cmd.KOMAScript"></a><a href="#cmd.KOMAScript">\KOMAScript</a> --> <a href="scrguien.pdf#scrbase.cmd.KOMAScript">284</a></li> +<li><a name="cmd.KOMAScriptVersion"></a><a href="#cmd.KOMAScriptVersion">\KOMAScriptVersion</a> --> <a href="scrguien.pdf#scrbase.cmd.KOMAScriptVersion">284</a></li> <li><a name="cmd.KOMAoption"></a><a href="#cmd.KOMAoption">\KOMAoption</a> --> <a href="scrguien.pdf#typearea.cmd.KOMAoption">29</a></li> <li><a name="cmd.KOMAoptions"></a><a href="#cmd.KOMAoptions">\KOMAoptions</a> --> <a href="scrguien.pdf#typearea.cmd.KOMAoptions">29</a></li> <li><a name="cmd.LastName"></a><a href="#cmd.LastName">\LastName</a> --> <a href="scrguien.pdf#scraddr.cmd.LastName">237</a></li> -<li><a name="cmd.LenToUnit"></a><a href="#cmd.LenToUnit">\LenToUnit</a> --> <a href="scrguien.pdf#scrlayer.cmd.LenToUnit">317</a></li> -<li><a name="cmd.LetterOptionNeedsPapersize"></a><a href="#cmd.LetterOptionNeedsPapersize">\LetterOptionNeedsPapersize</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.LetterOptionNeedsPapersize">397</a></li> +<li><a name="cmd.LastTOCLevelWasHigher"></a><a href="#cmd.LastTOCLevelWasHigher">\LastTOCLevelWasHigher</a> --> <a href="scrguien.pdf#tocbasic.cmd.LastTOCLevelWasHigher">321</a></li> +<li><a name="cmd.LastTOCLevelWasLower"></a><a href="#cmd.LastTOCLevelWasLower">\LastTOCLevelWasLower</a> --> <a href="scrguien.pdf#tocbasic.cmd.LastTOCLevelWasLower">321</a></li> +<li><a name="cmd.LastTOCLevelWasSame"></a><a href="#cmd.LastTOCLevelWasSame">\LastTOCLevelWasSame</a> --> <a href="scrguien.pdf#tocbasic.cmd.LastTOCLevelWasSame">321</a></li> +<li><a name="cmd.LenToUnit"></a><a href="#cmd.LenToUnit">\LenToUnit</a> --> <a href="scrguien.pdf#scrlayer.cmd.LenToUnit">346</a></li> +<li><a name="cmd.LetterOptionNeedsPapersize"></a><a href="#cmd.LetterOptionNeedsPapersize">\LetterOptionNeedsPapersize</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.LetterOptionNeedsPapersize">426</a></li> <li><a name="cmd.LoadLetterOption"></a><a href="#cmd.LoadLetterOption">\LoadLetterOption</a> --> <a href="scrguien.pdf#scrlttr2.cmd.LoadLetterOption">196</a></li> <li><a name="cmd.LoadLetterOptions"></a><a href="#cmd.LoadLetterOptions">\LoadLetterOptions</a> --> <a href="scrguien.pdf#scrlttr2.cmd.LoadLetterOptions">196</a></li> -<li><a name="cmd.MakeMarkcase"></a><a href="#cmd.MakeMarkcase">\MakeMarkcase</a> --> <a href="scrguien.pdf#tocbasic.cmd.MakeMarkcase">291</a>, <a href="scrguien.pdf#scrlayer.cmd.MakeMarkcase">327</a></li> -<li><a name="cmd.ModifyLayer"></a><a href="#cmd.ModifyLayer">\ModifyLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.ModifyLayer">309</a></li> -<li><a name="cmd.ModifyLayerPageStyleOptions"></a><a href="#cmd.ModifyLayerPageStyleOptions">\ModifyLayerPageStyleOptions</a> --> <a href="scrguien.pdf#scrlayer.cmd.ModifyLayerPageStyleOptions">325</a></li> +<li><a name="cmd.MakeMarkcase"></a><a href="#cmd.MakeMarkcase">\MakeMarkcase</a> --> <a href="scrguien.pdf#tocbasic.cmd.MakeMarkcase">308</a>, <a href="scrguien.pdf#scrlayer.cmd.MakeMarkcase">356</a></li> +<li><a name="cmd.ModifyLayer"></a><a href="#cmd.ModifyLayer">\ModifyLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.ModifyLayer">338</a></li> +<li><a name="cmd.ModifyLayerPageStyleOptions"></a><a href="#cmd.ModifyLayerPageStyleOptions">\ModifyLayerPageStyleOptions</a> --> <a href="scrguien.pdf#scrlayer.cmd.ModifyLayerPageStyleOptions">354</a></li> <li><a name="cmd.Name"></a><a href="#cmd.Name">\Name</a> --> <a href="scrguien.pdf#scraddr.cmd.Name">237</a></li> -<li><a name="cmd.PreventPackageFromLoading*"></a><a href="#cmd.PreventPackageFromLoading*">\PreventPackageFromLoading*</a> --> <a href="scrguien.pdf#scrlfile.cmd.PreventPackageFromLoading*">277</a></li> -<li><a name="cmd.PreventPackageFromLoading"></a><a href="#cmd.PreventPackageFromLoading">\PreventPackageFromLoading</a> --> <a href="scrguien.pdf#scrlfile.cmd.PreventPackageFromLoading">277</a></li> -<li><a name="cmd.ProvideLayer"></a><a href="#cmd.ProvideLayer">\ProvideLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.ProvideLayer">309</a></li> -<li><a name="cmd.ProvideNoteColumn"></a><a href="#cmd.ProvideNoteColumn">\ProvideNoteColumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.ProvideNoteColumn">344</a></li> -<li><a name="cmd.ProvidePageStyleAlias"></a><a href="#cmd.ProvidePageStyleAlias">\ProvidePageStyleAlias</a> --> <a href="scrguien.pdf#scrlayer.cmd.ProvidePageStyleAlias">320</a></li> -<li><a name="cmd.ProvidePageStyleByLayers"></a><a href="#cmd.ProvidePageStyleByLayers">\ProvidePageStyleByLayers</a> --> <a href="scrguien.pdf#scrlayer.cmd.ProvidePageStyleByLayers">321</a></li> -<li><a name="cmd.ProvideSectionCommand"></a><a href="#cmd.ProvideSectionCommand">\ProvideSectionCommand</a> --> <a href="scrguien.pdf#maincls-experts.cmd.ProvideSectionCommand">361</a></li> -<li><a name="cmd.ProvideSectionCommands"></a><a href="#cmd.ProvideSectionCommands">\ProvideSectionCommands</a> --> <a href="scrguien.pdf#maincls-experts.cmd.ProvideSectionCommands">369</a></li> -<li><a name="cmd.RedeclareLayer"></a><a href="#cmd.RedeclareLayer">\RedeclareLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.RedeclareLayer">309</a></li> -<li><a name="cmd.RedeclareNoteColumn"></a><a href="#cmd.RedeclareNoteColumn">\RedeclareNoteColumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.RedeclareNoteColumn">344</a></li> -<li><a name="cmd.RedeclarePageStyleAlias"></a><a href="#cmd.RedeclarePageStyleAlias">\RedeclarePageStyleAlias</a> --> <a href="scrguien.pdf#scrlayer.cmd.RedeclarePageStyleAlias">320</a></li> -<li><a name="cmd.RedeclarePageStyleByLayers"></a><a href="#cmd.RedeclarePageStyleByLayers">\RedeclarePageStyleByLayers</a> --> <a href="scrguien.pdf#scrlayer.cmd.RedeclarePageStyleByLayers">321</a></li> -<li><a name="cmd.RedeclareSectionCommand"></a><a href="#cmd.RedeclareSectionCommand">\RedeclareSectionCommand</a> --> <a href="scrguien.pdf#maincls-experts.cmd.RedeclareSectionCommand">361</a></li> -<li><a name="cmd.RedeclareSectionCommands"></a><a href="#cmd.RedeclareSectionCommands">\RedeclareSectionCommands</a> --> <a href="scrguien.pdf#maincls-experts.cmd.RedeclareSectionCommands">369</a></li> -<li><a name="cmd.RelaxFamilyKey"></a><a href="#cmd.RelaxFamilyKey">\RelaxFamilyKey</a> --> <a href="scrguien.pdf#scrbase.cmd.RelaxFamilyKey">250</a></li> -<li><a name="cmd.RemoveLayersFromPageStyle"></a><a href="#cmd.RemoveLayersFromPageStyle">\RemoveLayersFromPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.RemoveLayersFromPageStyle">324</a></li> -<li><a name="cmd.ReplaceClass"></a><a href="#cmd.ReplaceClass">\ReplaceClass</a> --> <a href="scrguien.pdf#scrlfile.cmd.ReplaceClass">275</a></li> -<li><a name="cmd.ReplaceInput"></a><a href="#cmd.ReplaceInput">\ReplaceInput</a> --> <a href="scrguien.pdf#scrlfile.cmd.ReplaceInput">274</a></li> -<li><a name="cmd.ReplacePackage"></a><a href="#cmd.ReplacePackage">\ReplacePackage</a> --> <a href="scrguien.pdf#scrlfile.cmd.ReplacePackage">275</a></li> -<li><a name="cmd.ResetPreventPackageFromLoading"></a><a href="#cmd.ResetPreventPackageFromLoading">\ResetPreventPackageFromLoading</a> --> <a href="scrguien.pdf#scrlfile.cmd.ResetPreventPackageFromLoading">278</a></li> -<li><a name="cmd.StorePreventPackageFromLoading"></a><a href="#cmd.StorePreventPackageFromLoading">\StorePreventPackageFromLoading</a> --> <a href="scrguien.pdf#scrlfile.cmd.StorePreventPackageFromLoading">278</a></li> -<li><a name="cmd.TOCclone"></a><a href="#cmd.TOCclone">\TOCclone</a> --> <a href="scrguien.pdf#scrwfile.cmd.TOCclone">281</a></li> +<li><a name="cmd.PreventPackageFromLoading*"></a><a href="#cmd.PreventPackageFromLoading*">\PreventPackageFromLoading*</a> --> <a href="scrguien.pdf#scrlfile.cmd.PreventPackageFromLoading*">294</a></li> +<li><a name="cmd.PreventPackageFromLoading"></a><a href="#cmd.PreventPackageFromLoading">\PreventPackageFromLoading</a> --> <a href="scrguien.pdf#scrlfile.cmd.PreventPackageFromLoading">294</a></li> +<li><a name="cmd.ProvideLayer"></a><a href="#cmd.ProvideLayer">\ProvideLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.ProvideLayer">338</a></li> +<li><a name="cmd.ProvideNoteColumn"></a><a href="#cmd.ProvideNoteColumn">\ProvideNoteColumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.ProvideNoteColumn">373</a></li> +<li><a name="cmd.ProvidePageStyleAlias"></a><a href="#cmd.ProvidePageStyleAlias">\ProvidePageStyleAlias</a> --> <a href="scrguien.pdf#scrlayer.cmd.ProvidePageStyleAlias">349</a></li> +<li><a name="cmd.ProvidePageStyleByLayers"></a><a href="#cmd.ProvidePageStyleByLayers">\ProvidePageStyleByLayers</a> --> <a href="scrguien.pdf#scrlayer.cmd.ProvidePageStyleByLayers">350</a></li> +<li><a name="cmd.ProvideSectionCommand"></a><a href="#cmd.ProvideSectionCommand">\ProvideSectionCommand</a> --> <a href="scrguien.pdf#maincls-experts.cmd.ProvideSectionCommand">390</a></li> +<li><a name="cmd.ProvideSectionCommands"></a><a href="#cmd.ProvideSectionCommands">\ProvideSectionCommands</a> --> <a href="scrguien.pdf#maincls-experts.cmd.ProvideSectionCommands">399</a></li> +<li><a name="cmd.RedeclareLayer"></a><a href="#cmd.RedeclareLayer">\RedeclareLayer</a> --> <a href="scrguien.pdf#scrlayer.cmd.RedeclareLayer">338</a></li> +<li><a name="cmd.RedeclareNoteColumn"></a><a href="#cmd.RedeclareNoteColumn">\RedeclareNoteColumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.RedeclareNoteColumn">373</a></li> +<li><a name="cmd.RedeclarePageStyleAlias"></a><a href="#cmd.RedeclarePageStyleAlias">\RedeclarePageStyleAlias</a> --> <a href="scrguien.pdf#scrlayer.cmd.RedeclarePageStyleAlias">349</a></li> +<li><a name="cmd.RedeclarePageStyleByLayers"></a><a href="#cmd.RedeclarePageStyleByLayers">\RedeclarePageStyleByLayers</a> --> <a href="scrguien.pdf#scrlayer.cmd.RedeclarePageStyleByLayers">350</a></li> +<li><a name="cmd.RedeclareSectionCommand"></a><a href="#cmd.RedeclareSectionCommand">\RedeclareSectionCommand</a> --> <a href="scrguien.pdf#maincls-experts.cmd.RedeclareSectionCommand">390</a></li> +<li><a name="cmd.RedeclareSectionCommands"></a><a href="#cmd.RedeclareSectionCommands">\RedeclareSectionCommands</a> --> <a href="scrguien.pdf#maincls-experts.cmd.RedeclareSectionCommands">399</a></li> +<li><a name="cmd.RelaxFamilyKey"></a><a href="#cmd.RelaxFamilyKey">\RelaxFamilyKey</a> --> <a href="scrguien.pdf#scrbase.cmd.RelaxFamilyKey">267</a></li> +<li><a name="cmd.RemoveLayersFromPageStyle"></a><a href="#cmd.RemoveLayersFromPageStyle">\RemoveLayersFromPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.RemoveLayersFromPageStyle">353</a></li> +<li><a name="cmd.ReplaceClass"></a><a href="#cmd.ReplaceClass">\ReplaceClass</a> --> <a href="scrguien.pdf#scrlfile.cmd.ReplaceClass">292</a></li> +<li><a name="cmd.ReplaceInput"></a><a href="#cmd.ReplaceInput">\ReplaceInput</a> --> <a href="scrguien.pdf#scrlfile.cmd.ReplaceInput">291</a></li> +<li><a name="cmd.ReplacePackage"></a><a href="#cmd.ReplacePackage">\ReplacePackage</a> --> <a href="scrguien.pdf#scrlfile.cmd.ReplacePackage">292</a></li> +<li><a name="cmd.ResetPreventPackageFromLoading"></a><a href="#cmd.ResetPreventPackageFromLoading">\ResetPreventPackageFromLoading</a> --> <a href="scrguien.pdf#scrlfile.cmd.ResetPreventPackageFromLoading">295</a></li> +<li><a name="cmd.Sentence"></a><a href="#cmd.Sentence">\Sentence</a> --> <a href="scrguien.pdf#scrjura.cmd.Sentence">251</a></li> +<li><a name="cmd.StorePreventPackageFromLoading"></a><a href="#cmd.StorePreventPackageFromLoading">\StorePreventPackageFromLoading</a> --> <a href="scrguien.pdf#scrlfile.cmd.StorePreventPackageFromLoading">295</a></li> +<li><a name="cmd.SubClause"></a><a href="#cmd.SubClause">\SubClause</a> --> <a href="scrguien.pdf#scrjura.cmd.SubClause">246</a></li> +<li><a name="cmd.TOCEntryStyleInitCode"></a><a href="#cmd.TOCEntryStyleInitCode">\TOCEntryStyleInitCode</a> --> <a href="scrguien.pdf#tocbasic.cmd.TOCEntryStyleInitCode">321</a></li> +<li><a name="cmd.TOCEntryStyleStartInitCode"></a><a href="#cmd.TOCEntryStyleStartInitCode">\TOCEntryStyleStartInitCode</a> --> <a href="scrguien.pdf#tocbasic.cmd.TOCEntryStyleStartInitCode">321</a></li> +<li><a name="cmd.TOCLineLeaderFill"></a><a href="#cmd.TOCLineLeaderFill">\TOCLineLeaderFill</a> --> <a href="scrguien.pdf#tocbasic.cmd.TOCLineLeaderFill">321</a></li> +<li><a name="cmd.TOCclone"></a><a href="#cmd.TOCclone">\TOCclone</a> --> <a href="scrguien.pdf#scrwfile.cmd.TOCclone">298</a></li> <li><a name="cmd.Telephone"></a><a href="#cmd.Telephone">\Telephone</a> --> <a href="scrguien.pdf#scraddr.cmd.Telephone">237</a></li> -<li><a name="cmd.UnPreventPackageFromLoading*"></a><a href="#cmd.UnPreventPackageFromLoading*">\UnPreventPackageFromLoading*</a> --> <a href="scrguien.pdf#scrlfile.cmd.UnPreventPackageFromLoading*">279</a></li> -<li><a name="cmd.UnPreventPackageFromLoading"></a><a href="#cmd.UnPreventPackageFromLoading">\UnPreventPackageFromLoading</a> --> <a href="scrguien.pdf#scrlfile.cmd.UnPreventPackageFromLoading">279</a></li> -<li><a name="cmd.UnReplaceClass"></a><a href="#cmd.UnReplaceClass">\UnReplaceClass</a> --> <a href="scrguien.pdf#scrlfile.cmd.UnReplaceClass">277</a></li> -<li><a name="cmd.UnReplaceInput"></a><a href="#cmd.UnReplaceInput">\UnReplaceInput</a> --> <a href="scrguien.pdf#scrlfile.cmd.UnReplaceInput">277</a></li> -<li><a name="cmd.UnReplacePackage"></a><a href="#cmd.UnReplacePackage">\UnReplacePackage</a> --> <a href="scrguien.pdf#scrlfile.cmd.UnReplacePackage">277</a></li> -<li><a name="cmd.UnifyLayersAtPageStyle"></a><a href="#cmd.UnifyLayersAtPageStyle">\UnifyLayersAtPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.UnifyLayersAtPageStyle">325</a></li> -<li><a name="cmd.XdivY"></a><a href="#cmd.XdivY">\XdivY</a> --> <a href="scrguien.pdf#scrbase.cmd.XdivY">268</a></li> -<li><a name="cmd.XmodY"></a><a href="#cmd.XmodY">\XmodY</a> --> <a href="scrguien.pdf#scrbase.cmd.XmodY">268</a></li> -<li><a name="cmd.activateareas"></a><a href="#cmd.activateareas">\activateareas</a> --> <a href="scrguien.pdf#typearea-experts.cmd.activateareas">354</a></li> +<li><a name="cmd.UnPreventPackageFromLoading*"></a><a href="#cmd.UnPreventPackageFromLoading*">\UnPreventPackageFromLoading*</a> --> <a href="scrguien.pdf#scrlfile.cmd.UnPreventPackageFromLoading*">296</a></li> +<li><a name="cmd.UnPreventPackageFromLoading"></a><a href="#cmd.UnPreventPackageFromLoading">\UnPreventPackageFromLoading</a> --> <a href="scrguien.pdf#scrlfile.cmd.UnPreventPackageFromLoading">296</a></li> +<li><a name="cmd.UnReplaceClass"></a><a href="#cmd.UnReplaceClass">\UnReplaceClass</a> --> <a href="scrguien.pdf#scrlfile.cmd.UnReplaceClass">294</a></li> +<li><a name="cmd.UnReplaceInput"></a><a href="#cmd.UnReplaceInput">\UnReplaceInput</a> --> <a href="scrguien.pdf#scrlfile.cmd.UnReplaceInput">294</a></li> +<li><a name="cmd.UnReplacePackage"></a><a href="#cmd.UnReplacePackage">\UnReplacePackage</a> --> <a href="scrguien.pdf#scrlfile.cmd.UnReplacePackage">294</a></li> +<li><a name="cmd.UnifyLayersAtPageStyle"></a><a href="#cmd.UnifyLayersAtPageStyle">\UnifyLayersAtPageStyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.UnifyLayersAtPageStyle">354</a></li> +<li><a name="cmd.XdivY"></a><a href="#cmd.XdivY">\XdivY</a> --> <a href="scrguien.pdf#scrbase.cmd.XdivY">285</a></li> +<li><a name="cmd.XmodY"></a><a href="#cmd.XmodY">\XmodY</a> --> <a href="scrguien.pdf#scrbase.cmd.XmodY">285</a></li> +<li><a name="cmd.activateareas"></a><a href="#cmd.activateareas">\activateareas</a> --> <a href="scrguien.pdf#typearea-experts.cmd.activateareas">383</a></li> <li><a name="cmd.addchap*"></a><a href="#cmd.addchap*">\addchap*</a> --> <a href="scrguien.pdf#maincls.cmd.addchap*">95</a></li> <li><a name="cmd.addchap"></a><a href="#cmd.addchap">\addchap</a> --> <a href="scrguien.pdf#maincls.cmd.addchap">95</a></li> <li><a name="cmd.addchapmark"></a><a href="#cmd.addchapmark">\addchapmark</a> --> <a href="scrguien.pdf#maincls.cmd.addchapmark">100</a></li> -<li><a name="cmd.addchaptertocentry"></a><a href="#cmd.addchaptertocentry">\addchaptertocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addchaptertocentry">359</a></li> -<li><a name="cmd.addcontentslinetoeachtocfile"></a><a href="#cmd.addcontentslinetoeachtocfile">\addcontentslinetoeachtocfile</a> --> <a href="scrguien.pdf#tocbasic.cmd.addcontentslinetoeachtocfile">288</a></li> -<li><a name="cmd.addparagraphtocentry"></a><a href="#cmd.addparagraphtocentry">\addparagraphtocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addparagraphtocentry">359</a></li> +<li><a name="cmd.addchaptertocentry"></a><a href="#cmd.addchaptertocentry">\addchaptertocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addchaptertocentry">388</a></li> +<li><a name="cmd.addcontentslinetoeachtocfile"></a><a href="#cmd.addcontentslinetoeachtocfile">\addcontentslinetoeachtocfile</a> --> <a href="scrguien.pdf#tocbasic.cmd.addcontentslinetoeachtocfile">306</a></li> +<li><a name="cmd.addparagraphtocentry"></a><a href="#cmd.addparagraphtocentry">\addparagraphtocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addparagraphtocentry">388</a></li> <li><a name="cmd.addpart*"></a><a href="#cmd.addpart*">\addpart*</a> --> <a href="scrguien.pdf#maincls.cmd.addpart*">95</a></li> <li><a name="cmd.addpart"></a><a href="#cmd.addpart">\addpart</a> --> <a href="scrguien.pdf#maincls.cmd.addpart">95</a></li> -<li><a name="cmd.addparttocentry"></a><a href="#cmd.addparttocentry">\addparttocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addparttocentry">359</a></li> +<li><a name="cmd.addparttocentry"></a><a href="#cmd.addparttocentry">\addparttocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addparttocentry">388</a></li> <li><a name="cmd.addrchar"></a><a href="#cmd.addrchar">\addrchar</a> --> <a href="scrguien.pdf#scrlttr2.cmd.addrchar">204</a></li> <li><a name="cmd.addrentry"></a><a href="#cmd.addrentry">\addrentry</a> --> <a href="scrguien.pdf#scrlttr2.cmd.addrentry">202</a></li> <li><a name="cmd.addsec*"></a><a href="#cmd.addsec*">\addsec*</a> --> <a href="scrguien.pdf#maincls.cmd.addsec*">95</a></li> <li><a name="cmd.addsec"></a><a href="#cmd.addsec">\addsec</a> --> <a href="scrguien.pdf#maincls.cmd.addsec">95</a></li> <li><a name="cmd.addsecmark"></a><a href="#cmd.addsecmark">\addsecmark</a> --> <a href="scrguien.pdf#maincls.cmd.addsecmark">100</a></li> -<li><a name="cmd.addsectiontocentry"></a><a href="#cmd.addsectiontocentry">\addsectiontocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addsectiontocentry">359</a></li> -<li><a name="cmd.addsubparagraphtocentry"></a><a href="#cmd.addsubparagraphtocentry">\addsubparagraphtocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addsubparagraphtocentry">359</a></li> -<li><a name="cmd.addsubsectiontocentry"></a><a href="#cmd.addsubsectiontocentry">\addsubsectiontocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addsubsectiontocentry">359</a></li> -<li><a name="cmd.addsubsubsectiontocentry"></a><a href="#cmd.addsubsubsectiontocentry">\addsubsubsectiontocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addsubsubsectiontocentry">359</a></li> -<li><a name="cmd.addtocentrydefault"></a><a href="#cmd.addtocentrydefault">\addtocentrydefault</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addtocentrydefault">358</a></li> -<li><a name="cmd.addtoeachtocfile"></a><a href="#cmd.addtoeachtocfile">\addtoeachtocfile</a> --> <a href="scrguien.pdf#tocbasic.cmd.addtoeachtocfile">287</a></li> +<li><a name="cmd.addsectiontocentry"></a><a href="#cmd.addsectiontocentry">\addsectiontocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addsectiontocentry">388</a></li> +<li><a name="cmd.addsubparagraphtocentry"></a><a href="#cmd.addsubparagraphtocentry">\addsubparagraphtocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addsubparagraphtocentry">388</a></li> +<li><a name="cmd.addsubsectiontocentry"></a><a href="#cmd.addsubsectiontocentry">\addsubsectiontocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addsubsectiontocentry">388</a></li> +<li><a name="cmd.addsubsubsectiontocentry"></a><a href="#cmd.addsubsubsectiontocentry">\addsubsubsectiontocentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addsubsubsectiontocentry">388</a></li> +<li><a name="cmd.addtocentrydefault"></a><a href="#cmd.addtocentrydefault">\addtocentrydefault</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addtocentrydefault">387</a></li> +<li><a name="cmd.addtoeachtocfile"></a><a href="#cmd.addtoeachtocfile">\addtoeachtocfile</a> --> <a href="scrguien.pdf#tocbasic.cmd.addtoeachtocfile">304</a></li> <li><a name="cmd.addtokomafont"></a><a href="#cmd.addtokomafont">\addtokomafont</a> --> <a href="scrguien.pdf#maincls.cmd.addtokomafont">54</a></li> -<li><a name="cmd.addtokomafontgobblelist"></a><a href="#cmd.addtokomafontgobblelist">\addtokomafontgobblelist</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addtokomafontgobblelist">360</a></li> -<li><a name="cmd.addtokomafontrelaxlist"></a><a href="#cmd.addtokomafontrelaxlist">\addtokomafontrelaxlist</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addtokomafontrelaxlist">360</a></li> +<li><a name="cmd.addtokomafontgobblelist"></a><a href="#cmd.addtokomafontgobblelist">\addtokomafontgobblelist</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addtokomafontgobblelist">389</a></li> +<li><a name="cmd.addtokomafontrelaxlist"></a><a href="#cmd.addtokomafontrelaxlist">\addtokomafontrelaxlist</a> --> <a href="scrguien.pdf#maincls-experts.cmd.addtokomafontrelaxlist">389</a></li> <li><a name="cmd.addtolengthplength"></a><a href="#cmd.addtolengthplength">\addtolengthplength</a> --> <a href="scrguien.pdf#scrlttr2.cmd.addtolengthplength">142</a></li> -<li><a name="cmd.addtoreffields"></a><a href="#cmd.addtoreffields">\addtoreffields</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.addtoreffields">393</a></li> -<li><a name="cmd.addtotoclist"></a><a href="#cmd.addtotoclist">\addtotoclist</a> --> <a href="scrguien.pdf#tocbasic.cmd.addtotoclist">285</a></li> -<li><a name="cmd.addxcontentsline"></a><a href="#cmd.addxcontentsline">\addxcontentsline</a> --> <a href="scrguien.pdf#tocbasic.cmd.addxcontentsline">288</a></li> -<li><a name="cmd.addxcontentslinetoeachtocfile"></a><a href="#cmd.addxcontentslinetoeachtocfile">\addxcontentslinetoeachtocfile</a> --> <a href="scrguien.pdf#tocbasic.cmd.addxcontentslinetoeachtocfile">288</a></li> +<li><a name="cmd.addtoreffields"></a><a href="#cmd.addtoreffields">\addtoreffields</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.addtoreffields">422</a></li> +<li><a name="cmd.addtotoclist"></a><a href="#cmd.addtotoclist">\addtotoclist</a> --> <a href="scrguien.pdf#tocbasic.cmd.addtotoclist">302</a></li> +<li><a name="cmd.addxcontentsline"></a><a href="#cmd.addxcontentsline">\addxcontentsline</a> --> <a href="scrguien.pdf#tocbasic.cmd.addxcontentsline">305</a></li> +<li><a name="cmd.addxcontentslinetoeachtocfile"></a><a href="#cmd.addxcontentslinetoeachtocfile">\addxcontentslinetoeachtocfile</a> --> <a href="scrguien.pdf#tocbasic.cmd.addxcontentslinetoeachtocfile">306</a></li> <li><a name="cmd.adrchar"></a><a href="#cmd.adrchar">\adrchar</a> --> <a href="scrguien.pdf#scrlttr2.cmd.adrchar">204</a></li> <li><a name="cmd.adrentry"></a><a href="#cmd.adrentry">\adrentry</a> --> <a href="scrguien.pdf#scrlttr2.cmd.adrentry">201</a></li> -<li><a name="cmd.aliaskomafont"></a><a href="#cmd.aliaskomafont">\aliaskomafont</a> --> <a href="scrguien.pdf#maincls-experts.cmd.aliaskomafont">359</a></li> +<li><a name="cmd.aliaskomafont"></a><a href="#cmd.aliaskomafont">\aliaskomafont</a> --> <a href="scrguien.pdf#maincls-experts.cmd.aliaskomafont">388</a></li> <li><a name="cmd.and"></a><a href="#cmd.and">\and</a> --> <a href="scrguien.pdf#maincls.cmd.and">62</a></li> <li><a name="cmd.appendix"></a><a href="#cmd.appendix">\appendix</a> --> <a href="scrguien.pdf#maincls.cmd.appendix">132</a></li> -<li><a name="cmd.appendixmore"></a><a href="#cmd.appendixmore">\appendixmore</a> --> <a href="scrguien.pdf#maincls-experts.cmd.appendixmore">375</a></li> +<li><a name="cmd.appendixmore"></a><a href="#cmd.appendixmore">\appendixmore</a> --> <a href="scrguien.pdf#maincls-experts.cmd.appendixmore">405</a></li> <li><a name="cmd.areaset"></a><a href="#cmd.areaset">\areaset</a> --> <a href="scrguien.pdf#typearea.cmd.areaset">43</a></li> <li><a name="cmd.author"></a><a href="#cmd.author">\author</a> --> <a href="scrguien.pdf#maincls.cmd.author">62</a></li> <li><a name="cmd.autodot"></a><a href="#cmd.autodot">\autodot</a> --> <a href="scrguien.pdf#maincls.cmd.autodot">98</a></li> <li><a name="cmd.automark"></a><a href="#cmd.automark">\automark</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.automark">219</a></li> <li><a name="cmd.backmatter"></a><a href="#cmd.backmatter">\backmatter</a> --> <a href="scrguien.pdf#maincls.cmd.backmatter">84</a></li> -<li><a name="cmd.bankname"></a><a href="#cmd.bankname">\bankname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.bankname">402</a></li> -<li><a name="cmd.bib@beginhook"></a><a href="#cmd.bib@beginhook">\bib@beginhook</a> --> <a href="scrguien.pdf#maincls-experts.cmd.bib@beginhook">376</a></li> -<li><a name="cmd.bib@endhook"></a><a href="#cmd.bib@endhook">\bib@endhook</a> --> <a href="scrguien.pdf#maincls-experts.cmd.bib@endhook">376</a></li> +<li><a name="cmd.bankname"></a><a href="#cmd.bankname">\bankname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.bankname">431</a></li> +<li><a name="cmd.bib@beginhook"></a><a href="#cmd.bib@beginhook">\bib@beginhook</a> --> <a href="scrguien.pdf#maincls-experts.cmd.bib@beginhook">406</a></li> +<li><a name="cmd.bib@endhook"></a><a href="#cmd.bib@endhook">\bib@endhook</a> --> <a href="scrguien.pdf#maincls-experts.cmd.bib@endhook">406</a></li> <li><a name="cmd.caption"></a><a href="#cmd.caption">\caption</a> --> <a href="scrguien.pdf#maincls.cmd.caption">118</a></li> <li><a name="cmd.captionabove"></a><a href="#cmd.captionabove">\captionabove</a> --> <a href="scrguien.pdf#maincls.cmd.captionabove">118</a></li> <li><a name="cmd.captionaboveof"></a><a href="#cmd.captionaboveof">\captionaboveof</a> --> <a href="scrguien.pdf#maincls.cmd.captionaboveof">120</a></li> @@ -327,42 +355,42 @@ <li><a name="cmd.captionbelowof"></a><a href="#cmd.captionbelowof">\captionbelowof</a> --> <a href="scrguien.pdf#maincls.cmd.captionbelowof">120</a></li> <li><a name="cmd.captionformat"></a><a href="#cmd.captionformat">\captionformat</a> --> <a href="scrguien.pdf#maincls.cmd.captionformat">125</a></li> <li><a name="cmd.captionof"></a><a href="#cmd.captionof">\captionof</a> --> <a href="scrguien.pdf#maincls.cmd.captionof">120</a></li> -<li><a name="cmd.captionsUKenglish"></a><a href="#cmd.captionsUKenglish">\captionsUKenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsUKenglish">401</a></li> -<li><a name="cmd.captionsUSenglish"></a><a href="#cmd.captionsUSenglish">\captionsUSenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsUSenglish">401</a></li> -<li><a name="cmd.captionsamerican"></a><a href="#cmd.captionsamerican">\captionsamerican</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsamerican">401</a></li> -<li><a name="cmd.captionsaustrian"></a><a href="#cmd.captionsaustrian">\captionsaustrian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsaustrian">401</a></li> -<li><a name="cmd.captionsbritish"></a><a href="#cmd.captionsbritish">\captionsbritish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsbritish">401</a></li> -<li><a name="cmd.captionscroatian"></a><a href="#cmd.captionscroatian">\captionscroatian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionscroatian">401</a></li> -<li><a name="cmd.captionsdutch"></a><a href="#cmd.captionsdutch">\captionsdutch</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsdutch">401</a></li> -<li><a name="cmd.captionsenglish"></a><a href="#cmd.captionsenglish">\captionsenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsenglish">401</a></li> -<li><a name="cmd.captionsfinnish"></a><a href="#cmd.captionsfinnish">\captionsfinnish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsfinnish">401</a></li> -<li><a name="cmd.captionsfrench"></a><a href="#cmd.captionsfrench">\captionsfrench</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsfrench">401</a></li> -<li><a name="cmd.captionsgerman"></a><a href="#cmd.captionsgerman">\captionsgerman</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsgerman">401</a></li> -<li><a name="cmd.captionsitalian"></a><a href="#cmd.captionsitalian">\captionsitalian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsitalian">401</a></li> -<li><a name="cmd.captionsnaustrian"></a><a href="#cmd.captionsnaustrian">\captionsnaustrian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsnaustrian">401</a></li> -<li><a name="cmd.captionsngerman"></a><a href="#cmd.captionsngerman">\captionsngerman</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsngerman">401</a></li> -<li><a name="cmd.captionsnorsk"></a><a href="#cmd.captionsnorsk">\captionsnorsk</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsnorsk">401</a></li> -<li><a name="cmd.captionsspanish"></a><a href="#cmd.captionsspanish">\captionsspanish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsspanish">401</a></li> -<li><a name="cmd.captionsswedish"></a><a href="#cmd.captionsswedish">\captionsswedish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsswedish">401</a></li> +<li><a name="cmd.captionsUKenglish"></a><a href="#cmd.captionsUKenglish">\captionsUKenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsUKenglish">430</a></li> +<li><a name="cmd.captionsUSenglish"></a><a href="#cmd.captionsUSenglish">\captionsUSenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsUSenglish">430</a></li> +<li><a name="cmd.captionsamerican"></a><a href="#cmd.captionsamerican">\captionsamerican</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsamerican">430</a></li> +<li><a name="cmd.captionsaustrian"></a><a href="#cmd.captionsaustrian">\captionsaustrian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsaustrian">430</a></li> +<li><a name="cmd.captionsbritish"></a><a href="#cmd.captionsbritish">\captionsbritish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsbritish">430</a></li> +<li><a name="cmd.captionscroatian"></a><a href="#cmd.captionscroatian">\captionscroatian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionscroatian">430</a></li> +<li><a name="cmd.captionsdutch"></a><a href="#cmd.captionsdutch">\captionsdutch</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsdutch">430</a></li> +<li><a name="cmd.captionsenglish"></a><a href="#cmd.captionsenglish">\captionsenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsenglish">430</a></li> +<li><a name="cmd.captionsfinnish"></a><a href="#cmd.captionsfinnish">\captionsfinnish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsfinnish">430</a></li> +<li><a name="cmd.captionsfrench"></a><a href="#cmd.captionsfrench">\captionsfrench</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsfrench">430</a></li> +<li><a name="cmd.captionsgerman"></a><a href="#cmd.captionsgerman">\captionsgerman</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsgerman">430</a></li> +<li><a name="cmd.captionsitalian"></a><a href="#cmd.captionsitalian">\captionsitalian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsitalian">430</a></li> +<li><a name="cmd.captionsnaustrian"></a><a href="#cmd.captionsnaustrian">\captionsnaustrian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsnaustrian">430</a></li> +<li><a name="cmd.captionsngerman"></a><a href="#cmd.captionsngerman">\captionsngerman</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsngerman">430</a></li> +<li><a name="cmd.captionsnorsk"></a><a href="#cmd.captionsnorsk">\captionsnorsk</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsnorsk">430</a></li> +<li><a name="cmd.captionsspanish"></a><a href="#cmd.captionsspanish">\captionsspanish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsspanish">430</a></li> +<li><a name="cmd.captionsswedish"></a><a href="#cmd.captionsswedish">\captionsswedish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.captionsswedish">430</a></li> <li><a name="cmd.cc"></a><a href="#cmd.cc">\cc</a> --> <a href="scrguien.pdf#scrlttr2.cmd.cc">151</a></li> -<li><a name="cmd.ccname"></a><a href="#cmd.ccname">\ccname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.ccname">402</a></li> +<li><a name="cmd.ccname"></a><a href="#cmd.ccname">\ccname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.ccname">431</a></li> <li><a name="cmd.cefoot*"></a><a href="#cmd.cefoot*">\cefoot*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.cefoot*">215</a></li> <li><a name="cmd.cefoot"></a><a href="#cmd.cefoot">\cefoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.cefoot">213</a></li> <li><a name="cmd.cehead*"></a><a href="#cmd.cehead*">\cehead*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.cehead*">212</a></li> <li><a name="cmd.cehead"></a><a href="#cmd.cehead">\cehead</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.cehead">210</a></li> <li><a name="cmd.cfoot*"></a><a href="#cmd.cfoot*">\cfoot*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.cfoot*">217</a></li> <li><a name="cmd.cfoot"></a><a href="#cmd.cfoot">\cfoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.cfoot">216</a></li> -<li><a name="cmd.changefontsizes"></a><a href="#cmd.changefontsizes">\changefontsizes</a> --> <a href="scrguien.pdf#maincls-experts.cmd.changefontsizes">359</a></li> +<li><a name="cmd.changefontsizes"></a><a href="#cmd.changefontsizes">\changefontsizes</a> --> <a href="scrguien.pdf#maincls-experts.cmd.changefontsizes">388</a></li> <li><a name="cmd.chapapp"></a><a href="#cmd.chapapp">\chapapp</a> --> <a href="scrguien.pdf#maincls.cmd.chapapp">100</a></li> <li><a name="cmd.chapappifchapterprefix"></a><a href="#cmd.chapappifchapterprefix">\chapappifchapterprefix</a> --> <a href="scrguien.pdf#maincls.cmd.chapappifchapterprefix">100</a></li> <li><a name="cmd.chapter*"></a><a href="#cmd.chapter*">\chapter*</a> --> <a href="scrguien.pdf#maincls.cmd.chapter*">95</a></li> <li><a name="cmd.chapter"></a><a href="#cmd.chapter">\chapter</a> --> <a href="scrguien.pdf#maincls.cmd.chapter">90</a></li> <li><a name="cmd.chapterformat"></a><a href="#cmd.chapterformat">\chapterformat</a> --> <a href="scrguien.pdf#maincls.cmd.chapterformat">98</a></li> -<li><a name="cmd.chapterheadendvskip"></a><a href="#cmd.chapterheadendvskip">\chapterheadendvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.chapterheadendvskip">370</a></li> -<li><a name="cmd.chapterheadmidvskip"></a><a href="#cmd.chapterheadmidvskip">\chapterheadmidvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.chapterheadmidvskip">370</a></li> -<li><a name="cmd.chapterheadstartvskip"></a><a href="#cmd.chapterheadstartvskip">\chapterheadstartvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.chapterheadstartvskip">370</a></li> -<li><a name="cmd.chapterlinesformat"></a><a href="#cmd.chapterlinesformat">\chapterlinesformat</a> --> <a href="scrguien.pdf#maincls-experts.cmd.chapterlinesformat">371</a></li> -<li><a name="cmd.chapterlineswithprefixformat"></a><a href="#cmd.chapterlineswithprefixformat">\chapterlineswithprefixformat</a> --> <a href="scrguien.pdf#maincls-experts.cmd.chapterlineswithprefixformat">371</a></li> +<li><a name="cmd.chapterheadendvskip"></a><a href="#cmd.chapterheadendvskip">\chapterheadendvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.chapterheadendvskip">399</a></li> +<li><a name="cmd.chapterheadmidvskip"></a><a href="#cmd.chapterheadmidvskip">\chapterheadmidvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.chapterheadmidvskip">399</a></li> +<li><a name="cmd.chapterheadstartvskip"></a><a href="#cmd.chapterheadstartvskip">\chapterheadstartvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.chapterheadstartvskip">399</a></li> +<li><a name="cmd.chapterlinesformat"></a><a href="#cmd.chapterlinesformat">\chapterlinesformat</a> --> <a href="scrguien.pdf#maincls-experts.cmd.chapterlinesformat">401</a></li> +<li><a name="cmd.chapterlineswithprefixformat"></a><a href="#cmd.chapterlineswithprefixformat">\chapterlineswithprefixformat</a> --> <a href="scrguien.pdf#maincls-experts.cmd.chapterlineswithprefixformat">401</a></li> <li><a name="cmd.chaptermark"></a><a href="#cmd.chaptermark">\chaptermark</a> --> <a href="scrguien.pdf#maincls.cmd.chaptermark">100</a>, <a href="scrguien.pdf#scrlayer-scrpage.cmd.chaptermark">224</a></li> <li><a name="cmd.chaptermarkformat"></a><a href="#cmd.chaptermarkformat">\chaptermarkformat</a> --> <a href="scrguien.pdf#maincls.cmd.chaptermarkformat">100</a>, <a href="scrguien.pdf#scrlayer-scrpage.cmd.chaptermarkformat">224</a></li> <li><a name="cmd.chapternumdepth"></a><a href="#cmd.chapternumdepth">\chapternumdepth</a> --> <a href="scrguien.pdf#maincls.cmd.chapternumdepth">101</a></li> @@ -382,63 +410,64 @@ <li><a name="cmd.cleardoublepageusingstyle"></a><a href="#cmd.cleardoublepageusingstyle">\cleardoublepageusingstyle</a> --> <a href="scrguien.pdf#maincls.cmd.cleardoublepageusingstyle">79</a></li> <li><a name="cmd.cleardoubleplainpage"></a><a href="#cmd.cleardoubleplainpage">\cleardoubleplainpage</a> --> <a href="scrguien.pdf#maincls.cmd.cleardoubleplainpage">79</a></li> <li><a name="cmd.cleardoublestandardpage"></a><a href="#cmd.cleardoublestandardpage">\cleardoublestandardpage</a> --> <a href="scrguien.pdf#maincls.cmd.cleardoublestandardpage">79</a></li> -<li><a name="cmd.clearmainofpairofpagestyles"></a><a href="#cmd.clearmainofpairofpagestyles">\clearmainofpairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearmainofpairofpagestyles">336</a></li> -<li><a name="cmd.clearnotecolumn"></a><a href="#cmd.clearnotecolumn">\clearnotecolumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.clearnotecolumn">351</a></li> -<li><a name="cmd.clearnotecolumns"></a><a href="#cmd.clearnotecolumns">\clearnotecolumns</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.clearnotecolumns">352</a></li> +<li><a name="cmd.clearmainofpairofpagestyles"></a><a href="#cmd.clearmainofpairofpagestyles">\clearmainofpairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearmainofpairofpagestyles">365</a></li> +<li><a name="cmd.clearnotecolumn"></a><a href="#cmd.clearnotecolumn">\clearnotecolumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.clearnotecolumn">380</a></li> +<li><a name="cmd.clearnotecolumns"></a><a href="#cmd.clearnotecolumns">\clearnotecolumns</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.clearnotecolumns">381</a></li> <li><a name="cmd.clearpage"></a><a href="#cmd.clearpage">\clearpage</a> --> <a href="scrguien.pdf#maincls.cmd.clearpage">79</a></li> -<li><a name="cmd.clearpairofpagestyles"></a><a href="#cmd.clearpairofpagestyles">\clearpairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearpairofpagestyles">336</a></li> -<li><a name="cmd.clearplainofpairofpagestyles"></a><a href="#cmd.clearplainofpairofpagestyles">\clearplainofpairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearplainofpairofpagestyles">336</a></li> -<li><a name="cmd.clearscrheadfoot"></a><a href="#cmd.clearscrheadfoot">\clearscrheadfoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearscrheadfoot">336</a></li> -<li><a name="cmd.clearscrheadings"></a><a href="#cmd.clearscrheadings">\clearscrheadings</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearscrheadings">336</a></li> -<li><a name="cmd.clearscrplain"></a><a href="#cmd.clearscrplain">\clearscrplain</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearscrplain">336</a></li> +<li><a name="cmd.clearpairofpagestyles"></a><a href="#cmd.clearpairofpagestyles">\clearpairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearpairofpagestyles">365</a></li> +<li><a name="cmd.clearplainofpairofpagestyles"></a><a href="#cmd.clearplainofpairofpagestyles">\clearplainofpairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearplainofpairofpagestyles">365</a></li> +<li><a name="cmd.clearscrheadfoot"></a><a href="#cmd.clearscrheadfoot">\clearscrheadfoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearscrheadfoot">365</a></li> +<li><a name="cmd.clearscrheadings"></a><a href="#cmd.clearscrheadings">\clearscrheadings</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearscrheadings">365</a></li> +<li><a name="cmd.clearscrplain"></a><a href="#cmd.clearscrplain">\clearscrplain</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.clearscrplain">365</a></li> <li><a name="cmd.closing"></a><a href="#cmd.closing">\closing</a> --> <a href="scrguien.pdf#scrlttr2.cmd.closing">148</a></li> <li><a name="cmd.cofoot*"></a><a href="#cmd.cofoot*">\cofoot*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.cofoot*">215</a></li> <li><a name="cmd.cofoot"></a><a href="#cmd.cofoot">\cofoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.cofoot">213</a></li> <li><a name="cmd.cohead*"></a><a href="#cmd.cohead*">\cohead*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.cohead*">212</a></li> <li><a name="cmd.cohead"></a><a href="#cmd.cohead">\cohead</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.cohead">210</a></li> -<li><a name="cmd.currentpagestyle"></a><a href="#cmd.currentpagestyle">\currentpagestyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.currentpagestyle">319</a></li> -<li><a name="cmd.customername"></a><a href="#cmd.customername">\customername</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.customername">402</a></li> +<li><a name="cmd.currentpagestyle"></a><a href="#cmd.currentpagestyle">\currentpagestyle</a> --> <a href="scrguien.pdf#scrlayer.cmd.currentpagestyle">348</a></li> +<li><a name="cmd.customername"></a><a href="#cmd.customername">\customername</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.customername">431</a></li> <li><a name="cmd.date"></a><a href="#cmd.date">\date</a> --> <a href="scrguien.pdf#maincls.cmd.date">62</a></li> -<li><a name="cmd.dateUKenglish"></a><a href="#cmd.dateUKenglish">\dateUKenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateUKenglish">401</a></li> -<li><a name="cmd.dateUSenglish"></a><a href="#cmd.dateUSenglish">\dateUSenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateUSenglish">401</a></li> -<li><a name="cmd.dateamerican"></a><a href="#cmd.dateamerican">\dateamerican</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateamerican">401</a></li> -<li><a name="cmd.dateaustrian"></a><a href="#cmd.dateaustrian">\dateaustrian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateaustrian">401</a></li> -<li><a name="cmd.datebritish"></a><a href="#cmd.datebritish">\datebritish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datebritish">401</a></li> -<li><a name="cmd.datecroatian"></a><a href="#cmd.datecroatian">\datecroatian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datecroatian">401</a></li> -<li><a name="cmd.datedutch"></a><a href="#cmd.datedutch">\datedutch</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datedutch">401</a></li> -<li><a name="cmd.dateenglish"></a><a href="#cmd.dateenglish">\dateenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateenglish">401</a></li> -<li><a name="cmd.datefinnish"></a><a href="#cmd.datefinnish">\datefinnish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datefinnish">401</a></li> -<li><a name="cmd.datefrench"></a><a href="#cmd.datefrench">\datefrench</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datefrench">401</a></li> -<li><a name="cmd.dategerman"></a><a href="#cmd.dategerman">\dategerman</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dategerman">401</a></li> -<li><a name="cmd.dateitalian"></a><a href="#cmd.dateitalian">\dateitalian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateitalian">401</a></li> -<li><a name="cmd.datename"></a><a href="#cmd.datename">\datename</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datename">402</a></li> -<li><a name="cmd.datenaustrian"></a><a href="#cmd.datenaustrian">\datenaustrian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datenaustrian">401</a></li> -<li><a name="cmd.datengerman"></a><a href="#cmd.datengerman">\datengerman</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datengerman">401</a></li> -<li><a name="cmd.datenorsk"></a><a href="#cmd.datenorsk">\datenorsk</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datenorsk">401</a></li> -<li><a name="cmd.datespanish"></a><a href="#cmd.datespanish">\datespanish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datespanish">401</a></li> -<li><a name="cmd.dateswedish"></a><a href="#cmd.dateswedish">\dateswedish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateswedish">401</a></li> +<li><a name="cmd.dateUKenglish"></a><a href="#cmd.dateUKenglish">\dateUKenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateUKenglish">430</a></li> +<li><a name="cmd.dateUSenglish"></a><a href="#cmd.dateUSenglish">\dateUSenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateUSenglish">430</a></li> +<li><a name="cmd.dateamerican"></a><a href="#cmd.dateamerican">\dateamerican</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateamerican">430</a></li> +<li><a name="cmd.dateaustrian"></a><a href="#cmd.dateaustrian">\dateaustrian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateaustrian">430</a></li> +<li><a name="cmd.datebritish"></a><a href="#cmd.datebritish">\datebritish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datebritish">430</a></li> +<li><a name="cmd.datecroatian"></a><a href="#cmd.datecroatian">\datecroatian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datecroatian">430</a></li> +<li><a name="cmd.datedutch"></a><a href="#cmd.datedutch">\datedutch</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datedutch">430</a></li> +<li><a name="cmd.dateenglish"></a><a href="#cmd.dateenglish">\dateenglish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateenglish">430</a></li> +<li><a name="cmd.datefinnish"></a><a href="#cmd.datefinnish">\datefinnish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datefinnish">430</a></li> +<li><a name="cmd.datefrench"></a><a href="#cmd.datefrench">\datefrench</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datefrench">430</a></li> +<li><a name="cmd.dategerman"></a><a href="#cmd.dategerman">\dategerman</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dategerman">430</a></li> +<li><a name="cmd.dateitalian"></a><a href="#cmd.dateitalian">\dateitalian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateitalian">430</a></li> +<li><a name="cmd.datename"></a><a href="#cmd.datename">\datename</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datename">431</a></li> +<li><a name="cmd.datenaustrian"></a><a href="#cmd.datenaustrian">\datenaustrian</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datenaustrian">430</a></li> +<li><a name="cmd.datengerman"></a><a href="#cmd.datengerman">\datengerman</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datengerman">430</a></li> +<li><a name="cmd.datenorsk"></a><a href="#cmd.datenorsk">\datenorsk</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datenorsk">430</a></li> +<li><a name="cmd.datespanish"></a><a href="#cmd.datespanish">\datespanish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.datespanish">430</a></li> +<li><a name="cmd.dateswedish"></a><a href="#cmd.dateswedish">\dateswedish</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.dateswedish">430</a></li> <li><a name="cmd.dedication"></a><a href="#cmd.dedication">\dedication</a> --> <a href="scrguien.pdf#maincls.cmd.dedication">64</a></li> -<li><a name="cmd.defaultreffields"></a><a href="#cmd.defaultreffields">\defaultreffields</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.defaultreffields">393</a></li> -<li><a name="cmd.defcaptionname"></a><a href="#cmd.defcaptionname">\defcaptionname</a> --> <a href="scrguien.pdf#scrbase.cmd.defcaptionname">264</a></li> +<li><a name="cmd.defaultreffields"></a><a href="#cmd.defaultreffields">\defaultreffields</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.defaultreffields">422</a></li> +<li><a name="cmd.defcaptionname"></a><a href="#cmd.defcaptionname">\defcaptionname</a> --> <a href="scrguien.pdf#scrbase.cmd.defcaptionname">281</a></li> <li><a name="cmd.deffootnote"></a><a href="#cmd.deffootnote">\deffootnote</a> --> <a href="scrguien.pdf#maincls.cmd.deffootnote">83</a></li> <li><a name="cmd.deffootnotemark"></a><a href="#cmd.deffootnotemark">\deffootnotemark</a> --> <a href="scrguien.pdf#maincls.cmd.deffootnotemark">83</a></li> -<li><a name="cmd.defpagestyle"></a><a href="#cmd.defpagestyle">\defpagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.defpagestyle">339</a></li> -<li><a name="cmd.defpairofpagestyles"></a><a href="#cmd.defpairofpagestyles">\defpairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.defpairofpagestyles">335</a></li> -<li><a name="cmd.deftocheading"></a><a href="#cmd.deftocheading">\deftocheading</a> --> <a href="scrguien.pdf#tocbasic.cmd.deftocheading">291</a></li> -<li><a name="cmd.deftriplepagestyle"></a><a href="#cmd.deftriplepagestyle">\deftriplepagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.deftriplepagestyle">337</a></li> -<li><a name="cmd.deftripstyle"></a><a href="#cmd.deftripstyle">\deftripstyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.deftripstyle">339</a></li> +<li><a name="cmd.defpagestyle"></a><a href="#cmd.defpagestyle">\defpagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.defpagestyle">368</a></li> +<li><a name="cmd.defpairofpagestyles"></a><a href="#cmd.defpairofpagestyles">\defpairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.defpairofpagestyles">364</a></li> +<li><a name="cmd.deftocheading"></a><a href="#cmd.deftocheading">\deftocheading</a> --> <a href="scrguien.pdf#tocbasic.cmd.deftocheading">308</a></li> +<li><a name="cmd.deftriplepagestyle"></a><a href="#cmd.deftriplepagestyle">\deftriplepagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.deftriplepagestyle">366</a></li> +<li><a name="cmd.deftripstyle"></a><a href="#cmd.deftripstyle">\deftripstyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.deftripstyle">368</a></li> <li><a name="cmd.dictum"></a><a href="#cmd.dictum">\dictum</a> --> <a href="scrguien.pdf#maincls.cmd.dictum">104</a></li> <li><a name="cmd.dictumauthorformat"></a><a href="#cmd.dictumauthorformat">\dictumauthorformat</a> --> <a href="scrguien.pdf#maincls.cmd.dictumauthorformat">104</a></li> <li><a name="cmd.dictumrule"></a><a href="#cmd.dictumrule">\dictumrule</a> --> <a href="scrguien.pdf#maincls.cmd.dictumrule">104</a></li> <li><a name="cmd.dictumwidth"></a><a href="#cmd.dictumwidth">\dictumwidth</a> --> <a href="scrguien.pdf#maincls.cmd.dictumwidth">104</a></li> <li><a name="cmd.documentclass"></a><a href="#cmd.documentclass">\documentclass</a> --> <a href="scrguien.pdf#typearea.cmd.documentclass">28</a></li> -<li><a name="cmd.doforeachtocfile"></a><a href="#cmd.doforeachtocfile">\doforeachtocfile</a> --> <a href="scrguien.pdf#tocbasic.cmd.doforeachtocfile">287</a></li> -<li><a name="cmd.edgesize"></a><a href="#cmd.edgesize">\edgesize</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.edgesize">398</a></li> -<li><a name="cmd.emailname"></a><a href="#cmd.emailname">\emailname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.emailname">402</a></li> +<li><a name="cmd.doforeachtocfile"></a><a href="#cmd.doforeachtocfile">\doforeachtocfile</a> --> <a href="scrguien.pdf#tocbasic.cmd.doforeachtocfile">304</a></li> +<li><a name="cmd.edgesize"></a><a href="#cmd.edgesize">\edgesize</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.edgesize">427</a></li> +<li><a name="cmd.ellipsispar"></a><a href="#cmd.ellipsispar">\ellipsispar</a> --> <a href="scrguien.pdf#scrjura.cmd.ellipsispar">250</a></li> +<li><a name="cmd.emailname"></a><a href="#cmd.emailname">\emailname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.emailname">431</a></li> <li><a name="cmd.encl"></a><a href="#cmd.encl">\encl</a> --> <a href="scrguien.pdf#scrlttr2.cmd.encl">151</a></li> -<li><a name="cmd.enclname"></a><a href="#cmd.enclname">\enclname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.enclname">402</a></li> +<li><a name="cmd.enclname"></a><a href="#cmd.enclname">\enclname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.enclname">431</a></li> <li><a name="cmd.extratitle"></a><a href="#cmd.extratitle">\extratitle</a> --> <a href="scrguien.pdf#maincls.cmd.extratitle">61</a></li> -<li><a name="cmd.faxname"></a><a href="#cmd.faxname">\faxname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.faxname">402</a></li> +<li><a name="cmd.faxname"></a><a href="#cmd.faxname">\faxname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.faxname">431</a></li> <li><a name="cmd.figureformat"></a><a href="#cmd.figureformat">\figureformat</a> --> <a href="scrguien.pdf#maincls.cmd.figureformat">126</a></li> <li><a name="cmd.flushbottom"></a><a href="#cmd.flushbottom">\flushbottom</a> --> <a href="scrguien.pdf#maincls.cmd.flushbottom">51</a></li> <li><a name="cmd.footnote"></a><a href="#cmd.footnote">\footnote</a> --> <a href="scrguien.pdf#maincls.cmd.footnote">81</a></li> @@ -446,47 +475,47 @@ <li><a name="cmd.footnotetext"></a><a href="#cmd.footnotetext">\footnotetext</a> --> <a href="scrguien.pdf#maincls.cmd.footnotetext">81</a></li> <li><a name="cmd.footref"></a><a href="#cmd.footref">\footref</a> --> <a href="scrguien.pdf#maincls.cmd.footref">82</a></li> <li><a name="cmd.frontmatter"></a><a href="#cmd.frontmatter">\frontmatter</a> --> <a href="scrguien.pdf#maincls.cmd.frontmatter">84</a></li> -<li><a name="cmd.headfromname"></a><a href="#cmd.headfromname">\headfromname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.headfromname">402</a></li> +<li><a name="cmd.headfromname"></a><a href="#cmd.headfromname">\headfromname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.headfromname">431</a></li> <li><a name="cmd.headmark"></a><a href="#cmd.headmark">\headmark</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.headmark">222</a></li> -<li><a name="cmd.headtoname"></a><a href="#cmd.headtoname">\headtoname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.headtoname">402</a></li> -<li><a name="cmd.if@atdocument"></a><a href="#cmd.if@atdocument">\if@atdocument</a> --> <a href="scrguien.pdf#scrbase.cmd.if@atdocument">263</a></li> -<li><a name="cmd.if@chapter"></a><a href="#cmd.if@chapter">\if@chapter</a> --> <a href="scrguien.pdf#scrlayer.cmd.if@chapter">307</a></li> -<li><a name="cmd.if@mainmatter"></a><a href="#cmd.if@mainmatter">\if@mainmatter</a> --> <a href="scrguien.pdf#scrlayer.cmd.if@mainmatter">307</a></li> -<li><a name="cmd.ifVTeX"></a><a href="#cmd.ifVTeX">\ifVTeX</a> --> <a href="scrguien.pdf#scrbase.cmd.ifVTeX">260</a></li> -<li><a name="cmd.ifattoclist"></a><a href="#cmd.ifattoclist">\ifattoclist</a> --> <a href="scrguien.pdf#tocbasic.cmd.ifattoclist">284</a></li> -<li><a name="cmd.ifdimen"></a><a href="#cmd.ifdimen">\ifdimen</a> --> <a href="scrguien.pdf#scrbase.cmd.ifdimen">263</a></li> -<li><a name="cmd.ifdvioutput"></a><a href="#cmd.ifdvioutput">\ifdvioutput</a> --> <a href="scrguien.pdf#scrbase.cmd.ifdvioutput">261</a></li> -<li><a name="cmd.ifiscount"></a><a href="#cmd.ifiscount">\ifiscount</a> --> <a href="scrguien.pdf#scrbase.cmd.ifiscount">262</a></li> -<li><a name="cmd.ifiscounter"></a><a href="#cmd.ifiscounter">\ifiscounter</a> --> <a href="scrguien.pdf#scrbase.cmd.ifiscounter">263</a></li> -<li><a name="cmd.ifisdimen"></a><a href="#cmd.ifisdimen">\ifisdimen</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisdimen">261</a></li> -<li><a name="cmd.ifisdimension"></a><a href="#cmd.ifisdimension">\ifisdimension</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisdimension">261</a></li> -<li><a name="cmd.ifisdimexpr"></a><a href="#cmd.ifisdimexpr">\ifisdimexpr</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisdimexpr">261</a></li> -<li><a name="cmd.ifisglue"></a><a href="#cmd.ifisglue">\ifisglue</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisglue">262</a></li> -<li><a name="cmd.ifisglueexpr"></a><a href="#cmd.ifisglueexpr">\ifisglueexpr</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisglueexpr">262</a></li> -<li><a name="cmd.ifisinteger"></a><a href="#cmd.ifisinteger">\ifisinteger</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisinteger">262</a></li> -<li><a name="cmd.ifisnumexpr"></a><a href="#cmd.ifisnumexpr">\ifisnumexpr</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisnumexpr">262</a></li> -<li><a name="cmd.ifisskip"></a><a href="#cmd.ifisskip">\ifisskip</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisskip">262</a></li> +<li><a name="cmd.headtoname"></a><a href="#cmd.headtoname">\headtoname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.headtoname">431</a></li> +<li><a name="cmd.if@atdocument"></a><a href="#cmd.if@atdocument">\if@atdocument</a> --> <a href="scrguien.pdf#scrbase.cmd.if@atdocument">280</a></li> +<li><a name="cmd.if@chapter"></a><a href="#cmd.if@chapter">\if@chapter</a> --> <a href="scrguien.pdf#scrlayer.cmd.if@chapter">336</a></li> +<li><a name="cmd.if@mainmatter"></a><a href="#cmd.if@mainmatter">\if@mainmatter</a> --> <a href="scrguien.pdf#scrlayer.cmd.if@mainmatter">336</a></li> +<li><a name="cmd.ifVTeX"></a><a href="#cmd.ifVTeX">\ifVTeX</a> --> <a href="scrguien.pdf#scrbase.cmd.ifVTeX">277</a></li> +<li><a name="cmd.ifattoclist"></a><a href="#cmd.ifattoclist">\ifattoclist</a> --> <a href="scrguien.pdf#tocbasic.cmd.ifattoclist">301</a></li> +<li><a name="cmd.ifdimen"></a><a href="#cmd.ifdimen">\ifdimen</a> --> <a href="scrguien.pdf#scrbase.cmd.ifdimen">280</a></li> +<li><a name="cmd.ifdvioutput"></a><a href="#cmd.ifdvioutput">\ifdvioutput</a> --> <a href="scrguien.pdf#scrbase.cmd.ifdvioutput">278</a></li> +<li><a name="cmd.ifiscount"></a><a href="#cmd.ifiscount">\ifiscount</a> --> <a href="scrguien.pdf#scrbase.cmd.ifiscount">279</a></li> +<li><a name="cmd.ifiscounter"></a><a href="#cmd.ifiscounter">\ifiscounter</a> --> <a href="scrguien.pdf#scrbase.cmd.ifiscounter">280</a></li> +<li><a name="cmd.ifisdimen"></a><a href="#cmd.ifisdimen">\ifisdimen</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisdimen">278</a></li> +<li><a name="cmd.ifisdimension"></a><a href="#cmd.ifisdimension">\ifisdimension</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisdimension">279</a></li> +<li><a name="cmd.ifisdimexpr"></a><a href="#cmd.ifisdimexpr">\ifisdimexpr</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisdimexpr">279</a></li> +<li><a name="cmd.ifisglue"></a><a href="#cmd.ifisglue">\ifisglue</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisglue">279</a></li> +<li><a name="cmd.ifisglueexpr"></a><a href="#cmd.ifisglueexpr">\ifisglueexpr</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisglueexpr">279</a></li> +<li><a name="cmd.ifisinteger"></a><a href="#cmd.ifisinteger">\ifisinteger</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisinteger">279</a></li> +<li><a name="cmd.ifisnumexpr"></a><a href="#cmd.ifisnumexpr">\ifisnumexpr</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisnumexpr">280</a></li> +<li><a name="cmd.ifisskip"></a><a href="#cmd.ifisskip">\ifisskip</a> --> <a href="scrguien.pdf#scrbase.cmd.ifisskip">279</a></li> <li><a name="cmd.ifkomavar"></a><a href="#cmd.ifkomavar">\ifkomavar</a> --> <a href="scrguien.pdf#scrlttr2.cmd.ifkomavar">141</a></li> -<li><a name="cmd.ifkomavarempty*"></a><a href="#cmd.ifkomavarempty*">\ifkomavarempty*</a> --> <a href="scrguien.pdf#scrlttr2.cmd.ifkomavarempty*">141</a>, <a href="scrguien.pdf#scrlttr2-experts.cmd.ifkomavarempty*">395</a></li> -<li><a name="cmd.ifkomavarempty"></a><a href="#cmd.ifkomavarempty">\ifkomavarempty</a> --> <a href="scrguien.pdf#scrlttr2.cmd.ifkomavarempty">141</a>, <a href="scrguien.pdf#scrlttr2-experts.cmd.ifkomavarempty">395</a></li> -<li><a name="cmd.ifnotundefined"></a><a href="#cmd.ifnotundefined">\ifnotundefined</a> --> <a href="scrguien.pdf#scrbase.cmd.ifnotundefined">261</a></li> -<li><a name="cmd.ifnumber"></a><a href="#cmd.ifnumber">\ifnumber</a> --> <a href="scrguien.pdf#scrbase.cmd.ifnumber">263</a></li> +<li><a name="cmd.ifkomavarempty*"></a><a href="#cmd.ifkomavarempty*">\ifkomavarempty*</a> --> <a href="scrguien.pdf#scrlttr2.cmd.ifkomavarempty*">141</a>, <a href="scrguien.pdf#scrlttr2-experts.cmd.ifkomavarempty*">424</a></li> +<li><a name="cmd.ifkomavarempty"></a><a href="#cmd.ifkomavarempty">\ifkomavarempty</a> --> <a href="scrguien.pdf#scrlttr2.cmd.ifkomavarempty">141</a>, <a href="scrguien.pdf#scrlttr2-experts.cmd.ifkomavarempty">424</a></li> +<li><a name="cmd.ifnotundefined"></a><a href="#cmd.ifnotundefined">\ifnotundefined</a> --> <a href="scrguien.pdf#scrbase.cmd.ifnotundefined">278</a></li> +<li><a name="cmd.ifnumber"></a><a href="#cmd.ifnumber">\ifnumber</a> --> <a href="scrguien.pdf#scrbase.cmd.ifnumber">280</a></li> <li><a name="cmd.ifnumbered"></a><a href="#cmd.ifnumbered">\ifnumbered</a> --> <a href="scrguien.pdf#maincls.cmd.ifnumbered">102</a></li> <li><a name="cmd.ifoot*"></a><a href="#cmd.ifoot*">\ifoot*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.ifoot*">217</a></li> <li><a name="cmd.ifoot"></a><a href="#cmd.ifoot">\ifoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.ifoot">216</a></li> -<li><a name="cmd.ifpdfoutput"></a><a href="#cmd.ifpdfoutput">\ifpdfoutput</a> --> <a href="scrguien.pdf#scrbase.cmd.ifpdfoutput">260</a></li> -<li><a name="cmd.ifpdftex"></a><a href="#cmd.ifpdftex">\ifpdftex</a> --> <a href="scrguien.pdf#scrbase.cmd.ifpdftex">260</a></li> -<li><a name="cmd.ifpsoutput"></a><a href="#cmd.ifpsoutput">\ifpsoutput</a> --> <a href="scrguien.pdf#scrbase.cmd.ifpsoutput">260</a></li> -<li><a name="cmd.ifstr"></a><a href="#cmd.ifstr">\ifstr</a> --> <a href="scrguien.pdf#scrbase.cmd.ifstr">261</a></li> -<li><a name="cmd.ifstrstart"></a><a href="#cmd.ifstrstart">\ifstrstart</a> --> <a href="scrguien.pdf#scrbase.cmd.ifstrstart">261</a></li> +<li><a name="cmd.ifpdfoutput"></a><a href="#cmd.ifpdfoutput">\ifpdfoutput</a> --> <a href="scrguien.pdf#scrbase.cmd.ifpdfoutput">278</a></li> +<li><a name="cmd.ifpdftex"></a><a href="#cmd.ifpdftex">\ifpdftex</a> --> <a href="scrguien.pdf#scrbase.cmd.ifpdftex">277</a></li> +<li><a name="cmd.ifpsoutput"></a><a href="#cmd.ifpsoutput">\ifpsoutput</a> --> <a href="scrguien.pdf#scrbase.cmd.ifpsoutput">278</a></li> +<li><a name="cmd.ifstr"></a><a href="#cmd.ifstr">\ifstr</a> --> <a href="scrguien.pdf#scrbase.cmd.ifstr">278</a></li> +<li><a name="cmd.ifstrstart"></a><a href="#cmd.ifstrstart">\ifstrstart</a> --> <a href="scrguien.pdf#scrbase.cmd.ifstrstart">278</a></li> <li><a name="cmd.ifthispageodd"></a><a href="#cmd.ifthispageodd">\ifthispageodd</a> --> <a href="scrguien.pdf#maincls.cmd.ifthispageodd">72</a></li> -<li><a name="cmd.iftocfeature"></a><a href="#cmd.iftocfeature">\iftocfeature</a> --> <a href="scrguien.pdf#tocbasic.cmd.iftocfeature">294</a></li> -<li><a name="cmd.ifundefinedorrelax"></a><a href="#cmd.ifundefinedorrelax">\ifundefinedorrelax</a> --> <a href="scrguien.pdf#scrbase.cmd.ifundefinedorrelax">260</a></li> +<li><a name="cmd.iftocfeature"></a><a href="#cmd.iftocfeature">\iftocfeature</a> --> <a href="scrguien.pdf#tocbasic.cmd.iftocfeature">311</a></li> +<li><a name="cmd.ifundefinedorrelax"></a><a href="#cmd.ifundefinedorrelax">\ifundefinedorrelax</a> --> <a href="scrguien.pdf#scrbase.cmd.ifundefinedorrelax">277</a></li> <li><a name="cmd.ifunnumbered"></a><a href="#cmd.ifunnumbered">\ifunnumbered</a> --> <a href="scrguien.pdf#maincls.cmd.ifunnumbered">102</a></li> <li><a name="cmd.ihead*"></a><a href="#cmd.ihead*">\ihead*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.ihead*">217</a></li> <li><a name="cmd.ihead"></a><a href="#cmd.ihead">\ihead</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.ihead">216</a></li> <li><a name="cmd.indexpagestyle"></a><a href="#cmd.indexpagestyle">\indexpagestyle</a> --> <a href="scrguien.pdf#maincls.cmd.indexpagestyle">76</a></li> -<li><a name="cmd.invoicename"></a><a href="#cmd.invoicename">\invoicename</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.invoicename">402</a></li> +<li><a name="cmd.invoicename"></a><a href="#cmd.invoicename">\invoicename</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.invoicename">431</a></li> <li><a name="cmd.item"></a><a href="#cmd.item">\item</a> --> <a href="scrguien.pdf#maincls.cmd.item">106</a></li> <li><a name="cmd.labelenumi"></a><a href="#cmd.labelenumi">\labelenumi</a> --> <a href="scrguien.pdf#maincls.cmd.labelenumi">108</a></li> <li><a name="cmd.labelenumii"></a><a href="#cmd.labelenumii">\labelenumii</a> --> <a href="scrguien.pdf#maincls.cmd.labelenumii">108</a></li> @@ -496,56 +525,58 @@ <li><a name="cmd.labelitemii"></a><a href="#cmd.labelitemii">\labelitemii</a> --> <a href="scrguien.pdf#maincls.cmd.labelitemii">106</a></li> <li><a name="cmd.labelitemiii"></a><a href="#cmd.labelitemiii">\labelitemiii</a> --> <a href="scrguien.pdf#maincls.cmd.labelitemiii">106</a></li> <li><a name="cmd.labelitemiv"></a><a href="#cmd.labelitemiv">\labelitemiv</a> --> <a href="scrguien.pdf#maincls.cmd.labelitemiv">106</a></li> -<li><a name="cmd.layercontentsmeasure"></a><a href="#cmd.layercontentsmeasure">\layercontentsmeasure</a> --> <a href="scrguien.pdf#scrlayer.cmd.layercontentsmeasure">318</a></li> -<li><a name="cmd.layerhalign"></a><a href="#cmd.layerhalign">\layerhalign</a> --> <a href="scrguien.pdf#scrlayer.cmd.layerhalign">316</a></li> -<li><a name="cmd.layerheight"></a><a href="#cmd.layerheight">\layerheight</a> --> <a href="scrguien.pdf#scrlayer.cmd.layerheight">316</a></li> -<li><a name="cmd.layervalign"></a><a href="#cmd.layervalign">\layervalign</a> --> <a href="scrguien.pdf#scrlayer.cmd.layervalign">316</a></li> -<li><a name="cmd.layerwidth"></a><a href="#cmd.layerwidth">\layerwidth</a> --> <a href="scrguien.pdf#scrlayer.cmd.layerwidth">316</a></li> -<li><a name="cmd.layerxoffset"></a><a href="#cmd.layerxoffset">\layerxoffset</a> --> <a href="scrguien.pdf#scrlayer.cmd.layerxoffset">316</a></li> -<li><a name="cmd.layeryoffset"></a><a href="#cmd.layeryoffset">\layeryoffset</a> --> <a href="scrguien.pdf#scrlayer.cmd.layeryoffset">316</a></li> +<li><a name="cmd.layercontentsmeasure"></a><a href="#cmd.layercontentsmeasure">\layercontentsmeasure</a> --> <a href="scrguien.pdf#scrlayer.cmd.layercontentsmeasure">347</a></li> +<li><a name="cmd.layerhalign"></a><a href="#cmd.layerhalign">\layerhalign</a> --> <a href="scrguien.pdf#scrlayer.cmd.layerhalign">345</a></li> +<li><a name="cmd.layerheight"></a><a href="#cmd.layerheight">\layerheight</a> --> <a href="scrguien.pdf#scrlayer.cmd.layerheight">345</a></li> +<li><a name="cmd.layervalign"></a><a href="#cmd.layervalign">\layervalign</a> --> <a href="scrguien.pdf#scrlayer.cmd.layervalign">345</a></li> +<li><a name="cmd.layerwidth"></a><a href="#cmd.layerwidth">\layerwidth</a> --> <a href="scrguien.pdf#scrlayer.cmd.layerwidth">345</a></li> +<li><a name="cmd.layerxoffset"></a><a href="#cmd.layerxoffset">\layerxoffset</a> --> <a href="scrguien.pdf#scrlayer.cmd.layerxoffset">345</a></li> +<li><a name="cmd.layeryoffset"></a><a href="#cmd.layeryoffset">\layeryoffset</a> --> <a href="scrguien.pdf#scrlayer.cmd.layeryoffset">345</a></li> <li><a name="cmd.lefoot*"></a><a href="#cmd.lefoot*">\lefoot*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.lefoot*">215</a></li> <li><a name="cmd.lefoot"></a><a href="#cmd.lefoot">\lefoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.lefoot">213</a></li> -<li><a name="cmd.leftbotmark"></a><a href="#cmd.leftbotmark">\leftbotmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.leftbotmark">328</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.leftbotmark">333</a></li> -<li><a name="cmd.leftfirstmark"></a><a href="#cmd.leftfirstmark">\leftfirstmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.leftfirstmark">328</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.leftfirstmark">333</a></li> +<li><a name="cmd.leftbotmark"></a><a href="#cmd.leftbotmark">\leftbotmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.leftbotmark">357</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.leftbotmark">362</a></li> +<li><a name="cmd.leftfirstmark"></a><a href="#cmd.leftfirstmark">\leftfirstmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.leftfirstmark">357</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.leftfirstmark">362</a></li> <li><a name="cmd.leftmark"></a><a href="#cmd.leftmark">\leftmark</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.leftmark">222</a></li> -<li><a name="cmd.lefttopmark"></a><a href="#cmd.lefttopmark">\lefttopmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.lefttopmark">328</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.lefttopmark">333</a></li> +<li><a name="cmd.lefttopmark"></a><a href="#cmd.lefttopmark">\lefttopmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.lefttopmark">357</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.lefttopmark">362</a></li> <li><a name="cmd.lehead*"></a><a href="#cmd.lehead*">\lehead*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.lehead*">212</a></li> <li><a name="cmd.lehead"></a><a href="#cmd.lehead">\lehead</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.lehead">210</a></li> <li><a name="cmd.letterlastpage"></a><a href="#cmd.letterlastpage">\letterlastpage</a> --> <a href="scrguien.pdf#scrlttr2.cmd.letterlastpage">146</a></li> <li><a name="cmd.letterpagestyle"></a><a href="#cmd.letterpagestyle">\letterpagestyle</a> --> <a href="scrguien.pdf#scrlttr2.cmd.letterpagestyle">188</a></li> -<li><a name="cmd.listofeachtoc"></a><a href="#cmd.listofeachtoc">\listofeachtoc</a> --> <a href="scrguien.pdf#tocbasic.cmd.listofeachtoc">289</a></li> +<li><a name="cmd.listofeachtoc"></a><a href="#cmd.listofeachtoc">\listofeachtoc</a> --> <a href="scrguien.pdf#tocbasic.cmd.listofeachtoc">306</a></li> <li><a name="cmd.listoffigures"></a><a href="#cmd.listoffigures">\listoffigures</a> --> <a href="scrguien.pdf#maincls.cmd.listoffigures">131</a></li> -<li><a name="cmd.listofname"></a><a href="#cmd.listofname">\listofname</a> --> <a href="scrguien.pdf#tocbasic.cmd.listofname">289</a></li> +<li><a name="cmd.listofname"></a><a href="#cmd.listofname">\listofname</a> --> <a href="scrguien.pdf#tocbasic.cmd.listofname">306</a></li> <li><a name="cmd.listoftables"></a><a href="#cmd.listoftables">\listoftables</a> --> <a href="scrguien.pdf#maincls.cmd.listoftables">131</a></li> -<li><a name="cmd.listoftoc*"></a><a href="#cmd.listoftoc*">\listoftoc*</a> --> <a href="scrguien.pdf#tocbasic.cmd.listoftoc*">289</a></li> -<li><a name="cmd.listoftoc"></a><a href="#cmd.listoftoc">\listoftoc</a> --> <a href="scrguien.pdf#tocbasic.cmd.listoftoc">289</a></li> +<li><a name="cmd.listoftoc*"></a><a href="#cmd.listoftoc*">\listoftoc*</a> --> <a href="scrguien.pdf#tocbasic.cmd.listoftoc*">306</a></li> +<li><a name="cmd.listoftoc"></a><a href="#cmd.listoftoc">\listoftoc</a> --> <a href="scrguien.pdf#tocbasic.cmd.listoftoc">306</a></li> <li><a name="cmd.lofoot*"></a><a href="#cmd.lofoot*">\lofoot*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.lofoot*">215</a></li> <li><a name="cmd.lofoot"></a><a href="#cmd.lofoot">\lofoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.lofoot">213</a></li> <li><a name="cmd.lohead*"></a><a href="#cmd.lohead*">\lohead*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.lohead*">212</a></li> <li><a name="cmd.lohead"></a><a href="#cmd.lohead">\lohead</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.lohead">210</a></li> <li><a name="cmd.lowertitleback"></a><a href="#cmd.lowertitleback">\lowertitleback</a> --> <a href="scrguien.pdf#maincls.cmd.lowertitleback">64</a></li> <li><a name="cmd.mainmatter"></a><a href="#cmd.mainmatter">\mainmatter</a> --> <a href="scrguien.pdf#maincls.cmd.mainmatter">84</a></li> -<li><a name="cmd.makenote"></a><a href="#cmd.makenote">\makenote</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.makenote">348</a></li> +<li><a name="cmd.makenote"></a><a href="#cmd.makenote">\makenote</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.makenote">377</a></li> <li><a name="cmd.maketitle"></a><a href="#cmd.maketitle">\maketitle</a> --> <a href="scrguien.pdf#maincls.cmd.maketitle">60</a></li> <li><a name="cmd.manualmark"></a><a href="#cmd.manualmark">\manualmark</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.manualmark">219</a></li> -<li><a name="cmd.marginline"></a><a href="#cmd.marginline">\marginline</a> --> <a href="scrguien.pdf#maincls.cmd.marginline">131</a></li> -<li><a name="cmd.marginpar"></a><a href="#cmd.marginpar">\marginpar</a> --> <a href="scrguien.pdf#maincls.cmd.marginpar">131</a></li> +<li><a name="cmd.marginline"></a><a href="#cmd.marginline">\marginline</a> --> <a href="scrguien.pdf#maincls.cmd.marginline">132</a></li> +<li><a name="cmd.marginpar"></a><a href="#cmd.marginpar">\marginpar</a> --> <a href="scrguien.pdf#maincls.cmd.marginpar">132</a></li> <li><a name="cmd.markboth"></a><a href="#cmd.markboth">\markboth</a> --> <a href="scrguien.pdf#scrlttr2.cmd.markboth">191</a>, <a href="scrguien.pdf#scrlayer-scrpage.cmd.markboth">225</a>, <a href="scrguien.pdf#maincls.cmd.markboth">75</a></li> <li><a name="cmd.markleft"></a><a href="#cmd.markleft">\markleft</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.markleft">225</a></li> <li><a name="cmd.markright"></a><a href="#cmd.markright">\markright</a> --> <a href="scrguien.pdf#scrlttr2.cmd.markright">191</a>, <a href="scrguien.pdf#scrlayer-scrpage.cmd.markright">225</a>, <a href="scrguien.pdf#maincls.cmd.markright">75</a></li> <li><a name="cmd.minisec"></a><a href="#cmd.minisec">\minisec</a> --> <a href="scrguien.pdf#maincls.cmd.minisec">96</a></li> <li><a name="cmd.multfootsep"></a><a href="#cmd.multfootsep">\multfootsep</a> --> <a href="scrguien.pdf#maincls.cmd.multfootsep">81</a></li> <li><a name="cmd.multiplefootnoteseparator"></a><a href="#cmd.multiplefootnoteseparator">\multiplefootnoteseparator</a> --> <a href="scrguien.pdf#maincls.cmd.multiplefootnoteseparator">81</a></li> -<li><a name="cmd.myrefname"></a><a href="#cmd.myrefname">\myrefname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.myrefname">402</a></li> -<li><a name="cmd.newbibstyle"></a><a href="#cmd.newbibstyle">\newbibstyle</a> --> <a href="scrguien.pdf#maincls-experts.cmd.newbibstyle">376</a></li> -<li><a name="cmd.newblock"></a><a href="#cmd.newblock">\newblock</a> --> <a href="scrguien.pdf#maincls-experts.cmd.newblock">376</a></li> -<li><a name="cmd.newcaptionname"></a><a href="#cmd.newcaptionname">\newcaptionname</a> --> <a href="scrguien.pdf#scrbase.cmd.newcaptionname">264</a></li> -<li><a name="cmd.newkomafont"></a><a href="#cmd.newkomafont">\newkomafont</a> --> <a href="scrguien.pdf#maincls-experts.cmd.newkomafont">359</a></li> -<li><a name="cmd.newkomavar*"></a><a href="#cmd.newkomavar*">\newkomavar*</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.newkomavar*">393</a></li> -<li><a name="cmd.newkomavar"></a><a href="#cmd.newkomavar">\newkomavar</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.newkomavar">393</a></li> -<li><a name="cmd.newpagestyle"></a><a href="#cmd.newpagestyle">\newpagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.newpagestyle">339</a></li> -<li><a name="cmd.newpairofpagestyles"></a><a href="#cmd.newpairofpagestyles">\newpairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.newpairofpagestyles">335</a></li> -<li><a name="cmd.newtriplepagestyle"></a><a href="#cmd.newtriplepagestyle">\newtriplepagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.newtriplepagestyle">337</a></li> +<li><a name="cmd.myrefname"></a><a href="#cmd.myrefname">\myrefname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.myrefname">431</a></li> +<li><a name="cmd.newbibstyle"></a><a href="#cmd.newbibstyle">\newbibstyle</a> --> <a href="scrguien.pdf#maincls-experts.cmd.newbibstyle">406</a></li> +<li><a name="cmd.newblock"></a><a href="#cmd.newblock">\newblock</a> --> <a href="scrguien.pdf#maincls-experts.cmd.newblock">406</a></li> +<li><a name="cmd.newcaptionname"></a><a href="#cmd.newcaptionname">\newcaptionname</a> --> <a href="scrguien.pdf#scrbase.cmd.newcaptionname">281</a></li> +<li><a name="cmd.newkomafont"></a><a href="#cmd.newkomafont">\newkomafont</a> --> <a href="scrguien.pdf#maincls-experts.cmd.newkomafont">388</a></li> +<li><a name="cmd.newkomavar*"></a><a href="#cmd.newkomavar*">\newkomavar*</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.newkomavar*">422</a></li> +<li><a name="cmd.newkomavar"></a><a href="#cmd.newkomavar">\newkomavar</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.newkomavar">422</a></li> +<li><a name="cmd.newpagestyle"></a><a href="#cmd.newpagestyle">\newpagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.newpagestyle">368</a></li> +<li><a name="cmd.newpairofpagestyles"></a><a href="#cmd.newpairofpagestyles">\newpairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.newpairofpagestyles">364</a></li> +<li><a name="cmd.newtriplepagestyle"></a><a href="#cmd.newtriplepagestyle">\newtriplepagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.newtriplepagestyle">366</a></li> +<li><a name="cmd.nonumberline"></a><a href="#cmd.nonumberline">\nonumberline</a> --> <a href="scrguien.pdf#tocbasic.cmd.nonumberline">324</a></li> +<li><a name="cmd.numberline"></a><a href="#cmd.numberline">\numberline</a> --> <a href="scrguien.pdf#tocbasic.cmd.numberline">311</a></li> <li><a name="cmd.ofoot*"></a><a href="#cmd.ofoot*">\ofoot*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.ofoot*">217</a></li> <li><a name="cmd.ofoot"></a><a href="#cmd.ofoot">\ofoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.ofoot">216</a></li> <li><a name="cmd.ohead*"></a><a href="#cmd.ohead*">\ohead*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.ohead*">217</a></li> @@ -553,7 +584,7 @@ <li><a name="cmd.opening"></a><a href="#cmd.opening">\opening</a> --> <a href="scrguien.pdf#scrlttr2.cmd.opening">147</a></li> <li><a name="cmd.othersectionlevelsformat"></a><a href="#cmd.othersectionlevelsformat">\othersectionlevelsformat</a> --> <a href="scrguien.pdf#maincls.cmd.othersectionlevelsformat">98</a></li> <li><a name="cmd.pagemark"></a><a href="#cmd.pagemark">\pagemark</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.pagemark">222</a></li> -<li><a name="cmd.pagename"></a><a href="#cmd.pagename">\pagename</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.pagename">402</a></li> +<li><a name="cmd.pagename"></a><a href="#cmd.pagename">\pagename</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.pagename">431</a></li> <li><a name="cmd.pagenumbering"></a><a href="#cmd.pagenumbering">\pagenumbering</a> --> <a href="scrguien.pdf#maincls.cmd.pagenumbering">77</a></li> <li><a name="cmd.pagestyle"></a><a href="#cmd.pagestyle">\pagestyle</a> --> <a href="scrguien.pdf#scrlttr2.cmd.pagestyle">189</a>, <a href="scrguien.pdf#maincls.cmd.pagestyle">73</a></li> <li><a name="cmd.paragraph*"></a><a href="#cmd.paragraph*">\paragraph*</a> --> <a href="scrguien.pdf#maincls.cmd.paragraph*">95</a></li> @@ -562,32 +593,37 @@ <li><a name="cmd.paragraphmark"></a><a href="#cmd.paragraphmark">\paragraphmark</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.paragraphmark">224</a></li> <li><a name="cmd.paragraphmarkformat"></a><a href="#cmd.paragraphmarkformat">\paragraphmarkformat</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.paragraphmarkformat">224</a></li> <li><a name="cmd.paragraphnumdepth"></a><a href="#cmd.paragraphnumdepth">\paragraphnumdepth</a> --> <a href="scrguien.pdf#maincls.cmd.paragraphnumdepth">101</a></li> +<li><a name="cmd.parellipsis"></a><a href="#cmd.parellipsis">\parellipsis</a> --> <a href="scrguien.pdf#scrjura.cmd.parellipsis">250</a></li> +<li><a name="cmd.parformat"></a><a href="#cmd.parformat">\parformat</a> --> <a href="scrguien.pdf#scrjura.cmd.parformat">250</a></li> +<li><a name="cmd.parformatseparation"></a><a href="#cmd.parformatseparation">\parformatseparation</a> --> <a href="scrguien.pdf#scrjura.cmd.parformatseparation">250</a></li> +<li><a name="cmd.parname"></a><a href="#cmd.parname">\parname</a> --> <a href="scrguien.pdf#scrjura.cmd.parname">255</a></li> +<li><a name="cmd.parshortname"></a><a href="#cmd.parshortname">\parshortname</a> --> <a href="scrguien.pdf#scrjura.cmd.parshortname">255</a></li> <li><a name="cmd.part*"></a><a href="#cmd.part*">\part*</a> --> <a href="scrguien.pdf#maincls.cmd.part*">95</a></li> <li><a name="cmd.part"></a><a href="#cmd.part">\part</a> --> <a href="scrguien.pdf#maincls.cmd.part">90</a></li> <li><a name="cmd.partformat"></a><a href="#cmd.partformat">\partformat</a> --> <a href="scrguien.pdf#maincls.cmd.partformat">98</a></li> -<li><a name="cmd.partheademptypage"></a><a href="#cmd.partheademptypage">\partheademptypage</a> --> <a href="scrguien.pdf#maincls-experts.cmd.partheademptypage">370</a></li> -<li><a name="cmd.partheadendvskip"></a><a href="#cmd.partheadendvskip">\partheadendvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.partheadendvskip">370</a></li> -<li><a name="cmd.partheadmidvskip"></a><a href="#cmd.partheadmidvskip">\partheadmidvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.partheadmidvskip">370</a></li> -<li><a name="cmd.partheadstartvskip"></a><a href="#cmd.partheadstartvskip">\partheadstartvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.partheadstartvskip">370</a></li> +<li><a name="cmd.partheademptypage"></a><a href="#cmd.partheademptypage">\partheademptypage</a> --> <a href="scrguien.pdf#maincls-experts.cmd.partheademptypage">399</a></li> +<li><a name="cmd.partheadendvskip"></a><a href="#cmd.partheadendvskip">\partheadendvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.partheadendvskip">399</a></li> +<li><a name="cmd.partheadmidvskip"></a><a href="#cmd.partheadmidvskip">\partheadmidvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.partheadmidvskip">399</a></li> +<li><a name="cmd.partheadstartvskip"></a><a href="#cmd.partheadstartvskip">\partheadstartvskip</a> --> <a href="scrguien.pdf#maincls-experts.cmd.partheadstartvskip">399</a></li> <li><a name="cmd.partmark"></a><a href="#cmd.partmark">\partmark</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.partmark">224</a></li> <li><a name="cmd.partmarkformat"></a><a href="#cmd.partmarkformat">\partmarkformat</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.partmarkformat">224</a></li> <li><a name="cmd.partnumdepth"></a><a href="#cmd.partnumdepth">\partnumdepth</a> --> <a href="scrguien.pdf#maincls.cmd.partnumdepth">101</a></li> <li><a name="cmd.partpagestyle"></a><a href="#cmd.partpagestyle">\partpagestyle</a> --> <a href="scrguien.pdf#maincls.cmd.partpagestyle">76</a></li> -<li><a name="cmd.phonename"></a><a href="#cmd.phonename">\phonename</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.phonename">402</a></li> -<li><a name="cmd.providecaptionname"></a><a href="#cmd.providecaptionname">\providecaptionname</a> --> <a href="scrguien.pdf#scrbase.cmd.providecaptionname">264</a></li> -<li><a name="cmd.providepagestyle"></a><a href="#cmd.providepagestyle">\providepagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.providepagestyle">339</a></li> -<li><a name="cmd.providepairofpagestyles"></a><a href="#cmd.providepairofpagestyles">\providepairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.providepairofpagestyles">335</a></li> -<li><a name="cmd.providetriplepagestyle"></a><a href="#cmd.providetriplepagestyle">\providetriplepagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.providetriplepagestyle">337</a></li> +<li><a name="cmd.phonename"></a><a href="#cmd.phonename">\phonename</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.phonename">431</a></li> +<li><a name="cmd.providecaptionname"></a><a href="#cmd.providecaptionname">\providecaptionname</a> --> <a href="scrguien.pdf#scrbase.cmd.providecaptionname">281</a></li> +<li><a name="cmd.providepagestyle"></a><a href="#cmd.providepagestyle">\providepagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.providepagestyle">368</a></li> +<li><a name="cmd.providepairofpagestyles"></a><a href="#cmd.providepairofpagestyles">\providepairofpagestyles</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.providepairofpagestyles">364</a></li> +<li><a name="cmd.providetriplepagestyle"></a><a href="#cmd.providetriplepagestyle">\providetriplepagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.providetriplepagestyle">366</a></li> <li><a name="cmd.ps"></a><a href="#cmd.ps">\ps</a> --> <a href="scrguien.pdf#scrlttr2.cmd.ps">149</a></li> <li><a name="cmd.publishers"></a><a href="#cmd.publishers">\publishers</a> --> <a href="scrguien.pdf#maincls.cmd.publishers">62</a></li> -<li><a name="cmd.putC"></a><a href="#cmd.putC">\putC</a> --> <a href="scrguien.pdf#scrlayer.cmd.putC">317</a></li> -<li><a name="cmd.putLL"></a><a href="#cmd.putLL">\putLL</a> --> <a href="scrguien.pdf#scrlayer.cmd.putLL">317</a></li> -<li><a name="cmd.putLR"></a><a href="#cmd.putLR">\putLR</a> --> <a href="scrguien.pdf#scrlayer.cmd.putLR">317</a></li> -<li><a name="cmd.putUL"></a><a href="#cmd.putUL">\putUL</a> --> <a href="scrguien.pdf#scrlayer.cmd.putUL">317</a></li> -<li><a name="cmd.putUR"></a><a href="#cmd.putUR">\putUR</a> --> <a href="scrguien.pdf#scrlayer.cmd.putUR">317</a></li> +<li><a name="cmd.putC"></a><a href="#cmd.putC">\putC</a> --> <a href="scrguien.pdf#scrlayer.cmd.putC">346</a></li> +<li><a name="cmd.putLL"></a><a href="#cmd.putLL">\putLL</a> --> <a href="scrguien.pdf#scrlayer.cmd.putLL">346</a></li> +<li><a name="cmd.putLR"></a><a href="#cmd.putLR">\putLR</a> --> <a href="scrguien.pdf#scrlayer.cmd.putLR">346</a></li> +<li><a name="cmd.putUL"></a><a href="#cmd.putUL">\putUL</a> --> <a href="scrguien.pdf#scrlayer.cmd.putUL">346</a></li> +<li><a name="cmd.putUR"></a><a href="#cmd.putUR">\putUR</a> --> <a href="scrguien.pdf#scrlayer.cmd.putUR">346</a></li> <li><a name="cmd.raggedbottom"></a><a href="#cmd.raggedbottom">\raggedbottom</a> --> <a href="scrguien.pdf#maincls.cmd.raggedbottom">51</a></li> <li><a name="cmd.raggedchapter"></a><a href="#cmd.raggedchapter">\raggedchapter</a> --> <a href="scrguien.pdf#maincls.cmd.raggedchapter">97</a></li> -<li><a name="cmd.raggedchapterentry"></a><a href="#cmd.raggedchapterentry">\raggedchapterentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.raggedchapterentry">359</a></li> +<li><a name="cmd.raggedchapterentry"></a><a href="#cmd.raggedchapterentry">\raggedchapterentry</a> --> <a href="scrguien.pdf#maincls-experts.cmd.raggedchapterentry">388</a></li> <li><a name="cmd.raggeddictum"></a><a href="#cmd.raggeddictum">\raggeddictum</a> --> <a href="scrguien.pdf#maincls.cmd.raggeddictum">104</a></li> <li><a name="cmd.raggeddictumauthor"></a><a href="#cmd.raggeddictumauthor">\raggeddictumauthor</a> --> <a href="scrguien.pdf#maincls.cmd.raggeddictumauthor">104</a></li> <li><a name="cmd.raggeddictumtext"></a><a href="#cmd.raggeddictumtext">\raggeddictumtext</a> --> <a href="scrguien.pdf#maincls.cmd.raggeddictumtext">104</a></li> @@ -595,44 +631,61 @@ <li><a name="cmd.raggedsection"></a><a href="#cmd.raggedsection">\raggedsection</a> --> <a href="scrguien.pdf#maincls.cmd.raggedsection">97</a></li> <li><a name="cmd.raggedsignature"></a><a href="#cmd.raggedsignature">\raggedsignature</a> --> <a href="scrguien.pdf#scrlttr2.cmd.raggedsignature">193</a></li> <li><a name="cmd.recalctypearea"></a><a href="#cmd.recalctypearea">\recalctypearea</a> --> <a href="scrguien.pdf#typearea.cmd.recalctypearea">36</a></li> +<li><a name="cmd.ref"></a><a href="#cmd.ref">\ref</a> --> <a href="scrguien.pdf#scrjura.cmd.ref">251</a></li> +<li><a name="cmd.refClause"></a><a href="#cmd.refClause">\refClause</a> --> <a href="scrguien.pdf#scrjura.cmd.refClause">252</a></li> +<li><a name="cmd.refClauseN"></a><a href="#cmd.refClauseN">\refClauseN</a> --> <a href="scrguien.pdf#scrjura.cmd.refClauseN">252</a></li> +<li><a name="cmd.refL"></a><a href="#cmd.refL">\refL</a> --> <a href="scrguien.pdf#scrjura.cmd.refL">251</a></li> +<li><a name="cmd.refN"></a><a href="#cmd.refN">\refN</a> --> <a href="scrguien.pdf#scrjura.cmd.refN">251</a></li> +<li><a name="cmd.refPar"></a><a href="#cmd.refPar">\refPar</a> --> <a href="scrguien.pdf#scrjura.cmd.refPar">252</a></li> +<li><a name="cmd.refParL"></a><a href="#cmd.refParL">\refParL</a> --> <a href="scrguien.pdf#scrjura.cmd.refParL">252</a></li> +<li><a name="cmd.refParN"></a><a href="#cmd.refParN">\refParN</a> --> <a href="scrguien.pdf#scrjura.cmd.refParN">252</a></li> +<li><a name="cmd.refParS"></a><a href="#cmd.refParS">\refParS</a> --> <a href="scrguien.pdf#scrjura.cmd.refParS">252</a></li> +<li><a name="cmd.refS"></a><a href="#cmd.refS">\refS</a> --> <a href="scrguien.pdf#scrjura.cmd.refS">251</a></li> +<li><a name="cmd.refSentence"></a><a href="#cmd.refSentence">\refSentence</a> --> <a href="scrguien.pdf#scrjura.cmd.refSentence">252</a></li> +<li><a name="cmd.refSentenceL"></a><a href="#cmd.refSentenceL">\refSentenceL</a> --> <a href="scrguien.pdf#scrjura.cmd.refSentenceL">252</a></li> +<li><a name="cmd.refSentenceN"></a><a href="#cmd.refSentenceN">\refSentenceN</a> --> <a href="scrguien.pdf#scrjura.cmd.refSentenceN">252</a></li> +<li><a name="cmd.refSentenceS"></a><a href="#cmd.refSentenceS">\refSentenceS</a> --> <a href="scrguien.pdf#scrjura.cmd.refSentenceS">252</a></li> <li><a name="cmd.refoot*"></a><a href="#cmd.refoot*">\refoot*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.refoot*">215</a></li> <li><a name="cmd.refoot"></a><a href="#cmd.refoot">\refoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.refoot">213</a></li> <li><a name="cmd.rehead*"></a><a href="#cmd.rehead*">\rehead*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.rehead*">212</a></li> <li><a name="cmd.rehead"></a><a href="#cmd.rehead">\rehead</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.rehead">210</a></li> -<li><a name="cmd.removefromtoclist"></a><a href="#cmd.removefromtoclist">\removefromtoclist</a> --> <a href="scrguien.pdf#tocbasic.cmd.removefromtoclist">286</a></li> -<li><a name="cmd.removereffields"></a><a href="#cmd.removereffields">\removereffields</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.removereffields">393</a></li> -<li><a name="cmd.renewcaptionname"></a><a href="#cmd.renewcaptionname">\renewcaptionname</a> --> <a href="scrguien.pdf#scrbase.cmd.renewcaptionname">264</a></li> -<li><a name="cmd.renewpagestyle"></a><a href="#cmd.renewpagestyle">\renewpagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.renewpagestyle">339</a></li> -<li><a name="cmd.renewpairofpagestyle"></a><a href="#cmd.renewpairofpagestyle">\renewpairofpagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.renewpairofpagestyle">335</a></li> -<li><a name="cmd.renewtriplepagestyle"></a><a href="#cmd.renewtriplepagestyle">\renewtriplepagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.renewtriplepagestyle">337</a></li> -<li><a name="cmd.rightbotmark"></a><a href="#cmd.rightbotmark">\rightbotmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.rightbotmark">328</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.rightbotmark">333</a></li> -<li><a name="cmd.rightfirstmark"></a><a href="#cmd.rightfirstmark">\rightfirstmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.rightfirstmark">328</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.rightfirstmark">333</a></li> +<li><a name="cmd.removefromtoclist"></a><a href="#cmd.removefromtoclist">\removefromtoclist</a> --> <a href="scrguien.pdf#tocbasic.cmd.removefromtoclist">303</a></li> +<li><a name="cmd.removereffields"></a><a href="#cmd.removereffields">\removereffields</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.removereffields">422</a></li> +<li><a name="cmd.renewcaptionname"></a><a href="#cmd.renewcaptionname">\renewcaptionname</a> --> <a href="scrguien.pdf#scrbase.cmd.renewcaptionname">281</a></li> +<li><a name="cmd.renewpagestyle"></a><a href="#cmd.renewpagestyle">\renewpagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.renewpagestyle">368</a></li> +<li><a name="cmd.renewpairofpagestyle"></a><a href="#cmd.renewpairofpagestyle">\renewpairofpagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.renewpairofpagestyle">364</a></li> +<li><a name="cmd.renewtriplepagestyle"></a><a href="#cmd.renewtriplepagestyle">\renewtriplepagestyle</a> --> <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.renewtriplepagestyle">366</a></li> +<li><a name="cmd.rightbotmark"></a><a href="#cmd.rightbotmark">\rightbotmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.rightbotmark">357</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.rightbotmark">362</a></li> +<li><a name="cmd.rightfirstmark"></a><a href="#cmd.rightfirstmark">\rightfirstmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.rightfirstmark">357</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.rightfirstmark">362</a></li> <li><a name="cmd.rightmark"></a><a href="#cmd.rightmark">\rightmark</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.rightmark">222</a></li> -<li><a name="cmd.righttopmark"></a><a href="#cmd.righttopmark">\righttopmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.righttopmark">328</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.righttopmark">333</a></li> +<li><a name="cmd.righttopmark"></a><a href="#cmd.righttopmark">\righttopmark</a> --> <a href="scrguien.pdf#scrlayer.cmd.righttopmark">357</a>, <a href="scrguien.pdf#scrlayer-scrpage-experts.cmd.righttopmark">362</a></li> <li><a name="cmd.rofoot*"></a><a href="#cmd.rofoot*">\rofoot*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.rofoot*">215</a></li> <li><a name="cmd.rofoot"></a><a href="#cmd.rofoot">\rofoot</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.rofoot">213</a></li> <li><a name="cmd.rohead*"></a><a href="#cmd.rohead*">\rohead*</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.rohead*">212</a></li> <li><a name="cmd.rohead"></a><a href="#cmd.rohead">\rohead</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.rohead">210</a></li> -<li><a name="cmd.scr@ifVTeX"></a><a href="#cmd.scr@ifVTeX">\scr@ifVTeX</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifVTeX">260</a></li> -<li><a name="cmd.scr@ifdvioutput"></a><a href="#cmd.scr@ifdvioutput">\scr@ifdvioutput</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifdvioutput">261</a></li> -<li><a name="cmd.scr@ifpdfoutput"></a><a href="#cmd.scr@ifpdfoutput">\scr@ifpdfoutput</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifpdfoutput">260</a></li> -<li><a name="cmd.scr@ifpdftex"></a><a href="#cmd.scr@ifpdftex">\scr@ifpdftex</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifpdftex">260</a></li> -<li><a name="cmd.scr@ifpsoutput"></a><a href="#cmd.scr@ifpsoutput">\scr@ifpsoutput</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifpsoutput">260</a></li> -<li><a name="cmd.scr@ifundefinedorrelax"></a><a href="#cmd.scr@ifundefinedorrelax">\scr@ifundefinedorrelax</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifundefinedorrelax">260</a></li> -<li><a name="cmd.scr@startsection"></a><a href="#cmd.scr@startsection">\scr@startsection</a> --> <a href="scrguien.pdf#maincls-experts.cmd.scr@startsection">375</a></li> -<li><a name="cmd.scrlayerAddCsToInterface"></a><a href="#cmd.scrlayerAddCsToInterface">\scrlayerAddCsToInterface</a> --> <a href="scrguien.pdf#scrlayer.cmd.scrlayerAddCsToInterface">330</a></li> -<li><a name="cmd.scrlayerAddToInterface"></a><a href="#cmd.scrlayerAddToInterface">\scrlayerAddToInterface</a> --> <a href="scrguien.pdf#scrlayer.cmd.scrlayerAddToInterface">330</a></li> -<li><a name="cmd.scrlayerInitInterface"></a><a href="#cmd.scrlayerInitInterface">\scrlayerInitInterface</a> --> <a href="scrguien.pdf#scrlayer.cmd.scrlayerInitInterface">330</a></li> -<li><a name="cmd.scrlayerOnAutoRemoveInterface"></a><a href="#cmd.scrlayerOnAutoRemoveInterface">\scrlayerOnAutoRemoveInterface</a> --> <a href="scrguien.pdf#scrlayer.cmd.scrlayerOnAutoRemoveInterface">330</a></li> +<li><a name="cmd.scr@ifVTeX"></a><a href="#cmd.scr@ifVTeX">\scr@ifVTeX</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifVTeX">277</a></li> +<li><a name="cmd.scr@ifdvioutput"></a><a href="#cmd.scr@ifdvioutput">\scr@ifdvioutput</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifdvioutput">278</a></li> +<li><a name="cmd.scr@ifpdfoutput"></a><a href="#cmd.scr@ifpdfoutput">\scr@ifpdfoutput</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifpdfoutput">278</a></li> +<li><a name="cmd.scr@ifpdftex"></a><a href="#cmd.scr@ifpdftex">\scr@ifpdftex</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifpdftex">277</a></li> +<li><a name="cmd.scr@ifpsoutput"></a><a href="#cmd.scr@ifpsoutput">\scr@ifpsoutput</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifpsoutput">278</a></li> +<li><a name="cmd.scr@ifundefinedorrelax"></a><a href="#cmd.scr@ifundefinedorrelax">\scr@ifundefinedorrelax</a> --> <a href="scrguien.pdf#scrbase.cmd.scr@ifundefinedorrelax">277</a></li> +<li><a name="cmd.scr@startsection"></a><a href="#cmd.scr@startsection">\scr@startsection</a> --> <a href="scrguien.pdf#maincls-experts.cmd.scr@startsection">404</a></li> +<li><a name="cmd.scrlayerAddCsToInterface"></a><a href="#cmd.scrlayerAddCsToInterface">\scrlayerAddCsToInterface</a> --> <a href="scrguien.pdf#scrlayer.cmd.scrlayerAddCsToInterface">359</a></li> +<li><a name="cmd.scrlayerAddToInterface"></a><a href="#cmd.scrlayerAddToInterface">\scrlayerAddToInterface</a> --> <a href="scrguien.pdf#scrlayer.cmd.scrlayerAddToInterface">359</a></li> +<li><a name="cmd.scrlayerInitInterface"></a><a href="#cmd.scrlayerInitInterface">\scrlayerInitInterface</a> --> <a href="scrguien.pdf#scrlayer.cmd.scrlayerInitInterface">359</a></li> +<li><a name="cmd.scrlayerOnAutoRemoveInterface"></a><a href="#cmd.scrlayerOnAutoRemoveInterface">\scrlayerOnAutoRemoveInterface</a> --> <a href="scrguien.pdf#scrlayer.cmd.scrlayerOnAutoRemoveInterface">359</a></li> <li><a name="cmd.section*"></a><a href="#cmd.section*">\section*</a> --> <a href="scrguien.pdf#maincls.cmd.section*">95</a></li> <li><a name="cmd.section"></a><a href="#cmd.section">\section</a> --> <a href="scrguien.pdf#maincls.cmd.section">90</a></li> -<li><a name="cmd.sectioncatchphraseformat"></a><a href="#cmd.sectioncatchphraseformat">\sectioncatchphraseformat</a> --> <a href="scrguien.pdf#maincls-experts.cmd.sectioncatchphraseformat">373</a></li> +<li><a name="cmd.sectioncatchphraseformat"></a><a href="#cmd.sectioncatchphraseformat">\sectioncatchphraseformat</a> --> <a href="scrguien.pdf#maincls-experts.cmd.sectioncatchphraseformat">403</a></li> <li><a name="cmd.sectionformat"></a><a href="#cmd.sectionformat">\sectionformat</a> --> <a href="scrguien.pdf#maincls.cmd.sectionformat">98</a></li> -<li><a name="cmd.sectionlinesformat"></a><a href="#cmd.sectionlinesformat">\sectionlinesformat</a> --> <a href="scrguien.pdf#maincls-experts.cmd.sectionlinesformat">373</a></li> +<li><a name="cmd.sectionlinesformat"></a><a href="#cmd.sectionlinesformat">\sectionlinesformat</a> --> <a href="scrguien.pdf#maincls-experts.cmd.sectionlinesformat">403</a></li> <li><a name="cmd.sectionmark"></a><a href="#cmd.sectionmark">\sectionmark</a> --> <a href="scrguien.pdf#maincls.cmd.sectionmark">100</a>, <a href="scrguien.pdf#scrlayer-scrpage.cmd.sectionmark">224</a></li> <li><a name="cmd.sectionmarkformat"></a><a href="#cmd.sectionmarkformat">\sectionmarkformat</a> --> <a href="scrguien.pdf#maincls.cmd.sectionmarkformat">100</a>, <a href="scrguien.pdf#scrlayer-scrpage.cmd.sectionmarkformat">224</a></li> <li><a name="cmd.sectionnumdepth"></a><a href="#cmd.sectionnumdepth">\sectionnumdepth</a> --> <a href="scrguien.pdf#maincls.cmd.sectionnumdepth">101</a></li> +<li><a name="cmd.sentencename"></a><a href="#cmd.sentencename">\sentencename</a> --> <a href="scrguien.pdf#scrjura.cmd.sentencename">255</a></li> +<li><a name="cmd.sentenceshortname"></a><a href="#cmd.sentenceshortname">\sentenceshortname</a> --> <a href="scrguien.pdf#scrjura.cmd.sentenceshortname">255</a></li> <li><a name="cmd.setbibpreamble"></a><a href="#cmd.setbibpreamble">\setbibpreamble</a> --> <a href="scrguien.pdf#maincls.cmd.setbibpreamble">134</a></li> +<li><a name="cmd.setcapdynwidth"></a><a href="#cmd.setcapdynwidth">\setcapdynwidth</a> --> <a href="scrguien.pdf#maincls.cmd.setcapdynwidth">127</a></li> <li><a name="cmd.setcaphanging"></a><a href="#cmd.setcaphanging">\setcaphanging</a> --> <a href="scrguien.pdf#maincls.cmd.setcaphanging">126</a></li> <li><a name="cmd.setcapindent*"></a><a href="#cmd.setcapindent*">\setcapindent*</a> --> <a href="scrguien.pdf#maincls.cmd.setcapindent*">126</a></li> <li><a name="cmd.setcapindent"></a><a href="#cmd.setcapindent">\setcapindent</a> --> <a href="scrguien.pdf#maincls.cmd.setcapindent">126</a></li> @@ -650,18 +703,18 @@ <li><a name="cmd.setkomavar*"></a><a href="#cmd.setkomavar*">\setkomavar*</a> --> <a href="scrguien.pdf#scrlttr2.cmd.setkomavar*">140</a></li> <li><a name="cmd.setkomavar"></a><a href="#cmd.setkomavar">\setkomavar</a> --> <a href="scrguien.pdf#scrlttr2.cmd.setkomavar">140</a></li> <li><a name="cmd.setlengthtoplength"></a><a href="#cmd.setlengthtoplength">\setlengthtoplength</a> --> <a href="scrguien.pdf#scrlttr2.cmd.setlengthtoplength">142</a></li> -<li><a name="cmd.setparsizes"></a><a href="#cmd.setparsizes">\setparsizes</a> --> <a href="scrguien.pdf#maincls-experts.cmd.setparsizes">361</a></li> +<li><a name="cmd.setparsizes"></a><a href="#cmd.setparsizes">\setparsizes</a> --> <a href="scrguien.pdf#maincls-experts.cmd.setparsizes">390</a></li> <li><a name="cmd.setpartpreamble"></a><a href="#cmd.setpartpreamble">\setpartpreamble</a> --> <a href="scrguien.pdf#maincls.cmd.setpartpreamble">102</a></li> -<li><a name="cmd.setshowstyle"></a><a href="#cmd.setshowstyle">\setshowstyle</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.setshowstyle">398</a></li> -<li><a name="cmd.setuptoc"></a><a href="#cmd.setuptoc">\setuptoc</a> --> <a href="scrguien.pdf#tocbasic.cmd.setuptoc">292</a></li> -<li><a name="cmd.showISOenvelope"></a><a href="#cmd.showISOenvelope">\showISOenvelope</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.showISOenvelope">398</a></li> -<li><a name="cmd.showUScheck"></a><a href="#cmd.showUScheck">\showUScheck</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.showUScheck">398</a></li> -<li><a name="cmd.showUScommercial"></a><a href="#cmd.showUScommercial">\showUScommercial</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.showUScommercial">398</a></li> -<li><a name="cmd.showenvelope"></a><a href="#cmd.showenvelope">\showenvelope</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.showenvelope">398</a></li> -<li><a name="cmd.showfields"></a><a href="#cmd.showfields">\showfields</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.showfields">397</a></li> -<li><a name="cmd.storeareas"></a><a href="#cmd.storeareas">\storeareas</a> --> <a href="scrguien.pdf#typearea-experts.cmd.storeareas">354</a></li> +<li><a name="cmd.setshowstyle"></a><a href="#cmd.setshowstyle">\setshowstyle</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.setshowstyle">427</a></li> +<li><a name="cmd.setuptoc"></a><a href="#cmd.setuptoc">\setuptoc</a> --> <a href="scrguien.pdf#tocbasic.cmd.setuptoc">309</a></li> +<li><a name="cmd.showISOenvelope"></a><a href="#cmd.showISOenvelope">\showISOenvelope</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.showISOenvelope">427</a></li> +<li><a name="cmd.showUScheck"></a><a href="#cmd.showUScheck">\showUScheck</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.showUScheck">427</a></li> +<li><a name="cmd.showUScommercial"></a><a href="#cmd.showUScommercial">\showUScommercial</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.showUScommercial">427</a></li> +<li><a name="cmd.showenvelope"></a><a href="#cmd.showenvelope">\showenvelope</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.showenvelope">427</a></li> +<li><a name="cmd.showfields"></a><a href="#cmd.showfields">\showfields</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.showfields">426</a></li> +<li><a name="cmd.storeareas"></a><a href="#cmd.storeareas">\storeareas</a> --> <a href="scrguien.pdf#typearea-experts.cmd.storeareas">383</a></li> <li><a name="cmd.subject"></a><a href="#cmd.subject">\subject</a> --> <a href="scrguien.pdf#maincls.cmd.subject">62</a></li> -<li><a name="cmd.subjectname"></a><a href="#cmd.subjectname">\subjectname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.subjectname">402</a></li> +<li><a name="cmd.subjectname"></a><a href="#cmd.subjectname">\subjectname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.subjectname">431</a></li> <li><a name="cmd.subparagraph*"></a><a href="#cmd.subparagraph*">\subparagraph*</a> --> <a href="scrguien.pdf#maincls.cmd.subparagraph*">95</a></li> <li><a name="cmd.subparagraph"></a><a href="#cmd.subparagraph">\subparagraph</a> --> <a href="scrguien.pdf#maincls.cmd.subparagraph">90</a></li> <li><a name="cmd.subparagraphformat"></a><a href="#cmd.subparagraphformat">\subparagraphformat</a> --> <a href="scrguien.pdf#maincls.cmd.subparagraphformat">98</a></li> @@ -681,8 +734,8 @@ <li><a name="cmd.subsubsectionmarkformat"></a><a href="#cmd.subsubsectionmarkformat">\subsubsectionmarkformat</a> --> <a href="scrguien.pdf#scrlayer-scrpage.cmd.subsubsectionmarkformat">224</a></li> <li><a name="cmd.subsubsectionnumdepth"></a><a href="#cmd.subsubsectionnumdepth">\subsubsectionnumdepth</a> --> <a href="scrguien.pdf#maincls.cmd.subsubsectionnumdepth">101</a></li> <li><a name="cmd.subtitle"></a><a href="#cmd.subtitle">\subtitle</a> --> <a href="scrguien.pdf#maincls.cmd.subtitle">62</a></li> -<li><a name="cmd.syncwithnotecolumn"></a><a href="#cmd.syncwithnotecolumn">\syncwithnotecolumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.syncwithnotecolumn">349</a></li> -<li><a name="cmd.syncwithnotecolumns"></a><a href="#cmd.syncwithnotecolumns">\syncwithnotecolumns</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.syncwithnotecolumns">351</a></li> +<li><a name="cmd.syncwithnotecolumn"></a><a href="#cmd.syncwithnotecolumn">\syncwithnotecolumn</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.syncwithnotecolumn">378</a></li> +<li><a name="cmd.syncwithnotecolumns"></a><a href="#cmd.syncwithnotecolumns">\syncwithnotecolumns</a> --> <a href="scrguien.pdf#scrlayer-notecolumn.cmd.syncwithnotecolumns">380</a></li> <li><a name="cmd.tableformat"></a><a href="#cmd.tableformat">\tableformat</a> --> <a href="scrguien.pdf#maincls.cmd.tableformat">126</a></li> <li><a name="cmd.tableofcontents"></a><a href="#cmd.tableofcontents">\tableofcontents</a> --> <a href="scrguien.pdf#maincls.cmd.tableofcontents">68</a></li> <li><a name="cmd.textsubscript"></a><a href="#cmd.textsubscript">\textsubscript</a> --> <a href="scrguien.pdf#maincls.cmd.textsubscript">53</a></li> @@ -693,37 +746,42 @@ <li><a name="cmd.theenumiii"></a><a href="#cmd.theenumiii">\theenumiii</a> --> <a href="scrguien.pdf#maincls.cmd.theenumiii">108</a></li> <li><a name="cmd.theenumiv"></a><a href="#cmd.theenumiv">\theenumiv</a> --> <a href="scrguien.pdf#maincls.cmd.theenumiv">108</a></li> <li><a name="cmd.thefootnotemark"></a><a href="#cmd.thefootnotemark">\thefootnotemark</a> --> <a href="scrguien.pdf#maincls.cmd.thefootnotemark">83</a></li> +<li><a name="cmd.thepar"></a><a href="#cmd.thepar">\thepar</a> --> <a href="scrguien.pdf#scrjura.cmd.thepar">250</a></li> +<li><a name="cmd.thesentence"></a><a href="#cmd.thesentence">\thesentence</a> --> <a href="scrguien.pdf#scrjura.cmd.thesentence">251</a></li> <li><a name="cmd.thisletter"></a><a href="#cmd.thisletter">\thisletter</a> --> <a href="scrguien.pdf#scrlttr2.cmd.thisletter">146</a></li> <li><a name="cmd.thispagestyle"></a><a href="#cmd.thispagestyle">\thispagestyle</a> --> <a href="scrguien.pdf#scrlttr2.cmd.thispagestyle">189</a>, <a href="scrguien.pdf#maincls.cmd.thispagestyle">73</a></li> <li><a name="cmd.title"></a><a href="#cmd.title">\title</a> --> <a href="scrguien.pdf#maincls.cmd.title">62</a></li> <li><a name="cmd.titlehead"></a><a href="#cmd.titlehead">\titlehead</a> --> <a href="scrguien.pdf#maincls.cmd.titlehead">62</a></li> <li><a name="cmd.titlepagestyle"></a><a href="#cmd.titlepagestyle">\titlepagestyle</a> --> <a href="scrguien.pdf#scrextend.cmd.titlepagestyle">243</a>, <a href="scrguien.pdf#maincls.cmd.titlepagestyle">76</a></li> -<li><a name="cmd.tocbasic@@after@hook"></a><a href="#cmd.tocbasic@@after@hook">\tocbasic@@after@hook</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@@after@hook">295</a></li> -<li><a name="cmd.tocbasic@@before@hook"></a><a href="#cmd.tocbasic@@before@hook">\tocbasic@@before@hook</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@@before@hook">295</a></li> -<li><a name="cmd.tocbasic@addxcontentsline"></a><a href="#cmd.tocbasic@addxcontentsline">\tocbasic@addxcontentsline</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@addxcontentsline">296</a></li> -<li><a name="cmd.tocbasic@extend@babel"></a><a href="#cmd.tocbasic@extend@babel">\tocbasic@extend@babel</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@extend@babel">294</a></li> -<li><a name="cmd.tocbasic@listhead"></a><a href="#cmd.tocbasic@listhead">\tocbasic@listhead</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@listhead">296</a></li> -<li><a name="cmd.tocbasic@listhead@"></a><a href="#cmd.tocbasic@listhead@">\tocbasic@listhead@</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@listhead@">296</a></li> -<li><a name="cmd.tocbasic@starttoc"></a><a href="#cmd.tocbasic@starttoc">\tocbasic@starttoc</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@starttoc">295</a></li> -<li><a name="cmd.tocbasicautomode"></a><a href="#cmd.tocbasicautomode">\tocbasicautomode</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasicautomode">287</a></li> +<li><a name="cmd.tocbasic@@after@hook"></a><a href="#cmd.tocbasic@@after@hook">\tocbasic@@after@hook</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@@after@hook">323</a></li> +<li><a name="cmd.tocbasic@@before@hook"></a><a href="#cmd.tocbasic@@before@hook">\tocbasic@@before@hook</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@@before@hook">323</a></li> +<li><a name="cmd.tocbasic@DependOnPenaltyAndTOCLevel"></a><a href="#cmd.tocbasic@DependOnPenaltyAndTOCLevel">\tocbasic@DependOnPenaltyAndTOCLevel</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@DependOnPenaltyAndTOCLevel">324</a></li> +<li><a name="cmd.tocbasic@SetPenaltyByTOCLevel"></a><a href="#cmd.tocbasic@SetPenaltyByTOCLevel">\tocbasic@SetPenaltyByTOCLevel</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@SetPenaltyByTOCLevel">324</a></li> +<li><a name="cmd.tocbasic@addxcontentsline"></a><a href="#cmd.tocbasic@addxcontentsline">\tocbasic@addxcontentsline</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@addxcontentsline">324</a></li> +<li><a name="cmd.tocbasic@extend@babel"></a><a href="#cmd.tocbasic@extend@babel">\tocbasic@extend@babel</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@extend@babel">322</a></li> +<li><a name="cmd.tocbasic@listhead"></a><a href="#cmd.tocbasic@listhead">\tocbasic@listhead</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@listhead">323</a></li> +<li><a name="cmd.tocbasic@listhead@"></a><a href="#cmd.tocbasic@listhead@">\tocbasic@listhead@</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@listhead@">323</a></li> +<li><a name="cmd.tocbasic@starttoc"></a><a href="#cmd.tocbasic@starttoc">\tocbasic@starttoc</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasic@starttoc">322</a></li> +<li><a name="cmd.tocbasicautomode"></a><a href="#cmd.tocbasicautomode">\tocbasicautomode</a> --> <a href="scrguien.pdf#tocbasic.cmd.tocbasicautomode">304</a></li> <li><a name="cmd.typearea"></a><a href="#cmd.typearea">\typearea</a> --> <a href="scrguien.pdf#typearea.cmd.typearea">36</a></li> -<li><a name="cmd.unitfactor"></a><a href="#cmd.unitfactor">\unitfactor</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.unitfactor">398</a></li> -<li><a name="cmd.unsettoc"></a><a href="#cmd.unsettoc">\unsettoc</a> --> <a href="scrguien.pdf#tocbasic.cmd.unsettoc">292</a></li> +<li><a name="cmd.unitfactor"></a><a href="#cmd.unitfactor">\unitfactor</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.unitfactor">427</a></li> +<li><a name="cmd.unsettoc"></a><a href="#cmd.unsettoc">\unsettoc</a> --> <a href="scrguien.pdf#tocbasic.cmd.unsettoc">309</a></li> <li><a name="cmd.uppertitleback"></a><a href="#cmd.uppertitleback">\uppertitleback</a> --> <a href="scrguien.pdf#maincls.cmd.uppertitleback">64</a></li> <li><a name="cmd.useencodingofkomafont"></a><a href="#cmd.useencodingofkomafont">\useencodingofkomafont</a> --> <a href="scrguien.pdf#maincls.cmd.useencodingofkomafont">58</a></li> <li><a name="cmd.usefamilyofkomafont"></a><a href="#cmd.usefamilyofkomafont">\usefamilyofkomafont</a> --> <a href="scrguien.pdf#maincls.cmd.usefamilyofkomafont">58</a></li> <li><a name="cmd.usefontofkomafont"></a><a href="#cmd.usefontofkomafont">\usefontofkomafont</a> --> <a href="scrguien.pdf#maincls.cmd.usefontofkomafont">58</a></li> <li><a name="cmd.usekomafont"></a><a href="#cmd.usekomafont">\usekomafont</a> --> <a href="scrguien.pdf#maincls.cmd.usekomafont">54</a></li> -<li><a name="cmd.usekomavar*"></a><a href="#cmd.usekomavar*">\usekomavar*</a> --> <a href="scrguien.pdf#scrlttr2.cmd.usekomavar*">141</a>, <a href="scrguien.pdf#scrlttr2-experts.cmd.usekomavar*">394</a></li> -<li><a name="cmd.usekomavar"></a><a href="#cmd.usekomavar">\usekomavar</a> --> <a href="scrguien.pdf#scrlttr2.cmd.usekomavar">141</a>, <a href="scrguien.pdf#scrlttr2-experts.cmd.usekomavar">394</a></li> +<li><a name="cmd.usekomavar*"></a><a href="#cmd.usekomavar*">\usekomavar*</a> --> <a href="scrguien.pdf#scrlttr2.cmd.usekomavar*">141</a>, <a href="scrguien.pdf#scrlttr2-experts.cmd.usekomavar*">423</a></li> +<li><a name="cmd.usekomavar"></a><a href="#cmd.usekomavar">\usekomavar</a> --> <a href="scrguien.pdf#scrlttr2.cmd.usekomavar">141</a>, <a href="scrguien.pdf#scrlttr2-experts.cmd.usekomavar">423</a></li> <li><a name="cmd.usepackage"></a><a href="#cmd.usepackage">\usepackage</a> --> <a href="scrguien.pdf#typearea.cmd.usepackage">28</a></li> <li><a name="cmd.useplength"></a><a href="#cmd.useplength">\useplength</a> --> <a href="scrguien.pdf#scrlttr2.cmd.useplength">142</a></li> <li><a name="cmd.useseriesofkomafont"></a><a href="#cmd.useseriesofkomafont">\useseriesofkomafont</a> --> <a href="scrguien.pdf#maincls.cmd.useseriesofkomafont">58</a></li> <li><a name="cmd.useshapeofkomafont"></a><a href="#cmd.useshapeofkomafont">\useshapeofkomafont</a> --> <a href="scrguien.pdf#maincls.cmd.useshapeofkomafont">58</a></li> <li><a name="cmd.usesizeofkomafont"></a><a href="#cmd.usesizeofkomafont">\usesizeofkomafont</a> --> <a href="scrguien.pdf#maincls.cmd.usesizeofkomafont">58</a></li> -<li><a name="cmd.wwwname"></a><a href="#cmd.wwwname">\wwwname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.wwwname">402</a></li> -<li><a name="cmd.yourmailname"></a><a href="#cmd.yourmailname">\yourmailname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.yourmailname">402</a></li> -<li><a name="cmd.yourrefname"></a><a href="#cmd.yourrefname">\yourrefname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.yourrefname">402</a></li> +<li><a name="cmd.usetocbasicnumberline"></a><a href="#cmd.usetocbasicnumberline">\usetocbasicnumberline</a> --> <a href="scrguien.pdf#tocbasic.cmd.usetocbasicnumberline">311</a></li> +<li><a name="cmd.wwwname"></a><a href="#cmd.wwwname">\wwwname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.wwwname">431</a></li> +<li><a name="cmd.yourmailname"></a><a href="#cmd.yourmailname">\yourmailname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.yourmailname">431</a></li> +<li><a name="cmd.yourrefname"></a><a href="#cmd.yourrefname">\yourrefname</a> --> <a href="scrguien.pdf#scrlttr2-experts.cmd.yourrefname">431</a></li> </ul> <h2><a name="environment">Environments</a></h2> <ul> @@ -732,6 +790,7 @@ <li><a name="env.addmargin"></a><a href="#env.addmargin">addmargin</a> --> <a href="scrguien.pdf#maincls.env.addmargin">113</a></li> <li><a name="env.captionbeside"></a><a href="#env.captionbeside">captionbeside</a> --> <a href="scrguien.pdf#maincls.env.captionbeside">122</a></li> <li><a name="env.captionofbeside"></a><a href="#env.captionofbeside">captionofbeside</a> --> <a href="scrguien.pdf#maincls.env.captionofbeside">125</a></li> +<li><a name="env.contract"></a><a href="#env.contract">contract</a> --> <a href="scrguien.pdf#scrjura.env.contract">246</a></li> <li><a name="env.description"></a><a href="#env.description">description</a> --> <a href="scrguien.pdf#maincls.env.description">109</a></li> <li><a name="env.enumerate"></a><a href="#env.enumerate">enumerate</a> --> <a href="scrguien.pdf#maincls.env.enumerate">108</a></li> <li><a name="env.itemize"></a><a href="#env.itemize">itemize</a> --> <a href="scrguien.pdf#maincls.env.itemize">106</a></li> @@ -749,50 +808,50 @@ </ul> <h2><a name="plength">Pseudolengths</a></h2> <ul> -<li><a name="plength.PPdatamatrixvskip"></a><a href="#plength.PPdatamatrixvskip">PPdatamatrixvskip</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.PPdatamatrixvskip">390</a></li> -<li><a name="plength.PPheadheight"></a><a href="#plength.PPheadheight">PPheadheight</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.PPheadheight">389</a></li> -<li><a name="plength.PPheadwidth"></a><a href="#plength.PPheadwidth">PPheadwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.PPheadwidth">389</a></li> -<li><a name="plength.backaddrheight"></a><a href="#plength.backaddrheight">backaddrheight</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.backaddrheight">389</a></li> -<li><a name="plength.bfoldmarklength"></a><a href="#plength.bfoldmarklength">bfoldmarklength</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.bfoldmarklength">386</a></li> -<li><a name="plength.bfoldmarkvpos"></a><a href="#plength.bfoldmarkvpos">bfoldmarkvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.bfoldmarkvpos">385</a></li> -<li><a name="plength.firstfoothpos"></a><a href="#plength.firstfoothpos">firstfoothpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstfoothpos">393</a></li> -<li><a name="plength.firstfootvpos"></a><a href="#plength.firstfootvpos">firstfootvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstfootvpos">393</a></li> -<li><a name="plength.firstfootwidth"></a><a href="#plength.firstfootwidth">firstfootwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstfootwidth">393</a></li> -<li><a name="plength.firstheadhpos"></a><a href="#plength.firstheadhpos">firstheadhpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstheadhpos">387</a></li> -<li><a name="plength.firstheadvpos"></a><a href="#plength.firstheadvpos">firstheadvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstheadvpos">387</a></li> -<li><a name="plength.firstheadwidth"></a><a href="#plength.firstheadwidth">firstheadwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstheadwidth">387</a></li> -<li><a name="plength.foldmarkhpos"></a><a href="#plength.foldmarkhpos">foldmarkhpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.foldmarkhpos">386</a></li> -<li><a name="plength.foldmarkthickness"></a><a href="#plength.foldmarkthickness">foldmarkthickness</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.foldmarkthickness">386</a></li> -<li><a name="plength.foldmarkvpos"></a><a href="#plength.foldmarkvpos">foldmarkvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.foldmarkvpos">386</a></li> -<li><a name="plength.fromrulethickness"></a><a href="#plength.fromrulethickness">fromrulethickness</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.fromrulethickness">387</a></li> -<li><a name="plength.fromrulewidth"></a><a href="#plength.fromrulewidth">fromrulewidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.fromrulewidth">387</a></li> -<li><a name="plength.lfoldmarkhpos"></a><a href="#plength.lfoldmarkhpos">lfoldmarkhpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.lfoldmarkhpos">386</a></li> -<li><a name="plength.lfoldmarklength"></a><a href="#plength.lfoldmarklength">lfoldmarklength</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.lfoldmarklength">386</a></li> -<li><a name="plength.locheight"></a><a href="#plength.locheight">locheight</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.locheight">390</a></li> -<li><a name="plength.lochpos"></a><a href="#plength.lochpos">lochpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.lochpos">390</a></li> -<li><a name="plength.locvpos"></a><a href="#plength.locvpos">locvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.locvpos">390</a></li> -<li><a name="plength.locwidth"></a><a href="#plength.locwidth">locwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.locwidth">390</a></li> -<li><a name="plength.mfoldmarklength"></a><a href="#plength.mfoldmarklength">mfoldmarklength</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.mfoldmarklength">386</a></li> -<li><a name="plength.mfoldmarkvpos"></a><a href="#plength.mfoldmarkvpos">mfoldmarkvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.mfoldmarkvpos">385</a></li> -<li><a name="plength.pfoldmarklength"></a><a href="#plength.pfoldmarklength">pfoldmarklength</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.pfoldmarklength">386</a></li> -<li><a name="plength.refaftervskip"></a><a href="#plength.refaftervskip">refaftervskip</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.refaftervskip">391</a></li> -<li><a name="plength.refhpos"></a><a href="#plength.refhpos">refhpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.refhpos">391</a></li> -<li><a name="plength.refvpos"></a><a href="#plength.refvpos">refvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.refvpos">391</a></li> -<li><a name="plength.refwidth"></a><a href="#plength.refwidth">refwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.refwidth">391</a></li> -<li><a name="plength.sigbeforevskip"></a><a href="#plength.sigbeforevskip">sigbeforevskip</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.sigbeforevskip">392</a></li> -<li><a name="plength.sigindent"></a><a href="#plength.sigindent">sigindent</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.sigindent">392</a></li> -<li><a name="plength.specialmailindent"></a><a href="#plength.specialmailindent">specialmailindent</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.specialmailindent">389</a></li> -<li><a name="plength.specialmailrightindent"></a><a href="#plength.specialmailrightindent">specialmailrightindent</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.specialmailrightindent">389</a></li> -<li><a name="plength.subjectaftervskip"></a><a href="#plength.subjectaftervskip">subjectaftervskip</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.subjectaftervskip">392</a></li> -<li><a name="plength.subjectbeforevskip"></a><a href="#plength.subjectbeforevskip">subjectbeforevskip</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.subjectbeforevskip">392</a></li> -<li><a name="plength.subjectvpos"></a><a href="#plength.subjectvpos">subjectvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.subjectvpos">391</a></li> -<li><a name="plength.tfoldmarklength"></a><a href="#plength.tfoldmarklength">tfoldmarklength</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.tfoldmarklength">386</a></li> -<li><a name="plength.tfoldmarkvpos"></a><a href="#plength.tfoldmarkvpos">tfoldmarkvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.tfoldmarkvpos">385</a></li> -<li><a name="plength.toaddrheight"></a><a href="#plength.toaddrheight">toaddrheight</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.toaddrheight">388</a></li> -<li><a name="plength.toaddrhpos"></a><a href="#plength.toaddrhpos">toaddrhpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.toaddrhpos">388</a></li> -<li><a name="plength.toaddrindent"></a><a href="#plength.toaddrindent">toaddrindent</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.toaddrindent">389</a></li> -<li><a name="plength.toaddrvpos"></a><a href="#plength.toaddrvpos">toaddrvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.toaddrvpos">388</a></li> -<li><a name="plength.toaddrwidth"></a><a href="#plength.toaddrwidth">toaddrwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.toaddrwidth">388</a></li> +<li><a name="plength.PPdatamatrixvskip"></a><a href="#plength.PPdatamatrixvskip">PPdatamatrixvskip</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.PPdatamatrixvskip">419</a></li> +<li><a name="plength.PPheadheight"></a><a href="#plength.PPheadheight">PPheadheight</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.PPheadheight">418</a></li> +<li><a name="plength.PPheadwidth"></a><a href="#plength.PPheadwidth">PPheadwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.PPheadwidth">418</a></li> +<li><a name="plength.backaddrheight"></a><a href="#plength.backaddrheight">backaddrheight</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.backaddrheight">418</a></li> +<li><a name="plength.bfoldmarklength"></a><a href="#plength.bfoldmarklength">bfoldmarklength</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.bfoldmarklength">415</a></li> +<li><a name="plength.bfoldmarkvpos"></a><a href="#plength.bfoldmarkvpos">bfoldmarkvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.bfoldmarkvpos">414</a></li> +<li><a name="plength.firstfoothpos"></a><a href="#plength.firstfoothpos">firstfoothpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstfoothpos">422</a></li> +<li><a name="plength.firstfootvpos"></a><a href="#plength.firstfootvpos">firstfootvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstfootvpos">422</a></li> +<li><a name="plength.firstfootwidth"></a><a href="#plength.firstfootwidth">firstfootwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstfootwidth">422</a></li> +<li><a name="plength.firstheadhpos"></a><a href="#plength.firstheadhpos">firstheadhpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstheadhpos">416</a></li> +<li><a name="plength.firstheadvpos"></a><a href="#plength.firstheadvpos">firstheadvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstheadvpos">416</a></li> +<li><a name="plength.firstheadwidth"></a><a href="#plength.firstheadwidth">firstheadwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.firstheadwidth">416</a></li> +<li><a name="plength.foldmarkhpos"></a><a href="#plength.foldmarkhpos">foldmarkhpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.foldmarkhpos">415</a></li> +<li><a name="plength.foldmarkthickness"></a><a href="#plength.foldmarkthickness">foldmarkthickness</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.foldmarkthickness">415</a></li> +<li><a name="plength.foldmarkvpos"></a><a href="#plength.foldmarkvpos">foldmarkvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.foldmarkvpos">415</a></li> +<li><a name="plength.fromrulethickness"></a><a href="#plength.fromrulethickness">fromrulethickness</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.fromrulethickness">416</a></li> +<li><a name="plength.fromrulewidth"></a><a href="#plength.fromrulewidth">fromrulewidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.fromrulewidth">416</a></li> +<li><a name="plength.lfoldmarkhpos"></a><a href="#plength.lfoldmarkhpos">lfoldmarkhpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.lfoldmarkhpos">415</a></li> +<li><a name="plength.lfoldmarklength"></a><a href="#plength.lfoldmarklength">lfoldmarklength</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.lfoldmarklength">415</a></li> +<li><a name="plength.locheight"></a><a href="#plength.locheight">locheight</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.locheight">419</a></li> +<li><a name="plength.lochpos"></a><a href="#plength.lochpos">lochpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.lochpos">419</a></li> +<li><a name="plength.locvpos"></a><a href="#plength.locvpos">locvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.locvpos">419</a></li> +<li><a name="plength.locwidth"></a><a href="#plength.locwidth">locwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.locwidth">419</a></li> +<li><a name="plength.mfoldmarklength"></a><a href="#plength.mfoldmarklength">mfoldmarklength</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.mfoldmarklength">415</a></li> +<li><a name="plength.mfoldmarkvpos"></a><a href="#plength.mfoldmarkvpos">mfoldmarkvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.mfoldmarkvpos">414</a></li> +<li><a name="plength.pfoldmarklength"></a><a href="#plength.pfoldmarklength">pfoldmarklength</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.pfoldmarklength">415</a></li> +<li><a name="plength.refaftervskip"></a><a href="#plength.refaftervskip">refaftervskip</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.refaftervskip">420</a></li> +<li><a name="plength.refhpos"></a><a href="#plength.refhpos">refhpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.refhpos">420</a></li> +<li><a name="plength.refvpos"></a><a href="#plength.refvpos">refvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.refvpos">420</a></li> +<li><a name="plength.refwidth"></a><a href="#plength.refwidth">refwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.refwidth">420</a></li> +<li><a name="plength.sigbeforevskip"></a><a href="#plength.sigbeforevskip">sigbeforevskip</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.sigbeforevskip">421</a></li> +<li><a name="plength.sigindent"></a><a href="#plength.sigindent">sigindent</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.sigindent">421</a></li> +<li><a name="plength.specialmailindent"></a><a href="#plength.specialmailindent">specialmailindent</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.specialmailindent">418</a></li> +<li><a name="plength.specialmailrightindent"></a><a href="#plength.specialmailrightindent">specialmailrightindent</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.specialmailrightindent">418</a></li> +<li><a name="plength.subjectaftervskip"></a><a href="#plength.subjectaftervskip">subjectaftervskip</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.subjectaftervskip">421</a></li> +<li><a name="plength.subjectbeforevskip"></a><a href="#plength.subjectbeforevskip">subjectbeforevskip</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.subjectbeforevskip">421</a></li> +<li><a name="plength.subjectvpos"></a><a href="#plength.subjectvpos">subjectvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.subjectvpos">420</a></li> +<li><a name="plength.tfoldmarklength"></a><a href="#plength.tfoldmarklength">tfoldmarklength</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.tfoldmarklength">415</a></li> +<li><a name="plength.tfoldmarkvpos"></a><a href="#plength.tfoldmarkvpos">tfoldmarkvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.tfoldmarkvpos">414</a></li> +<li><a name="plength.toaddrheight"></a><a href="#plength.toaddrheight">toaddrheight</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.toaddrheight">417</a></li> +<li><a name="plength.toaddrhpos"></a><a href="#plength.toaddrhpos">toaddrhpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.toaddrhpos">417</a></li> +<li><a name="plength.toaddrindent"></a><a href="#plength.toaddrindent">toaddrindent</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.toaddrindent">418</a></li> +<li><a name="plength.toaddrvpos"></a><a href="#plength.toaddrvpos">toaddrvpos</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.toaddrvpos">417</a></li> +<li><a name="plength.toaddrwidth"></a><a href="#plength.toaddrwidth">toaddrwidth</a> --> <a href="scrguien.pdf#scrlttr2-experts.plength.toaddrwidth">417</a></li> </ul> <h2><a name="variable">Variables</a></h2> <ul> @@ -842,8 +901,8 @@ </ul> <h2><a name="pagestyle">Page Styles</a></h2> <ul> -<li><a name="pagestyle.@everysel@"></a><a href="#pagestyle.@everysel@">@everysel@</a> --> <a href="scrguien.pdf#scrlayer.pagestyle.@everysel@">323</a></li> -<li><a name="pagestyle.empty"></a><a href="#pagestyle.empty">empty</a> --> <a href="scrguien.pdf#scrlttr2.pagestyle.empty">189</a>, <a href="scrguien.pdf#scrlayer.pagestyle.empty">323</a></li> +<li><a name="pagestyle.@everysel@"></a><a href="#pagestyle.@everysel@">@everysel@</a> --> <a href="scrguien.pdf#scrlayer.pagestyle.@everysel@">352</a></li> +<li><a name="pagestyle.empty"></a><a href="#pagestyle.empty">empty</a> --> <a href="scrguien.pdf#scrlttr2.pagestyle.empty">189</a>, <a href="scrguien.pdf#scrlayer.pagestyle.empty">352</a></li> <li><a name="pagestyle.headings"></a><a href="#pagestyle.headings">headings</a> --> <a href="scrguien.pdf#scrlttr2.pagestyle.headings">189</a></li> <li><a name="pagestyle.myheadings"></a><a href="#pagestyle.myheadings">myheadings</a> --> <a href="scrguien.pdf#scrlttr2.pagestyle.myheadings">189</a></li> <li><a name="pagestyle.plain"></a><a href="#pagestyle.plain">plain</a> --> <a href="scrguien.pdf#scrlttr2.pagestyle.plain">189</a></li> @@ -852,7 +911,9 @@ <h2><a name="counter">Counter</a></h2> <ul> <li><a name="counter.letter"></a><a href="#counter.letter">letter</a> --> <a href="scrguien.pdf#scrlttr2.counter.letter">146</a></li> +<li><a name="counter.par"></a><a href="#counter.par">par</a> --> <a href="scrguien.pdf#scrjura.counter.par">250</a></li> <li><a name="counter.secnumdepth"></a><a href="#counter.secnumdepth">secnumdepth</a> --> <a href="scrguien.pdf#maincls.counter.secnumdepth">101</a></li> +<li><a name="counter.sentence"></a><a href="#counter.sentence">sentence</a> --> <a href="scrguien.pdf#scrjura.counter.sentence">251</a></li> <li><a name="counter.tocdepth"></a><a href="#counter.tocdepth">tocdepth</a> --> <a href="scrguien.pdf#maincls.counter.tocdepth">69</a></li> </ul> <h2><a name="floatstyle">Styles for the float Package</a></h2> diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf b/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf Binary files differindex 57b3ed1cd23..d6785491200 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf +++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf diff --git a/Master/texmf-dist/source/latex/koma-script/scrdoc.dtx b/Master/texmf-dist/source/latex/koma-script/scrdoc.dtx index 8ebda7724e0..a1592e35f5f 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrdoc.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrdoc.dtx @@ -1,6 +1,6 @@ % ====================================================================== % scrdoc.dtx -% Copyright (c) Markus Kohm, 2002-2012 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrdoc.dtx -% Copyright (c) Markus Kohm, 2002-2012 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -42,7 +42,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{scrdoc}[% - 2003/01/19 v0.1d KOMA-Script source documentation class] + 2016/04/12 v0.1e KOMA-Script source documentation class] % Load standard LaTeX documentation class, passing all options to it % but use scrartcl instead of article. @@ -141,7 +141,8 @@ \DoNotIndex{\if@tempswa,\ifcase,\or,\fi,\fi} \DoNotIndex{\ifnum,\ifodd,\ifx,\fi,\fi,\fi} \DoNotIndex{\include,\input,\InputIfFileExists,\item,\itshape} -\DoNotIndex{\kern,\leavevmode,\leftmark,\leftskip,\let,\lineskip} +\DoNotIndex{\kern,\kernel@ifnextchar} +\DoNotIndex{\leavevmode,\leftmark,\leftskip,\let,\lineskip} \DoNotIndex{\list,\long} \DoNotIndex{\m@ne,\m@th,\marginpar,\markboth,\markright,\mathbf,\mathcal} \DoNotIndex{\mathit,\mathnormal,\mathrm,\mathsf,\mathtt,\MessageBreak} diff --git a/Master/texmf-dist/source/latex/koma-script/scrdocstrip.tex b/Master/texmf-dist/source/latex/koma-script/scrdocstrip.tex index ca7ec757fd8..980b4dd17f5 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrdocstrip.tex +++ b/Master/texmf-dist/source/latex/koma-script/scrdocstrip.tex @@ -1,6 +1,6 @@ % ====================================================================== % scrdocstrip.tex -% Copyright (c) Markus Kohm, 2013 +% Copyright (c) Markus Kohm, 2013-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. % ---------------------------------------------------------------------- % scrdocstrip.tex -% Copyright (c) Markus Kohm, 2013 +% Copyright (c) Markus Kohm, 2013-2015 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -59,7 +59,7 @@ \expandafter\ifx\csname scrdocstripversion\endcsname\relax \else \expandafter\endinput \fi -\Msg{| Using KOMA-Script's docstrip extensions.} +\Msg{| Using KOMA-Script's docstrip extensions.}%| % Support for variables: \def\KOMAdefVariable#1#2{% \expandafter\def\csname KOMAvar@#1\endcsname{#2}% @@ -111,7 +111,7 @@ \fi } \def\KOMAvalidityTest#1{% - \maybeMsg{^^J| Testing validity of distribution: }% + \maybeMsg{^^J| Testing validity of distribution: }%| \begingroup \def\readloop{% \ifeof\inFile\else @@ -165,12 +165,12 @@ \else \def\do##1{,^^J| \@spaces\@spaces\@spaces##1}% \errhelp{| You should ask your distributor for a valid and legal - distribution.}% + distribution.}%| \errmessage{^^J% | Missing files: \expandafter\expandafter\expandafter\@gobble \KOMAFilesMissing\KOMAdocFilesMissing\KOMAnoFilesMissing^^J% | Distribution seems to be invalid.^^J% - | This error is fatal}% + | This error is fatal}%| \batchmode \csname @@end\endcsname \fi @@ -193,7 +193,7 @@ | PLEASE NOTE, THAT DISTRIBUTIONS WITHOUT THOSE FILES ARE NOT ALLOWED!^^J% | But maybe those files are there and you're TeX distribution simply^^J% | cannot open files without extension.^^J% - +----------------------------------------------------------------------} + +----------------------------------------------------------------------}%| \fi \ifx\KOMAdocFilesMissing\empty\else \Msg{% @@ -274,19 +274,20 @@ \ifx\relax#2\relax\else\@commentWarning#2\@nil\fi } \def\KNL{^\empty^J\perCent^^J} +\def\XKNL{^\empty^J\perCent|^^J} \def\genericWarning#1#2{% \string\immediate\string\write17{\KNL +----------------------------------------------------------------------\KNL - | WARNING (`#1'):\KNL + | WARNING (`#1'):\XKNL +----------------------------------------------------------------------\KNL \@genericWarning#2^^J\@nil +----------------------------------------------------------------------\KNL }^^J% } \def\@genericWarning#1^^J#2\@nil{% - | #1\KNL + | #1\XKNL \ifx\relax#2\relax\else\@genericWarning#2\@nil\fi -} +}%| \def\useWarning#1{\let\use@Warning#1} \useWarning\genericWarning @@ -305,6 +306,18 @@ \chardef\scrdocstripversion 1\relax +\def\fromoptional#1{% + \immediate\openin\inputcheck\uptospace#1 \qStop\relax + \ifeof\inputcheck + \Msg{Ignorring not existing optional file `#1'.}% + \expandafter\@gobbletwo + \else + \immediate\closein\inputcheck + \expandafter\from + \fi + {#1}% +} + \process@first@batchfile \endinput % diff --git a/Master/texmf-dist/source/latex/koma-script/scrhack.dtx b/Master/texmf-dist/source/latex/koma-script/scrhack.dtx index 13460cd2ead..b5403731117 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrhack.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrhack.dtx @@ -1,8 +1,8 @@ -% \CheckSum{814} +% \CheckSum{827} % \iffalse meta-comment % ====================================================================== % scrhack.dtx -% Copyright (c) Markus Kohm, 2008-2015 +% Copyright (c) Markus Kohm, 2008-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -23,7 +23,7 @@ % of TeX would generate the implementation documentation. % ---------------------------------------------------------------------- % scrhack.dtx -% Copyright (c) Markus Kohm, 2008-2015 +% Copyright (c) Markus Kohm, 2008-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -62,7 +62,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ +%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ %<package&identify>%%% using: package,identify %<package&option>%%% using: package,option %<package&body>%%% using: package,body @@ -478,7 +478,14 @@ the expected effect. \expandafter\ifx\csname ver@#2.#1\endcsname\relax \expandafter\@secondoftwo \else - \expandafter\@firstoftwo +% \end{macrocode} +% Allerdings wird jeder Hack nur genau einmal geladen: +% \begin{macrocode} + \expandafter\ifx\csname ver@#2.hak\endcsname\relax + \expandafter\expandafter\expandafter\@firstoftwo + \else + \expandafter\expandafter\expandafter\@secondoftwo + \fi \fi {% \PackageInfo{scrhack}{loading #2 hack}% @@ -1217,8 +1224,11 @@ the expected effect. % % \begin{option}{lscape} % \changes{v3.18a}{2015/07/07}{Neue Option für neuen Hack}^^A +% \changes{v3.20}{2016/05/07}{\textsf{xpatch} wird bereits im Optionenteil +% geladen}^^A % \begin{macrocode} %<*package&option> +\RequirePackage{xpatch}% \KOMA@ifkey{lscape}{@scrhack@lscape}% \KOMAExecuteOptions{lscape=true}% %</package&option> @@ -1237,6 +1247,8 @@ the expected effect. % % \begin{macro}{\landscape} % \changes{v3.18a}{2015/07/07}{Neu}^^A +% \changes{v3.20}{2016/05/07}{\textsf{xpatch} wird bereits im Optionenteil +% geladen}^^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 @@ -1244,7 +1256,6 @@ the expected effect. % 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} @@ -1301,7 +1312,7 @@ the expected effect. %%% mode: flyspell %%% coding: iso-latin-1 %%% ispell-local-dictionary: "en_GB" -%%% TeX-master: +%%% TeX-master: t %%% End: % LocalWords: eineinhalbzeilige diff --git a/Master/texmf-dist/source/latex/koma-script/scrjura.dtx b/Master/texmf-dist/source/latex/koma-script/scrjura.dtx index 53c33e3a91b..b3cf047bfec 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrjura.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrjura.dtx @@ -1,8 +1,8 @@ -% \CheckSum{1835} +% \CheckSum{1928} % \iffalse meta-comment % ====================================================================== % scrjura.dtx -% Copyright (c) Markus Kohm, 2007-2015 +% Copyright (c) Markus Kohm, 2007-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -22,7 +22,7 @@ % `scrlogo.dtx'. % ---------------------------------------------------------------------- % scrjura.dtx -% Copyright (c) Markus Kohm, 2007-2015 +% Copyright (c) Markus Kohm, 2007-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -60,27 +60,36 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrjura.dtx 2098 2015-05-13 16:23:25Z kohm $ +%%% From File: $Id: scrjura.dtx 2448 2016-05-06 09:06:19Z kohm $ %<*dtx> +\begingroup + \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} + \filedate$Date: 2016-05-06 11:06:19 +0200 (Fri, 06 May 2016) $ +% Note: In future the following line should be replaced by SVN revision + \gdef\filerevision{v0.9h}% +\endgroup \def\LaTeXformat{LaTeX2e} \ifx\fmtname\LaTeXformat\def\MainBodyWork{% -\ProvidesFile{scrjura.dtx} +\ProvidesFile{scrjura.dtx}[% %</dtx> %<package>\NeedsTeXFormat{LaTeX2e}[1995/06/01] -%<driver>\ProvidesFile{scrjura.drv} -%<package>\ProvidesPackage{scrjura} -%<*dtx|package|driver> - [2015/05/13 v0.9d KOMA-Script for jurists -%</dtx|package|driver> -%<driver> (driver)% -%<package> (package)% +%<package>\ProvidesPackage{scrjura}[% +%<*dtx|package> +% Note: In future the following line should use KOMASCRIPTVERSION +%!SCRJURAVERSION %<*dtx> - (dtx)% + \filedate\space\filerevision\space %</dtx> -%<*dtx|package|driver> - ] -%</dtx|package|driver> -%<*dtx|driver> + for jurists +%</dtx|package> +%<package> (package)% +%<*dtx> + (dtx)% +%</dtx> +%<*dtx|package> +] +%</dtx|package> +%<*dtx> \IfFileExists{scrdoc.cls}{% \documentclass[halfparskip-]{scrdoc} }{% @@ -100,7 +109,7 @@ \GetFileInfo{scrjura.dtx} \DocInput{\filename} \end{document} -%</dtx|driver> +%</dtx> %<*dtx> }\else\let\MainBodyWork\relax\fi @@ -110,78 +119,14 @@ %</dtx> %<ins>\def\batchfile{scrjura.ins} %<*dtx|ins> -\input docstrip.tex - -\let\ifbeta=\iffalse %^^A with = will be replaced by release process - -\ifToplevel{\ifx\generate\undefined - \errhelp{Install a new version of docstrip.} - \errmessage{Old docstrip in input path} - \batchmode - \csname @@end\endcsname - \fi - \Msg{************************************************************} - \Msg{*} - \Msg{* KOMA-Script} - \Msg{* a versatile LaTeX2e bundle} - \Msg{*} - \Msg{* This is `\batchfile', a batchfile to unpack some or all} - \Msg{* parts of KOMA-Script. See `liesmich.txt' (german) or} - \Msg{* `readme.txt' (english) for additional information.} - \Msg{*} - \Msg{* If some - maybe old - files of KOMA-Script are already} - \Msg{* installed, you will be ask, if it is allowed to overwrite} - \Msg{* them. Answering `yes' doesn't mean, that `\batchfile'} - \Msg{* WILL overwrite such files. It means only, that} - \Msg{* `\batchfile' or installation MAY overwrite them.} - \Msg{*} - \Msg{************************************************************} -} - -% ---------- some docstrip switchs ------------------------------------- - -\ifToplevel{% - \keepsilent - \askforoverwritefalse - \ifx\askonceonly\undefined\else\askonceonly\fi -} - -% ---------- defining preambles ---------------------------------------- - -\preamble - -Copyright (c) 2007-2013 -Markus Kohm and any individual authors listed elsewhere in this file. - -This file was generated from file(s) of the KOMA-Script bundle. ---------------------------------------------------------------- - -This work may be distributed and/or modified under the conditions of -the LaTeX Project Public License, version 1.3c of the license. -The latest version of this license is in - http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX -version 2005/12/01 or later and of this work. - -This work has the LPPL maintenance status "author-maintained". - -The Current Maintainer and author of this work is Markus Kohm. - -This file may only be distributed together with the files -`scrlogo.dtx' and `scrjura.dtx'. You may however distribute the files -`scrlogo.dtx' and `scrjura.dtx' without this file. -See also `scrjura.dtx' for additional information. - -If this file is a beta version, you are not allowed to distribute it. - -Currently there is only a short german manual at `scrjura.dtx', that -should also be found as `scrjura.pdf'. - -The KOMA-Script bundle (but maybe not this file) was based upon the -LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e -standard classes created by The LaTeX3 Project 1994-1996. - -\endpreamble +\input scrdocstrip.tex +\@@input scrkernel-version.dtx +\@@input scrstrip.inc +\KOMAdefVariable{COPYRIGHTFROM}{2007} +% Note: Some time in future the follow three lines will be removed +\KOMAdefVariable{SCRJURAVERSION}{% + \space\space\filedate\space\filerevision\space KOMA-Script +}% % ---------- File generation ------------------------------------------- @@ -189,9 +134,6 @@ standard classes created by The LaTeX3 Project 1994-1996. \file{scrjura.ins}{% \from{scrjura.dtx}{ins}% }% -% \file{scrjura.drv}{% -% \from{scrjura.dtx}{driver}% -% }% \file{scrjura.sty}{% \from{scrjura.dtx}{package}% \from{scrlogo.dtx}{logo}% @@ -200,35 +142,7 @@ standard classes created by The LaTeX3 Project 1994-1996. % ---------- end of docstrip process ----------------------------------- -\ifToplevel{% - \Msg{************************************************************} - \Msg{*} - \Msg{* KOMA-Script} - \Msg{* a versatile LaTeX2e bundle} - \Msg{*} - \ifbeta - \Msg{* THIS IS AN BETA VERSION. YOU SHOULD NOT INSTALL OR USE IT!} - \Msg{* THERE MAY BE A LOT OF BUGS AT THIS VERSION!} - \Msg{* PLEASE INSTALL THE RELEASE YOU CAN FIND AT CTAN!} - \else - \Msg{* To finish the installation you have to move some} - \Msg{* files into a directory searched by TeX.} - \Msg{* See INSTALL.TXT (english) or INSTALLD.TXT (german)} - \Msg{* from KOMA-Script bundle for additional information.} - \Msg{*} - \Msg{* You may also produce the implementation documentation} - \Msg{* including also a short version of the english manual.} - \Msg{* To produce it, do} - \Msg{* \space\space pdflatex scrjura.dtx} - \Msg{* \space\space mkindex scrjura} - \Msg{* \space\space pdflatex scrjura.dtx} - \Msg{* after finishing the installation.} - \Msg{*} - \Msg{* Happy TeXing} - \fi - \Msg{*} - \Msg{************************************************************} -} +\@@input scrstrop.inc \bye %</dtx|ins> @@ -250,561 +164,6 @@ standard classes created by The LaTeX3 Project 1994-1996. % begriffen. % \end{abstract} % -% \tableofcontents -% -% \section{Rechtlicher Hinweis} -% Dieser Teil von \KOMAScript{} darf ohne die restlichen Teile von -% \KOMAScript{} verteilt werden. Dazu dürfen die Dateien -% »\texttt{scrlogo.dtx}« und »\texttt{scrjura.dtx}« unter den Bedingungen der -% \LaTeX{} Project Public License, wahlweise Version 1.3c oder (nach Ihrer -% Entscheidung) jede spätere Version, verteilt und verändert werden. Die -% aktuelle Version dieser Lizenz ist unter -% \mbox{http://www.latex-project.org/lppl.txt} zu finden und Version~1.3c oder -% neuer ist Teil von \LaTeX{} Version 2005/12/01 oder neuer. Es ist nicht -% gestattet die Datei »\texttt{scrjura.dtx}« ohne die Datei -% »\texttt{scrlogo.dtx}« zu verteilen. Eine Verteilung ist nur zusammen -% gestattet. -% -% Zu \KOMAScript{} existiert eine ausführliche Anleitung in Deutsch und -% Englisch. Die Anleitung zum Paket \textsf{scrjura} existiert derzeit jedoch -% nur in dieser deutschen Kurzform. -% -% Das komplette \KOMAScript-Paket ist unter -% CTAN:/\mbox{macros}/""\mbox{latex}/""\mbox{contrib}/""\mbox{koma-script}/ zu -% finden, wobei »CTAN:« ein abkürzendes Synonym für das Verzeichnos -% »tex-archive« jedes CTAN-Servers oder -Spiegels, beispielsweise -% \mbox{ftp://ftp.dante.de/tex-archive/} darstellt. Siehe -% \mbox{http://www.ctan.org} für eine Liste aller CTAN-Server und -Spiegel. -% -% \section{Das Paket »scrjura«} -% \subsection{Überblick} -% Das Paket \textsf{scrjura} ist in erster Linie für den Satz von -% Verträgen gedacht. -% Über eine Reihe von Optionen kann die Wirkung des Pakets -% verändert werden. Innerhalb von Verträgen steht eine Reihe von Befehlen zur -% Verfügung. -% -% Wer juristische Dokumente verfasst, steht oft unter hohem -% Zeitdruck. Überraschende Fehlermeldungen von \LaTeXe{} kann man da nicht -% brauchen. Erfreulicherweise setzt \textsf{scrjura} lediglich das -% \textsf{scrkbase"=Paket} voraus. -% -% \textsf{scrjura} bietet zwei Modi: -% \begin{enumerate} -% \item den \glqq Vertragsmodus": das gesamte Dokument wird als Vertrag -% gesetzt; -% \item den \glqq Umgebungsmodus": Nur der Text innerhalb der -% |contract|"=Umgebung wird als Vertrag gesetzt. -% \end{enumerate} -% Der \emph{Vertragsmodus} wird durch die Option |contract| beim Laden des -% Pakets dauerhaft eingeschaltet. Also: Mit |\usepackage[contract]{scrjura}| -% wird Text nach |\begin{document}| als Vertrag gesetzt. Der -% \emph{Umgebungsmodus} wird dagegen wie jede andere Umgebung mit -% |\begin{contract}| begonnen und ist entsprechend mit |\end{contract}| zu -% beenden. Beide Modi können nicht im gleichen Dokument verwendet werden. -% -% Ein Inhaltsverzeichnis wird wie üblich mit |\tableofcontents| erzeugt und -% enthält -- neben etwaigen anderen Überschriften -- auch alle -% Paragraphentitel, sofern \textsf{scrjura} mit der Option |juratotoc| geladen -% wurde. Automatische Kolumnentitel sind ebenfalls möglich. -% -% Jeder Paragraph hat einen Titel, z.\,B.: |\Clause{title=Besitz}|. Die -% Nummerierung der Paragraphen erfolgt automatisch, kann aber auch manuell -% vorgenommen werden. -% -% Nahezu alle vom Anwender anzugebenden Daten folgen dem -% \textit{key=value}"=Schema, wie bereits an dem eben genannten Titel eines -% Paragraphen zu sehen war. -% -% Enthält ein Paragraph mehr als einen Absatz, werden alle Absätze automatisch -% nummeriert. Die Nummerierung kann fallweise abgeschaltet werden. Es ist -% darüber hinaus möglich, die Sätze eines Absatzes nummerieren zu lassen. -% -% Paragraphen, Absätze und Sätze können referenziert werden. Bei Absätzen -% besteht die Wahl, wie die Ausgabe erfolgt; es ist sowohl möglich, -% beispielsweise "`§ 16 Absatz 3 Satz 1"' als auch "`§ 16 III 1"' als Ausgabe -% zu erhalten. -% -% \textsf{scrjura} unterstützt das |hyperref|"=Paket, ist damit aber hier noch -% nicht ausfürlich getestet worden. Wie immer, wird |hyperref| zuletzt -% geladen. Andernfalls gibt es faszinierende Fehlermeldungen. Wird |hyperref| -% wieder entfernt, muss die *.aux-Datei gelöscht werden. -% -% \subsection{Die Optionen beim Laden des Pakets} -% -% \DescribeOption{contract}% -% Die Option \texttt{contract} sorgt dafür, dass das gesamte Dokument als -% Vertrag interpretiert wird. Innerhalb des Dokuments ist dann keine weitere -% Vertragsumgebung zu verwenden. Dasselbe Verhalten kann erreicht werden, -% indem unmittelbar nach |\begin{document}| eine \texttt{contract}-Umgebung -% begonnen und unmittelbar vor |\end{document}| wieder beendet wird. -% -% \DescribeOption{juratitlepagebreak}% -% Normalerweise sind Seitenumbrüche innerhalb der Überschriften von Paragraphen -% nicht erlaubt. Einige Juristen verwenden aber so lange Überschriften, dass -% selbst Seitenumbrüche darin sinnvoll sein können. Mit der Option -% \texttt{juratitlepagebreak} wird dies ermöglicht. Diese Option kann -% jederzeit mit Hilfe von |\KOMAoptions{juratitlepagebreak}| ein- oder mit -% |\KOMAoptions{juratitlepagebreak=false}| wieder ausgeschaltet werden. -% -% \DescribeOption{juratotoc}% -% \DescribeCounter{juratoclevel}% -% Die Option \texttt{juratotoc} sorgt dafür, dass die Paragraphen in das -% Inhaltsverzeichnis eingetragen werden. Dabei wird in der Voreinstellung die -% Gliederungstiefe~2 für diese Einträge verwendet. Über den Zähler -% |juratoclevel| kann auch eine andere Gliederungstiefe vorgegeben werden. Das -% Paket greift hier auf die Routinen von \LaTeX{} zur Erstellung eines -% Inhaltsverzeichnisses zurück. Bei dreistelligen Paragraphennummern kann im -% Inhaltsverzeichnis die Nummer in den Überschriftstext hineinragen. -% -% Die einfachste Abhilfe gegen diesen Fehler besteht darin, die Box mit der -% Gliederungsnummer zu verbreitern, beispielsweise mit -% \begin{verbatim} -% \renewcommand{\numberline}[1]{\makebox[6em][l]{#1}} -% \end{verbatim}\vskip-2\parskip -% die Breite der Box den jeweiligen Gegebenheiten anzupassen. -% -% Eine andere Abhilfe bei der Verwendung einer \KOMAScript"=Klasse besteht -% darin, die Option |tocleft| zu verwenden. Zuletzt kann man -% selbstverständlich auf die verschiedenen Pakete zurückgreifen, mit denen -% sich das Inhaltsverzeichnis anpassen lässt. Den Gewinn an Möglichkeiten -% erkauft man sich allerdings mit einem erhöhten Risiko, dass Fehler -% auftreten. -% -% -% Ein für den Autor der Anleitung entscheidender Vorteil von \textsf{scrjura} -% liegt in dem umfassenden System, auf andere Klauseln des Vertrages verweisen -% zu können. Beim Laden des Paktes kann per Option entschieden werden, wie die -% Verweise formatiert werden sollen: lang (Bsp: »§ 314 Absatz 2 Satz 2«), kurz -% (»§ 314 Abs. 2 S. 2«) und numerisch (»§ 314 II 2«). Die Optionen hierzu -% lauten: -% \begin{itemize} -% \item ref=numeric -% \item ref=long -% \item ref=short -% \end{itemize} -% -% Wird nichts angegeben, ist |ref=long| voreingestellt. -% -% Wer hier spezifische Wünsche hat, kann die Zitierweise von Absätzen und -% Sätzen bereits bei den Optionen hiervon abweichend festlegen. Es sind -% beliebige Kombinationen von |parlong, parshort, parnumeric, nopar| mit -% |sentenceslong, sentenceshort, sentencesnumeric, nosentence| -% möglich. Beispiel: |\usepackage[ref=parlong,ref=sentenceshort]{scrjura}|. -% Wir haben allerdings diese Kombinationen nicht alle getestet. -% -% \subsection{Optionen betreffend Kolumnentitel} -% -% Bei langen Verträgen können automatische Kolumnentitel hilfreich -% sein. Allerdings hängt die Ausgabe hier davon ab, wie die diese erzeugt -% werden. -% \DescribeOption{paragraphmark}% -% \textsf{scrjura} unterstützt lebende Kolumnentitel. Die Option -% \texttt{paragraphmark} kann auf folgende Werte gesetzt werden: -% \begin{itemize} -% \item false, off, no -% \item right -% \item both -% \end{itemize} -% -% -% Sollte der Vertrag in Abschnitte unterteilt werden, also etwa mit einer Zeile -% |\parnumberfalse\section{ABSCHNITT}\parnumbertrue|, -% würde auf den ungeraden Seiten die Abschnittsüberschriften und auf den -% geraden Seiten der Titel des aktuellen Paragraphen angegeben werden. -% -% Im übrigen können die zur Gestaltung von Kopfzeilen üblichen Pakete -% (z.B. scrpage2) verwendet werden. -% -% -% -% \subsection{Der Paragraph} -% \label{sec:paragraph} -% \textsf{scrjura} führt zwei Gliederungsebenen ein: Paragraph und -% Subparagraph. Selbstverständlich funktioniert deren im folgenden -% beschriebene Befehle im \textit{Umgebungsmodus} nur innerhalb der -% Vertragsumgebung. Es sei an dieser Stelle darauf hingewiesen, dass bei -% früheren Versionen von \textsf{scrjura} Befehle und Zähler noch den Terminus -% "`Paragraph"' im Namen trugen. Da dieser Teminus für juristische Paragraphen -% im Englischen jedoch eher unüblich ist und vor allem auch zur Vermeidung von -% Verwechslungen mit dem normalen Gliederungsbefehl |\paragraph|, wurde dies -% ab Version 0.7b in "`Clause"' geändert. Ältere Dokumente müssen daher -% ggf. entsprechend angepasst werden. -% -% \DescribeMacro{\Clause}% -% Für die Paragraphenüberschrift stehen verschiedene optionale Argumente zur -% Verfügung, die ebenfalls in einer durch Kommata zu trennenden -% key=value-Liste angegeben werden: -% -% \bigskip\renewcommand{\arraystretch}{1.3} -% \begin{tabular}{lp{0.4\linewidth}l}\hline -% Eintrag & Erklärung & Eintrag unterdrücken\\\hline -% |title = <Titel>| & Titel des Paragraphen & |dummy|\\ -% |head =| \dots & Kolumnentitel des Paragraphen & |nohead|\\ -% |entry =| \dots & Eintrag im Inhaltsverzeichnis& |noentry|\\ -% |number=| \dots & die Paragraphennummer & -\\ -% \end{tabular}\bigskip -% -% Beispiele: |\Clause{title=Gattungsschuld, number=244}| gibt "`§ 244 -% Gattungsschuld"' aus. |\Clause{title=Gattungsschuld}| als erster -% Paragraph gibt "`§ 1 Gattungsschuld"' aus, während |\Clause{}| an -% gleicher Stelle zu "`§ 1"' führt, also einer Paragraphenzählung ohne Titel. -% -% Will man aber beginnend von beispielsweise § 244 an eine Reihe von -% Paragraphen setzen, empfiehlt es sich nicht, die Option |number=| zu -% verwenden, denn die Option lässt den Zähler |Clause| unberührt. Will man -% nicht alle Paragraphen per Hand nummerieren, kann mit -% |\setcounter{Clause}{243}| der Startpunkt für eine automatische Zählung -% gesetzt werden. Bei |\SubClause| ist der Zähler natürlich mit einer -% arabischen Zahl anzugeben, auch wenn die Ausgabe dann in Kleinbuchstaben -% erfolgt. -% -% -% \DescribeMacro{\SubClause}% -% Sofern ein Paragraph eingeschoben werden soll, kann dieses Makro verwendet -% werden, es verhält sich im übrigen wie |\Clause|. Die Nummerierung fügt -% der zuletzt verwendeten Paragraphennummer einen Kleinbuchstaben hinzu. -% -% Die Nummerierung für |\SubClause| erfolgt in \textsf{scrjura.sty} über -% folgende Definition: -% -% |\renewcommand*{\thecontractSubClause}{%|\\ -% |{\theClause\alph{contractSubClause}}}| -% -% Wer zwischen Paragraphenzahl und dem Kleinbuchstaben einen Abstand wünscht, -% sowie nach dem Kleinbuchstaben eine runde Klammer, kann in die Präambel also -% einfügen: -% -% |\renewcommand*{\thecontractSubClause}{%|\\ -% |{\theClause~\alph{contractSubClause})}}|. -% -% \DescribeOption{preskip}% -% \DescribeOption{postskip}% -% Abstände vor und nach der Paragraphen-Überschrift können derzeit über -% |\setkeys{contract}{preskip=|\dots|, postskip=|\dots|}| gesetzt werden. -% -% Es ist möglich, einen Vertrag in Abschnitte zu unterteilen unter Verwendung -% z.\,B. von |\section{}|. Allerdings muss entweder vorher die -% contract"=Umgebung beendet und danach fortgesetzt werden (die -% Paragraphenzählung wird dadurch nicht zurückgesetzt), oder man setzt davor -% ein |\parnumberfalse| und danach ein |\parnumbertrue|. Vergisst man dies, -% wird der Abschnitt zum ersten als Paragraphenabsatz und dann als Abschnitt -% nummeriert. -% -% \DescribeMacro{\ellipsispar} -% \DescribeMacro{\parellipsis} -% Manchmal wird insbesondere für Kommentare gewünscht, dass man Absätze in -% Paragraphen auch auslassen kann, diese Absätze aber dennoch mitgezählt und -% auch bei der automatischen Absatznummerierung mitberücksichtigt werden. Die -% ausgelassenen Absätze sollen dabei in der Regel durch Pünktchen markiert -% werden. Genau dies erledigt |\ellipsispar|. Als optionales Argument kann -% dabei die Anzahl der Absätze angegeben werden, die ausgelassen -% wurde. Voreingestellt ist ein Absatz. Für das Auslassungszeichen wird -% |\parellipsis| verwendet. Dies ist mit |\textellipsis| vordefiniert, falls -% eine solche Anweisung existiert. Anderenfalls wird |\dots| verwendet. -% -% -% \subsection{Verweise} -% \label{sec:referenzierung} -% -% Verlässlich funktionierende Verweise sind eine große Erleichterung beim -% Abfassen von Verträgen. Wenn in einem ersten Entwurf eines -% Gesellschaftsvertrags die Abfindungsregelungen in §§~28 ff. enthalten sind, -% diese aber nach einigen Umbauten sich irgendwann in §§~19 ff. wiederfinden, -% dann müssen alle Verweise auf die unterschiedlichen Abfindungsregelungen für -% kündigende Gesellschafter, für solche, die in Rente gehen und für -% 'rausgeworfene diese Änderungen nachvollzogen haben. -% -% In der Grundeinstellung führt der Verweis |\ref{testA}| auf ein -% |\label{testA}|, das in einem Absatz platziert wurde, zur Ausgabe eines -% Vollverweises einschließlich der Satzangabe. -% -% Nun will man häufig nicht den Paragraph, Absatz \textit{und} Satz, sondern -% nur Paragraph und Absatznummer referenzieren. Die folgende Tabelle enthält -% eine systematische Darstellung aller Verweismöglicheiten. Ein »L« -% kennzeichnet die Langform, ein »S« die Kurzform und ein »N« die nummerische -% Darstellung des Verweises. -% -% Zunächst das Beispiel, auf das sich die Tabelle bezieht: -% -% \begin{verbatim} -% \begin{contract} -% \Clause{title=Beispiel} -% Es irrt der Mensch.\label{testA} -% \end{contract} -% \end{verbatim} -% -% Dies ergibt einen sehr kurzen Paragraphen: -% -% \rule{10cm}{0.4pt} -% -% \begin{contract} -% \Clause{title=Beispiel} -% -% Es irrt der Mensch.\label{testA} -% -% \end{contract} -% -% \rule{10cm}{0.4pt} -% -% \bigskip -% -% Folgende Verweise auf diesen § 1 Absatz 1 Satz 1 sind möglich: -% -% \begin{tabular}{ll} -% Code & Ergebnis \\ -% \hline -% \verb|\ref{testA}| & \ref{testA} \\ -% \verb|\refL{testA}| & \refL{testA} \\ -% \verb|\refS{testA}| & \refS{testA} \\ -% \verb|\refN{testA}| & \refN{testA} \\ -% \verb|\refClause{testA}| & \refClause{testA} \\ -% \verb|\refClauseN{testA}| & \refClauseN{testA} \\ -% \verb|\refPar{testA}| & \refPar{testA} \\ -% \verb|\refParL{testA}| & \refParL{testA} \\ -% \verb|\refParS{testA}| & \refParS{testA} \\ -% \verb|\refParN{testA}| & \refParN{testA} \\ -% \verb|\refParN[arabic]{testA}| & \refParN[arabic]{testA} \\ -% \verb|\refSentence{testA}| & \refSentence{testA} \\ -% \verb|\refSentenceL{testA}| & \refSentenceL{testA} \\ -% \verb|\refSentenceS{testA}| & \refSentenceS{testA} \\ -% \verb|\refSentenceN{testA}| & \refSentenceN{testA} \\ -% \end{tabular} -% -% Dabei hängt die Ausgabe von |\ref|, |\refPar| und |\refSentence| von den -% Einstellungen der Option |ref| ab. Hier zum Vergleich mit der Einstellung -% |\KOMAoptions{ref=nopar}|: -% -% \begingroup\KOMAoptions{ref=nopar} -% \begin{tabular}{ll} -% Code & Ergebnis \\ -% \hline -% \verb|\ref{testA}| & \ref{testA} \\ -% \verb|\refPar{testA}| & \refPar{testA} \\ -% \verb|\refSentence{testA}| & \refSentence{testA} \\ -% \end{tabular} -% \endgroup -% -% Das gleiche mit |\KOMAoptions{ref=nosentence}|: -% -% \begingroup\KOMAoptions{ref=nosentence} -% \begin{tabular}{ll} -% Code & Ergebnis \\ -% \hline -% \verb|\ref{testA}| & \ref{testA} \\ -% \verb|\refPar{testA}| & \refPar{testA} \\ -% \verb|\refSentence{testA}| & \refSentence{testA} \\ -% \end{tabular} -% \endgroup -% -% Das gleiche mit |\KOMAoption{ref}{nopar,nosentence}|: -% -% \begingroup\KOMAoption{ref}{nopar,nosentence} -% \begin{tabular}{ll} -% Code & Ergebnis \\ -% \hline -% \verb|\ref{testA}| & \ref{testA} \\ -% \verb|\refPar{testA}| & \refPar{testA} \\ -% \verb|\refSentence{testA}| & \refSentence{testA} \\ -% \end{tabular} -% \endgroup -% -% -% Zu jeder existiert noch eine Stern"=Version, also z.B. -% |\ref*{testA}|. Wenn das Paket |hyperref| geladen ist, erzeugt -% die besternte Version einen Verweis, der \textit{kein} Hyperlink ist. -% Wenn das Paket jedoch nicht geladen wurde, erzeugt die besternte Version -% -- Fehler. -% -% -% \subsection{Absatz- und Satznummerierung} -% \label{sec:abs-u-satznummerierung} -% \DescribeMacro{\parnumbertrue}% -% \DescribeMacro{\parnumberfalse}% -% Absätze in Paragraphen werden automatisch nummeriert. Mit |\parnumberfalse| -% kann die Nummerierung ab- und mit |\parnumbertrue| wieder eingeschaltet -% werden. -% -% \DescribeMacro{\Sentence} Auch alle einzelnen Sätze eines Absatzes können -% durch eine hochgestellte Ziffer nummeriert werden. Allerdings kann dies -% nicht automatisch geschehen. Am einfachsten gestaltet sich die -% Satznummerierung unter Zuhilfenahme des Befehls |\useshorthands| aus dem -% ohnehin bei deutschen Texten notwendigen babel"=Paket: -% -% \begin{verbatim} -% \usepackage[...]{babel} -% \useshorthands{'} -% \defineshorthand{'S}{\Sentence\ignorespaces} -% \defineshorthand{'.}{. \Sentence\ignorespaces} -% \end{verbatim} -% -% Die Sätze lassen sich mit einem vorangestellten |'S| nummerieren. Alternativ -% kann der Satzendepunkt apostrophiert gesetzt werden: |'.|, damit wird dann -% der nächste Satz nummeriert. -% % -% \subsection{kile anpassen, \textsf{scrjura} unter lyx} -% Bei langen Verträgen ist es sehr hilfreich, die Gliederung und die -% Paragraphentitel auf dem Bildschirm einblenden zu können. Wer kile als -% Editor verwendet, der kann sich -- Open Source sei Dank! -- selbst -% helfen. Bei Version 2.0.0 von kile genügt es, in der Datei -% |kiledocumentinfo.cpp| an geeigneter Stelle zwei Zeilen (jeweils ohne -% Zeilenumbruch) einzufügen: -% \begin{verbatim} -% m_dictStructLevel["\\Clause"]= -% KileStructData(5, KileStruct::Sect, "Clause"); -% -% m_dictStructLevel["\\SubClause"]= -% KileStructData(6, KileStruct::Sect, "SubClause"); -% \end{verbatim} -% -% -% -% Zahlen über 7 sind eine schlechte Idee. Nach dem Speichern der Datei folgt -% der übliche Dreisprung: configure, make, make install (oder checkinstall -% \dots). kile zeigt danach Paragraphen und »Unterparagraphen« als -% Dokumentenstruktur an. Vielleicht findet ein Anwender ja heraus, wie dies -% mit \TeX nicCenter zu bewerkstelligen ist. -% -% Bis jemand für die Verwendung von \textsf{scrjura} eine lyx-Klasse schreibt, -% wozu wir ausdrücklich ermutigen wollen, kann man sich bei der Nutzung von -% lyx damit behelfen, im sog. »\LaTeX"=Vorspann« beispielsweise die Definition -% des Unterunterabschnitts anzupassen: -% -% |\renewcommand{\subsubsection}[1]{\Clause{title= #1}}| -% -% Damit lassen sich Paragraphenüberschriften in lyx als Unterunterabschnittsüberschriften -% setzen. Da die Absätze von Verträgen ohnehin von \textsf{scrjura} automatisch nummeriert werden, -% zeigen sich die Nachteile dieses Vorgehens erst, wenn man einen Unterunterabschnitt benötigt. -% -% -% \subsection{Zusätzliche Vertragsumgebungen} -% \label{sec:newenv} -% -% Einer der Anwender setzt mit \textsf{scrjura} keine Verträge oder Kommentare -% zu einzelnen Gesetzen, sondern Werke, in denen unterschiedliche Arten von -% Gesetzen behandelt werden. Es ist daher erforderliche, dass ein Paragraph -% nicht immer mit demselben Präfix »\S« versehen wird, sondern beispielsweise -% als »Art.« oder »GG« oder was auch immer bezeichnet wird. Darüber hinaus -% wird eine unabhängige Zählung der unterschiedlichen Paragraphen benötigt. -% -% \DescribeMacro{\DeclareNewJuraEnvironment} -% Die für unabhängige Vertrags- oder Gesetzestexte notwendigen Umgebungen -% werden über die Anweisung: -% -% \csname @hangfrom\endcsname{\cs{DeclareNewJuraEnvironment}}\marg{Name}\oarg{Optionen}\\ -% \marg{Start-Anweisungen}\\ -% \marg{End-Anweisungen} -% -% deklariert. Das Argument \meta{Name} ist dabei der Name der neuen -% Umgebung. \meta{Start-Anweisungen} sind Anweisungen, die immer am Anfang der -% Umgebung ausgeführt werden, ganz als ob man sie jedes Mal unmittelbar hinter -% \cs{begin}\marg{Name} einfügen würde. Entsprechend werden -% \meta{End-Anwesiungen} immer am Ende der Umgebung ausgeführt, ganz als ob -% man sie jedes Mal unmittelbar vor \cs{end}\marg{Name} einfügen würde. Ohne -% \meta{Optionen} entspricht die neue Umgebung \meta{Name} einer -% \texttt{contract}-Umgebung mit eigenen Zählern. Es besteht jedoch die -% Möglichkeit über eine mit Komma separierte Liste an \oarg{Optionen} darauf -% Einfluss zu nehmen. Derzeit werden folgende \oarg{Optionen} unterstützt: -% \begin{description} -% \item[\texttt{Clause=}\meta{Anweisung}:] Legt fest, auf welche -% \meta{Anweisung} innerhalb der Umgebung die Anweisung \cs{Clause} abgebildet -% werden soll. Die \meta{Anweisung} sollte wie die für \texttt{contract} -% dokumentierte Anweisung genau ein Argument erwarten. Für eine korrekte -% Anwendung dieser Option sind erweiterte Kenntnisse über die interne Funktion -% von \textsf{scrjura} notwendig. Außerdem können sich die Anforderungen an -% die \meta{Anweisung} von Version zu Version noch ändern. Daher wird derzeit -% empfohlen, die Option nicht zu verwenden! -% \item[\texttt{SubClause=}\meta{Anweisung}:] Siehe Option \texttt{Clause}, -% allerdings für \cs{SubClause} statt \cs{Clause}. -% \item[\texttt{Sentence=}\meta{Anweisung}:] Legt fest, auf welche -% \meta{Anweisung} innerhalb der Umgebung die Anweisung \cs{Sentence} -% abgebildet werden soll. Die \meta{Anweisung} sollte kein Argument -% besitzen. Normalerweise sollte sie den Zähler \texttt{sentence} mit -% \cs{refstepcounter} erhöhen und dann in geeigneter Form ausgeben. Dabei ist -% besonders darauf zu achten, dass keine unerwünschten Leerzeichen eingebaut -% werden! -% \item[\texttt{ClauseNumberFormat=}\meta{Anweisung}:] Legt fest, auf welche -% Weise die Paragraphen"=Nummern dieser Umgebung bei der Ausgabe formatiert -% werden. Es wird eine Anweisung mit genau einem Argument erwartet, der Nummer -% des Paragraphen. Falls diese Nummer das letzte Argument einer Kette von -% Anweisungen ist, so kann diese Kette an Anweisungen auch direkt angegeben -% werden. -% \end{description} -% -% Um beispielsweise die in der Einleitung zu diesem Abschnitt erwähnte -% Umgebung für Artikel zu definieren, genügt: -% \begin{verbatim} -% \DeclareNewJuraEnvironment{Artikel}[ClauseNumberFormat=Art.]{}{} -% \end{verbatim} -% Sollen die Artikel unter Verwendung einer \KOMAScript-Klasse mit -% Absatzabstand statt Absatzeinzug gesetzt werden, kann -% \begin{verbatim} -% \DeclareNewJuraEnvironment{Artikel}[ClauseNumberFormat=Art.~] -% {\KOMAoptions{parskip}}{} -% \end{verbatim} -% verwendet werden. Natürlich wird dann auch bei der Referenzierung -% automatisch »Art.« an Stelle von »\S« vorangestellt. -% -% -% \subsection{Sonstiges} -%\label{sec:else} -% -% -% \DescribeMacro{\parname}% -% \DescribeMacro{\sentencename}% -% Sprachabhängiger Name von Absatz und Satz. -% -% \DescribeMacro{\thecontractClause}% -% \DescribeMacro{\thecontractSubClause}% -% Ausgabe der automatischen Zähler für Paragraph und eingeschobener Paragraph -% bei Verträgen. -% -% \DescribeMacro{\AutoPar}% -% \DescribeMacro{\ManualPar}% -% \DescribeMacro{\Par}% -% Automatische und manuelle Absatznummerierung. -% -% -% \DescribeMacro{\ifparnumber}% -% \DescribeMacro{\parnumbertrue}% -% \DescribeMacro{\parnumberfalse}% -% Absatznummern ein- und ausschalten. -% -% \DescribeCounter{par}% -% \DescribeMacro{\thepar}% -% \DescribeMacro{\parformat}% -% \DescribeMacro{\parciteformat}% -% Zähler für die Absatznummern und dessen Ausgabe und Formatierung und -% Formatierung der Referenz. ACHTUNG: Wenn |\thepar| nicht nur eine arabische -% Zahl ist, werden Absätze bei automatischer Nummerierung unabhängig davon -% nummeriert, ob es mehr als einen Absatz im Paragraphen gibt. -% -% \DescribeMacro{\refClause}% -% So etwas wie |\ref| nur für den Paragraphen. -% -% \DescribeMacro{\refPar}% -% So etwas wie |\ref| nur für den Absatz. -% -% \DescribeMacro{\refSentence}% -% So etwas wie |\ref| nur für den Satz. -% -% \DescribeCounter{sentence}% -% \DescribeMacro{\thesentence}% -% \DescribeMacro{\sentenceciteformat}% -% Zähler für die Satznummer und dessen Ausgabe, sowie Formatierung der -% Referenz. ACHTUNG: |\thesentence| muss bei unverändertem -% |\sentenceciteformat| eine arabische Zahl sein! -% -% \DescribeMacro{\newmaxpar}% -% \DescribeMacro{\getmaxpar}% -% Werden intern verwendet und müssen deshalb allenfalls für Paketautoren -% dokumentiert werden. -% -% \section{Bekannte Probleme} -% -% Die Verweistechnik wurde noch nicht ausführlich getestet; Fehler sind -% möglich. -% % % \StopEventually{\PrintIndex\PrintChanges} % @@ -980,6 +339,9 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macrocode} % \end{option} % +% \begin{option}{clausemark} +% \changes{v0.9h}{2016/04/11}{\texttt{paragraphmark} umbenannt in +% \texttt{clausemark}}^^A % \begin{option}{paragraphmark} % \changes{v0.7}{2013/11/04}{Verwendung der renovierten Schnittstelle mit % \cs{FamilyKeyStateProcessed}}%^^A @@ -994,9 +356,9 @@ standard classes created by The LaTeX3 Project 1994-1996. % die zu verwendende Nummer (das könnte bei Bedarf noch geändert werden!) % \begin{macrocode} \newcommand*{\Clausemark}[1]{} -\KOMA@key{paragraphmark}{% +\KOMA@key{clausemark}{% \begingroup - \KOMA@set@ncmdkey{paragraphmark}{@tempa}{% + \KOMA@set@ncmdkey{clausemark}{@tempa}{% {false}{0},{off}{0},{no}{0},% {forceright}{1},% {forceboth}{2},% @@ -1037,16 +399,26 @@ standard classes created by The LaTeX3 Project 1994-1996. \endgroup \FamilyKeyStateUnknownValue \fi - \KOMA@kav@xreplacevalue{.scrjura.sty}{paragraphmark}{#1}% + \KOMA@kav@xreplacevalue{.scrjura.sty}{clausemark}{#1}% +} +\KOMA@kav@add{.scrjura.sty}{clausemark}{false} +\KOMA@DeclareDeprecatedOption[scrjura]{markright}{clausemark=forceright} +\KOMA@DeclareDeprecatedOption[scrjura]{markboth}{clausemark=forceboth} +\KOMA@key{paragraphmark}{% + \PackageWarningNoLine{scrjura}{% + You've used obsolete option `paragraphmark'.\MessageBreak + Usage of this option is deprecated.\MessageBreak + You should simply replace `paragraphmark'\MessageBreak + by `clausemark'% + }% + \KOMAExecuteOptions[.scrjura.sty]{clausemark=#1}% } -\KOMA@kav@add{.scrjura.sty}{paragraphmark}{false} -\KOMA@DeclareDeprecatedOption[scrjura]{markright}{paragraphmark=forceright} -\KOMA@DeclareDeprecatedOption[scrjura]{markboth}{paragraphmark=forceboth} % \end{macrocode} % \end{macro} % \end{option} % \end{option} % \end{option} +% \end{option} % % \begin{option}{ref} % \changes{v0.5d}{2010/06/07}{neue Einstellungen \texttt{nopar}, @@ -1254,17 +626,22 @@ standard classes created by The LaTeX3 Project 1994-1996. % flexibilisiert}^^A % \begin{macro}{\parellipsis} % \changes{v0.7}{2013/05/02}{neu}^^A +% \changes{v0.9g}{2016/03/25}{in die \texttt{aux}-Datei nur bei +% \cs{if@filesw} schreiben}^^A % Paragraphen auslassen aber mit zählen. % \begin{macrocode} \newcommand*{\ellipsispar}[1][1]{% \begingroup \KOMAoptions{parnumber=manual}\parellipsis\par \addtocounter{par}{#1}% - \protected@write\@auxout{}{% - \string\newmaxpar{\scrjura@env@type}% - {\csname the\scrjura@env@type AbsoluteClause\endcsname}% - {\thepar}% - }% + \if@filesw + \protected@write\@auxout{}{% + \string\newmaxpar{\scrjura@env@type}% + {\csname the\scrjura@env@type + AbsoluteClause\endcsname}% + {\thepar}% + }% + \fi \endgroup \addtocounter{par}{-1}\refstepcounter{par}% \ignorespaces @@ -1349,6 +726,8 @@ standard classes created by The LaTeX3 Project 1994-1996. % % \begin{macro}{\DeclareNewJuraEnvironment} % \changes{v0.9}{2014/11/12}{Neue Anweisung} +% \changes{v0.9h}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Verwendet \cs{@defjuraenvironment} um eine neue juristische Umgebung zu % definieren. % \begin{macrocode} @@ -1366,7 +745,7 @@ standard classes created by The LaTeX3 Project 1994-1996. Declaration will be ignored}% \long\def\reserved@defjuraenvironment##1[##2]##3##4{}% }% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\reserved@defjuraenvironment{#1}}{\reserved@defjuraenvironment{#1}[]}% } \@onlypreamble\DeclareNewJuraEnvironment @@ -1415,9 +794,11 @@ standard classes created by The LaTeX3 Project 1994-1996. }{}% % \end{macrocode} % \changes{v0.9c}{2015/05/13}{\cs{the\dots Clause} definiert}^^A +% \changes{v0.9f}{2016/02/24}{\cs{protect}\cs{\@nameuse} statt +% \cs{csname}\dots\cs{endcsname}}^^A % \begin{macrocode} \expandafter\renewcommand\expandafter*\csname the#1Clause\endcsname{% - \csname #1@Clauseformat\endcsname{\arabic{#1Clause}}}% + \protect\@nameuse{#1@Clauseformat}{\arabic{#1Clause}}}% % \end{macrocode} % Umgebung: % \begin{macrocode} @@ -1640,8 +1021,12 @@ standard classes created by The LaTeX3 Project 1994-1996. \let\@elt\@stpelt \cl@Clause \endgroup +% \end{macrocode} +% \changes{v0.9f}{2016/02/24}{\cs{protect}\cs{\@nameuse} statt +% \cs{csname}\dots\cs{endcsname}}^^A +% \begin{macrocode} \protected@edef\theClause{% - \csname \scrjura@env@type @Clauseformat\endcsname{\contract@number}% + \protect\@nameuse{\scrjura@env@type @Clauseformat}{\contract@number}% }% \protected@edef\@currentlabel{\theClause}% \fi @@ -1816,7 +1201,58 @@ standard classes created by The LaTeX3 Project 1994-1996. % nicht die automatische Absatznummerierung abgeschaltet wird, wird sie neu % eingefügt. % \begin{macro}{\scrjura@doendpe} -% \begin{macrocode} +% \begin{macro}{\IncludeInRelease} +% \changes{v0.9e}{2015/11/03}{wird temporär benötigt}^^A +% \begin{macro}{\@gobble@IncludeInRelease} +% \changes{v0.9e}{2015/11/03}{wird temporär benötigt}^^A +% \begin{macro}{\EndIncludeInRelease} +% \changes{v0.9e}{2015/11/03}{wird temporär benötigt}^^A +% Seit \LaTeX{} 2015/01/01 ist \cs{@doendpe} abhängig von +% \textsf{latexrelease} etwas anders definiert. Das wird hier +% berücksichtigt. Damit das auch noch mit älteren Versionen von \LaTeX{} +% funktioniert, ohne dass man extra \textsf{latexrelease} nachinstalliert, +% wird hier ein wenig getrickst. Die Änderungen werden aber so temporär wie +% möglich gehalten. +% \begin{macrocode} +\providecommand*{\IncludeInRelease}[3]{% + \PackageInfo{scrjura}{temporary definition of \string\IncludeInRelease}% + \ifstr{#1}{0000/00/00}{% + \let\IncludeInRelease\@undefined + \def\EndIncludeInRelease{\let\EndIncludeInRelease\@undefined}% + }{% + \let\EndIncludeInRelease\relax + \long\def\@gobble@IncludeInRelease##1\EndIncludeInRelease{% + \let\@gobble@IncludeInRelease\@undefined + }% + \expandafter\@gobble@IncludeInRelease + }% +} +\IncludeInRelease{2015/01/01}{\@doendpe}{clubpenalty fix} +\CheckCommand*\@doendpe{\@endpetrue + \def\par{\@restorepar + \clubpenalty\@clubpenalty + \everypar{}\par\@endpefalse}\everypar + {{\setbox\z@\lastbox}% + \everypar{}\@endpefalse}} +\newcommand*{\scrjura@doendpe}{% + \@endpetrue + \def\par{% + \@restorepar + \clubpenalty\@clubpenalty + \everypar{% + \csname scrjura@everypar\endcsname + }% + \par\@endpefalse + }% + \everypar{% + {\setbox\z@\lastbox}\everypar{% + \csname scrjura@everypar\endcsname + }% + \@endpefalse + }% +} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}{\@doendpe}{clubpenalty fix} \CheckCommand*\@doendpe{\@endpetrue \def\par{\@restorepar\everypar{}\par\@endpefalse}\everypar {{\setbox\z@\lastbox}\everypar{}\@endpefalse}} @@ -1835,7 +1271,11 @@ standard classes created by The LaTeX3 Project 1994-1996. \@endpefalse }% } +\EndIncludeInRelease % \end{macrocode} +% \end{macro}^^A \EndIncludeInRelease +% \end{macro}^^A \@gobble@IncludeInRelease +% \end{macro}^^A \IncludeInRelease % \end{macro}^^A \scrjura@doendpe % \end{macro}^^A \doendpe % \end{macro}^^A \scrjura@everypar @@ -1891,6 +1331,8 @@ standard classes created by The LaTeX3 Project 1994-1996. % \begin{macro}{\theHpar} % \begin{macro}{\parformat} % \changes{v0.7}{2013/06/07}{neues Font-Element \texttt{parnumber}} +% \begin{macro}{\parformatseparation} +% \changes{v0.9f}{2016/02/06}{neue Anweisung} % \begin{macro}{\p@par} % \changes{v0.5d}{2010/04/28}{\cs{jura@usetype} mit Argument % \cs{jura@env@type} eingefügt} @@ -1906,6 +1348,7 @@ standard classes created by The LaTeX3 Project 1994-1996. \renewcommand*{\thepar}{\arabic{par}} \newcommand*{\theHpar}{\theH@AbsClause-\Roman{par}} \newcommand*{\parformat}{(\thepar)} +\newcommand*{\parformatseparation}{\nobreakspace} \newkomafont{parnumber}{} \renewcommand*\p@par{{\scrjura@usetype{\scrjura@env@type}\theSubClause\scrjura@separator{\nobreakspace}}} \@addtoreset{par}{Clause} @@ -1915,6 +1358,7 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % \end{Counter} % \end{macro} % \changes{v0.5c}{2010/04/26}{erstes Argument von \cs{newmaxpar} und zweites @@ -1932,6 +1376,10 @@ standard classes created by The LaTeX3 Project 1994-1996. % Absatznummern die Absätze auf jeden Fall nummerieren} % \changes{v0.7b}{2014/11/03}{\texttt{contractAbsoluteClause} % flexibilisiert}^^A +% \changes{v0.9f}{2016/02/06}{\cs{nobreakspace} durch +% \cs{parformatseparation} ersetzt}^^A +% \changes{v0.9g}{2016/03/25}{in die \texttt{aux}-Datei nur bei +% \cs{if@filesw} schreiben}^^A % \begin{macrocode} \newcommand*{\contract@everypar}{% \ifparnumber @@ -1951,26 +1399,29 @@ standard classes created by The LaTeX3 Project 1994-1996. \setcounter{sentence}{0}\refstepcounter{sentence}% \fi \begingroup - \protected@write\@auxout{% - \expandafter\let\csname \scrjura@env@type @Clauseformat\endcsname - \@firstofone - }{% - \string\newmaxpar{\scrjura@env@type}% - {\csname the\scrjura@env@type AbsoluteClause\endcsname}% - {\thepar}% - }% + \if@filesw + \protected@write\@auxout{% + \expandafter\let\csname \scrjura@env@type @Clauseformat\endcsname + \@firstofone + }{% + \string\newmaxpar{\scrjura@env@type}% + {\csname the\scrjura@env@type + AbsoluteClause\endcsname}% + {\thepar}% + }% + \fi \getmaxpar\@tempa{\scrjura@env@type}% {\csname the\scrjura@env@type AbsoluteClause\endcsname}% \typeout{Stored max is \@tempa}% \def\reserved@a##1\@nnil{\def\@tempa{##1}}% \afterassignment\reserved@a\@tempcnta=0\@tempa\relax\@nnil \ifnum \@tempcnta>\@ne - {\usekomafont{parnumber}{\parformat\nobreakspace}}% + {\usekomafont{parnumber}{\parformat\parformatseparation}}% \else \def\reserved@a{\relax}% \ifx\@tempa\reserved@a \else - {\usekomafont{parnumber}{\parformat\nobreakspace}}% + {\usekomafont{parnumber}{\parformat\parformatseparation}}% \fi \fi \endgroup @@ -2004,10 +1455,12 @@ standard classes created by The LaTeX3 Project 1994-1996. % % % \begin{macro}{\refL} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ref@L} % Das gleiche wie |\ref| aber zwingend mit der Langform. % \begin{macrocode} -\newcommand*{\refL}{\@ifstar {\ref@L*}{\ref@L{}}} +\newcommand*{\refL}{\kernel@ifstar {\ref@L*}{\ref@L{}}} \newcommand*{\ref@L}[2]{% \begingroup \def\parcite@format{0}% @@ -2020,10 +1473,12 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macro} % % \begin{macro}{\refS} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ref@S} % Das gleiche wie |\ref| aber zwingend mit der Kurzform. % \begin{macrocode} -\newcommand*{\refS}{\@ifstar {\ref@S*}{\ref@S{}}} +\newcommand*{\refS}{\kernel@ifstar {\ref@S*}{\ref@S{}}} \newcommand*{\ref@S}[2]{% \begingroup \def\parcite@format{1}% @@ -2036,10 +1491,12 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macro} % % \begin{macro}{\refN} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ref@N} % Das gleiche wie |\ref| aber zwingend mit der numerischen Form. % \begin{macrocode} -\newcommand*{\refN}{\@ifstar {\ref@N*}{\ref@N{}}} +\newcommand*{\refN}{\kernel@ifstar {\ref@N*}{\ref@N{}}} \newcommand*{\ref@N}[2]{% \begingroup \def\parcite@format{2}% @@ -2052,13 +1509,15 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macro} % % \begin{macro}{\refClause} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ref@Clause} % Zitiert nur den Paragraphen eines Paragraphen, eines Absatzes oder eines % Satzes. Für mehr Kompatibilität mit hyperref gibt es mit hyperref auch eine % Sternform. Ohne hyperref produziert diese nur Unsinn. % \begin{macrocode} \newcommand*{\refClause}{% - \@ifstar {\ref@Clause*}{\ref@Clause{}} + \kernel@ifstar {\ref@Clause*}{\ref@Clause{}} } \newcommand*{\ref@Clause}[2]{% \expandafter\ifx\csname r@#2\endcsname\relax @@ -2100,13 +1559,15 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macro} % % \begin{macro}{\refClauseN} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ref@ClauseN} % Zitiert nur den Paragraphen eines Paragraphen, eines Absatzes oder eines % Satzes. Für mehr Kompatibilität mit hyperref gibt es mit hyperref auch eine % Sternform. Ohne hyperref produziert diese nur Unsinn. % \begin{macrocode} \newcommand*{\refClauseN}{% - \@ifstar {\ref@ClauseN*}{\ref@ClauseN{}} + \kernel@ifstar {\ref@ClauseN*}{\ref@ClauseN{}} } \newcommand*{\ref@ClauseN}[2]{% \begingroup @@ -2119,13 +1580,15 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macro} % % \begin{macro}{\refPar} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ref@Par} % Zitiert nur den Absatz eines Absatzes oder eines Satzes. Für mehr % Kompatibilität mit hyperref gibt es mit hyperref auch eine Sternform. Ohne % hyperref produziert diese nur Unsinn. % \begin{macrocode} \newcommand*{\refPar}{% - \@ifstar {\ref@Par*}{\ref@Par{}} + \kernel@ifstar {\ref@Par*}{\ref@Par{}} } \newcommand*{\ref@Par}[2]{% \expandafter\ifx\csname r@#2\endcsname\relax @@ -2173,11 +1636,13 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macro} % % \begin{macro}{\refParL} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ref@ParX} % \begin{macrocode} % Das Gleiche zwingend lang. \newcommand*{\refParL}{% - \@ifstar {\ref@ParX0*}{\ref@ParX0{}} + \kernel@ifstar {\ref@ParX0*}{\ref@ParX0{}} } \newcommand*{\ref@ParX}[3]{% \begingroup @@ -2191,22 +1656,30 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macro} % % \begin{macro}{\refParS} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Das Gleiche zwingend kurz. % \begin{macrocode} \newcommand*{\refParS}{% - \@ifstar {\ref@ParX1*}{\ref@ParX1{}} + \kernel@ifstar {\ref@ParX1*}{\ref@ParX1{}} } % \end{macrocode} % \end{macro} % % \begin{macro}{\refParN} +% \begin{macro}{\ref@ParN} +% \changes{v0.9h}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A +% \begin{macro}{\ref@@ParN} % Das Gleiche zwingend nummerisch. % \begin{macrocode} \newcommand*{\refParN}{% - \@ifstar {\ref@ParN2*}{\ref@ParN2{}} + \kernel@ifstar {\ref@ParN2*}{\ref@ParN2{}} } \newcommand*{\ref@ParN}[2]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\ref@@ParN{#1}{#2}}% {\ref@ParX{#1}{#2}}% } @@ -2221,15 +1694,19 @@ standard classes created by The LaTeX3 Project 1994-1996. } % \end{macrocode} % \end{macro} +% \end{macro} +% \end{macro} % % \begin{macro}{\refSentence} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ref@Sentence} % Zitiert nur den Satz eines Satzes. Für mehr % Kompatibilität mit hyperref gibt es mit hyperref auch eine Sternform. Ohne % hyperref produziert diese nur Unsinn. % \begin{macrocode} \newcommand*{\refSentence}{% - \@ifstar {\ref@Sentence*}{\ref@Sentence{}} + \kernel@ifstar {\ref@Sentence*}{\ref@Sentence{}} } \newcommand*{\ref@Sentence}[2]{% \expandafter\ifx\csname r@#2\endcsname\relax @@ -2277,11 +1754,13 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macro} % % \begin{macro}{\refSentenceL} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ref@SentenceX} % \begin{macrocode} % Das Gleiche zwingend lang. \newcommand*{\refSentenceL}{% - \@ifstar {\ref@SentenceX0*}{\ref@SentenceX0{}} + \kernel@ifstar {\ref@SentenceX0*}{\ref@SentenceX0{}} } \newcommand*{\ref@SentenceX}[3]{% \begingroup @@ -2295,27 +1774,31 @@ standard classes created by The LaTeX3 Project 1994-1996. % \end{macro} % % \begin{macro}{\refSentenceS} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Das Gleiche zwingend kurz. % \begin{macrocode} \newcommand*{\refSentenceS}{% - \@ifstar {\ref@SentenceX1*}{\ref@SentenceX1{}} + \kernel@ifstar {\ref@SentenceX1*}{\ref@SentenceX1{}} } % \end{macrocode} % \end{macro} % % \begin{macro}{\refSentenceN} +% \changes{v0.9h}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Das Gleiche zwingend nummerisch. % \begin{macrocode} \newcommand*{\refSentenceN}{% - \@ifstar {\ref@SentenceX2*}{\ref@SentenceX2{}} + \kernel@ifstar {\ref@SentenceX2*}{\ref@SentenceX2{}} } % \end{macrocode} % \end{macro} % % \begin{macro}{\contract@sentence} -% \changes{v0.7a}{2014/01/28}{auf \cs{textsuperscript} umgestellt} +% \changes{v0.7a}{2014/01/28}{auf \cs{textsuperscript} umgestellt}^^A % \changes{v0.7a}{2014/01/28}{\cs{nobreak}\cs{hskip}\cs{z@} eingefügt, um -% die Trennung des ersten Worts nach der Satzmarkierung zu ermöglichen} +% die Trennung des ersten Worts nach der Satzmarkierung zu ermöglichen}^^A % Sätze nummerieren. % \begin{Counter}{sentence} % \begin{macro}{\thesentence} @@ -2331,7 +1814,25 @@ standard classes created by The LaTeX3 Project 1994-1996. \newcommand*{\p@@sentence}[1]{\p@par{{\par@cite{\thepar}}% \scrjura@separator{\nobreakspace}}{\sentence@cite{#1}}} \newcommand*{\contract@sentence}{% - \refstepcounter{sentence}% +% \end{macrocode} +% \changes{v0.9e}{2015/11/04}{erst den Absatz beginnen, dann die Nummer +% setzen}^^A +% Bei der Nummerierung ist wichtig, dass am Anfang des Absatzes die +% Satznummer nicht erhöht wird, weil das der Absatz bereits erledigt. Damit +% das funktioniert muss aber vor der Ausgabe erst einmal der Absatz begonnen +% werden. Befinden wir uns allerdings unmittelbar hinter einer +% \texttt{minipage}, einer Liste oder einer \cs{parbox} tun wir so, als wären +% wir nicht am Anfang des Absatzes. +% \begin{macrocode} + \ifvmode + \if@endpe + \refstepcounter{sentence}% + \else + \leavevmode + \fi + \else + \refstepcounter{sentence}% + \fi \textsuperscript{\thesentence}\nobreak\hskip\z@ } % \end{macrocode} @@ -2454,13 +1955,14 @@ standard classes created by The LaTeX3 Project 1994-1996. % % \begin{macro}{\newmaxpar} % \changes{v0.6b}{2013/04/16}{\cs{\#1@Clauseformat} expandiert zu seinem -% Argument} +% Argument}^^A % \begin{macro}{\getmaxpar} % \changes{v0.6}{2011/09/30}{Argument 3 muss mit \cs{protected@edef} -% expandiert werden} -% \changes{v0.5c}{2010/04/26}{\cs{protected@edef} durch \cs{edef} ersetzt} +% expandiert werden}^^A +% \changes{v0.5c}{2010/04/26}{\cs{protected@edef} durch \cs{edef} +% ersetzt}^^A % \changes{v0.5c}{2010/04/26}{\cs{\#2@Clauseformat} expandiert zu seinem -% Argument} +% Argument}^^A % Noch zwei Hilfsmakros, um Zähler in der aux-Datei zwischenzuspeichern und % auch dann Werte zu holen, wenn sie nicht in der aux-Datei stehen. % \begin{macrocode} @@ -2486,14 +1988,18 @@ standard classes created by The LaTeX3 Project 1994-1996. } % \end{macrocode} % \changes{v0.7b}{2014/11/10}{Notfallcode in die \texttt{aux}-Datei}^^A +% \changes{v0.9g}{2015/03/25}{in die \texttt{aux}-Datei nur bei +% \cs{if@filesw} schreiben}^^A % Da manche Anwender \texttt{scrjura} aus einem Dokument entfernen, ohne die % \texttt{aux}-Dateien zu löschen, sehen wir eine Notlösung vor, um % Fehlermeldungen wegen nicht definiertem \cs{newmaxpar} zu vermeiden. % \begin{macrocode} \AtBeginDocument{% - \immediate\write\@mainaux{% - \string\providecommand*{\string\newmaxpar}[3]{} - }% + \if@filesw + \immediate\write\@auxout{% + \string\providecommand*\string\newmaxpar[3]{} + }% + \fi } % \end{macrocode} % \end{macro} 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 450a28de737..452d88c8c8d 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx @@ -1,8 +1,8 @@ -% \CheckSum{2959} +% \CheckSum{3545} % \iffalse meta-comment % ====================================================================== % scrkernel-basics.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-basics.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $ %<package&option>\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-08-29 19:21:55 +0200 (Sat, 29 Aug 2015) $ + \filedate$Date: 2016-04-27 12:58:21 +0200 (Wed, 27 Apr 2016) $ \def\filerevision$#1: #2 ${\def\filerevision{r#2}} \filerevision$Revision: 1638 $ \xdef\fileinfo{\filedate\space\filerevision\space} @@ -217,6 +217,25 @@ % \end{macrocode} % erledigt ist. % +% \subsection{Schutz vor Umdefinierung von +% \LaTeX-Kern-Anweisungen durch +% andere Pakete} +% Einige Pakete wie \textsf{amsgen} definieren \LaTeX-Kern-Anweisungen so um, +% dass sie nicht mehr korrekt funktionieren. Ich muss dann leider dafür +% sorgen, dass \KOMAScript{} damit keine Probleme hat. Die Klassen sind dabei +% in der günstigen Situation, dass sie ggf. einfach die vorhandene Definition +% testen und übernehmen können. Die Pakete müssen hingegen dummer Weise selbst +% dafür sorgen, dass es irgendwie funktioniert. +% +% \begin{macro}{\kernel@ifstar} +% \changes{v3.20}{2016/04/12}{neu (intern)} +% Ich hoffe ja, dass der \LaTeX-Kern zukünftig diese Anweisung definiert und +% das dann auch funktioniert. Damit es aber auch mit älteren \LaTeX-Versionen +% geht, sorge ich hier vor. +% \begin{macrocode} +%<base>\providecommand*\kernel@ifstar[1]{\kernel@ifnextchar*{\@firstoftwo{#1}}} +% \end{macrocode} +% \end{macro}^^A \kernel@ifstar % % \subsection{Test von Anweisungen} % @@ -276,6 +295,8 @@ % % \begin{macro}{\DefineFamily} % \changes{v3.00}{2008/04/30}{Neue Anweisung}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\DefineFamilyMember} % \changes{v3.00}{2008/04/30}{Neue Anweisung}^^A % \begin{macro}{\DefineFamilyKey} @@ -342,7 +363,7 @@ }% } \newcommand*{\DefineFamilyKey}[3][.\@currname.\@currext]{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {% \edef\reserved@a{#1}% \expandafter\scr@define@family@key @@ -757,21 +778,20 @@ % \begin{macro}{\@globaloptionslist} % \changes{v2.96}{2006/11/26}{new}^^A % \changes{v2.96}{2006/11/26}{Klassenoptionen durchsuchen}^^A -% Die Lister der globalen Optionen wird teilweise benötigt. Weil +% \changes{v3.20}{2016/02/06}{Entscheidung später treffen}^^A +% Die Liste der globalen Optionen wird teilweise benötigt. Weil % \textsl{xkeyval} dämlicherweise glaubt, es müsse alle Optionen mit % Gleichheitszeichen aus der Liste der Klassenoptionen entfernen % (seltsamerweise aber nicht die (x)keyval-Optionen, die ohne Wert aufgerufen % werden, weil ihr Defaultwert verwendet werden soll), wird hier ein eigenes -% Makro definiert. +% Makro definiert. Bis \KOMAScript{} 3.19a wurde auch genau hier die Zuweisung +% durchgeführt. Wenn aber \textsf{scrbase} noch vor \cs{documentclass} geladen +% wird, dann ist \cs{@classoptionslist} natürlich noch nicht gültig. Deshalb +% wird die Zuweisung, seit \KOMAScript{} 3.20 in \cs{FamilyProcessOptions} +% durchgeführt. % \begin{macrocode} %<*base> \newcommand*{\@globaloptionslist}{} -\let\@globaloptionslist\@classoptionslist -\scr@ifundefinedorrelax{XKV@classoptionslist}{}{% - \ifx\XKV@classoptionslist\@empty\else - \let\@globaloptionslist\XKV@classoptionslist - \fi -} %</base> % \end{macrocode} % \end{macro} @@ -842,7 +862,19 @@ % dazu jedoch keine Fehler oder Warnungen aus. % \changes{v3.18}{2015/06/17}{Behandlung von undefiniertem % \cs{@globaloptionslist}}^^A +% \changes{v3.20}{2016/02/06}{\cs{@globaloptionslist} immer neu zuweisen}^^A % \begin{macrocode} + \let\@globaloptionslist\@classoptionslist + \scr@ifundefinedorrelax{XKV@classoptionslist}{% +%<trace> \PackageInfo{scrbase}{Using \string\@classoptionslist}% + }{% + \ifx\XKV@classoptionslist\@empty +%<trace> \PackageInfo{scrbase}{Using \string\@classoptionslist}% + \else +%<trace> \PackageInfo{scrbase}{Using \string\XKV@classoptionslist}% + \let\@globaloptionslist\XKV@classoptionslist + \fi + }% \scr@ifundefinedorrelax{@globaloptionslist}{}{% \@for\CurrentOption:=\@globaloptionslist\do{% % \end{macrocode} @@ -1317,225 +1349,401 @@ %</base> % \end{macro}^^A \IfArgIsEmpty % +% +% \begin{macro}{\ifislengthprimitive} +% \changes{v3.20}{2015/10/19}{neu}^^A +% Falls das erste Argument ggf. über mehrere Stufen hinweg zu einem Primitiv +% expandiert, das als Länge verwendet werden kann, wird das erste Argument +% ausgeführt, sonst das zweite. +% \begin{macrocode} +%<*base> +\newcommand*{\ifislengthprimitive}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifislengthprimitive#1\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifislengthprimitive} +% \changes{v3.20}{2015/10/19}{neu (intern)}^^A +% Hilfsmacro, das ggf. rekusiv auf diverse Primitive prüft. +% \begin{macrocode} +\newcommand*{\scr@ifislengthprimitive}[1]{% + \begingroup + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifislengthprimitive + }{% + \def\reserved@c{\aftergroup\scr@secondoftwoAfterNil}% + \@for\reserved@a:=\baselineskip,\dp,\hsize,\ht,\lineskip,% + \parindent,\parskip,\pdfpageheight,\pdfpagewidth,% + \wd,\vsize \do {% + \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \meaning #1% + }{% + \def\reserved@c{\aftergroup\scr@TestDimenAssignTillNil}% + }% + }% + \reserved@c + }% + \endgroup + #1% +} +%</base> +% \end{macrocode} +% \end{macro}^^A \scr@ifislengthprimitive +% \end{macro}^^A \ifislengthprimitive +% +% % \begin{macro}{\ifisdimen} % \changes{v3.12}{2013/11/05}{neu}^^A -% Falls die Expansion des ersten Arguments eine \cs{dimen} ist, wird das -% zweite Argument ausgeführt, sonst das dritte. +% \changes{v3.20}{2015/10/19}{Reimplementierung}^^A +% Falls das erste Argument ggf. über mehrere Stufen hinweg zu einem +% \cs{dimen}-Register (und zu nichts weiterem!) expandiert, wird das erste +% Argument ausgeführt, sonst das zweite. % \begin{macrocode} %<*base> \newcommand*{\ifisdimen}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimen#1\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifisdimen} +% \changes{v3.20}{2015/10/19}{neu (intern)}^^A +% Hilfsmacro, das ggf. rekusiv auf ein \cs{dimen}-Register prüft +% \begin{macrocode} +\newcommand*{\scr@ifisdimen}[1]{% \begingroup - \edef\reserved@a{#1}% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\reserved@a - \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}% - \expandafter\def\expandafter\reserved@b\expandafter{\string\dimen}% - \ifstrstart{\reserved@a}{\reserved@b}{% - \afterassignment\scr@ifrelax@to@nnil - \@tempdima=#1\relax\@nnil{% - \aftergroup\@firstoftwo + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifisdimen + }{% + \ifstrstart{\meaning #1}{\string\dimen}{% + \aftergroup\scr@TestDimenAssignTillNil }{% - \aftergroup\@secondoftwo + \aftergroup\scr@secondoftwoAfterNil }% - }{\aftergroup\@secondoftwo}% + }% \endgroup + #1% } % \end{macrocode} -% \begin{macro}{\scr@ifrelax@to@nnil} -% \changes{v3.12}{2013/11/05}{neu (intern)}^^A -% Hilfsmakro, zur Verwendung beispielsweise nach Zuweissungen. Falls alles bis -% zum ersten \cs{@nnil} aus genau einem \cs{relax} besteht, wird das erste -% Argument ausgeführt, sonst das zweite. +% \end{macro}^^A \scr@ifisdimen +% \begin{macro}{\scr@TestDimenAssignTillNil} +% \changes{v3.20}{2015/10/19}{neu (intern)} +% Das durch \cs{@nil} begrenzte Argument wird einer temporären Länge +% zugewiesen. Wird dabei das Argument komplett aufgebraucht, so wird das +% erste Argument nach \cs{@nil} ausgeführt, sonst das zweite. Das begrenzte +% Argument wird in jedem Fall komplett aufgebraucht. % \begin{macrocode} -\newcommand*{\scr@ifrelax@to@nnil}{} -\def\scr@ifrelax@to@nnil#1\@nnil{% +\newcommand*\scr@TestDimenAssignTillNil{} +\def\scr@TestDimenAssignTillNil#1\@nil{% \begingroup - \def\reserved@a{#1}\def\reserved@b{\relax}% - \ifx\reserved@a\reserved@b - \aftergroup\@firstoftwo - \else - \aftergroup\@secondoftwo - \fi + \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillNnil + \@tempdima=#1\relax\@nnil +} +% \end{macrocode} +% \begin{macro}{\scr@IfAfterEndgroupArgIsRelaxTillNnil} +% \changes{v3.20}{2015/10/19}{neu (intern)} +% \begin{macro}{\scr@IfArgIsRelaxAfterRelaxTillNnil} +% \changes{v3.20}{2015/10/19}{neu (intern)} +% Die Hilfsmakros lesen ein durch \cs{@nnil} begrenztes Argument. Falls dieses +% Argument nur aus einer Folge von \cs{relax} besteht, wird das erste Argument +% nach \cs{@nnil} ausgeführt, sonst das zweite. +% \begin{macrocode} +\newcommand*\scr@AfterEndGroupIfArgIsRelaxTillNnil{} +\def\scr@AfterEndGroupIfArgIsRelaxTillNnil#1\@nnil{% \endgroup + \ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{% + \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \scr@IfArgIsRelaxAfterRelaxTillNnil #1\@nnil + }{\@secondoftwo}% + }% } +\newcommand*\scr@IfArgIsRelaxAfterRelaxTillNnil{} +\def\scr@IfArgIsRelaxAfterRelaxTillNnil \relax#1\@nnil{% + \ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{% + \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \scr@IfArgIsRelaxAfterRelaxTillNnil #1\@nnil + }{\@secondoftwo}% + }% +} +% \end{macrocode} +% \end{macro}^^A \scr@IfArgIsRelaxAfterRelaxTillNnil +% \end{macro}^^A \scr@IfArgIsRelaxTillNnil +% \end{macro}^^A \scr@TestSkipAssignTillNil +% \begin{macro}{\scr@secondoftwoAfterNil} +% \changes{v3.20}{2015/10/19}{neu (intern)} +% Das Hilfsmakro liest ein durch \cs{@nil} begrenztes Argument und führt dann +% das zweite Argument nach \cs{@nil} aus. Dabei wird auch Sorge dafür getrage, +% dass das Argument eventuell leer sein könnte, was normalerweise dazu führen +% würde, dass \cs{@nil} zum Argument selbst wird. +% \begin{macro}{\scr@@secondoftwoAfterNil} +% \changes{v3.20}{2015/10/19}{neu (intern)} +% Zu diesem Zweck wird ein zweites Hilfsmakro benötigt. +% \begin{macrocode} +\newcommand*{\scr@secondoftwoAfterNil}{\scr@@secondoftwoAfterNil\@empty} +\newcommand*{\scr@@secondoftwoAfterNil}{} +\def\scr@@secondoftwoAfterNil#1\@nil{\@secondoftwo} %</base> % \end{macrocode} -% \end{macro} -% \end{macro} +% \end{macro}^^A \scr@@secondoftwoAfterNil +% \end{macro}^^A \scr@secondoftwoAfterNil +% \end{macro}^^A \ifisdimen % -% \begin{macro}{\ifisdimexpr} +% \begin{macro}{\ifisskip} % \changes{v3.12}{2013/11/05}{neu}^^A -% Falls die Expansion des ersten Arguments eine \cs{dimexpr} ist, wird das -% zweite Argument ausgeführt, sonst das dritte. Achtung: Falls der Ausdruck -% ungültig ist, so wird ein Fehler gemeldet! +% \changes{v3.18a}{2015/07/07}{\cs{baselineskip} und \cs{parskip} werden als +% skips akzeptiert}^^A +% \changes{v3.20}{2015/10/19}{\cs{baselineskip} und \cs{parskip} sind keine +% skips}^^A +% \changes{v3.20}{2015/10/19}{Reimplementierung}^^A +% Falls das erste Argument ggf. über mehrere Stufen hinweg zu einem +% \cs{skip}-Register (und zu nichts weiterem!) expandiert, wird das erste +% Argument ausgeführt, sonst das zweite. % \begin{macrocode} %<*base> -\newcommand*{\ifisdimexpr}[1]{% +\newcommand*{\ifisskip}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisskip#1\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifisskip} +% \changes{v3.20}{2015/10/19}{neu (intern)}^^A +% Hilfsmacro, das ggf. rekusiv auf ein \cs{skip}-Register prüft +% \begin{macrocode} +\newcommand*{\scr@ifisskip}[1]{% \begingroup - \edef\reserved@a{#1}% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\reserved@a - \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}% - \expandafter\def\expandafter\reserved@b\expandafter{\string\dimexpr}% - \ifstrstart{\reserved@a}{\reserved@b}{% - \afterassignment\scr@ifemptyorrelax@to@nnil - \@tempdima=#1\relax\@nnil{% - \aftergroup\@firstoftwo + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifisskip + }{% + \ifstrstart{\meaning #1}{\string\skip}{% + \aftergroup\scr@TestSkipAssignTillNil }{% - \aftergroup\@secondoftwo + \aftergroup\scr@secondoftwoAfterNil }% - }{\aftergroup\@secondoftwo}% + }% \endgroup + #1% } % \end{macrocode} -% \begin{macro}{\scr@ifemptyorrelax@to@nnil} -% \changes{v3.12}{2013/11/05}{neu (intern)}^^A -% Hilfsmakro, zur Verwendung beispielsweise nach Zuweissungen. Falls alles bis -% zum ersten \cs{@nnil} leer ist oder aus genau einem \cs{relax} besteht, wird -% das erste Argument ausgeführt, sonst das zweite. +% \end{macro}^^A \scr@ifisskip +% \begin{macro}{\scr@TestSkipAssignTillNil} +% \changes{v3.20}{2015/10/19}{neu (intern)} +% Das durch \cs{@nil} begrenzte Argument wird einer temporären Länge +% zugewiesen. Wird dabei das Argument komplett aufgebraucht, so wird das +% erste Argument nach \cs{@nil} ausgeführt, sonst das zweite. Das begrenzte +% Argument wird in jedem Fall komplett aufgebraucht. % \begin{macrocode} -\newcommand*{\scr@ifemptyorrelax@to@nnil}{} -\def\scr@ifemptyorrelax@to@nnil#1\@nnil{% +\newcommand*\scr@TestSkipAssignTillNil{} +\def\scr@TestSkipAssignTillNil#1\@nil{% \begingroup - \def\reserved@a{#1}\def\reserved@b{\relax}% - \ifx\reserved@a\reserved@b - \aftergroup\@firstoftwo - \else - \ifx\reserved@a\@empty - \aftergroup\@firstoftwo - \else - \aftergroup\@secondoftwo - \fi - \fi - \endgroup + \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillNnil + \@tempskipa=#1\relax\@nnil } %</base> % \end{macrocode} -% \end{macro} -% \end{macro} +% \end{macro}^^A \scr@TestSkipAssignTillNil +% \end{macro}^^A \ifiskip % -% \begin{macro}{\ifisskip} +% \begin{macro}{\ifiscount} % \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. +% \changes{v3.20}{2015/10/19}{Reimplementierung}^^A +% Falls das erste Argument ggf. über mehrere Stufen hinweg zu einem +% \cs{count}-Register (und zu nichts weiterem!) expandiert, wird das erste +% Argument ausgeführt, sonst das zweite. % \begin{macrocode} %<*base> -\newcommand*{\ifisskip}[1]{% +\newcommand*{\ifiscount}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifiscount#1\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifiscount} +% \changes{v3.20}{2015/10/19}{neu (intern)}^^A +% Hilfsmacro, das ggf. rekusiv auf ein \cs{count}-Register prüft +% \begin{macrocode} +\newcommand*{\scr@ifiscount}[1]{% \begingroup - \edef\reserved@a{#1}% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\reserved@a - \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}% - \expandafter\def\expandafter\reserved@b\expandafter{\string\skip}% - \ifstrstart{\reserved@a}{\reserved@b}{% - \afterassignment\scr@ifrelax@to@nnil - \@tempskipa=#1\relax\@nnil{% - \aftergroup\@firstoftwo + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifiscount + }{% + \ifstrstart{\meaning #1}{\string\count}{% + \aftergroup\scr@TestCountAssignTillNil }{% - \aftergroup\@secondoftwo + \aftergroup\scr@secondoftwoAfterNil }% + }% + \endgroup + #1% +} +% \end{macrocode} +% \end{macro}^^A \scr@ifiscount +% \begin{macro}{\scr@TestSkipCountTillNil} +% \changes{v3.20}{2015/10/19}{neu (intern)} +% Das durch \cs{@nil} begrenzte Argument wird einer temporären Länge +% zugewiesen. Wird dabei das Argument komplett aufgebraucht, so wird das +% erste Argument nach \cs{@nil} ausgeführt, sonst das zweite. Das begrenzte +% Argument wird in jedem Fall komplett aufgebraucht. +% \begin{macrocode} +\newcommand*\scr@TestCountAssignTillNil{} +\def\scr@TestCountAssignTillNil#1\@nil{% + \begingroup + \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillNnil + \@tempcnta=#1\relax\@nnil +} +%</base> +% \end{macrocode} +% \end{macro}^^A \scr@TestCountAssignTillNil +% \end{macro}^^A \ifiscount +% +% +% \begin{macro}{\ifisdimexpr} +% \changes{v3.12}{2013/11/05}{neu}^^A +% \changes{v3.20}{2015/10/19}{Reimplementierung}^^A +% Falls das erste Argument ggf. über mehrere Stufen hinweg zu einer +% \cs{dimexpr} (und zu nichts weiterem!) expandiert, wird das erste +% Argument ausgeführt, sonst das zweite. Dies unterscheidet sich in einem +% wichtigen Punkt von \cs{ifisdimen}: Sollte das ganze zwar als \cs{dimexpr} +% beginnen, aber syntaktisch nicht korrekt sein, so wird dies nicht erkannt, +% sondern führt tatsächlich zu einer Fehlermeldung. +% \begin{macrocode} +%<*base> +\newcommand*{\ifisdimexpr}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimexpr#1\relax\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifisdimexpr} +% \changes{v3.20}{2015/10/19}{neu (intern)}^^A +% Hilfsmacro, das ggf. rekusiv auf eine \cs{dimexpr} prüft +% \begin{macrocode} +\newcommand*{\scr@ifisdimexpr}[1]{% + \begingroup + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifisdimexpr }{% - \ifstr{\reserved@a}{\string\baselineskip}{% - \aftergroup\@firstoftwo + \ifstrstart{\meaning #1}{\string\dimexpr}{% + \aftergroup\scr@TestDimenAssignTillNil }{% - \ifstr{\reserved@a}{\string\parskip}{% - \aftergroup\@firstoftwo - }{% - \aftergroup\@secondoftwo - }% + \aftergroup\scr@secondoftwoAfterNil }% }% \endgroup + #1% } %</base> % \end{macrocode} -% \end{macro} +% \end{macro}^^A \scr@ifisdimexpr +% \end{macro}^^A \ifisdimexpr +% % % \begin{macro}{\ifisglueexpr} % \changes{v3.12}{2013/11/05}{neu}^^A -% Falls die Expansion des ersten Arguments eine \cs{glueexpr} ist, wird das -% zweite Argument ausgeführt, sonst das dritte. Achtung: Falls der Ausdruck -% ungültig ist, so wird ein Fehler gemeldet! +% \changes{v3.20}{2015/10/19}{Reimplementierung}^^A +% Falls das erste Argument ggf. über mehrere Stufen hinweg zu einer +% \cs{glueexpr} (und zu nichts weiterem!) expandiert, wird das erste +% Argument ausgeführt, sonst das zweite. Dies unterscheidet sich in einem +% wichtigen Punkt von \cs{ifisskip}: Sollte das ganze zwar als \cs{glueexpr} +% beginnen, aber syntaktisch nicht korrekt sein, so wird dies nicht erkannt, +% sondern führt tatsächlich zu einer Fehlermeldung. % \begin{macrocode} %<*base> \newcommand*{\ifisglueexpr}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisglueexpr#1\relax\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifisglueexpr} +% \changes{v3.20}{2015/10/19}{neu (intern)}^^A +% Hilfsmacro, das ggf. rekusiv auf eine \cs{glueexpr} prüft +% \begin{macrocode} +\newcommand*{\scr@ifisglueexpr}[1]{% \begingroup - \edef\reserved@a{#1}% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\reserved@a - \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}% - \expandafter\def\expandafter\reserved@b\expandafter{\string\glueexpr}% - \ifstrstart{\reserved@a}{\reserved@b}{% - \afterassignment\scr@ifemptyorrelax@to@nnil - \@tempskipa=#1\relax\@nnil{% - \aftergroup\@firstoftwo + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifisglueexpr + }{% + \ifstrstart{\meaning #1}{\string\glueexpr}{% + \aftergroup\scr@TestSkipAssignTillNil }{% - \aftergroup\@secondoftwo + \aftergroup\scr@secondoftwoAfterNil }% - }{\aftergroup\@secondoftwo}% + }% \endgroup + #1% } %</base> % \end{macrocode} -% \end{macro} +% \end{macro}^^A \scr@ifisglueexpr +% \end{macro}^^A \ifisglueexpr % -% \begin{macro}{\ifiscount} +% +% \begin{macro}{\ifisnumexpr} % \changes{v3.12}{2013/11/05}{neu}^^A -% Falls die Expansion des ersten Arguments ein \cs{count} ist, wird das -% zweite Argument ausgeführt, sonst das dritte. Für \LaTeX-Zähler siehe -% stattdessen \cs{ifiscounter}. +% \changes{v3.20}{2015/10/19}{Reimplementierung}^^A +% Falls das erste Argument ggf. über mehrere Stufen hinweg zu einer +% \cs{numexpr} (und zu nichts weiterem!) expandiert, wird das erste +% Argument ausgeführt, sonst das zweite. Dies unterscheidet sich in einem +% wichtigen Punkt von \cs{ifiscount}: Sollte das ganze zwar als \cs{numexpr} +% beginnen, aber syntaktisch nicht korrekt sein, so wird dies nicht erkannt, +% sondern führt tatsächlich zu einer Fehlermeldung. % \begin{macrocode} %<*base> -\newcommand*{\ifiscount}[1]{% +\newcommand*{\ifisnumexpr}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisnumexpr#1\relax\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifisnumexpr} +% \changes{v3.20}{2015/10/19}{neu (intern)}^^A +% Hilfsmacro, das ggf. rekusiv auf eine \cs{numexpr} prüft +% \begin{macrocode} +\newcommand*{\scr@ifisnumexpr}[1]{% \begingroup - \edef\reserved@a{#1}% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\reserved@a - \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}% - \expandafter\def\expandafter\reserved@b\expandafter{\string\count}% - \ifstrstart{\reserved@a}{\reserved@b}{% - \afterassignment\scr@ifrelax@to@nnil - \@tempcnta=#1\relax\@nnil{% - \aftergroup\@firstoftwo + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifisnumexpr + }{% + \ifstrstart{\meaning #1}{\string\numexpr}{% + \aftergroup\scr@TestCountAssignTillNil }{% - \aftergroup\@secondoftwo + \aftergroup\scr@secondoftwoAfterNil }% - }{\aftergroup\@secondoftwo}% + }% \endgroup + #1% } %</base> % \end{macrocode} -% \end{macro} +% \end{macro}^^A \scr@ifisnumexpr +% \end{macro}^^A \ifisnumexpr % -% \begin{macro}{\ifisnumexpr} -% \changes{v3.12}{2013/11/05}{neu}^^A -% Falls die Expansion des ersten Arguments eine \cs{numexpr} ist, wird das -% zweite Argument ausgeführt, sonst das dritte. Achtung: Falls der Ausdruck -% ungültig ist, so wird ein Fehler gemeldet! +% +% \begin{macro}{\ifisdefchar} +% \changes{v3.20}{2015/10/19}{neu}^^A +% Falls das erste Argument ggf. über mehrere Stufen hinweg zu einem mit +% \cs{chardef} definierten Wert (und zu nichts weiterem!) expandiert, wird das +% erste Argument ausgeführt, sonst das zweite. Dies unterscheidet sich in einem +% wichtigen Punkt von \cs{ifiscount}: Sollte das ganze zwar wie ein \cs{char} +% beginnen, aber syntaktisch nicht korrekt sein, so wird dies nicht erkannt, +% sondern führt tatsächlich zu einer Fehlermeldung. % \begin{macrocode} %<*base> -\newcommand*{\ifisnumexpr}[1]{% +\newcommand*{\ifisdefchar}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdefchar#1\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifisdefchar} +% \changes{v3.20}{2015/10/19}{neu (intern)}^^A +% Hilfsmacro, das ggf. rekusiv auf eine \cs{char} prüft +% \begin{macrocode} +\newcommand*{\scr@ifisdefchar}[1]{% \begingroup - \edef\reserved@a{#1}% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\reserved@a - \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}% - \expandafter\def\expandafter\reserved@b\expandafter{\string\numexpr}% - \ifstrstart{\reserved@a}{\reserved@b}{% - \afterassignment\scr@ifemptyorrelax@to@nnil - \@tempcnta=#1\relax\@nnil{% - \aftergroup\@firstoftwo + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifisdefchar + }{% + \ifstrstart{\meaning #1}{\string\char\string"}{% + \aftergroup\scr@TestCountAssignTillNil }{% - \aftergroup\@secondoftwo + \aftergroup\scr@secondoftwoAfterNil }% - }{\aftergroup\@secondoftwo}% + }% \endgroup + #1% } %</base> % \end{macrocode} -% \end{macro} +% \end{macro}^^A \scr@ifisdefchar +% \end{macro}^^A \ifisdefchar +% % % \begin{macro}{\ifiscounter} % \changes{v3.12}{2013/11/05}{neu}^^A @@ -1545,148 +1753,398 @@ %<*base> \newcommand*{\ifiscounter}[1]{% \begingroup - \@ifundefined{c@#1}% - {\aftergroup\@secondoftwo}% - {\aftergroup\@firstoftwo}% + \scr@ifundefinedorrelax{c@#1}{% + \aftergroup\@secondoftwo + }{% + \aftergroup\@firstoftwo + }% \endgroup } %</base> % \end{macrocode} -% \end{macro} +% \end{macro}^^A \ifiscounter +% % % \begin{macro}{\ifisinteger} % \changes{v3.12}{2013/11/05}{neu}^^A % \changes{v3.12a}{2014/01/24}{Leerzeichenfehler korrigiert}^^A +% \changes{v3.20}{2015/10/19}{Reimplementierung}^^A % Falls die Expansion des ersten Arguments eine (positive oder negative) ganze % Zahl ist, wird das zweite Argument ausgeführt, sonst das dritte. % \begin{macrocode} %<*base> \newcommand*{\ifisinteger}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisinteger#1\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifisinteger} +% \changes{v3.20}{2015/10/19}{neu (intern)}^^A +% Hilfsmacro, das ggf. rekusiv auf ein Vorzeichen oder eine positive Zahl +% prüft. +% \begin{macrocode} +\def\scr@ifisinteger#1{% \begingroup - \edef\reserved@a{#1}\expandafter - \scr@ifintegerplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}% - {\aftergroup\@secondoftwo}% + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifisinteger\aftergroup#1% + }{% + \ifstrstart{\meaning #1}{\detokenize{the character}}{% + \if #1-\aftergroup\scr@ifisinteger + \else + \if #1+\aftergroup\scr@ifisinteger + \else + \ifnum 0=0\if #10\else\if #11\else\if #12\else\if #13\else + \if #14\else\if #15\else\if #16\else\if #17\else + \if #18\else\if #19\else 1\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \relax + \aftergroup\scr@TestCountAssignTillNil + \aftergroup#1% + \else + \aftergroup\scr@secondoftwoAfterNil + \aftergroup#1% + \fi + \fi + \fi + }{% + \ifstrstart{\meaning #1}{\string\char\string"}{% + \aftergroup\scr@TestCountAssignTillNil + }{% + \def\reserved@c{% + \aftergroup\scr@secondoftwoAfterNil + }% + \@for\reserved@a:=\abovedisplayskip,\abovedisplayshortskip,% + \adjdemerits,% + \baselineskip,\belowdisplayskip,% + \belowdisplayshortskip,\binoppenalty,\boxmaxdepth,% + \brokenpenalty,% + \clubpenalty,\count,% + \dimen,\dimexpr,\doublehyphendemerits,\dp,% + \emergenystretch,\exhyphenpenalty,% + \finalhyphendemerits,% + \glueexpr,% + \hbadness,\hfuzz,\hsize,\ht,\hyphenpenalty,% + \lastskip,\lastpenalty,\linepenalty,% + \lineskip,\lineskiplimit,% + \maxdepth,\numexpr,% + \overfullrule,% + \parfillskip,\parindent,\parskip,% + \pdfpageheight,\pdfpagewidth,% + \predisplaypenalty,\pretolerance,% + \relpenalty,\widowpenalty,% + \skip,\splitmaxdepth,\splittopskip,% + \tolerance,\topskip,% + \wd,\vbadness,\vfuzz,\vsize + \do {% + \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \meaning #1% + }{% + \def\reserved@c{\aftergroup\scr@TestCountAssignTillNil}% + }% + }% + \reserved@c + }% + \aftergroup#1% + }% + }% \endgroup } +%</base> % \end{macrocode} -% \begin{macro}{\scr@ifintegerplusminus} +% \end{macro}^^A \scr@ifisinteger +% \end{macro}^^A \ifisinteger +% +% +% \begin{macro}{\scr@ifrelax@to@nnil} % \changes{v3.12}{2013/11/05}{neu (intern)}^^A -% Hilfsmakro, ausschließlich für \cs{ifisinteger}. +% Hilfsmakro, zur Verwendung beispielsweise nach Zuweissungen. Falls alles bis +% zum ersten \cs{@nnil} aus genau einem \cs{relax} besteht, wird das erste +% Argument ausgeführt, sonst das zweite. % \begin{macrocode} -\newcommand*{\scr@ifintegerplusminus}{} -\def\scr@ifintegerplusminus#1#2\@nil{% - \def\scr@next{\scr@ifintegerplusminus #2\@nil}% - \if #1-\relax - \else \if #1+\relax +%<*base> +\newcommand*{\scr@ifrelax@to@nnil}{} +\def\scr@ifrelax@to@nnil#1\@nnil{% + \begingroup + \def\reserved@a{#1}\def\reserved@b{\relax}% + \ifx\reserved@a\reserved@b + \aftergroup\@firstoftwo \else - \def\scr@next{% - \afterassignment\scr@ifrelax@to@nnil - \@tempcnta=#1#2\relax\@nnil - }% - \if #10\else\if #11\else\if #12\else\if #13\else\if #14\else - \if #15\else\if #16\else\if #17\else\if #18\else\if #19\else - \let\scr@next\@secondoftwo - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \aftergroup\@secondoftwo \fi - \fi - \scr@next + \endgroup } %</base> % \end{macrocode} % \end{macro} -% \end{macro} % % \begin{macro}{\ifisdimension} % \changes{v3.12}{2013/11/05}{neu}^^A % \changes{v3.12a}{2014/01/24}{Leerzeichenfehler korrigiert}^^A -% Falls die Expansion des ersten Arguments eine (positive oder negative) -% Länge ist, wird das zweite Argument ausgeführt, sonst das dritte. Es sei -% darauf hingewiesen, dass derzeit ungültige oder fehlende Einheiten eine -% Fehlermeldung bewirken! +% \changes{v3.20}{2015/10/20}{Reimplementierung}^^A +% Falls die stufenweise Expansion des ersten Arguments eine (positive oder +% negative) Länge ist, wird das zweite Argument ausgeführt, sonst das +% dritte. % \begin{macrocode} %<*base> \newcommand*{\ifisdimension}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimension#1\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifisdimension} +% \changes{v3.20}{2015/10/20}{neu (intern)} +% Eigentlich wäre dieses Hilfsmakro extrem aufwändig, da eine Dimension recht +% komplex aufgebaut sein darf. Ich habe aber beschlossen, hier mit einer +% Heuristik zu Werke zu gehen: Wenn das Argument mit einer beliebigen Anzahl +% Vorzeichen, gefolgt von max. einem Punkt, Komma oder einer Ziffer oder +% gefolgt einem der für Längen zulässigen Primitiv beginnt, dann probieren wir +% eine Zuweisung. Ist diese syntaktisch nicht korrekt, kann ein Fehler die +% Folge sein. Das mag unschön sein, vereinfacht den Test aber erheblich! +% \begin{macrocode} +\newcommand*{\scr@ifisdimension}[1]{% \begingroup - \edef\reserved@a{#1\relax}\expandafter - \scr@ifdimensionplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}% - {\aftergroup\@secondoftwo}% + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifisdimension\aftergroup#1% + }{% + \ifstrstart{\meaning #1}{\detokenize{the character}}{% + \if #1-\aftergroup\scr@ifisdimension + \else + \if #1-\aftergroup\scr@ifisdimension + \else + \if #1.% + \aftergroup\scr@TestDimensionAssignTillNil + \aftergroup#1% + \else + \if #1,% + \aftergroup\scr@TestDimensionAssignTillNil + \aftergroup#1% + \else + \ifnum 0=0\if #10\else\if #11\else\if #12\else\if #13\else + \if #14\else\if #15\else\if #16\else\if #17\else + \if #18\else\if #19\else 1\fi\fi + \fi\fi\fi\fi + \fi\fi\fi\fi + \relax + \aftergroup\scr@TestDimensionAssignTillNil + \aftergroup#1% + \else + \aftergroup\scr@secondoftwoAfterNil + \aftergroup#1% + \fi + \fi + \fi + \fi + \fi + }{% + \ifstrstart{\meaning #1}{\string\char\string"}{% + \aftergroup\scr@TestDimensionAssignTillNil + }{% + \def\reserved@c{% + \aftergroup\scr@secondoftwoAfterNil + \aftergroup\@empty + }% + \@for\reserved@a:=\abovedisplayskip,\abovedisplayshortskip,% + \adjdemerits,% + \baselineskip,\belowdisplayskip,% + \belowdisplayshortskip,\binoppenalty,\boxmaxdepth,% + \brokenpenalty,% + \clubpenalty,\count,% + \dimen,\dimexpr,\doublehyphendemerits,\dp,% + \emergenystretch,\exhyphenpenalty,% + \finalhyphendemerits,% + \glueexpr,% + \hbadness,\hfuzz,\hsize,\ht,\hyphenpenalty,% + \lastskip,\lastpenalty,\linepenalty,% + \lineskip,\lineskiplimit,% + \maxdepth,\numexpr,% + \overfullrule,% + \parfillskip,\parindent,\parskip,% + \pdfpageheight,\pdfpagewidth,% + \predisplaypenalty,\pretolerance,% + \relpenalty,\widowpenalty,% + \skip,\splitmaxdepth,\splittopskip,% + \tolerance,\topskip,% + \wd,\vbadness,\vfuzz,\vsize + \do {% + \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \meaning #1% + }{% + \def\reserved@c{\aftergroup\scr@TestDimensionAssignTillNil}% + }% + }% + \reserved@c + }% + \aftergroup#1% + }% + }% \endgroup } % \end{macrocode} -% \begin{macro}{\scr@ifdimensionplusminus} -% \changes{v3.12}{2013/11/05}{neu (intern)}^^A -% Hilfsmakro, ausschließlich für \cs{ifisdimension}. +% \begin{macro}{\scr@TestDimenionAssignTillNil} +% \changes{v3.20}{2015/10/19}{neu (intern)} +% Das durch \cs{@nil} begrenzte Argument wird einer temporären Länge +% zugewiesen. Wird dabei das Argument komplett aufgebraucht, so wird das +% erste Argument nach \cs{@nil} ausgeführt, sonst das zweite. Das begrenzte +% Argument wird in jedem Fall komplett aufgebraucht. % \begin{macrocode} -\newcommand*{\scr@ifdimensionplusminus}{} -\def\scr@ifdimensionplusminus#1#2\@nil{% - \def\scr@next{\scr@ifdimensionplusminus #2\@nil}% - \if #1-\relax - \else \if #1+\relax - \else - \def\scr@next{% - \afterassignment\scr@ifrelax@to@nnil - \@tempdima=#1#2\@nnil - }% - \if #1,\else\if #1.\else - \if #10\else\if #11\else\if #12\else\if #13\else\if #14\else - \if #15\else\if #16\else\if #17\else\if #18\else\if #19\else - \let\scr@next\@secondoftwo - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \fi\fi - \fi - \fi - \scr@next +\newcommand*\scr@TestDimensionAssignTillNil{} +\def\scr@TestDimensionAssignTillNil#1\@nil{% + \begingroup + \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillptNnil + \@tempdima=#1pt\@nnil +} +% \end{macrocode} +% \begin{macro}{\scr@IfAfterEndgroupArgIsRelaxTillptNnil} +% \changes{v3.20}{2015/10/19}{neu (intern)} +% \begin{macro}{\scr@IfArgIsRelaxAfterRelaxTillptNnil} +% \changes{v3.20}{2015/10/19}{neu (intern)} +% Die Hilfsmakros lesen ein durch \cs{@nnil} begrenztes Argument. Falls dieses +% Argument nur aus einer Folge von \cs{relax} besteht, wird das erste Argument +% nach \cs{@nnil} ausgeführt, sonst das zweite. +% \begin{macrocode} +\newcommand*\scr@AfterEndGroupIfArgIsRelaxTillptNnil{} +\def\scr@AfterEndGroupIfArgIsRelaxTillptNnil#1\@nnil{% + \endgroup + \ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{% + \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \scr@IfArgIsRelaxAfterRelaxTillptNnil #1\@nnil + }{\@secondoftwo}% + }% +} +\newcommand*\scr@IfArgIsRelaxAfterRelaxTillptNnil{} +\def\scr@IfArgIsRelaxAfterRelaxTillptNnil \relax#1pt\@nnil{% + \ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{% + \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \scr@IfArgIsRelaxAfterRelaxTillptNnil #1\@nnil + }{\@secondoftwo}% + }% } %</base> % \end{macrocode} -% \end{macro} -% \end{macro} +% \end{macro}^^A \scr@IfArgIsRelaxAfterRelaxTillptNnil +% \end{macro}^^A \scr@IfArgIsRelaxTillptNnil +% \end{macro}^^A \scr@DimensionSkipAssignTillNil +% \end{macro}^^A \scr@ifisdimension +% \end{macro}^^A \ifisdimension +% % % \begin{macro}{\ifisglue} % \changes{v3.12}{2013/11/05}{neu}^^A % \changes{v3.12a}{2014/01/24}{Leerzeichenfehler korrigiert}^^A -% Falls die Expansion des ersten Arguments eine (positive oder negative) -% Ausdehnung ist, wird das zweite Argument ausgeführt, sonst das dritte. Es sei -% darauf hingewiesen, dass derzeit ungültige oder fehlende Einheiten eine -% Fehlermeldung bewirken! +% \changes{v3.20}{2015/10/21}{Reimplementierung}^^A +% Falls die stufenweise Expansion des ersten Arguments eine (positive oder +% negative) Länge mit Leim ist, wird das zweite Argument ausgeführt, sonst das +% dritte. % \begin{macrocode} %<*base> \newcommand*{\ifisglue}[1]{% + \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisglue#1\@nil}% +} +% \end{macrocode} +% \begin{macro}{\scr@ifisglue} +% \changes{v3.20}{2015/10/21}{neu (intern)} +% Eigentlich wäre dieses Hilfsmakro extrem aufwändig, da Leim recht +% komplex aufgebaut sein darf. Ich habe aber beschlossen, hier mit einer +% Heuristik zu Werke zu gehen: Wenn das Argument mit einer beliebigen Anzahl +% Vorzeichen, gefolgt von max. einem Punkt, Komma oder einer Ziffer oder +% gefolgt einem der für Leim zulässigen Primitiv beginnt, dann probieren wir +% eine Zuweisung. Ist diese syntaktisch nicht korrekt, kann ein Fehler die +% Folge sein. Das mag unschön sein, vereinfacht den Test aber erheblich! +% \begin{macrocode} +\newcommand*{\scr@ifisglue}[1]{% \begingroup - \edef\reserved@a{#1\relax}\expandafter - \scr@ifglueplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}% - {\aftergroup\@secondoftwo}% + \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \aftergroup\expandafter\aftergroup\scr@ifisglue\aftergroup#1% + }{% + \ifstrstart{\meaning #1}{\detokenize{the character}}{% + \if #1-\aftergroup\scr@ifisglue + \else + \if #1-\aftergroup\scr@ifisdimension + \else + \if #1.% + \aftergroup\scr@TestGlueAssignTillNil + \aftergroup#1% + \else + \if #1,% + \aftergroup\scr@TestGlueAssignTillNil + \aftergroup#1% + \else + \ifnum 0=0\if #10\else\if #11\else\if #12\else\if #13\else + \if #14\else\if #15\else\if #16\else\if #17\else + \if #18\else\if #19\else 1\fi\fi + \fi\fi\fi\fi + \fi\fi\fi\fi + \relax + \aftergroup\scr@TestGlueAssignTillNil + \aftergroup#1% + \else + \aftergroup\scr@secondoftwoAfterNil + \aftergroup#1% + \fi + \fi + \fi + \fi + \fi + }{% + \ifstrstart{\meaning #1}{\string\char\string"}{% + \aftergroup\scr@TestGlueAssignTillNil + }{% + \def\reserved@c{% + \aftergroup\scr@secondoftwoAfterNil + \aftergroup\@empty + }% + \@for\reserved@a:=\abovedisplayskip,\abovedisplayshortskip,% + \adjdemerits,% + \baselineskip,\belowdisplayskip,% + \belowdisplayshortskip,\binoppenalty,\boxmaxdepth,% + \brokenpenalty,% + \clubpenalty,\count,% + \dimen,\dimexpr,\doublehyphendemerits,\dp,% + \emergenystretch,\exhyphenpenalty,% + \finalhyphendemerits,% + \glueexpr,% + \hbadness,\hfuzz,\hsize,\ht,\hyphenpenalty,% + \lastskip,\lastpenalty,\linepenalty,% + \lineskip,\lineskiplimit,% + \maxdepth,\numexpr,% + \overfullrule,% + \parfillskip,\parindent,\parskip,% + \pdfpageheight,\pdfpagewidth,% + \predisplaypenalty,\pretolerance,% + \relpenalty,\widowpenalty,% + \skip,\splitmaxdepth,\splittopskip,% + \tolerance,\topskip,% + \wd,\vbadness,\vfuzz,\vsize + \do {% + \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \meaning #1% + }{% + \def\reserved@c{\aftergroup\scr@TestGlueAssignTillNil}% + }% + }% + \reserved@c + }% + \aftergroup#1% + }% + }% \endgroup } % \end{macrocode} -% \begin{macro}{\scr@ifglueplusminus} -% \changes{v3.12}{2013/11/05}{neu (intern)}^^A -% Hilfsmakro, ausschließlich für \cs{ifisglue}. +% \begin{macro}{\scr@TestGlueAssignTillNil} +% \changes{v3.20}{2015/10/21}{neu (intern)} +% Das durch \cs{@nil} begrenzte Argument wird einer temporären Länge +% zugewiesen. Wird dabei das Argument komplett aufgebraucht, so wird das +% erste Argument nach \cs{@nil} ausgeführt, sonst das zweite. Das begrenzte +% Argument wird in jedem Fall komplett aufgebraucht. % \begin{macrocode} -\newcommand*{\scr@ifglueplusminus}{} -\def\scr@ifglueplusminus#1#2\@nil{% - \def\scr@next{\scr@ifglueplusminus #2\@nil}% - \if #1-\relax - \else \if #1+\relax - \else - \def\scr@next{% - \afterassignment\scr@ifrelax@to@nnil - \@tempskipa=#1#2\@nnil - }% - \if #1,\else\if #1.\else - \if #10\else\if #11\else\if #12\else\if #13\else\if #14\else - \if #15\else\if #16\else\if #17\else\if #18\else\if #19\else - \let\scr@next\@secondoftwo - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \fi\fi - \fi - \fi - \scr@next +\newcommand*\scr@TestGlueAssignTillNil{} +\def\scr@TestGlueAssignTillNil#1\@nil{% + \begingroup + \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillptNnil + \@tempskipa=#1pt\@nnil } %</base> % \end{macrocode} -% \end{macro} -% \end{macro} +% \end{macro}^^A \scr@TestGlueAssignTillNil +% \end{macro}^^A \scr@ifisglue +% \end{macro}^^A \ifisglue % % % \begin{macro}{\ifnumber} @@ -2128,17 +2586,48 @@ \ifx\scr@key@name\space\else \scr@ifundefinedorrelax{KV@#2@\scr@key@name}{% \scr@ifundefinedorrelax{KV@#2#1@\scr@key@name}{% - \PackageError{scrbase}{% - unknown option - `\expandafter\detokenize\expandafter{\scr@key@atlist}'% +% \end{macrocode} +% \changes{v3.20}{2015/11/18}{Besondere Behandlung der +% \texttt{@else@}-Option}^^A +% Es existiert zwar weder eine Familienoption noch eine Mitgliedsoption, aber +% vielleicht existiert ja die Spezialoption \texttt{@else@}, die in einem +% solchen Fall die eigentliche Option als Wert erhält. +% \begin{macrocode} + \scr@ifundefinedorrelax{KV@#2#1@@else@}{% + \PackageError{scrbase}{% + unknown option + `\expandafter\detokenize\expandafter{\scr@key@atlist}'% + }{% + Member `#1' of family `#2'\MessageBreak + cannot handle option `\scr@key@name'.\MessageBreak + So it cannot be set% + \ifx\scr@key@value\@empty\else + \space to value + `\expandafter\detokenize\expandafter{\scr@key@value}'% + \fi.% + }% }{% - Member `#1' of family `#2'\MessageBreak - cannot handle option `\scr@key@name'.\MessageBreak - So it cannot be set% - \ifx\scr@key@value\@empty\else - \space to value - `\expandafter\detokenize\expandafter{\scr@key@value}'% - \fi.% + \scr@execute@elseoption{#2#1}% +% \end{macrocode} +% Im Gegensatz zu anderen Optionen bedeuten bei der \texttt{@else@}-Option +% alle von \cs{FamilyKeyStateProcessed} abweichenden Ergebnisse, dass die +% Option nicht korrekt verarbeitet werden konnte und deshalb die ursprüngliche +% Option als Fehler zu melden ist. +% \begin{macrocode} + \ifx\FamilyKeyState\FamilyKeyStateProcessed\else + \PackageError{scrbase}{% + unknown option + `\expandafter\detokenize\expandafter{\scr@key@atlist}'% + }{% + Member `#1' of family `#2'\MessageBreak + cannot handle option `\scr@key@name'.\MessageBreak + So it cannot be set% + \ifx\scr@key@value\@empty\else + \space to value + `\expandafter\detokenize\expandafter{\scr@key@value}'% + \fi.% + }% + \fi }% }{% \scr@execute@option{#2#1}% @@ -2146,7 +2635,20 @@ }{% \scr@execute@option{#2}% \ifstr{#1}{}{}{% - \scr@ifundefinedorrelax{KV@#2#1\scr@key@name}{}{% +% \end{macrocode} +% \changes{v3.20}{2015/11/18}{Memberoptionstest nach Familyoptionsausführung +% korrigiert}^^A +% Auch wenn eine Familienoption ausgeführt wurde, muss eine existierende +% Mitgliederoption ggf. noch ausgeführt werden. Existiert sie nicht, wird +% ebenfalls eine existierende \texttt{@else@}-Option ausgeführt. Allerdings +% führen in diesem Fall von \cs{FamilyKeyStateProcessed} abweichende +% Ergebnisse nicht zu einer Fehlermeldung. +% \begin{macrocode} + \scr@ifundefinedorrelax{KV@#2#1@\scr@key@name}{% + \scr@ifundefinedorrelax{KV@#2#1@@else@}{}{% + \scr@execute@elseoption{#2#1}% + }% + }{% \ifx\FamilyKeyState\FamilyKeyStateProcessed \scr@execute@option{#2#1}% \FamilyKeyStateProcessed @@ -2385,7 +2887,7 @@ \noexpand\let\noexpand\KV@err\noexpand\scr@KV@err \noexpand\setkeys{#1}{% \unexpanded\expandafter{\scr@key@atlist}}% - \noexpand\def\noexpand\scr@key@atlist{% + \noexpand\def\noexpand\scr@key@atlist{% \unexpanded\expandafter{\scr@key@atlist}}% \noexpand\def\noexpand\scr@key@name{% \unexpanded\expandafter{\scr@key@name}}% @@ -2445,8 +2947,37 @@ % \begin{macrocode} \newcommand*{\scr@key@run@errors}{} % \end{macrocode} -% \end{macro} +% \end{macro}^^A \scr@key@run@errors} % \end{macro}^^A \scr@execute@option +% \begin{macro}{\scr@execute@elseoption} +% \changes{v3.20}{2015/11/18}{neu (intern)} +% Ist eine Spezialoption mit dem Namen \texttt{@else@} definiert, so wird +% diese von \cs{FamilyExecuteOptions} genau dann ausgeführt, wenn keine +% passende Option gefunden wurde. Dafür dient dieses Makro, dessen Argumente +% und Aufrufstatus genau \cs{scr@execute@option} entspricht. Es soll auch +% genau dasselbe tun, außer dass es nicht die Option selbst aufruft, sondern +% die Option als Wert an die \texttt{@else@}-Option übergibt. Es muss also +% temporär \cs{scr@key@atlist}, \cs{scr@key@name} und \cs{scr@key@value} +% geändert werden, bevor \cs{scr@execute@option} ausgeführt wird. +% \begin{macrocode} +\newcommand*{\scr@execute@elseoption}[1]{% + \protected@edef\reserved@a{% + \noexpand\def\noexpand\scr@key@name{@else@}% + \noexpand\def\noexpand\scr@key@value{% + \unexpanded\expandafter{\scr@key@atlist}}% + \noexpand\def\noexpand\scr@key@atlist{% + @else@={\unexpanded\expandafter{\scr@key@atlist}}}% + \noexpand\scr@execute@option{#1}% + \noexpand\def\noexpand\scr@key@atlist{ + \unexpanded\expandafter{\scr@key@atlist}}% + \noexpand\def\noexpand\scr@key@name{% + \unexpanded\expandafter{\scr@key@name}}% + \noexpand\def\noexpand\scr@key@value{% + \unexpanded\expandafter{\scr@key@value}}% + }\reserved@a +} +% \end{macrocode} +% \end{macro}^^A \scr@execute@elseoption % \begin{macro}{\ifscr@key@found@} % \changes{v2.97c}{2007/04/19}{Neuer Schalter (intern)}^^A % \changes{v3.00}{2008/04/30}{umbenannt von \cs{ifKOMA@key@found}} @@ -2667,7 +3198,104 @@ }% %</base> % \end{macrocode} -% \end{macro} +% \end{macro}^^A \l@addto@macro +% +% \begin{macro}{\l@addto@macro@a} +% \changes{v3.20}{2015/11/20}{neu (intern)} +% So eine ähnliche Anweisung benötige ich außerdem für den Fall, dass eine +% Anweisung erweitert werden soll, die genau ein obligatorisches Argument +% benötigt. Achtung! Diese Anweisung funktioniert deutlich weniger allgemein +% als \cs{l@addto@macro} und wird deshalb nie offiziell dokumentiert! +% \begin{macrocode} +%<*base> +\begingroup + \catcode`\^^A=\catcode`\# + \@makeother\# + \gdef\l@addto@macro@a^^A1{% + \begingroup + \@makeother\# + \def\l@addto@macro@a@cmd{^^A1}% + \l@addto@macro@a@ + } + \gdef\l@addto@macro@a@^^A1{% + \def\l@addto@macro@a@add{^^A1}% + \l@addto@macro@a@@ + } +\endgroup +\begingroup + \@makeother\# + \gdef\l@addto@macro@a@@{% + \@makeother\# + \edef\reserved@a{% + \detokenize{\endgroup\def}% + \detokenize\expandafter{\l@addto@macro@a@cmd#1}% + {% + \expandafter\detokenize% + \expandafter\expandafter\expandafter{\l@addto@macro@a@cmd{#1}}% + \expandafter\detokenize\expandafter{\l@addto@macro@a@add}% + }% + }% + \expandafter\scantokens\expandafter{\reserved@a}% + }% +\endgroup +%</base> +% \end{macrocode} +% \end{macro}^^A \l@addto@macro@a +% +% \begin{macro}{\l@preto@macro} +% \changes{v3.20}{2015/11/25}{neu (intern)}^^A +% In gewisser Weise das gleiche wie \cs{l@appto@macro}, allerdings wird vorn +% statt hinten angefügt. +% \begin{macrocode} +%<*base> +\newcommand\l@preto@macro[2]{% + \edef#1{\unexpanded{#2}\unexpanded\expandafter{#1}}% +}% +%</base> +% \end{macrocode} +% \end{macro}^^A \l@preto@macro +% +% \begin{macro}{\l@preto@macro@a} +% \changes{v3.20}{2015/11/25}{neu (intern)} +% So eine ähnliche Anweisung benötige ich außerdem für den Fall, dass eine +% Anweisung erweitert werden soll, die genau ein obligatorisches Argument +% benötigt. Achtung! Diese Anweisung funktioniert deutlich weniger allgemein +% als \cs{l@preto@macro} und wird deshalb nie offiziell dokumentiert! +% \begin{macrocode} +%<*base> +\begingroup + \catcode`\^^A=\catcode`\# + \@makeother\# + \gdef\l@preto@macro@a^^A1{% + \begingroup + \@makeother\# + \def\l@preto@macro@a@cmd{^^A1}% + \l@preto@macro@a@ + } + \gdef\l@preto@macro@a@^^A1{% + \def\l@preto@macro@a@add{^^A1}% + \l@preto@macro@a@@ + } +\endgroup +\begingroup + \@makeother\# + \gdef\l@preto@macro@a@@{% + \@makeother\# + \edef\reserved@a{% + \detokenize{\endgroup\def}% + \detokenize\expandafter{\l@preto@macro@a@cmd#1}% + {% + \expandafter\detokenize\expandafter{\l@preto@macro@a@add}% + \expandafter\detokenize% + \expandafter\expandafter\expandafter{\l@preto@macro@a@cmd{#1}}% + }% + }% + \expandafter\scantokens\expandafter{\reserved@a}% + }% +\endgroup +%</base> +% \end{macrocode} +% \end{macro}^^A \l@preto@macro@a % % \begin{macro}{\KOMAoption} % \changes{v2.98c}{2008/03/12}{Neue Anweisung}^^A @@ -2825,6 +3453,8 @@ % \changes{v3.12}{2013/11/05}{neu}^^A % \changes{v3.15}{2014/12/03}{er wird ein (optionaler) Säumniswert % unterstützt}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Dieses Makro definiert einen Schlüssel, der einen \LaTeX-Zähler an Hand % des Wertes setzt. Das erste, optionale Argument ist das Familienmitglied, % das zweite, obligatorische Argument ist die Familie, das dritte der Name @@ -2837,7 +3467,7 @@ % \begin{macrocode} %<*base> \newcommand*{\FamilyCounterKey}[3][.\@currname.\@currext]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\Family@@Counter@@Key{#1}{#2}{#3}}% {\Family@Counter@Key{#1}{#2}{#3}}% } @@ -2860,15 +3490,26 @@ % 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\FamilyKeyStateProcessed}{% - \ifisnumexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% - \ifisdimexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% - \ifisinteger{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% - \ifiscounter{#4}{\value{#3}=\value{#4}\FamilyKeyStateProcessed}{% - \FamilyUnknownKeyValue{#1}{#2}{#4}{% - integer numbers, counters, lengths, skips, dimens + \begingroup + \protected@edef\reserved@a{#4}% + \def\reserved@b{\endgroup\value{#3}=#4 \FamilyKeyStateProcessed}% + \expandafter\ifiscount\expandafter{\reserved@a}{}{% + \expandafter\ifisdimen\expandafter{\reserved@a}{}{% + \expandafter\ifisskip\expandafter{\reserved@a}{}{% + \expandafter\ifisnumexpr\expandafter{\reserved@a}{}{% + \expandafter\ifisdimexpr\expandafter{\reserved@a}{}{% + \expandafter\ifisinteger\expandafter{\reserved@a}{}{% + \expandafter\ifiscounter\expandafter{\reserved@a}{% + \def\reserved@b{% + \endgroup\value{#3}=\value{#4}\FamilyKeyStateProcessed + }% + }{% + \def\reserved@b{% + \endgroup + \FamilyUnknownKeyValue{#1}{#2}{#4}{% + integer numbers, counters, lengths, skips, dimens + }% + }% }% }% }% @@ -2876,7 +3517,7 @@ }% }% }% - }% + \reserved@b } %</base> % \end{macrocode} @@ -2899,6 +3540,8 @@ % \cs{FamilyKeyStateProcessed}}^^A % \changes{v3.18a}{2015/07/06}{korrekte Verwendung von % \cs{FamilyKeyStateProcessed}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^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 @@ -2910,7 +3553,7 @@ % \begin{macrocode} %<*base> \newcommand*{\FamilyCounterMacroKey}[3][.\@currname.\@currext]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\Family@@Counter@@Macro@@Key{#1}{#2}{#3}}% {\Family@Counter@Macro@Key{#1}{#2}{#3}}% } @@ -2925,28 +3568,28 @@ } \newcommand*{\FamilySetCounterMacro}[4]{% \begingroup - \ifiscount{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisdimen{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisnumexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisdimexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisinteger{#4}{% - \@tempcnta=#4\aftergroup\FamilyKeyStateProcessed - }{% - \ifiscounter{#4}{% - \@tempcnta=\value{#4}\FamilyKeyStateProcessed}{% - \FamilyUnknownKeyValue{#1}{#2}{#4}{% - integer numbers, counters, lengths, skips, dimens - }% - }% - }% - }% - }% +% \end{macrocode} +% An dieser Stelle wird nun der immer definierte Zähler page als lokaler +% Zähler verwendet. Das ist nur möglich, weil \cs{FamilySetCounter} nicht +% global mit \cs{setcounter} arbeitet, sondern lokal mit einer Zuweisung an +% \cs{value}. +% \begin{macrocode} + \FamilySetCounter{#1}{#2}{page}{#4}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \edef\reserved@a{% + \unexpanded{\endgroup\def#3}% + {\the\value{page}}% + \noexpand\FamilyKeyStateProcessed + }% + \else + \def\reserved@a{% + \endgroup + \FamilyUnknownKeyValue{#1}{#2}{#4}{% + integer numbers, counters, lengths, skips, dimens }% }% - }% - \expandafter\expandafter\expandafter\endgroup - \expandafter\def\expandafter#3\expandafter{\the\@tempcnta}% + \fi + \reserved@a } %</base> % \end{macrocode} @@ -2959,6 +3602,8 @@ % \changes{v3.12}{2013/11/05}{neu}^^A % \changes{v3.15}{2014/12/03}{er wird ein (optionaler) Säumniswert % unterstützt}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Dieses Makro definiert einen Schlüssel, der eine \LaTeX-Länge an Hand % des Wertes setzt. Das erste, optionale Argument ist das Familienmitglied, % das zweite, obligatorische Argument ist die Familie, das dritte der Name @@ -2970,7 +3615,7 @@ % \begin{macrocode} %<*base> \newcommand*{\FamilyLengthKey}[3][.\@currname.\@currext]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\Family@@Length@@Key{#1}{#2}{#3}}% {\Family@Length@Key{#1}{#2}{#3}}% } @@ -2989,21 +3634,36 @@ % \changes{v3.15}{2015/01/02}{\cs{ifglueexpr} hinzugefügt}^^A % \changes{v3.18a}{2015/07/06}{korrekte Verwendung von % \cs{FamilyKeyStateProcessed}}^^A +% \changes{v3.20}{2016/04/27}{Expansion vor dem Test}^^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\FamilyKeyStateProcessed}{% - \ifisnumexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% - \ifisdimexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% - \ifisglueexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% - \ifisglue{#4}{#3=#4\FamilyKeyStateProcessed}{% - \FamilyUnknownKeyValue{#1}{#2}{#4}{% - length values, counters, lengths, skips, dimens - }% + \begingroup + \protected@edef\reserved@a{#4}% + \expandafter\ifiscount\expandafter{\reserved@a}{% + \aftergroup\@firstoftwo + }{% + \expandafter\ifisdimen\expandafter{\reserved@a}{% + \aftergroup\@firstoftwo + }{% + \expandafter\ifisskip\expandafter{\reserved@a}{% + \aftergroup\@firstoftwo + }{% + \expandafter\ifisnumexpr\expandafter{\reserved@a}{% + \aftergroup\@firstoftwo + }{% + \expandafter\ifisdimexpr\expandafter{\reserved@a}{% + \aftergroup\@firstoftwo + }{% + \expandafter\ifisglueexpr\expandafter{\reserved@a}{% + \aftergroup\@firstoftwo + }{% + \expandafter\ifisglue\expandafter{\reserved@a}{% + \aftergroup\@firstoftwo + }{% + \aftergroup\@secondoftwo }% }% }% @@ -3011,6 +3671,13 @@ }% }% }% + \endgroup + {#3=#4\FamilyKeyStateProcessed}% + {% + \FamilyUnknownKeyValue{#1}{#2}{#4}{% + length values, counters, lengths, skips, dimens + }% + }% } %</base> % \end{macrocode} @@ -3030,8 +3697,11 @@ % \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 +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} ersetzt durch +% \cs{kernel@ifnextchar}}^^A +% \changes{v3.20}{2016/04/27}{interne Verwendung von \cs{FamilySetLength}}^^A +% Diese Anweisungen arbeitet fast wie \cs{FamilyLengthKey} und +% \cs{FamilySetLengt}, allerdings wird nicht eine Länge gesetzt, sondern % ein Makro auf einen Wert definiert. Dabei ist das erste Argument die % Familie, das zweite der Name des Schlüssels, das dritte das Makro, das % vierte schließlich der gewünschte Wert. @@ -3042,7 +3712,7 @@ % \begin{macrocode} %<*base> \newcommand*{\FamilyLengthMacroKey}[3][.\@currname.\@currext]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\Family@@Length@@Macro@@Key{#1}{#2}{#3}}% {\Family@Length@Macro@Key{#1}{#2}{#3}}% } @@ -3057,31 +3727,81 @@ } \newcommand*{\FamilySetLengthMacro}[4]{% \begingroup - \ifiscount{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisdimen{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisnumexpr{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisdimexpr{#4}{% - \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed - }{% - \ifisglueexpr{#4}{% - \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed - }{% - \ifisglue{#4}{% - \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed - }{% - \FamilyUnknownKeyValue{#1}{#2}{#4}{% - length values, counters, lengths, skips, dimens - }% - }% - }% - }% - }% + \FamilySetLength{#1}{#2}{\@tempskipa}{#4}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \edef\reserved@a{% + \unexpanded{\endgroup\def#3}% + {\the\@tempskipa}% + \noexpand\FamilyKeyStateProcessed + }% + \else + \def\reserved@a{% + \endgroup + \FamilyUnknownKeyValue{#1}{#2}{#4}{% + length values, counters, lengths, skips, dimens }% }% - }% - \expandafter\expandafter\expandafter\endgroup - \expandafter\def\expandafter#3\expandafter{\the\@tempskipa}% + \fi + \reserved@a +} +%</base> +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% +% \begin{macro}{\FamilyUseLengthMacroKey} +% \changes{v3.20}{2016/04/27}{neu}^^A +% \begin{macro}{\FamilySetLengthMacro} +% \changes{v3.20}{2016/04/27}{neu}^^A +% Diese Anweisungen arbeitet fast wie \cs{FamilyLengthKey} und +% \cs{FamilySetLengt}, allerdings wird das Makro nicht als den Wert des Werts, +% sondern als den Wert selbst definiert. Eine Expansion des Werts findet nur +% für die Prüfung statt. Änderungen am Wert wirken sich also ggf. weiterhing +% aus. Dabei ist das erste Argument die Familie, das zweite der Name des +% Schlüssels, das dritte das Makro, das vierte schließlich der gewünschte +% Wert. +% \begin{macro}{\Family@@UseLength@@Macro@@Key} +% \changes{v3.20}{2016/04/27}{neu (intern)}^^A +% \begin{macro}{\Family@USeLength@Macro@Key} +% \changes{v3.20}{2016/04/27}{neu (intern)}^^A +% \begin{macrocode} +%<*base> +\newcommand*{\FamilyUseLengthMacroKey}[3][.\@currname.\@currext]{% + \kernel@ifnextchar [%] + {\Family@@UseLength@@Macro@@Key{#1}{#2}{#3}}% + {\Family@UseLength@Macro@Key{#1}{#2}{#3}}% +} +\newcommand*{\Family@@UseLength@@Macro@@Key}{} +\def\Family@@UseLength@@Macro@@Key#1#2#3[#4]#5{% + \ifdefined#5\else\let#5\z@\fi + \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{% + \FamilySetUseLengthMacro{#2}{#3}{#5}{##1}% + }% +} +\newcommand*{\Family@UseLength@Macro@Key}[4]{% + \ifdefined#4\else\let#4\z@\fi + \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetUseLengthMacro{#2}{#3}{#4}{##1}}% +} +\newcommand*{\FamilySetUseLengthMacro}[4]{% + \begingroup + \FamilySetLength{#1}{#2}{\@tempskipa}{#4}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \def\reserved@a{% + \endgroup\def#3{#4}% + \FamilyKeyStateProcessed + }% + \else + \def\reserved@a{% + \endgroup + \FamilyUnknownKeyValue{#1}{#2}{#4}{% + length values, counters, lengths, skips, dimens + }% + }% + \fi + \reserved@a } %</base> % \end{macrocode} @@ -3093,6 +3813,8 @@ % % \begin{macro}{\FamilyNumericalKey} % \changes{v3.00}{2008/04/30}{Neue Anweisung}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\Family@Numerical@Key} % \changes{v3.00}{2008/05/28}{Neu (intern)}^^A % \changes{v3.08b}{2011/03/31}{fehlendes Argument bei \cs{ifundefined}} @@ -3113,7 +3835,7 @@ % \begin{macrocode} %<*base> \newcommand*{\FamilyNumericalKey}[3][.\@currname.\@currext]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\Family@Numerical@Key{#1}{#2}{#3}}{\Family@Numerical@Key{#1}{#2}{#3}[]}% } \newcommand*{\Family@Numerical@Key}{} @@ -3175,6 +3897,10 @@ % \changes{v3.02c}{2009/02/04}{definiert ebenfalls das Familienmitglied}^^A % \changes{v3.17}{2015/03/16}{neu implementiert mit Speicherung der % Werte und optionalem erstem Argument}^^A +% \begin{macro}{\KOMA@@ncmdkey} +% \changes{v3.17}{2015/03/16}{neu (intern)}^^A +% \begin{macro}{\KOMA@@@ncmdkey} +% \changes{v3.17}{2015/03/16}{neu (intern)}^^A % Wie \cs{FamilyNumericalKey} mit zwei entscheidenden Unterschieden: % \begin{itemize} % \item Die Familien ist immer \texttt{KOMA} und entfällt daher als zweites @@ -3191,10 +3917,10 @@ \expandafter\endgroup\reserved@a } \newcommand*{\KOMA@@ncmdkey}[2]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\KOMA@@@ncmdkey{#1}{#2}}{\KOMA@@@ncmdkey{#1}{#2}[]} } -\newcommand*{\KOMA@@@cmdkey}{} +\newcommand*{\KOMA@@@ncmdkey}{} \def\KOMA@@@ncmdkey#1#2[#3]#4#5{% \@ifundefined{#4}{\@namedef{#4}{0}}{}% \ifx\relax#3\relax @@ -3224,12 +3950,16 @@ % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % % % \begin{macro}{\FamilyStringKey} % \changes{v3.08}{2010/11/05}{Neue Anweisung}^^A % \changes{v3.08b}{2011/03/31}{\cs{Family@String@Key} und -% \cs{Family@@String@@Key} vertauscht} +% \cs{Family@@String@@Key} vertauscht}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\Family@String@Key} % \changes{v3.08}{2010/11/05}{Neu (intern)}^^A % \begin{macro}{\Family@@String@@Key} @@ -3246,7 +3976,7 @@ % \begin{macrocode} %<*base> \newcommand*{\FamilyStringKey}[3][.\@currname.\@currext]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\Family@@String@@Key{#1}{#2}{#3}}{\Family@String@Key{#1}{#2}{#3}}% } \newcommand*{\Family@@String@@Key}{} @@ -3265,6 +3995,8 @@ % % \begin{macro}{\KOMA@DeclareDeprecatedOption} % \changes{v3.01a}{2008/11/20}{neu (intern)}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\KOMA@@DeclareDeprecatedOption} % \changes{v3.01a}{2008/11/20}{neu (intern)}^^A % \begin{macro}{\KOMA@@@DeclareDeprecatedOption} @@ -3278,7 +4010,7 @@ % \begin{macrocode} %<*koma> \newcommand*{\KOMA@DeclareDeprecatedOption}{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\KOMA@@DeclareDeprecatedOption}% {\KOMA@@@DeclareDeprecatedOption{\ClassWarningNoLine{\KOMAClassName}}}% } @@ -3316,11 +4048,15 @@ You've used obsolete option `#2'.\noexpand\MessageBreak Usage of this option indicates an old document\noexpand\MessageBreak and changes compatibility level using\noexpand\MessageBreak - `#3,version=first'.\noexpand\MessageBreak + `#3,version=first,\noexpand\MessageBreak + enabledeprecatedfontcommands' that may result\noexpand\MessageBreak + in further warnings.\noexpand\MessageBreak If you don't want this, you should simply\noexpand\MessageBreak replace option `#2' by `#3'% }% - \noexpand\KOMAExecuteOptions{#3,version=first}% + \noexpand\KOMAExecuteOptions{% + #3,version=first}% + \noexpand\ExecuteOptions{enabledeprecatedfontcommands}% \noexpand\def\noexpand\CurrentOption{\CurrentOption}% }% }% @@ -3336,6 +4072,8 @@ % % \begin{macro}{\KOMA@DeclareStandardOption} % \changes{v3.01a}{2008/11/21}{neu (intern)}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\KOMA@@DeclareStandardOption} % \changes{v3.01a}{2008/11/21}{neu (intern)}^^A % \begin{macro}{\KOMA@@@DeclareStandardOption} @@ -3349,7 +4087,7 @@ % \begin{macrocode} %<*koma> \newcommand*{\KOMA@DeclareStandardOption}{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\KOMA@@DeclareStandardOption}% {\KOMA@@@DeclareStandardOption{\ClassInfoNoLine{\KOMAClassName}}}% } 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 5ed3e0095b6..162a31da1d7 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx @@ -1,8 +1,8 @@ -% \CheckSum{209} +% \CheckSum{210} % \iffalse meta-comment % ====================================================================== % scrkernel-compatibility.dtx -% Copyright (c) Markus Kohm, 2006-2015 +% Copyright (c) Markus Kohm, 2006-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-compatibility.dtx -% Copyright (c) Markus Kohm, 2006-2015 +% Copyright (c) Markus Kohm, 2006-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z 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-10-03 14:59:03 +0200 (Sat, 03 Oct 2015) $ + \filedate$Date: 2016-02-17 12:13:55 +0100 (Wed, 17 Feb 2016) $ \def\filerevision$#1: #2 ${\def\filerevision{r#2}} \filerevision$Revision: 1638 $ \edef\reserved@a{% @@ -130,6 +130,8 @@ % % \begin{option}{emulatestandardclasses} % \changes{v3.12}{2013/11/11}{Neue Option}^^A +% \changes{v3.20}{2016/02/16}{\texttt{headings!=standardclasses} auch für +% \textsf{scrartcl}}^^A % Diese Option muss sich auf diverse andere Einstellungen auswirken und % sollte deshalb so früh wie möglich verwendet werden. Vieles ändert sie % sofort, manches aber auch erst später. @@ -146,7 +148,7 @@ \let\if@scr@emulatestandardclasses\iftrue \KOMAExecuteOptions{% fontsize=10pt,% -%<book|report> headings=standardclasses,% +%<article|book|report> headings=standardclasses,% cleardoublepage=current }% \newcommand*{\defaultpapersize}{letter}% @@ -393,6 +395,8 @@ % \changes{v3.19}{2015/07/26}{Neues Macro} % \begin{macro}{\scr@v@3.19a} % \changes{v3.19a}{2015/10/03}{Neues Macro} +% \begin{macro}{\scr@v@3.20} +% \changes{v3.20}{2015/10/06}{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 @@ -458,6 +462,7 @@ \@namedef{scr@v@3.18a}{15} \@namedef{scr@v@3.19}{15} \@namedef{scr@v@3.19a}{15} +\@namedef{scr@v@3.20}{15} \@namedef{scr@v@last}{15} % \end{macrocode} % \end{macro} @@ -507,6 +512,7 @@ % \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-floats.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx index 61fd26aade6..d7472dcce29 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx @@ -1,8 +1,8 @@ -% \CheckSum{1326} +% \CheckSum{1493} % \iffalse meta-comment % ====================================================================== % scrkernel-floats.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-floats.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z 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-12 13:06:17 +0100 (Thu, 12 Mar 2015) $ + \filedate$Date: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1962 $ \edef\reserved@a{% @@ -579,12 +579,20 @@ % % \begin{macro}{\@captionbeside} % \changes{v2.8q}{2001/11/22}{neu (intern)}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@captionbeside} % \changes{v2.8q}{2001/11/22}{neu (intern)}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@@captionbeside} % \changes{v2.8q}{2001/11/22}{neu (intern)}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@@@captionbeside} % \changes{v2.8q}{2001/11/22}{neu (intern)}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Die Umgebung soll einmal folgende Parameter besitzen: % \begin{description} % \item[(optional)] Verzeichniseintrag @@ -603,21 +611,21 @@ % \begin{macrocode} \newcommand*{\@captionbeside}{} \long\def\@captionbeside[#1]#2{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\@@captionbeside[{#1}]{#2}} {\c@pti@nb@sid@[{#1}]{#2}}% } \newcommand*{\@@captionbeside}{} \long\def\@@captionbeside[#1]#2[#3]{% \def\scap@pos{#3}% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\@@@captionbeside[{#1}]{#2}} {\c@pti@nb@sid@[{#1}]{#2}}% } \newcommand*{\@@@captionbeside}{} \long\def\@@@captionbeside[#1]#2[#3]{% \def\scap@width{#3}% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\@@@@captionbeside[{#1}]{#2}} {\setlength{\@tempdima}{#3}% \addtolength{\@tempdima}{-\linewidth}% @@ -628,7 +636,7 @@ \newcommand*{\@@@@captionbeside}{} \long\def\@@@@captionbeside[#1]#2[#3]{% \def\scap@move{#3}% - \@ifstar + \kernel@ifstar {\scap@alttrue\c@pti@nb@sid@[{#1}]{#2}} {\scap@altfalse\c@pti@nb@sid@[{#1}]{#2}}% } @@ -818,11 +826,13 @@ % \end{macrocode} % \end{macro} % \begin{macro}{\setcapindent} -% \changes{v2.8j}{2001/07/30}{\cs{if@capbreak} wird verwendet} +% \changes{v2.8j}{2001/07/30}{\cs{if@capbreak} wird verwendet}^^A % \changes{v2.8l}{2001/08/17}{\cs{edef}\cs{cap@indent} statt -% \cs{def}\cs{cap@indent}} +% \cs{def}\cs{cap@indent}}^^A % \changes{v2.8q}{2001/11/17}{wird nach dem Laden von -% \textsf{caption2} umdefiniert} +% \textsf{caption2} umdefiniert}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Dann wird weiter ein Befehl benötigt, mit dem der Benutzer die % Weite des Einzugs selbst einstellen kann. Da intern für die Weite % ein Makro verwendet werden soll, findet hier sicherheitshalber eine @@ -837,7 +847,7 @@ % Für die Implementierung der Sternform werden zwei interne Makros % benötigt. % \begin{macrocode} -\newcommand*{\setcapindent}{\@ifstar{\@@setcapindent}{\@setcapindent}} +\newcommand*{\setcapindent}{\kernel@ifstar{\@@setcapindent}{\@setcapindent}} \newcommand*{\@setcapindent}[1]{% \setlength{\@tempdima}{#1}% \ifdim\@tempdima>\hsize @@ -864,7 +874,7 @@ `\string\setcapindent'% }% \captionstyle{indent}% - \@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}% + \kernel@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}% }% } % \end{macrocode} @@ -1033,7 +1043,111 @@ }% }% % \end{macrocode} -% \end{macro} +% \end{macro}^^A \setcapwidth +% \begin{macro}{\setcapdynwidth} +% \changes{v3.20}{2016/03/31}{neu} +% Ulrike findet es blöd, dass \cs{setcapwidth} wie \cs{setlength} arbeitet und +% ist der Meinung, dass das Argument erst zur Laufzeit ausgewertet werden +% sollte. Also ein neuer Befehl genau dafür. Es sei allerdings darauf +% hingewiesen, dass Fehler im Argument dann ggf. erst bei jeder +% \cs{caption}-Anweisung und nicht bereits hier ausgegeben werden! +% \begin{macrocode} +\newcommand*{\setcapdynwidth}[2][]{% + \def\cap@width{#2}% + \begingroup + \edef\@tempa{#1}% + \def\@tempb{c}\ifx\@tempa\@tempb + \endgroup + \def\cap@margin{% + \ifdim \cap@width<\z@ + \ClassWarning{\KOMAClassName}{% + caption width less than 0pt not allowed.\MessageBreak + Setting caption width to 0pt% + }% + \let\cap@width\z@ + \fi + \let\cap@left=\hfill\let\cap@right=\hfill}% + \else + \def\@tempb{l}\ifx\@tempa\@tempb + \endgroup + \def\cap@margin{% + \ifdim \cap@width<\z@ + \ClassWarning{\KOMAClassName}{% + caption width less than 0pt not allowed.\MessageBreak + Setting caption width to 0pt% + }% + \let\cap@width\z@ + \fi + \let\cap@left=\relax\let\cap@right\hfill}% + \else + \def\@tempb{r}\ifx\@tempa\@tempb + \endgroup + \def\cap@margin{% + \ifdim \cap@width<\z@ + \ClassWarning{\KOMAClassName}{% + caption width less than 0pt not allowed.\MessageBreak + Setting caption width to 0pt% + }% + \let\cap@width\z@ + \fi + \let\cap@left=\hfill\let\cap@right=\relax}% + \else + \def\@tempb{i}\ifx\@tempa\@tempb + \endgroup + \def\cap@margin{% + \ifdim \cap@width<\z@ + \ClassWarning{\KOMAClassName}{% + caption width less than 0pt not allowed.\MessageBreak + Setting caption width to 0pt% + }% + \let\cap@width\z@ + \fi + \let\cap@left=\relax + \let\cap@right=\hfill + \if@twoside + \ifthispageodd{}{% + \let\cap@left=\hfill + \let\cap@right=\relax + }% + \fi + }% + \else + \def\@tempb{o}\ifx\@tempa\@tempb + \endgroup + \def\cap@margin{% + \ifdim \cap@width<\z@ + \ClassWarning{\KOMAClassName}{% + caption width less than 0pt not allowed.\MessageBreak + Setting caption width to 0pt% + }% + \let\cap@width\z@ + \fi + \let\cap@left=\hfill + \let\cap@right=\relax + \if@twoside + \ifthispageodd{}{% + \let\cap@left=\relax + \let\cap@right=\hfill + }% + \fi + }% + \else + \ifx \@tempa\@empty\else + \ClassError{\KOMAClassName}{% + unknown optional position argument% + }{% + You've used `#1' as position argument at + \string\setcaptionwidth,\MessageBreak + but only ONE of `c', `l', `r', `i`, `o` ist + allowed.\MessageBreak + Argument will be ignored, if you'll continue.% + }% + \fi + \endgroup + \fi\fi\fi\fi\fi +} +% \end{macrocode} +% \end{macro}^^A \setcapdynwidth % \begin{macro}{\cap@margin} % \changes{v2.8q}{2001/11/17}{neu (intern)}^^A % Dieses Makro beinhaltet nicht den Wert der Ränder, sondern das @@ -1048,6 +1162,8 @@ % \end{macro} % \begin{macro}{\setcapmargin} % \changes{v2.8q}{2001/11/17}{neu}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\@setcapmargin} % \changes{v2.8q}{2001/11/17}{neu (intern)}^^A % \changes{v2.9a}{2002/06/27}{\cs{ifthispageodd} statt @@ -1058,7 +1174,7 @@ % Ränder gesetzt werden. In der Sternvariante werden im zweiseitigen % Modus die Ränder auf linken Seiten vertauscht. % \begin{macrocode} -\newcommand*{\setcapmargin}{\@ifstar{\@setcapmargin}{\@@setcapmargin}} +\newcommand*{\setcapmargin}{\kernel@ifstar{\@setcapmargin}{\@@setcapmargin}} \newcommand*{\@setcapmargin}[2][\@tempdimb]{% \def\cap@margin{% \onelinecaptionsfalse @@ -1471,7 +1587,7 @@ % \begin{environment}{figure} % \changes{v2.2c}{1995/05/25}{Abbildungsausgabe auf CJK umgestellt}^^A % \changes{v2.8h}{2001/07/19}{\cs{caption} wird explizit zu -% \cs{captionbelow}} +% \cs{captionbelow}}^^A % Zunächst werden \texttt{figure}s, also Abbildungen behandelt. % \begin{Counter}{figure} % \begin{macro}{\thefigure} @@ -1532,18 +1648,23 @@ % Jetzt aber zurück zur Umgebung. Wie üblich gibt es eine Version mit % und eine Version ihne Stern. Zur unterschiedlichen Bedeutung bei % zweispaltigem Satz siehe \texttt{classes.dtx} und \texttt{source2e}. -% \changes{v3.11c}{2013/03/01}{fix: one \cs{caption} change removed} +% \changes{v3.11c}{2013/03/01}{fix: one \cs{caption} change removed}^^A +% \changes{v3.20}{2016/04/07}{Interne Umdefinierung von \cs{caption}}^^A % \begin{macrocode} \newenvironment{figure}{% - \if@figurecaptionabove\let\caption\captionabove - \else\let\caption\captionbelow\fi + \def\caption{% + \if@figurecaptionabove\expandafter\captionabove + \else\expandafter\captionbelow\fi + }% \@float{figure}% }{% \end@float } \newenvironment{figure*}{% - \if@figurecaptionabove\let\caption\captionabove - \else\let\caption\captionbelow\fi + \def\caption{% + \if@figurecaptionabove\expandafter\captionabove + \else\expandafter\captionbelow\fi + }% \@dblfloat{figure}% }{% \end@dblfloat @@ -1609,20 +1730,25 @@ \newcommand*{\fnum@table}{\tableformat} % \end{macrocode} % \end{macro} +% \changes{v3.20}{2016/04/07}{Interne Umdefinierung von \cs{caption}}^^A % Ob es \cs{caption} in der Voreinstellung eine Tabellenüberschrift % oder eine Tabellenunterschrift erzeugt, hängt hier von den Optionen % ab. % \begin{macrocode} \newenvironment{table}{% - \if@tablecaptionabove\let\caption\captionabove - \else\let\caption\captionbelow\fi + \def\caption{% + \if@tablecaptionabove\expandafter\captionabove + \else\expandafter\captionbelow\fi + }% \@float{table}% }{% \end@float } \newenvironment{table*}{% - \if@tablecaptionabove\let\caption\captionabove - \else\let\caption\captionbelow\fi + \def\caption{% + \if@tablecaptionabove\expandafter\captionabove + \else\expandafter\captionbelow\fi + }% \@dblfloat{table}% }{% \end@dblfloat 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 90ce6819b17..9593eb7a133 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx @@ -1,8 +1,8 @@ -% \CheckSum{3237} +% \CheckSum{3296} % \iffalse meta-comment % ====================================================================== % scrkernel-fonts.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-fonts.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,12 +55,12 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z 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-08-24 11:30:25 +0200 (Mon, 24 Aug 2015) $ + \filedate$Date: 2016-04-12 12:31:07 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1827 $ \edef\reserved@a{% @@ -1126,12 +1126,14 @@ \@@@generatefontfile }{% % \end{macrocode} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Das zweite Argument ist optional. Ist es angegeben, so gibt es den % gewünschten Zeilenabstand an. Ist es nicht angegeben, so wird der % Zeilenabstand |\changefontsized| überlassen. Das dritte Argument ist % schließlich die gewünschte Schriftgröße. % \begin{macrocode} - \@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}% + \kernel@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}% }% } % \end{macrocode} @@ -1549,59 +1551,159 @@ }% } %</!extend> +%</class|extend> +%</body> % \end{macrocode} % % % \subsection{"`Alte"' Font-Auswahlbefehle} % +% \begin{option}{enabledeprecatedfontcommands} +% \changes{v3.20}{2015/10/14}{neue (veraltete) Option}^^A +% Diese Option ist bereits bei ihrer Definition veraltet. Sie stellt quasi die +% nächste Eskalation für die veralteten Font-Auswahlbefehle dar. Man kann mit +% ihrer Hilfe notfalls noch einmal die alten Befehle zurück holen. Dabei wird +% in der Voreinstellung weiterhin eine Warnung ausgegeben. +% \begin{macro}{\scr@defineobsoletefonts} +% \changes{v3.20}{2015/10/14}{neue (veraltete) Anweisung (intern)}^^A +% Über diese Anweisung wird eingestellt, ob die veralteten Befehle mit +% Fehlermeldung, Warnung, Info oder gar nicht gemeldet werden. +% Negative Werte bedeuten, dass die Befehle nicht definiert werden. Null steht +% für interne Fehlermeldung. Eins ist eine Warnung. Zwei ist eine Info und +% darüber hinaus werden die Befehle einfach definiert. Voreingestellt ist +% derzeit noch Null. In naher Zukunft wird das aber -1 werden. +% \begin{macrocode} +%<*option> +%<*class> +\DeclareOption{enabledeprecatedfontcommands}{% + \ClassWarningNoLine{\KOMAClassName}{% + deprecated option `enabledeprecatedfontcommands'.\MessageBreak + Note, that this option was already depreacted when\MessageBreak + it has been defined. Support for old font commands\MessageBreak + has been removed from KOMA-Script more than one\MessageBreak + decade ago. It is not recommended to use them any\MessageBreak + longer. Therefore usage of this class option also\MessageBreak + is not recommended% + }% + \let\scr@defineobsoletefonts\@ne +} +\scr@ifundefinedorrelax{scr@defineobsoletefonts}{% + \let\scr@defineobsoletefonts\z@ +}{} +\BeforePackage{tex4ht}{% + \let\scr@defineobsoletefonts\thr@@ +} +%</class> +%</option> +% \end{macrocode} +% \end{macro}^^A \scr@degineobsoletefonts +% \end{option}^^A enabledeprecatedfontscommands +% % \begin{macro}{\scr@DeclareOldFontCommand} % \changes{v3.12}{2013/10/31}{neu}^^A +% \changes{v3.20}{2015/10/14}{veraltet eskaliert}^^A % Diese Anweisung arbeitet prinzipiell wie die \LaTeX-Kern-Anweisung % \cs{DeclareOldFontCommand}, wirft aber zusätzlich mit Warnungen um sich, um % dem Anwender die Verwendung der alten Befehle zu versauern. % \begin{macrocode} +%<*body> +%<*class|extend> %<*!extend> \newcommand*{\scr@DeclareOldFontCommand}[3]{% - \DeclareRobustCommand #1{\@fontswitch {% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated font command `\string#1'!\MessageBreak - You should note, that in 1994 font command `\string#1' has\MessageBreak - been defined for compatiblitiy to Script 2.0 only.\MessageBreak - Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak - shouldn't use such commands any longer and within\MessageBreak - KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak - See `fntguide.pdf' for more information about\MessageBreak - recommended font commands.\MessageBreak - Note also, that KOMA-Script will remove the definition\MessageBreak - of `\string#1' anytime until release of about version 3.20.\MessageBreak - But for now, KOMA-Script will replace deprecated - `\string#1'\MessageBreak - by `\detokenize{#2}'% - }% - #2% - }{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated font command `\string#1'!\MessageBreak - You should note, that in 1994 font command `\string#1' has\MessageBreak - been defined for compatiblitiy to Script 2.0 only.\MessageBreak - Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak - shouldn't use such commands any longer and within\MessageBreak - KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak - See `fntguide.pdf' for more information about\MessageBreak - recommended font commands.\MessageBreak - Note also, that KOMA-Script will remove the definition\MessageBreak - of `\string#1' anytime until release of about version 3.20.\MessageBreak - But for now, KOMA-Script will replace deprecated - `\string#1'\MessageBreak - by `\detokenize{#3}'% + \ifnum\scr@defineobsoletefonts<\z@\else + \ifnum\scr@defineobsoletefonts>\tw@ + \DeclareOldFontCommand{#1}{#2}{#3}% + \else + \DeclareOldFontCommand{#1}{% + \scr@ErrorWarningInfo{#1}{#2}#2% + }{% + \scr@ErrorWarningInfo{#1}{#3}#3% }% - #3% + \fi + \fi +} +% \end{macrocode} +% \begin{macro}{\scr@ErrorWarningInfo} +% \changes{v3.20}{2015/10/14}{neu (intern)}^^A +% \begin{macrocode} +\DeclareRobustCommand*{\scr@ErrorWarningInfo}[2]{% +% \end{macrocode} +% Wenn \cs{scr@defineobsoletefonts} Null ist, wird eine Fehlermeldung +% ausgegeben. +% \begin{macrocode} + \ifnum \scr@defineobsoletefonts=\z@ + \ClassError{\KOMAClassName}{undefined old font command `\string#1'}{% + You should note that since 1994 LaTeX2e provides a new font selection + scheme\MessageBreak + called NFSS2 with several new, combinable font commands. New + KOMA-Script\MessageBreak + classes have defined the old font commands like `\string#1' + only for compatibility\MessageBreak + with old LaTeX 2.09 document styles of Script 2.0. Nevertheless, + these\MessageBreak + commands are deprecated and undocumented at least since + 2003. Since 2013\MessageBreak + KOMA-Script classes warn abouts soon removement of these deprecated + commands.\MessageBreak + Now, after two decades of LaTeX2e and NFSS2, these commands will not + work any\MessageBreak + more. If loading a package results in this error message, you should + contact\MessageBreak + the author of that package and ask him to replace the deprecated font + command\MessageBreak + `\string#1', e.g., by `\detokenize{#2}`. Otherwise you should + reconfigure\MessageBreak + or replace the package. If you have used the old font command + `\string#1' yourself,\MessageBreak + you should replace it, e.g., by `\detokenize{#2}'.\MessageBreak + To make it work for now, you can use the already also deprecated class + option\MessageBreak + `enabledeprecatedfontcommands'.% }% - }% + \else + \ifcase \scr@defineobsoletefonts +% \end{macrocode} +% Bei Eins gibt es eine Warnung: +% \begin{macrocode} + \or + \expandafter\ClassWarning +% \end{macrocode} +% Bei Zwei gibt es eine Info: +% \begin{macrocode} + \or + \expandafter\ClassInfo +% \end{macrocode} +% Sonst gibt es nichts: +% \begin{macrocode} + \else + \expandafter\@gobbletwo + \fi + {\KOMAClassName}{deprecated old font command `\string#1' used.\MessageBreak + You should note, that since 1994 LaTeX2e provides a\MessageBreak + new font selection scheme called NFSS2 with several\MessageBreak + new, combinable font commands. New KOMA-Script classes\MessageBreak + have defined the old font commands like `\string#1' only for\MessageBreak + compatibility with LaTeX 2.09 document styles of\MessageBreak + Script 2.0. These commands are deprecated and\MessageBreak + undocumented at least since 2003. Since 2013,\MessageBreak + KOMA-Script classes warn about soon removement of\MessageBreak + these deprecated commands. Now, after two decades of\MessageBreak + LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak + not work any longer. If loading a package results in\MessageBreak + this message you should contact the author of that\MessageBreak + package and ask him to replace the depracted font\MessageBreak + command `\string#1', e.g., by `\detokenize{#2}'.\MessageBreak + Otherwise you should reconfigure or replace the\MessageBreak + package. If you have used the old font command\MessageBreak + `\string #1' yourself you should replace it, e.g., by\MessageBreak + `\detokenize{#2}'% + }% + \fi } %</!extend> % \end{macrocode} -% \end{macro} +% \end{macro}^^A \scr@OldFontErrorWarningInfo +% \end{macro}^^A \scr@DeclareOldFontCommand % % \begin{macro}{\rm} % \changes{v3.12}{2013/10/13}{Anweisung ist veraltet}^^A 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 595934ee27f..a6c5f45ded2 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx @@ -1,8 +1,8 @@ -% \CheckSum{1996} +% \CheckSum{2080} % \iffalse meta-comment % ====================================================================== % scrkernel-language.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-language.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z 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-07-03 11:25:42 +0200 (Fri, 03 Jul 2015) $ + \filedate$Date: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1638 $ \edef\reserved@a{% @@ -188,6 +188,8 @@ % % \begin{macro}{\defcaptionname} % \changes{3.12}{2013/07/29}{neu}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Für eine Reihe von Sprachen (durch Komma separierte Liste in \#1) % wird ein Makro (\#2) auf einen bestimmten Inhalt (\#3) definiert. Die % Sternversion verwendet dabei zwingend \cs{extras\meta{Sprache}}, während @@ -196,7 +198,7 @@ % Befehl in der Dokumentpräambel aufgerufen wird, wird er verzögert. % \begin{macrocode} \newcommand*{\defcaptionname}{% - \@ifstar\scr@def@scaptionname\scr@def@captionname + \kernel@ifstar\scr@def@scaptionname\scr@def@captionname } % \end{macrocode} % \begin{macro}{\scr@def@scaptionname} @@ -258,12 +260,39 @@ \newcommand*{\scr@def@activateactivelanguageaftergroup}[2]{% \@onelevel@sanitize\languagename \@tempswafalse +%<trace> \typeout{compare `\languagename' and `\scr@reserved@a'}% \ifx\languagename\scr@reserved@a \@tempswatrue \else - \ifcsname l@\scr@reserved@a\endcsname - \expandafter\ifnum\csname l@\scr@reserved@a\endcsname=\language - \@tempswatrue +% \end{macrocode} +% \changes{v3.20}{2016/01/05}{Sonderbehandlung für \textsf{polyglossia}}^^A +% Bei Verwendung von \textsf{polyglossia} gibt es die Besonderheit, dass alle +% Deutschen Sprachen als \texttt{german} definiert sind. Die Unterscheidung +% zwischen Deutsch, Österreichisch und Schweizerisch geschieht über zwei +% boolsche Schalter. Für die Unterscheidung alte oder neue Rechtschreibung +% existiert ein weiterer Schalter. Mit ein paar trickreichen Vergleichen kann +% man das zusätzlich behandeln. Natürlich muss es so gemacht werden, dass es +% mit babel trotzdem noch funktioniert. +% \begin{macrocode} + \edef\scr@reserved@b{\detokenize{german}}% + \ifx\languagename\scr@reserved@b + \edef\scr@reserved@b{% + \expandafter\ifx\csname if@german@oldspelling\expandafter\endcsname + \csname iffalse\endcsname n\fi + \expandafter\ifx\csname if@austrian@locale\expandafter\endcsname + \csname iftrue\endcsname austrian\else + \expandafter\ifx\csname if@swiss@locale\expandafter\endcsname + \csname iftrue\endcsname swiss\else german\fi\fi + }% +%<trace> \typeout{compare also `\scr@reserved@a' and `\scr@reserved@b'}% + \@onelevel@sanitize\scr@reserved@b + \ifx\scr@reserved@a\scr@reserved@b \@tempswatrue\fi + \fi + \if@tempswa\else + \ifcsname l@\scr@reserved@a\endcsname + \expandafter\ifnum\csname l@\scr@reserved@a\endcsname=\language + \@tempswatrue + \fi \fi \fi \fi @@ -364,6 +393,46 @@ % \end{macro}^^A \scr@def@captionname % \end{macro}^^A \defcaptionname % +% \changes{v3.20}{2016/01/05}{Neue Sonderbehandlung für +% \texttt{polyglossia}}^^A +% Bei Verwendung von \textsf{polyglossia} haben wir nun bei den Sprachen +% \texttt{austrian}, \texttt{swiss}, \texttt{ngerman}, \texttt{naustrian} und +% \texttt{nswiss} das Problem, dass diese dort alle in \cs{captionsgerman} +% vermischt sind. Es werden also also beim Umschalten eventuell gar nicht die +% richtigen Befehle ausgeführt. Das lässt sich beispielsweise beheben, indem +% in \cs{init@extra@german} dafür gesorgt wid, dass eben diese doch noch +% ausgeführt werden: +% \begin{macrocode} +\AfterPackage*{polyglossia}{% + \scr@ifundefinedorrelax{init@extras@german}{% + \AfterFile{gloss-german.ldf}% + }{% + \@firstofone + }% + {% + \providecommand*\captionsngerman{}% + \providecommand*\captionsaustrian{}% + \providecommand*\captionsnaustrian{}% + \providecommand*\captionsswiss{}% + \providecommand*\captionsnswiss{}% + \csgappto{init@extras@german}{% + \if@austrian@locale + \csuse{captions\if@german@oldspelling\else n\fi austrian}% + \else + \if@swiss@locale + \csuse{captions\if@german@oldspelling\else n\fi swiss}% + \else + \if@german@oldspelling\else \csuse{captionsngerman}\fi + \fi + \fi + }% + }% +} +% \end{macrocode} +% Ich bin mir natürlich bewusst, dass dieser Code auch nur wieder ein Hack +% ist. Ideal ist das so nicht. Aber sehr viel sauberer geht es mit +% \textsf{polyglossia} unter Beibehaltung der Kompatibilität auch nicht mehr. +% % \begin{macro}{\providecaptionname} % \changes{v2.8q}{2001/11/08}{neu}^^A % \changes{v2.9r}{2004/06/16}{Wenn die aktuelle Sprache, die geänderte @@ -375,13 +444,15 @@ % \changes{v3.02c}{2009/02/17}{undefined test improved}^^A % \changes{v3.12}{2013/07/30}{Neuimplementierung nach dem Muster von % \cs{defcaptionname}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Wie \cs{defcaptionname}, allerdings wird nur definiert, wenn die Sprache \#1 % bereits existiert, aber der Begriff \#2 nicht existiert. Unter dieser % Einschränkung verwendet die Sternvariante \cs{extras\meta{Sprache}}, während % die Normalvariante \cs{captions\meta{Sprache}} verwendet. % \begin{macrocode} \newcommand*{\providecaptionname}{% - \@ifstar\scr@provide@scaptionname\scr@provide@captionname + \kernel@ifstar\scr@provide@scaptionname\scr@provide@captionname } % \end{macrocode} % \begin{macro}{\scr@provide@scaptionname} @@ -521,6 +592,8 @@ % \changes{v3.02c}{2009/02/17}{undefined test improved}^^A % \changes{v3.12}{2013/07/30}{Neuimplementierung nach dem Muster von % \cs{defcaptionname}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Wie \cs{defcaptionname} mit folgender Änderung: Existiert die % Sprache und der Begriff, so wird ein Fehler ausgegeben. Existiert die % Sprache aber nicht der Begriff, so wird er definiert. Existiert die Sprache @@ -529,7 +602,7 @@ % \cs{captions\meta{Sprache}} verwendet. % \begin{macrocode} \newcommand*{\newcaptionname}{% - \@ifstar\scr@new@scaptionname\scr@new@captionname + \kernel@ifstar\scr@new@scaptionname\scr@new@captionname } % \end{macrocode} % \begin{macro}{\scr@new@scaptionname} @@ -657,6 +730,8 @@ % \changes{v3.02c}{2009/02/17}{undefined test improved}^^A % \changes{v3.12}{2013/07/30}{Neuimplementierung nach dem Muster von % \cs{defcaptionname}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Wie \cs{defcaptionname} mit folgender Änderung: Existiert die % Sprache nicht, so ist dies ein Fehler. Existiert die Sprache nicht aber der % Begriff, so ist dies ebenfalls ein Fehler. Existieren Sprache und Begriff, @@ -666,7 +741,7 @@ % \cs{extras\meta{Sprache}} definiert war, und sonst \cs{extras\meta{Sprache}}. % \begin{macrocode} \newcommand*{\renewcaptionname}{% - \@ifstar\scr@renew@scaptionname\scr@renew@captionname + \kernel@ifstar\scr@renew@scaptionname\scr@renew@captionname } % \end{macrocode} % \begin{macro}{\scr@renew@scaptionname} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx index f808b99c1fe..0c3cb4e116c 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx @@ -2,7 +2,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-letterclassoptions.dtx -% Copyright (c) Markus Kohm, 2006-2015 +% Copyright (c) Markus Kohm, 2006-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-letterclassoptions.dtx -% Copyright (c) Markus Kohm, 2006-2015 +% Copyright (c) Markus Kohm, 2006-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,15 +55,15 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z 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-03 10:05:35 +0200 (Wed, 03 Jun 2015) $ + \filedate$Date: 2016-04-12 12:31:07 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 2122 $ + \filerevision$Revision: 2428 $ \endgroup \ProvidesFile{scrkernel-letterclassoptions.dtx} [\filedate\space \filerevision\space @@ -1250,8 +1250,12 @@ % % \begin{macro}{\showenvelope} % \begin{macro}{\@showenvelope} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@showenvelope} % \begin{macro}{\@@@showenvelope} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Es kann auch ein Briefumschlag angezeigt werden. Dazu müssen verschiedene % Parameter des Umschlags bekannt sein. Der Umschlag wird immer hochkant auf % der aktuellen Seite angezeigt. Hierfür wird das Paket \textsf{graphicx} @@ -1263,7 +1267,7 @@ \newcommand*{\@@showenvelope}{} \newcommand*{\@@@showenvelope}{} \def\showenvelope(#1,#2){% - \@ifnextchar (%) + \kernel@ifnextchar (%) {\@showenvelope({#1},{#2})}% {\@@@showenvelope({#1},{#2})}% } @@ -1306,7 +1310,7 @@ \@tempa } \def\@showenvelope(#1,#2)(#3,#4){% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\@@showenvelope({#1},{#2})({#3},{#4})}% {\@@showenvelope({#1},{#2})({#3},{#4})[]}% } diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-listsandtabulars.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-listsandtabulars.dtx index e179bc45f30..e00a47c4f30 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-listsandtabulars.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-listsandtabulars.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z 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-23 13:19:51 +0100 (Mon, 23 Mar 2015) $ + \filedate$Date: 2016-01-29 12:40:15 +0100 (Fri, 29 Jan 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1872 $ \edef\reserved@a{% @@ -475,12 +475,14 @@ % \subsection{Schriftarten für Listen} % % \begin{macro}{\descfont} +% \changes{v3.20}{2016/01/29}{\cs{sffamily} durch \cs{@gr@gsffamily} +% ersetzt}^^A % Dies ist die Schriftart, in der das Label der Einträge in eine % \texttt{description}-Umgebung gesetzt wird. Das Makro ist als intern % zu betrachten. Anwender habe stattdessen das entsprechende Element % zu verwenden. % \begin{macrocode} -\newcommand*\descfont{\sffamily\bfseries} +\newcommand*\descfont{\@gr@gsffamily\bfseries} % \end{macrocode} % \end{macro} % 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 f04a019968d..da67065b2a4 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx @@ -1,8 +1,8 @@ -% \CheckSum{623} +% \CheckSum{634} % \iffalse meta-comment % ====================================================================== % scrkernel-listsof.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-listsof.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,15 +55,15 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z 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-09-27 10:08:34 +0200 (Sun, 27 Sep 2015) $ + \filedate$Date: 2016-03-15 12:58:53 +0100 (Tue, 15 Mar 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 2206 $ + \filerevision$Revision: 2384 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-listsof.dtx}% @@ -611,6 +611,26 @@ % Einige Definitionen werden von unterschiedlichen Verzeichnissen % verwendet. Diese sind hier zu finden. % +% \begin{macro}{\numberline@numberpostfix} +% \changes{v3.20}{2016/03/15}{\cs{autodot} wird darüber eingefügt} +% Auch in den Verzeichnissen soll ggf. \cs{autodot} quasi als Bestandteil der +% Nummer ausgegeben werden. +% \begin{macrocode} +\g@addto@macro{\numberline@numberpostfix}{\autodot} +% \end{macrocode} +% \end{macro}^^A \numberline@numberpostfix +% +% \begin{macro}{\numberline} +% \changes{v3.20}{2016/03/15}{Definition von \textsf{tocbasic} verwenden} +% Unabhängig vom Stil soll immer die Definition von \textsf{tocbasic} +% verwendet werden. +% \begin{macrocode} +\usetocbasicnumberline[% + \ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}% +] +% \end{macrocode} +% \end{macro}^^A \numberline +% % \changes{v3.06}{2010/06/02}{einschalten des \texttt{tocbasic}-Features % \texttt{chapteratlist} in die Datei \texttt{scrkernel-listsof.dtx} verschoben} % Bei Büchern wird für jedes Verzeichnis des Besitzers \texttt{float} das @@ -626,59 +646,6 @@ } %</book|report> % \end{macrocode} -% \begin{macro}{\numberline} -% \changes{v2.3c}{1995/08/06}{\cs{numberline} umdefiniert}^^A -% \changes{v3.06}{2010/05/18}{Verwendung von \cs{numberline@prefix} und -% \cs{numberline@postfix}}^^A -% \changes{v3.12}{2013/11/22}{use \cs{numberline@numberformat} only, if the -% argument expands to a non-empty string}^^A -% Dieses Makro wird indirekt im Inhaltsverzeichnis verwendet und muss -% umdefiniert werden, um Duden, 20.~Auflage, Regel~5 und Regel~6 zu -% implementieren. -% \begin{macrocode} -\renewcommand*{\numberline}[1]{% - \numberline@box{% - \numberline@prefix - \ifstr{#1}{}{#1}{\numberline@numberformat{#1}}% - \numberline@postfix - }% -} -% \end{macrocode} -% \begin{macro}{\numberline@prefix} -% \changes{v3.06}{2010/05/18}{neu (intern)}^^A -% Das ist in der Voreinstellung einfach leer. Es könnte verwendet werden, um -% etwas vor die Nummer zu setzen oder die Nummer rechtsbündig zu setzen. -% \begin{macrocode} -\newcommand*{\numberline@prefix}{} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\numberline@postfix} -% \changes{v3.06}{2010/05/18}{neu (intern)} -% Das ist in der Voreinstellung einfach \cs{hfil} und dient dazu die Nummer -% linksbündig zu platzieren. -% \begin{macrocode} -\newcommand*{\numberline@postfix}{\hfil} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\numberline@numberformat} -% \changes{v3.06}{2010/05/18}{neu (intern)}^^A -% \changes{v3.12}{2013/11/22}{don't output anything, if argument expands to -% an empty string}^^A -% Das dient in der Voreinstellung dazu, Regel~5 und 6 aus der 20.~Auflage des -% DUDENs umzusetzen. -% \begin{macrocode} -\newcommand*{\numberline@numberformat}[1]{\ifstr{#1}{}{}{#1\autodot}} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\numberline@box} -% \changes{v3.06}{2010/05/18}{neu (intern)} -% Das dient in der Voreinstellung dazu, die Gliederungsnummer in eine Box zu -% setzen. -% \begin{macrocode} -\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}} -% \end{macrocode} -% \end{macro} -% \end{macro} % % \begin{macro}{\@pnumwidth} % \begin{macro}{\@tocrmarg} @@ -749,7 +716,7 @@ % \changes{v3.06}{2010/05/18}{statt \cs{numberline} wird \cs{numberline@box} % umdefiniert} % \begin{macrocode} -\newcommand*{\before@starttoc}[1]{ +\newcommand*{\before@starttoc}[1]{% \let\scr@dottedtocline=\@dottedtocline \renewcommand*{\@dottedtocline}[3]{% \scr@dottedtocline{##1}{\z@}{\last@l@number}}% @@ -766,6 +733,28 @@ \expandafter=\csname#1@l@number\endcsname \fi }% +% \end{macrocode} +% \changes{v3.20}{2015/11/26}{Vorbereitungen für Verzeichniseintragsstile +% via \texttt{scrkernel-tocstyle}}^^A +% \begin{macrocode} + \begingroup + \def\do@endgroup{\endgroup}% + \def\do##1{% + \scr@ifundefinedorrelax{scr@tso@##1@numwidth}{}{% + \typeout{Setting numwidth of `##1' to \last@l@number}% + \l@addto@macro\do@endgroup{% + \@namedef{scr@tso@##1@numwidth}{\last@l@number}% + }% + }% + \scr@ifundefinedorrelax{scr@tso@##1@indent}{}{% + \typeout{Setting indent of `##1' to \string\z@}% + \l@addto@macro\do@endgroup{% + \@namedef{scr@tso@##1@indent}{\z@}% + }% + }% + }% + \@nameuse{scr@dte@donumwidth}% + \do@endgroup } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx index 14a7357619a..5ab1652e6ac 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx @@ -1,8 +1,8 @@ -% \CheckSum{430} +% \CheckSum{449} % \iffalse meta-comment % ====================================================================== % scrkernel-miscellaneous.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-miscellaneous.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,15 +55,15 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z 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-23 13:19:51 +0100 (Mon, 23 Mar 2015) $ + \filedate$Date: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 2028 $ + \filerevision$Revision: 2429 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-miscellaneous.dtx}% @@ -179,8 +179,8 @@ % Definiert die in der do-Liste gespeicherten Anweisungen um. % \begin{macrocode} \newcommand*{\scr@renewforletter}{% - \@ifstar {\@renewforletter*}% - {\@renewforletter{}}% + \kernel@ifstar {\@renewforletter*}% + {\@renewforletter{}}% } \newcommand*{\@renewforletter}[2]{% \g@addto@macro\do@renewforletter@list{\do#2}% @@ -285,6 +285,33 @@ % \end{option} % \end{option} % +% +% \subsection{Optionen für \texttt{egreg}} +% +% \texttt{egreg} hat in einem Kommentar zu +% \url{https://tex.stackexchange.com/questions/289853} verlauten lassen, dass +% er \KOMAScript{} u.\,a. deshalb nicht verwendet, weil \KOMAScript{} +% serifenlose Fonts für Überschriften voreingestellt hat. Er hätte lieber die +% hässlichen, fetten Antiqua-Fonts. Außerdem reicht es ihm nicht, dass man das +% einfach per \cs{setkomafont} ändern kann. Er will eine Option dafür. Nun, +% die soll er haben: +% +% \begin{option}{egegdoesnotlikesansseriftitles} +% \changes{v3.20}{2016/01/29}{neu (speziell)} +% \begin{macro}{\@gr@gsffamily} +% \changes{v3.20}{2016/01/29}{neu (intern)} +% Schaltet je nach Einstellung von Option +% \texttt{egegdoesnotlikesansseriftitles} entweder auf \cs{sffamily} um oder +% eben nicht. +% \begin{macrocode} +\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles} +\newcommand*{\@gr@gsffamily}{% + \if@egregdoesnotlikesansseriftitles\else\sffamily\fi +} +% \end{macrocode} +% \end{macro}^^A \@gr@gsffamily +% \end{option}^^A egregdoesnotlikesansseriftitles +% % \iffalse %</!letter> % \fi @@ -390,6 +417,8 @@ % \changes{v2.8q}{2001/20/04}{neu}^^A % \begin{KOMAfont}{dictum} % \changes{v2.8q}{2001/20/04}{neues Element}^^A +% \changes{v3.20}{2016/01/29}{\cs{sffamily} durch \cs{@gr@gsffamily} +% ersetzt}^^A % \begin{KOMAfont}{dictumtext} % \changes{v2.8q}{2001/20/04}{neues Element}^^A % \begin{KOMAfont}{dictumauthor} @@ -429,7 +458,7 @@ \newcommand*{\dictumauthorformat}[1]{(#1)} \newcommand*{\raggeddictumtext}{\raggedright} \newcommand*{\raggeddictumauthor}{\raggedleft} -\newkomafont{dictum}{\normalfont\normalcolor\sffamily\small} +\newkomafont{dictum}{\normalfont\normalcolor\@gr@gsffamily\small} \newkomafont{dictumauthor}{\itshape} \aliaskomafont{dictumtext}{dictum} % \end{macrocode} @@ -517,12 +546,20 @@ % % \begin{macro}{\new@tpo@label} % \changes{v2.8q}{2001/11/22}{neu (intern)}^^A -% \changes{v2.95b}{2006/07/28}{verwendet jetzt \cs{@newl@bel}} +% \changes{v2.95b}{2006/07/28}{verwendet jetzt \cs{@newl@bel}}^^A +% \changes{v3.20}{2016/03/25}{use after definition in \texttt{aux}-file}^^A % Definition eines neuen \emph{true}-\emph{page}-\emph{odd} Labels. % Wird in der \texttt{aux}-Datei verwendet. % \begin{macrocode} %<*class|extend> \newcommand*{\new@tpo@label}{\@newl@bel{tpo}} +\AtBeginDocument{% + \if@filesw + \immediate\write\@auxout{% + \string\providecommand*\string\new@tpo@label[2]{}% + }% + \fi +} % \end{macrocode} % \end{macro} % @@ -542,6 +579,8 @@ % \changes{v3.17}{2015/03/23}{in zwei Anweisungen ausgeteilt}^^A % \begin{macro}{\is@thispageodd@setlabel} % \changes{v3.17}{2015/03/23}{neu (intern)}^^A +% \changes{v3.20}{2016/03/25}{write to \texttt{aux}-file only +% \cs{if@filesw}}^^A % Diese Makros machen die eigentliche Arbeit. Sie funktionieren nicht wie % ein normales \cs{iffalse} oder \cs{iftrue}, denn es kann nicht % geschachtelt innerhalb anderer \cs{if\dots} \dots \cs{fi} @@ -572,9 +611,11 @@ \fi \endgroup \edef\is@thispageodd@setlabel{% - \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{% - \noexpand\string - \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}% + \if@filesw + \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{% + \noexpand\string + \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}% + \fi }% #1% \@esphack @@ -737,7 +778,15 @@ \let\scr@ttl@saved@subparagraph\subparagraph } \AfterPackage{titlesec}{% - \@ifpackagelater{titlesec}{2014/10/09}{% +% \end{macrocode} +% Hack getestet mit \textsf{titlesec} 2011/12/15 v2.10.0 bis 2016/03/21 +% v2.10.2. Daher bis zu diesem Datum freigeschaltet. +% \changes{v3.20}{2016/03/22}{\textsf{titlesec}-Hack auch für Version +% 2016/03/15}^^A +% \changes{v3.20}{2016/03/24}{\textsf{titlesec}-Hack auch für Version +% 2016/03/21}^^A +% \begin{macrocode} + \@ifpackagelater{titlesec}{2016/03/22}{% \ClassInfo{\KOMAClassName}{% Deactivating the `titlesec` workaround,\MessageBreak because package is newer than expected% 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 1d56645a744..5a82b3f8aca 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx @@ -1,8 +1,8 @@ -% \CheckSum{3382} +% \CheckSum{3390} % \iffalse meta-comment % ====================================================================== % scrkernel-notepaper.dtx -% Copyright (c) Markus Kohm, 2006-2015 +% Copyright (c) Markus Kohm, 2006-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-notepaper.dtx -% Copyright (c) Markus Kohm, 2006-2015 +% Copyright (c) Markus Kohm, 2006-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z 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-07-15 09:30:52 +0200 (Wed, 15 Jul 2015) $ + \filedate$Date: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1767 $ \edef\reserved@a{% @@ -3496,8 +3496,12 @@ % \begin{macro}{\stopbreaks} % \begin{macro}{\startbreaks} % \begin{macro}{\@nobreakvspace} +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\@nobreakvspacex} % \begin{macro}{\@nobreakcr} +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Innerhalb von Briefen wird der Umbruch etwas anders gehandhabt. % Dadurch soll der Brieftext besser positioniert werden. % \begin{macrocode} @@ -3505,11 +3509,11 @@ \def\par{\@@par\nobreak}\let\\=\@nobreakcr \let\vspace\@nobreakvspace} \newcommand*{\@nobreakvspace}{% - \@ifstar{\@nobreakvspacex}{\@nobreakvspacex}} + \kernel@ifstar{\@nobreakvspacex}{\@nobreakvspacex}} \newcommand*{\@nobreakvspacex}[1]{\ifvmode\nobreak\vskip #1\relax\else \@bsphack\vadjust{\nobreak\vskip #1}\@esphack\fi} \newcommand*{\@nobreakcr}{% - \vadjust{\penalty\@M}\@ifstar{\@xnewline}{\@xnewline}} + \vadjust{\penalty\@M}\kernel@ifstar{\@xnewline}{\@xnewline}} \newcommand*{\startbreaks}{\let\\=\@normalcr \interlinepenalty 200\def\par{\@@par\penalty 200}} % \end{macrocode} @@ -3607,6 +3611,8 @@ % treiben wollen, \cs{}\cs{} durch \cs{tabularnewline} ersetzt.}^^A % \changes{v3.17}{2015/02/20}{Weil manche Leute es unbedingt auf die Spitze % treiben wollen, mehr \cs{strut} eingefügt.}^^A +% \changes{v3.20}{2015/10/08}{Umbruch nach dem Gruß nur, wenn wir uns im +% horizontalen Modus befinden}^^A % \begin{macrocode} \newcommand*{\closing}[1]{{% \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative\nobreak\par @@ -3623,7 +3629,8 @@ \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi \hspace{\useplength{sigindent}}% \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces - #1\ifhmode\unskip\strut\fi\\[\useplength{sigbeforevskip}] + #1\ifhmode\unskip\strut\\[\useplength{sigbeforevskip}] + \else\vskip \useplength{sigbeforevskip}\fi \strut\ignorespaces \usekomavar{signature}\ifhmode\unskip\strut\fi}}\par \nobreak\vskip\baselineskip @@ -3777,7 +3784,7 @@ % \changes{v3.12}{2013/05/13}{neu (intern)}^^A % Über diese Option kann eingestellt werden, dass an Stelle von % sprachabhängigen Bezeichnern für einige Variablen Symbole verwendet -% werden. Daztu wird das Paket \textsf{macrosym} benötigt. +% werden. Dazu wird das Paket \textsf{macrosym} benötigt. % \begin{macrocode} %</letter> %</body> @@ -3818,17 +3825,30 @@ \fi \endgroup \else -%<*class> - \ifstr{\@currname.\@currext}{\KOMAClassFileName}{% - \expandafter\AtEndOfClass -%</class> -%<*package> - \ifstr{\@currname.\@currext}{scrletter.\scr@pkgextension}{% - \expandafter\AtEndOfPackage -%</package> - }{% +% \end{macrocode} +% \changes{v3.20}{2016/04/01}{Name der Klasse oder des Pakets ist für die +% Ladeverzögerung von \textsf{marvosym} egal}^^A +% \changes{v3.20}{2016/04/01}{Ladeverzögerung für das Paket +% \textsf{marvosym} nur, wenn erforderlich und möglich}^^A +% In der Dokumentpräambel kann das Paket \textsf{marvosym} selbst geladen +% werden. Allerdings funktioniert das nicht, solange wir im Optionen-Abschnitt +% sind. Also muss es ggf. verzögert werden. Wie lange es zu verzögern ist, +% hängt davon ab, ob wir uns in einer Klasse, einem Paket oder sonst einer +% Datei mit Optionen-Abschnitt befinden. +% \begin{macrocode} + \ifx\@fileswith@pti@ns\@badrequireerror + \ifstr{\@currext}{\@clsextension}{% + \expandafter\AtEndOfClass + }{% + \ifstr{\@currext}{\@pksextension}{% + \expandafter\AtEndOfPackage + }{% + \expandafter\AtBeginDocument + }% + }% + \else \expandafter\@firstofone - }% + \fi {\RequirePackage{marvosym}}% \fi \fi @@ -3948,9 +3968,9 @@ % \begin{KOMAvar}{date} % \changes{v2.8q}{2002/01/16}{Neu}^^A % \begin{macro}{\date} -% \changes{v3.7}{2015/03/05}{das Makro gibt eine Warnung aus}^^A +% \changes{v3.17}{2015/03/05}{das Makro gibt eine Warnung aus}^^A % \begin{macro}{\scr@saved@date} -% \changes{v3.7}{2015/03/05}{Neu (intern)}^^A +% \changes{v3.17}{2015/03/05}{Neu (intern)}^^A % Desweiteren gibt es einige Variable, die auch einen Ausgabenamen haben, weil % dieser üblicherweise vorangestellt wird. Eine Besonderheit stellt dabei % \texttt{subject} dar. Der Ausgabename beinhaltet dabei nämlich auch die 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 d082a7c6888..ed58c881024 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx @@ -1,4 +1,4 @@ -% \CheckSum{702} +% \CheckSum{678} % \iffalse meta-comment % ====================================================================== % scrkernel-pagestyles.dtx @@ -55,15 +55,15 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z 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-07-15 09:30:52 +0200 (Wed, 15 Jul 2015) $ + \filedate$Date: 2015-12-12 09:55:47 +0100 (Sat, 12 Dec 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 2162 $ + \filerevision$Revision: 2304 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-pagestyles.dtx}% @@ -131,6 +131,8 @@ % \changes{v3.17}{2015/03/10}{Wert wird gespeichert}^^A % \changes{v3.18a}{2015/07/08}{BugFix: Argument bei % \cs{PassOptionsToPackage} erneut vertauscht}^^A +% \changes{v3.20}{2015/12/12}{Optionenweiterleitung an \textsf{typearea} +% entfernt}^^A % \begin{option}{headnosepline} % \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} durch \cs{PackageInfoNoLine} % ersetzt}^^A @@ -141,29 +143,13 @@ % \begin{macro}{\@hslfalse} % Die Entscheidung wird in einem Schalter gespeichert. % \begin{macrocode} -\newif\if@hsl +\KOMA@ifkey{headsepline}{@hsl}% +\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} +\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} -% Gleichzeitig wird dem \textsf{typearea}-Paket mitgeteilt, dass der -% Kopf zum Textbereich zu rechnen ist. Dies geschieht min. seit \KOMAScript{} -% 2.98c in beide Richtungen. Es ist leider nicht ganz klar, wie das zuvor war. -% \begin{macrocode} -\KOMA@key{headsepline}[true]{% - \KOMA@set@ifkey{headsepline}{@hsl}{#1}% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% - \@ifundefined{typearea}{% - \PassOptionsToPackage{headinclude=#1}{typearea}% - }{% - \KOMAoptions{headinclude=#1}{}% - }% - \fi -} -\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} -\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} -% \end{macrocode} % \end{option} % \end{option} % @@ -189,6 +175,8 @@ % \changes{v3.17}{2015/03/10}{Wert wird gespeichert}^^A % \changes{v3.18a}{2015/07/08}{BugFix: Argument bei % \cs{PassOptionsToPackage} erneut vertauscht}^^A +% \changes{v3.20}{2015/12/12}{Optionenweiterleitung an \textsf{typearea} +% entfernt}^^A % \begin{option}{footnosepline} % \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} durch \cs{PackageInfoNoLine} % ersetzt} @@ -199,28 +187,13 @@ % \begin{macro}{\@fslfalse} % Die Entscheidung wird in einem Schalter gespeichert. % \begin{macrocode} -\newif\if@fsl +\KOMA@ifkey{footsepline}{@fsl}% +\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false} +\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} -% Gleichzeitig wird dem \texttt{typearea}-Paket mitgeteilt, dass der -% Fuß zum Textbereich (nicht) zu rechnen ist. -% \begin{macrocode} -\KOMA@key{footsepline}[true]{% - \KOMA@set@ifkey{footsepline}{@fsl}{#1}% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% - \@ifundefined{typearea}{% - \PassOptionsToPackage{footinclude=#1}{typearea}% - }{% - \KOMAoptions{footinclude=#1}% - }% - \fi -} -\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false} -\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} -% \end{macrocode} % \end{option} % \end{option} % 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 4d398010b1d..ef0ad0757d1 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx @@ -1,8 +1,8 @@ -% \CheckSum{702} +% \CheckSum{704} % \iffalse meta-comment % ====================================================================== % scrkernel-paragraphs.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-paragraphs.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,13 +55,15 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%<option>%%% run: option +%<body>%%% run: body %<*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-08-22 08:36:48 +0200 (Sat, 22 Aug 2015) $ + \filedate$Date: 2016-02-22 09:20:29 +0100 (Mon, 22 Feb 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1872 $ \edef\reserved@a{% @@ -184,6 +186,8 @@ % % \begin{macro}{\par@update} % \changes{v2.95}{2004/11/05}{neues internes Macro}^^A +% \changes{v3.20}{2016/02/22}{wird möglichst früh \cs{AtBeginDocument} +% ausgeführt}^^A % Dieses Makro wird später in |\selectfont| die Änderung vornehmen. % \begin{macro}{\default@par@update} % \changes{v2.95}{2004/11/05}{neues internes Macro}^^A @@ -194,6 +198,7 @@ \let\par@update\relax \newcommand*{\default@par@update}{} \let\default@par@update\relax +\AtBeginDocument{\par@update} % \end{macrocode} % \end{macro} % \end{macro} 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 c91d3652a3d..5bdedf913f7 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx @@ -1,8 +1,8 @@ -% \CheckSum{3851} +% \CheckSum{3692} % \iffalse meta-comment % ====================================================================== % scrkernel-sections.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-sections.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,7 +55,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $ % The runs of run-time file generation: %<preidentify>%%% (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-10-03 14:51:00 +0200 (Sat, 03 Oct 2015) $ + \filedate$Date: 2016-04-27 12:58:21 +0200 (Wed, 27 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} - \filerevision$Revision: 2212 $ + \filerevision$Revision: 2438 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-sections.dtx}% @@ -450,11 +450,13 @@ % \changes{v2.95}{2004/01/15}{es wird erst unmittelbar vor dem Schließen % der Haupt-aux-Datei in diese geschrieben}^^A % \changes{v2.96a}{2006/12/07}{es wird \cs{immediate} geschrieben}^^A +% \changes{v3.20}{2016/03/25}{es wird \cs{csname}\dots\cs{endcsname} +% verwendet}^^A % \begin{macrocode} %<*body> \BeforeClosingMainAux{% \if@autodot\if@filesw\immediate\write\@mainaux{% - \string\global\string\@altsecnumformattrue}% + \string\global\string\csname\space @altsecnumformattrue\string\endcsname}% \fi\fi} %</body> % \end{macrocode} @@ -549,14 +551,24 @@ % \changes{v3.13a}{2014/09/11}{Neue interne Anweisung}^^A % \changes{v3.18}{2015/05/22}{verwende \cs{numexpr} für Argument 2} % \changes{v3.18}{2015/05/22}{verwende \cs{glueexpr} für Argument 3--5} +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\scr@saved@startsection} % \changes{v3.13a}{2014/09/11}{Neue interne Anweisung}^^A +% \changes{v3.20}{2016/04/12}{Tests funktionieren jetzt auch mit +% \textsf{amsgen}}^^A % \KOMAScript{} benötigt ein eigenes \cs{@startsection}, weil die % Funktionalität des \cs{@startsection} aus dem \LaTeX-Kern nicht % genügt. Bevor allerdings die eigene Definition in Angriff genommen wird, % muss kontrolliert werden, ob die aufgefundene Definition noch den % Erwartungen entspricht. Alles andere wäre ein deutlicher Hinweis, dass % eventuell in \KOMAScript{} ebenfalls eine Anpassung vorzunehmen wäre. +% Da es offenbar Leute gibt, die bei der Umdefinierung von \cs{section} +% etc. mit Hilfe von \cs{@startsection} Leerzeichen zwischen die Argumente +% packen und gleichzeitig \textsf{amsgen} verwenden, sorgen wir hier dafür, +% dass dann trotzdem noch die Warnungen funktionieren und nebenbei der Code +% mit etwas Glück sogar ebenfalls. Dazu ist es notwendig, dass die Version von +% \cs{@startsection} gespeichert wird, die \cs{kernel@ifstar} verwendet. % \begin{macrocode} %<*body> \newcommand*{\scr@saved@startsection}[6]{% @@ -572,11 +584,33 @@ \else \addpenalty\@secpenalty\addvspace\@tempskipa \fi + \kernel@ifstar + {\@ssect{#3}{#4}{#5}{#6}}% + {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}% +} +\def\reserved@a#1#2#3#4#5#6{% + \if@noskipsec \leavevmode \fi + \par + \@tempskipa #4\relax + \@afterindenttrue + \ifdim \@tempskipa <\z@ + \@tempskipa -\@tempskipa \@afterindentfalse + \fi + \if@nobreak + \everypar{}% + \else + \addpenalty\@secpenalty\addvspace\@tempskipa + \fi \@ifstar {\@ssect{#3}{#4}{#5}{#6}}% {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}% } -\ifx\@startsection\scr@saved@startsection +\ifcase \ifx\@startsection\scr@saved@startsection 0 + \else + \ifx\@startsection\reserved@a 0 + \else 1 + \fi + \fi \newcommand*{\scr@startsection}[6]{% \if@noskipsec \leavevmode \fi \par @@ -591,7 +625,7 @@ \else \addpenalty\@secpenalty\addvspace\@tempskipa \fi - \@ifstar {% + \kernel@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}% @@ -622,7 +656,7 @@ }% \let\scr@saved@startsection\@startsection \newcommand*{\scr@startsection}[6]{% - \@ifstar {% + \kernel@ifstar {% \scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}% {\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*% }{% @@ -708,12 +742,14 @@ % % \begin{macro}{\SecDef} % \changes{v3.13a}{2014/09/11}{neue Anweisung}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\secdef} % \changes{v3.13a}{2014/09/11}{Vollständige Neudefinition zur Optimierung % der Erweiterung für das optionale Argument}^^A % \begin{macrocode} %<*body> -\newcommand*{\SecDef}[2]{\@ifstar{#2}{\scr@section@dblarg{#1}}} +\newcommand*{\SecDef}[2]{\kernel@ifstar{#2}{\scr@section@dblarg{#1}}} \CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}} \let\secdef\SecDef %</body> @@ -1021,7 +1057,7 @@ Neither the then-code nor the else-code will be\MessageBreak executed.\MessageBreak You may change this and avoid the warning by LOCALLY\MessageBreak - setting \string\IsUsePrefixLine\space to either + setting \string\IfUsePrefixLine\space to either \string\@firstoftwo\space or\MessageBreak \string\@secondoftwo\space before using it% }% @@ -1057,7 +1093,9 @@ % \changes{v3.17}{2015/03/23}{Komplettumbau, um stilabhängige Optionen zu % ermöglichen}^^A % \changes{v3.18}{2015/05/22}{\cs{scr@dsc@def@style@\dots @command} -% definiert alle Stil abhängigen Anweisung}^^A +% definiert alle Stil abhängigen Anweisungen}^^A +% \changes{v3.20}{2015/10/03}{\cs{DeclareTOCStyleEntry} +% definiert die Verzeichnisstil abhängigen Anweisungen}^^A % Definition neuer oder Umdefinition existierender Gliederungsbefehle, die auf % \cs{scr@startsection} basieren. Ebenso wird ein Verzeichniseintrag erzeugt, % falls ein solcher noch nicht existiert. Die Deklaration geschieht über @@ -1076,7 +1114,7 @@ % werden, so ist \texttt{KOMAarg} zu verwenden. % \begin{macrocode} \newcommand*{\DeclareSectionCommandStyleOption}[3]{% - \DeclareSectionCommandDummyOption{#2}% + \AddToSectionCommandOptionsDoList{#2}% \expandafter\g@addto@macro\csname scr@dsc@style@#1@options\endcsname{% \DefineFamilyKey[.dsc]{KOMAarg}{#2}{#3}% }% @@ -1084,37 +1122,64 @@ % \end{macrocode} % \begin{macro}{\DeclareSectionCommandDummyOption} % \changes{v3.17}{2015/03/23}{neue Anweisung (intern)}^^A -% \begin{macro}{\scr@dsc@dummyoptions} -% \changes{v3.17}{2015/03/23}{Neu (intern)}^^A -% Definiert eine neue Dummy-Option für einen Stil eines -% Gliederungsbefehls. Das einzige Argument ist der Name der Option. Die -% Dummy-Optionen werden in \cs{scr@dsc@dummyoptions} gesammelt. -% \begin{macrocode} -\newcommand*{\DeclareSectionCommandDummyOption}[1]{% - \@ifstar {% - \g@addto@macro{\scr@dsc@dummyoptions}{% - \DefineFamilyKey[.dsc]{KOMAarg}{#1}[]{\FamilyKeyStateProcessed}% +% \changes{v3.20}{2015/11/18}{wird nicht mehr benötigt}^^A +% \end{macro}^^A \DeclareSectionCommandDummyOption +% \begin{macro}{\AddToSectionCommandOptionsDoList} +% \changes{v3.20}{2015/11/18}{neu} +% \begin{macro}{\@AddToSectionCommandOptionsDoList} +% \changes{v3.20}{2015/11/18}{neu (intern)} +% \begin{macro}{\scr@dsc@doopts} +% \changes{v3.20}{2015/11/18}{neu (intern)} +% Registriert eine neue Gliederungsbefehlsoption, indem sie der internen Liste +% der Gliederungsbefehlsoptionen hinzugefügt wird. +% \begin{macrocode} +\newcommand*{\AddToSectionCommandOptionsDoList}[1]{% + \kernel@ifnextchar [%] + {\@AddToSectionCommandOptionListWithDefault{#1}}% + {\l@addto@macro\scr@dsc@doopts{\do{#1}}}% +} +\newcommand*{\@AddToSectionCommandOptionListWithDefault}{} +\def\@AddToSectionCommandOptionListWithDefault#1[#2]{% + \l@addto@macro\scr@dsc@doopts{\do[{#2}]{#1}} +}% +\newcommand*{\scr@dsc@doopts}{} +% \end{macrocode} +% \end{macro}^^A \scr@dsc@dooptions +% \end{macro}^^A \@AddToSectionCommandOptionsListWithDefault +% \end{macro}^^A \AddToSectionCommandOptionsDoList +% \begin{macro}{\RelaxSectionCommandOptions} +% \changes{v3.20}{2015/11/18}{neu} +% Diese Option macht alle Gliederungsbefehlsoptionen ungültig. +% \begin{macrocode} +\newcommand*{\RelaxSectionCommandOptions}{% + \begingroup + \def\do@endgroup{\endgroup}% + \def\do{% + \kernel@ifnextchar [%] + {\@do}% + {\@do[]}% }% - }{% - \g@addto@macro{\scr@dsc@dummyoptions}{% - \DefineFamilyKey[.dsc]{KOMAarg}{#1}{\FamilyKeyStateProcessed}% + \def\@do[##1]##2{% + \l@addto@macro\do@endgroup{\RelaxFamilyKey[.dsc]{KOMAarg}{##2}}% }% - }% + \scr@dsc@doopts + \do@endgroup } -\newcommand*{\scr@dsc@dummyoptions}{} % \end{macrocode} -% \end{macro}^^A \scr@dsc@dummyoptions -% \end{macro}^^A \DeclareSectionCommandDummyOption +% \end{macro}^^A \RelaxSectionCommandOptions % \end{macro}^^A \DeclareSectionCommandStyleOption % \begin{macro}{\DeclareSectionCommandStyleLengthOption} % \changes{v3.17}{2015/03/23}{neue Anweisung}^^A +% \changes{v3.20}{2016/04/25}{Argument wird ggf. expandiert}^^A % Definiert eine für die aktuelle Ebene \cs{scr@dsc@current} eine neue % Längenoption und speichert das Ergebnis in einem Makro, das sich aus % Argument 3 gefolgt von der aktuellen Ebene gefolgt von Argument 4 ergibt. % \begin{macrocode} \newcommand*{\DeclareSectionCommandStyleLengthOption}[4]{% \DeclareSectionCommandStyleOption{#1}{#2}{% - \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}% + \protected@edef\reserved@a{% + \noexpand\FamilySetLength{KOMAarg}{#2}{\noexpand\@tempskipa}{##1}% + }\reserved@a \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifscr@dsc@expandtopt \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{% @@ -1129,15 +1194,18 @@ % \end{macro}^^A \DeclareSectionCommandStyleLengthOption % \begin{macro}{\DeclareSectionCommandStyleNumberOption} % \changes{v3.17}{2015/03/23}{neue Anweisung}^^A +% \changes{v3.20}{2016/04/25}{Argument wird expandiert}^^A % Definiert eine für die aktuelle Ebene \cs{scr@dsc@current} eine neue % Zahlenoption und speichert das Ergebnis in einem Makro, das sich aus % Argument 3 gefolgt von der aktuellen Ebene gefolgt von Argument 4 ergibt. % \begin{macrocode} \newcommand*{\DeclareSectionCommandStyleNumberOption}[4]{% \DeclareSectionCommandStyleOption{#1}{#2}{% - \FamilySetCounter{KOMAarg}{#2}{\@tempcnta}{##1}% + \protected@edef\reserved@a{% + \noexpand\FamilySetCounterMacro{KOMAarg}{#2}{\noexpand\reserved@a}{##1} + }\reserved@a \ifx\FamilyKeyState\FamilyKeyStateProcessed - \expandafter\edef\csname #3\scr@dsc@current#4 \endcsname{\the\@tempcnta}% + \expandafter\let\csname #3\scr@dsc@current#4 \endcsname\reserved@a \fi }% } @@ -1161,17 +1229,6 @@ } % \end{macrocode} % \end{macro}^^A \DeclareSectionCommandStyleFontOption -% Es folgt die Initialisierung zunächst der Dummys für die Optionen, die es -% immer gibt. (Erklärung dieser Optionen folgt unten.) -% \begin{macrocode} -\DeclareSectionCommandDummyOption{style} -\DeclareSectionCommandDummyOption{expandtopt}* -\DeclareSectionCommandDummyOption{increaselevel} -\DeclareSectionCommandDummyOption{level} -\DeclareSectionCommandDummyOption{toclevel} -\DeclareSectionCommandDummyOption{tocindent} -\DeclareSectionCommandDummyOption{tocnumwidth} -% \end{macrocode} % % \begin{macro}{\scr@dsc@style@section@options} % \changes{v3.17}{2015/03/23}{neue Anweisung (intern)}^^A @@ -1209,6 +1266,8 @@ % \end{macro}^^A \scr@dsc@style@section@options % \begin{macro}{\scr@dsc@def@style@section@command} % \changes{v3.18}{2015/05/21}{neue Anweisung (intern)}^^A +% \changes{v3.20}{2016/01/19}{korrekte Spitzmarkenprüfung für +% \cs{parfillskip}-Änderung}^^A % Diese Anweisung left fest, wie ein Gliederungsbefehl für den Stil % \texttt{section} zu definieren ist. Das einzige Argument ist dabei der % \meta{Name} der Gliederungsebene, beispielsweise \texttt{section}, @@ -1223,7 +1282,7 @@ {\csname scr@#1@beforeskip\endcsname}% {\csname scr@#1@afterskip\endcsname}% {% - \ifdim\glueexpr\csname scr@#1@beforeskip\endcsname <\z@ + \ifdim\glueexpr\csname scr@#1@afterskip\endcsname >\z@ \expandafter\ifnum\scr@v@is@gt{2.96}\relax \setlength{\parfillskip}{\z@ plus 1fil}% \fi @@ -1398,9 +1457,6 @@ % mit \cs{aftergroup}\cs{@gobbletwo} dafür, dass die Definition unterbleibt. % \begin{macrocode} \newcommand*{\scr@dsc@style@section@neededoptionstest}{% -%<trace> \typeout{TRACE: -%<trace> \string\scr@dsc@style@section@neededoptionstest\space for -%<trace> \scr@dsc@current}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{% \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}% }{}% @@ -1428,9 +1484,6 @@ % \begin{macrocode} %<*book|report> \newcommand*{\scr@dsc@style@chapter@neededoptionstest}{% -%<trace> \typeout{TRACE: -%<trace> \string\scr@dsc@style@chapter@neededoptionstest\space for -%<trace> \scr@dsc@current}% \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{% \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style} {pagestyle}% @@ -1467,9 +1520,6 @@ % mit \cs{aftergroup}\cs{@gobbletwo} dafür, dass die Definition unterbleibt. % \begin{macrocode} \newcommand*{\scr@dsc@style@part@neededoptionstest}{% -%<trace> \typeout{TRACE: -%<trace> \string\scr@dsc@style@part@neededoptionstest\space for -%<trace> \scr@dsc@current}% %<*book|report> \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{% \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style} @@ -1500,9 +1550,10 @@ % \end{macro}^^A \scr@dsc@style@part@neededoptionstest % % \begin{macro}{\ifscr@dsc@parametersonly} -% \changes{v3.17}{2015/03/24}{neu} +% \changes{v3.17}{2015/03/24}{neu}^^A +% \changes{v3.20}{2015/11/18}{es gibt keine Dummy-Optionen mehr}^^A % Dieser Schalter wird verwendet, um die Einstellungen entsprechend dem -% aktuell gültigen Stil zu ändern, die zugehörige Anweisunge selbst aber nicht +% aktuell gültigen Stil zu ändern, die zugehörige Anweisung selbst aber nicht % neu zu definieren. Er wird von einem leeren \texttt{style}-Wert lokal % gesetzt. % \begin{macrocode} @@ -1514,19 +1565,15 @@ \newcommand*{\DeclareSectionCommand}[2][]{% \edef\scr@dsc@current{#2}% % \end{macrocode} -% Zunächst sind alle für Gliederungsbefehle bekannten Optionen nur -% dummy-Optionen. -% \begin{macrocode} - \scr@dsc@dummyoptions -% \end{macrocode} -% Die einzige Optionen, die wir direkt auswerten, ist der Stil: -% \begin{description}\item[\texttt{style}] Stil der -% Gliederungsebene\end{description} +% Im ersten Durchlauf werden nur die Stil-Optionen ausgewertet: +% \begin{description} +% \item[\texttt{style}] Stil der Gliederungsebene +% \end{description} % \begin{macrocode} \scr@dsc@parametersonlyfalse \DefineFamilyKey[.dsc]{KOMAarg}{style}{% - \ifstr{##1}{}{% - \ifscr@dsc@parametersonlytrue + \IfArgIsEmpty{##1}{% + \scr@dsc@parametersonlytrue \FamilyKeyStateProcessed }{% \scr@ifundefinedorrelax{scr@dsc@def@style@##1@command}{% @@ -1537,7 +1584,65 @@ }% }% }% +% \end{macrocode} +% \begin{description} +% \item[\texttt{tocstyle}] +% \changes{v3.20}{2015/11/12}{Option \texttt{tocstyle} frühzeitig +% auswerten}^^A +% Verzeichnis-Eintrags-Stil, damit auch für diesen anschließend die Optionen +% definiert bzw. aktiviert werden können. +% \end{description} +% \begin{macrocode} + \DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{% + \IfArgIsEmpty{##1}{% + \expandafter\let\csname scr@dte@\scr@dsc@current @style\endcsname + \relax + \FamilyKeyStateProcessed + }{% +%<trace> \typeout{TRACE: option tocstyle=##1}% +%<trace> \typeout{TRACE: command=\scr@dsc@current}% + \scr@ifundefinedorrelax{scr@dte@def@l@##1}{% +%<trace> \typeout{TRACE: style not defined}% + \FamilyKeyStateUnknownValue + }{% +%<trace> \typeout{TRACE: style defined}% + \@namedef{scr@dte@\scr@dsc@current @style}{##1}% + \FamilyKeyStateProcessed + }% + }% + }% +% \end{macrocode} +% \begin{description} +% \item[\texttt{@else@}] +% \changes{v3.20}{2015/11/18}{Option \texttt{tocstyle} frühzeitig +% auswerten}^^A +% Damit keine anderen Optionen ausgewertet werden müssen aber auch nicht als +% unbekannte Optionen einen Fehler erzeugen, wird diese Spezialoption +% definiert, die einfach nur \cs{FamilyKeyStateProcessed} setzt. +% \end{description} +% \begin{macrocode} + \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{% +%<*trace> + \typeout{TRACE: ignoring option `@else@=\detokenize{##1}'}% + \typeout{TRACE: + \string\scr@key@atlist=`\detokenize\expandafter{\scr@key@atlist}'}% + \typeout{TRACE: + \string\scr@key@name=`\detokenize\expandafter{\scr@key@name}'}% + \typeout{TRACE: + \string\scr@key@value=`\detokenize\expandafter{\scr@key@value}'}% +%</trace> + \FamilyKeyStateProcessed + }% \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}% +% \end{macrocode} +% \changes{v3.20}{2015/11/18}{Rüchnahme der Optionen nach dem ersten +% Durchgang}^^A +% Nach dem ersten Druchgang müssen alle Optionen wieder zurückgenommen +% werden. +% \begin{macrocode} + \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}% + \RelaxFamilyKey[.dsc]{KOMAarg}{tocstyle}% + \RelaxFamilyKey[.dsc]{KOMAarg}{style}% \begingroup \scr@ifundefinedorrelax{scr@\scr@dsc@current @style}{% \scr@declaresectioncommanderror{\scr@dsc@current} @@ -1546,13 +1651,79 @@ \endgroup \@firstofone{% % \end{macrocode} -% Nach nun der Stil für den Gliederungsbefehl bekannt ist, können wir dessen -% Optionen aktivieren: +% \changes{v3.20}{2015/11/12}{keine Dummy-Optionen für den echten Lauf}^^A +% Nachdem nun der Stil für den Gliederungsbefehl bekannt ist, können wir +% dessen Optionen aktivieren: % \begin{macrocode} - \scr@dsc@dummyoptions %<trace> \typeout{TRACE: style=\@nameuse{scr@\scr@dsc@current @style}}% \@nameuse{scr@dsc@style@\@nameuse{scr@\scr@dsc@current @style}@options}% % \end{macrocode} +% Außerdem muss der Verzeichniseintrags-Stils initialisiert werden: +% \begin{macrocode} +%<trace> \typeout{TRACE: tocstyle=% +%<trace> \@nameuse{scr@dte@\scr@dsc@current @style}}% + \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{% + \scr@ifundefinedorrelax{l@\scr@dsc@current}{% + \@namedef{scr@dte@\scr@dsc@current @style}{default}% + }{}% + }{}% +% \end{macrocode} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A +% An dieser Stelle müssen die Optionen des Verzeichniseintrags auf Optionen +% der Gliederungsebene abgebildet werden. Dazu erhalten sie in der +% Gliederungebene den Präfix \texttt{toc}. Das bedeutet gleichzeitig, dass es +% keine Verzeichniseintragsoption Namens \texttt{style} geben kann und dass +% Gliederungsoptionen nicht mit \texttt{toc} beginnen dürfen. +% \begin{macrocode} + \let\scr@dsc@tocstyle@options\@empty + \let\scr@dsc@extra@relax@opts\@empty + \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{}{% + \begingroup + \def\scr@dte@current{#2}% + \edef\reserved@a{% + \noexpand\@ExecuteTOCEntryStyleInitCode{% + \@nameuse{scr@dte@\scr@dsc@current @style}% + }{\scr@dsc@current}% + }\reserved@a + \def\do@endgroup{\endgroup}% + \def\do##1{% + \l@addto@macro\do@endgroup{% + \l@addto@macro\scr@dsc@extra@relax@opts{% + \RelaxFamilyKey[.dsc]{KOMAarg}{toc##1}% + }% + }% + \kernel@ifnextchar[%] + {\@dodefault{##1}}% + {\@donodefault{##1}}% + }% + \def\@donodefault##1{% + \l@addto@macro\do@endgroup{% + \DefineFamilyKey[.dsc]{KOMAarg}{toc##1}{% + \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}% + \FamilyKeyStateProcessed + }% + }% + }% + \def\@dodefault##1[##2]{% + \l@addto@macro\do@endgroup{% + \DefineFamilyKey[.dsc]{KOMAarg}{toc##1}[##2]{% + \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}% + \FamilyKeyStateProcessed + }% + }% + }% + \scr@dte@doopts + \do@endgroup + }% +% \end{macrocode} +% Die Optionen für die Stile von Verzeichniseintrag und Gliederungsebene +% werden nicht erneut benötigt, müssten aber natürlich erneut verarbeitet +% werden. +% \begin{macrocode} + \DefineFamilyKey[.dsc]{KOMAarg}{style}{\FamilyKeyStateProcessed}% + \DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{\FamilyKeyStateProcessed}% +% \end{macrocode} % Dazu kommen einige Optionen, die es schlicht immer gibt: % \begin{description}\item[\texttt{expandtopt}] Schalter, um die Längen zur % Definitionszeit statt zur Anwendungszeit komplett zu expandieren. Das @@ -1613,66 +1784,47 @@ \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}% \let\scr@local@counterwithin\relax % \end{macrocode} -% \begin{description}\item[\texttt{toclevel}] Ebene im Inhaltsverzeichnis -% (Voreinstellung ist derselbe Wert wie für level)\end{description} +% \begin{description} +% \item[\texttt{toclevel}] Ebene im Inhaltsverzeichnis (Voreinstellung ist +% derselbe Wert wie für level); diese Option gibt es nur, wenn der +% Verzeichnisstil sie unterstützt (was jeder Verzeichnisstil +% sollte); wenn allerdings ein Offset dafür definiert ist, dann wird die +% Option nicht einfach an den Stil weitergereicht, muss also noch einmal +% umdefiniert werden. +% \end{description} % \begin{macrocode} - \scr@ifundefinedorrelax{scr@local@tocleveloffset}{% - \edef\reserved@a{% - \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{toclevel}{% - \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname}% - }\reserved@a - }{% - \edef\reserved@a{% - \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{% - \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{% - \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname - }% - \unexpanded{% - {\numexpr ##1+\scr@local@tocleveloffset\relax}% - \edef\scr@local@tocleveloffset{% - \the\numexpr\scr@local@tocleveloffset - +\scr@local@levelincrease\relax + \scr@ifundefinedorrelax{scr@local@tocleveloffset}{}{% + \scr@ifundefinedorrelax{KV@KOMAarg.dsc@toclevel}{% + }{% + \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{% + \edef\reserved@a{% + \noexpand\l@addto@macro{\noexpand\scr@dsc@tocstyle@options}{% + level=\the\numexpr ##1+\scr@local@tocleveloffset\relax,% }% + }\reserved@a + \edef\scr@local@tocleveloffset{% + \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax }% + \FamilyKeyStateProcessed }% - }\reserved@a - }% -% \end{macrocode} -% \begin{description}\item[\texttt{tocindent}] Einzug des -% Inhaltsverzeichniseintrags\end{description} -% \begin{macrocode} - \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{% - \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \ifscr@dsc@expandtopt - \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{% - \the\@tempskipa}% - \else - \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{% - ##1}% - \fi - \fi - }% -% \end{macrocode} -% \begin{description}\item[\texttt{tocnumwidth}] Breite der Nummer des -% Inhaltsverzeichniseintrags\end{description} -% \begin{macrocode} - \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{% - \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \ifscr@dsc@expandtopt - \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{% - \the\@tempskipa}% - \else - \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{% - ##1}% - \fi - \fi + }% }% % \end{macrocode} -% Optionen ausführen: +% \changes{v3.20}{2015/11/12}{Optionen werden nur temporär definiert}^^A +% Optionen ausführen und anschließend wieder freigeben. % \begin{macrocode} \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}% + \scr@dsc@extra@relax@opts + \let\scr@dsc@extra@relax@opts\relax + \RelaxSectionCommandOptions + \RelaxFamilyKey[.dsc]{KOMAarg}{style}% + \RelaxFamilyKey[.dsc]{KOMAarg}{tocstyle}% + \RelaxFamilyKey[.dsc]{KOMAarg}{expandtopt}% + \scr@ifundefinedorrelax{scr@local@levelincrease}{}{% + \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}% + }% + \RelaxFamilyKey[.dsc]{KOMAarg}{level}% + \RelaxFamilyKey[.dsc]{KOMAarg}{counterwithin}% % \end{macrocode} % Testen, ob alle benötigten Optionen für die (Um-)Definierung des % Gliederungsbefehls gesetzt sind: @@ -1681,14 +1833,6 @@ \scr@ifundefinedorrelax{\scr@dsc@current numdepth}{% \scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}% }{}% - \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocindent}{% - \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry indent} - {tocindent}% - }{}% - \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocnumwidth}{% - \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry number - width}{tocnumwidth}% - }{}% \@nameuse{scr@dsc@style@% \@nameuse{scr@\scr@dsc@current @style}% @neededoptionstest}% @@ -1701,6 +1845,7 @@ % \end{macrocode} % Zunächst sicherstellen, dass der Zähler existiert und ggf. dessen % Ausgabe anpassen: +% \changes{v3.20}{2015/10/15}{fehlendes \cs{expandafter} ergänzt}^^A % \begin{macrocode} \@ifundefined{c@#2}{\newcounter{#2}}{}% \ifx\scr@local@counterwithout\relax @@ -1716,7 +1861,7 @@ \else \@removefromreset{#2}{\scr@local@counterwithin}% \@addtoreset{#2}{\scr@local@counterwithin}% - \expandafter\def\csname the#2\expandafter\endcsname{% + \expandafter\def\csname the#2\expandafter\endcsname\expandafter{% \csname the\scr@local@counterwithin\endcsname.\arabic{#2}}% \fi \fi @@ -1767,22 +1912,27 @@ % Und es gehören Befehle dazu, um einen Eintrag ins Inhaltsverzeichnis zu % schreiben und den Eintrag auch darzustellen: % \begin{macrocode} - \scr@ifundefinedorrelax{#2tocdepth}{% - \expandafter\let\csname #2tocdepth\expandafter\endcsname - \csname #2numdepth\endcsname - }{}% \expandafter\providecommand\expandafter*% \csname add#2tocentry\endcsname[2]{% \addtocentrydefault{#2}{##1}{##2}% }% + \scr@ifundefinedorrelax{scr@dte@#2@style}{% + }{% + \DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{% + \@nameuse{scr@dte@#2@style}% + }{#2}% + }% \scr@ifundefinedorrelax{l@#2}{% - \expandafter\edef\csname l@#2\endcsname{% - \noexpand\bprot@dottedtocline - \expandafter\noexpand\csname #2tocdepth\endcsname - \expandafter\noexpand\csname scr@#2@tocindent\endcsname - \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname - }% + \DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{default}{#2}% }{}% +% \end{macrocode} +% \changes{v3.20}{2015/0/07}{\textsf{hyperref} bei den Ebenen der +% Verzeichniseinträge berücksichtigen}^^A +% \begin{macrocode} + \scr@ifundefinedorrelax{toclevel@part}{}{% + \expandafter\let\csname toclevel@#2\expandafter\endcsname + \csname #2tocdepth\endcsname + }% }% }% \let\scr@dsc@current\relax @@ -1890,9 +2040,9 @@ % \begin{macrocode} \newcommand*{\DeclareSectionCommands}[2][]{% \edef\reserved@a{#2}% - \let\scr@local@levelincrease\z@ - \let\scr@local@leveloffset\z@ - \let\scr@local@tocleveloffset\z@ + \def\scr@local@levelincrease{\z@}% + \def\scr@local@leveloffset{\z@}% + \def\scr@local@tocleveloffset{\z@}% \@for\reserved@a:=\reserved@a\do{% \edef\reserved@a{% \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}% @@ -1916,9 +2066,9 @@ % \begin{macrocode} \newcommand*{\DeclareNewSectionCommands}[2][]{% \edef\reserved@a{#2}% - \let\scr@local@levelincrease\z@ - \let\scr@local@leveloffset\z@ - \let\scr@local@tocleveloffset\z@ + \def\scr@local@levelincrease{\z@}% + \def\scr@local@leveloffset{\z@}% + \def\scr@local@tocleveloffset{\z@}% \@for\reserved@a:=\reserved@a\do{% \@ifundefined{\reserved@a}{}{% \ClassError{\KOMAClassName}{% @@ -1957,9 +2107,9 @@ % \begin{macrocode} \newcommand*{\RedeclareSectionCommands}[2][]{% \edef\reserved@a{#2}% - \let\scr@local@levelincrease\z@ - \let\scr@local@leveloffset\z@ - \let\scr@local@tocleveloffset\z@ + \def\scr@local@levelincrease{\z@}% + \def\scr@local@leveloffset{\z@}% + \def\scr@local@tocleveloffset{\z@}% \@for\reserved@a:=\reserved@a\do{% \@ifundefined{\reserved@a}{% \ClassError{\KOMAClassName}{% @@ -1996,9 +2146,9 @@ % \begin{macrocode} \newcommand*{\ProvideSectionCommands}[2][]{% \edef\reserved@a{#2}% - \let\scr@local@levelincrease\z@ - \let\scr@local@leveloffset\z@ - \let\scr@local@tocleveloffset\z@ + \def\scr@local@levelincrease{\z@}% + \def\scr@local@leveloffset{\z@}% + \def\scr@local@tocleveloffset{\z@}% \@for\reserved@a:=\reserved@a\do{% \@ifundefined{\reserved@a}{% \edef\reserved@a{% @@ -2010,9 +2160,9 @@ % Wenn die Anweisung bereits definiert ist, dann müssen wir trotzdem die % Optionen auswerten, wobei allerdings nur die Option \texttt{level} und % \texttt{increaselevel} eine Wirkung haben dürfen. Der Rest wird per -% dummy-Optionen erledigt. +% \texttt{@else}-Optionen erledigt. % \begin{macrocode} - \scr@dsc@dummyoptions + \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}% \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]% {\scr@local@levelincrease}% \DefineFamilyKey[.dsc]{KOMAarg}{level}{% @@ -2020,11 +2170,18 @@ \edef\scr@local@leveloffset{% \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax }% + }% + \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{% + \FamilySetCounterMacro{KOMAarg}{toclevel}{\reserved@b}{##1}% \edef\scr@local@tocleveloffset{% \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax }% }% \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}% + \RelaxFamilyKey[.dsc]{KOMAarg}{toclevel}% + \RelaxFamilyKey[.dsc]{KOMAarg}{level}% + \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}% + \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}% }% }% \let\scr@local@levelincrease\relax @@ -2065,6 +2222,8 @@ % \end{macro} % \begin{macro}{\set@preamble} % \changes{v2.8p}{2001/09/25}{neu (intern)}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Das Makro \cs{set@preamble} dient allgemein der Defintion einer % Präambel (für Gliederungsüberschriften). Als Argument wird der % Name der Gliederungsebene übergeben. Danach folgt ein optionales @@ -2075,6 +2234,8 @@ % Präambel. Die Definition der Präambel erfolgt global. % \begin{macro}{\set@@preamble} % \changes{v2.8p}{2001/09/25}{neu (intern)}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\set@@@preamble} % \changes{v2.8p}{2001/09/25}{neu (intern)}^^A % \begin{macro}{\set@@@@preamble} @@ -2089,7 +2250,7 @@ % \end{macrocode} % Zunächst wird das erste optionale Argument gesucht. % \begin{macrocode} - \@ifnextchar [%] + \kernel@ifnextchar [%] {\set@@preamble{#1}}{\set@@@preamble{#1}[][\hsize]}% } \newcommand*{\set@@preamble}{} @@ -2098,7 +2259,7 @@ % Wenn ein optionales Argument existiert, kann es auch ein zweites % geben. Wenn nicht, wird mit der Voreinstellung gearbeitet. % \begin{macrocode} - \@ifnextchar [%] + \kernel@ifnextchar [%] {\set@@@preamble{#1}[{#2}]}{\set@@@preamble{#1}[{#2}][\hsize]}% } \newcommand{\set@@@preamble}{} @@ -2271,19 +2432,11 @@ \newcommand*{\bprot@dottedtocline}[5]{% \expandafter\ifnum\scr@v@is@gt{2.96}\relax \ifnum #1>\c@tocdepth \else - \begingroup - \@tempcnta 20010 - \advance \@tempcnta by -#1 - \ifnum \@tempcnta>\lastpenalty - \endgroup + \ifnum \lastpenalty<\numexpr 20010-#1\relax \addpenalty{\@lowpenalty}% - \else - \endgroup \fi \@dottedtocline{#1}{#2}{#3}{#4}{#5}% - \@tempcnta 20009 - \advance \@tempcnta by -#1 - \penalty\@tempcnta + \penalty \numexpr 20009-#1\relax \fi \else \@dottedtocline{#1}{#2}{#3}{#4}{#5}% @@ -2597,7 +2750,6 @@ % \begin{macrocode} \newcommand{\scr@@startpart}{} \long\def\scr@@startpart#1[#2]#3{% -%<trace> \typeout{TRACE: \string\scr@@startpart{#1}}% % \end{macrocode} % \changes{v3.10}{2011/08/30}{Integration der Erweiterung für das optionale % Argument der Gliederungsbefehle}^^A @@ -2747,7 +2899,6 @@ % ist der \meta{Text} für die Überschrift. % \begin{macrocode} \newcommand{\scr@@startspart}[2]{% -%<trace> \typeout{TRACE: \string\scr@@startspart{#1}}% % \end{macrocode} % Für Leute, die unbedingt nach der Sternversion noch ein \cs{addcontentsline} % anfügen wollen, muss hier ebenfalls der \textsf{hyperref}-Hook ausgeführt @@ -2970,6 +3121,7 @@ % verwendet}^^A % \changes{v3.15}{2014/12/23}{Verwendung von \cs{parttocdepth} und % \cs{scr@part@numwidth}}^^A +% \changes{v3.20}{2015/10/06}{Überführung in Verzeichnisstil}^^A % Der Eintrag für \cs{part}. Es werden einige Hilfsmakros passend zu % \cs{DeclareSectionCommand} definiert. Dadurch können diverse Einstellungen % darüber geändert werden. Es kann jedoch derzeit kein neuer Stil zugewiesen @@ -2977,74 +3129,14 @@ % \begin{macro}{\scr@part@tocindent} % \changes{v3.15}{2014/12/02}{neue (interne) Anweisung}^^A % \changes{v3.18}{2015/06/09}{indirekt über \cs{DeclareSectionCommand}}^^A -% Wird nicht verwendet aber zwecks besserer Kompatibilität mit -% \cs{DeclareSectionCommand} definiert. +% \changes{v3.20}{2015/11/06}{wird nun auch verwendet}^^A +% Der Einzug des Eintrags noch vor der Nummer. % \end{macro}^^A \scr@part@tocindent % \begin{macro}{\scr@part@tocnumwidth} % \changes{v3.15}{2014/12/02}{neue (interne) Anweisung}^^A % \changes{v3.18}{2015/06/09}{indirekt über \cs{DeclareSectionCommand}}^^A % Die definierte Breite der Nummer für den Eintrag ins Inhaltsverzeichnis. % \end{macro} -% \begin{macrocode} -\newcommand*\l@part[2]{% - \ifnum \c@tocdepth <\parttocdepth \else -%<article> \addpenalty{\@secpenalty}% -%<book|report> \addpenalty{-\@highpenalty}% - \addvspace{2.25em \@plus\p@}% -% \end{macrocode} -% \changes{v2.5e}{1998/07/17}{geänderte part-Formatierung ragte in -% den linken Rand}^^A -% \changes{v2.9k}{2003/01/02}{Anpassung an Option \texttt{tocleft}}^^A -% \begin{macrocode} - \setlength{\@tempdima}{\scr@part@tocnumwidth}% - \if@tocleft - \ifx\toc@l@number\@empty\else - \setlength\@tempdima{0\toc@l@number}% - \fi - \fi - \begingroup - \parindent \z@ \rightskip \@pnumwidth - \parfillskip -\@pnumwidth -% \end{macrocode} -% \changes{v2.5c}{1997/11/25}{Formatierung bei Zeilenumbruch im -% part-Eintrag korrigiert}^^A -% \changes{v2.5e}{1998/07/17}{beinhaltet \cs{sectfont} eine -% Größenangabe, so wird diese überschrieben}^^A -% \begin{macrocode} - \leavevmode - \advance\leftskip\@tempdima - \hskip -\leftskip - \usekomafont{partentry}{#1\nobreak - \usekomafont{partentrypagenumber}{\hfil\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par -% \end{macrocode} -% \changes{v2.96b}{2006/11/30}{Umbruch zwischen \cs{part}-Eintrag im -% Inhaltsverzeichnis und untergeordneten Einträgen verhindern}^^A -% Aus unerfindlichen Gründen war es bis Version~2.96 erlaubt, dass zwischen -% der \cs{part}-Überschrift und der nachfolgenden Überschrift ein Umbruch -% stattfinden kann. Ab Version~2.96a gilt das nur noch, wenn die nachfolgende -% Überschrift wiederum eine \cs{part}-Überschrift ist. -% \begin{macrocode} - \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \endgroup - \penalty20010 - \else -%<*article> - \if@compatibility - \global\@nobreaktrue -% \end{macrocode} -% \changes{v2.3g}{1996/01/14}{fehlendes Kommentarzeichen ergänzt}^^A -% \begin{macrocode} - \everypar{\global\@nobreakfalse\everypar{}}% - \else -%</article> - \penalty\@highpenalty -%<article> \fi - \endgroup - \fi - \fi -} -% \end{macrocode} % \end{macro}^^A \l@part % % @@ -3662,9 +3754,11 @@ \chapterheadstartvskip % \end{macrocode} % Dann die eigentliche Überschrift innerhalb einer Gruppe. +% \changes{v3.20}{2015/12/23}{\cs{parfillskip} auf \texttt{\cs{z@} plus +% 1fil} gesetzt}^^A % \begin{macrocode} {% - \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% + \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}% % \end{macrocode} % \changes{v3.19}{2015/08/02}{Verwendung von \cs{chapterlinesformat} und % \cs{chapterlineswithprefixformat}}^^A @@ -3743,13 +3837,15 @@ % \cs{raggedsection}}^^A % \changes{v3.19}{2015/08/02}{an die Änderungen bei \cs{scr@@makechapterhead} % angepasst}^^A +% \changes{v3.20}{2015/12/23}{\cs{parfillskip} auf \texttt{\cs{z@} plus +% 1fil} gesetzt}^^A % \begin{macrocode} \newcommand*{\scr@@makeschapterhead}[2]{% \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \chapterheadstartvskip {% - \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% + \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}% \let\IfUseNumber\secondoftwo \if@chapterprefix \let\IfUsePrefixLine\@firstoftwo @@ -4070,6 +4166,7 @@ Please update hyperref to at least version 6.71b}}} %</book> +%</body> % \end{macrocode} % \end{macro}^^A \@saddchap % \end{macro}^^A \@addchap @@ -4092,6 +4189,7 @@ % \cs{scr@chapter@tocnumwidth}}^^A % \changes{v3.15}{2014/12/10}{Verwendung von \cs{addvspace} statt \cs{vskip} % für den Abstand am Anfang}^^A +% \changes{v3.20}{2015/10/06}{überführt in Verzeichnisstil}^^A % Für die Definition des Kapiteleintrags ins Inhaltsverzeichnis werden einige % Parameter von \cs{DeclareSectionCommand} definiert und teilweise % verwendet. Damit kann man dann zumindest einige Änderungen mit @@ -4100,7 +4198,8 @@ % \begin{macro}{\scr@chapter@tocindent} % \changes{v3.15}{2014/12/02}{neue (interne) Anweisung}^^A % \changes{v3.18}{2015/05/20}{indirekt über \cs{DeclareSectionCommand}}^^A -% Der Einzug des Eintrags wird nicht verwendet. +% \changes{v3.20}{2015/11/06}{wird nun auch verwendet}^^A +% Der Einzug des Eintrags noch vor der Nummer. % \end{macro}^^A \scr@chapter@tocindent % \begin{macro}{\scr@chapter@tocnumwidth} % \changes{v3.15}{2014/12/02}{neue (interne) Anweisung}^^A @@ -4112,65 +4211,17 @@ % Seit Version~3.15 kann man mit dieser Option Pünktchen zwischen Text und % Seitenzahl in den Kapiteleinträgen einschalten. % \begin{macrocode} -%</body> %<*option> \KOMA@ifkey{chapterentrydots}{@chapterentrywithdots} %</option> -%<*body> % \end{macrocode} % \end{option}^^A chapterentrydots -% \begin{macrocode} -\newcommand*\l@chapter[2]{% - \ifnum \c@tocdepth <\chaptertocdepth \else - \ifnum \lastpenalty<20010 - \addpenalty{-\@highpenalty}% - \fi - \expandafter\ifnum\scr@v@is@lt{3.15}% - \vskip 1.0em \@plus\p@ - \else - \addvspace{1.0em \@plus\p@}% - \fi - \setlength\@tempdima{\scr@chapter@tocnumwidth}% - \if@tocleft - \ifx\toc@l@number\@empty\else - \setlength\@tempdima{0\toc@l@number}% - \fi - \fi - \begingroup - \raggedchapterentry - \parindent \z@ \advance\rightskip \@pnumwidth - \parfillskip -\@pnumwidth - \interlinepenalty\@M - \leavevmode - \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip - \edef\@pnumwidth{\the\dimexpr\@pnumwidth\relax}% - \usekomafont{chapterentry}{#1\nobreak - \usekomafont{chapterentrypagenumber}{% -% \end{macrocode} -% \changes{v3.15}{2014/10/12}{optionale Pünktchen im Eintrag}^^A -% \begin{macrocode} - {\usekomafont{chapterentrydots}{% - \if@chapterentrywithdots - \leaders\hbox{$\m@th - \mkern \@dotsep mu\hbox{.}\mkern \@dotsep - mu$}% - \fi - \hfill}}\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par - \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \endgroup - \penalty20009 - \else - \penalty\@highpenalty - \endgroup - \fi - \fi -} -% \end{macrocode} % \begin{macro}{\raggedchapterentry} % \changes{v2.97c}{2007/06/21}{neue Anweisung}^^A +% \changes{v3.20}{2015/02/23}{wird nicht mehr verwendet}^^A % Ausrichtung des Textes der Kapiteleinträge im Inhaltsverzeichnis. % \begin{macrocode} +%<*body> \newcommand*{\raggedchapterentry}{} % \end{macrocode} % \end{macro}^^A \raggedchapterentry @@ -4439,11 +4490,12 @@ % \changes{v3.15}{2014/11/24}{\cs{sectiontocdepth}, % \cs{scr@section@tocindent} und \cs{scr@section@tocnumwidth} werden % verwendet}^^A +% \changes{v3.20}{2015/10/06}{Überführung in Verzeichnisstil}^^A % Bei der Artikel-Klasse folgt die Formatierung für % \cs{section}-Einträge, an Stelle der Einträge für \cs{chapter} % der Buch- oder der Bericht-Klasse. Bei diesen handelt es sich hier % stattdessen um eine normale Ebene. -% \begin{option}{chapterentrydots} +% \begin{option}{sectionentrydots} % \changes{v3.15}{2014/12/10}{Neu}^^A % Seit Version~3.15 kann man mit dieser Option Pünktchen zwischen Text und % Seitenzahl in den Kapiteleinträgen einschalten. @@ -4453,59 +4505,19 @@ \KOMA@ifkey{sectionentrydots}{@sectionentrywithdots} %</option> % \end{macrocode} -% \end{option}^^A chapterentrydots -% \begin{macrocode} -%<*body> -\newcommand*\l@section[2]{% - \ifnum \c@tocdepth <\sectiontocdepth\else - \ifnum \lastpenalty<20009 - \addpenalty{\@secpenalty}% - \fi - \addvspace{1.0em \@plus\p@}% - \setlength\@tempdima{\dimexpr\scr@section@tocnumwidth}% - \if@tocleft - \ifx\toc@l@number\@empty\else - \setlength\@tempdima{0\toc@l@number}% - \fi - \fi - \begingroup - \raggedsectionentry - \parindent \z@ \advance\rightskip \@pnumwidth - \parfillskip -\@pnumwidth - \interlinepenalty\@M - \leavevmode - \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip - \edef\@pnumwidth{\the\dimexpr\@pnumwidth\relax}% - \usekomafont{sectionentry}{#1\nobreak - \usekomafont{sectionentrypagenumber}{% -% \end{macrocode} -% \changes{v3.15}{2014/10/12}{optionale Pünktchen im Eintrag}^^A -% \begin{macrocode} - {\usekomafont{sectionentrydots}{% - \if@sectionentrywithdots - \leaders\hbox{$\m@th - \mkern \@dotsep mu\hbox{.}\mkern \@dotsep - mu$}% - \fi - \hfill}}\nobreak - \hb@xt@\@pnumwidth{\hss#2}}}\par - \endgroup - \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \penalty20008 - \fi - \fi -} -% \end{macrocode} +% \end{option}^^A sectionentrydots % \begin{macro}{\raggedsectionentry} % \changes{v2.97c}{2007/06/21}{neue Anweisung}^^A +% \changes{v3.20}{2016/02/23}{nicht mehr verwendet}^^A % Ausrichtung des Textes der Abschnittseinträge im Inhaltsverzeichnis. % \begin{macrocode} +%<*body> \newcommand*{\raggedsectionentry}{} %</body> %</article> % \end{macrocode} -% \end{macro} -% \end{macro} +% \end{macro}^^A \raggedsectionentry +% \end{macro}^^A \l@section % % % \begin{macro}{\addsec} @@ -4976,17 +4988,19 @@ %<article> level=\z@,% %<report|book> level=\m@ne,% %<report|book> pagestyle=plain,% + tocstyle=part,% toclevel=\m@ne,% tocindent=\z@,% - tocnumwidth=2em + tocnumwidth=2em% ]{part} %<*book|report> \DeclareSectionCommand[% style=chapter,% level=\z@,% pagestyle=plain,% + tocstyle=chapter,% tocindent=\z@,% - tocnumwidth=1.5em + tocnumwidth=1.5em% ]{chapter} %</book|report> \DeclareSectionCommand[% @@ -4995,6 +5009,7 @@ indent=\z@,% beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,% afterskip=2.3ex \@plus.2ex,% + tocstyle=section,% %<article> tocindent=0pt,% %<book|report> tocindent=1.5em,% %<article> tocnumwidth=1.5em% @@ -5006,6 +5021,8 @@ indent=\z@,% beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,% afterskip=1.5ex \@plus .2ex,% +%<article> tocstyle=subsection,% +%<book|report> tocstyle=section,% %<article> tocindent=1.5em,% %<book|report> tocindent=3.8em,% %<article> tocnumwidth=2.3em% @@ -5017,6 +5034,8 @@ indent=\z@,% beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,% afterskip=1.5ex \@plus .2ex,% +%<article> tocstyle=subsection,% +%<book|report> tocstyle=section,% %<article> tocindent=3.8em,% %<book|report> tocindent=7.0em,% %<article> tocnumwidth=3.2em% @@ -5028,6 +5047,8 @@ indent=\z@,% beforeskip=3.25ex \@plus1ex \@minus.2ex,% afterskip=-1em,% +%<article> tocstyle=subsection,% +%<book|report> tocstyle=section,% %<article> tocindent=7.0em,% %<book|report> tocindent=10em,% %<article> tocnumwidth=4.1em% @@ -5039,6 +5060,8 @@ indent=\scr@parindent,% beforeskip=3.25ex \@plus1ex \@minus .2ex,% afterskip=-1em,% +%<article> tocstyle=subsection,% +%<book|report> tocstyle=section,% %<article> tocindent=10em,% %<book|report> tocindent=12em,% %<article> tocnumwidth=5em% @@ -5090,12 +5113,14 @@ % \changes{v2.8c}{2001/06/29}{\cs{normalcolor} eingefügt}^^A % \changes{v3.12}{2013/11/11}{wird wegen Option % \texttt{headings!=standardclasses} früher definiert}^^A +% \changes{v3.20}{2016/01/29}{\cs{sffamily} durch \cs{@gr@gsffamily} +% ersetzt}^^A % Dies Schriftart nicht nur für die Gliederungsbefehle. Dieses Makro % ist als intern zu betrachten. Der Anwender sollte stattdessen das % entsprtechende Fontelement verwenden. % \begin{macrocode} %<*prepare> -\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} +\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} %</prepare> %<*body> \newcommand*{\scr@fnt@disposition}{\sectfont} 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 32693afa4e3..bdfdca45e9a 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{802} +% \CheckSum{815} % \iffalse meta-comment % ====================================================================== % scrkernel-title.dtx @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z 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-08-25 11:10:08 +0200 (Tue, 25 Aug 2015) $ + \filedate$Date: 2015-10-14 16:31:04 +0200 (Wed, 14 Oct 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1638 $ \edef\reserved@a{% @@ -350,6 +350,8 @@ % \changes{v3.11c}{2013/02/14}{Fußnoten der letzten Titelseite ausgeben}^^A % \changes{v3.11c}{2013/02/14}{Fußnoten für die nächste Titelseite % initialisieren}^^A +% \changes{v3.20}{2015/10/14}{\cs{setparsizes} bzw. entsprechende Angaben +% für die Längen eingefügt}^^A % \begin{macro}{\next@tdpage} % \changes{v3.11c}{2013/02/14}{neue Anweisung (intern)}^^A % \changes{v3.12}{2013/11/21}{\cs{titlepage@restore} hinzugefügt} @@ -360,6 +362,8 @@ \@thanks\global\let\@thanks\@empty \clearpage \csname titlepage@restore\endcsname +%<!extend> \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative +%<extend> \parskip\z@ \parindent\z@ \parfillskip\z@\@plus 1fil \thispagestyle{empty}% \let\footnote\thanks \setcounter{footnote}{0}% diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx new file mode 100644 index 00000000000..84ad3dff3ae --- /dev/null +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx @@ -0,0 +1,1973 @@ +% \CheckSum{1261} +% \iffalse meta-comment +% ====================================================================== +% scrkernel-tocstyle.dtx +% Copyright (c) Markus Kohm, 2015-2016 +% +% This file is part of the LaTeX2e KOMA-Script bundle. +% +% This work may be distributed and/or modified under the conditions of +% the LaTeX Project Public License, version 1.3c of the license. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later and of this work. +% +% This work has the LPPL maintenance status "author-maintained". +% +% The Current Maintainer and author of this work is Markus Kohm. +% +% This work consists of all files listed in manifest.txt. +% ---------------------------------------------------------------------- +% scrkernel-tocstyle.dtx +% Copyright (c) Markus Kohm, 2015-2016 +% +% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, +% Version 1.3c, verteilt und/oder veraendert werden. +% Die neuste Version dieser Lizenz ist +% http://www.latex-project.org/lppl.txt +% und Version 1.3c ist Teil aller Verteilungen von LaTeX +% Version 2005/12/01 oder spaeter und dieses Werks. +% +% Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained" +% (allein durch den Autor verwaltet). +% +% Der Aktuelle Verwalter und Autor dieses Werkes ist Markus Kohm. +% +% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien. +% ====================================================================== +% \fi +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% \iffalse +%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $ +% The runs of run-time file generation: +%<preidentify>%%% (run: preidentify) +% - everything that is needed before selfidentification of resulting files +% (unused) +%<identify>%%% (run: identify) +% - everything that is needed for selfidentification of resulting files +% (unused) +%<prepare>%%% (run: prepare) +% - everything that is needed to define options +%<option>%%% (run: option) +% - definition of options (unused) +%<execoption>%%% (run: execoption) +% - initial option executions up to \KOMAProcessOptions +% (unused) +%<body>%%% (run: body) +% - everything, that should be done after \KOMAProcessOptions +%<exit>%%% (run: exit) +% - everything, that should be done immediately before leaving the file +% (unused) +%<*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: 2016-04-27 12:58:21 +0200 (Wed, 27 Apr 2016) $ + \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} + \filerevision$Revision: 2254 $ + \edef\reserved@a{% + \noexpand\endgroup + \noexpand\ProvidesFile{scrkernel-tocstyle.dtx}% + [\filedate\space\filerevision\space + KOMA-Script (TOC styles)] + }% +\reserved@a +% \iffalse +\documentclass[parskip=half-]{scrdoc} +\usepackage[english,ngerman]{babel} +\usepackage[latin1]{inputenc} +\CodelineIndex +\RecordChanges +\GetFileInfo{scrkernel-tocstyle.dtx} +\title{\KOMAScript{} \partname\ \texttt{\filename}% + \footnote{Dies ist Version \fileversion\ von Datei + \texttt{\filename}.}} +\date{\filedate} +\author{Markus Kohm} + +\begin{document} + \maketitle + \tableofcontents + \DocInput{\filename} +\end{document} +%</driver> +% \fi +% +% \selectlanguage{ngerman} +% +% \section{Verzeichnisstile} +% +% Verzeichnisstile werden derzeit nur in Kooperation mit Gliederungsstilen +% untersützt. In Zukunft soll das aber mal anders werden. Dann sollen +% Verzeichnisstile Teil der Grundfunktionalität für Verzeichnisse (Paket +% \textsf{tocbasic}) werden und auch unabhängig von Gliederungsstilen +% einsetzbar sein. +% +% \StopEventually{\PrintIndex\PrintChanges} +% +% \changes{v3.20}{2015/11/13}{neu und nur bei Vorhandensein verwendet} +% +% +% \subsection{Einstellungen unabhängig von Verzeichnisstilen und doch +% Grundlage für diese} +% +% Bis \KOMAScript~3.20 waren die Befehle, die hier definiert werden, Teil der +% KOMA-Script-Klassen. Allerdings zeigt sich, dass es für die Definition von +% Verzeichnisstilen von Vorteil ist, wenn diese Definitionen im Paket +% vorhanden sind. +% +% \iffalse +%<*package> +% \fi +% +% \begin{macro}{\numberline} +% \changes{v3.20}{2016/03/10}{\cs{numberline} wird indirekt über +% \cs{scr@numberline} definiert}^^A +% \begin{macro}{\scr@numberline} +% \changes{v2.3c}{1995/08/06}{\cs{numberline} umdefiniert}^^A +% \changes{v3.06}{2010/05/18}{Verwendung von \cs{numberline@prefix} und +% \cs{numberline@postfix}}^^A +% \changes{v3.12}{2013/11/22}{use \cs{numberline@numberformat} only, if the +% argument expands to a non-empty string}^^A +% Dieses Makro wird indirekt im Inhaltsverzeichnis verwendet und muss +% umdefiniert werden, um Duden, 20.~Auflage, Regel~5 und Regel~6 zu +% implementieren. +% \begin{macrocode} +%<*body> +\newcommand*{\scr@numberline}[1]{% + \numberline@box{% + \numberline@prefix + \ifstr{#1}{}{#1}{% + \numberline@numberformat{#1}% + }% + \numberline@postfix + }% +} +% \end{macrocode} +% \begin{macro}{\usetocbasicnumberline} +% \changes{v3.20}{2016/03/15}{neu}^^A +% Dieses Makro testet, ob \cs{numberline} auf \cs{scr@numberline} +% basiert. Falls das nicht der Fall ist, führt es das optionale Argument aus +% und führt dann eine entsprechende Umdefinierung statt. Falls es jedoch der +% Fall ist, lässt es alles unverändert. +% \begin{macrocode} +\newcommand*{\usetocbasicnumberline}[1][% + \PackageInfo{tocbasic}{Using my definition of `\string\numberline'}% +]{% + \@tempswatrue + \begingroup + \def\scr@numberline##1{\global\@tempswafalse}% +% \end{macrocode} +% \cs{@tempdima} ist üblicherweise bei \cs{numberline} die Breite der Nummer. +% Damit zu kleine Werte nicht zu einem Problem werden können, nehme ich hier +% gleich mal einen richtig großen Wert. +% \begin{macrocode} + \@tempdima\maxdimen + \sbox\@tempboxa{\numberline{0}}% + \endgroup + \if@tempswa #1\renewcommand*{\numberline}[1]{\scr@numberline{##1}}\fi +} +% \end{macrocode} +% \end{macro}^^A \usetocbasicnumberline +% \begin{macro}{\numberline@prefix} +% \changes{v3.06}{2010/05/18}{neu (intern)}^^A +% Das ist in der Voreinstellung einfach leer. Es könnte verwendet werden, um +% etwas vor die Nummer zu setzen oder die Nummer rechtsbündig zu setzen. +% \begin{macrocode} +\newcommand*{\numberline@prefix}{} +% \end{macrocode} +% \end{macro}^^A \numberline@prefix +% \begin{macro}{\numberline@postfix} +% \changes{v3.06}{2010/05/18}{neu (intern)} +% Das ist in der Voreinstellung einfach \cs{hfil} und dient dazu die Nummer +% linksbündig zu platzieren. +% \begin{macrocode} +\newcommand*{\numberline@postfix}{\hfil} +% \end{macrocode} +% \end{macro}^^A \numberline@postfix +% \begin{macro}{\numberline@numberformat} +% \changes{v3.06}{2010/05/18}{neu (intern)}^^A +% \changes{v3.12}{2013/11/22}{don't output anything, if argument expands to +% an empty string}^^A +% Das dient in der Voreinstellung dazu, Regel~5 und 6 aus der 20.~Auflage des +% DUDENs umzusetzen. +% \begin{macrocode} +\newcommand*{\numberline@numberformat}[1]{% + \ifstr{#1}{}{}{\numberline@numberprefix#1\numberline@numberpostfix}% +} +% \end{macrocode} +% \begin{macro}{\numberline@numberprefix} +% \changes{v3.20}{2016/03/15}{neu (intern)} +% Wird verwendet, um innerhalb von \cs{numberline@numberformat} der Nummer +% einen Präfix voran zu stellen. Im Gegensatz zu \cs{numberline@prefix} wird +% dieser nur ausgegeben, wenn das Argument von \cs{numberline@numberformat}, +% also auch das Argument von \cs{numberline} nicht leer ist. +% \begin{macrocode} +\newcommand*{\numberline@numberprefix}{} +% \end{macrocode} +% \end{macro}^^A \numberline@numberprefix +% \begin{macro}{\numberline@numberpostfix} +% \changes{v3.20}{2016/03/15}{neu (intern)} +% Wird verwendet, um innerhalb von \cs{numberline@numberformat} der Nummer +% einen Postfix anzuhängen. Im Gegensatz zu \cs{numberline@prefix} wird +% dieser nur ausgegeben, wenn das Argument von \cs{numberline@numberformat}, +% also auch das Argument von \cs{numberline} nicht leer ist. +% \begin{macrocode} +\newcommand*{\numberline@numberpostfix}{} +% \end{macrocode} +% \end{macro}^^A \numberline@numberpostfix +% \end{macro}^^A \numberline@numberformat +% \begin{macro}{\numberline@box} +% \changes{v3.06}{2010/05/18}{neu (intern)} +% Das dient in der Voreinstellung dazu, die Gliederungsnummer in eine Box zu +% setzen. +% \begin{macrocode} +\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}} +%</body> +% \end{macrocode} +% \end{macro}^^A \numberline@box +% \end{macro}^^A \scr@numberline +% +% \iffalse +%</package> +%<*class> +% \fi +% +% \begin{macrocode} +%<*body> +\let\numberline\scr@numberline +%</body> +% \end{macrocode} +% \end{macro}^^A \numberline +% +% \iffalse +%</class> +% \fi +% +% \subsection{Grundlagen für Verzeichniseintragsstile} +% +% Ab \KOMAScript~3.20 halten Stile Einzug in die Verzeichnisse. Der erste +% Schritt dabei sind die Stile der Verzeichniseinträge. Jeder Stil besteht aus +% einer Anweisung, mit der ein Verzeichnisbefehl definiert wird und +% zugehörigen Optionen. Die Optionen dienen dazu, Einstellungen für die +% einzelnen Verzeichnisbefehle vorzunehmen. +% +% \iffalse +%<*package> +% \fi +% +% \changes{v3.20}{2015/11/17}{Verzeichnisstile bekommen das +% \texttt{KOMAarg}-Mitglied \texttt{.dte}}^^A +% \begin{macrocode} +%<*body> +\DefineFamily{KOMAarg} +\DefineFamilyMember[.dte]{KOMAarg} +%</body> +% \end{macrocode} +% +% \begin{macro}{\@DefineTOCEntryOption} +% \changes{v3.20}{2015/04/10}{neu (intern)} +% Die Definition der Optionen geschieht mit einer einheitlichen +% Schnittstelle. Wichtig dabei ist, dass hier nicht tatsächlich die Optionen +% definiert werden, sondern eine Anweisung, die ihrerseits die Optionen bei +% Bedarf definiert. Ein solcher Bedarf besteht beispielsweise bei der +% Definition des Eintragsbefehls selbst. Er besteht aber auch innerhalb von +% \cs{DeclareSectionCommand}, weil diese Anweisung ebenfalls indirekt +% Verzeichniseinträge definiert und deshalb die Optionen auswerten können +% soll. Es gibt folgende Parameter: +% \begin{description} +% \item[\marg{Stil}: \meta{String},] Name des Eintragsstils +% \item[\marg{Option}: \meta{String},] Name der Option +% \item[\oarg{Wert}:] der Säumniswert der Option abhängig von der +% \meta{Definition} +% \item[\marg{Definition}: \meta{Code},] Definition der Option +% \end{description} +% \begin{macro}{\@DefineTOCEntryOptionWithoutDefault} +% \changes{v3.20}{2015/11/10}{neu (intern)} +% \begin{macro}{\@DefineTOCEntryOptionWithDefault} +% \changes{v3.20}{2015/11/10}{neu (intern)} +% Da mit einem optionalen Argument an Position 3 gearbeitet wird, werden zwei +% Hilfsmakros benötigt. +% \begin{macrocode} +%<*body> +\newcommand*{\@DefineTOCEntryOption}[2]{% + \edef\scr@dte@doopts{% + \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2}% + }% + \kernel@ifnextchar [%] + {\@DefineTOCEntryOptionWithDefault{#1}{#2}}% + {\@DefineTOCEntryOptionWithoutDefault{#1}{#2}}% +} +\newcommand*{\@DefineTOCEntryOptionWithoutDefault}[3]{% + \DefineFamilyKey[.dte]{KOMAarg}{#2}{#3}% +} +\newcommand*{\@DefineTOCEntryOptionWithDefault}{} +\def\@DefineTOCEntryOptionWithDefault#1#2[#3]#4{% + \l@addto@macro\scr@dte@doopts{[{#3}]}% + \DefineFamilyKey[.dte]{KOMAarg}{#2}[{#3}]{#4}% +} +%</body> +% \end{macrocode} +% \end{macro}^^A \@DefineTOCEntryOptionWithoutDefault +% \end{macro}^^A \@DefineTOCEntryOptionWithDefault +% \end{macro}^^A \@DefineTOCEntryOption +% +% \begin{macro}{\@RelaxTOCEntryOptions} +% \changes{v3.20}{2015/04/10}{neu (intern)} +% Setzt alle Optionen der aktuellen Do-Liste zurück auf \cs{relax}. +% \begin{macrocode} +%<*body> +\newcommand*{\@RelaxTOCEntryOptions}{% + \begingroup + \def\do@endgroup{\endgroup}% + \def\do##1{% + \l@addto@macro\do@endgroup{\RelaxFamilyKey[.dte]{KOMAarg}{##1}}% + \scr@dte@gobbleopt + }% + \scr@dte@doopts + \do@endgroup +} +\newcommand{\scr@dte@gobbleopt}[1][]{} +%</body> +% \end{macrocode} +% \end{macro}^^A \@RelaxTOCEntryOptions +% +% \begin{macro}{\@DefineTOCEntryLengthOption} +% \changes{v3.20}{2015/12/04}{neu (intern)} +% Verwendet \cs{DefineTOCEntryOption}, um eine Option zu definieren, die ein +% Längenmacro definiert. Es gibt folgende Parameter: +% \begin{description} +% \item[\marg{Stil}: \meta{String},] Name des Eintragsstils +% \item[\marg{Option}: \meta{String},] Name der Option +% \item[\oarg{Wert}:] der Säumniswert der Option +% \item[\marg{Prefix}: \meta{String},] Präfix des zu definierenden Makros +% \item[\marg{Postfix}: \meta{String},] Postfix des zu definierenden Makros +% \item[\marg{Erklärung}: \meta{String},] Erklärung der Option +% \item[\oarg{Init}: \meta{Code},] Initialisierung der Option +% \end{description} +% Zwischen Prefix und Postfix wird bei der späteren, tatsächlichen Definition +% automatisch \cs{scr@dte@current} eingefügt. +% \begin{macro}{\@DefineTOCEntryLengthOptionWithoutDefault} +% \changes{v3.20}{2015/11/10}{neu (intern)}^^A +% \begin{macro}{\@DefineTOCEntryLengthOptionWithDefault} +% \changes{v3.20}{2015/11/10}{neu (intern)}^^A +% \begin{macro}{\@DefineTOCEntryLengthOptionMacro} +% \changes{v3.20}{2015/11/10}{neu (intern)}^^A +% Da mit einem optionalen Argument an Position 3 gearbeitet wird, werden drei +% Hilfsmakros benötigt. +% \begin{macrocode} +%<*body> +\newcommand*{\@DefineTOCEntryLengthOption}[2]{% + \kernel@ifnextchar [%] + {\@DefineTOCEntryLengthOptionWithDefault{#1}{#2}} + {\@DefineTOCEntryLengthOptionWithoutDefault{#1}{#2}}% +} +\newcommand*{\@DefineTOCEntryLengthOptionWithoutDefault}[5]{% + \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4}{#2}{#5}% + \@DefineTOCEntryOption{#1}{#2}{% + \@DefineTOCEntryLengthOptionMacro{#2}{#3}{#4}{##1}% + }% +} +\newcommand*{\@DefineTOCEntryLengthOptionWithDefault}{} +\def\@DefineTOCEntryLengthOptionWithDefault#1#2[#3]#4#5#6{% + \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5}{#2}{#6}% + \@DefineTOCEntryOption{#1}{#2}[{#3}]{% + \@DefineTOCEntryLengthOptionMacro{#2}{#4}{#5}{##1}% + }% +} +\newcommand*{\@DefineTOCEntryLengthOptionMacro}[4]{% + \protected@edef\reserved@a{% + \noexpand\FamilySetLength{KOMAarg}{#1}{\noexpand\@tempskipa}{#4}% + }\reserved@a + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \ifscr@dte@expandtopt + \expandafter\edef\csname #2\scr@dte@current#3\endcsname{% + \the\@tempskipa}% + \else + \expandafter\protected@edef\csname #2\scr@dte@current#3\endcsname{#4}% + \fi + \fi +} +%</body> +% \end{macrocode} +% \end{macro}^^A \@DefineTOCEntryLengthOptionMacro +% \end{macro}^^A \@DefineTOCEntryLengthOptionWithDefault +% \end{macro}^^A \@DefineTOCEntryLengthOptionWithoutDefault +% \end{macro}^^A \@DefineTOCEntryLengthOption +% +% \begin{macro}{\@DefineTOCEntryNumberOption} +% \changes{v3.20}{2015/12/04}{neu (intern)} +% Verwendet \cs{DefineTOCEntryOption}, um eine Option zu definieren, die ein +% Nummernmacro definiert. Es gibt folgende Parameter: +% \begin{description} +% \item[\marg{Stil}: \meta{String},] Name des Eintragsstils +% \item[\marg{Option}: \meta{String},] Name der Option +% \item[\oarg{Wert}:] der Säumniswert der Option +% \item[\marg{Prefix}: \meta{String},] Präfix des zu definierenden Makros +% \item[\marg{Postfix}: \meta{String},] Postfix des zu definierenden Makros +% \item[\marg{Erklärung}: \meta{String},] Erklärung der Option +% \item[\oarg{Init}: \meta{Code},] Initialisierung der Option +% \end{description} +% Zwischen Prefix und Postfix wird bei der späteren, tatsächlichen Definition +% automatisch \cs{scr@dte@current} eingefügt. +% \begin{macro}{\@DefineTOCEntryNumberOptionWithoutDefault} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% \begin{macro}{\@DefineTOCEntryNumberOptionWithDefault} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% \begin{macro}{\@DefineTOCEntryNumberOptionMacro} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% Da mit einem optionalen Argument an Position 3 gearbeitet wird, werden drei +% Hilfsmakros benötigt. +% \begin{macrocode} +%<*body> +\newcommand*{\@DefineTOCEntryNumberOption}[2]{% + \kernel@ifnextchar [%] + {\@DefineTOCEntryNumberOptionWithDefault{#1}{#2}} + {\@DefineTOCEntryNumberOptionWithoutDefault{#1}{#2}}% +} +\newcommand*{\@DefineTOCEntryNumberOptionWithoutDefault}[5]{% + \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4}{#2}{#5}% + \@DefineTOCEntryOption{#1}{#2}{% + \@DefineTOCEntryNumberOptionMacro{#2}{#3}{#4}{##1}% + }% +} +\newcommand*{\@DefineTOCEntryNumberOptionWithDefault}{} +\def\@DefineTOCEntryNumberOptionWithDefault#1#2[#3]#4#5#6{% + \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5}{#2}{#6}% + \@DefineTOCEntryOption{#1}{#2}[{#3}]{% + \@DefineTOCEntryNumberOptionMacro{#2}{#4}{#5}{##1}% + }% +} +\newcommand*{\@DefineTOCEntryNumberOptionMacro}[4]{% + \protected@edef\reserved@a{% + \noexpand\FamilySetCounterMacro{KOMAarg}{#1}{% + \expandafter\noexpand\csname #2\scr@dte@current#3\endcsname + }{#4}% + }\reserved@a +} +%</body> +% \end{macrocode} +% \end{macro}^^A \@DefineTOCEntryNumberOptionMacro +% \end{macro}^^A \@DefineTOCEntryNumberOptionWithDefault +% \end{macro}^^A \@DefineTOCEntryNumberOptionWithoutDefault +% \end{macro}^^A \@DefineTOCEntryNumberOption +% +% \begin{macro}{\@DefineTOCEntryBooleanOption} +% \changes{v3.20}{2015/12/04}{neu (intern)} +% Verwendet \cs{DefineTOCEntryOption}, um eine Option zu definieren, die einen +% Schalter definiert. Es gibt folgende Parameter: +% \begin{description} +% \item[\marg{Stil}: \meta{String},] Name des Eintragsstils +% \item[\marg{Option}: \meta{String},] Name der Option +% \item[\oarg{Wert}:] der Säumniswert der Option +% \item[\marg{Prefix}: \meta{String},] Präfix des zu definierenden Makros +% \item[\marg{Postfix}: \meta{String},] Postfix des zu definierenden Makros +% \item[\marg{Erklärung}: \meta{String},] Erklärung der Option +% \item[\oarg{Init}: \meta{Code},] Initialisierung der Option +% \end{description} +% Zwischen Prefix und Postfix wird bei der späteren, tatsächlichen Definition +% automatisch \cs{scr@dte@current} eingefügt. +% \begin{macro}{\@DefineTOCEntryBoolOptionWithoutDefault} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% \begin{macro}{\@DefineTOCEntryBoolOptionWithDefault} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% \begin{macro}{\@DefineTOCEntryBoolOptionMacro} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% Da mit einem optionalen Argument an Position 3 gearbeitet wird, werden drei +% Hilfsmakros benötigt. +% \begin{macrocode} +%<*body> +\newcommand*{\@DefineTOCEntryBooleanOption}[2]{% + \kernel@ifnextchar [%] + {\@DefineTOCEntryBoolOptionWithDefault{#1}{#2}} + {\@DefineTOCEntryBoolOptionWithoutDefault{#1}{#2}}% +} +\newcommand*{\@DefineTOCEntryBoolOptionWithoutDefault}[5]{% + \@TOCEntryStyleNeedsCommandByOption{#1}{if#3}{#4}{#2}{#5}% + \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4false}{#2}{#5}% + \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4false}{#2}{#5}% + \@DefineTOCEntryOption{#1}{#2}[true]{% + \@DefineTOCEntryBoolOptionMacro{#2}{#3}{#4}{##1}% + }% +} +\newcommand*{\@DefineTOCEntryBoolOptionWithDefault}{} +\def\@DefineTOCEntryBoolOptionWithDefault#1#2[#3]#4#5#6{% + \@TOCEntryStyleNeedsCommandByOption{#1}{if#4}{#5}{#2}{#6}% + \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5true}{#2}{#6}% + \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5false}{#2}{#6}% + \@DefineTOCEntryOption{#1}{#2}[{#3}]{% + \@DefineTOCEntryBoolOptionMacro{#2}{#4}{#5}{##1}% + }% +} +\newcommand*{\@DefineTOCEntryBoolOptionMacro}[4]{% + \@ifundefined{if#2\scr@dte@current#3}{% + \expandafter\newif\csname if#2\scr@dte@current#3\endcsname + }{}% + \FamilySetBool{KOMAarg}{#1}{#2\scr@dte@current#3}{#4}% +} +%</body> +% \end{macrocode} +% \end{macro}^^A \@DefineTOCEntryBoolOptionMacro +% \end{macro}^^A \@DefineTOCEntryBoolOptionWithDefault +% \end{macro}^^A \@DefineTOCEntryBoolOptionWithoutDefault +% \end{macro}^^A \@DefineTOCEntryBooleanOption +% +% \begin{macro}{\@DefineTOCEntryIfOption} +% \changes{v3.20}{2015/12/06}{neu (intern)} +% Verwendet \cs{DefineTOCEntryOption}, um eine Option zu definieren, die eine +% If-Anweisung definiert. Die Option selbst ist dabei eine Schalter-Option. Es +% gibt folgende Parameter: +% \begin{description} +% \item[\marg{Stil}: \meta{String},] Name des Eintragsstils +% \item[\marg{Option}: \meta{String},] Name der Option +% \item[\oarg{Wert}:] der Säumniswert der Option +% \item[\marg{Prefix}: \meta{String},] Präfix des zu definierenden Makros +% \item[\marg{Postfix}: \meta{String},] Postfix des zu definierenden Makros +% \item[\marg{Erklärung}: \meta{String},] Erklärung der Option +% \end{description} +% Zwischen Prefix und Postfix wird bei der späteren, tatsächlichen Definition +% automatisch \cs{scr@dte@current} eingefügt. +% \begin{macro}{\@DefineTOCEntryIfOptionWithoutDefault} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% \begin{macro}{\@DefineTOCEntryIfOptionWithDefault} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% \begin{macro}{\@DefineTOCEntryIfOptionMacro} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% Da mit einem optionalen Argument an Position 3 gearbeitet wird, werden drei +% Hilfsmakros benötigt. +% \begin{macrocode} +%<*body> +\newcommand*{\@DefineTOCEntryIfOption}[2]{% + \kernel@ifnextchar [%] + {\@DefineTOCEntryIfOptionWithDefault{#1}{#2}} + {\@DefineTOCEntryIfOptionWithoutDefault{#1}{#2}}% +} +\newcommand*{\@DefineTOCEntryIfOptionWithoutDefault}[5]{% + \@TOCEntryStyleNeedsCommandByOption{#1}{If#3}{#4}{#2}{#5}% + \@DefineTOCEntryOption{#1}{#2}[true]{% + \@DefineTOCEntryIfOptionMacro{#2}{#3}{#4}{##1}% + }% +} +\newcommand*{\@DefineTOCEntryIfOptionWithDefault}{} +\def\@DefineTOCEntryIfOptionWithDefault#1#2[#3]#4#5#6{% + \@TOCEntryStyleNeedsCommandByOption{#1}{If#4}{#5}{#2}{#6}% + \@DefineTOCEntryOption{#1}{#2}[{#3}]{% + \@DefineTOCEntryIfOptionMacro{#2}{#4}{#5}{##1}% + }% +} +\newcommand*{\@DefineTOCEntryIfOptionMacro}[4]{% + \FamilySetBool{KOMAarg}{#1}{@tempswa}{#4}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \if@tempswa + \expandafter\let\csname If#2\scr@dte@current#3\endcsname\@firstoftwo + \else + \expandafter\let\csname If#2\scr@dte@current#3\endcsname\@secondoftwo + \fi + \fi +} +%</body> +% \end{macrocode} +% \end{macro}^^A \@DefineTOCEntryIfOptionMacro +% \end{macro}^^A \@DefineTOCEntryIfOptionWithDefault +% \end{macro}^^A \@DefineTOCEntryIfOptionWithoutDefault +% \end{macro}^^A \@DefineTOCEntryIfOption +% +% \begin{macro}{\@DefineTOCEntryCommandOption} +% \changes{v3.20}{2015/11/17}{neu} +% Verwendet \cs{DefineTOCEntryOption}, um eine Option zu definieren, die ein +% Macro definiert. Es gibt folgende Parameter: +% \begin{description} +% \item[\marg{Stil}: \meta{String},] Name des Eintragsstils +% \item[\marg{Option}: \meta{String},] Name der Option +% \item[\oarg{Wert}:] der Säumniswert der Option +% \item[\marg{Prefix}: \meta{String},] Präfix des zu definierenden Makros +% \item[\marg{Postfix}: \meta{String},] Postfix des zu definierenden Makros +% \item[\oarg{Argumentzahl}: \meta{Nummer},] Anzahl der Argumente des Makros +% \item[\marg{Erklärung}: \meta{String},] Erklärung der Option +% \item[\oarg{Init}: \meta{Code},] Initialisierung der Option +% \end{description} +% Zwischen Prefix und Postfix wird bei der späteren, tatsächlichen Definition +% automatisch \cs{scr@dte@current} eingefügt. +% \begin{macro}{\@DefineTOCEntryCommandOptionWithoutDefault} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% \begin{macro}{\@@DefineTOCEntryCommandOptionWithoutDefault} +% \changes{v3.20}{2015/11/26}{neu (intern)} +% \begin{macro}{\@DefineTOCEntryCommandOptionWithDefault} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% \begin{macro}{\@@DefineTOCEntryCommandOptionWithDefault} +% \changes{v3.20}{2015/11/26}{neu (intern)} +% \begin{macro}{\@DefineTOCEntryCommandOptionMacro} +% \changes{v3.20}{2015/11/12}{neu (intern)} +% \begin{macro}{\@@DefineTOCEntryCommandOptionMacro} +% \changes{v3.20}{2015/11/26}{neu (intern)} +% Da mit einem optionalen Argument an Position 3 gearbeitet wird, werden drei +% Hilfsmakros benötigt. +% \begin{macrocode} +%<*body> +\newcommand*{\@DefineTOCEntryCommandOption}[2]{% + \kernel@ifnextchar [%] + {\@DefineTOCEntryCommandOptionWithDefault{#1}{#2}} + {\@DefineTOCEntryCommandOptionWithoutDefault{#1}{#2}}% +} +\newcommand*{\@DefineTOCEntryCommandOptionWithoutDefault}[4]{% + \@testopt{\@@DefineTOCEntryCommandOptionWithoutDefault{#1}{#2}{#3}{#4}}0% +} +\newcommand*{\@@DefineTOCEntryCommandOptionWithoutDefault}{}% +\def\@@DefineTOCEntryCommandOptionWithoutDefault#1#2#3#4[#5]#6{% + \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4}{#2}{#6}% + \ifcase #5 + \@DefineTOCEntryOption{#1}{#2}{% + \@DefineTOCEntryCommandOptionMacro{#2}{#3}{#4}[#5]{##1}% + }% + \or + \@DefineTOCEntryOption{#1}{#2}{% + \@DefineTOCEntryCommandOptionMacro{#2}{#3}{#4}[#5]{##1{####1}}% + }% + \else +%<class> \ClassError{\KOMAClassName +%<package> \PackageError{tocbasic% + }{only one argument supported}{% + \string\DefineTOCEntryCommandOption\space currently supports only + commands with\MessageBreak + at most one argument not #5}% + \fi +} +\newcommand*{\@DefineTOCEntryCommandOptionWithDefault}{} +\def\@DefineTOCEntryCommandOptionWithDefault#1#2[#3]#4#5{% + \@testopt{\@@DefineTOCEntryCommandOptionWithDefault{#1}{#2}{#3}{#4}{#5}}0% +} +\def\@@DefineTOCEntryCommandOptionWithDefault#1#2#3#4#5[#6]#7{% + \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5}{#2}{#7}% + \ifcase #6 + \@DefineTOCEntryOption{#1}{#2}[{#3}]{% + \@DefineTOCEntryCommandOptionMacro{#2}{#4}{#5}[#6]{##1}% + }% + \or + \@DefineTOCEntryOption{#1}{#2}[{#3}]{% + \@DefineTOCEntryCommandOptionMacro{#2}{#4}{#5}[#6]{##1{####1}}% + }% + \or + \@DefineTOCEntryOption{#1}{#2}[{#3}]{% + \@DefineTOCEntryCommandOptionMacro{#2}{#4}{#5}[#6]{##1{####1}{####2}}% + }% + \else +%<class> \ClassError{\KOMAClassName +%<package> \PackageError{tocbasic% + }{only one argument supported}{% + \string\DefineTOCEntryCommandOption\space currently supports only + commands with\MessageBreak + at most two argument not #6}% + \fi +} +\newcommand*{\@DefineTOCEntryCommandOptionMacro}[3]{% + \@testopt{\@@DefineTOCEntryCommandOptionMacro{#1}{#2}{#3}}0% +} +\newcommand*{\@@DefineTOCEntryCommandOptionMacro}{} +\long\def\@@DefineTOCEntryCommandOptionMacro#1#2#3[#4]#5{% + \let\l@ngrel@x\long + \expandafter\@yargdef\csname #2\scr@dte@current#3\endcsname\@ne{#4}{#5}% + \FamilyKeyStateProcessed +} +%</body> +% \end{macrocode} +% \end{macro}^^A \@@DefineTOCEntryCommandOptionMacro +% \end{macro}^^A \@DefineTOCEntryCommandOptionMacro +% \end{macro}^^A \@@DefineTOCEntryCommandOptionWithDefault +% \end{macro}^^A \@DefineTOCEntryCommandOptionWithDefault +% \end{macro}^^A \@@DefineTOCEntryCommandOptionWithoutDefault +% \end{macro}^^A \@DefineTOCEntryCommandOptionWithoutDefault +% \end{macro}^^A \@DefineTOCEntryCommandOption +% +% \begin{macro}{\@AddToDeclareTOCStyleEntryPreCheckNeeds} +% \changes{v3.20}{2015/12/06}{neu (intern)} +% \begin{macro}{\@PreToDeclareTOCStyleEntryPreCheckNeeds} +% \changes{v3.20}{2015/12/06}{neu (intern)} +% Noch bevor die benötigten Befehle getestet werden, wird in +% \cs{DeclareTOCStyleEntry} ein Hook ausgeführt. Für das Hinzufügen von Code +% zu diesem Hook gibt es folgende Parameter: +% \begin{description} +% \item[\marg{Code}: \meta{Code},] Code, der ausgeführt werden soll. +% \end{description} +% Bitte beachten, dass diese Anweisung im Init-Code von Stilen verwendet wird, +% also innerhalb von \cs{DeclareTOCEntryStyle}, während der Hook innerhalb +% von \cs{DeclareTOCStyleEntry} ausgeführt wird. Der Code des Hooks hat ein +% Argument: Den Namen der Gliederungsebene. +% \begin{macrocode} +%<*body> +\newcommand{\@AddToDeclareTOCEntryStylePreCheckNeeds}[1]{% + \expandafter\providecommand\csname scr@dte@precheck\endcsname[1]{}% + \expandafter\l@addto@macro@a\csname scr@dte@precheck\endcsname +} +\newcommand{\@PreToDeclareTOCEntryStylePreCheckNeeds}[1]{% + \expandafter\providecommand\csname scr@dte@precheck\endcsname[1]{}% + \expandafter\l@preto@macro@a\csname scr@dte@precheck\endcsname +} +%</body> +% \end{macrocode} +% \end{macro}^^A \@PreToDeclareTOCStyleEntryPreCheckNeeds +% \end{macro}^^A \@AddToDeclareTOCStyleEntryPreCheckNeeds +% +% \begin{macro}{\@TOCEntryStyleNeedsCommandByOption} +% \changes{v3.20}{2015/12/04}{neu (intern)} +% Fügt einen oder mehrere Befehle der Liste der benötigten Befehle hinzu. +% \begin{description} +% \item[\marg{Stil}:] Der Stil \meta{string}, der die Befehle benötigt. +% \item[\marg{Präfix}:] Präfix \meta{string} des benötigten Befehls. +% \item[\marg{Postfix}:] Postfix \meta{string} des benötigten Befehls. +% \item[\marg{Option}:] Die Option \meta{string}, über die dieser Befehl +% definiert wird. +% \item[\marg{Erklärung}:] Bedeutung \meta{string} des Befehls. +% \end{description} +% Zwischen Präfix und Postfix wird dann automatisch der Name der +% Gliederungsebene eingefügt. +% \begin{macrocode} +%<*body> +\newcommand*{\@TOCEntryStyleNeedsCommandByOption}[5]{% + \expandafter\providecommand\expandafter*\csname scr@dte@#1@needs\endcsname{}% + \expandafter\l@addto@macro\csname scr@dte@#1@needs\endcsname{% + \do{#2}{#3}{#4}{#5}% + }% +} +%</body> +% \end{macrocode} +% \end{macro}^^A \@TOCEntryStyleNeedsCommandByOption +% +% \begin{macro}{\TOCEntryStyleInitCode} +% \changes{v3.20}{2015/11/19}{neu} +% \begin{macro}{\TOCEntryStyleStartInitCode} +% \changes{v3.20}{2015/11/25}{neu} +% Führt Befehle aus, bevor ein Verzeichnisbefehl in diesem Stil definiert wird +% und noch bevor die \emph{needs}-Liste abgearbeitet wird. +% Argumente sind: +% \begin{description} +% \item[\marg{Stil}:] Der Stil \meta{string} für den die Initialisierung +% erfolgen soll. +% \item[\marg{Code}:] Wird zwecks Initialisierung ausgeführt. Innerhalb dieses +% Codes ist \texttt{\#1} der Name der Verzeichnisebene. +% \end{description} +% \begin{macrocode} +%<*body> +\newcommand{\TOCEntryStyleInitCode}[1]{% + \scr@ifundefinedorrelax{scr@dte@#1@init}{% + \expandafter\providecommand\expandafter*% + \csname scr@dte@#1@init\endcsname[1]% + }{% + \expandafter\l@addto@macro@a\csname scr@dte@#1@init\endcsname + }% +} +\newcommand{\TOCEntryStyleStartInitCode}[1]{% + \scr@ifundefinedorrelax{scr@dte@#1@init}{% + \expandafter\providecommand\expandafter*% + \csname scr@dte@#1@init\endcsname[1]% + }{% + \expandafter\l@preto@macro@a\csname scr@dte@#1@init\endcsname + }% +} +% \end{macrocode} +% \end{macro}^^A \TOCEntryStyleStartInitCode +% \end{macro}^^A \TOCEntryStyleInitCode +% \begin{macro}{\@ExecuteTOCEntryStyleInitCode} +% \changes{v3.20}{2015/12/04}{neu (intern)} +% Führt den Init-Code eines Stils aus. Das erste Argument ist der Name des +% Stils, das zweite der Name der Verzeichnisebene. Diesen erhält die +% Init-Anweisung außerdem als Argument. +% \begin{macrocode} +\newcommand*{\@ExecuteTOCEntryStyleInitCode}[2]{% + \let\scr@dte@doopts\@empty + \scr@ifundefinedorrelax{scr@dte@#1@init}{}{% + \def\DefineTOCEntryBooleanOption{\@DefineTOCEntryBooleanOption{#1}}% + \def\DefineTOCEntryCommandOption{\@DefineTOCEntryCommandOption{#1}}% + \def\DefineTOCEntryIfOption{\@DefineTOCEntryIfOption{#1}}% + \def\DefineTOCEntryLengthOption{\@DefineTOCEntryLengthOption{#1}}% + \def\DefineTOCEntryNumberOption{\@DefineTOCEntryNumberOption{#1}}% + \def\DefineTOCEntryOption{\@DefineTOCEntryOption{#1}}% + \def\AddToDeclareTOCEntryStylePreCheckNeeds{% + \@AddToDeclareTOCEntryStylePreCheckNeeds{#1}}% + \def\PreToDeclareTOCEntryStylePreCheckNeeds{% + \@PreToDeclareTOCEntryStylePreCheckNeeds{#1}}% + \def\TOCEntryStyleNeedsCommandByOption{% + \@TOCEntryStyleNeedsCommandByOption{#1}}% + \@nameuse{scr@dte@#1@init}{#2}% + \let\TOCEntryStyleNeedsCommandByOption\relax + \let\PreToDeclareTOCEntryStylePreCheckNeeds\relax + \let\AddToDeclareTOCEntryStylePreCheckNeeds\relax + \let\DefineTOCEntryOption\relax + \let\DefineTOCEntryNumberOption\relax + \let\DefineTOCEntryLengthOption\relax + \let\DefineTOCEntryIfOption\relax + \let\DefineTOCEntryCommandOption\relax + \let\DefineTOCEntryBooleanOption\relax + }% +} +%</body> +% \end{macrocode} +% \end{macro}^^A \ExecuteTOCEntryStyleInitCode +% +% \begin{macro}{\DeclareTOCStyleEntry} +% \changes{v3.20}{2015/11/13}{neu} +% Diese Anweisung definiert einen Verzeichniseintragsbefehl. Dabei wird auch +% geprüft, ob all benötigten Befehle definiert sind. Falls das nicht der Fall +% ist, wird der Verzeichniseintragsbefehl nicht definiert, sondern ein Fehler +% gemeldet. Für die Definition werden folgende Argumente verwendet. +% \begin{description} +% \item[\oarg{Optionen}:] Komma separierte Liste von Optionen für die +% Definition des Eintrags. +% \item[\marg{Stil}:] Der Stil \meta{string}, in dem der Verzeichniseintrag +% sein soll. +% \item[\marg{Gliederungsebene}:] Der Name \meta{string} der Gliederungsebene +% für die ein Verzeichniseintrag definiert werden soll. +% \end{description} +% Es wird außerdem eine Anweisung \cs{scr@dte@def@l@\meta{Stil}} benötigt, +% über die dann die eigentliche Definition der Eintragsanweisung +% erfolgt. Diese hat genau ein Argument: \meta{Gliederungsebene}. +% \begin{macrocode} +%<*body> +\newcommand*{\DeclareTOCStyleEntry}[3][]{% + \scr@ifundefinedorrelax{scr@dte@def@l@#2}{% +%<class> \ClassError{\KOMAClassName +%<package> \PackageError{tocbasic% + }{toc entry style `#2' undefined}{% + Somebody told me to define toc entry `#3' with style `#2',\MessageBreak + but I do not know style `#2'.\MessageBreak + You should first define the style then define the entry.\MessageBreak + If you'll continue, I'll ignore the command. This could result + in\MessageBreak + further error messages.% + }% + }{% + \let\scr@dte@precheck\@gobble + \def\scr@dte@current{#3}% + \@ExecuteTOCEntryStyleInitCode{#2}{#3}% + \IfArgIsEmpty{#1}{}{% + \FamilyBoolKey[.dte]{KOMAarg}{expandtopt}{scr@dte@expandtopt}% + \scr@dte@expandtoptfalse + \FamilyExecuteOptions[.dte]{KOMAarg}{#1}% + \RelaxFamilyKey[.dte]{KOMAarg}{expandtopt}% + }% + \@RelaxTOCEntryOptions + \let\scr@dte@doopts\relax + \let\scr@dte@current\relax + \scr@ifundefinedorrelax{#3tocdepth}{% + \expandafter\let\csname #3tocdepth\expandafter\endcsname + \csname #3numdepth\endcsname + }{}% + \scr@dte@precheck{#3}% + \let\scr@dte@precheck\relax + \begingroup + \aftergroup\@tempswatrue + \def\do##1##2##3##4{% + \scr@ifundefinedorrelax{##1#3##2}{% +%<class> \ClassError{\KOMAClassName +%<package> \PackageError{tocbasic% + }{toc style `#2' needs ##4}{% + Usually the ##4 is defined using option `##3'.\MessageBreak + In some cases it may be set defining command + `\expandafter\string\csname ##1#3##2\endcsname'.\MessageBreak + If you'll continue, I'll ignore the command. This could result + in\MessageBreak + further error messages.% + }% + \aftergroup\@tempswafalse + }{}% + }% + \do{}{tocdepth}{level}{toc style level}% + \@nameuse{scr@dte@#2@needs}% + \endgroup + \if@tempswa + \@nameuse{scr@dte@def@l@#2}{#3}% + \expandafter\edef\csname scr@dte@#3@style\endcsname{#2}% + \fi + }% +} +%</body> +% \end{macrocode} +% \end{macro}^^A \DeclareTOCStyleEntry +% +% \begin{macro}{\DeclareTOCEntryStyle} +% \changes{v3.20}{2015/11/17}{neu} +% \begin{macro}{\@DeclareTOCEntryStyle} +% \changes{v3.20}{2015/11/17}{neu (intern)} +% Über diese Anweisung wir ein neuer Stil für TOC-Einträge definiert. Ein Stil +% besteht aus: +% \begin{description} +% \item[\marg{Stil}:] Der Stil \meta{string}, der definiert werden soll. +% \item[\oarg{Initialisierungscode}:] Dieser Code wird bei der Definition +% eines Verzeichnisbefehls ausgeführt und enthält beispielsweise +% Optionendeklarationen. Es ist zu beachten, dass dieser Code ggf. auch +% mehrfach ausgeführt werden kann! +% \item[\marg{Code}:] Der Code, der ausgeführt wird, wenn ein +% Verzeichniseintrag ausgegeben werden soll. +% \end{description} +% Unabhängig davon, ob eine \meta{Optionendeklaration} angegeben ist oder +% nicht, wird immer eine Option \texttt{level} definiert, über die die +% Verzeichnisebene einen nummerischen Wert erhält. +% \begin{macrocode} +%<*body> +\newcommand*{\DeclareTOCEntryStyle}[1]{% + \kernel@ifnextchar [%] + {\@DeclareTOCEntryStyle{#1}}% + {\@DeclareTOCEntryStyle{#1}[]}% +} +\newcommand{\@DeclareTOCEntryStyle}{} +\long\def\@DeclareTOCEntryStyle#1[#2]#3{% + \@namedef{scr@dte@def@l@#1}##1{% + \@namedef{l@##1}####1####2{% + \TOC@EntryStartHook{##1}% + #3% + \TOC@EntryEndHook{##1}% + }% + }% + \TOCEntryStyleInitCode{#1}{% + \DefineTOCEntryNumberOption{level}{}{tocdepth}{toc entry level}% + #2% + }% +} +%</body> +% \end{macrocode} +% \end{macro}^^A \@DeclareTOCEntryStyle +% \end{macro}^^A \DeclareTOCEntryStyle +% +% \begin{macro}{\TOC@EntryStartHook} +% \changes{v3.20}{2016/01/12}{neu (intern)} +% Bei jedem Eintrag, der über einen Eintragsstil von \KOMAScript{} definiert +% ist, kann vor dem jeweiligen Eintrag über einen Haken eine Reihe +% von Anweisungen ausgeführt werden. Innerhalb dieser Anweisungen ist +% \texttt{\#1} der Name der Gliederungsebene. In der Regel dürfen diese +% Anweisungen keinerlei Ausgaben tätigen und weder \cs{lastpenalty} noch +% \cs{lastskip} verändern. Der Anwender ist dafür selbst verantwortlich! Weil +% diese Einschränkung jedoch etwas kritisch ist und der Aufruf ohnehin ein +% \cs{makeatletter} benötigt, wird nur der Haken definiert aber keine +% Anweisung, um diesen zu ändern oder zu erweitern. +% \begin{macrocode} +%<*body> +\newcommand*{\TOC@EntryStartHook}[1]{} +%</body> +% \end{macrocode} +% \end{macro}^^A \TOC@EntryStartHook +% +% \begin{macro}{\TOC@EntryEndHook} +% \changes{v3.20}{2016/01/12}{neu (intern)} +% Bei jedem Eintrag, der über einen Eintragsstil von \KOMAScript{} definiert +% ist, kann nach dem jeweiligen Eintrag über einen Haken eine Reihe +% von Anweisungen ausgeführt werden. Innerhalb dieser Anweisungen ist +% \texttt{\#1} der Name der Gliederungsebene. In der Regel dürfen diese +% Anweisungen keinerlei Ausgaben tätigen und weder \cs{lastpenalty} noch +% \cs{lastskip} verändern. Der Anwender ist dafür selbst verantwortlich! Weil +% diese Einschränkung jedoch etwas kritisch ist und der Aufruf ohnehin ein +% \cs{makeatletter} benötigt, wird nur der Haken definiert aber keine +% Anweisung, um diesen zu ändern oder zu erweitern. +% \begin{macrocode} +%<*body> +\newcommand*{\TOC@EntryEndHook}[1]{} +%</body> +% \end{macrocode} +% \end{macro}^^A \TOC@EntryEndHook +% +% \begin{macro}{\CloneTOCEntryStyle} +% \changes{v3.20}{2015/11/25}{neu} +% Diese Anweisung dupliziert einen Stil samt seiner Optionen und +% Befehle. Anschließend kann man ihn beispielsweise verändern. Das erste +% Argument ist der Name des ursprünglichen Stils, das zweite der neue Name. +% \begin{macrocode} +%<*body> +\newcommand*{\CloneTOCEntryStyle}[2]{% +% \end{macrocode} +% Als erstes wird die Anweisung kopiert, mit der die \cs{l@\dots}-Anweisungen +% definiert werden. +% \begin{macrocode} + \expandafter\let\csname scr@dte@def@l@#2\expandafter\endcsname + \csname scr@dte@def@l@#1\endcsname +% \end{macrocode} +% Der Init-Code wird kopiert. +% \begin{macrocode} + \expandafter\let\csname scr@dte@#2@init\expandafter\endcsname + \csname scr@dte@#1@init\endcsname +} +%</body> +% \end{macrocode} +% \end{macro} +% +% +% \subsection{Vorgefertigte Verzeichniseintragsstile} +% +% Hier wird quasi an Beispielen gezeigt, wie man Verzeichniseintragsstile +% definieren kann. Einige dieser Stile sind sehr grundlegend. Andere sind +% stellen Erweiterungen der grundlegenden Stile dar. Die Stile können über +% mehrere \texttt{docstrip}-Durchgänge einzeln in den Quelltext gelangen. +% +% \iffalse +%<*style> +% \fi +% +% \begin{macro}{\scr@dte@def@l@gobble} +% \changes{v3.20}{2015/11/20}{neuer Verzeichniseintragsstil +% \texttt{gobble}}^^A +% Der aller einfachste Verzeichniseintragsstil ist \texttt{gobble}. Er nimmt +% die beiden Argumente für den Verzeichniseintrag und die Seitenzahl und +% vergisst sie unabhängig von der Ebene des Eintrags einfach. Daher benötigt +% dieser Stil auch keinerlei Optionen oder Initialisierung. +% \begin{macrocode} +%<*gobble> +%%% (run: style,gobble) +\DeclareTOCEntryStyle{gobble}{}% +%</gobble> +% \end{macrocode} +% \end{macro}^^A \scr@dte@def@l@gobble +% +% \begin{macro}{\scr@dte@def@l@dottedtocline} +% \changes{v3.20}{2015/11/20}{neuer Verzeichniseintragsstil +% \texttt{dottedtocline}}^^A +% Der einfachste echte Verzeichniseintragsstil ist +% \texttt{dottedtocline}. Dieser verwendet einfach nur die +% \LaTeX-Kern-Anweisung \cs{dottedtocline}. Für \KOMAScript{} selbst sollte +% man dieses Stil nicht verwenden. Man kann ihn aber beispielsweise mit den +% Standardklassen verwenden, wenn man kompatibel bleiben will. Dieser benötigt +% jedoch bereits Angaben bezüglich der Nummernbreite und des +% Eintragseinzugs. Der ohnehin immer definierte Level wird ebenfalls +% ausgewertet. +% \begin{macro}{\scr@dte@def@l@undottedtocline} +% \changes{v3.20}{2015/11/20}{neuer Verzeichniseintragsstil +% \texttt{undottedtocline}}^^A +% Im Unterschied dazu entspricht der Verzeichniseintragsstil +% \texttt{undottedtocline} dem der \texttt{chapter}-Ebene der +% Standardklassen. Im Unterschied zu diesen wird jedoch ein Eintragseinzug +% unterstützt. +% \begin{macro}{\scr@dte@def@l@largetocline} +% \changes{v3.20}{2015/11/20}{neuer Verzeichniseintragsstil +% \texttt{largetocline}}^^A +% Im Unterschied dazu entspricht der Verzeichniseintragsstil +% \texttt{largetocline} dem der \texttt{part}-Ebene der Standardklassen. Im +% Unterschied zu diesen wird jedoch ein Eintragseinzug unterstützt. Eine +% Nummernbreite gibt es hingegen nicht. Stattdessen werden die Einträge nicht +% hängend gesetzt. +% \begin{macro}{\scr@dte@def@l@tocline} +% \changes{v3.20}{2015/11/22}{neuer Verzeichniseintragsstil +% \texttt{tocline}}^^A +% Das hingegen wird der hochflexible Stil für Verzeichniseinträge, die aus +% einer oder mehreren Zeilen bestehen. Dieser wird später über diverse +% Hilfsmakros definiert. +% \begin{macrocode} +%<*dottedtocline|undottedtocline|largetocline|tocline> +%<*dottedtocline> +%%% (run: style,dottedtocline) +\DeclareTOCEntryStyle{dottedtocline}[{% +%</dottedtocline> +%<*undottedtocline> +%%% (run: style,undottedtocline) +\DeclareTOCEntryStyle{undottedtocline}[{% +%</undottedtocline> +%<*largetocline> +%%% (run: style, largetocline) +\DeclareTOCEntryStyle{largetocline}[{% +%</largetocline> +%<*tocline> +%%% (run: style,tocline) +\DeclareTOCEntryStyle{tocline}[{% + \DefineTOCEntryIfOption{raggedpagenumber}% + {scr@tso@}{@raggedpage}{page number ragged flag}% + \DefineTOCEntryIfOption{breakafternumber}% + {scr@tso@}{@breakafternumber}{line break after number flag}% + \DefineTOCEntryIfOption{dynnumwidth}% + {scr@tso@}{@dynnumwidth}{dynamic number width flag}% + \DefineTOCEntryCommandOption{onstarthigherlevel}% + {scr@tso@}{@LastTOCLevelWasLower}{start higher level entry hook}% + \DefineTOCEntryCommandOption{onstartsamelevel}% + {scr@tso@}{@LastTOCLevelWasSame}{start same level entry hook}% + \DefineTOCEntryCommandOption{onstartlowerlevel}% + {scr@tso@}{@LastTOCLevelWasHigher}{start lower level entry hook}% + \DefineTOCEntryCommandOption{entryformat}% + {scr@tso@}{@entryformat}[1]{entry format}% + \DefineTOCEntryCommandOption{entrynumberformat}% + {scr@tso@}{@numberformat}[1]{entry number format}% + \DefineTOCEntryCommandOption{pagenumberformat}% + {scr@tso@}{@pagenumberformat}[1]{page number format}% + \DefineTOCEntryCommandOption{pagenumberbox}% + {scr@tso@}{@pagenumberbox}[1]{page number box}% + \DefineTOCEntryCommandOption{linefill}[\TOCLineLeaderFill]% + {scr@tso@}{@linefill}{filling between text and page number}% + \DefineTOCEntryLengthOption{beforeskip}% + {scr@tso@}{@beforeskip}{vertical skip before the entry}% + \DefineTOCEntryLengthOption{numsep}% + {scr@tso@}{@numsep}{entry number separation}% +%</tocline> + \DefineTOCEntryLengthOption{indent}% + {scr@tso@}{@indent}{entry indent}% +%<*dottedtocline|undottedtocline|tocline> + \DefineTOCEntryLengthOption{numwidth}% + {scr@tso@}{@numwidth}{entry number width}% +%</dottedtocline|undottedtocline|tocline> +% \end{macrocode} +% Die Ebene, \texttt{level} bzw. \cs{\dots tocdepth}, kann auf zweierlei Arten +% automatisch bestimmt werden. Zum einen wird für Sub-Ebenen die Elternebene +% um eins erhöht verwendet, falls die Elternebene bereits definiert ist. +% \begin{macrocode} +%<*tocline> + \scr@ifundefinedorrelax{#1tocdepth}{% + \ifstrstart{#1}{sub}{% + \scr@ifundefinedorrelax{\scr@dte@nosub{#1}tocdepth}{}{% + \expandafter\edef\csname #1tocdepth\endcsname{% + \numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax + }% + }% + }{}% + }{}% +%</tocline> +% \end{macrocode} +% War der Weg über Elternebenen nicht erfolgreich oder wurde er nicht +% verwendet, so werden Standardwerte angenommen, wie sie bei den +% Standardklassen und bei \KOMAScript{} zutreffen. +% \begin{macrocode} + \@ifundefined{#1tocdepth}{% + \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% +% \end{macrocode} +% Für unbekannte Anweisungen wird stattdessen eine eventuell vorhandene +% Gliederungsebene auch als Verzeichnisebene übernommen: +% \begin{macrocode} + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname #1numdepth\endcsname + }% + }% + }% + }% + }% + }% + }% + }% + }% + }{}% +% \end{macrocode} +% Der Einzug kann wie der Level aus der Elternebene gebildet werden +% \begin{macrocode} +%<*tocline> + \scr@ifundefinedorrelax{scr@tso@#1@indent}{% + \@ifundefined{scr@#1@tocindent}{% + \ifstrstart{#1}{sub}{% + \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@indent}{% + \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{% + \expandafter\edef\csname scr@tso@#1@indent\endcsname{% + \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@numwidth}% + \relax + }% + }% + }{% + \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{% + \expandafter\edef\csname scr@tso@#1@indent\endcsname{% + \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@indent}% + \relax + }% + }{% + \expandafter\edef\csname scr@tso@#1@indent\endcsname{% + \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@indent}% + +\noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@numwidth}% + \relax + }% + }% + }% + }{}% + }{% +% \end{macrocode} +% Kompatibilität mit älteren \KOMAScript-Klassen. +% \begin{macrocode} + \@namedef{scr@tso@#1@indent}{\@nameuse{scr@#1@tocindent}}% + }% + }{}% +%</tocline> +% \end{macrocode} +% War das nicht erfolgreich oder wird es nicht genutzt, so werden +% Standardwerte verwendet, die sowohl für die Standardklasse als auch die +% \KOMAScript-Klassen zutreffend sind. +% \begin{macrocode} + \@ifundefined{scr@tso@#1@indent}{% +%<*dottedtocline|undottedtocline|largetocline> + \@ifundefined{scr@#1@tocindent}{% +%</dottedtocline|undottedtocline|largetocline> + \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% +% \end{macrocode} +% Ab hier hängt es nun davon ab, ob es eine Kapitel-Ebene gibt oder +% nicht. Dazu sollte die Kapitelebene bereits definiert sein! +% \begin{macrocode} + \scr@ifundefinedorrelax{l@chapter}{% + \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{3.8em}% + }{% + \ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{7em}% + }{% + \ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{10em}% + }{% +% \end{macrocode} +% Für unbekannte Ebenen muss der Wert selbst per Option gesetzt werden! +% \begin{macrocode} + }% + }% + }% + }% + }% + }{% + \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{7.0em}% + }{% + \ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{10em}% + }{% + \ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{12em}% + }{% +% \end{macrocode} +% Für unbekannte Ebenen muss der Wert selbst per Option gesetzt werden! +% \begin{macrocode} + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% +%<*dottedtocline|undottedtocline|largetocline> + }{% +% \end{macrocode} +% Kompatibilität mit älteren \KOMAScript-Klassen. +% \begin{macrocode} + \@namedef{scr@tso@#1@indent}{\@nameuse{scr@#1@tocindent}}% + }% +%</dottedtocline|undottedtocline|largetocline> + }{}% +% \end{macrocode} +% Für die Nummernbreite gibt es ebenfalls beide Wege. +% \begin{macrocode} +%<*dottedtocline|undottedtocline|tocline> +%<*tocline> + \scr@ifundefinedorrelax{scr@tso@#1@numwidth}{% + \scr@ifundefinedorrelax{scr@#1@tocnumwidth}{% + \ifstrstart{#1}{sub}{% + \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{% + \expandafter\edef\csname scr@tso@#1@numwidth\endcsname{% + \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@numwidth}% + +.9em% + \relax + }% + }% + }{}% + }{% + \@namedef{scr@tso@#1@numwidth}{\@nameuse{scr@#1@tocnumwidth}}% + }% + }{}% +%</tocline> + \@ifundefined{scr@tso@#1@numwidth}{% +%<*dottedtocline|undottedtocline> + \@ifundefined{scr@#1@tocnumwidth}{% +%</dottedtocline|undottedtocline> + \ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% +% \end{macrocode} +% Ab hier hängt es nun davon ab, ob es eine Kapitel-Ebene gibt oder +% nicht. Dazu sollte die Kapitelebene bereits definiert sein! +% \begin{macrocode} + \scr@ifundefinedorrelax{chapter}{% + \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@numwidth}{3.2em}% + }{% + \ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@numwidth}{4.1em}% + }{% + \ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@numwidth}{5m}% + }{% +% \end{macrocode} +% Für unbekannte Ebenen muss der Wert selbst per Option gesetzt werden! +% \begin{macrocode} + }% + }% + }% + }% + }% + }{% + \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% + \ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@numwidth}{3.1em}% + }{% + \ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@numwidth}{5em}% + }{% + \ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@numwidth}{6em}% + }{% +% \end{macrocode} +% Für unbekannte Ebenen muss der Wert selbst per Option gesetzt werden! +% \begin{macrocode} + }% + }% + }% + }% + }% + }% + }% + }% + }% +%<*dottedtocline|undottedtocline> + }{% +% \end{macrocode} +% Kompatibilität mit älteren \KOMAScript-Klassen. +% \begin{macrocode} + \@namedef{scr@tso@#1@numwidth}{\@nameuse{scr@#1@tocnumwidth}}% + }% +%</dottedtocline|undottedtocline> + }{}% +%</dottedtocline|undottedtocline|tocline> +%<*tocline> +% \end{macrocode} +% Die Standardeinstellungen für die drei Penalty-Hooks sind einfach die +% Standardanweisungen dafür. Dabei ist das so definiert, dass Änderungen an +% den Standardanweisungen direkte Auswirkungen haben. +% \begin{macrocode} + \expandafter\providecommand% + \csname scr@tso@#1@LastTOCLevelWasLower\endcsname{\LastTOCLevelWasLower}% + \expandafter\providecommand% + \csname scr@tso@#1@LastTOCLevelWasSame\endcsname{\LastTOCLevelWasSame}% + \expandafter\providecommand% + \csname scr@tso@#1@LastTOCLevelWasHigher\endcsname{\LastTOCLevelWasHigher}% +% \end{macrocode} +% Die Voreinstellung für den vertikalen Abstand ist Null mit ein klein wenig +% Leim, um den Seitenumbruch zu optimieren. Das genügt bei einer normalen +% A4-Seite aber gerade mal für den Ausgleich einer Zeile. Bei den höheren +% Ebenen werden stattdessen die Voreinstellungen der Standardklassen +% verwendet. +% \begin{macrocode} + \@ifundefined{scr@tso@#1@beforeskip}{% + \ifstr{#1}{part}{% + \@namedef{scr@tso@#1@beforeskip}{\glueexpr 2.25em \@plus\p@\relax}% + }{% + \ifstr{#1}{chapter}{% + \@namedef{scr@tso@#1@beforeskip}{\glueexpr 1.0em \@plus\p@\relax}% + }{% + \ifstr{#1}{section}{% + \scr@ifundefinedorrelax{l@chapter}{% + \@namedef{scr@tso@#1@beforeskip}{\glueexpr 1.0em \@plus\p@\relax}% + }{}% + }{}% + }% + }% + \expandafter\providecommand\expandafter*% + \csname scr@tso@#1@beforeskip\endcsname{\glueexpr \z@ plus .2\p@\relax}% + }{}% +% \end{macrocode} +% Es ist gut zu wissen, wie breit die breiteste Nummer ist, damit wir +% ggf. prüfen können, ob entsprechende Bedingungen eingehalten werden. +% \begin{macrocode} + \@ifundefined{scr@dte@#1@maxnumwidth}{% + \expandafter\newlength\csname scr@dte@#1@maxnumwidth\endcsname + \setlength{\@nameuse{scr@dte@#1@maxnumwidth}}{\z@}% + }{}% + \providecommand*{\scr@dte@donumwidth}{}% + \g@addto@macro{\scr@dte@donumwidth}{\do{#1}}% +% \end{macrocode} +% Eine dieser Bedingungen ist, dass ein Mindestabstand zwischen Nummer und +% Text eingehalten wird. +% \begin{macrocode} + \expandafter\providecommand\expandafter*% + \csname scr@tso@#1@numsep\endcsname{.4em}% +% \end{macrocode} +% Jede Ebene kann ihre eigene Formatierungsanweisung für die Nummer haben. +% Jede Ebene kann auch ihre eigene Formatierungsanweisung für Nummer und Text +% haben. Für \texttt{part} wird hier die Voreinstellung der Standardklassen +% verwendet. +% \begin{macrocode} + \expandafter\providecommand% + \csname scr@tso@#1@numberformat\endcsname[1]{##1}% + \ifstr{#1}{part}{% + \expandafter\providecommand% + \csname scr@tso@#1@entryformat\endcsname[1]{\large\bfseries ##1}% + }{% + \ifstr{#1}{chapter}{% + \expandafter\providecommand% + \csname scr@tso@#1@entryformat\endcsname[1]{\bfseries ##1}% + }{% + \scr@ifundefinedorrelax{l@chapter}{% + \ifstr{#1}{section}{% + \expandafter\providecommand% + \csname scr@tso@#1@entryformat\endcsname[1]{\bfseries ##1}% + }{}% + }{}% + \expandafter\providecommand% + \csname scr@tso@#1@entryformat\endcsname[1]{##1}% + }% + }% +% \end{macrocode} +% Nach der Nummer kann wahlweise ein Zeilenumbruch erfolgen, wobei in diesem +% Fall der Text wieder auf Höhe der Nummer und nicht erst danach +% erfolgt. Gesteuert wird das über einen Schalter. In der Voreinstellung +% machen wird das nicht. +% \begin{macrocode} + \expandafter\providecommand + \csname Ifscr@tso@#1@breakafternumber\endcsname[2]{##2}% +% \end{macrocode} +% Die Verbindung zwischen Ende des Eintrags und den Seitenzahlen erfolgt +% normalerweise mit Pünktchen. Das wird auch genau die Voreinstellung für die +% Option werden. In der Voreinstellung wird mit \cs{hfill} gefüllt. +% \begin{macrocode} + \@ifundefined{scr@tso@#1@linefill}{% + \ifstr{#1}{part}{% + \@namedef{scr@tso@#1@linefill}{\hfill}% + }{% + \ifstr{#1}{chapter}{% + \@namedef{scr@tso@#1@linefill}{\hfill}% + }{% + \scr@ifundefinedorrelax{l@chapter}{% + \ifstr{#1}{section}{% + \@namedef{scr@tso@#1@linefill}{\hfill}% + }{} + }{} + \expandafter\providecommand% + \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% + }% + }% + }{}% +% \end{macrocode} +% Keine Verbindung bedeutet nicht automatisch, dass die Seitenzahlen nach vorn +% rutschen. Das passiert erst, wenn die sie flatternd gesetzt werden: +% \begin{macrocode} + \expandafter\providecommand\csname Ifscr@tso@#1@raggedpage\endcsname[2]{##2}% +% \end{macrocode} +% Auch die Seitenzahl kann speziell formatiert werden, wenn das gewünscht ist. +% \begin{macrocode} + \ifstr{#1}{part}{% + \expandafter\providecommand% + \csname scr@tso@#1@pagenumberformat\endcsname[1]{\large\bfseries ##1}% + }{% + \expandafter\providecommand% + \csname scr@tso@#1@pagenumberformat\endcsname[1]{% + \normalfont\normalcolor ##1}% + }% +% \end{macrocode} +% Wobei die Seitenzahl normaleweise in eine Box fester Breite gesetzt wird. +% \begin{macrocode} + \expandafter\providecommand% + \csname scr@tso@#1@pagenumberbox\endcsname[1]{% + \hb@xt@\@pnumwidth{\hfil ##1}}% + \expandafter\providecommand\csname Ifscr@tso@#1@dynnumwidth\endcsname[2]{##2}% +%</tocline> +}]{% +% \end{macrocode} +% Damit ist die Initialisierung abgeschlossen und wir kommen zur +% Eintragsanweisung selbst: +% \begin{macrocode} +%<*dottedtocline> + \@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}% + {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% +%</dottedtocline> +%<*undottedtocline|largetocline> + \ifnum \c@tocdepth >\numexpr \@nameuse{#1tocdepth}-\@ne\relax +% \end{macrocode} +% An dieser Stelle gibt es einen kleinen Unterschied zwischen der +% \texttt{chapter}-Ebene und der \texttt{section}-Ebene von +% \textsf{article}. Diesen machen wir hier an der nummerischen Ebene fest. +% \begin{macrocode} + \ifnum \@nameuse{#1tocdepth}<\@ne + \scr@ifundefinedorrelax{chapter}{% + \addpenalty\@secpenalty +%<undottedtocline> \addvspace{1.0em \@plus\p@}% +%<largetocline> \addvspace{2.25em \@plus\p@}% + }{% + \addpenalty{-\@highpenalty}% +%<undottedtocline> \vskip 1.0em \@plus\p@ +%<largetocline> \addvspace{2.25em \@plus\p@}% + }% + \else + \addpenalty\@secpenalty +%<undottedtocline> \addvspace{1.0em \@plus\p@}% +%<largetocline> \addvspace{2.25em \@plus\p@}% + \fi +%<undottedtocline> \setlength\@tempdima{\@nameuse{scr@tso@#1@numwidth}}% +%<largetocline> \setlength\@tempdima{3em}% + \begingroup +% \end{macrocode} +% Es sei darauf hingewiesen, dass hier eigentlich zweimal \cs{@tocrmarg} +% statt \cs{@pnumwidth} verwendet werden müsste. Allerdings habe ich +% beschlossen, diesen schon vor Jahren gemeldeten Fehler aus +% Kompatibilitätsgründen vorerst von den Standardklassen zu übernehmen. +% \begin{macrocode} + \parindent \z@ \rightskip \@pnumwidth + \parfillskip -\@pnumwidth +% \end{macrocode} +% Die Standardklassen fügen an dieser Stelle noch eine Gruppe ein, die dann +% leider vor dem abschließenden \cs{par} bereits beendet wird. Das führt +% natürlich zu falschen Zeilenabständen bei mehrzeiligen Einträgen. Ich habe +% lange überlegt, aber schließlich beschlossen, diesen Fehler nicht aus den +% Standardklassen zu übernehmen. Das war mir dann doch zu krass! Schlimmer +% noch, würde man den Fehler übernehmen, müsste man das Setzen von +% \cs{leftskip} abändern, weil natürlich auch das erst am Absatzende +% wirklich zur Geltung kommt. +% \begin{macrocode} + \leavevmode +%<largetocline> \large + \bfseries +% \end{macrocode} +% Es sei darauf hingewiesen, dass hier eigentlich auch bei +% \texttt{largetocline} \cs{@tempdima} mit berücksichtigt werden +% müsste. Das geht nur deshalb nicht, weil bei den Standardklassen \cs{part} +% kein \cs{numberline} verwendet. Deshalb werden mehrzeilige Einträge auch +% nicht korrekt eingerückt. Auch das habe ich aus Kompatibilitätsgründen +% beibehalten. +% \begin{macrocode} +%<undottedtocline> \advance\leftskip\@tempdima + \advance\leftskip\@nameuse{scr@tso@#1@indent}% +%<*undottedtocline> + \hskip -\dimexpr \leftskip-\@nameuse{scr@tso@#1@indent}\relax +%</undottedtocline> + ##1% +%<undottedtocline> \nobreak +% \end{macrocode} +% Hier schließlich ist \cs{@pnumwidth} aufgrund des vorherigen +% \cs{large} nicht mehr derselbe absolute Wert wie bei Einträgen ohne +% \cs{large}. Deshalb müsste eigentlich noch vor dem \cs{large} der Wert +% beispielsweise in eine Länge wie \cs{@tempdimb} übertragen und dann hier +% verwendet werden. Auch das habe ich aus Kompatibilitätsgründen übernommen. +% \begin{macrocode} + \hfil \nobreak\hb@xt@\@pnumwidth{\hss ##2}% + \par +%<undottedtocline> \penalty\@highpenalty +%<*largetocline> + \nobreak + \ifnum 0= + \scr@ifundefinedorrelax{chapter}{\if@compatibility 1\else 0\fi}{1}\relax + \global\@nobreaktrue + \everypar{\global\@nobreakfalse\everypar{}}% + \fi +%</largetocline> + \endgroup + \fi +%</undottedtocline|largetocline> +%<*tocline> + \scr@dte@tocline{#1}{##1}{##2}% +%</tocline> +} +%</dottedtocline|undottedtocline|largetocline|tocline> +% \end{macrocode} +% \end{macro}^^A \scr@dte@def@l@tocline +% \end{macro}^^A \scr@dte@def@l@largetocline +% \end{macro}^^A \scr@dte@def@l@undottedtocline +% \end{macro}^^A \scr@dte@def@l@dottedtocline +% +% Für den Stil \texttt{tocline} werden diverse weitere Einstellungen und +% Befehle benötigt: +% \begin{macrocode} +%<*tocline> +\AtBeginDocument{% + \BeforeClosingMainAux{% + \begingroup + \def\do#1{% + \relax + \scr@ifundefinedorrelax{scr@dte@#1@maxnumwidth}{}{% + \ifdim \@nameuse{scr@dte@#1@maxnumwidth}>\z@ + \if@filesw + \protected@write\@mainaux{}{% + \string\global\string\@namedef{scr@dte@#1@lastmaxnumwidth}% + {\the\@nameuse{scr@dte@#1@maxnumwidth}}% + }% + \fi + \@nameuse{scr@dte@#1@maxnumwidth}\z@ + \fi + }% + }% + \@nameuse{scr@dte@donumwidth}% + \endgroup + }% +} +% \end{macrocode} +% \begin{macro}{\scr@dte@nosub} +% \changes{v3.20}{2015/11/23}{neu (intern)} +% \begin{macro}{\@scr@dte@nosub} +% \changes{v3.20}{2015/11/23}{neu (intern)} +% Über diese Hilfsmacros werden die Buchstaben \texttt{sub} am Anfang des +% Arguments entfernt. Stehen diese gar nicht am Anfang, so wird ein Fehler +% wegen falscher Verwendung von \cs{@scr@de@nosub} gemeldet. +% \begin{macrocode} +\newcommand*{\scr@dte@nosub}[1]{\@scr@dte@nosub #1\relax} +\newcommand*{\@scr@dte@nosub}{} +\def\@scr@dte@nosub sub#1\relax{#1} +% \end{macrocode} +% \end{macro}^^A \@scr@dte@nosub +% \end{macro}^^A \scr@dte@nosub +% \begin{macro}{\scr@dte@tocline} +% \changes{v3.20}{2015/11/22}{neu (intern)} +% In gewisser Weise entspricht diese Anweisung der \LaTeX-Kern-Anweisung +% \cs{dottedtocline}. Allerdings werden hier vielfältige +% Eingriffsmöglichkeiten untersützt, die jeweils durch Optionen gesteuert +% werden können. Daher hat der Befehl auch nur drei Argumente: +% \begin{description} +% \item[\marg{Ebene}:] Der Name \meta{string} der Verzeichnisebene. +% \item[\marg{Eintrag}:] Der Verzeichniseintrag \meta{string}. +% \item[\marg{Seite}:] Die Seitenzahl \meta{string} des Verzeichniseintrags. +% \end{description} +% \begin{Length}{\scr@dte@tocline@numberwidth} +% \changes{v3.20}{2016/01/15}{neu (intern)} +% Für alle, die es interessiert, gibt diese Länge die tatsächliche Breite der +% formatierten Nummer an. +% \begin{macrocode} +\newlength\scr@dte@tocline@numberwidth +\newcommand*{\scr@dte@tocline}[3]{% + \ifnum \@nameuse{#1tocdepth}>\c@tocdepth + \else + \tocbasic@DependOnPenaltyAndTOCLevel{#1}% + \addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax + {% + \leftskip \@nameuse{scr@tso@#1@indent}\relax + \rightskip \@tocrmarg + \parfillskip -\rightskip + \@nameuse{Ifscr@tso@#1@raggedpage}{% + \addtolength{\parfillskip}{\z@ \@plus 1fil}% + }{}% + \parindent \@nameuse{scr@tso@#1@indent}\relax + \@afterindenttrue + \interlinepenalty\@M + \leavevmode + \@tempdima \@nameuse{scr@tso@#1@numwidth}\relax + \@nameuse{Ifscr@tso@#1@dynnumwidth}{% + \scr@ifundefinedorrelax{scr@dte@#1@lastmaxnumwidth}{}{% + \ifdim \@nameuse{scr@dte@#1@lastmaxnumwidth}>\@tempdima + \@tempdima\@nameuse{scr@dte@#1@lastmaxnumwidth}\relax + \fi + }% + }{}% + \advance\leftskip \@tempdima + \null\nobreak\hskip -\leftskip + {% +% \end{macrocode} +% An dieser Stelle wenden wir einen Trick an, um die Breite einer eventuell +% vorhandenen Nummer während deren Ausgabe auszumessen. Dazu ist es eine +% schlichte Notwendigkeit, dass \cs{numberline} die interne Definition +% verwendet. +% \begin{macrocode} + \usetocbasicnumberline + \let\scr@dte@numberline@box\numberline@box + \def\numberline@box##1{% + \sbox\scr@dte@tocline@numbox{\@nameuse{scr@tso@#1@numberformat}{##1}}% +% \end{macrocode} +% Die Zuweisung an die aktuelle Länge der Nummer muss global erfolgen, weil +% wir hier in einer Gruppe sind. +% \begin{macrocode} + \global\scr@dte@tocline@numberwidth + \dimexpr\wd\scr@dte@tocline@numbox+\@nameuse{scr@tso@#1@numsep}\relax + \ifdim \scr@dte@tocline@numberwidth + >\@nameuse{scr@dte@#1@maxnumwidth}\relax + \global\@nameuse{scr@dte@#1@maxnumwidth}\scr@dte@tocline@numberwidth + \fi + \@nameuse{Ifscr@tso@#1@dynnumwidth}{}{% + \ifdim \scr@dte@tocline@numberwidth + >\dimexpr \@nameuse{scr@tso@#1@numwidth}% + +\@nameuse{scr@tso@#1@numsep}\relax +%<class> \ClassWarning{\KOMAClassName +%<package> \PackageWarning{tocbasic% + }{% + number width of #1 toc entries should be + increased!\MessageBreak + Currently used number width = + \the\wd\scr@dte@tocline@numbox,\MessageBreak + Wanted number separation + \space\space\space = + \the\dimexpr\@nameuse{scr@tso@#1@numsep}\relax,\MessageBreak + Reserved number width \space\space\space\space\space\space = + \the\dimexpr\@nameuse{scr@tso@#1@numwidth}\relax% + }% + \fi + }% + \scr@dte@numberline@box{\@nameuse{scr@tso@#1@numberformat}{##1}}% + \@nameuse{Ifscr@tso@#1@breakafternumber}{% + {\parfillskip\@flushglue\par}\nobreak\hskip-\leftskip + }{}% + }% + \@nameuse{scr@tso@#1@entryformat}{% + #2% + \nobreak + {% + \normalfont\normalsize\@nameuse{scr@tso@#1@linefill}% + \nobreak + \@nameuse{scr@tso@#1@pagenumberbox}{% + \@nameuse{scr@tso@#1@pagenumberformat}{#3}% + }% + }% + \@par + }% + }% + }% + \tocbasic@SetPenaltyByTOCLevel{#1}% + \fi +} +% \end{macrocode} +% \end{Length}^^A \scr@dte@tocline@numberwidth +% \begin{macro}{\scr@dte@tocline@numbox} +% \changes{v3.20}{2015/11/25}{neue Box (intern)} +% Wird benötigt, um die Breite der Nummer auszumessen und die Nummer später +% wieder zu verwenden. +% \begin{macrocode} +\newsavebox\scr@dte@tocline@numbox +% \end{macrocode} +% \end{macro}^^A \scr@dte@tocline@numbox +% \begin{macro}{\tocbasic@DependOnPenaltyAndTOCLevel} +% \changes{v3.20}{2015/11/23}{neu}^^A +% \changes{v3.20}{2016/03/12}{Anpassung an \textsf{tocbasic}-Syntax für +% Befehle für Paketautoren}^^A +% Führt eine gespeicherte Aktion in Abhängigkeit davon aus, ob der aktuelle +% Penalty-Wert darauf schließen lässt, dass zuvor ein Eintrag mit einem +% höheren, demselben oder einem tieferen Wert für die Ebene erfolgte. +% \begin{macro}{\tocbasic@SetPenaltyByTOCLevel} +% \changes{v3.20}{2015/11/23}{neu} +% \changes{v3.20}{2016/03/12}{Anpassung an \textsf{tocbasic}-Syntax für +% Befehle für Paketautoren}^^A +% Setze die Strafpunkte für einen Umbruch entsprechend der aktuellen +% Verzeichnisebene. +% \begin{macro}{\LastTOCLevelWasHigher} +% \changes{v3.20}{2015/11/23}{neu} +% Standardaktion, falls der vorherige Level einen größeren Wert hatte: Umbruch +% erlauben. +% \begin{macro}{\LastTOCLevelWasSame} +% \changes{v3.20}{2015/11/23}{neu} +% Standardaktion, falls der vorherige Level denselben Wert hatte: Umbruch +% erlauben. +% \begin{macro}{\LastTOCLevelWasLower} +% Standardaktion, falls der vorherige Level einen kleineren Wert hatte: +% Penalty beibehalten und damit den Umbruch verbieten. +% \changes{v3.20}{2015/11/23}{neu} +% \begin{macrocode} +\newcommand*{\tocbasic@DependOnPenaltyAndTOCLevel}[1]{% + \ifnum \lastpenalty<\numexpr 20009-\@nameuse{#1tocdepth}\relax + \@nameuse{scr@tso@#1@LastTOCLevelWasHigher}% + \else\ifnum \lastpenalty=\numexpr 20009-\@nameuse{#1tocdepth}\relax + \@nameuse{scr@tso@#1@LastTOCLevelWasSame}% + \else + \@nameuse{scr@tso@#1@LastTOCLevelWasLower}% + \fi + \fi +} +\newcommand*{\tocbasic@SetPenaltyByTOCLevel}[1]{% + \penalty \numexpr 20009-\@nameuse{#1tocdepth}\relax +} +\newcommand*{\LastTOCLevelWasHigher}{\ifvmode\addpenalty{\@lowpenalty}\fi} +\newcommand*{\LastTOCLevelWasSame}{\ifvmode\addpenalty{\@lowpenalty}\fi} +\newcommand*{\LastTOCLevelWasLower}{} +% \end{macrocode} +% \end{macro}^^A \tocbasic@SetPenaltyByTOCLevel +% \end{macro}^^A \tocbasic@DependOnPenaltyAndTOCLevel +% \end{macro}^^A \LastTOCLevelWasLower +% \end{macro}^^A \LastTOCLevelWasSame +% \end{macro}^^A \LastTOCLevelWasHigher +% \begin{macro}{\TOCLineLeaderFill} +% \changes{v3.20}{2015/11/14}{neu} +% Füllt den Abstand zwischen Text und Seitenzahl komplett. Hat als einziges +% optionales Argument das Füllzeichen. +% \begin{macrocode} +\newcommand*{\TOCLineLeaderFill}[1][.]{% + \leaders\hbox{$\m@th + \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep + mu$}\hfill +} +%</tocline> +% \end{macrocode} +% \end{macro}^^A \TOCLineLeaderFill +% \end{macro}^^A \scr@dte@tocline +% +% \begin{macro}{\scr@dte@def@l@default} +% \changes{v3.20}{2015/12/16}{neu im Paket}^^A +% Bereits im Paket gibt es einen Standardstil. Anderen Paketen ist es nicht +% gestattet diesen umzudefinieren. Klassen ist das hingegen gestattet, damit +% sie einen Dokument weiten Standardstil festlegen können. +% \begin{macrocode} +%<*default> +%%% (run: style,dottedtocline) +\CloneTOCEntryStyle{dottedtocline}{default} +%</default> +% \end{macrocode} +% \end{macro} +% +% \iffalse +%</style> +%</package> +% \fi +% +% \subsubsection{Von den \KOMAScript-Klassen genutzte Stile} +% +% \iffalse +%<*class> +%<*style> +% \fi +% +% Einige Stile sollen nur definiert werden, wenn die Definition in die Klasse +% geschrieben wird: +% +% \begin{macro}{\scr@dte@def@l@part} +% \changes{v3.20}{2015/12/07}{neuer Verzeichnisstil \texttt{part}}^^A +% Dieser Verzeichnisstil existiert bei \textsf{scrbook}, \textsf{scrreprt} und +% \textsf{scrartcl}. Das Format des Eintrags und der Seitenzahl wird dabei +% über die Elemente \texttt{partentry} und \texttt{partentrypagenumber} +% realisiert. +% \begin{macrocode} +%<*part> +%%% (run: class,style,part) +\CloneTOCEntryStyle{tocline}{part} +\TOCEntryStyleStartInitCode{part}{% + \expandafter\providecommand% + \csname scr@tso@#1@linefill\endcsname{\hfill}% + \expandafter\providecommand% + \csname scr@tso@#1@entryformat\endcsname[1]{\usekomafont{partentry}{##1}}% + \expandafter\providecommand% + \csname scr@tso@#1@pagenumberformat\endcsname[1]{% + \usekomafont{partentry}{\usekomafont{partentrypagenumber}{##1}}}% + \expandafter\providecommand\expandafter*% + \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% +} +%</part> +% \end{macrocode} +% \end{macro}^^A \scr@dte@def@l@part +% +% \begin{macro}{\scr@dte@def@l@chapter} +% \changes{v3.20}{2015/12/07}{neuer Verzeichnisstil \texttt{chapter}}^^A +% Dieser Verzeichnisstil existier bei \textsf{scrbook} und \textsf{scrreprt}. +% \begin{macrocode} +%<*chapter> +%%% (run: class,style,chapter) +\CloneTOCEntryStyle{tocline}{chapter} +\TOCEntryStyleStartInitCode{chapter}{% + \expandafter\providecommand% + \csname scr@tso@#1@linefill\endcsname{% + \if@chapterentrywithdots + \TOCLineLeaderFill\relax + \else + \hfill + \fi + }% + \expandafter\providecommand% + \csname scr@tso@#1@entryformat\endcsname{\usekomafont{chapterentry}}% + \expandafter\providecommand% + \csname scr@tso@#1@pagenumberformat\endcsname[1]{% + \usekomafont{chapterentry}{\usekomafont{chapterentrypagenumber}{##1}}}% + \expandafter\providecommand\expandafter*% + \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% +} +%</chapter> +% \end{macrocode} +% \end{macro}^^A \scr@dte@def@l@chapter +% +% \begin{macro}{\scr@dte@def@l@section} +% \changes{v3.20}{2015/12/07}{neuer Verzeichnisstil \texttt{section}}^^A +% Bei den Klassen \textsf{scrbook} und \textsf{scrreprt} ist das der Stil für +% die \emph{kleinen} Verzeichnisebenen. Bei \textsf{scrartcl} ist es dagegen +% der Stil für die obere Verzeichnisebene und entspricht damit obigem Stil +% \texttt{chapter}. +% \begin{macrocode} +%<*section> +%%% (run: class,style,section) +\CloneTOCEntryStyle{tocline}{section} +%<*book|report> +\TOCEntryStyleStartInitCode{section}{% + \expandafter\providecommand% + \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% +} +%</book|report> +%<*article> +\TOCEntryStyleStartInitCode{section}{% + \expandafter\providecommand% + \csname scr@tso@#1@linefill\endcsname{% + \if@sectionentrywithdots + \TOCLineLeaderFill\relax + \else + \hfill + \fi + }% + % Für die Einträge die Schrift von Element sectionentry verwenden. + \expandafter\providecommand% + \csname scr@tso@#1@entryformat\endcsname{\usekomafont{sectionentry}}% + \expandafter\providecommand% + \csname scr@tso@#1@pagenumberformat\endcsname[1]{\usekomafont{sectionentry}{\usekomafont{sectionentrypagenumber}{##1}}}% + \expandafter\providecommand\expandafter*% + \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% +} +%</article> +%</section> +% \end{macrocode} +% \end{macro}^^A \scr@dte@def@l@section +% +% \begin{macro}{\scr@dte@def@l@subsection} +% \changes{v3.20}{2015/12/07}{neuer Verzeichnisstil \texttt{subsection}}^^A +% Dieser Stil existiert nur bei \textsf{scrartcl} und entspricht dann dem Stil +% \texttt{section} bei \textsf{scrbook} und \textsf{scrreprt}. +% \begin{macrocode} +%<*subsection&article> +%%% (run: class,style,subsection) +\CloneTOCEntryStyle{tocline}{subsection} +\TOCEntryStyleStartInitCode{subsection}{% + \expandafter\providecommand% + \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% +} +%</subsection&article> +% \end{macrocode} +% \end{macro}^^A \scr@dte@def@l@subsection +% +% \begin{macro}{\scr@dte@def@l@default} +% \changes{v3.20}{2015/12/07}{neuer Verzeichnisstil \texttt{default}}^^A +% Dieser Stil entspricht bei \textsf{scrbook} und \textsf{scrreprt} dem Stil +% \texttt{section} und bei \textsf{scrartcl} dem Stil \textsf{subsection}. +% \begin{macrocode} +%<*default> +%%% (run: class,style,default) +%<book|report>\CloneTOCEntryStyle{section}{default} +%<article>\CloneTOCEntryStyle{subsection}{default} +%</default> +% \end{macrocode} +% \end{macro} +% +% \iffalse +%</style> +%</class> +% \fi +% +% \Finale +% +\endinput +% +% end of file `scrkernel-tocstyle.dtx' +%%% Local Variables: +%%% mode: doctex +%%% coding: iso-latin-1 +%%% TeX-master: t +%%% End: 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 9c641843a98..3f5d3c5858c 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx @@ -1,8 +1,8 @@ -% \CheckSum{2622} +% \CheckSum{2652} % \iffalse meta-comment % ====================================================================== % scrkernel-typearea.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-typearea.dtx -% Copyright (c) Markus Kohm, 2002-2015 +% Copyright (c) Markus Kohm, 2002-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,13 +55,13 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $ %<package&identify>\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-07-26 10:15:44 +0200 (Sun, 26 Jul 2015) $ + \filedate$Date: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1872 $ \edef\reserved@a{% @@ -618,6 +618,34 @@ % \end{option} % \end{option} % +% \begin{option}{headsepline} +% \changes{v3.20}{2015/12/12}{\textsf{typearea} reagiert selbst auf +% \texttt{headsepline}}^^A +% Bis \KOMAScript{} v3.20 konnte \textsf{typearea} nicht korrekt auf beliebige +% Abfolgen der Optionen \texttt{headsepline} und \texttt{headinclude} +% reagieren. Bis Version 3.18a gewann Option \texttt{headinclude} innerhalb +% der globalen Optionen immer über Option \texttt{headsepline}, während das +% innerhalb von \cs{KOMAoptions} nicht der Fall war. In Version 3.18a wurde +% ein Bug beseitigt, der dann dazu führte, dass \texttt{headsepline} innerhalb +% der globalen Optionen immer über \texttt{headinclude} siegte. Tatsächlich +% soll aber bei \texttt{headinclude=false,headsepline} oder bei +% \texttt{headinclude=true,headsepline=false} sowohl in den globalen Optionen +% als auch bei \cs{KOMAoptions} \texttt{headsepline} entscheidend sein, +% während bei \texttt{headsepline,headinclude=false} und +% \texttt{headsepline=false,headinclude} natürlich \texttt{headinclude} +% entscheidend sein soll. Das soll auch dann noch funktionieren, wenn sich die +% Optionen beliebig oft abwechseln. Damit das geht, muss \textsf{typearea} +% Option \texttt{headsepline} selbst als \texttt{headinclude} interpretieren. +% \begin{macrocode} +\KOMA@key{headsepline}[true]{% + \KOMA@set@ifkey{headinclude}{@hincl}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{headinclude}{@hincl}% + \fi +} +% \end{macrocode} +% \end{option}^^A headsepline +% % \begin{option}{footinclude} % \changes{v2.95}{2002/07/08}{Verwendung von \textsf{scrkeyvl}} % \begin{option}{footexclude} @@ -645,6 +673,34 @@ % \end{option} % \end{option} % +% \begin{option}{footsepline} +% \changes{v3.20}{2015/12/12}{\textsf{typearea} reagiert selbst auf +% \texttt{footsepline}}^^A +% Bis \KOMAScript{} v3.20 konnte \textsf{typearea} nicht korrekt auf beliebige +% Abfolgen der Optionen \texttt{footsepline} und \texttt{footinclude} +% reagieren. Bis Version 3.18a gewann Option \texttt{footinclude} innerhalb +% der globalen Optionen immer über Option \texttt{footsepline}, während das +% innerhalb von \cs{KOMAoptions} nicht der Fall war. In Version 3.18a wurde +% ein Bug beseitigt, der dann dazu führte, dass \texttt{footsepline} innerhalb +% der globalen Optionen immer über \texttt{footinclude} siegte. Tatsächlich +% soll aber bei \texttt{footinclude=false,footsepline} oder bei +% \texttt{footinclude=true,footsepline=false} sowohl in den globalen Optionen +% als auch bei \cs{KOMAoptions} \texttt{footsepline} entscheidend sein, +% während bei \texttt{footsepline,footinclude=false} und +% \texttt{footsepline=false,footinclude} natürlich \texttt{footinclude} +% entscheidend sein soll. Das soll auch dann noch funktionieren, wenn sich die +% Optionen beliebig oft abwechseln. Damit das geht, muss \textsf{typearea} +% Option \texttt{footsepline} selbst als \texttt{footinclude} interpretieren. +% \begin{macrocode} +\KOMA@key{footsepline}[true]{% + \KOMA@set@ifkey{footinclude}{@hincl}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{footinclude}{@hincl}% + \fi +} +% \end{macrocode} +% \end{option}^^A footsepline +% % \begin{option}{mpinclude} % \changes{v2.8q}{2002/03/28}{neue Option}^^A % \changes{v2.95}{2002/07/08}{Verwendung von \textsf{scrkeyvl}} @@ -831,15 +887,26 @@ }{% \def\FamilyElseValue{, `semi'}% \KOMA@set@ifkey{twoside}{% -%<package> @twoside% -%<class> @tempswa% +% \end{macrocode} +% \changes{v3.20}{2015/11/02}{nicht erfüllte Reihenfolgenabhängigkeit von +% Option \texttt{twocolumn} bevor \texttt{twoside} beseitigt}^^A +% Von Version~3.17 bis 3.19a wurde hier in den Klassen mit einem lokalen +% Schalter \cs{if@tempswa} gearbeitet. Dadurch konnte aber Option +% \texttt{twocolumn} nicht erkennen, dass doppelseitig gearbeitet +% wird. Deshalb hätte Option \texttt{twocolumn} vor \texttt{twoside} +% abgearbeitet werden müssen. Durch direkte Verwendung von \cs{if@twoside} +% auch in den Klassen, wurde die Abhängigkeit beseitigt. Die Alternative wäre +% gewesen, die Implementierung und Ausführung von \texttt{twocolumn} vor +% \texttt{twoside} zu verschieben. +% \begin{macrocode} + @twoside% }{#1}% }% \ifx\FamilyKeyState\FamilyKeyStateProcessed %<*class> \expandafter\ifnum\scr@v@is@ge{3.17}% %<*!letter> - \if@tempswa\flushbottom + \if@twoside\flushbottom \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi %</!letter> %<letter> \raggedbottom @@ -898,6 +965,8 @@ % \changes{v3.12}{2013/03/05}{Verwendung der Status-Signalisierung mit % \cs{FamilyKeyState}} % \changes{v3.13a}{2014/04/09}{Signallisierung korrigiert}^^A +% \changes{v3.20}{2016/02/16}{\cs{sloppy}, \cs{raggedbottom} und +% \cs{flushbottom} verzögert}^^A % Einspaltiger oder zweispaltiger Satz? % \begin{macrocode} %</package> @@ -914,10 +983,13 @@ }{twocolumn}{@twocolumn}% %<package> \csname recalctypearea\endcsname %<*class> - \expandafter\ifnum\scr@v@is@ge{3.17}% + \if@atdocument\expandafter\@firstofone + \else\@ifpackageloaded{typearea}{\expandafter\@firstofone} + {\expandafter\AtEndOfClass}\fi + {\expandafter\ifnum\scr@v@is@ge{3.17}% \if@twocolumn\twocolumn\sloppy\flushbottom \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi - \fi + \fi}% %</class> \fi } @@ -958,6 +1030,8 @@ % \changes{v3.12}{2013/03/05}{Verwendung der Status-Signalisierung mit % \cs{FamilyKeyState}}^^A % \changes{v3.17a}{2015/05/03}{Logik komplett neu geschrieben}^^A +% \changes{v3.20}{2015/07/10}{\texttt{luatex} als Synonym für +% \texttt{pdftex}}^^A % Diese Option ist nun das zentrale Element für die Übermittlung der % Seitengröße an pdf\TeX, \texttt{dvips} oder V\TeX. Sie wird auch von % den obsoleten Optionen verwendet. Die Werte und ihre Bedeutung: @@ -983,7 +1057,7 @@ \KOMA@key{pagesize}[auto]{% \KOMA@set@ncmdkey{pagesize}{@pagesizelast}{% {off}{-1},{no}{-1},{false}{-1},% - {auto}{0},{automedia}{1},{dvips}{2},{pdftex}{3},{dvipdfmx}{4}% + {auto}{0},{automedia}{1},{dvips}{2},{pdftex}{3},{luatex}{3},{dvipdfmx}{4}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase\number\@pagesizelast\relax @@ -1036,6 +1110,8 @@ % % \begin{macro}{\set@pdftexpagesize} % \changes{v2.95}{2002/08/27}{neu (intern)}^^A +% \changes{v3.20}{2015/07/10}{falls \cs{pdfpage\dots} nicht existiert wird +% \cs{page\dots} probiert (angekündigt für lua\TeX{}~0.80.1)}^^A % \begin{macro}{\set@dvipspagesize} % \changes{v2.95}{2002/08/27}{neu (intern)}^^A % \changes{v3.02c}{2009/02/13}{\texttt{seascape} wird beachtet} @@ -1159,8 +1235,12 @@ % ausgeführt werden: % \begin{macrocode} \newcommand{\set@pdftexpagesize}{% - \ifnotundefined{pdfpagewidth}{\pdfpagewidth=\paperwidth}{}% - \ifnotundefined{pdfpageheight}{\pdfpageheight=\paperheight}{}% + \scr@ifundefinedorrelax{pdfpagewidth}{% + \scr@ifundefinedorrelax{pagewidth}{}{pagewidth=\paperwidth}% + }{\pdfpagewidth=\paperwidth}% + \scr@ifundefinedorrelax{pdfpageheight}{% + \scr@ifundefinedorrelax{pageheight}{}{pageheight=\paperheight}% + }{\pdfpageheight=\paperheight}% } \newcommand{\set@dvipspagesize}{% \begingroup @@ -1983,12 +2063,14 @@ % % \begin{macro}{\AfterCalculatingTypearea} % \changes{v2.96a}{2006/11/29}{neu}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Neuerdings besteht die Möglichkeit, auf Benutzerebene das Verhalten von % \cs{typearea} zu beeinflussen. In der Sternvariante wird dabei lokal % gearbeitet. % \begin{macrocode} \newcommand*{\AfterCalculatingTypearea}{% - \@ifstar \l@addto@macro \g@addto@macro \@typearea@end + \kernel@ifstar \l@addto@macro \g@addto@macro \@typearea@end } % \end{macrocode} % \begin{macro}{\@typearea@end} @@ -2005,11 +2087,13 @@ % % \begin{macro}{\AfterSettingArea} % \changes{v3.11}{2012/04/17}{new}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % The user may influence the result of \cs{areaset}. The star version works % local while the non-star version is global. % \begin{macrocode} \newcommand*{\AfterSettingArea}{% - \@ifstar \l@addto@macro \g@addto@macro \@areaset@end + \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end } % \end{macrocode} % \begin{macro}{\@areaset@end} @@ -2214,8 +2298,12 @@ % \end{macrocode} % \begin{macro}{\BeforeRestoreareas} % \changes{v3.18}{2015/05/20}{neue Anweisung}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\AfterRestoreareas} % \changes{v3.18}{2015/05/20}{neue Anweisung}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\scr@storeareashook} % \changes{v3.18}{2015/05/20}{neue Anweisung (intern)}^^A % \begin{macro}{\scr@storeareas@before@hook} @@ -2232,10 +2320,12 @@ % bereits definierte Anweisungen gilt. % \begin{macrocode} \newcommand*{\BeforeRestoreareas}{% - \@ifstar{\scr@storeareashook{before@current}}{\scr@storeareashook{before}}% + \kernel@ifstar{\scr@storeareashook{before@current}}% + {\scr@storeareashook{before}}% } \newcommand*{\AfterRestoreareas}{% - \@ifstar{\scr@storeareashook{after@current}}{\scr@storeareashook{after}}% + \kernel@ifstar{\scr@storeareashook{after@current}}% + {\scr@storeareashook{after}}% } \newcommand*{\scr@storeareashook}[2]{% \expandafter\l@addto@macro\csname scr@storeareas@#1@hook\endcsname{#2}% diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-variables.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-variables.dtx index 130129d964a..2748f5c40f0 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-variables.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-variables.dtx @@ -2,7 +2,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-variables.dtx -% Copyright (c) Markus Kohm, 2008-2014 +% Copyright (c) Markus Kohm, 2008-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-variables.dtx -% Copyright (c) Markus Kohm, 2008-2014 +% Copyright (c) Markus Kohm, 2008-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,7 +55,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $ %<*driver> % \fi \ProvidesFile{scrkernel-variables.dtx}[2011/03/31 v3.08b KOMA-Script @@ -115,8 +115,9 @@ % % \begin{macro}{\newkomavar} % \changes{v2.8q}{2002/01/14}{Neu}^^A -% Es wird -% zwischen zwei Arten von Feldern unterschieden: +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A +% Es wird zwischen zwei Arten von Feldern unterschieden: % \begin{itemize} % \item Felder für die Geschäftszeile % \item Felder für sonstige Verwendung @@ -135,7 +136,7 @@ % \cs{scr@\emph{Name}@name}. % \begin{macrocode} \newcommand*{\newkomavar}{% - \@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} + \kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} \newcommand*{\@newkomavar}[2][\relax]{% \@ifundefined{scr@#2@name}{% \@ifundefined{scr@#2@var}{% @@ -176,6 +177,8 @@ % \changes{v2.8q}{2002/01/14}{Neu}^^A % \changes{v3.08}{2010/10/28}{\cs{scr@\emph{Name}@postsetname} % und \cs{scr@\emph{Name}@postsetvar}} +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Natürlich wird auch ein Befehl benötigt, um die Feldvariablen % zu setzen und ihnen ggf. einen neuen Namen für die Ausgabe zu % geben. Der \emph{Name} der Feldvariable wird als obligatorisches @@ -184,6 +187,8 @@ % bzw. \cs{scr@\emph{Name}@postsetvar} ausgeführt. % \begin{macro}{\@setkomavar} % \changes{v2.8q}{2002/01/14}{Neu}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Da dann zwischen einer Sternvariante und einer normalen % unterschieden werden soll wird ein Hilfsmakro benötigt. % \begin{macro}{\@setkomaname} @@ -198,9 +203,9 @@ % Argument übergeben. % \begin{macrocode} \newcommand*{\setkomavar}{% - \@ifstar {\@setkomaname}{\@setkomavar}} + \kernel@ifstar {\@setkomaname}{\@setkomavar}} \newcommand*{\@setkomavar}[1]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\@@setkomavar{#1}}{\@@setkomavar{#1}[\relax]}} \newcommand*{\@setkomaname}[2]{% \@ifundefined{scr@#1@var}{% @@ -255,6 +260,8 @@ % \begin{macro}{\usekomavar} % \changes{v2.8q}{2002/01/14}{Neu}^^A % \changes{v2.9i}{2002/09/04}{robust}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Selbstverständlich wird auch ein Makro benötigt, um auf den % Inhalt oder den Ausgabename einer Variablen zugreifen zu % können. Mit der normalen Variante wird dabei der Inhalt, mit der @@ -273,7 +280,7 @@ % benötigt. % \begin{macrocode} \DeclareRobustCommand*{\usekomavar}{% - \@ifstar {\@usekomaname}{\@usekomavar}} + \kernel@ifstar {\@usekomaname}{\@usekomavar}} \newcommand*{\@usekomavar}[2][\@firstofone]{% \@ifundefined{scr@#2@var}{% \@komavar@err{use}{#2}% @@ -311,6 +318,8 @@ % \changes{v2.8q}{2002/01/14}{Neu}^^A % \changes{v2.9i}{2002/09/04}{Leerzeichen rausgeworfen}^^A % \changes{v2.9i}{2002/09/04}{robust}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % Es gibt auch noch ein Makro, um zu testen, ob eine \KOMAScript{} % Variable oder deren Name leer ist. Die Sternvariante ist wieder für % den Namen zuständig. @@ -324,8 +333,8 @@ % \begin{macrocode} \DeclareRobustCommand*{\ifkomavarempty}{% \begingroup - \@ifstar {\@tempswatrue\@ifkomavarempty}% - {\@tempswafalse\@ifkomavarempty}% + \kernel@ifstar {\@tempswatrue\@ifkomavarempty}% + {\@tempswafalse\@ifkomavarempty}% } \newcommand{\@ifkomavarempty}[1]{% \ifkomavar{#1}{% 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 041eb6aed31..28675ca2de3 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 2213 2015-10-03 12:59:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $ % \fi % % \iffalse @@ -123,7 +123,7 @@ \fi %</ignorethis> \fi - \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}% + \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}% \endgroup % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx index 217a6be58c1..fb2ab3e0836 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx @@ -1,8 +1,8 @@ -% \CheckSum{1578} +% \CheckSum{1607} % \iffalse^^A meta-comment % ====================================================================== % scrlayer-notecolumn.dtx -% Copyright (c) Markus Kohm, 2013-2014 +% Copyright (c) Markus Kohm, 2013-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrlayer-notecolumn.dtx -% Copyright (c) Markus Kohm, 2013-2014 +% Copyright (c) Markus Kohm, 2013-2016 % % Diese Datei ist Teil der LaTeX2e KOMA-Script-Sammlung. % @@ -57,17 +57,17 @@ % Right brace \} Tilde \~} % % \iffalse^^A meta-comment -%<identify>%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (identify) -%<init>%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (init) -%<options>%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (options) -%<body>%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (body) +%<identify>%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (identify) +%<init>%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (init) +%<options>%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (options) +%<body>%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2014-06-03 10:28:36 +0200 (Tue, 03 Jun 2014) $ + \filedate$Date: 2016-03-25 11:22:23 +0100 (Fri, 25 Mar 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{v0.1.#2}} - \filerevision$Revision: 1760 $ + \filerevision$Revision: 2398 $ \endgroup \ProvidesFile{scrlayer-notecolumn.dtx}[\filedate\space\filerevision\space %</dtx> @@ -223,19 +223,33 @@ % \File{scrlayer.dtx}). % % Here we test the used pdf\TeX{} primitives. +% \changes{v0.1}{2015/10/07}{ready for renaming \cs{pdfsavepos} and +% \cs{pdflastypos} in luaTeX}^^A % \begin{macrocode} \@tempswatrue \scr@ifundefinedorrelax{pdfsavepos}{% - \expandafter\@tempswafalse + \scr@ifundefinedorrelax{savepos}{% + \expandafter\@tempswafalse + }{% + \let\scr@savepos\savepos + }% }{% + \let\scr@savepos\pdfsavepos \scr@ifundefinedorrelax{pdflastypos}{% - \expandafter\@tempswafalse - }{}% + \scr@ifundefinedorrelax{lastypos}{% + \expandafter\@tempswafalse + }{% + \let\scr@lastypos\lastypos + }% + }{% + \let\scr@lastypos\pdflastypos + }% } \if@tempswa\else - \PackageError{scrlayer-notecolumn}{missing pdfTeX features}{% - This package needs \string\pdfsavepos\space and - \string\pdflastypos.\MessageBreak + \PackageError{scrlayer-notecolumn}{missing pdfTeX/luaTeX features}{% + This package needs \string\pdfsavepos\space or \string\savepos\space + and\MessageBreak + \string\pdflastypos\space or \string\lastypos.\MessageBreak This error is fatal, because usage of the package without these features\MessageBreak cannot work!\MessageBreak @@ -666,6 +680,8 @@ % to put contents into the note columns and to output the note columns. % % \begin{macro}{\tf@slnc} +% \changes{v0.1.2395}{2016/03/25}{write to \texttt{aux}-file with +% \cs{if@filesw}}^^A % \begin{macro}{\slnc@initwrite} % \begin{macro}{\slnc@openwrite} % First of all we need a file to write the notes to. We use the @@ -678,9 +694,11 @@ \scrlayerAddToInterface\tf@slnc{% \newwrite\tf@slnc \AtBeginDocument{% - \immediate\write\@auxout{% - \noexpand\csname slnc@initwrite\noexpand\endcsname - }% + \if@filesw + \immediate\write\@auxout{% + \noexpand\csname slnc@initwrite\noexpand\endcsname + }% + \fi }% \AtEndDocument{\let\slnc@initwrite\slnc@openwrite}% } @@ -753,11 +771,11 @@ \scrlayerAddToInterface\makenote{% \newcommand{\makenote}[2][marginpar]{% \@bsphack - \pdfsavepos + \scr@savepos \addtocontents{slnc}{% \string\slnc@note{#1}% {\noexpand\number\value{slncpage}}% - {\noexpand\number\pdflastypos}% + {\noexpand\number\scr@lastypos}% {#2}% }% \@esphack @@ -848,8 +866,18 @@ \kern\dimexpr\topskip-\baselineskip\relax }% \fi +% \end{macrocode} +% \changes{v0.1}{2015/10/07}{ready for renaming \cs{pdfpageheight} in +% luaTeX}^^A +% From lua\TeX~0.80.1 \cs{pdfpageheight} will be renamed into +% \cs{pageheight}. So we have to do an extra test for the new primitive. +% \begin{macrocode} \scr@ifundefinedorrelax{pdfpageheight}{% - \@tempdima=\paperheight + \scr@ifundefinedorrelax{pageheight}{% + \@tempdima=\paperheight + }{% + \@tempdima=\pageheight + }% }{% \@tempdima=\pdfpageheight }% @@ -910,11 +938,11 @@ \if@filesw \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{% \expandafter\unvbox\csname slnc@#1@box\endcsname - \pdfsavepos + \scr@savepos \protected@write\@auxout{}{% \string\newlabel{notecolumn.##1.##3.syncnote.label}{% {% - \noexpand\number\pdflastypos + \noexpand\number\scr@lastypos }{\thepage}% }% }% @@ -1475,12 +1503,12 @@ \fi {% \if@filesw - \pdfsavepos + \scr@savepos \protected@write\@auxout{}{% \string\newlabel{notecolumn.\theslnc@syncpoint.synctext.label}{% {% \noexpand\number - \numexpr \pdflastypos\slnc@voffset\relax + \numexpr \scr@lastypos\slnc@voffset\relax }{\thepage}% }% }% @@ -1536,8 +1564,18 @@ \newpage\null\vskip-\dimexpr \baselineskip+\parskip\relax \edef\slnc@textpage{\the\numexpr\slnc@textpage+1\relax}% }% +% \end{macrocode} +% \changes{v0.1}{2015/10/07}{ready for renaming \cs{pdfpageheight} in +% luaTeX}^^A +% From lua\TeX~0.80.1 \cs{pdfpageheight} will be renamed into +% \cs{pageheight}. So we have to do an extra test for the new primitive. +% \begin{macrocode} \scr@ifundefinedorrelax{pdfpageheight}{% - \@tempdima=\paperheight + \scr@ifundefinedorrelax{pageheight}{% + \@tempdima=\paperheight + }{% + \@tempdima=\pageheight + }% }{% \@tempdima=\pdfpageheight }% diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx index f03f9855718..36dc001c395 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx @@ -2,7 +2,7 @@ % \iffalse^^A meta-comment % ====================================================================== % scrlayer-scrpage.dtx -% Copyright (c) Markus Kohm, 2012-2015 +% Copyright (c) Markus Kohm, 2012-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien. % ---------------------------------------------------------------------- % scrlayer-scrpage.dtx -% Copyright (c) Markus Kohm, 2012-2015 +% Copyright (c) Markus Kohm, 2012-2016 % % Diese Datei ist Teil der LaTeX2e KOMA-Script-Sammlung. % @@ -57,17 +57,17 @@ % Right brace \} Tilde \~} % % \iffalse^^A meta-comment -%<identify>%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (identify) -%<init>%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (init) -%<options>%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (options) -%<body>%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (body) +%<identify>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify) +%<init>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (init) +%<options>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (options) +%<body>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (body) %<*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-24 08:16:16 +0200 (Wed, 24 Jun 2015) $ + \filedate$Date: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} - \filerevision$Revision: 2147 $ + \filerevision$Revision: 2429 $ \endgroup \ProvidesFile{scrlayer-scrpage.dtx}[\filedate\space r\filerevision\space %</dtx> @@ -941,9 +941,13 @@ } % \end{macrocode} % \begin{macro}{\sls@setline} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@setline} % \begin{macro}{\sls@@@setline} % \changes{v3.17}[2015/02/27]{internal use of the corresponding options}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@@@setline} % \changes{v3.18}{2015/06/17}{explicit reuse of the current length}^^A % Helper to set up the line attributes processing the parameters of the @@ -951,7 +955,7 @@ % \begin{macrocode} \scrlayerAddToInterface\sls@setline{% \newcommand*\sls@setline[2]{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\sls@@setline{#1}{#2}}{\sls@@@setline{#1#2}}% }% } @@ -1003,7 +1007,7 @@ `\string\setkomafont' or `\string\addtokomafont' to\MessageBreak setup the colour% }% - \@ifnextchar[%] + \kernel@ifnextchar[%] {% \sls@@@@setline{#1}% }{% @@ -1346,7 +1350,11 @@ } % \end{macrocode} % \begin{macro}{\sls@defhead} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@defhead} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@@defhead} % \changes{v0.9}{2014/08/18}{fix names of layers \texttt{\dots head.odd} and % \texttt{\dots head.even}}%^^A @@ -1370,14 +1378,14 @@ % \begin{macrocode} \scrlayerAddToInterface\sls@defhead{% \newcommand*\sls@defhead[1]{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\sls@@defhead{#1}}% {\sls@@defhead{#1}(\sls@headabove@linelength,\sls@headabove@linethickness)}% }% } \scrlayerAddToInterface\sls@@defhead{% \def\sls@@defhead#1(#2,#3)#4#5#6{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\sls@@@defhead{#1}({#2},{#3}){#4}{#5}{#6}}% {\sls@@@defhead{#1}% ({#2},{#3})% @@ -1450,7 +1458,11 @@ } % \end{macrocode} % \begin{macro}{\sls@deffoot} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@deffoot} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@@deffoot} % \changes{v0.9}{2014/08/18}{fix names of layers \texttt{\dots foot.odd} and % \texttt{\dots foot.even}}%^^A @@ -1474,14 +1486,14 @@ % \begin{macrocode} \scrlayerAddToInterface\sls@deffoot{% \newcommand*\sls@deffoot[1]{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\sls@@deffoot{#1}}% {\sls@@deffoot{#1}(\sls@footabove@linelength,\sls@footabove@linethickness)}% }% } \scrlayerAddToInterface\sls@@deffoot{% \def\sls@@deffoot#1(#2,#3)#4#5#6{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\sls@@@deffoot{#1}({#2},{#3}){#4}{#5}{#6}}% {\sls@@@deffoot{#1}% ({#2},{#3})% @@ -1914,7 +1926,11 @@ } % \end{macrocode} % \begin{macro}{\scrlayer@triplestyle} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\scrlayer@@triplestyle} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\scrlayer@@@triplestyle} % Helpers, that do the real work. Parameters are same, but \cs{reserved@a} has % to be one of \Macro{defpagestyle}, \Macro{newpagestyle}, @@ -1922,14 +1938,14 @@ % \begin{macrocode} \scrlayerAddToInterface\scrlayer@triplestyle{% \def\scrlayer@triplestyle#1{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\scrlayer@@triplestyle{#1}}% {\scrlayer@@triplestyle{#1}[\z@]}% } } \scrlayerAddToInterface\scrlayer@@triplestyle{% \def\scrlayer@@triplestyle#1[#2]{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\scrlayer@@@triplestyle{#1}[#2]}% {\scrlayer@@@triplestyle{#1}[\z@][#2]}% }% @@ -2160,6 +2176,8 @@ % \end{macro}^^A \sls@currentplain % \end{macro}^^A \sls@currentheadings % \begin{macro}{\sls@init@pair@page@style} +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\sls@init@@pair@page@style} % \begin{description} % \item[\Parameter{string}:] the name of the page style, that should be @@ -2178,8 +2196,8 @@ % \begin{macrocode} \scrlayerAddToInterface\sls@init@pair@page@style{% \newcommand*{\sls@init@pair@page@style}{% - \@ifstar {% - \@ifstar {% + \kernel@ifstar {% + \kernel@ifstar {% \sls@let@pair@page@style\relax }{% \sls@let@pair@page@style\@empty @@ -2421,41 +2439,77 @@ % % % \begin{macro}{\ihead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ohead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\chead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\lehead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\lohead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\rehead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\rohead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\cehead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\cohead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ifoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ofoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\cfoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\lefoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\lofoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\refoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\rofoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\cefoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\cofoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % We also need macros to define the contents of the three part head % and foot. Each macro defines one of the part of head or foot of the % headings page style member and optional of the plain page style @@ -2463,16 +2517,18 @@ % \begin{macrocode} %<*body> \scrlayerAddToInterface\ihead{% - \newcommand*{\ihead}{\@ifstar {\@dblarg\@@@ihead}{\@ihead}}% + \newcommand*{\ihead}{\kernel@ifstar {\@dblarg\@@@ihead}{\@ihead}}% } % \end{macrocode} % \begin{macro}{\@ihead} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@ihead} % \begin{macro}{\@@@ihead} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@ihead{% - \newcommand*{\@ihead}{\@ifnextchar[{\@@@ihead}{\@@ihead}}% + \newcommand*{\@ihead}{\kernel@ifnextchar[{\@@@ihead}{\@@ihead}}% } \scrlayerAddToInterface\@@ihead{% \newcommand*{\@@ihead}[1]{\rehead{#1}\lohead{#1}}% @@ -2486,16 +2542,18 @@ % \end{macro}^^A \@ihead % \begin{macrocode} \scrlayerAddToInterface\ohead{% - \newcommand*{\ohead}{\@ifstar {\@dblarg\@@@ohead}{\@ohead}}% + \newcommand*{\ohead}{\kernel@ifstar {\@dblarg\@@@ohead}{\@ohead}}% } % \end{macrocode} % \begin{macro}{\@ohead} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@ohead} % \begin{macro}{\@@@ohead} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@ohead{% - \newcommand*{\@ohead}{\@ifnextchar[{\@@@ohead}{\@@ohead}}% + \newcommand*{\@ohead}{\kernel@ifnextchar[{\@@@ohead}{\@@ohead}}% } \scrlayerAddToInterface\@@ohead{% \newcommand*{\@@ohead}[1]{\lehead{#1}\rohead{#1}}% @@ -2509,16 +2567,18 @@ % \end{macro}^^A \@ohead % \begin{macrocode} \scrlayerAddToInterface\chead{% - \newcommand*{\chead}{\@ifstar {\@dblarg\@@@chead}{\@chead}}% + \newcommand*{\chead}{\kernel@ifstar {\@dblarg\@@@chead}{\@chead}}% } % \end{macrocode} % \begin{macro}{\@chead} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@chead} % \begin{macro}{\@@@chead} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@chead{% - \newcommand*{\@chead}{\@ifnextchar[{\@@@chead}{\@@chead}}% + \newcommand*{\@chead}{\kernel@ifnextchar[{\@@@chead}{\@@chead}}% } \scrlayerAddToInterface\@@chead{% \newcommand*{\@@chead}[1]{\cehead{#1}\cohead{#1}}% @@ -2552,16 +2612,18 @@ % \end{macrocode} % \begin{macrocode} \scrlayerAddToInterface\ifoot{% - \newcommand*{\ifoot}{\@ifstar {\@dblarg\@@@ifoot}{\@ifoot}}% + \newcommand*{\ifoot}{\kernel@ifstar {\@dblarg\@@@ifoot}{\@ifoot}}% } % \end{macrocode} % \begin{macro}{\@ifoot} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@ifoot} % \begin{macro}{\@@@ifoot} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@ifoot{% - \newcommand*{\@ifoot}{\@ifnextchar[{\@@@ifoot}{\@@ifoot}}% + \newcommand*{\@ifoot}{\kernel@ifnextchar[{\@@@ifoot}{\@@ifoot}}% } \scrlayerAddToInterface\@@ifoot{% \newcommand*{\@@ifoot}[1]{\refoot{#1}\lofoot{#1}}% @@ -2575,16 +2637,18 @@ % \end{macro}^^A \@ifoot % \begin{macrocode} \scrlayerAddToInterface\ofoot{% - \newcommand*{\ofoot}{\@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}% + \newcommand*{\ofoot}{\kernel@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}% } % \end{macrocode} % \begin{macro}{\@ofoot} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@ofoot} % \begin{macro}{\@@@ofoot} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@ofoot{% - \newcommand*{\@ofoot}{\@ifnextchar[{\@@@ofoot}{\@@ofoot}}% + \newcommand*{\@ofoot}{\kernel@ifnextchar[{\@@@ofoot}{\@@ofoot}}% } \scrlayerAddToInterface\@@ofoot{% \newcommand*{\@@ofoot}[1]{\lefoot{#1}\rofoot{#1}}% @@ -2598,16 +2662,18 @@ % \end{macro}^^A \@ofoot % \begin{macrocode} \scrlayerAddToInterface\cfoot{% - \newcommand*{\cfoot}{\@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}% + \newcommand*{\cfoot}{\kernel@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}% } % \end{macrocode} % \begin{macro}{\@cfoot} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@cfoot} % \begin{macro}{\@@@cfoot} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@cfoot{% - \newcommand*{\@cfoot}{\@ifnextchar[{\@@@cfoot}{\@@cfoot}}% + \newcommand*{\@cfoot}{\kernel@ifnextchar[{\@@@cfoot}{\@@cfoot}}% } \scrlayerAddToInterface\@@cfoot{% \newcommand*{\@@cfoot}[1]{\cefoot{#1}\cofoot{#1}}% @@ -2641,6 +2707,10 @@ % \end{macrocode} % \begin{macro}{\sls@renewelement} % \begin{macro}{\sls@@renewelement} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\sls@@@renewelement} % \begin{macro}{\sls@@@@renewelement} % \begin{macro}{\sls@@renewplainelement} @@ -2648,13 +2718,13 @@ % \begin{macrocode} \scrlayerAddToInterface\sls@renewelement{% \newcommand*{\sls@renewelement}[3]{% - \@ifstar{\@dblarg{\sls@@@@renewelement{#1}{#2}{#3}}}% - {\sls@@renewelement{#1}{#2}{#3}}% + \kernel@ifstar{\@dblarg{\sls@@@@renewelement{#1}{#2}{#3}}}% + {\sls@@renewelement{#1}{#2}{#3}}% }% } \scrlayerAddToInterface\sls@@renewelement{% \newcommand*{\sls@@renewelement}[3]{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\sls@@@@renewelement{#1}{#2}{#3}}% {\sls@@@renewelement{#1}{#2}{#3}}% }% diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx index 951299b9585..d91b561ac72 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx @@ -2,7 +2,7 @@ % \iffalse^^A meta-comment % ====================================================================== % scrlayer.dtx -% Copyright (c) Markus Kohm, 2012-2015 +% Copyright (c) Markus Kohm, 2012-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrlayer.dtx -% Copyright (c) Markus Kohm, 2012-2015 +% Copyright (c) Markus Kohm, 2012-2016 % % Diese Datei ist Teil der LaTeX2e KOMA-Script-Sammlung. % @@ -57,18 +57,18 @@ % Right brace \} Tilde \~} % % \iffalse^^A meta-comment -%<identify>%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (identify) -%<init>%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init) -%<options>%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options) -%<body>%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body) -%<final>%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (final) +%<identify>%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify) +%<init>%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init) +%<options>%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (options) +%<body>%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (body) +%<final>%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z 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-07-30 11:39:05 +0200 (Thu, 30 Jul 2015) $ + \filedate$Date: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 2172 $ + \filerevision$Revision: 2429 $ \endgroup \ProvidesFile{scrlayer.dtx}[\filedate\space\filerevision\space %</dtx> @@ -744,6 +744,8 @@ % \end{macro} % % \begin{macro}{\automark} +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\@automark} % This is the brain knot of the game! I'll try to explain, what I'm doing: % First of all the new starred version of \Macro{automark} doesn't reset the @@ -752,7 +754,7 @@ % \begin{macrocode} %<*package&body> \newcommand*{\automark}{% - \@ifstar{\@automark}{\manualmark\@automark}% + \kernel@ifstar{\@automark}{\manualmark\@automark}% } \newcommand*{\@automark}[2][]{% \ifstr{#2}{}{% @@ -2717,6 +2719,8 @@ % % \begin{macro}{\ForEachLayerOfPageStyle} % \changes{v3.18}{2015/05/14}{star version of the command}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{description} % \item[\Parameter{string}:] a valid page style (must be fully expandable % and expand to the name of a existing page style); note, that currently @@ -2731,7 +2735,7 @@ % \begin{macrocode} %<*package&body> \newcommand*{\ForEachLayerOfPageStyle}{% - \@ifstar {\@s@ForEachLayerOfPageStyle}{\@ForEachLayerOfPageStyle}% + \kernel@ifstar {\@s@ForEachLayerOfPageStyle}{\@ForEachLayerOfPageStyle}% } \newcommand*{\@ForEachLayerOfPageStyle}[2]{% \begingroup @@ -2835,6 +2839,8 @@ } % \end{macrocode} % \begin{macro}{\scr@layerbox} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\scr@@layerbox} % The layer box is used to output a layer in \cs{@oddhead}, \cs{@evenhead}, % \cs{@oddfoot}, or \cs{@evenfoot}. Is has two pairs of arguments: ($x,y$) @@ -2847,7 +2853,7 @@ % \cs{parbox}. % \begin{macrocode} \def\scr@layerbox(#1,#2)(#3,#4){% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\scr@@layerbox(#1,#2)(#3,#4)}{\scr@@layerbox(#1,#2)(#3,#4)[]}% } \def\scr@@layerbox(#1,#2)(#3,#4)[#5]#6{% diff --git a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx index c0b5498135b..06270977ab9 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx @@ -1,8 +1,8 @@ -% \CheckSum{781} +% \CheckSum{785} % \iffalse meta-comment % ====================================================================== % scrlfile.dtx -% Copyright (c) Markus Kohm, 2002-2013 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the work `scrlfile' which is part of the LaTeX2e % KOMA-Script bundle. @@ -21,7 +21,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrlfile.dtx -% Copyright (c) Markus Kohm, 2002-2013 +% Copyright (c) Markus Kohm, 2002-2016 % % Diese Datei ist Teil des Werks `scrlfile', das wiederum Teil des % LaTeX2e KOMA-Script Pakets ist. @@ -59,7 +59,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ +%%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $ %<*driver> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \ProvidesFile{scrlfile.dtx}[% @@ -742,6 +742,10 @@ % \begin{macro}{\AfterFile} % \begin{macro}{\BeforeClass} % \begin{macro}{\AfterClass} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\AfterAtEndOfClass} % \begin{macro}{\@AfterClass} % \begin{macro}{\@@AfterClass} @@ -751,6 +755,10 @@ % \begin{macro}{\@sAfterClass} % \begin{macro}{\BeforePackage} % \begin{macro}{\AfterPackage} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\AfterAtEndOfPackage} % \begin{macro}{\@AfterPackage} % \begin{macro}{\@@AfterPackage} @@ -772,9 +780,9 @@ \newcommand*{\BeforeClass}[1]{% \scr@set@load@hook{before}{#1.\@clsextension}} \newcommand*{\AfterClass}{% - \@ifstar {\@sAfterClass}{% - \@ifnextchar +\@@AfterClass{% - \@ifnextchar !\@@@AfterClass\@AfterClass + \kernel@ifstar {\@sAfterClass}{% + \kernel@ifnextchar +\@@AfterClass{% + \kernel@ifnextchar !\@@@AfterClass\@AfterClass }% }% } @@ -812,9 +820,9 @@ \newcommand*{\BeforePackage}[1]{% \scr@set@load@hook{before}{#1.\@pkgextension}} \newcommand*{\AfterPackage}{% - \@ifstar {\@sAfterPackage}{% - \@ifnextchar +\@@AfterPackage{% - \@ifnextchar !\@@@AfterPackage\@AfterPackage + \kernel@ifstar {\@sAfterPackage}{% + \kernel@ifnextchar +\@@AfterPackage{% + \kernel@ifnextchar !\@@@AfterPackage\@AfterPackage }% }% } @@ -872,8 +880,12 @@ % \changes{v3.11a}{2012/06/13}{write fault error in \cs{MessageBreak} fixed} % \changes{v3.12}{2012/06/15}{new star version allowes empty argument with % info instead of warning} +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\@PreventPackageFromLoading} % \changes{v3.12}{2012/06/15}{New (internal)}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@PreventPackageFromLoading} % \changes{v3.12}{2013/11/22}{New (internal)}^^A % \changes{v3.12}{2013/11/22}{\cs{usepackage} before \cs{documentclass} @@ -887,11 +899,11 @@ \let\scrlfile@excludedpackages\@empty \newcommand*{\scrlfile@saved@RequirePackage}{} \newcommand*{\PreventPackageFromLoading}{% - \@ifstar{\@PreventPackageFromLoading\PackageInfo}% + \kernel@ifstar{\@PreventPackageFromLoading\PackageInfo}% {\@PreventPackageFromLoading\PackageWarning}% } \newcommand*{\@PreventPackageFromLoading}[1]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\@@PreventPackageFromLoading#1}{\@@PreventPackageFromLoading#1[]}% } \newcommand*{\@@PreventPackageFromLoading}{} @@ -1004,13 +1016,15 @@ % \end{macrocode} % \begin{macro}{\UnPreventPackageFromLoading} % \changes{v3.12}{2013/11/22}{New}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\@UnPreventPackageFromLoading} % \changes{v3.12}{2013/11/22}{New (internal)}^^A % This removes packages from the prevent exclude list. The star variant also % undefines the instead code. % \begin{macrocode} \newcommand*{\UnPreventPackageFromLoading}{% - \@ifstar {\@tempswatrue\@UnPreventPackageFromLoading}% + \kernel@ifstar {\@tempswatrue\@UnPreventPackageFromLoading}% {\@tempswafalse\@UnPreventPackageFromLoading}% } \newcommand*{\@UnPreventPackageFromLoading}[1]{% @@ -1113,6 +1127,16 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\kernel@ifstar} +% \changes{v3.20}{2016/04/12}{New (internal)} +% I hope, the \LaTeX{} kernel will define this command in future. But +% nevertheless, there are \LaTeX{} kernels in real live without this +% command. So I do it again if needed: +% \begin{macrocode} +\providecommand*\kernel@ifstar[1]{\kernel@ifnextchar*{\@firstoftwo{#1}}} +% \end{macrocode} +% \end{macro}^^A \kernel@ifstar +% % \begin{macro}{\BeforeClosingMainAux} % \changes{v2.95}{2002/09/03}{new} % \begin{macro}{\AfterReadingMainAux} diff --git a/Master/texmf-dist/source/latex/koma-script/scrmain.ins b/Master/texmf-dist/source/latex/koma-script/scrmain.ins index 228b27ff38f..245d58351d7 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrmain.ins +++ b/Master/texmf-dist/source/latex/koma-script/scrmain.ins @@ -90,6 +90,7 @@ \from{scrkernel-version.dtx}{class,book}% \from{scrkernel-basics.dtx}{load}% \from{tocbasic.dtx}{class,load,chapter}% + \from{scrkernel-tocstyle.dtx}{class,book,prepare}% \from{scrkernel-sections.dtx}{class,book,prepare}% \from{scrkernel-compatibility.dtx}{class,book,option}% \from{scrkernel-miscellaneous.dtx}{class,book,option}% @@ -98,6 +99,7 @@ \from{scrkernel-typearea.dtx}{class,book,option}% \from{scrkernel-paragraphs.dtx}{class,book,option}% \from{scrkernel-title.dtx}{class,book,option}% + \from{scrkernel-tocstyle.dtx}{class,book,option}% \from{scrkernel-sections.dtx}{class,book,option}% \from{scrkernel-pagestyles.dtx}{class,book,option}% \from{scrkernel-floats.dtx}{class,book,option}% @@ -114,6 +116,11 @@ \from{scrkernel-typearea.dtx}{class,book,body}% \from{scrkernel-paragraphs.dtx}{class,book,body}% \from{scrkernel-title.dtx}{class,book,body}% + \from{scrkernel-tocstyle.dtx}{class,book,body}% + \from{scrkernel-tocstyle.dtx}{class,book,style,part}% + \from{scrkernel-tocstyle.dtx}{class,book,style,chapter}% + \from{scrkernel-tocstyle.dtx}{class,book,style,section}% + \from{scrkernel-tocstyle.dtx}{class,book,style,default}% \from{scrkernel-sections.dtx}{class,book,body}% \from{scrkernel-miscellaneous.dtx}{class,book,body}% \from{scrkernel-pagestyles.dtx}{class,book,body}% @@ -129,6 +136,7 @@ \from{scrkernel-version.dtx}{class,report}% \from{scrkernel-basics.dtx}{load}% \from{tocbasic.dtx}{class,load,chapter}% + \from{scrkernel-tocstyle.dtx}{class,report,prepare}% \from{scrkernel-sections.dtx}{class,report,prepare}% \from{scrkernel-compatibility.dtx}{class,report,option}% \from{scrkernel-miscellaneous.dtx}{class,report,option}% @@ -137,6 +145,7 @@ \from{scrkernel-typearea.dtx}{class,report,option}% \from{scrkernel-paragraphs.dtx}{class,report,option}% \from{scrkernel-title.dtx}{class,report,option}% + \from{scrkernel-tocstyle.dtx}{class,report,option}% \from{scrkernel-sections.dtx}{class,report,option}% \from{scrkernel-pagestyles.dtx}{class,report,option}% \from{scrkernel-floats.dtx}{class,report,option}% @@ -153,6 +162,11 @@ \from{scrkernel-typearea.dtx}{class,report,body}% \from{scrkernel-paragraphs.dtx}{class,report,body}% \from{scrkernel-title.dtx}{class,report,body}% + \from{scrkernel-tocstyle.dtx}{class,report,body}% + \from{scrkernel-tocstyle.dtx}{class,report,style,part}% + \from{scrkernel-tocstyle.dtx}{class,report,style,chapter}% + \from{scrkernel-tocstyle.dtx}{class,report,style,section}% + \from{scrkernel-tocstyle.dtx}{class,report,style,default}% \from{scrkernel-sections.dtx}{class,report,body}% \from{scrkernel-miscellaneous.dtx}{class,report,body}% \from{scrkernel-pagestyles.dtx}{class,report,body}% @@ -168,6 +182,7 @@ \from{scrkernel-version.dtx}{class,article}% \from{scrkernel-basics.dtx}{load}% \from{tocbasic.dtx}{class,load}% + \from{scrkernel-tocstyle.dtx}{class,article,prepare}% \from{scrkernel-sections.dtx}{class,article,prepare}% \from{scrkernel-compatibility.dtx}{class,article,option}% \from{scrkernel-miscellaneous.dtx}{class,article,option}% @@ -176,6 +191,7 @@ \from{scrkernel-typearea.dtx}{class,article,option}% \from{scrkernel-paragraphs.dtx}{class,article,option}% \from{scrkernel-title.dtx}{class,article,option}% + \from{scrkernel-tocstyle.dtx}{class,article,option}% \from{scrkernel-sections.dtx}{class,article,option}% \from{scrkernel-pagestyles.dtx}{class,article,option}% \from{scrkernel-floats.dtx}{class,article,option}% @@ -192,6 +208,11 @@ \from{scrkernel-typearea.dtx}{class,article,body}% \from{scrkernel-paragraphs.dtx}{class,article,body}% \from{scrkernel-title.dtx}{class,article,body}% + \from{scrkernel-tocstyle.dtx}{class,article,body}% + \from{scrkernel-tocstyle.dtx}{class,article,style,part}% + \from{scrkernel-tocstyle.dtx}{class,article,style,section}% + \from{scrkernel-tocstyle.dtx}{class,article,style,subsection}% + \from{scrkernel-tocstyle.dtx}{class,article,style,default}% \from{scrkernel-sections.dtx}{class,article,body}% \from{scrkernel-miscellaneous.dtx}{class,article,body}% \from{scrkernel-pagestyles.dtx}{class,article,body}% diff --git a/Master/texmf-dist/source/latex/koma-script/scrpage.dtx b/Master/texmf-dist/source/latex/koma-script/scrpage.dtx index c74023d6c8b..1425c5e2227 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrpage.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrpage.dtx @@ -2,7 +2,7 @@ % \iffalse % ====================================================================== % scrpage.dtx -% Copyright (c) Markus Kohm, 1995-2013 +% Copyright (c) Markus Kohm, 1995-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrpage.dtx -% Copyright (c) Markus Kohm, 1995-2013 +% Copyright (c) Markus Kohm, 1995-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,7 +55,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $ +%%% From File: $Id: scrpage.dtx 2428 2016-04-12 10:31:07Z kohm $ %<scrpage>\NeedsTeXFormat{LaTeX2e}[1995/06/01] %<*driver> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi @@ -568,21 +568,25 @@ % % \begin{macro}{\def@head} % \changes{v2.5}{2010/04/22}{new (internal)} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\def@@head} % \changes{v2.0}{2001/04/20}{Thickness and length of the lines are % optional} % \changes{v2.0j}{2001/08/18}{Use of \cs{scr@nouppercase}} % \changes{v2.5}{2010/04/22}{new (internal)} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % This was real simple, but we already have to do the real definition % of the heads and foots. First the head: % \begin{macrocode} \def\def@head{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\def@@head}% {\def@@head(\scr@headabove@linelength,% \scr@headabove@linethickness)}} \def\def@@head(#1,#2)#3#4#5{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\def@@@head({#1},{#2}){#3}{#4}{#5}}% {\def@@@head({#1},{#2}){#3}{#4}{#5}% (\scr@headbelow@linelength,% @@ -622,8 +626,12 @@ % \changes{v1.3}{2001/03/30}{Use of \cmd\@footwidth instead of % \cs{textwidth}} % \changes{v2.5}{2010/04/22}{new (internal)} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\def@@foot} % \changes{v2.5}{2010/04/22}{new (internal)} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\def@@@foot} % \changes{v2.0j}{2001/08/18}{Use of \cs{scr@nouppercase}} % \changes{v2.2f}{2008/02/14}{Use of \cs{footfont}} @@ -631,12 +639,12 @@ % And last twosided and onesided foot: % \begin{macrocode} \def\def@foot{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\def@@foot} {\def@@foot(\scr@footabove@linelength,% \scr@footabove@linethickness)}} \def\def@@foot(#1,#2)#3#4#5{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\def@@@foot({#1},{#2}){#3}{#4}{#5}}% {\def@@@foot({#1},{#2}){#3}{#4}{#5}% (\scr@footbelow@linelength,% @@ -887,9 +895,11 @@ % \end{macro} % Next we check, if there is an optional argument: % \begin{macro}{\@deftripstyle} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macrocode} \def\@deftripstyle[#1]#2{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\@@deftripstyle[#1]{#2}}% {\@@deftripstyle[#1]{#2}[\z@]}} % \end{macrocode} @@ -899,11 +909,13 @@ % \begin{macrocode} \def\@@deftripstyle[#1]#2[#3]{% % \end{macrocode} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Ok, now we have the problem, that there can be only 9 arguments. So we % have to distinguish the star-versions by a macro: % \begin{macrocode} \def\@tempa{#1}% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\@@@deftripstyle#2[#3]}% {\@@@deftripstyle#2[\z@][#3]}} % \end{macrocode} @@ -1434,17 +1446,21 @@ \newcommand*{\setfootbotline}{\scr@setline{foot}{below}} % \end{macrocode} % \begin{macro}{\scr@setline} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@scr@setline} % \changes{v2.0d}{2001/06/19}{symbolic values implemented} % \begin{macro}{\@@scr@setline} % \changes{v2.0d}{2001/06/18}{macro name fixed} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@scr@set@pre@line} % \changes{v2.2}{2004/07/05}{New internal} % The real change of the lines is done with the macros % \cs{scr@setline}, \cs{@scr@setline} and \cs{@@scr@setline}: % \begin{macrocode} \def\scr@setline#1#2{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\@scr@setline{#1}{#2}}{\@@scr@setline{#1#2}}% } \def\@scr@setline#1#2[#3]{% @@ -1462,7 +1478,7 @@ \expandafter\edef\csname scr@#1@linethickness\endcsname% {\the\@tempdima}% \fi\fi - \@ifnextchar[%] + \kernel@ifnextchar[%] {\@src@set@pre@line{#1}}{}% } \def\@src@set@pre@line#1[#2]{% @@ -1874,118 +1890,154 @@ % % \begin{macro}{\ihead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\ohead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\chead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\lehead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\lohead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\rehead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\rohead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\cehead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\cohead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\ifoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\ofoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\cfoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\lefoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\lofoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\refoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\rofoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\cefoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\cofoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % We also need macros to define the contents of the three part head % and foot. Each macro defines one of the part of head or foot of the % scrheadings pagestyle and optional of the scrplain pagestyle. % \begin{macrocode} -\newcommand{\ihead}{\@ifnextchar[{\@@lhead}{\@lhead}} +\newcommand{\ihead}{\kernel@ifnextchar[{\@@lhead}{\@lhead}} \newcommand{\@lhead}[1]{\@rehead{#1}\@lohead{#1}} \newcommand{\@@lhead}[2][]{\@@rehead[{#1}]{#2}\@@lohead[{#1}]{#2}} -\newcommand{\ohead}{\@ifnextchar[{\@@rhead}{\@rhead}} +\newcommand{\ohead}{\kernel@ifnextchar[{\@@rhead}{\@rhead}} \newcommand{\@rhead}[1]{\@lehead{#1}\@rohead{#1}} \newcommand{\@@rhead}[2][]{\@@lehead[{#1}]{#2}\@@rohead[{#1}]{#2}} -\newcommand{\chead}{\@ifnextchar[{\@@chead}{\@chead}} +\newcommand{\chead}{\kernel@ifnextchar[{\@@chead}{\@chead}} \newcommand{\@chead}[1]{\@cehead{#1}\@cohead{#1}} \newcommand{\@@chead}[2][]{\@@cehead[{#1}]{#2}\@@cohead[{#1}]{#2}} -\newcommand{\lehead}{\@ifnextchar[{\@@lehead}{\@lehead}} +\newcommand{\lehead}{\kernel@ifnextchar[{\@@lehead}{\@lehead}} \newcommand{\@lehead}[1]{\renewcommand*{\scrheadings@even@left@head}{#1}} \newcommand{\@@lehead}[2][]{% \renewcommand*{\scrplain@even@left@head}{#1}% \renewcommand*{\scrheadings@even@left@head}{#2}} -\newcommand{\lohead}{\@ifnextchar[{\@@lohead}{\@lohead}} +\newcommand{\lohead}{\kernel@ifnextchar[{\@@lohead}{\@lohead}} \newcommand{\@lohead}[1]{\renewcommand*{\scrheadings@odd@left@head}{#1}} \newcommand{\@@lohead}[2][]{% \renewcommand*{\scrplain@odd@left@head}{#1}% \renewcommand*{\scrheadings@odd@left@head}{#2}} -\newcommand{\rehead}{\@ifnextchar[{\@@rehead}{\@rehead}} +\newcommand{\rehead}{\kernel@ifnextchar[{\@@rehead}{\@rehead}} \newcommand{\@rehead}[1]{\renewcommand*{\scrheadings@even@right@head}{#1}} \newcommand{\@@rehead}[2][]{% \renewcommand*{\scrplain@even@right@head}{#1}% \renewcommand*{\scrheadings@even@right@head}{#2}} -\newcommand{\rohead}{\@ifnextchar[{\@@rohead}{\@rohead}} +\newcommand{\rohead}{\kernel@ifnextchar[{\@@rohead}{\@rohead}} \newcommand{\@rohead}[1]{\renewcommand*{\scrheadings@odd@right@head}{#1}} \newcommand{\@@rohead}[2][]{% \renewcommand*{\scrplain@odd@right@head}{#1}% \renewcommand*{\scrheadings@odd@right@head}{#2}} -\newcommand{\cehead}{\@ifnextchar[{\@@cehead}{\@cehead}} +\newcommand{\cehead}{\kernel@ifnextchar[{\@@cehead}{\@cehead}} \newcommand{\@cehead}[1]{\renewcommand*{\scrheadings@even@middle@head}{#1}} \newcommand{\@@cehead}[2][]{% \renewcommand*{\scrplain@even@middle@head}{#1}% \renewcommand*{\scrheadings@even@middle@head}{#2}} -\newcommand{\cohead}{\@ifnextchar[{\@@cohead}{\@cohead}} +\newcommand{\cohead}{\kernel@ifnextchar[{\@@cohead}{\@cohead}} \newcommand{\@cohead}[1]{\renewcommand*{\scrheadings@odd@middle@head}{#1}} \newcommand{\@@cohead}[2][]{% \renewcommand*{\scrplain@odd@middle@head}{#1}% \renewcommand*{\scrheadings@odd@middle@head}{#2}} -\newcommand{\ifoot}{\@ifnextchar[{\@@lfoot}{\@lfoot}} +\newcommand{\ifoot}{\kernel@ifnextchar[{\@@lfoot}{\@lfoot}} \newcommand{\@lfoot}[1]{\@refoot{#1}\@lofoot{#1}} \newcommand{\@@lfoot}[2][]{\@@refoot[{#1}]{#2}\@@lofoot[{#1}]{#2}} -\newcommand{\ofoot}{\@ifnextchar[{\@@rfoot}{\@rfoot}} +\newcommand{\ofoot}{\kernel@ifnextchar[{\@@rfoot}{\@rfoot}} \newcommand{\@rfoot}[1]{\@lefoot{#1}\@rofoot{#1}} \newcommand{\@@rfoot}[2][]{\@@lefoot[{#1}]{#2}\@@rofoot[{#1}]{#2}} -\newcommand{\cfoot}{\@ifnextchar[{\@@cfoot}{\@cfoot}} +\newcommand{\cfoot}{\kernel@ifnextchar[{\@@cfoot}{\@cfoot}} \newcommand{\@cfoot}[1]{\@cefoot{#1}\@cofoot{#1}} \newcommand{\@@cfoot}[2][]{\@@cefoot[{#1}]{#2}\@@cofoot[{#1}]{#2}} -\newcommand{\lefoot}{\@ifnextchar[{\@@lefoot}{\@lefoot}} +\newcommand{\lefoot}{\kernel@ifnextchar[{\@@lefoot}{\@lefoot}} \newcommand{\@lefoot}[1]{\renewcommand*{\scrheadings@even@left@foot}{#1}} \newcommand{\@@lefoot}[2][]{% \renewcommand*{\scrplain@even@left@foot}{#1}% \renewcommand*{\scrheadings@even@left@foot}{#2}} -\newcommand{\lofoot}{\@ifnextchar[{\@@lofoot}{\@lofoot}} +\newcommand{\lofoot}{\kernel@ifnextchar[{\@@lofoot}{\@lofoot}} \newcommand{\@lofoot}[1]{\renewcommand*{\scrheadings@odd@left@foot}{#1}} \newcommand{\@@lofoot}[2][]{% \renewcommand*{\scrplain@odd@left@foot}{#1}% \renewcommand*{\scrheadings@odd@left@foot}{#2}} -\newcommand{\refoot}{\@ifnextchar[{\@@refoot}{\@refoot}} +\newcommand{\refoot}{\kernel@ifnextchar[{\@@refoot}{\@refoot}} \newcommand{\@refoot}[1]{\renewcommand*{\scrheadings@even@right@foot}{#1}} \newcommand{\@@refoot}[2][]{% \renewcommand*{\scrplain@even@right@foot}{#1}% \renewcommand*{\scrheadings@even@right@foot}{#2}} -\newcommand{\rofoot}{\@ifnextchar[{\@@rofoot}{\@rofoot}} +\newcommand{\rofoot}{\kernel@ifnextchar[{\@@rofoot}{\@rofoot}} \newcommand{\@rofoot}[1]{\renewcommand*{\scrheadings@odd@right@foot}{#1}} \newcommand{\@@rofoot}[2][]{% \renewcommand*{\scrplain@odd@right@foot}{#1}% \renewcommand*{\scrheadings@odd@right@foot}{#2}} -\newcommand{\cefoot}{\@ifnextchar[{\@@cefoot}{\@cefoot}} +\newcommand{\cefoot}{\kernel@ifnextchar[{\@@cefoot}{\@cefoot}} \newcommand{\@cefoot}[1]{\renewcommand*{\scrheadings@even@middle@foot}{#1}} \newcommand{\@@cefoot}[2][]{% \renewcommand*{\scrplain@even@middle@foot}{#1}% \renewcommand*{\scrheadings@even@middle@foot}{#2}} -\newcommand{\cofoot}{\@ifnextchar[{\@@cofoot}{\@cofoot}} +\newcommand{\cofoot}{\kernel@ifnextchar[{\@@cofoot}{\@cofoot}} \newcommand{\@cofoot}[1]{\renewcommand*{\scrheadings@odd@middle@foot}{#1}} \newcommand{\@@cofoot}[2][]{% \renewcommand*{\scrplain@odd@middle@foot}{#1}% diff --git a/Master/texmf-dist/source/latex/koma-script/scrsource.tex b/Master/texmf-dist/source/latex/koma-script/scrsource.tex index efb88b62478..5528efed674 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrsource.tex +++ b/Master/texmf-dist/source/latex/koma-script/scrsource.tex @@ -108,6 +108,7 @@ \DocInclude{scrkernel-title} \DocInclude{scrkernel-sections} \DocInclude{scrkernel-listsof} + \IfFileExists{scrkernel-tocstyle.dtx}{\DocInclude{scrkernel-tocstyle}}{} \DocInclude{scrkernel-bibliography} \DocInclude{scrkernel-index} \DocInclude{scrkernel-listsandtabulars} diff --git a/Master/texmf-dist/source/latex/koma-script/scrstrip.inc b/Master/texmf-dist/source/latex/koma-script/scrstrip.inc index cd844729d10..406341f196d 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrstrip.inc +++ b/Master/texmf-dist/source/latex/koma-script/scrstrip.inc @@ -1,6 +1,6 @@ % ====================================================================== % scrstrip.inc -% Copyright (c) Markus Kohm, 2002-2014 +% Copyright (c) Markus Kohm, 2002-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -22,7 +22,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrstrip.inc -% Copyright (c) Markus Kohm, 2002-2014 +% Copyright (c) Markus Kohm, 2002-2016 % % Diese Datei ist Teil des LaTeX2e-KOMA-Script-Pakets. % @@ -54,7 +54,7 @@ \KOMAdefVariable{AUTHOR}{Markus Kohm} \KOMAdefVariable{EMAIL}{[komascript at gmx info]} \KOMAdefVariable{COPYRIGHTFROM}{1994} -\KOMAdefVariable{COPYRIGHTTILL}{2014} +\KOMAdefVariable{COPYRIGHTTILL}{2016} \let\ifbeta=\iffalse % with = will be replaced by release process diff --git a/Master/texmf-dist/source/latex/koma-script/scrtime.dtx b/Master/texmf-dist/source/latex/koma-script/scrtime.dtx index 7e87469db80..61c09b5cfb0 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrtime.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrtime.dtx @@ -2,7 +2,7 @@ % \iffalse % ====================================================================== % scrtime.dtx -% Copyright (c) Markus Kohm, 1995-2014 +% Copyright (c) Markus Kohm, 1995-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrtime.dtx -% Copyright (c) Markus Kohm, 1995-2014 +% Copyright (c) Markus Kohm, 1995-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,15 +55,15 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ +%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $ %<package&identify>\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: 2014-12-11 14:46:00 +0100 (Thu, 11 Dec 2014) $ + \filedate$Date: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} - \filerevision$Revision: 1874 $ + \filerevision$Revision: 2429 $ \endgroup \ProvidesFile{scrtime.dtx}[\filedate\space\filerevision\space %</driver> @@ -209,13 +209,15 @@ % We use |\@tempcnta| and |\@tempcntb| but we know, that this is not % a very good idea. % -% \begin{macro}{\thistime} -% \changes{v1.1b}{1995/02/15}{{\cmd\thistime*} added.} -% \changes{v1.1b}{1995/02/15}{{\cmd\thistime} works.} +% \begin{macro}{\thistime} +% \changes{v1.1b}{1995/02/15}{{\cmd\thistime*} added.}^^A +% \changes{v1.1b}{1995/02/15}{{\cmd\thistime} works.}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % First we have to decide, is it a star-version ore not. % \begin{macrocode} \def\thistime{% - \@ifstar + \kernel@ifstar {\let\@tempif\iffalse\@thistime} {\let\@tempif\iftrue\@thistime}} % \end{macrocode} @@ -249,7 +251,7 @@ % \begin{macrocode} \newcommand*{\settime}[1]{\renewcommand*{\@thistime}[1][]{#1}} % \end{macrocode} -% \end{macro} +% \end{macro} % % % \iffalse diff --git a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx index 86d5a72d482..d7cc63d857a 100644 --- a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx +++ b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx @@ -1,8 +1,8 @@ -% \CheckSum{1465} +% \CheckSum{1499} % \iffalse meta-comment % ====================================================================== % tocbasic.dtx -% Copyright (c) Markus Kohm, 2008-2015 +% Copyright (c) Markus Kohm, 2008-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -17,12 +17,10 @@ % % The Current Maintainer and author of this work is Markus Kohm. % -% This work consists of files `tocbasic.dtx' and `scrlogo.dtx' at least. -% % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % tocbasic.dtx -% Copyright (c) Markus Kohm, 2008-2015 +% Copyright (c) Markus Kohm, 2008-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -57,32 +55,37 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ +%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $ +%<identify>%%% (run: identify) +%<prepare>%%% (run: prepare) +%<option>%%% (run: option) +%<execoption>%%% (run: execoption) +%<body>%%% (run: body) +%<exit>%%% (run: exit) %<*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-20 08:38:46 +0200 (Sat, 20 Jun 2015) $ + \filedate$Date: 2016-04-29 17:59:32 +0200 (Fri, 29 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1962 $ \endgroup \ProvidesFile{tocbasic.dtx}[\filedate\space\filerevision\space %</dtx> -%<package>\NeedsTeXFormat{LaTeX2e}[1995/12/01] -%<doc>\ProvidesFile{tocbasic.tex}[% -%<package>\ProvidesPackage{tocbasic}[% -%<*dtx|package|driver|doc> +%<package&identify>\NeedsTeXFormat{LaTeX2e}[1995/12/01] +%<package&identify>\ProvidesPackage{tocbasic}[% +%<*dtx|(package&identify)|driver> %!KOMAScriptVersion package -%</dtx|package|driver|doc> +%</dtx|(package&identify)|driver> %<driver> (driver)% -%<package|doc> (handling toc-files)% +%<package&identify> (handling toc-files)% %<*dtx> (dtx)% %</dtx> -%<*dtx|package|driver|doc> +%<*dtx|(package&identify)|driver> ] -%</dtx|package|driver|doc> +%</dtx|(package&identify)|driver> %<*dtx> \ifx\documentclass\undefined \input scrdocstrip.tex @@ -90,14 +93,21 @@ \@@input scrstrip.inc \KOMAdefVariable{COPYRIGHTFROM}{2008} \generate{\usepreamble\defaultpreamble - \useWarning\@gobbletwo - \file{tocbasic.tex}{% - \from{tocbasic.dtx}{doc}% - }% - } - \generate{\usepreamble\defaultpreamble \file{tocbasic.sty}{% - \from{tocbasic.dtx}{package}% + \from{tocbasic.dtx}{package,identify}% + \from{tocbasic.dtx}{package,prepare}% + \from{scrkernel-tocstyle.dtx}{package,prepare}% + \from{tocbasic.dtx}{package,option}% + \from{scrkernel-tocstyle.dtx}{package,option}% + \from{tocbasic.dtx}{package,body}% + \from{scrkernel-tocstyle.dtx}{package,body}% + \from{scrkernel-tocstyle.dtx}{package,style,gobble}% + \from{scrkernel-tocstyle.dtx}{package,style,dottedtocline}% + \from{scrkernel-tocstyle.dtx}{package,style,undottedtocline}% + \from{scrkernel-tocstyle.dtx}{package,style,largetocline}% + \from{scrkernel-tocstyle.dtx}{package,style,tocline}% + \from{scrkernel-tocstyle.dtx}{package,style,default}% + \from{tocbasic.dtx}{package,exit}% \from{scrlogo.dtx}{logo}% }% }% @@ -127,55 +137,9 @@ \DocInput{\filename} \end{document} %</driver> +%<*dtx> % \fi % -% \providecommand*{\DescribeCounter}{\DescribeMacro} -% \let\Macro\cs -% \let\Class\textsf -% \let\Package\textsf -% \let\File\texttt -% \let\Environment\texttt -% \let\Parameter\marg -% \let\OParameter\oarg -% \let\PName\meta -% \let\PValue\texttt -% \let\Option\texttt -% \newenvironment{Example}{\quote -% \hspace*{-\leftmargin}\textbf{Example:}\enskip\ignorespaces -% }{\endquote} -% \newlength\descwidth -% \newenvironment{desctabular}{ -% \setlength{\descwidth}{\linewidth} -% \addtolength{\descwidth}{-1em} -% \addtolength{\descwidth}{-2\tabcolsep} -% \tabular{@{}lp{\descwidth}@{}} -% \hline -% }{% -% \hline -% \endtabular -% } -% \newcommand{\pventry}[2]{\multicolumn{2}{@{}l@{}}{\PValue{#1}}\\ -% ~ & #2 \\ } -% \providecommand*{\autoref}[1]{\expandafter\AUTOREF#1:} -% \newcommand*{\AUTOREF}{} -% \makeatletter -% \def\AUTOREF#1:#2:{\edef\@tempa{#1}\edef\@tempb{tab}\ifx\@tempa\@tempb -% table~\fi -% \edef\@tempb{sec}\ifx\@tempa\@tempb section~\fi -% \ref{#1:#2}} -% \makeatother -% \providecommand*{\BeginIndex}[2]{} -% \providecommand*{\IndexPackage}[2][]{\index{#2 (package)}} -% \providecommand*{\IndexCmd}[2][]{\index{\cs{#2}}} -% \providecommand*{\Index}[1][]{\index} -% \providecommand*{\IndexOption}[2][]{\index{#2 (option)}} -% \providecommand*{\IndexLength}[2][]{\index{\cs{#2} (length)}} -% \providecommand*{\textnote}[2][]{} -% \providecommand*{\important}[2][]{} -% \providecommand*{\KOption}[1]{\texttt{#1=}} -% \providecommand*{\OptionValue}[2]{\texttt{#1=#2}} -% \providecommand*{\ChangedAt}[2]{} -% % \begin{document} % \title{\KOMAScript{} \partname\ \texttt{\filename}% % \thanks{Diese Datei ist Version \fileversion\ von \texttt{\filename}.}} @@ -183,1680 +147,24 @@ % \author{Markus Kohm\thanks{mailto:komascript(at)gmx.info}} % \maketitle % \begin{abstract} -% \iffalse -%<*doc> - -\translator{Markus Kohm} - -% Date of the translated German file: 2012/03/14 - -\chapter[{Management of Tables and Lists of Contents Using - \Package{tocbasic}}] - {Management of Tables and Lists of Contents Using - \Package{tocbasic}\protect\footnote{This chapter has been generated from the - source of the package. It's not a 1-to-1 translation of the German - manual. Currently translation has not been finished}} -\labelbase{tocbasic} - -\BeginIndex{Package}{tocbasic}% -\BeginIndex{}{table of contents}% -\BeginIndex{}{list>of contents}% -\BeginIndex{}{file>extension}% -%</doc> -%<*doc|dtx> -% \fi -The main purpose of package \Package{tocbasic} is to provide features for -authors of classes and packages to create own tables or lists of contents like -the list of figures and the list of tables and thereby allow other classes or -packages some types of control over these. For examples package -\Package{tocbasic} delegates language control of all these tables and lists of -contents to package \Package{babel}\IndexPackage{babel}%^^A -%\iffalse^^A -\ (see \cite{package:babel})%^^A -%\fi^^A -. So automatic change of language will be provided inside -all these tables and lists of contents. Using \Package{tocbasic} will -exculpate authors of classes and packages from implementation of such -features. - -\KOMAScript{} itself uses \Package{tocbasic} not only for the table of -contents but also for the already mentioned lists of figures and tables. -% \iffalse -%<*dtx> -% \fi +% The main purpose of package \textsf{tocbasic} is to provide features for +% authors of classes and packages to create own tables or lists of contents +% like the list of figures and the list of tables and thereby allow other +% classes or packages some types of control over these. For examples package +% \textsf{tocbasic} delegates language control of all these tables and lists +% of contents to package \textsf{babel}. So automatic change of language +% will be provided inside all these tables and lists of contents. Using +% \textsf{tocbasic} will exculpate authors of classes and packages from +% implementation of such features. +% +% \KOMAScript{} itself uses \textsf{tocbasic} not only for the table of +% contents but also for the already mentioned lists of figures and tables. % \end{abstract} % % \tableofcontents % -% \section{Legal Note} -% \label{sec:tocbasic.legalnote} -% -% You are allowed to destribute this part of \KOMAScript{} without the main -% part of \KOMAScript{}. The files ``\File{scrlogo.dtx}'' and -% ``\File{tocbasic.dtx}'' may be distributed together under the conditions -% of the \LaTeX{} Project Public License, either version~1.3c of this license -% or (at your option) any later version. -% -% The latest version of this license is in -% \mbox{http://www.latex-project.org/lppl.txt} and version~1.3c or later is -% part of all distributions of \LaTeX{} version~2005/12/01 or later. -% -% The \KOMAScript{} bundle may be found at -% CTAN:/\mbox{macros}/\linebreak[3]\mbox{latex}/\linebreak[3]\mbox{contrib}/% -% \linebreak[3]\mbox{koma-script}/. -% ``CTAN:'' is a shortcut for every ``tex-archive'' directory at every -% CTAN-server or CTAN-mirror. See \mbox{http://www.ctan.org} for a list of all -% those servers and mirrors. -% -% \section{Using Package \Package{tocbasic}} -% \label{sec:tocbasic.usage} -% -% This package was made to be used by class and package authors. Because of -% this the package has no options. If different packages would load it with -% different options a option clash would be the result. So using options -% wouldn't be a good idea. -% -% This package may be used by by other class and package authors. It is also -% allowed to distribute it without the main part of \KOMAScript{} (see -% section~\ref{sec:tocbasic.legalnote}. Because of this, it does not use any -% \KOMAScript{} package, that isn't allowed to be distributed without the main -% part of \KOMAScript{}, too. Currently \Package{tocbasic} does only need -% package \Package{keyval} from the graphics bundle. -% -% There are two kind of commands. The first kind are basic command. Those -% are used to inform other packages about the extensions used for files that -% represent a list of something. Classes or packages may use this information -% e.\,g, for putting something to every of those files. Packages may also ask, -% if an extension is already in use. This does even work, if \Macro{nofiles} -% was used. The second kind are commands to create the list of something. -% \iffalse -%</dtx> -% \fi - -\section{Basic Commands} -\label{sec:tocbasic.basics} - -Basic commands are used to handle a list of all extensions\textnote{file - extension, table or list of contents} known for files representing a table -of contents or list of something. Entries to such files are typically written -using \Macro{addtocontents}\important{\Macro{addtocontents}, - \Macro{addcontentsline}} or \Macro{addcontentsline}. There are also -commands to do something for all known extensions. And there are commands to -set or unset features of an extension or the file represented by the -extension. Typically an extension also has an owner\textnote{file owner}. -This owner may be a class or package or a term decided by the author of the -class or package using \Package{tocbasic}, e.\,g., \KOMAScript{} uses the -owner \texttt{float} for list of figures and list of tables, and the file name -of the class file as owner for the table of contents. - -% \iffalse -\begin{Declaration} - \Macro{ifattoclist}\Parameter{extension}\Parameter{true - part}\Parameter{false part} -\end{Declaration} -\BeginIndex{Cmd}{ifattoclist}% -This command -%<*dtx> -%\fi -\DescribeMacro{\ifattoclist} -Command \Macro{ifattoclist}\Parameter{extension}\Parameter{true - instructions}\Parameter{false instructions} -% \iffalse -%</dtx> -% \fi -may be used to ask, wether or not an \PName{extension} is already a known -extension. If the \PName{extension} is already known the \PName{true - instructions} will be used, otherwise the \PName{false instructions} will be -used. -\begin{Example} - Maybe you want to know if the extension ``\File{foo}'' is already in use to - report an error, if you can not use it: -\begin{lstcode} - \ifattoclist{foo}{% - \PackageError{bar}{% - extension `foo' already in use% - }{% - Each extension may be used only - once.\MessageBreak - The class or another package already - uses extension `foo'.\MessageBreak - This error is fatal!\MessageBreak - You should not continue!}% - }{% - \PackageInfo{bar}{using extension `foo'}% - } -\end{lstcode} -\end{Example} -% \iffalse -\EndIndex{Cmd}{ifattoclist}% - -\begin{Declaration} - \Macro{addtotoclist}\OParameter{owner}\Parameter{extension} -\end{Declaration} -\BeginIndex{Cmd}{addtotoclist}% -This command -%<*dtx> -%\fi -\DescribeMacro{\addtotoclist} -Command \Macro{addtotoclist}\OParameter{owner}\Parameter{extension} -% \iffalse -%</dtx> -% \fi -adds the \PName{extension} to the list of known extensions. But if the -\PName{extension} is a known one already, then an error will be reported to -avoid double usage of the same \PName{extension}. - -If the optional argument, \OParameter{owner}, was given this \PName{owner} -will be stored to be the owner of the \PName{extension}. If the optional -argument has been omitted, \Package{tocbasic} tries to find out the file name -of the current processed class or package and stores this as owner. -This\textnote{Attention!} will fail if \Macro{addtotoclist} was not used, -loading a class or package but using a command of a class or package after -loading this class or package. In this case the owner will be set to -``\PValue{.}''. - -Please note\textnote{Attention!} that an empty \PName{owner} is not the same -like omitting the optional argument with the braces. An empty argument would -result in an empty owner. -\begin{Example} - You want to add the extension ``\File{foo}'' to the list of known extension, - while loading your package with file name ``\File{bar.sty}'': -\begin{lstcode} - \addtotoclist{foo} -\end{lstcode}% - This will add the extension ``\PValue{foo}'' with owner ``\PValue{bar.sty}'' - to the list of known extensions, if it was not already on the list of known - extensions. If the class or another package already added the extension you - will get the error: -\begin{lstoutput} - Package tocbasic Error: file extension `foo' cannot be used twice - - See the tocbasic package documentation for explanation. - Type H <return> for immediate help. -\end{lstoutput} - and after typing \texttt{H} and pressing the return key you will get the - help: -\begin{lstoutput} - File extension `foo' is already used by a toc-file, while bar.sty - tried to use it again for a toc-file. - This may be either an incompatibility of packages, an error at a package, - or a mistake by the user. -\end{lstoutput} - - Maybe your package has a command, that creates list of files dynamically. In - this case you should use the optional argument of \Macro{addtotoclist} to - set the owner. -\begin{lstcode} - \newcommand*{\createnewlistofsomething}[1]{% - \addtotoclist[bar.sty]{#1}% - % Do something more to make this list of something available - } -\end{lstcode} - If the user calls now, e.\,g., -\begin{lstcode} - \createnewlistofsomething{foo} -\end{lstcode} - this would add the extension ``\PValue{foo}'' with the owner - ``\PValue{bar.sty}'' to the list of known extension or report an error, if the - extension is already in use. -\end{Example} -You may use any owner you want. But it should be unique! So, if you would -be, e.\,g., the author of package \Package{float} you could use for example -owner ``\PValue{float}'' instead of owner ``\PValue{float.sty}'', so the -\KOMAScript{} options for the list of figures and the list of tables will also -handle the lists of this package. Those are already added to the known -extensions when the option is used. This is because \KOMAScript{} already -registers file extension ``\PValue{lof}'' for the list of figures and file -extension ``\PValue{lot}'' for the list of tables with owner -``\PValue{float}'' and sets options for this owner. -% \iffalse -\EndIndex{Cmd}{addtotoclist}% -% \fi - -% \iffalse -\begin{Declaration} - \Macro{AtAddToTocList}\OParameter{owner}\Parameter{instructions} -\end{Declaration} -\BeginIndex{Cmd}{AtAddToTocList}% -This command -%<*dtx> -%\fi -\DescribeMacro{\AtAddtoTocList} -Command \Macro{AtAddToTocList}\OParameter{owner}\Parameter{instructions} -% \iffalse -%</dtx> -% \fi -adds the \PName{instructions} to a internal list of instructions that will be -processed whenever a file extension with the given \PName{owner} will be -added to the list of known extensions using \Macro{addtotoclist}. The -optional argument is handled in the same way as with the command -\Macro{addtotoclist}. With an empty \PName{owner} you may -add \Parameter{instructions}, that will be processed at every successful -\Macro{addtotoclist}, after processing the instructions for the individual -owner. While processing the \PValue{instructions}, -\Macro{@currext}\IndexCmd{@currext}\important{\Macro{@currext}} will be set to -the extension of the currently added extension. -\begin{Example} - \Package{tocbasic} itself uses -\begin{lstcode} - \AtAddToTocList[]{% - \expandafter\tocbasic@extend@babel - \expandafter{\@currext}% - } -\end{lstcode} - to add every extension to the \Package{tocbasic}-internal babel handling of - files. -\end{Example} - -The two \Macro{expandafter} commands are needed, because the argument of -\Macro{tocbasic@extend@babel} has to be expanded! See the description of -\Macro{tocbasic@extend@babel} at \autoref{sec:tocbasic.internals}% -% \iffalse -, \autopageref{desc:tocbasic.cmd.tocbasic@extend@babel} -% \fi -for more information. -% \iffalse -\EndIndex{Cmd}{AtAddToTocList}% -% \fi - -% \iffalse -\begin{Declaration} - \Macro{removefromtoclist}\OParameter{owner}\Parameter{extension} -\end{Declaration} -\BeginIndex{Cmd}{removefromtoclist}% -This command -%<*dtx> -%\fi -\DescribeMacro{\removefromtoclist} -Command \Macro{removefromtotoclist}\OParameter{owner}\Parameter{extension} -% \iffalse -%</dtx> -% \fi -removes the \PName{extension} from the list of known extensions. If the -optional argument, \OParameter{owner}, was given, the \PName{extension} will -only be removed if it was added by this \PName{owner}. See description of -\Macro{addtotoclist} for information of omitting optional argument. Note that -an empty \PName{owner} is not the same like omitting the optional argument, -but removes the \PName{extension} without any owner test.% -% \iffalse -\EndIndex{Cmd}{removefromtoclist}% -% \fi - -% \iffalse -\begin{Declaration} - \Macro{doforeachtocfile}\OParameter{owner}\Parameter{instructions} -\end{Declaration} -\BeginIndex{Cmd}{doforeachtocfile}% -%<*dtx> -% \fi -\DescribeMacro{\doforeachtocfile} -% \iffalse -%</dtx> -% \fi -Until now you've learned to know commands that result in more safety in -handling file extensions, but also needs some additional effort. With -\Macro{doforeachtocfile}%^^A -% \iffalse -%<*dtx> -% \fi -\OParameter{owner}\Parameter{instructions}%^^A -% \iffalse -%</dtx> -% \fi -\ you will win for this. The command provides to processes \PName{instructions} -for every known file extension of the given \PName{owner}. While processing -the \PName{instructions} \Macro{@currext} is the extension of the current -file. If you omit the optional argument, \OParameter{owner}, every known file -extensions independent from the owner will be used. If the optional argument -is empty, only file extensions with an empty owner will be processed. -\begin{Example} - If you want to type out all known extensions, you may simply write: -\begin{lstcode} - \doforeachtocfile{\typeout{\@currext}} -\end{lstcode} - and if only the extensions of owner ``\PValue{foo}'' should be typed out: -\begin{lstcode} - \doforeachtocfile[foo]{\typeout{\@currext}} -\end{lstcode} -\end{Example} -% \iffalse -\EndIndex{Cmd}{doforeachtocfile}% -% \fi - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\tocbasicautomode} -Command -% \iffalse -%</dtx> -\begin{Declaration} -% \fi - \Macro{tocbasicautomode} -% \iffalse -\end{Declaration} -\BeginIndex{Cmd}{tocbasicautomode}% -This command -% \fi -redefines \LaTeX{} kernel macro \Macro{@starttoc} to add all not yet added -extensions to the list of known extensions and use \Macro{tocbasic@starttoc} -instead of \Macro{@starttoc}. See \autoref{sec:tocbasic.internals}%^^A -% \iffalse -, \autopageref{desc:tocbasic.cmd.tocbasic@starttoc} -% \fi -for more information about \Macro{tocbasic@starttoc} and \Macro{@starttoc}. - -This means that after using \Macro{tocbasicautomode} every table of contents -or list of something, that will be generated using \Macro{@starttoc} will be -at least partially under control of \Package{tocbasic}. Whether or not this will -make the wanted result, depends on the individual table of contents and lists -of something. At least the \Package{babel} control extension for -all those tables of contents and lists of something will work. Nevertheless, -it would be better if the author of the corresponding class or package will -use \Package{tocbasic} explicitly. In that case additional advantages of -\Package{tocbasic} may be used that will be described at the following -sections.% -% \iffalse -\EndIndex{Cmd}{tocbasicautomode}% -% \fi - -\section{Creating a Table of Contents or List of Something} -\label{sec:tocbasic.toc} - -In the previous section you've seen commands to handle a list of known -extensions and to trigger commands while adding a new extension to this -list. You've also seen a command to do something for all known extensions or -all known extensions of one owner. In this section you will see commands to -handle the file corresponding with an extension or the list of known -extensions. - -% \iffalse -\begin{Declaration} - \Macro{addtoeachtocfile}\OParameter{owner}\Parameter{content} -\end{Declaration} -\BeginIndex{Cmd}{addtoeachtocfile}% -This command -%<*dtx> -% \fi -\DescribeMacro{\addtoeachtocfile} -Command \Macro{addtoeachtocfile}\OParameter{owner}\Parameter{content} -% \iffalse -%</dtx> -% \fi -writes \PName{content} to the files of every known file extension of -\PName{owner} using \LaTeX{} kernel command \Macro{addtocontents}. If you omit -the optional argument, \PName{content} is written to the files of every known -file extension. Furthermore, the practical file name is built from -\Macro{jobname} and the file extension. While writing the \PName{content}, -\Macro{@currext}\IndexCmd{@currext}\important{\Macro{@currext}} is the -extension of the currently handled file. -\begin{Example} - You may add a vertical space of one text line to all toc-files. -\begin{lstcode} - \addtoeachtocfile{% - \protect\addvspace{\protect\baselineskip}% - } -\end{lstcode} - And if you want to do this, only for the toc-files of owner - ``\PValue{foo}'': -\begin{lstcode} - \addtoeachtocfile[foo]{% - \protect\addvspace{\protect\baselineskip}% - } -\end{lstcode} -\end{Example} -Commands, that shouldn't be expanded while writing, should be prefixed by -\Macro{protect} in the same way like they should be in the argument of -\Macro{addtocontents}. -% \iffalse -\EndIndex{Cmd}{addtoeachtocfile}% -% \fi - - -%\iffalse^^A meta-comment -\begin{Declaration} -%\fi^^A meta-comment -% \DescribeMacro{\addxcontentsline} -% The command - \Macro{addxcontentsline}% - \Parameter{extension}\Parameter{level}\OParameter{number}%^^A - \Parameter{text} -%\iffalse^^A meta-comment -\end{Declaration} -\BeginIndex{Cmd}{addxcontentsline}% -The command \Macro{addxcontentsline} -%\fi^^A meta-comment -adds an entry of given \PName{level} to toc-file with \PName{extension}. If -the \Parameter{number} is empty or omitted the entry won't have a number for -the entry with the given \PName{text}. Entries without number may be left -aligned to the number of the numbered entries of the same \PName{level} or -indented like the text of the numbered entries of the same \PName{level}, -depending on the \PValue{numberline} feature. - -\begin{Example} - Maybe you are not using a \KOMAScript{} class but need a not numbered - chapter with entry to the table of contents. This may be done using -\begin{lstcode} - \cleardoublepage - \csname phantomsection\endcsname - \addxcontentsline{toc}{chapter} - {Chapters without Numbers} - \chapter*{Chapters without Numbers} - \markboth{Chapters without Numbers}{} -\end{lstcode} - As you can see, you simply have to replace usual \Macro{addcontentsline} by - \Macro{addxcontentsline} to support the \Package{tocbasic} feature - \PValue{numberline}. -\end{Example} - -Note, that \Macro{addxcontentsline} uses -\Macro{add\PName{level}\PName{extension}entry} if such a macro exists and -\Macro{tocbasic@addxcontentsline} otherwise. Therefore you cannot define -a macro \Macro{add\PName{level}\PName{extension}entry} using -\Macro{addxcontentsline} but \Macro{tocbasic@addxcontentsline}. - -It is recommended to use \Macro{addxcontentsline} instead of -\Macro{addcontentsline} whenever possible.% -%\iffalse^^A meta-comment -\EndIndex{Cmd}{addxcontentsline} -%\fi^^A meta-comment - - -% \iffalse -\begin{Declaration} -% \fi -% \DescribeMacro{\addcontentslinetoeachfile} -% \DescribeMacro{\addxcontentslinetoeachfile} -% The command - \Macro{addcontentslinetoeachtocfile}\OParameter{owner}\Parameter{level}%^^A - \Parameter{contentsline}\\ -% \iffalse - \Macro{addxcontentslinetoeachtocfile}\OParameter{owner}%^^A - \Parameter{level}\OParameter{number}\Parameter{text} -\end{Declaration} -\BeginIndex{Cmd}{addcontentslinetoeachtocfile}% -\BeginIndex{Cmd}{addxcontentslinetoeachtocfile}% -The first command -% \fi -is something like \Macro{addcontentsline} from \LaTeX{} kernel. In difference -to that it writes the \PName{contentsline} not only -into one file, but into all files of all known file extensions or of all known -file extensions of a given owner. - -The Command \Macro{addxcontentslinetoeachtocfile}%^^A -% \OParameter{owner}\Parameter{level}\OParameter{number}\Parameter{text}%^^A -\ is similar but uses -\Macro{addxcontentsline} instead of \Macro{addcontentsline} and -therefore supports \Package{tocbasic} feature \PValue{numberline}. -\begin{Example} - You are a class author and want to write the chapter entry not only to the - table of contents toc-file but to all toc-files, while \texttt{\#1} is the - title, that should be written to the files. -\begin{lstcode} - \addxcontentslinetoeachtocfile - {chapter}[\thechapter]{#1}% -\end{lstcode} - In this case the current chapter number should be expanded while writing - into the file. So it isn't protected from expansion using \Macro{protect}. -\end{Example} -While writing \Macro{@currext}\IndexCmd{@currext}\important{\Macro{@currext}} -is the file extension of the file into which \PName{contentsline} will be -written. - -It is recommended to use \Macro{addxcontentslinetoeachtocfile} instead -of \Macro{addcontentslinetoeachtocfile} whenever possible. -% \iffalse -\EndIndex{Cmd}{addxcontentslinetoeachtocfile}% -\EndIndex{Cmd}{addcontentslinetoeachtocfile}% -% \fi - - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\listoftoc}%^^A -\DescribeMacro{\listoftoc*}%^^A -\DescribeMacro{\listofeachtoc}%^^A -Commands -% \iffalse -%</dtx> -\begin{Declaration} -% \fi - \Macro{listoftoc}\OParameter{list of title}\Parameter{extension}%^^A -% \iffalse -\\ -%<*dtx> -% \fi -, -% \iffalse -%</dtx> -% \fi - \Macro{listoftoc*}\Parameter{extension}%^^A -% \iffalse -\\ -%<*dtx> -% \fi -, -% \iffalse -%</dtx> -% \fi - \Macro{listofeachtoc}\OParameter{owner}%^^A -% \iffalse -\\ -%<*dtx> -% \fi -, and -% \iffalse -%</dtx> -% \fi - \Macro{listof\PName{file-extension}name} -% \iffalse -\end{Declaration} -\BeginIndex{Cmd}{listoftoc*}% -\BeginIndex{Cmd}{listoftoc}% -\BeginIndex{Cmd}{listofeachtoc}% -\BeginIndex{Cmd}{listof\PName{file-extension}name}% -These commands -% \fi -may be used to set the ``list of'' corresponding to file -extension. The\important{\Macro{listoftoc*}} star version \Macro{listoftoc*} -needs only one argument, the extension of the file. It does setup the vertical -and horizontal spacing of paragraphs, calls before hooks, reads the file, and -last but not least calls the after hooks. You may interpret it as direct -replacement of the \LaTeX{} kernel macro -\Macro{@starttoc}\IndexCmd{@starttoc}\important{\Macro{@starttoc}}. - -The\important{\Macro{listoftoc}} version without star, sets the whole file -with title, optional table of contents entry, and running heads. If the -optional argument \OParameter{list of title} was given, it will be used as -title term, optional table of contents entry and running head. Please -note\textnote{Attention!}: If the optional argument is empty, this term will -be empty, too! If you omit the optional argument, but -\Macro{listof\PName{extension}name} was defined, that will be used. If that is -also not defined, a standard ersatz name will be used and reported by a -warning message. - -The\important{\Macro{listofeachtoc}} command \Macro{listofeachtoc} outputs all -lists of something of the given \PName{owner} or of all known file -extensions. Thereby\textnote{Attention!} -\Macro{listof\PName{file-extension}name} should be defined to get the correct -titles. - -It\textnote{Hint!} is recommended to define -\Macro{listof\PName{file-extension}name} for all used file extensions, because -the user itself may use \Macro{listofeachtoc}. -\begin{Example} - Assumed, you have a new ``list of algorithms'' with extension \PValue{loa} - and want to show it: -\begin{lstcode} - \listoftoc[List of Algorithms]{loa} -\end{lstcode} - will do it for you. But maybe the ``list of algorithms'' should not be set - with a title. So you may use -\begin{lstcode} - \listof*{loa} -\end{lstcode} - Note that in this case no entry at the table of contents will be created, - even if you'd used the setup command above. - See command \Macro{setuptoc} -%\iffalse - at \autopageref{desc:tocbasic.cmd.setuptoc} -%\fi - for more information about the - attribute of generating entries into the table of contents using - \Macro{setuptoc}. - - If you've defined -\begin{lstcode} - \newcommand*{\listofloaname}{% - List of Algorithms% - } -\end{lstcode} - before, then -\begin{lstcode} - \listoftoc{loa} -\end{lstcode} - would be enough to print the list of algorithms with the wanted heading. For - the user it may be easier to operate, if you'd define -\begin{lstcode} - \newcommand*{\listofalgorithms}{\listoftoc{loa}} -\end{lstcode} - additionally. -\end{Example} - -Because\textnote{Attention!} \LaTeX{} normally opens a new file for each of -those lists of something immediately, the call of each of those commands may -result in an error like: -\begin{lstoutput} - ! No room for a new \write . - \ch@ck ...\else \errmessage {No room for a new #3} - \fi -\end{lstoutput} -if there are no more write handles left. Loading package -\Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile} -%\iffalse -(see \autoref{cha:scrwfile}) -%\fi -may solve this problem. -%\iffalse -\EndIndex{Cmd}{listof\PName{Dateierweiterung}name}% -\EndIndex{Cmd}{listofeachtoc}% -\EndIndex{Cmd}{listoftoc*}% -\EndIndex{Cmd}{listoftoc}% -%\fi - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\BeforeStartingTOC} -\DescribeMacro{\AfterStartingTOC} -The Commands -% \iffalse -%</dtx> -\begin{Declaration} -% \fi - \Macro{BeforeStartingTOC}\OParameter{extension}\Parameter{instructions} -% \iffalse -\\ -%<*dtx> -% \fi -and -% \iffalse -%</dtx> -% \fi - \Macro{AfterStartingTOC}\OParameter{extension}\Parameter{instructions} -% \iffalse -\end{Declaration} -\BeginIndex{Cmd}{BeforeStartingTOC}% -\BeginIndex{Cmd}{AfterStartingTOC}% -Sometimes it's useful, to process \PName{instructions} immediately before -reading the helper file of a list of something. -These commands -% \fi -may be used to process \PName{instructions} before or after loading the file -with given \PName{extension} using \Macro{listoftoc*}, \Macro{listoftoc}, or -\Macro{listofeachtoc}. If you omit the optional argument (or set an empty -one) the general hooks will be set. The general before hook will be called -before the individuel one and the general after hook will be called after the -individuel one. While calling the hooks -\Macro{@currext}\IndexCmd{@currext}\important{\Macro{@currext}} is the -extension of the toc-file and should not be changed. -% \iffalse - -An example\textnote{Example} for usage of \Macro{AfterStartingTOC} may be -found in \autoref{sec:scrwfile.clonefilefeature} at -\autopageref{example:scrwfile.AfterStartingTOC}. -\EndIndex{Cmd}{AfterStartingTOC}% -\EndIndex{Cmd}{BeforeStartingTOC}% -% \fi - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\BeforeTOCHead} -\DescribeMacro{\AfterTOCHead} -The Commands -% \iffalse -%</dtx> -\begin{Declaration} -% \fi - \Macro{BeforeTOCHead}\OParameter{file extension}\Parameter{instructions} -% \iffalse -\\ -%<*dtx> -% \fi -and -% \iffalse -%</dtx> -% \fi - \Macro{AfterTOCHead}\OParameter{file extension}\Parameter{instructions} -% \iffalse -\end{Declaration} -\BeginIndex{Cmd}{BeforeTOCHead}% -\BeginIndex{Cmd}{AfterTOCHead}% -This commands -% \fi -may be used to process \PName{instructions} before or after setting the title -of a list of something corresponding to given \PName{file extension} using -\Macro{listoftoc*} or \Macro{listoftoc}. If you omit the optional argument (or -set an empty one) the general hooks will be set. The general before hook will -be called before the individuel one and the general after hook will be called -after the individuel one. While calling the hooks -\Macro{@currext}IndexCmd{@currext}\important{\Macro{@currext}} is the -extension of the corresponding file and should not be changed. -% \iffalse -\EndIndex{Cmd}{AfterTOCHead}% -\EndIndex{Cmd}{BeforeTOCHead}% -% \fi - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\MakeMarkcase} -% \iffalse -%</dtx> -\begin{Declaration} - \Macro{MakeMarkcase}\Parameter{text} -\end{Declaration} -\BeginIndex{Cmd}{MakeMarkcase}% -% \fi -Whenever \Package{tocbasic} sets a mark for a running head, The text of the -mark will be an argument of \Macro{MakeMarkcase}%^^A -%\Parameter{text}^^A -. This command may be used, to change the case of the letters at the running -head if wanted. The default is, to use -\Macro{@firstofone}\IndexCmd{@firstofone}\important{\Macro{@firstofone}} for -\KOMAScript{} classes. This means the text of the running head will be set -without change of case. -\Macro{MakeUppercase}\IndexCmd{MakeUppercase}\important{\Macro{MakeUppercase}} -will be used for all other classes. If you are the class author you may define -\Macro{MakeMarkcase} on your own. If \Package{scrlayer} or another package, -that defines \Macro{MakeMarkcase} will be used, \Package{tocbasic} will not -overwrite that definition. -\begin{Example} - For incomprehensible reasons, you want to set the running heads in lower - case letters only. To make this automatically for all running heads, that - will be set by \Package{tocbasic}, you define: -\begin{lstcode} - \let\MakeMarkcase\MakeLowercase -\end{lstcode} -\end{Example} -Please\textnote{Hint!} allow me some words about \Macro{MakeUppercase}, First -of all this command isn't fully expandable. This means, that problems may -occur using it in the context of other commands. Beyond that typographers -accord, that whenever setting whole words or phrases in capitals, letter -spacing is absolutely necessary. But correct letter spacing of capitals -shouldn't be done with a fix white space between all letters. Different pairs -of letters need different space between each other. Additional some letters -build holes in the text, that have to be taken into account. Packages like -\Package{ulem} or \Package{soul} doesn't provide this and -\Macro{MakeUppercase} doesn't do anything like this. Also automatic letter -spacing using package \Package{microtype} is only one step to a less-than-ideal -solution, because it cannot recognize and take into account the glyphs of the -letters. Because of this\textnote{Attention!} typesetting whole words and -phrases is expert work and almost ever must be hand made. So average users are -recommended to not do that or to use it only spare and not at exposed places -like running heads.% -% \iffalse -\EndIndex{Cmd}{MakeMarkcase}% -% \fi - -% \DescribeMacro{\deftocheading} -% \iffalse -\begin{Declaration} - \Macro{deftocheading}\Parameter{file extension}\Parameter{definition} -\end{Declaration} -\BeginIndex{Cmd}{deftocheading}% -% \fi -The package \Package{tocbasic} contains a standard definition for typesetting -headings of tables of contents or lists of something. This standard definition -is configurable by several features, described at \Macro{setuptoc} next. But -if all those features are not enough, an alternative heading command may be -defined using \Macro{deftocheading}%^^A -%\Parameter{file extension}\Parameter{definition}%^^A -. Thereby \PName{file extension} is the file extension of the corresponding -helper file. The \PName{definition} of the heading command may use one single -parameter \PValue{\#1}. While calling the newly defined command inside of -\Macro{listoftoc} or \Macro{listofeachtoc} that \PValue{\#1} will be replaced by the -corresponding heading term. -% \iffalse -\EndIndex{Cmd}{deftocheading}% -% \fi - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\setuptoc} -\DescribeMacro{\unsettoc} -The Commands -% \iffalse -%</dtx> -\begin{Declaration} -% \fi - \Macro{setuptoc}\Parameter{file extension}\Parameter{feature list} -% \iffalse -\\ -%<*dtx> -% \fi -and -% \iffalse -%</dtx> -% \fi - \Macro{unsettoc}\Parameter{file extension}\Parameter{feature list} -% \iffalse -\end{Declaration} -\BeginIndex{Cmd}{setuptoc}% -\BeginIndex{Cmd}{unsettoc}% -This commands -% \fi -set up and unset features bound to an \PName{file extension}. The -\PName{feature list} is a comma seperated list of single -features. \Package{tocbasic} does know following features: -\begin{description} -\item[\texttt{leveldown}] uses not the top level heading below - \Macro{part}\,---\,\Macro{chapter} if available, \Macro{section} - otherwise\,---\,but the first sub level. This feature will be evaluated by - the internal heading command. On the other hand, if an user defined heading - command has been made with \Macro{deftocheading}, that user is responsible - for the evaluation of the feature. The \KOMAScript{} classes set this - feature using option - \OptionValue{listof}{leveldown}important{\OptionValue{listof}{leveldown}}% - \IndexOption{listof~=\PValue{leveldown}} for all file extensions of the - owner \PValue{float}. -\item[\texttt{nobabel}] prevents usage of the language switch of - \Package{babel}\IndexPackage{babel} at the helper file with the - corresponding \PName{file extension}. This feature should be used only for - helper files, that contain text in one language only. Changes of the - language inside of the document will not longer regarded at the helper - file. Package - \Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile} uses - this feature also for clone destinations, because those will get the - language change from the clone source already. -\item[\texttt{noparskipfake}] prevents\ChangedAt{v3.17}{\Package{tocbasic}} - usage of an extra \Length{parskip} before switching \Length{parskip} off. In - general, the consequence of this feature for documents using paragraph - distance is less vertical space between heading and first entry than between - normal headings and normal text. -\item[\texttt{noprotrusion}] prevents\ChangedAt{v3.10}{\Package{tocbasic}} - disabling character protrusion at the lists of something. Character - protrusion at the lists will be disabled by default if package - \Package{microtype}\IndexPackage{microtype} or another package, that - supports \Macro{microtypesetup}\IndexCmd{microtypesetup}, was loaded. So if - you want protrusion at the lists, you have to set this feature. But - note\textnote{Attention!}, that with character protrusion entries at the - list may be set wrong. This is a known issue of character protrusion. -\item[\texttt{numbered}] uses a numbered heading for the table of contents or - list of something and because of this also generates an entry to the table - of contents. This feature will be evaluated by the internal heading - command. On the other hand, if an user defined heading command has been made - with \Macro{deftocheading}, that user is responsible for the evaluation of - the feature. The \KOMAScript{} classes set this feature using option - \OptionValue{listof}{numbered}\important{\OptionValue{listof}{numbered}}% - \IndexOption{listof~=\PValue{numbered}} for all file extensions of the owner - \PValue{float}. -\item[\texttt{numberline}] \leavevmode\ChangedAt{v3.12}{\Package{tocbasic}}% - redefines \Macro{nonumberline} to use \Macro{numberline}. With this the not - numbered entries generated by \KOMAScript{} or using \Macro{nonumberline} at - the very beginning of the last argument of \Macro{addcontentline} will also - be indented like numbered entries of the same type. -\item[\texttt{onecolumn}] \leavevmode\ChangedAt{v3.01}{\Package{tocbasic}}% - typesets the corresponding table of contents or list of something with - internal one column mode of - \Macro{onecolumn}\IndexCmd{onecolumn}. This\textnote{Attention!} will be - done only, if the corresponding table of contents or list of something - doesn't use feature \PValue{leveldown}\important{\PValue{leveldown}}. The - \KOMAScript{} classes \Class{scrbook} and \Class{scrreprt} activate this - feature with \Macro{AtAddToTocList} (see \autoref{sec:tocbasic.basics}%^^A -% \iffalse - , \autopageref{desc:tocbasic.cmd.AtAddToTocList}%^^A -% \fi - ) for all lists of something with owner \PValue{float} or with themselves as - owner. With this, e.\,g., the table of contents, the list of figures and the - list of tables of both classes will be single columned automatically. The - multiple-column-mode of package \Package{multicol}\IndexPackage{multicol} - will not be recognized or changed by this option. -\item[\texttt{totoc}] writes the title of the corresponding table of contents - or the list of something to the table of contents. This feature will be - evaluated by the internal heading command. On the other hand, if an user - defined heading command has been made with \Macro{deftocheading}, that user - is responsible for the evaluation of the feature. The \KOMAScript{} classes - set this feature using option - \OptionValue{listof}{totoc}\important{\OptionValue{listof}{totoc}}% - \IndexOption{listof~=\PValue{totoc}} for all file extensions of the owner - \PValue{float}. -\end{description} -Classes and packages may know features, too, e.\,g, the \KOMAScript{} classes -know following additional features: -\begin{description} -\item[\texttt{chapteratlist}] activates special code to be put into the list - at start of a new chapter. This code may either be vertical space or the - heading of the chapter. -% \iffalse - See \Option{listof}\IndexOption{listof}\important{\Option{listof}} in - \autoref{sec:maincls.floats}, \autopageref{desc:maincls.option.listof} for - more information about such features. -% \fi -\end{description} -\begin{Example} - Because \KOMAScript{} classes use \Package{tocbasic} for the list of figures - and list of tables, there's one more way to remove chapter structuring at - those: -\begin{lstcode} - \unsettoc{lof}{chapteratlist} - \unsettoc{lot}{chapteratlist} -\end{lstcode} - - And if you want to have the chapter structuring of the \KOMAScript{} classes - at your own list of algorithms with \PName{file extension} ``\PValue{load}'' - from the previous examples, you may use -\begin{lstcode} - \setuptoc{loa}{chapteratlist} -\end{lstcode} - And if classes with \Macro{chapter} should also force single column mode for - the list of algorithms you may use -\begin{lstcode} - \ifundefinedorrelax{chapter}{}{% - \setuptoc{loa}{onecolumn}% - } -\end{lstcode} - Usage of \Macro{ifundefinedorrelax} presumes package \Package{scrbase}%^^A -%\iffalse - \ (see \autoref{sec:scrbase.if}, - \autopageref{desc:scrbase.cmd.ifundefinedorrelax})%^^A -%\fi - . - - It\textnote{Hint!} doesn't matter if you're package would be used with - another class. You should never the less set this feature. And if the other - class would also recognize the feature your package would automatically use - the feature of that class. -\end{Example} -As you may see, packages, that use \Package{tocbasic}, already provide several -interesting features, without the need of a lot of implementation effort. Such -an effort would be needed only without \Package{tocbasic} and because of this, -most packages currently lack of such features.% -% \iffalse -\EndIndex{Cmd}{unsettoc}% -\EndIndex{Cmd}{setuptoc}% -% \fi - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\iftocfeature} -Command -% \iffalse -%</dtx> -\begin{Declaration} -% \fi - \Macro{iftocfeature}\Parameter{file extension}\Parameter{feature}%^^A - \Parameter{true-instructions}%^^A -%\linebreak[1]^^A - \Parameter{false-instructions} -% \iffalse -\end{Declaration} -\BeginIndex{Cmd}{iftocfeature}% -This command -% \fi -may be used, to test, if a \PName{feature} was set for \PName{file - extension}. If so the \PName{true-instructions} will be processed, otherwise -the \PName{false-instruction} will be. This may be useful, e.\,g., if you -define your own heading command using \Macro{deftocheading} but want to -support the features \PValue{totoc}, \PValue{numbered} or \PValue{leveldown}. -% \iffalse -\EndIndex{Cmd}{iftocfeature}% -% \fi - - -\section{Internal Commands for Class and Package Authors} -\label{sec:tocbasic.internals} - -Commands with prefix \Macro{tocbasic@} are internal but class and package -authors may use them. But even if you are a class or package author you -should not change them! - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\tocbasic@extend@babel} -% \iffalse -%</dtx> -\begin{Declaration} - \Macro{tocbasic@extend@babel}\Parameter{file extension} -\end{Declaration} -\BeginIndex{Cmd}{tocbasic@extend@babel}% -% \fi -The Package \Package{babel}\IndexPackage{babel} -% \iffalse -(see \cite{package:babel}) -% \fi -respectively a \LaTeX{} kernel that has been extended by the language -management of \Package{babel} writes instructions to change the language -inside of the files with the file extensions \File{toc}, \File{lof}, and -\File{lot} into those files at every change of the current language -either at the begin of the document or inside the document. Package -\Package{tocbasic} extends this mechanism with -\Macro{tocbasic@extend@babel} -%\unskip\Parameter{file extension} -to be used for other file extensions too. Argument \PName{file extension} has -to be expandable! Otherwise the meaning of the argument may change until it -will be used really. - -Normally this command will be used by default for every \PName{file extension} -that will be added to the list of known extensions using -\Macro{addtotoclist}. The may be suppressed using feature -\PValue{nobabel}\important{\PValue{nobabel}} (see \Macro{setuptoc}, -\autoref{sec:tocbasic.toc}%^^A -% \iffalse -, \autopageref{desc:tocbasic.cmd.setuptoc}%^^A -% \fi -). For the file extensions \File{toc}, \File{lof}, and \File{lot} this will be -done automatically by \Package{tocbasic} to avoid double language switching in -the corresponding files. - -Normally there isn't any reason to call this command yourself. But there may -by lists of something, that should not be under control of \Package{tocbasic}, -and to are not in \Package{tocbasic}'s list of known file extensions, but -nevertheless should be handled by the language change mechanism of -\Package{babel}. The command may be used explicitly for those files. But pleas -note, that this should be done only once per file extension!% -% \iffalse -\EndIndex{Cmd}{tocbasic@extend@babel}% -% \fi - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\tocbasic@starttoc} -Command -% \iffalse -%</dtx> -\begin{Declaration} -% \fi - \Macro{tocbasic@starttoc}\Parameter{extension} -% \iffalse -\end{Declaration} -\BeginIndex{Cmd}{tocbasic@starttoc} -This command -% \fi -is something like the \LaTeX{} kernel macro -\Macro{@starttoc}\IndexCmd{@starttoc}\important{\Macro{@starttoc}}. It's the -command behind \Macro{listoftoc*} (siehe \autoref{sec:tocbasic.toc}%^^A -% \iffalse -, \autopageref{desc:tocbasic.cmd.listoftoc*}%^^A -% \fi -). Authors of classes or packages who want to participate from the advantages -of \Package{tocbasic} should at least use this command. Nevertheless it's -recommended to use \Macro{listoftoc}. Command \Macro{tocbasic@starttoc} -internally uses \Macro{\@starttoc}, but sets -% \expandafter\Macro\iffalse -\Length -% \fi -{parskip}\IndexLength{parskip}\important{\Length{parskip}\\ - \Length{parindent}\\ - \Length{parfillskip}} and -% \expandafter\Macro\iffalse -\Length -% \fi -{parindent}\IndexLength{parindent} to 0 and -% \expandafter\Macro\iffalse -\Length -% \fi -{parfillskip} to 0 until infinite before. Moreover, -\Macro{@currext}\important{\Macro{@currext}}\IndexCmd{@currext} will be set to -the file extension of the current helper file, so this will be available while -the execution of the hooks, that will be done before and after reading the -helper files. - -Because\textnote{Attention!} of \LaTeX{} will immediately open a new helper -file for writing after reading that file, the usage of -\Macro{tocbasic@starttoc} may result in an error message like -\begin{lstoutput} - ! No room for a new \write . - \ch@ck ...\else \errmessage {No room for a new #3} - \fi -\end{lstoutput} -if there are no more unused write handles. This may be solved, e.\,g., using -package -\Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile}. -% \iffalse -See \autoref{cha:scrwfile} for more information about that package.% -\EndIndex{Cmd}{tocbasic@starttoc} -% \fi -% - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\tocbasic@@before@hook} -\DescribeMacro{\tocbasic@@after@hook} -% \iffalse -%</dtx> -\begin{Declaration} - \Macro{tocbasic@@before@hook}\\ - \Macro{tocbasic@@after@hook} -\end{Declaration} -\BeginIndex{Cmd}{tocbasic@@before@hook}% -\BeginIndex{Cmd}{tocbasic@@after@hook}% -% \fi -The hook \Macro{tocbasic@@before@hook} will be executed immediately before -reading a helper file for a table of contents or list of something even -before execution of the instructions of a \Macro{BeforeStartingTOC} -command. It is permitted to extend this hook using -\Macro{g@addto@macro}\IndexCmd{g@addto@macro}. - -Similarly \Macro{tocbasic@@after@hook} will be executed immediately after -reading such a helper file and before execution of instructions of -\Macro{AfterStartingTOC}. It is permitted to extend this hook using -\Macro{g@addto@macro}\IndexCmd{g@addto@macro}. - -\KOMAScript{} uses these hooks, to provide the automatic width calculation of -the place needed by heading numbers. Only classes and packages should use -these hooks. Users\textnote{Attention!} should really use -\Macro{BeforeStartingTOC} and \Macro{AfterStartingTOC} instead. Authors of -packages should also favor those commands! These hooks shouldn't be used to -generate any output! - -If neither\textnote{Attention!} \Macro{listofeachtoc} nor \Macro{listoftoc} -nor \Macro{listoftoc*} are used for the output of a table of contents or list -of something, the hooks should be executed explicitly.% -% \iffalse -\EndIndex{Cmd}{tocbasic@@before@hook}% -\EndIndex{Cmd}{tocbasic@@after@hook}% -% \fi - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\tocbasic@\PName{extension}@before@hook} -\DescribeMacro{\tocbasic@\PName{extension}@after@hook} -% \iffalse -%</dtx> -\begin{Declaration} - \Macro{tocbasic@\PName{extension}@before@hook}\\ - \Macro{tocbasic@\PName{extension}@after@hook} -\end{Declaration} -\BeginIndex{Cmd}{tocbasic@\PName{extension}@before@hook}% -\BeginIndex{Cmd}{tocbasic@\PName{extension}@after@hook}% -% \fi -These hooks are processed after \Macro{tocbasic@@before@hook}, respectively -before \Macro{tocbasic@@after@hook} before and after loading the helper file -with the corresponding file \PName{extension}. Authors\textnote{Attention!} -of classes and packages should never manipulate them! But if -neither\textnote{Attention!} \Macro{listofeachtoc} nor \Macro{listoftoc} nor -\Macro{listoftoc*} are used for the output of a table of contents or list of -something, the hooks should be executed explicitly, if they are -defined. Please note, that they even can be undefined.% -% \iffalse -\EndIndex{Cmd}{tocbasic@\PName{extension}@after@hook}% -\EndIndex{Cmd}{tocbasic@\PName{extension}@before@hook}% -% \fi - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\tocbasic@listhead} -Command % \iffalse %</dtx> -\begin{Declaration} -% \fi - \Macro{tocbasic@listhead}\Parameter{title} -% \iffalse -\end{Declaration} -\BeginIndex{Cmd}{tocbasic@listhead}% -This command -% \fi -is used by \Macro{listoftoc} to set the heading of the list, either the -default heading or the individually defined heading. If you define your own -list command not using \Macro{listoftoc} you may use -\Macro{tocbasic@listhead}. In this case you should define -\Macro{@currext}\important{\Macro{@currext}}\IndexCmd{@currext} to be the file -extension of the corresponding helper file before using -\Macro{tocbasic@listhead}. -% \iffalse -\EndIndex{Cmd}{tocbasic@listhead}% -% \fi - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\tocbasic@listhead@\PName{extension}} -Command -% \iffalse -%</dtx> -\begin{Declaration} -% \fi - \Macro{tocbasic@listhead@\PName{extension}}\Parameter{title} -% \iffalse -\end{Declaration} -\BeginIndex{Cmd}{tocbasic@listhead@\PName{extension}}% -This command -% \fi -is used in \Macro{tocbasic@listhead} to set the individual headings, optional -toc-entry, and running head, if it was defined. If it was not defined it will -be defined and used in \Macro{tocbasic@listhead} automatically. -% \iffalse -\EndIndex{Cmd}{tocbasic@listhead@\PName{extension}}% -% \fi - -%\iffalse^^A meta-comment -\begin{Declaration} -%\fi^^A meta-comment -% \DescribeMacro{\tocbasic@addxcontentsline} -% The command - \Macro{tocbasic@addxcontentsline}% - \Parameter{extension}\Parameter{level}\Parameter{number}\Parameter{text} -%\iffalse^^A meta-comment -\end{Declaration} -\BeginIndex{Cmd}{tocbasic@addxcontentsline}% -This command -%\fi^^A meta-comment -uses \Macro{addcontentsline} to either create a numbered or not numbered text -entry to toc-file with given \PName{extension}. Note, that all parameters of -\Macro{tocbasic@addxcontentsline} are mandatory. But you may use an -empty \PName{number} argument, if you don't want a number. -%\iffalse^^A meta-comment -\EndIndex{Cmd}{tocbasic@addxcontentsline} -%\fi^^A meta-comment - - -\section{A Complete Example} -\label{sec:tocbasic.example} - -This section will show you a complete example of a user defined floating -environment with list of that kind of floats and \KOMAScript{} integration -using \Package{tocbasic}. This example uses internal commands, that have a -``\texttt{@}'' in their name. This means\textnote{Attention}, that the code -has to be put into a own package or class, or has to be placed between -\Macro{makeatletter}\important[i]{\Macro{makeatletter}\\\Macro{makeatother}}% -\IndexCmd{makeatletter} and \Macro{makeatother}\IndexCmd{makeatother}. - -First\textnote{environment} of all, a new floating environment will be -needed. This could simply be done using: -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newenvironment{remarkbox}{% - \@float{remarkbox}% - }{% - \end@float - } -\end{lstcode} -To the new environment is named \Environment{remarkbox}. - -Each\textnote{placement} floating environment has a default -placement. This is build by some of the well known placement options: -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newcommand*{\fps@remarkbox}{tbp} -\end{lstcode} -So, the new floating environment should be placed by default only either at -the top of a page, at the bottom of a page, or on a page on its own. - -Floating\textnote{type} environments have a numerical floating -type. Environments with the same active bit at the floating type cannot change -their order. Figures and table normally use type~1 and 2. So a figure that -comes later at the source code than a table, may be output earlier than the -table and vica versa. -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newcommand*{\ftype@remarkbox}{4} -\end{lstcode} -The new environment has floating type~4, so it may pass figures and floats and -may be passed by those. - -The\textnote{number} captions of floating environment also have numbers. -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newcounter{remarkbox} - \newcommand*{\remarkboxformat}{% - Remark~\theremarkbox\csname autodot\endcsname} - \newcommand*{\fnum@remarkbox}{\remarkboxformat} -\end{lstcode} -Here first a new counter has been defined, that is independent from chapters -or the counters of other structural levels. \LaTeX{} itself also defines -\Macro{theremarkbox} with the default Arabic representation of the counter's -value. Afterwards this has been used defining the formatted output of the -counter. Last this formatted output has been used for the output of the -environment number of the \Macro{caption} command. - -Floating\textnote{file extension} environments have lists of themselves and -those need a helper file with name \Macro{jobname} and a file extension. -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newcommand*{\ext@remarkbox}{lor} -\end{lstcode} -The file extension of the helper file for the list of -\Environment{remarkbox}es is ``\File{lor}''. - -This was the definition of the floating environment. But the list of this new -environment's captions is still missing. To reduce the implementation effort -package \Package{tocbasic} will be used for this. This will be loaded using -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \usepackage{tocbasic} -\end{lstcode} -inside of document preambles. Authors of classes or packages would use -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \RequirePackage{tocbasic} -\end{lstcode} -instead. - -Now\textnote{extension} we register the file name extension for package -\Package{tocbasic}: -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \addtotoclist[float]{lor} -\end{lstcode} -Thereby the owner \PValue{float} has been used, to allude all further -\KOMAScript{} options for lists of something also to the new one. - -Next\textnote{title} we define a title or heading for the list of -\Environment{remarkbox}es: -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newcommand*{\listoflorname}{List of Remarks} -\end{lstcode} -You may use package \Package{scrbase} to additionally support titles in other -languages than English. - -Also\textnote{entry} a command is needed to define the layout of the entries -to the list of remarks: -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newcommand*{\l@remarkbox}{\l@figure} -\end{lstcode} -Here simply the entries to the list of remarks get the same layout like the -entries to the list of figure. This would be the easiest solution. A more -explicit would be, e.\,g., -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newcommand*{\l@remarkbox}{\@dottedtocline{1}{1em}{1.5em}} -\end{lstcode} - -Additionally\textnote{chapter entry} you may want structure the list of -remarks depending on chapters. -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \setuptoc{lor}{chapteratlist} -\end{lstcode} -The \KOMAScript{} classes provide that feature and may other classes do so -too. Unfortunately the standard classes do not. - -This\textnote{list of remarks} would already be enough. Now, users may already -select different kinds of headings either using the corresponding options of -the \KOMAScript{} classes, or \Macro{setuptoc}, e.\,g., with or without entry -in the table of contents, with or without number. But a simply -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newcommand*{\listofremarkboxes}{\listoftoc{lor}} -\end{lstcode} -may make the usage a little bit easier again. - -As you've seen only five commands refers to the list of remarks. Only three of -them are necessary. Nevertheless the new list of remarks already provides -optional numbering of the heading and optional not numbered entry into the -table of contents. Optional even a lower document structure level may be used -for the heading. Running headers are provides with the \KOMAScript{} classes, -the standard classes, and all classes that explicitly support -\Package{tocbasic}. Supporting classes even pay attention to this new list of -remarks at every new \Macro{chapter}. Even changes of the current language are -handled inside the list of remarks like they will inside the list of figures -or inside the list of tables. - -Moreover.\textnote{additional features} an author of a package may add more -features. For example, options to hide \Macro{setuptoc} from the users may be -added. On the other hand, the \Package{tocbasic} manual may be referenced to -describe the corresponding features. The advantage of this would be that user -would get information about new features provides by \Package{tocbasic}. But -if the user should be able to set the features of the remarks even without -knowledge about the file extension \File{lor} a simple -\begin{lstcode}[belowskip=\dp\strutbox plus 1pt] - \newcommand*{\setupremarkboxes}{\setuptoc{lor}} -\end{lstcode} -would be enough to use a list of features argument to -\Macro{setupremarkboxes} as list of features of file extension \File{lor}. - - -\section{Everything with One Command Only} -\label{sec:tocbasic.highlevel} - -The example from the previous section shows, that using \Package{tocbasic} to -define floating environments and lists with the captions of those floating -environments is easy. The following example will show, that is may be even -easier. - -% \iffalse -%<*dtx> -% \fi -\DescribeMacro{\DeclareNewTOC} -Command -% \iffalse -%</dtx> -\begin{Declaration} -% \fi - \Macro{DeclareNewTOC}\OParameter{options}\Parameter{extension} -% \iffalse -\end{Declaration} -\BeginIndex{Cmd}{DeclareNewTOC}% -This command -% \fi -declares\ChangedAt{v3.06}{\Package{tocbasic}} in one step only a new list of -something, the heading of that list, the term used for the entries to the -list, and to manage the file name \PName{extension}. Additionally optional -floating and non-floating environments may be defined, and inside of both such -environments \Macro{caption}\important{\Macro{caption}}\IndexCmd{caption} may -be used. The additional features \Macro{captionabove}\important[i]{% - \Macro{captionabove}\\ - \Macro{captionbelow}}, \Macro{captionbelow}, and \Environment{captionbeside} -of the \KOMAScript{} classes -% \iffalse -(see \autoref{sec:maincls.floats}) -% \fi -may also be used inside of those environments. - -Argument \PName{extension} is the file name extension of the helper file, that -represents the list of something. See \autoref{sec:tocbasic.basics} for more -information about this. This argument is mandatory and must not be empty! - -Argument \PName{options} is a comma separated list, like you know it from, -e.\,g., \Macro{KOMAoptions}% -% \iffalse -\ (see \autoref{sec:typearea.options})%^^A -% \fi -. Nevertheless\textnote{Attention!}, those options cannot be set using -\Macro{KOMAoptions}\IndexCmd{KOMAoptions}! An overview of all available -options -% is shown next. -% \iffalse -may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. -% \fi - -% \iffalse -\begin{desclist} - \renewcommand*{\abovecaptionskipcorrection}{-\normalbaselineskip}% - \desccaption[{Options for command \Macro{DeclareNewTOC}}]{% - Options for command - \Macro{DeclareNewTOC}\ChangedAt{v3.06}{\Package{tocbasic}}% - \label{tab:tocbasic.DeclareNewTOC-options}% - }{% - Options for command \Macro{DeclareNewTOC} (continuation)% - }% -% \fi -%\begin{description} -% \newcommand{\entry}[2]{\item[\normalfont#1]\hfill\\* #2} - \entry{\KOption{atbegin}\PName{instructions}}{% - The \PName{instructions} will be executed at the begin of the floating or - non-floating environment.% - }% - \entry{\KOption{atend}\PName{instructions}}{% - The \PName{instructions} will be executed at the end of the floating or - non-floating environment.% - }% - \entry{\KOption{counterwithin}\PName{\LaTeX{} counter}}{% - If you define a float or non-float, the captions will be numbered and a - counter \PName{type} (see option \Option{type}) will be defined. You may - declare another counter to be the parent \LaTeX{} counter. In this case, - the parent counter will be set before the float counter and the float - counter will be reset whenever the parent counter is increased using - \Macro{stepcounter} or \Macro{refstepcounter}.% - }% -%^^A not yet implemented: -%^^A \entry{\KOption{captionpos}\PName{position}}{% -%^^A If \PName{position} is \PValue{top} or \PValue{above} the spacing above -%^^A and below the caption will be done for captions above objects. If -%^^A \PName{position} is \PValue{bot}, \PValue{bottom}, or \PValue{below} the -%^^A spacing above and below the caption will be done for captions below -%^^A objects. -%^^A } - \entry{\Option{float}}{% - If set, float environments for that type will be defined. The names of the - environments are the value of \PName{type} and for double column floats - the value of \PName{type} with addendum ``\PValue{*}''.% - }% - \entry{\KOption{floatpos}\PName{float positions}}{% - The default floating position of the float. If no float position was - given, ``tbp'' will be used like the standard classes do for figures and - tables.% - }% - \entry{\KOption{floattype}\PName{number}}{% - The numerical float type of the defined floats. Float types with common - bits cannot be reordered. At the standard classes figures has float type 1 - and tables has float type 2. If no float type was given, 16 will be used.% - }% - \entry{\Option{forcenames}}{% - If set, the names will be even defined, if they where already defined - before.% - }% - \entry{\KOption{hang}\PName{length}}{% - The amount of the hanging indent of the entries for that list. If not - given, 1.5\,em will be used like standard classes use for entries to list - of figures or list of tables.% - }% - \entry{\KOption{indent}\PName{length}}{% - The indent value for the entries of that list. If not given, 1\,em will be - used like standard classes use for entries to list of figures or list of - tables.% - }% - \entry{\KOption{level}\PName{number}}{% - The level of the entries of that list. If not given level 1 will be used - like standard classes use for entries to list of figures or list of - tables.% - }% - \entry{\KOption{listname}\PName{string}}{% - The name of the list of foo. If not given the value of \PValue{types} with - upper case first char prefixed by ``List of '' will be used.% - }% - \entry{\KOption{name}\PName{string}}{% - The name of an element. If no name is given, the value of \PValue{type} - with upper case first char will be used.% - }% - \entry{\Option{nonfloat}}{% - If set, a non floating environment will be defined. The name of the - environment is the value of \PName{type} with postfix ``\PValue{-}''.% - }% - \entry{\KOption{owner}\PName{string}}{% - The owner as described in the sections before. If no owner was given owner - \PValue{float} will be used.% - }% - \entry{\KOption{type}\PName{string}}{% - sets the type of the new declared list. The type will be used e.\,g. to - defined a \Macro{listof}\PName{string}. If no type is set up the extension - from the mandatory argument will be used.% - }% - \entry{\KOption{types}\PName{string}}{% - the plural of the type. If no plural was given the value of \PValue{type} - with addendum ``s'' will be used.% - }% -% \end{description} -% \iffalse -\end{desclist} -% \fi - -\begin{Example} - Using \Macro{DeclareNewTOC} reduces the example from - \autoref{sec:tocbasic.example} to: -\begin{lstcode} - \DeclareNewTOC[% - type=remarkbox,% - types=remarkboxes,% - float,% define a floating environment - floattype=4,% - name=Remark,% - listname={List of Remarks}% - ]{lor} - \setuptoc{lor}{chapteratlist} -\end{lstcode} - Beside environments \Environment{remarkbox} and \Environment{remarkbox*} the - counter -% \expandafter\texttt\iffalse -\Counter -% \fi - {remarkbox}, the commands \Macro{theremarkbox}, - \Macro{remarkboxname}, and \Macro{remarkboxformat} that are used for - captions; the commands \Macro{listremarkboxnames} and - \Macro{listofremarkboxes} that are used at the list of remarks; and some - internal commands that depends on the file name extension \File{lor} are - defined. If the package should use a default for the floating type, option - Option{floattype} may be omitted. If option \Option{nonfloat} will be used - additionally, then a non-floating environment \Environment{remarkbox-} will - be also defined. You may use \Macro{caption}\IndexCmd{caption} inside of - that non-floating environment as usual for floating environments. -%\iffalse - \hyperref[tab:tocbasic.comparison]{Figure~\ref*{tab:tocbasic.comparison}} - showes a comparison of the commands, counters and environments of the - example environment \Environment{remarkbox} and of the commands, counters - and environments for figures.% - \begin{table} - \centering - \caption{Comparison of example environment \Environment{remarkbox} - and environment \Environment{figure}} - \label{tab:tocbasic.comparison} - \begin{tabularx}{\textwidth}{ll>{\raggedright}p{6em}X} - \toprule - \Environment{remarkbox} & \Environment{figure} - & options of \Macro{DeclareNewTOC} & short description \\[1ex] - \midrule - \Environment{remarkbox} & \Environment{figure} - & \Option{type}, \Option{float} - & floating environments of the respective types\\[1ex] - \Environment{remarkbox*} & \Environment{figure*} - & \Option{type}, \Option{float} - & columns spanning floating environments of the respective types\\[1ex] - \Counter{remarkbox} & \Counter{figure} - & \Option{type}, \Option{float} - & counter used by \Macro{caption}\\[1ex] - \Macro{theremarkbox} & \Macro{thefigure} - & \Option{type}, \Option{float} - & output command to the respective counters\\[1ex] - \Macro{remarkboxformat} & \Macro{figureformat} - & \Option{type}, \Option{float} - & formating command to the respective counters used by - \Macro{caption}\\[1ex] - \Macro{remarkboxname} & \Macro{figurename} - & \Option{type}, \Option{float}, \Option{name} - & names used in the label of \Macro{caption}\\[1ex] - \Macro{listofremarkboxes} & \Macro{listoffigures} - & \Option{types}, \Option{float} - & command to show the list of the respective environments\\[1ex] - \Macro{listremarboxname} & \Macro{listfigurename} - & \Option{type}, \Option{float}, \Option{listname} - & heading text of the respective list \\[1ex] - \Macro{fps@remarkbox} & \Macro{fps@figure} - & \Option{type}, \Option{float}, \Option{floattype} - & numeric float type for order perputation\\[1ex] - \File{lor} & \File{lof} - & - & file extension of the helper file of the respective list \\ - \bottomrule - \end{tabularx} - \end{table} -%\fi - - And now a possible usage of the example environment: -\begin{lstcode} - \begin{remarkbox} - \centering - Equal should be typeset equally - and with equal formatting. - \caption{First theorem of typography} - \label{rem:typo1} - \end{remarkbox} -\end{lstcode} - A segment of an example page with this environment could be: - \begin{center}\footnotesize - \begin{tabular} - {|!{\hspace{.1\linewidth}}p{.55\linewidth}!{\hspace{.1\linewidth}}|} - \\ - \centering - Equal should be typeset equally - and with equal formatting.\\[\abovecaptionskip] - {% - \usekomafont{caption}\footnotesize{\usekomafont{captionlabel}% - Remark 1: }First theorem of typography - }\\ - \end{tabular}% - \end{center}% -\end{Example} -% \iffalse -\EndIndex{Cmd}{DeclareNewTOC}% -% -\EndIndex{Package}{tocbasic}% -\EndIndex{}{table of contents}% -\EndIndex{}{list>of contents}% -\EndIndex{}{file>extension}% -% \fi -% -% \iffalse -%</doc|dtx> % \fi % % \StopEventually{\PrintIndex\PrintChanges} @@ -1871,6 +179,9 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % packages authors. Macros without \texttt{@} are interface macros and may be % used by class and package authors and users. % +% Note: Parts of the implementation of package \textsf{tocbasic} are +% out-sourced into file \texttt{scrkernel-tocbasic.dtx}. +% % \iffalse %<*package> % \fi @@ -1880,19 +191,25 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % % There are no options because the package should be used by class and package % authors not by users. So the package will be loaded using -% \Macro{RequiresPackage}. Using different options by different packages would +% \cs{RequiresPackage}. Using different options by different packages would % result in an option clash. % \begin{macrocode} +%<*option> \ProcessOptions\relax +%</option> % \end{macrocode} % % % \subsection{Required Packages} % \label{sec:packages} % -% Currently only graphics bundle's package \Package{keyval} is needed. +% Package \textsf{scrbase} is needed to process all macro options. As long as +% no package options are provided, the \texttt{body}-run is early enough to +% load it. % \begin{macrocode} -\RequirePackage{keyval} +%<*body> +\RequirePackage{scrbase} +%</body> % \end{macrocode} % We load it after processing the options, because we don't need it for % processing options. @@ -1916,6 +233,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % % The initial state of the list will be \emph{empty}. % \begin{macrocode} +%<*body> \newcommand*{\tb@listoftocs}{} % \end{macrocode} % \end{macro} @@ -1942,11 +260,13 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % % \begin{macro}{\addtotoclist} % \changes{v1.0a}{2008/11/11}{internal \cs{@addtotoclist} renamed to -% \cs{scr@addtotoclist} because of package \textsf{floatfram}}.% +% \cs{scr@addtotoclist} because of package \textsf{floatfram}}.^^A % \changes{v1.0a}{2008/11/11}{internal \cs{@@addtotoclist} renamed to -% \cs{scr@@addtotoclist} because of package \textsf{floatfram}}.% +% \cs{scr@@addtotoclist} because of package \textsf{floatfram}}.^^A % \changes{v3.06a}{2010/09/14}{expand the arguments while adding them to the -% internal list} +% internal list}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % This command adds an extension to the list of toc-files. The first, % optional argument is the class or package name with the corresponding % extension of class or package files. If this argument was omitted @@ -1957,7 +277,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % empty first argument is not the same like omitting the first argument! % \begin{macrocode} \newcommand*{\addtotoclist}{% - \@ifnextchar [%] + \kernel@ifnextchar [%] \scr@@addtotoclist\scr@addtotoclist } \newcommand*{\scr@addtotoclist}{% @@ -2006,6 +326,8 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \end{macro} % % \begin{macro}{\AtAddToTocList} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Action to be done, when adding a toc-file of a known owner. The first % optional argument is the owner. The second, mandatory argument is the % action. While doing the action \cs{@currext} will be the extension of the @@ -2021,7 +343,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % toc-files without any owner! % \begin{macrocode} \newcommand*{\AtAddToTocList}{% - \@ifnextchar [%] + \kernel@ifnextchar [%] \@@AtAddToTocList\@AtAddToTocList } \newcommand*{\@AtAddToTocList}{% @@ -2044,11 +366,10 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \cs{tocbasic@extend@babel} must not be a local macro (like \cs{@currext}) % \begin{macrocode} \newcommand*{\tocbasic@extend@babel}[1]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \ifx\csname bbl@set@language\endcsname\relax + \scr@ifundefinedorrelax{bbl@set@language}{% \PackageInfo{tocbasic}{babel extension for `#1' omitted\MessageBreak because of missing \string\bbl@set@language}% - \else + }{% \iftocfeature{#1}{nobabel}{% \PackageInfo{tocbasic}{omitting babel extension for `#1'\MessageBreak because of feature `nobabel' available\MessageBreak @@ -2061,7 +382,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \addtocontents{#1}{\xstring\select@language{\languagename}}% }% }% - \fi + }% } % \end{macrocode} % This feature should be used for all toc-files (unless feature @@ -2072,13 +393,15 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \end{macro} % % \begin{macro}{\removefromtoclist} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % This command will remove an extension from the list of toc-files. If the % first, optional argument is given, the extension will only be removed, if % it was added by the given owner. NOTE: An empty first argument is not the % same like omitting the first argument! % \begin{macrocode} \newcommand*{\removefromtoclist}{% - \@ifnextchar [%] + \kernel@ifnextchar [%] \@removefromtoclist\@@removefromtoclist } \newcommand*{\@removefromtoclist}[2][]{% @@ -2120,7 +443,9 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % % \begin{macro}{\doforeachtocfile} % \changes{v3.09}{2011/03/01}{\cs{@currext} defined using \cs{edef} instead -% of \cs{def}} +% of \cs{def}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % This command does the second, mandatory argument for each toc-file at the % list of toc-files. If the first, optional argument was given this will be % done only for the toc-files of that owner. NOTE: An empty first argument @@ -2134,7 +459,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \cs{doforeachtocfile}. % \begin{macrocode} \newcommand{\doforeachtocfile}{% - \@ifnextchar [%] + \kernel@ifnextchar [%] \@doforeachtocfile\@@doforeachtocfile } \newcommand{\@doforeachtocfile}[2][]{% @@ -2165,7 +490,9 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \begin{macro}{\addtoeachtocfile} % \begin{macro}{\@addtoeachtocfile} % \begin{macro}{\@@addtoeachtocfile} -% \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}} +% \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % This command calls \cs{addtocontents} with the section, mandatory % argument for each toc-file at the list of toc-files. If the first, % optional argument was given this will be done only for the toc-files of @@ -2174,7 +501,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % not be expanded, at the mandatory argument. % \begin{macrocode} \newcommand{\addtoeachtocfile}{% - \@ifnextchar [%] + \kernel@ifnextchar [%] \@addtoeachtocfile\@@addtoeachtocfile } \newcommand{\@addtoeachtocfile}[2][]{% @@ -2183,6 +510,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \newcommand{\@@addtoeachtocfile}[1]{% \doforeachtocfile{\addtocontents{\@currext}{#1}}% } +%</body> % \end{macrocode} % \end{macro} % \end{macro} @@ -2194,11 +522,14 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % once. And we have some special commands for the table of contents. % % \begin{macro}{\addcontentslinetoeachtocfile} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Something like a combination of \cs{addtoeachtocfile} and % \cs{addcontentsline}. % \begin{macrocode} +%<*body> \newcommand{\addcontentslinetoeachtocfile}{% - \@ifnextchar [%] + \kernel@ifnextchar [%] \@addcontentslinetoeachtocfile\@@addcontentslinetoeachtocfile } \newcommand{\@addcontentslinetoeachtocfile}[3][]{% @@ -2213,6 +544,8 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \begin{macro}{\addxcontentsline} % \changes{v3.12}{2013/09/24}{new} % \changes{v3.12}{2013/09/24}{Take care of new feature \texttt{numberline}} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@addxcontentsline} % \changes{v3.12}{2013/09/24}{new (internal)} % This will be used instead of \cs{addcontentsline} to generate numbered or @@ -2221,18 +554,17 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % empty and the fourth and last is the entry text. % \begin{macrocode} \newcommand*{\addxcontentsline}[2]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\@addxcontentsline{#1}{#2}}% {\@addxcontentsline{#1}{#2}[]}% } \newcommand*{\@addxcontentsline}{} \def\@addxcontentsline#1#2[#3]#4{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname add#2#1entry\endcsname\relax + \scr@ifundefinedorrelax{add#2#1entry}{% \tocbasic@addxcontentsline{#1}{#2}{#3}{#4}% - \else + }{% \@nameuse{add#2#1entry}{#3}{#4}% - \fi + }% } % \end{macrocode} % \begin{macro}{\nonumberline} @@ -2263,10 +595,16 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % % \begin{macro}{\addxcontentslinetoeachtocfile} % \changes{v3.12}{2013/09/24}{new} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@addxcontentslinetoeachtocfile} % \changes{v3.12}{2013/09/24}{new (internal)} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@addxcontentslinetoeachtocfile} % \changes{v3.12}{2013/09/24}{new (internal)} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@@addxcontentslinetoeachtocfile} % \changes{v3.12}{2013/09/24}{new (internal)} % \begin{macro}{\@@@@addxcontentslinetoeachtocfile} @@ -2275,11 +613,11 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \cs{addxcontentsline} instead of \cs{addcontentsline}. % \begin{macrocode} \newcommand{\addxcontentslinetoeachtocfile}{% - \@ifnextchar [%] + \kernel@ifnextchar [%] \@addxcontentslinetoeachtocfile\@@addxcontentslinetoeachtocfile } \newcommand{\@addxcontentslinetoeachtocfile}[2][]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\@@@addxcontentslinetoeachtocfile[{#1}]{#2}}% {\@@@addxcontentslinetoeachtocfile[{#1}]{#2}[]} } @@ -2288,7 +626,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \doforeachtocfile[{#1}]{\addxcontentsline{\@currext}{#2}[#3]{#4}}% } \newcommand{\@@addxcontentslinetoeachtocfile}[1]{% - \@ifnextchar [%] + \kernel@ifnextchar [%] {\@@@@addxcontentslinetoeachtocfile{#1}}% {\@@@@addxcontentslinetoeachtocfile{#1}[]}% } @@ -2296,6 +634,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \def\@@@@addxcontentslinetoeachtocfile#1[#2]#3{% \doforeachtocfile{\addxcontentsline{\@currext}{#1}[{#2}]{#3}}% } +%</body> % \end{macrocode} % \end{macro} % \end{macro} @@ -2317,6 +656,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % be called, the toc will be started, an individual hook will be called, an % general hook wil be called, that's it. % \begin{macrocode} +%<*body> \newcommand*{\tocbasic@starttoc}[1]{% \begingroup \edef\@currext{#1}% @@ -2393,18 +733,20 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \end{macro} % % \begin{macro}{\listoftoc} -% \begin{macro}{\listoftoc*} -% \changes{v1.0a}{2008/11/12}{\cs{twocolumn} fixed}% -% \changes{v1.01}{2008/11/13}{new feature \texttt{onecolumn}} +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A +% \begin{macro}{\@listoftoc} +% \changes{v1.0a}{2008/11/12}{\cs{twocolumn} fixed}^^A +% \changes{v1.01}{2008/11/13}{new feature \texttt{onecolumn}}^^A % \changes{v3.09}{2011/03/01}{\cs{@currext} defined using \cs{edef} instead -% of \cs{def}} +% of \cs{def}}^^A % Command to handle the hole list of something. There are additional hooks % for this. The first optional argument is the title for this list. If the % optional argument was omitted \cs{listof\#2name} will be used. The star % version does not set up a heading or switch the column number! % \begin{macrocode} \newcommand*{\listoftoc}{% - \@ifstar \tocbasic@starttoc\@listoftoc + \kernel@ifstar \tocbasic@starttoc\@listoftoc } \newcommand*{\@listoftoc}[2][\list@fname]{% \begingroup @@ -2432,14 +774,13 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. }{}% \iftocfeature{\@currext}{numberline}{\def\nonumberline{\numberline{}}}{}% \tocbasic@listhead{#1}% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname microtypesetup\endcsname\relax - \else + \scr@ifundefinedorrelax{microtypesetup}{}{% \iftocfeature{\@currext}{noprotrusion}{}{% \microtypesetup{protrusion=false}% - \PackageInfo{tocbasic}{character protrusion at \@currext\space deactivated}% + \PackageInfo{tocbasic}{% + character protrusion at \@currext\space deactivated}% }% - \fi + }% \tocbasic@starttoc{#2}% \endgroup } @@ -2457,11 +798,13 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \begin{macro}{\listofeachtoc} % \begin{macro}{\@listofeachtoc} % \begin{macro}{\@@listofeachtoc} -% \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}} +% \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Another example of using \cs{doforeachtocfile}. % \begin{macrocode} \newcommand*{\listofeachtoc}{% - \@ifnextchar [%] + \kernel@ifnextchar [%] \@listofeachtoc\@@listofeachtoc } \newcommand{\@listofeachtoc}[1][]{% @@ -2492,8 +835,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \begin{macrocode} \newcommand*{\tocbasic@listhead}[1]{% \@ifundefined{tocbasic@listhead@\@currext}{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname chapter\endcsname\relax + \scr@ifundefinedorrelax{chapter}{% \expandafter\def\csname tocbasic@listhead@\@currext\endcsname##1{% \iftocfeature{\@currext}{leveldown}{% \iftocfeature{\@currext}{numbered}{% @@ -2533,7 +875,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. }% }% }% - \else + }{% \expandafter\def\csname tocbasic@listhead@\@currext\endcsname##1{% \iftocfeature{\@currext}{leveldown}{% \iftocfeature{\@currext}{numbered}{% @@ -2592,7 +934,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. }% }% }% - \fi + }% }{}% \csname tb@@beforehead@hook\endcsname \csname tb@\@currext @beforehead@hook\endcsname @@ -2630,6 +972,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. }{}% \expandafter\g@addto@macro\csname tb@#1@afterhead@hook\endcsname{#2}% } +%</body> % \end{macrocode} % \end{macro} % \end{macro} @@ -2638,22 +981,24 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \begin{macro}{\MakeMarkcase} % Use upper-case or not? % \begin{macrocode} +%<*exit> \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname KOMAClassName\endcsname\relax + \scr@ifundefinedorrelax{KOMAClassName}{% \let\MakeMarkcase\MakeUppercase - \else + }{% \let\MakeMarkcase\@firstofone - \fi + }% }{}% } +%</exit> % \end{macrocode} % \end{macro} % % \begin{macro}{\deftocheading} % Define a toc headings command with one argument (the title). % \begin{macrocode} +%<*body> \newcommand*{\deftocheading}[1]{% \@namedef{tocbasic@listhead@#1}##1} % \end{macrocode} @@ -2721,13 +1066,13 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % We need a test for the features % \begin{macrocode} \newcommand*{\iftocfeature}[2]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname tocbasic@#1@feature@#2\endcsname\relax + \scr@ifundefinedorrelax{tocbasic@#1@feature@#2}{% \expandafter\@secondoftwo - \else + }{% \expandafter\@firstoftwo - \fi + }% } +%</body> % \end{macrocode} % \end{macro} % \end{macro} @@ -2737,15 +1082,16 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \changes{v1.0a}{2008/11/11}{use of \cs{addtotoclist} instead of internal}% % \changes{v3.07a}{2010/11/25}{fix: added missing % \cs{let}\cs{@starttoc}\cs{tocbasic@starttoc}}% -% \Package{tocbasic} can overtake \Macro{@starttoc} to automaticly add all +% \textsf{tocbasic} can overtake \cs{@starttoc} to automaticly add all % used extensions to the list of known extensions and use -% \Macro{tocbasic@starttoc} instead of \Macro{@starttoc} from \LaTeX{} +% \cs{tocbasic@starttoc} instead of \cs{@starttoc} from \LaTeX{} % kernel. Please note, that we don't need a fix for the unfriendly -% redefinition of \Macro{@starttoc} by \Package{hyperref}, because hyperref -% does it only at the first \LaTeX{} run. So this action of \Package{hyperref} +% redefinition of \cs{@starttoc} by \textsf{hyperref}, because hyperref +% does it only at the first \LaTeX{} run. So this action of \textsf{hyperref} % may only result in the need of one more \LaTeX{} run, but not in a permanent % mistake. % \begin{macrocode} +%<*body> \newcommand*{\tocbasicautomode}{% \let\tb@saved@starttoc\@starttoc \let\@starttoc\tocbasic@starttoc @@ -2756,205 +1102,398 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. }% }% } +%</body> % \end{macrocode} % \end{macro} % % -% \section{High Level Interface for Generating New TOCs and Floats} +% \subsection{High Level Interface for Generating New TOCs and Floats} % \label{sec:newfloats} % % \begin{macro}{\DeclareNewTOC} -% \changes{v3.06}{2010/06/01}{new high level command}% +% \changes{v3.06}{2010/06/01}{new high level command}^^A +% \changes{v3.18}{2015/06/20}{\cs{tb@nt@types} and \cs{tb@nt@listname} are +% initialised \cs{relax}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % This command defines only a new TOC and a new caption command for this % TOC. It does not define a new foat unless option float was set! It does % not define a new nonfloat unless option nonfloat was set! The optional -% argument is used to set up several settings using \Package{keyval}. The +% argument is used to set up several settings using \textsf{keyval}. The % mandatory argument is the shortcut. The default type is the shortcut. % The extension is the shortcut. The default owner is ``\texttt{float}''. -% -% But first of all, we define the options used by the optional argument: +% \begin{macrocode} +%<*body> +\DefineFamily{KOMAarg} +\DefineFamilyMember[.toc]{KOMAarg} +\newcommand*{\DeclareNewTOC}[2][]{% + \newif\iftb@nt@float + \newif\iftb@nt@nonfloat + \newif\iftb@nt@forcenames + \def\tb@nt@floattype{\tb@nt@autofloattype}% + \def\tb@nt@floatpos{tbp}% + \def\tb@nt@ext{#2}% + \edef\tb@nt@type{#2}% + \let\tb@nt@types\relax + \def\tb@nt@owner{float}% + \def\tb@nt@name{\expandafter\protect\expandafter\MakeUppercase\tb@nt@type}% + \let\tb@nt@listname\relax + \let\tb@nt@counterwithin\@empty + \let\tb@nt@atbegin\@empty + \let\tb@nt@atend\@empty + \def\tb@nt@tocentrystyle{default}% +% \end{macrocode} +% \changes{v3.20}{2016/04/29}{need more initialization for empty optional +% argument}^^A +% \begin{macrocode} + \def\tb@nt@tocstyle@options{level=1}% + \IfArgIsEmpty{#1}{% +% \end{macrocode} +% Also need to call the style init code, to set the defaults for options +% \texttt{numwidth} and \texttt{indent}. +% \begin{macrocode} + \begingroup + \let\scr@dte@current\tb@nt@type + \@ExecuteTOCEntryStyleInitCode{\tb@nt@tocentrystyle}{\tb@nt@type}% + \def\do@endgroup{\endgroup}% + \def\do##1{% + \ifstr{##1}{numwidth}{% + \l@addto@macro\do@endgroup{% + \l@addto@macro{\tb@nt@tocstyle@options}{,numwidth=1.5em}% + }% + }{% + \ifstr{##1}{indent}{% + \l@addto@macro\do@endgroup{% + \l@addto@macro{\tb@nt@tocstyle@options}{,indent=1em}% + }% + }{}% + }% + \kernel@ifnextchar[%] + {\@dodefault}% + {}% + }% + \def\@dodefault[##1]{}% + \scr@dte@doopts + \do@endgroup + }{% + \let\tb@nt@extra@relax@opts\@empty +% \end{macrocode} +% After initialisation of the local values we need to know the style of the +% toc entry, to define style dependend options. +% \begin{macro}{\tb@nt@type} +% \changes{v3.20}{2015/12/16}{local valid only}^^A % The type of list is used for environment and counter names and as part of -% several internal and user macros. +% several internal and user macros. It is needed before defining the style +% dependend options. So we use a first run to set it up. % \begin{macrocode} -\define@key{tocbasic}{type}{% - \tb@ifvalueisnotempty{type}{#1}{\edef\tb@nt@type{#1}}% -} + \DefineFamilyKey[.toc]{KOMAarg}{type}{% + \tb@ifvalueisnotempty{##1}{\edef\tb@nt@type{##1}}% + }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@tocentrystyle} +% \changes{v3.20}{2015/12/16}{neu (intern)} +% The style of the toc entry. It is needed before defining the style +% dependend options. So we use a first run to set it up. +% \begin{macrocode} + \DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}[default]{% + \IfArgIsEmpty{##1}{% + \edef\tb@nt@tocentrystyle{##1}% + \FamilyKeyStateProcessed + }{% + \scr@ifundefinedorrelax{scr@dte@def@l@##1}{% + \FamilyKeyStateUnknownValue + }{% + \edef\tb@nt@tocentrystyle{##1}% + \FamilyKeyStateProcessed + }% + }% + }% +% \end{macrocode} +% \end{macro} +% After this we define pseudo option \texttt{@else@} to ignore all currently +% not needed options. After this we do the first option execution run. +% \begin{macrocode} + \DefineFamilyKey[.toc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}% + \FamilyExecuteOptions[.toc]{KOMAarg}{#1}% + \RelaxFamilyKey[.toc]{KOMAarg}{@else@}% +% \end{macrocode} +% For the second run we do not need to set up these options again. So define +% it as no-opt. +% \begin{macrocode} + \DefineFamilyKey[.toc]{KOMAarg}{type}{\FamilyKeyStateProcessed}% + \DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}{\FamilyKeyStateProcessed}% +% \end{macrocode} +% \changes{v3.20}{2015/12/16}{defining toc style depending options}^^A +% If the toc style is empty we won't define any \cs{l@\dots}. Otherwise we +% need to define additional options. +% \begin{macrocode} + \ifstr{\tb@nt@tocentrystyle}{}{}{% + \begingroup + \let\scr@dte@current\tb@nt@type + \@ExecuteTOCEntryStyleInitCode{\tb@nt@tocentrystyle}{\tb@nt@type}% + \def\do@endgroup{\endgroup}% + \def\do##1{% + \l@addto@macro\do@endgroup{% + \l@addto@macro\tb@nt@extra@relax@opts{% + \RelaxFamilyKey[.toc]{KOMAarg}{toc##1}% + }% + }% + \kernel@ifnextchar[%] + {\@dodefault{##1}}% + {\@donodefault{##1}}% + }% + \def\@donodefault##1{% + \l@addto@macro\do@endgroup{% + \DefineFamilyKey[.toc]{KOMAarg}{toc##1}{% + \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}% + \FamilyKeyStateProcessed + }% + }% + }% + \def\@dodefault##1[##2]{% + \l@addto@macro\do@endgroup{% + \DefineFamilyKey[.toc]{KOMAarg}{toc##1}[##2]{% + \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}% + \FamilyKeyStateProcessed + }% + }% + }% + \scr@dte@doopts + \do@endgroup + }% +% \end{macrocode} +% After this, we need to define all the other options and do the real option +% execution. +% \begin{macro}{\tb@nt@atbegin} +% \changes{v3.09}{2011/03/01}{new optional identifier \texttt{atbegin}} +% \changes{v3.11c}{2013/02/01}{\texttt{atbegin} argument may be empty} +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% Additional code executed at the begin of a new defined environment. +% \begin{macrocode} + \FamilyStringKey[.toc]{KOMAarg}{atbegin}{\tb@nt@atbegin}% % \end{macrocode} +% \end{macro} +% \begin{macro}{\tb@nt@atend} +% \changes{v3.09}{2011/03/01}{new optional identifier \texttt{atbend}} +% \changes{v3.11c}{2013/02/01}{\texttt{atend} argument may be empty} +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% Additional code executed at the end of a new defined environment. +% \begin{macrocode} + \FamilyStringKey[.toc]{KOMAarg}{atend}{\tb@nt@atend}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\tb@nt@counterwithin} +% \changes{v3.20}{2015/12/16}{local valid only}^^A % If a counter will be defined, this counter may depend on another counter % (like figure counter depends on chapter counter at book classes). If the % value is empty, the counter does not depend on any other counter. % \begin{macrocode} -\define@key{tocbasic}{counterwithin}{% - \edef\tb@nt@counterwithin{#1}% -} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\tb@nt@types} -% Sometimes the plural of the type is needed and may be defined by a -% seperate option. -% \begin{macrocode} -\define@key{tocbasic}{types}{% - \tb@ifvalueisnotempty{types}{#1}{\edef\tb@nt@types{#1}}% -} + \DefineFamilyKey[.toc]{KOMAarg}{counterwithin}{% + \edef\tb@nt@counterwithin{##1}\FamilyKeyStateProcessed + }% % \end{macrocode} % \end{macro} % \begin{macro}{\tb@nt@ext} +% \changes{v3.20}{2015/12/16}{local valid only}^^A % Don't tell the user, that the mandatory argument of the command may be % overloaded by this option. This was only done to simplify the definition. % \begin{macrocode} -\define@key{tocbasic}{extension}{% - \tb@ifvalueisnotempty{extension}{#1}{\edef\tb@nt@ext{#1}}% -} + \DefineFamilyKey[.toc]{KOMAarg}{extension}{% + \tb@ifvalueisnotempty{##1}{\edef\tb@nt@ext{##1}}% + }% % \end{macrocode} % \end{macro} -% \begin{macro}{\tb@nt@owner} -% The owner of the new list extension. +% \begin{macro}{\iftb@nt@float} +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% \changes{v3.06}{2010/06/01}{new internal} +% This boolean indicates, that float environments should also be defined. % \begin{macrocode} -\define@key{tocbasic}{owner}{% - \tb@ifvalueisnotempty{owner}{#1}{\edef\tb@nt@owner{#1}}% -} + \FamilyBoolKey[.toc]{KOMAarg}{float}{tb@nt@float}% % \end{macrocode} % \end{macro} -% \begin{macro}{\tb@nt@name} -% We need a name/term for the entries of the new list. This may e.\,g. be used -% for |caption| output. A |\<type>name| will also be defined. +% \begin{macro}{\tb@nt@floatpos} +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% Simply the value for the |\fps@...| macro. % \begin{macrocode} -\define@key{tocbasic}{name}{% - \tb@ifvalueisnotempty{name}{#1}{\edef\tb@nt@name{#1}}% -} + \DefineFamilyKey[.toc]{KOMAarg}{floatpos}{% + \tb@ifvalueisnotempty{##1}{\edef\tb@nt@floatpos{##1}}% + }% % \end{macrocode} % \end{macro} -% \begin{macro}{\tb@nt@listname} -% \changes{v3.18}{2015/06/20}{using \cs{def} instead of \cs{edef}} -% The list itself has a heading. A |\list<type>name| will also be defined. +% \begin{macro}{\tb@nt@floattype} +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% Simply the value for the |\ftype@...| macro. It has to be +% $1<=\textrm{value}<=31$. % \begin{macrocode} -\define@key{tocbasic}{listname}{% - \tb@ifvalueisnotempty{listname}{#1}{\def\tb@nt@listname{#1}}% -} + \DefineFamilyKey[.toc]{KOMAarg}{floattype}{% + \FamilySetCounterMacro{KOMAarg}{floattype}{\reserved@d}{##1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \ifnum 0= + \ifnum\reserved@d<1 0 \else\ifnum\reserved@d>31 0 \else 1 \fi\fi + \FamilyKeyStateUnknownValue + \else + \let\tb@nt@floattype\reserved@d + \fi + \fi + }% % \end{macrocode} % \end{macro} -% \begin{macro}{\iftb@forcenames} +% \begin{macro}{\iftb@nt@forcenames} % \changes{v3.06}{2010/06/01}{new internal} +% \changes{v3.20}{2015/12/16}{local valid only}^^A % The |\...name| commands will only be defined, if they are not already % defined. But some users may want to define their own names even if there % are already definitions. So this boolean option may switch to force the % definition. % \begin{macrocode} -\newif\iftb@forcenames -\define@key{tocbasic}{forcenames}[true]{% - \lowercase{\tb@boolkey{#1}}{forcenames}% -} + \FamilyBoolKey[.toc]{KOMAarg}{forcenames}{tb@nt@forcenames}% % \end{macrocode} % \end{macro} -% \begin{macro}{\tb@nt@level} -% Each entry to a TOC/list of has a numeric level. You may set up your own -% level. +% \begin{macro}{\tb@nt@hang} +% \changes{v3.20}{2015/12/16}{undefined}^^A +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% Earch entry of a TOC/list of is idented on the left side. This is the +% amount of the indention of the text of the entry. % \begin{macrocode} -\define@key{tocbasic}{level}{% - \tb@ifvalueisnotempty{level}{#1}{\tb@numkey\tb@nt@level{#1}}% -} + \DefineFamilyKey[.toc]{KOMAarg}{hang}{% + \scr@ifundefinedorrelax{KV@KOMAarg.toc@tocnumwidth}{% + \PackageWarning{tocbasic}{% + deprecated option `hang'.\MessageBreak + Option will be ignored, because toc entry style\MessageBreak + `\tb@nt@tocentrystyle' does not provide option `numwidth'% + }% + }{% + \PackageWarning{tocbasic}{% + deprecated option `hang'.\MessageBreak + You should replace option `hang' by option\MessageBreak + `tocnumwidth'% + }% + \l@addto@macro\tb@nt@tocstyle@options{,numwidth={##1}}% + }% + \FamilyKeyStateProcessed + }% + \scr@ifundefinedorrelax{KV@KOMAarg.toc@tocnumwidth}{}{% + \l@addto@macro\tb@nt@tocstyle@options{,numwidth=1.5em}% + }% % \end{macrocode} % \end{macro} % \begin{macro}{\tb@nt@indent} +% \changes{v3.20}{2015/12/16}{undefined}^^A +% \changes{v3.20}{2015/12/16}{local valid only}^^A % Earch entry of a TOC/list of is idented on the left side. This is the % amount of the indention of the number part. % \begin{macrocode} -\define@key{tocbasic}{indent}{% - \tb@ifvalueisnotempty{indent}{#1}{\tb@dimkey\tb@nt@indent{#1}}% -} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\tb@nt@hang} -% Earch entry of a TOC/list of is idented on the left side. This is the -% amount of the indention of the text of the entry. -% \begin{macrocode} -\define@key{tocbasic}{hang}{% - \tb@ifvalueisnotempty{hang}{#1}{\tb@dimkey\tb@nt@hang{#1}}% -} + \DefineFamilyKey[.toc]{KOMAarg}{indent}{% + \scr@ifundefinedorrelax{KV@KOMAarg.toc@tocindent}{% + \PackageWarning{tocbasic}{% + deprecated option `indent'.\MessageBreak + Option will be ignored, because toc entry style\MessageBreak + `\tb@nt@tocentrystyle' does not provide option `indent'% + }% + }{% + \PackageWarning{tocbasic}{% + deprecated option `indent'.\MessageBreak + You should replace option `indent' by option\MessageBreak + `tocindent'% + }% + \l@addto@macro\tb@nt@tocstyle@options{,indent={##1}}% + }% + \FamilyKeyStateProcessed + }% + \scr@ifundefinedorrelax{KV@KOMAarg.toc@tocindent}{}{% + \l@addto@macro\tb@nt@tocstyle@options{,indent=1em}% + }% % \end{macrocode} % \end{macro} -% \begin{macro}{\iftb@float} -% \changes{v3.06}{2010/06/01}{new internal} -% This boolean indicates, that float environments should also be defined. +% \begin{macro}{\tb@nt@level} +% \changes{v3.20}{2015/12/16}{undefined}^^A +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% Each entry to a TOC/list of has a numeric level. You may set up your own +% level. % \begin{macrocode} -\newif\iftb@float -\define@key{tocbasic}{float}[true]{% - \lowercase{\tb@boolkey{#1}}{float}% -} + \DefineFamilyKey[.toc]{KOMAarg}{level}{% + \PackageWarning{tocbasic}{% + deprecated option `level'.\MessageBreak + You should replace option `level' by option\MessageBreak + `toclevel' + }% + \l@addto@macro\tb@nt@tocstyle@options{,level={##1}}% + \FamilyKeyStateProcessed + }% % \end{macrocode} % \end{macro} -% \begin{macro}{\iftb@nonfloat} -% \changes{v3.06}{2010/06/01}{new internal} -% This boolean indicates, that non-float environment should also be -% defined. The environment has the postfix ``-''. +% \begin{macro}{\tb@nt@listname} +% \changes{v3.18}{2015/06/20}{using \cs{def} instead of \cs{edef}}^^A +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% The list itself has a heading. A |\list<type>name| will also be defined. % \begin{macrocode} -\newif\iftb@nonfloat -\define@key{tocbasic}{nonfloat}[true]{% - \lowercase{\tb@boolkey{#1}}{nonfloat}% -} + \DefineFamilyKey[.toc]{KOMAarg}{listname}{% + \tb@ifvalueisnotempty{##1}{\def\tb@nt@listname{##1}}% + }% % \end{macrocode} % \end{macro} -% \begin{macro}{\tb@nt@floattype} -% Simply the value for the |\ftype@...| macro. It has to be -% $1<=\textrm{value}<=31$. +% \begin{macro}{\tb@nt@name} +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% We need a name/term for the entries of the new list. This may e.\,g. be used +% for |caption| output. A |\<type>name| will also be defined. % \begin{macrocode} -\define@key{tocbasic}{floattype}{% - \tb@ifvalueisnotempty{floattype}{#1}{\tb@numkey\tb@nt@floattype{#1}}% -} + \DefineFamilyKey[.toc]{KOMAarg}{name}{% + \tb@ifvalueisnotempty{##1}{\edef\tb@nt@name{##1}}% + }% % \end{macrocode} % \end{macro} -% \begin{macro}{\tb@nt@floatpos} -% Simply the value for the |\fps@...| macro. +% \begin{macro}{\iftb@nt@nonfloat} +% \changes{v3.06}{2010/06/01}{new (internal)}^^A +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% This boolean indicates, that non-float environment should also be +% defined. The environment has the postfix ``-''. % \begin{macrocode} -\define@key{tocbasic}{floatpos}{% - \tb@ifvalueisnotempty{floatpos}{#1}{\edef\tb@nt@floatpos{#1}}% -} + \FamilyBoolKey[.toc]{KOMAarg}{nonfloat}{tb@nt@nonfloat}% % \end{macrocode} % \end{macro} -% \begin{macro}{\tb@nt@atbegin} -% \changes{v3.09}{2011/03/01}{new optional identifier \texttt{atbegin}} -% \changes{v3.11c}{2013/02/01}{\texttt{atbegin} argument may be empty} -% Additional code executed at the begin of a new defined environment. +% \begin{macro}{\tb@nt@owner} +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% The owner of the new list extension. % \begin{macrocode} -\define@key{tocbasic}{atbegin}{% - \def\tb@nt@atbegin{#1}% -} + \DefineFamilyKey[.toc]{KOMAarg}{owner}{% + \tb@ifvalueisnotempty{##1}{\edef\tb@nt@owner{##1}}% + }% % \end{macrocode} % \end{macro} -% \begin{macro}{\tb@nt@atend} -% \changes{v3.09}{2011/03/01}{new optional identifier \texttt{atbend}} -% \changes{v3.11c}{2013/02/01}{\texttt{atend} argument may be empty} -% Additional code executed at the end of a new defined environment. +% \begin{macro}{\tb@nt@types} +% \changes{v3.20}{2015/12/16}{local valid only}^^A +% Sometimes the plural of the type is needed and may be defined by a +% seperate option. % \begin{macrocode} -\define@key{tocbasic}{atend}{% - \def\tb@nt@atend{#1}% -} + \DefineFamilyKey[.toc]{KOMAarg}{types}{% + \tb@ifvalueisnotempty{##1}{\edef\tb@nt@types{##1}}% + }% % \end{macrocode} % \end{macro} -% Now the command to define a new list and maybe float or nonfloat. -% \changes{v3.18}{2015/06/20}{\cs{tb@nt@types} and \cs{tb@nt@listname} are -% initialised \cs{relax}}^^A -% \begin{macrocode} -\newcommand*{\DeclareNewTOC}[2][]{% - \tb@floatfalse - \tb@nonfloatfalse - \tb@forcenamesfalse - \def\tb@nt@floattype{\tb@nt@autofloattype}% - \def\tb@nt@floatpos{tbp}% - \def\tb@nt@ext{#2}% - \def\tb@nt@type{#2}% - \let\tb@nt@types\relax - \def\tb@nt@owner{float}% - \def\tb@nt@name{\expandafter\protect\expandafter\MakeUppercase\tb@nt@type}% - \let\tb@nt@listname\relax - \def\tb@nt@level{1}% - \def\tb@nt@indent{1em}% - \def\tb@nt@hang{1.5em}% - \let\tb@nt@counterwithin\@empty - \let\tb@nt@atbegin\@empty - \let\tb@nt@atend\@empty - \setkeys{tocbasic}{#1}% +% Last but not least we have to execute the options and reset the option +% definitions. +% \begin{macrocode} + \FamilyExecuteOptions[.toc]{KOMAarg}{#1}% + \RelaxFamilyKey[.toc]{KOMAarg}{types}% + \RelaxFamilyKey[.toc]{KOMAarg}{owner}% + \RelaxFamilyKey[.toc]{KOMAarg}{nonfload}% + \RelaxFamilyKey[.toc]{KOMAarg}{name}% + \RelaxFamilyKey[.toc]{KOMAarg}{listname}% + \RelaxFamilyKey[.toc]{KOMAarg}{level}% + \RelaxFamilyKey[.toc]{KOMAarg}{indent}% + \RelaxFamilyKey[.toc]{KOMAarg}{hang}% + \RelaxFamilyKey[.toc]{KOMAarg}{forcenames}% + \RelaxFamilyKey[.toc]{KOMAarg}{floatpos}% + \RelaxFamilyKey[.toc]{KOMAarg}{float}% + \RelaxFamilyKey[.toc]{KOMAarg}{extension}% + \RelaxFamilyKey[.toc]{KOMAarg}{counterwithin}% + \RelaxFamilyKey[.toc]{KOMAarg}{atend}% + \RelaxFamilyKey[.toc]{KOMAarg}{atbegin}% + \tb@nt@extra@relax@opts + \RelaxFamilyKey[.toc]{KOMAarg}{tocentrystyle}% + \RelaxFamilyKey[.toc]{KOMAarg}{type}% + }% % \end{macrocode} % First of all, every TOC needs a extension, that should be added to the % list of known extensions. @@ -2974,7 +1513,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \@ifundefined{\tb@nt@type name}{% \expandafter\protected@edef\csname \tb@nt@type name\endcsname{\tb@nt@name}% }{% - \iftb@forcenames + \iftb@nt@forcenames \expandafter\protected@edef\csname \tb@nt@type name\endcsname {\tb@nt@name}% \fi @@ -2982,7 +1521,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \@ifundefined{list\tb@nt@type name}{% \expandafter\let\csname list\tb@nt@type name\endcsname\tb@nt@listname }{% - \iftb@forcenames + \iftb@nt@forcenames \expandafter\let\csname list\tb@nt@type name\endcsname\tb@nt@listname \fi }% @@ -2995,12 +1534,26 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. }\@tempa % \end{macrocode} % The list entry: -% \begin{macrocode} - \begingroup\edef\@tempa{\endgroup - \noexpand\newcommand*\csname l@\tb@nt@type\endcsname{% - \noexpand\@dottedtocline{\tb@nt@level}{\tb@nt@indent}{\tb@nt@hang}% +% \changes{v3.20}{2016/04/05}{warning if \cs{l@\dots} is undefined}^^A +% \begin{macrocode} + \ifstr{\tb@nt@tocentrystyle}{}{% + \@ifundefined{l@\tb@nt@type}{% + \PackageWarning{tocbasic}{% + \expandafter\string\csname l@\tb@nt@type\endcsname\space + undefined!\MessageBreak + I hope you know, what you are doing, but\MessageBreak + maybe it would be better to use proper\MessageBreak + `tocentrystyle` settings% + }% + }{}% + }{% + \edef\reserved@a{% + \noexpand\DeclareTOCStyleEntry[% + {\unexpanded\expandafter{\tb@nt@tocstyle@options}}% + ]{\tb@nt@tocentrystyle}{\tb@nt@type}% }% - }\@tempa + \reserved@a + }% % \end{macrocode} % \changes{v3.12}{2013/05/03}{fixed: definition of % \cs{listof\meta{type}entryname} added as explained in the manual} @@ -3022,7 +1575,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \changes{v3.09a}{2011/05/30}{fixed: floats may have an optional argument} % \changes{v3.12}{2013/12/10}{fixed: usage of default placement} % \begin{macrocode} - \iftb@float + \iftb@nt@float \expandafter\newcommand\expandafter*\csname fps@\tb@nt@type\expandafter \endcsname\expandafter{\tb@nt@floatpos}% \expandafter\newcommand\expandafter*\csname ftype@\tb@nt@type\expandafter @@ -3031,7 +1584,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \edef\@tempa{% \noexpand\endgroup \noexpand\newenvironment{\tb@nt@type}{% - \noexpand\@ifnextchar[%] + \noexpand\kernel@ifnextchar[%] {\noexpand\tb@atbegin@after\noexpand\@float{\tb@nt@type}}% {\noexpand\edef\noexpand\reserved@a{% \noexpand\noexpand\noexpand\tb@atbegin@after @@ -3043,7 +1596,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \noexpand\end@float }% \noexpand\newenvironment{\tb@nt@type*}{% - \noexpand\@ifnextchar[%] + \noexpand\kernel@ifnextchar[%] {\noexpand\tb@atbegin@after\noexpand\@dblfloat{\tb@nt@type}}% {\noexpand\edef\noexpand\reserved@a{% \noexpand\noexpand\noexpand\tb@atbegin@after @@ -3061,7 +1614,7 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \end{macrocode} % The nonfloat environment: % \begin{macrocode} - \iftb@nonfloat + \iftb@nt@nonfloat \begingroup \edef\@tempa{% \noexpand\endgroup @@ -3081,9 +1634,9 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \end{macrocode} % The counter and hooks of float and nonfloat environments: % \changes{v3.10b}{2012/04/04}{\cs{noexpand} added to fix problems using -% \cs{autodot}}%^^A +% \cs{autodot}}^^A % \changes{v3.13}{2014/07/31}{add \cs{autodot} only to hierachical -% counters}%^^A +% counters}^^A % \begin{macrocode} \if@tempswa \@ifundefined{c@\tb@nt@type}{% @@ -3142,66 +1695,44 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \end{macrocode} % \end{macro} % \begin{macro}{\tb@ifvalueisnotempty} -% \changes{v3.06}{2010/05/21}{new internal}% +% \changes{v3.06}{2010/05/21}{new internal}^^A +% \changes{v3.20}{2015/12/16}{simpler definition}^^A % This is only a helper for defining some of the keys. % \begin{macrocode} -\newcommand*{\tb@ifvalueisnotempty}[2]{% - \begingroup - \edef\@tempa{#2}\ifx\@tempa\@empty - \PackageError{tocbasic}{empty value for key `#1'}{% - The argument of key `#1' may not by empty!}% - \aftergroup\@gobble - \else - \aftergroup\@firstofone - \fi - \endgroup +\newcommand*{\tb@ifvalueisnotempty}[1]{% + \ifstr{#1}{}{% + \FamilyKeyStateUnknownValue + \expandafter\@gobble + }{% + \FamilyKeyStateProcessed + \expandafter\@firstofone + }% } % \end{macrocode} % \end{macro} % \begin{macro}{\tb@boolkey} -% \changes{v3.06}{2010/05/21}{new internal}% -% This is only a helper for boolean keys. -% \begin{macrocode} -\newcommand*{\tb@boolkey}[2]{% - \csname tb@#2\ifx\relax#1\relax true\else#1\fi\endcsname -} -% \end{macrocode} +% \changes{v3.06}{2010/05/21}{new (internal)}^^A +% \changes{v3.20}{2015/12/16}{undefined}^^A % \end{macro} % \begin{macro}{\tb@dimkey} -% \changes{v3.06}{2010/05/21}{new internal}% -% This is only a helper for dimension keys. -% \begin{macrocode} -\newcommand*{\tb@dimkey}[2]{% - \begingroup - \@defaultunits\@tempdima#2pt\relax\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\def\noexpand#1{\the\@tempdima}} - \@tempa -} -% \end{macrocode} +% \changes{v3.06}{2010/05/21}{new (internal)}^^A +% \changes{v3.20}{2015/12/16}{undefined}^^A % \end{macro} -% \begin{macro}{\tb@dimkey} +% \begin{macro}{\tb@numkey} % \changes{v3.06}{2010/05/21}{new internal}% -% This is only a helper for numerical keys. -% \begin{macrocode} -\newcommand*{\tb@numkey}[2]{% - \begingroup - \afterassignment\remove@to@nnil\@tempcnta#2\relax\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\def\noexpand#1{\the\@tempcnta}} - \@tempa -} -% \end{macrocode} +% \changes{v3.20}{2015/12/16}{undefined}^^A % \end{macro} % \begin{macro}{\tb@nt@autofloattype} % \changes{v3.06}{2010/06/01}{new internal} % This macro saves the float type for auto generated float types. % \begin{macrocode} \newcommand*{\tb@nt@autofloattype}{16} +%</body> % \end{macrocode} % \end{macro} % \end{macro} % % -% % \iffalse %</package> %<*load> diff --git a/Master/texmf-dist/source/latex/koma-script/tocstyle.dtx b/Master/texmf-dist/source/latex/koma-script/tocstyle.dtx index 9d2bd1c0a37..66fd8729da8 100644 --- a/Master/texmf-dist/source/latex/koma-script/tocstyle.dtx +++ b/Master/texmf-dist/source/latex/koma-script/tocstyle.dtx @@ -1,8 +1,8 @@ -% \CheckSum{1699} +% \CheckSum{1886} % \iffalse meta-comment % ====================================================================== % tocstyle.dtx -% Copyright (c) Markus Kohm, 2007-2015 +% Copyright (c) Markus Kohm, 2007-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -29,7 +29,7 @@ % at least three times. % ---------------------------------------------------------------------- % tocstyle.dtx -% Copyright (c) Markus Kohm, 2007-2015 +% Copyright (c) Markus Kohm, 2007-2016 % % Diese Datei ist Teil des LaTeX2e KOMA-Script-Pakets. % @@ -75,7 +75,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: tocstyle.dtx 1977 2015-03-09 08:17:29Z kohm $ +%%% From File: $Id: tocstyle.dtx 2428 2016-04-12 10:31:07Z kohm $ %<*dtx> % \fi \def\LaTeXformat{LaTeX2e} @@ -104,10 +104,7 @@ \preamble -Copyright (c) 2007-2013 by Markus Kohm <komascript(at)gmx.info> - -Copyright (c) 1994-2007 -Markus Kohm and any individual authors listed elsewhere in this file. +Copyright (c) 2007-2016 by Markus Kohm <komascript(at)gmx.info> This file was generated from file(s) of the KOMA-Script bundle. --------------------------------------------------------------- @@ -132,7 +129,7 @@ If this file is a beta version, you are not allowed to distribute it. English and German manuals are part of KOMA-Script bundle. ---------------------------------------------------------- -The english manual is at `tocstyle.dtx', too. +The english manual is in `tocstyle.dtx', too. The KOMA-Script bundle (but not this file) was based upon the LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e standard @@ -178,7 +175,7 @@ THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE! \Msg{* To finish the installation you have to copy the file `tocstyle.sty'} \Msg{* to folder `tex/latex/tocstyle/' of one of your TEXMF trees.} \Msg{* You should also produce the documentation using} - \Msg{*\space\space latex tocstyle.dtx} + \Msg{*\space\space pdflatex tocstyle.dtx} \Msg{* and copy it to folder `doc/latex/tocstyle/' of one of your} \Msg{* TEXMF trees.} \Msg{*} @@ -202,7 +199,7 @@ THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE! %<driver>\ProvidesFile{tocstyle.drv} %<doc>\ProvidesFile{tocstyle.tex} %<*dtx|package|driver|doc> - [2013/08/11 v0.2e-alpha KOMA-Script package (versatile toc styles)] + [2016/04/12 v0.2h-alpha KOMA-Script package (versatile toc styles)] %</dtx|package|driver|doc> %<*driver> \documentclass{scrdoc} @@ -222,7 +219,6 @@ THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE! \date{\filedate} \author{Markus Kohm} -\newenvironment{Explain}{\par}{\par} \let\Macro\cs \let\Package\textsf \let\File\texttt @@ -269,7 +265,9 @@ THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE! % % \selectlanguage{english} % -% \changes{v0.1}{2007/06/23}{start of new package} +% \changes{v0.1}{2007/06/23}{start of new package}^^A +% \changes{v0.2h}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % %\iffalse %<doc>\chapter{Other Styles for Table of Contents and Lists of Floats} @@ -288,6 +286,9 @@ author didn't like to change the \LaTeX\ kernel at a class, because this may result in serveral problems with other packages. The package \Package{tocstyle} will fill the gap. If it conflicts with another package, you simply may decide not to use it. + +Since \KOMAScript~3.20 most of the features of \Package{tocstyle} are also +provided by other \KOMAScript{} packages like \Package{tocbasic}. %\iffalse %</doc> %\fi @@ -301,45 +302,64 @@ you simply may decide not to use it. %<*doc> %\fi % +\section{Package Status} +\label{sec:tocstyle.status} + +Package \Package{tocstyle} has alpha status for a very long time (since +2007), despite the fact that it was very stable all over the years. The main +reason for this is that it was an experiment and I always intended to make a +better successor. Another reason was, that there are known issues, which are +hardly to fix. So \Package{tocstyle} never became an official part of +\KOMAScript. Nevertheless it has been published with \KOMAScript, because I +thought it would be an useful addition. I never thought that the interim +status of the package would be for more than eight years. + +With \KOMAScript~3.20 several features of \Package{tocstyle} can be found also +in \Package{tocbasic}. I recommend to use that official and essential part of +\KOMAScript{} instead of \Package{tocstyle} whenever possible. Nevertheless, I +plan to ensure the compatibility of \Package{tocstyle} with new releases of +\KOMAScript{} for at least already existing, unchanged documents as long as it +is possible. But expect that \Package{tocstyle} will move from +\KOMAScript{} bundle to another package, e.\,g., \KOMAScript-obsolete or a +stand-alone package. + \section{How It Works} \label{sec:tocstyle.howitworks} -\begin{Explain} - Loading the package \Package{tocstyle} will redefine the kernel macro - \Macro{@starttoc}. Using the redefined \Macro{@starttoc} will redefine - \Macro{@dottedtocline}, \Macro{l@part} down to \Macro{l@subparagraph}, - \Macro{l@figure}, and \Macro{l@table}, if and only if \Package{tocstyle} - wasn't deactivated for all TOCs or this TOC. Usage the redefined - \Macro{@dottedtocline} will redefine \Macro{numberline}. +Loading the package \Package{tocstyle} will redefine the kernel macro +\Macro{@starttoc}. Using the redefined \Macro{@starttoc} will redefine +\Macro{@dottedtocline}, \Macro{l@part} down to \Macro{l@subparagraph}, +\Macro{l@figure}, and \Macro{l@table}, if and only if \Package{tocstyle} +wasn't deactivated for all TOCs or this TOC. Usage the redefined +\Macro{@dottedtocline} will redefine \Macro{numberline}. - Redefining \Macro{@starttoc}, \Macro{@dottedtocline}, and \Macro{numberline} - will activate the features of \Package{tocstyle} for all lists that uses - these, e.g. table of contents, list of figures and list of tables at the - standard or the \KOMAScript{} classes. But while not all classes uses - \Macro{@dottedtocline} and \Macro{@numberline} for all entries to table of - contents and list of floats the package redefines some other macros that are - typically used for those entries. These are e.g. \Macro{l@part}, - \Macro{l@chapter} and some more. If the class even does not use those - macros, you may not use \Package{tocstyle} to change the lists. The term TOC - will be used for all kind of list, that may be processed by - \Package{tocstyle}. The package tests wether the original kernel macros - \Macro{@starttoc}, \Macro{@dottedtocline}, and \Macro{numberline} were used - or not and warns if not. +Redefining \Macro{@starttoc}, \Macro{@dottedtocline}, and \Macro{numberline} +will activate the features of \Package{tocstyle} for all lists that uses +these, e.g. table of contents, list of figures and list of tables at the +standard or the \KOMAScript{} classes. But while not all classes uses +\Macro{@dottedtocline} and \Macro{@numberline} for all entries to table of +contents and list of floats the package redefines some other macros that are +typically used for those entries. These are e.g. \Macro{l@part}, +\Macro{l@chapter} and some more. If the class even does not use those macros, +you may not use \Package{tocstyle} to change the lists. The term TOC will be +used for all kind of list, that may be processed by \Package{tocstyle}. The +package tests wether the original kernel macros \Macro{@starttoc}, +\Macro{@dottedtocline}, and \Macro{numberline} were used or not and warns if +not. - Package \Package{tocstyle} needs some more information. For the standard and - the \KOMAScript{} classes these informations may be detected by the - package. If the result is not the expected, you may configure these - informations manually. +Package \Package{tocstyle} needs some more information. For the standard and +the \KOMAScript{} classes these informations may be detected by the +package. If the result is not the expected, you may configure these +informations manually. - The entries of every TOC hat a depth. See the counter \Counter{tocdepth} for - more information about the depth. You may change several settings for the - entries of either all depths of all TOCs, all depths of one TOC, or one - depth of one TOC. +The entries of every TOC hat a depth. See the counter \Counter{tocdepth} for +more information about the depth. You may change several settings for the +entries of either all depths of all TOCs, all depths of one TOC, or one depth +of one TOC. - But most users will not need to set up \Package{tocstyle} at this low - level. They simply will select one of the predefined styles and maybe select - one of the optional features. -\end{Explain} +But most users will not need to set up \Package{tocstyle} at this low +level. They simply will select one of the predefined styles and maybe select +one of the optional features. \section{Optional Features} \label{sec:tocstyle.options} @@ -1068,11 +1088,11 @@ usefull to define your own toc styles. % \end{macro} % % \begin{option}{chapter} -% \changes{v3.05}{2009/11/11}{New} +% \changes{v0.2d}{2009/11/11}{New} % \begin{option}{nochapter} -% \changes{v3.05}{2009/11/11}{New} +% \changes{v0.2d}{2009/11/11}{New} % \begin{macro}{\iftochaschapter} -% \changes{v3.05}{2009/11/11}{New} +% \changes{v0.2d}{2009/11/11}{New} % Do we have \cs{chapter} and \cs{l@chapter}? % \begin{macrocode} \newif\iftochaschapter\tochaschapterfalse @@ -1413,7 +1433,7 @@ usefull to define your own toc styles. % \subsubsection{Redefining Class Macros} % % \begin{macro}{\l@part} -% \changes{v2.4}{2009/11/11}{part level is always -1} +% \changes{v0.2d}{2009/11/11}{part level is always -1} % \begin{macro}{\l@chapter} % \begin{macro}{\l@section} % \begin{macro}{\l@subsection} @@ -1423,44 +1443,147 @@ usefull to define your own toc styles. % \begin{macro}{\l@table} % \begin{macro}{\l@figure} % Try to redefine the toc commands at startup. +% \changes{v0.2f}{2016/03/22}{recognize all subs of part, chapter, +% section and paragraph}^^A +% \changes{v0.2g}{2016/03/23}{warning for usage of not recommended package +% combinations}^^A +% \changes{v0.2h}{2016/04/24}{lokal \cs{normalcolor} auf \cs{relax} +% setzen}^^A +% \changes{v0.2h}{2016/04/24}{lokal \cs{color} auf \cs{@gobble} setzen}^^A % \begin{macrocode} \AtBeginDocument{% - \ifcsname l@part\endcsname - \setbox\@tempboxa\vbox{\hsize\maxdimen - \l@part{\tocstyle@l@define{part}{-1}}{}}% - \fi - \ifcsname l@chapter\endcsname - \setbox\@tempboxa\vbox{\hsize\maxdimen - \l@chapter{\tocstyle@l@define{chapter}{0}}{}}% - \fi - \ifcsname l@section\endcsname + \@ifpackageloaded{tocbasic}{% + \@ifpackagelater{tocbasic}{2016/03/01}{% + \PackageWarningNoLine{tocstyle}{% + Usage of `tocstyle' with new `tocbasic' detected.\MessageBreak + This is not an error! You can do this.\MessageBreak + Nevertheless, you should note, combining `tocstyle'\MessageBreak + with this version of `tocbasic' will break several\MessageBreak + features of `tocbasic'. You should use `tocstyle'\MessageBreak + features instead of `tocbasic' attributes for all\MessageBreak + entry changes you want.\MessageBreak + You may also get additional warnings because of\MessageBreak + redefined `\string\numberline'. Ignore them}% + }{}% + }{}% + \@ifpackageloaded{etoc}{% + \PackageWarningNoLine{tocstyle}{% + Usage of `tocstyle' with `etoc' detected.\MessageBreak + I suggest to use either `tocstyle' or `etoc'\MessageBreak + but not both of them together}% + }{}% + \@ifpackageloaded{titletoc}{% + \PackageWarningNoLine{tocstyle}{% + Usage of `tocstyle' with `titletoc' detected.\MessageBreak + I suggest to use either `tocstyle' or `titletoc'\MessageBreak + but not both of them together. I expect even\MessageBreak + error messages because of this combination}% + }{}% + \def\tocstyle@test@level{-1}% + \def\tocstyle@test@levelname{part}% + \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% \setbox\@tempboxa\vbox{\hsize\maxdimen - \l@section{\tocstyle@l@define{section}{1}}{}}% - \fi - \ifcsname l@subsection\endcsname - \setbox\@tempboxa\vbox{\hsize\maxdimen - \l@subsection{\tocstyle@l@define{subsection}{2}}{}}% + \let\normalcolor\relax + \let\color\@gobble + \edef\reserved@a{% + \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% + \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% + {\tocstyle@test@level}% + }{}% + }% + \reserved@a + }% + \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% + \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% + }% + \ifnum\tocstyle@test@level<\z@ + \def\tocstyle@test@level{0}% \fi - \ifcsname l@subsubsection\endcsname + \def\tocstyle@test@levelname{chapter}% + \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% \setbox\@tempboxa\vbox{\hsize\maxdimen - \l@subsubsection{\tocstyle@l@define{subsubsection}{3}}{}}% + \let\normalcolor\relax + \let\color\@gobble + \edef\reserved@a{% + \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% + \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% + {\tocstyle@test@level}% + }{}% + }% + \reserved@a + }% + \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% + \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% + }% + \ifnum\tocstyle@test@level<\@ne + \def\tocstyle@test@level{1}% \fi - \ifcsname l@paragraph\endcsname + \def\tocstyle@test@levelname{section}% + \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% \setbox\@tempboxa\vbox{\hsize\maxdimen - \l@paragraph{\tocstyle@l@define{paragraph}{4}}{}}% - \fi - \ifcsname l@subparagraph\endcsname + \let\normalcolor\relax + \let\color\@gobble + \edef\reserved@a{% + \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% + \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% + {\tocstyle@test@level}% + }{}% + }% + \reserved@a + }% + \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% + \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% + }% + \def\tocstyle@test@levelname{paragraph}% + \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% \setbox\@tempboxa\vbox{\hsize\maxdimen - \l@subparagraph{\tocstyle@l@define{subparagraph}{5}}{}}% - \fi - \ifcsname l@table\endcsname + \let\normalcolor\relax + \let\color\@gobble + \edef\reserved@a{% + \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% + \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% + {\tocstyle@test@level}% + }{}% + }% + \reserved@a + }% + \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% + \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% + }% + \def\tocstyle@test@level{1}% + \def\tocstyle@test@levelname{table}% + \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% \setbox\@tempboxa\vbox{\hsize\maxdimen - \l@table{\tocstyle@l@define{table}{1}}{}}% - \fi - \ifcsname l@figure\endcsname + \let\normalcolor\relax + \let\color\@gobble + \edef\reserved@a{% + \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% + \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% + {\tocstyle@test@level}% + }{}% + }% + \reserved@a + }% + \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% + \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% + }% + \def\tocstyle@test@level{1}% + \def\tocstyle@test@levelname{figure}% + \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% \setbox\@tempboxa\vbox{\hsize\maxdimen - \l@figure{\tocstyle@l@define{figure}{1}}{}}% - \fi + \let\normalcolor\relax + \let\color\@gobble + \edef\reserved@a{% + \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% + \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% + {\tocstyle@test@level}% + }{}% + }% + \reserved@a + }% + \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% + \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% + }% % \end{macrocode} % \begin{macro}{\@dottedtocline} % This will be used even for undotted toc lines. First check the definition, @@ -1594,7 +1717,9 @@ usefull to define your own toc styles. \if@filesw \begingroup \endlinechar=\m@ne +% \end{macrocode} % While \LaTeX{} does not close the files, we have to do it know. +% \begin{macrocode} \immediate\closeout\csname tf@#1\endcsname \immediate\openin\@inputcheck \jobname.#1 \immediate\openout\@partaux \jobname.#1#2 @@ -1686,7 +1811,8 @@ usefull to define your own toc styles. % \end{macro} % % \begin{macro}{\tocstyle@set@width} -% \changes{v3.05}{2009/11/11}{improve handling of standard classes} +% \changes{v0.2d}{2009/11/11}{improve handling of standard classes}^^A +% \changes{v0.2h}{2016/03/25}{use after definition in \texttt{aux}-file}^^A % Some classes do not use \cs{numberline}. This may result in negativ widths % (esp. negativ skips). Following special handling of negativ values improves % the toc handling of the standard classes. Nevertheless indentation of not @@ -1708,6 +1834,13 @@ usefull to define your own toc styles. \fi \fi } +\AtBeginDocument{% + \if@filesw + \immediate\write\@auxout{% + \string\providecommand*\string\tocstyle@set@width[4]{}% + }% + \fi +} % \end{macrocode} % \end{macro} % @@ -1747,7 +1880,7 @@ usefull to define your own toc styles. % The primary command to set the features of a depth of a TOC. % \begin{macrocode} \newcommand*{\@settocfeature}[1][]{% - \@ifnextchar[ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]} + \kernel@ifnextchar[ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]} } \def\@@settocfeature[#1][#2]#3#4{% %<trace> \typeout{exclude: \tocstyle@feature@excludelist}% @@ -1804,7 +1937,7 @@ usefull to define your own toc styles. % Same as above without TOC argument. % \begin{macrocode} \newcommand*{\@settocstylefeature}{% - \@ifnextchar[ {\@settocfeature[]}{\@settocfeature[][]}% + \kernel@ifnextchar[ {\@settocfeature[]}{\@settocfeature[][]}% } \newcommand*{\settocstylefeature}{} \let\settocstylefeature\@settocstylefeature @@ -1882,10 +2015,10 @@ usefull to define your own toc styles. % that defines all features doesn't need a parent. % \begin{macrocode} \newcommand*{\newtocstyle}{% - \@ifnextchar [{\@newtocstyle}{\@newtocstyle[]}} + \kernel@ifnextchar [{\@newtocstyle}{\@newtocstyle[]}} \newcommand*{\@newtocstyle}{} \def\@newtocstyle[#1]{% - \@ifnextchar [{\@@newtocstyle[{#1}]}{\@newtocstyle[{#1}][]}} + \kernel@ifnextchar [{\@@newtocstyle[{#1}]}{\@newtocstyle[{#1}][]}} \newcommand*{\@@newtocstyle}{} \def\@@newtocstyle[#1][#2]#3#4{% \@ifundefined{tocstyle@style@#3}{% @@ -1935,7 +2068,7 @@ usefull to define your own toc styles. but there's no TOC style `#2' defined.}% }{% \def\settocfeature{% - \@ifnextchar[ %] + \kernel@ifnextchar[ %] {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}% }% \let\settocstylefeature\settocfeature |