From 73d73aa3ed33c11ee796197d8aac78f7d74cd5cd Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 27 Nov 2007 14:56:17 +0000 Subject: update juramisc from CTAN git-svn-id: svn://tug.org/texlive/trunk@5619 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/juramisc/jbgoe.clo | 6 +- .../texmf-dist/tex/latex/juramisc/jbstgallen.clo | 5 +- Master/texmf-dist/tex/latex/juramisc/jbtrier.clo | 6 +- Master/texmf-dist/tex/latex/juramisc/jurabase.sty | 124 ++++-- Master/texmf-dist/tex/latex/juramisc/jurabook.cls | 452 ++++++++++----------- 5 files changed, 324 insertions(+), 269 deletions(-) (limited to 'Master/texmf-dist/tex/latex/juramisc') diff --git a/Master/texmf-dist/tex/latex/juramisc/jbgoe.clo b/Master/texmf-dist/tex/latex/juramisc/jbgoe.clo index 2283a65a61e..8eedf951b5d 100644 --- a/Master/texmf-dist/tex/latex/juramisc/jbgoe.clo +++ b/Master/texmf-dist/tex/latex/juramisc/jbgoe.clo @@ -2,12 +2,13 @@ % % Official title: Georg-August-Universitaet Goettingen % -% Version 1 (03.03.06 21:43) +% Version 2 (2007/09/11) % % 2006 Axel Sodtalbers (juramisc@sodtalbers.de) -% +% 2007 adopted to new title-mechanism (AS) \ClassInfo{jurabook}{Setting up the official goettingen university thesis titlepage \@gobble} +\makeatletter \renewcommand{\maketitle}{% \begin{titlepage} \begin{center} @@ -46,4 +47,5 @@ \end{titlepage}% \@emptytitles% } +\makeatother \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/juramisc/jbstgallen.clo b/Master/texmf-dist/tex/latex/juramisc/jbstgallen.clo index b1c206dd7cd..5feb5864e9c 100644 --- a/Master/texmf-dist/tex/latex/juramisc/jbstgallen.clo +++ b/Master/texmf-dist/tex/latex/juramisc/jbstgallen.clo @@ -2,11 +2,13 @@ % % Official title: Universitaet St. Gallen % -% Version 1 (2006/05/24) +% Version 2 (2007/09/11) % % 2006 Axel Sodtalbers +% 2007 adopted to new title-mechanism (AS) \ClassInfo{jurabook}{Setting up the official st gallen university thesis titlepage \@gobble} +\makeatletter \renewcommand{\maketitle}{% \begin{titlepage} {\large @@ -63,4 +65,5 @@ \end{titlepage} \@emptytitles% } +\makeatother \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/juramisc/jbtrier.clo b/Master/texmf-dist/tex/latex/juramisc/jbtrier.clo index 87850e47752..f502b8c7784 100644 --- a/Master/texmf-dist/tex/latex/juramisc/jbtrier.clo +++ b/Master/texmf-dist/tex/latex/juramisc/jbtrier.clo @@ -2,11 +2,13 @@ % % Official title: Universitaet Trier % -% Version 1 (03.03.06 21:56) +% Version 2 (2007/09/11) % % 2006 Peter Schuster +% 2007 adopted to new title-mechanism (AS) \ClassInfo{jurabook}{Setting up the official trier university thesis titlepage \@gobble} +\makeatletter \renewcommand{\maketitle}{% \begin{titlepage} \begin{center} %% Den ganzen Text auf der Titelseite zentrieren @@ -50,6 +52,8 @@ \end{center} \end{titlepage} + \@emptytitles% } +\makeatother \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/juramisc/jurabase.sty b/Master/texmf-dist/tex/latex/juramisc/jurabase.sty index 6e7507ac3f9..2bf61ce3d4f 100644 --- a/Master/texmf-dist/tex/latex/juramisc/jurabase.sty +++ b/Master/texmf-dist/tex/latex/juramisc/jurabase.sty @@ -1,5 +1,5 @@ -% last change : 05.06.05 14:04 -% status : 0.16 beta +% last change : 15.11.2007 18:13:18 +% status : 0.17 beta % created : 2001/06/28 17:49:53 % % subject : jurabase package - basic jura commands @@ -9,9 +9,11 @@ % © Axel Sodtalbers \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{jurabase}[2005/06/05 V0.16 basic jura commands (AS)] - +\ProvidesPackage{jurabase}[2007/11/15 V0.17 basic jura commands (AS)] +% - some reworking of forwardandback environment code +% - patched code of \so (= \sob) command for proper function +% when soul package is used. %======================================== % @@ -42,7 +44,7 @@ %======================================== % -% Aufzaehlung gem. Juristerei +% enumeration in germin law docs % %======================================== @@ -64,14 +66,19 @@ %======================================== % -% forwardandback Umgebung +% forwardandback environment +% (maybe needs heavy reworking % %======================================== \newcounter{fabdepth} \setcounter{fabdepth}{-1} -\newboolean{boldfablabel} +\newif\if@infablist +\@infablistfalse + +\newif\if@boldfablabel +\@boldfablabelfalse \newcommand{\@jfablabel}{} @@ -94,22 +101,26 @@ \setlength{\fablabelsep}{\labelsep/2} \newenvironment{forwardandback}[1][III.\ ]% Begl. 464 - {\setcounter{fabdepth}{\z@}% + {\setcounter{fabdepth}{\@ne}% \settowidth{\fablabelwidth}{#1}% - \setboolean{boldfablabel}{false}% + \@boldfablabelfalse% + \@infablisttrue% \begin{@fablist}% \item % } - {\end{@fablist}} + {\end{@fablist}% + \@infablistfalse} \newenvironment{forwardandback*}[1][III.\ ] - {\setcounter{fabdepth}{\z@}% + {\setcounter{fabdepth}{\@ne}% \settowidth{\fablabelwidth}{#1}% - \setboolean{boldfablabel}{true}% + \@boldfablabeltrue% + \@infablisttrue% \begin{@fablist}% \item % } - {\end{@fablist}} + {\end{@fablist}% + \@infablistfalse} \iffalse @@ -129,36 +140,66 @@ \setlength{\rightmargin}{\z@}% \setlength{\topsep}{\z@}% \setlength{\parsep}{\z@}% - \ifthenelse{\boolean{boldfablabel}}% - {\renewcommand{\@jfablabel}{{\bfseries #1}}% - }% - % else - {\renewcommand{\@jfablabel}{#1}% - }% + \if@boldfablabel% + \renewcommand{\@jfablabel}{{\bfseries #1}}% + \else% + \renewcommand{\@jfablabel}{#1}% + \fi% \let\makelabel\@jfablabel% }% \item % } - + \newcommand{\jfrw}[1]{% - \end{list}% - \addtocounter{fabdepth}{\@ne}% - \@startforwardandbacklist{#1}% - } + \if@infablist + \end{list}% + \addtocounter{fabdepth}{\@ne}% + \@startforwardandbacklist{#1}% + \else% + \PackageError{jurabase}% + {\protect\jfrw\space used outside forwardandback environment}% + {Use the forwardandback environment!}% + \fi% +} \newcommand{\jsme}[1]{% - \end{list}% - \@startforwardandbacklist{#1}% - } + \if@infablist + \end{list}% + \@startforwardandbacklist{#1}% + \else% + \PackageError{jurabase}% + {\protect\jsme\space used outside forwardandback environment}% + {Use the forwardandback environment!}% + \fi% +} -\newcommand{\jbck}[1]{% - \end{list}% - \addtocounter{fabdepth}{\m@ne}% - \@startforwardandbacklist{#1}% - } +\newcommand{\jbck}[2][1]{% + \if@infablist + \end{list}% + \addtocounter{fabdepth}{-#1}% + \ifthenelse{\value{fabdepth}>0}% + {\@startforwardandbacklist{#2}}% + {\PackageError{jurabase}% + {You are on the lowest level, \MessageBreak + you cannot go back with \protect\jbck\space here.}% + {Use \protect\jsme\space or rearrange your forwardandback environment!}% + } + \else% + \PackageError{jurabase}% + {\protect\jbck\space used outside forwardandback environment}% + {Use the forwardandback environment!}% + \fi% +} -\newcommand{\jgoback}{\addtocounter{fabdepth}{\m@ne}} % check<0 ??? -\newcommand{\fabreset}{\setcounter{fabdepth}{\z@}} +\newcommand{\fabreset}{% + \if@infablist + \setcounter{fabdepth}{\@ne} + \else% + \PackageError{jurabase}% + {\protect\jreset\space used outside forwardandback environment}% + {Use the forwardandback environment!}% + \fi% +} %======================================== @@ -291,8 +332,19 @@ s.\,a.\xspace} \abkwarning% Siehe auch\xspace} -\newcommand*{\so}{% Abkuerzung fuer siehe oben -s.\,o.\xspace} +\AtBeginDocument{ + \@ifundefined{so}% Abkuerzung fuer siehe oben + {\newcommand*{\so}{s.\,o.\xspace}% + \let\sob\so% + }% + {\PackageWarning{jurabase}% + {Command \protect\so\space is already defined (maybe because you\MessageBreak + are using the 'soul' package).\MessageBreak + Please use the command \protect\sob\space to typeset\MessageBreak + the abbreviation 'siehe oben'!}% + \newcommand*{\sob}{s.\,o.\xspace}% + } +} \newcommand*{\So}{% Abkuerzung fuer Siehe oben \abkwarning% diff --git a/Master/texmf-dist/tex/latex/juramisc/jurabook.cls b/Master/texmf-dist/tex/latex/juramisc/jurabook.cls index ae8cd1a80e3..960155a1a22 100644 --- a/Master/texmf-dist/tex/latex/juramisc/jurabook.cls +++ b/Master/texmf-dist/tex/latex/juramisc/jurabook.cls @@ -1,5 +1,5 @@ -% last change : 2006-05-28 18:23:52 -% status : 0.90 beta +% last change : 09.11.2007 18:56:07 +% status : 0.91 beta % created : 2001/06/28 17:49:53 % % subject : typesetting german phd thesis law @@ -8,8 +8,20 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jurabook}[2006/05/28 V0.90 (beta) juridical books (AS)] +\ProvidesClass{jurabook}[2007/11/09 V0.91 (beta) juridical books (AS)] +% new styles: chapter (all chapter/appendix headings, def: \huge\bfseries +% partintro ('Kapitel X:', def: \huge\bfseries +% part ('Einleitung', def: \Huge\bfseries +% +% new option: showpagenumber +% +% change: \rn works with option 'norunners' turned on +% +% bug fixed: \dumpoptions broken (showed obsolete options) +% bug fixed: correct chapter display in toc +% bug fixed: \settowidth{\@tempdima}{\bfseries 99.\space} +% % for a change history cf. % doc/jmgerdoc.tex (\subsubsection{Versionsgeschichte}) @@ -41,8 +53,8 @@ % %======================================== -\newcommand*{\jurabookversion}{V0.90 (beta)} -\newcommand*{\jurabookdate}{2006/05/28} +\newcommand*{\jurabookversion}{V0.91 (beta)} +\newcommand*{\jurabookdate}{2007/10/15} %======================================== @@ -102,7 +114,7 @@ \iffalse rnrefbold - ========= + =============== Sollen in Verweisen mit \mnref{Marke} die Randnummern fett ausgegeben werden? -> default: false @@ -118,7 +130,7 @@ \iffalse rnintoc (rn in toc) - ======= + =============== Sollen auch die Randnummern in das Inhaltsverzeichnis mit aufgenommen werden? (funktioniert noch nicht!) @@ -157,6 +169,28 @@ \DeclareOption{fncontinued}{\@fncontinuedtrue} +\iffalse + + showpagenumber + =============== + Footers of the first page of a part / chaper contains the page number + Fussnoten werden auch nach chapter weitergezaehlt + -> default: false + +\fi + + +\newif\if@showpagenumber +\@showpagenumberfalse +\newcommand{\jubo@thispagestyle@empty}% + {\thispagestyle{empty}} + +\DeclareOption{showpagenumber}{% + \@showpagenumbertrue% + \renewcommand{\jubo@thispagestyle@empty}% + {\thispagestyle{plain}}% +} + \iffalse suppresswebdates @@ -365,52 +399,6 @@ \DeclareOption{maketime}{\@printmaketimetrue} -\iffalse - - goettingen - ========== - Offizieller Titel nach der Goettinger Promotionsordnung - -> default: false -\fi - -\newif\if@goettingen -\@goettingenfalse - - -\DeclareOption{goettingen}{% - \@goettingentrue} - - -\iffalse - - trier - ========== - Offizieller Titel nach der Trierer Promotionsordnung - -> default: false -\fi - -\newif\if@trier -\@trierfalse - -\DeclareOption{trier}{% - \@triertrue} - -\iffalse - - stgallen - ========== - Offizieller Titel der Uni St. Gallen - -> default: false -\fi - -\newif\if@stgallen -\@stgallenfalse - -\DeclareOption{stgallen}{% - \@stgallentrue} - - - \newif\if@ruwtitle \@ruwtitlefalse @@ -485,6 +473,7 @@ \@jb@checkopt{rnrefbold} \@jb@checkopt{oldfootnotes} \@jb@checkopt{fncontinued} + \@jb@checkopt{showpagenumber} \@jb@checkopt{longfnrule} \@jb@checkopt{classiclayout} \@jb@checkopt{centeredlayout} @@ -496,9 +485,6 @@ \@jb@checkopt{chaptersuffix} \@jb@checkopt{fixtocindent} \if@printmaketime \@jb@oo{maketime: off}\else\@jb@oo{maketime: on}\fi - \@jb@checkopt{officialtitle} - \@jb@checkopt{goettingen} - \@jb@checkopt{bonn} } %======================================== @@ -749,24 +735,33 @@ %============================================ % -% Titelei +% titles % %============================================ \iffalse + + Three ways to set a title - \subtitle{untertitel} + 1. Standard title - used as ususal, with some extra fields (see below) + 2. RuW title - switched on with option 'ruwtitle' (not documentated) + 3. Official title in external file - use with \officaltitle + + Some extra fields + + \subtitle{text} #1 - Ein subtitle ist optional, deswegen wird hier nicht - der code aus latex.tex uebernommen (dieser fuehrt - zu einer Fehlermeldung, wenn zB \@title unbesetzt ist). + A subtitle is optional. We don't use exactly + the same code as in latex.ltx, because + latex.ltx fails if \@title is not set. + - \publishinfo{verlag} - #1 + \publishinfo{text} + #1 - Fuer Verlag o.ae., wird ganz unten auf die Titelseite gesetzt. + To print out the publishing company, typeset in the lower margin. \fi @@ -813,146 +808,139 @@ \def\@examdate{\today} -% #1: university (goettingen) -% #2: filename (goe) +\newcommand{\@use@title@standard}{% + \renewcommand{\maketitle}{% + \begin{titlepage}% + \let\footnotesize\small + \let\footnoterule\relax + \let \footnote \thanks + \null\vfil% + %\vskip 60\p@ + \begin{center}% + \if@classiclayout% original definition: + {\jb@title@style\@title\par}% + \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\' + \else% + {\jb@subtitle@style\vskip 4ex\@subtitle\par}% + \fi% + {\jb@author@style% + \vskip 8ex von\par + \vskip 1ex% + \lineskip .75em% + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par% + }% + \ifx\@subauthor\@empty% + \else% + {\jb@subauthor@style% + \vskip 1ex + \begin{tabular}[t]{c}% + \@subauthor + \end{tabular}\par}% + \fi% + \vskip 1.5em% + {\jb@titledate@style\@date\par}% + \else % slightly modernized: + {\jb@title@style\vskip 2ex \@title\par}% + \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\' + \else + {\jb@subtitle@style\vskip 4ex\@subtitle \par}% + \fi% + {\jb@from@style\vskip 8ex von\par}% + {\jb@author@style + \vskip 1ex% + \lineskip .75em% + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par% + } + \ifx\@subauthor\@empty% + \else% + {\jb@subauthor@style% + \vskip 1ex + \begin{tabular}[t]{c}% + \@subauthor + \end{tabular}\par}% + \fi% + \vskip 1.5em% + {\jb@titledate@style\@date\par}% + \fi% + \end{center}\par + {\jb@thanks@style\@thanks\par} + \ifx\@publishinfo\@empty% + {\vfil\null}% + \else% + \vfill% + {\hfil\jb@publishinfo@style\@publishinfo\hfil}% + \ifx\@publishplace\@empty% + \else% + {\vskip 1ex\hfil\jb@publishplace@style\@publishplace\hfil}% + \fi% + \fi% + \@emptytitles + \end{titlepage}% + }% +} + +\newcommand{\@use@title@ruw}{% + \renewcommand{\maketitle}{% + \begin{titlepage}% + \let\footnotesize\small + \let\footnoterule\relax + \let \footnote \thanks + {\centering% + \vspace*{\jb@chapterbefore@length}% + {\jb@title@style\@title\par}% + \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\' + \else + {\jb@subtitle@style\vskip 4ex\@subtitle \par}% + \fi% + {\jb@from@style\vskip 8ex von\par}% + {\jb@author@style + \vskip 1ex% + \lineskip .75em% + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par% + } + \ifx\@subauthor\@empty% + \else% + {\jb@subauthor@style% + \vskip 1ex + \begin{tabular}[t]{c}% + \@subauthor + \end{tabular}\par}% + \fi% + \vfill + \begin{tabular}[t]{c}% + \usebox{\titlepublisherbox} + \end{tabular}% + \par} + \@emptytitles% + \end{titlepage}% + }% +} -\newcommand{\notitlefileerror}[2]{ - \ClassError{jurabook}% - {You request the official #1 titlepage,\MessageBreak - but I cannot find the file 'jb#2.clo'}% - {Get 'jb#2.clo' from CTAN or www.sodtalbers.de/tex.}% +\newcommand{\officaltitle}[1]{% + \InputIfFileExists{jb#1.clo}% + {\relax % information is given within the clo-file + }% + {\ClassError{jurabook}% + {You request an official titlepage,\MessageBreak + but I cannot find the corresponding\MessageBreak + file 'jb#1.clo'}% + {Get 'jb#1.clo' from CTAN or www.sodtalbers.de/tex\MessageBreak + or use another title format.}% + }% } \if@titlepage% - \if@goettingen% - \InputIfFileExists{jbgoe.clo}% - {\relax}% - {\notitlefileerror{goettingen}{goe}}% - \else - \if@trier% - \InputIfFileExists{jbtrier.clo}% - {\relax}% - {\notitlefileerror{trier}{trier}}% - \else - \if@stgallen% - \InputIfFileExists{jbstgallen.clo}% - {\relax}% - {\notitlefileerror{stgallen}{stgallen}}% - \else% - \if@ruwtitle% - \renewcommand{\maketitle}{% - \begin{titlepage}% - \let\footnotesize\small - \let\footnoterule\relax - \let \footnote \thanks - {\centering% - \vspace*{\jb@chapterbefore@length}% - {\jb@title@style\@title\par}% - \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\' - \else - {\jb@subtitle@style\vskip 4ex\@subtitle \par}% - \fi% - {\jb@from@style\vskip 8ex von\par}% - {\jb@author@style - \vskip 1ex% - \lineskip .75em% - \begin{tabular}[t]{c}% - \@author - \end{tabular}\par% - } - \ifx\@subauthor\@empty% - \else% - {\jb@subauthor@style% - \vskip 1ex - \begin{tabular}[t]{c}% - \@subauthor - \end{tabular}\par}% - \fi% - \vfill - \begin{tabular}[t]{c}% - \usebox{\titlepublisherbox} - \end{tabular}% - \par} - \@emptytitles% - \end{titlepage}% - }% - \else% - \renewcommand{\maketitle}{% - \begin{titlepage}% - \let\footnotesize\small - \let\footnoterule\relax - \let \footnote \thanks - \null\vfil% - %\vskip 60\p@ - \begin{center}% - \if@classiclayout% original definition: - {\jb@title@style\@title\par}% - \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\' - \else% - {\jb@subtitle@style\vskip 4ex\@subtitle\par}% - \fi% - {\jb@author@style% - \vskip 8ex von\par - \vskip 1ex% - \lineskip .75em% - \begin{tabular}[t]{c}% - \@author - \end{tabular}\par% - }% - \ifx\@subauthor\@empty% - \else% - {\jb@subauthor@style% - \vskip 1ex - \begin{tabular}[t]{c}% - \@subauthor - \end{tabular}\par}% - \fi% - \vskip 1.5em% - {\jb@titledate@style\@date\par}% - \else % slightly modernized: - {\jb@title@style\vskip 2ex \@title\par}% - \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\' - \else - {\jb@subtitle@style\vskip 4ex\@subtitle \par}% - \fi% - {\jb@from@style\vskip 8ex von\par}% - {\jb@author@style - \vskip 1ex% - \lineskip .75em% - \begin{tabular}[t]{c}% - \@author - \end{tabular}\par% - } - \ifx\@subauthor\@empty% - \else% - {\jb@subauthor@style% - \vskip 1ex - \begin{tabular}[t]{c}% - \@subauthor - \end{tabular}\par}% - \fi% - \vskip 1.5em% - {\jb@titledate@style\@date\par}% - \fi% - \end{center}\par - {\jb@thanks@style\@thanks\par} - \ifx\@publishinfo\@empty% - {\vfil\null}% - \else% - \vfill% - {\hfil\jb@publishinfo@style\@publishinfo\hfil}% - \ifx\@publishplace\@empty% - \else% - {\vskip 1ex\hfil\jb@publishplace@style\@publishplace\hfil}% - \fi% - \fi% - \@emptytitles - \end{titlepage}% - }% - \fi% if@ruwtitle - \fi% if@stgallen - \fi% if@trier - \fi% if@goettingen + \if@ruwtitle% + \@use@title@ruw% + \else% + \@use@title@standard + \fi% \else % option 'notitlepage' is set - jurabook will terminate! \ClassError{jurabook}% {jurabook does not support the 'notitlepage' option.}% @@ -1202,7 +1190,7 @@ \if@twoside% \ifodd\c@page% \else% - \thispagestyle{empty}% + \jubo@thispagestyle@empty% \mbox{}\newpage% \if@twocolumn\mbox{}\newpage\fi % really necessary?! \fi% @@ -1251,8 +1239,9 @@ #2\marginpar% [\hfill{\bfseries\therunner}\hspace*{\jb@runnersspace@length}]% {\hspace*{\jb@runnersspace@length}{\bfseries\therunner}\hfill}% -% hiermit wird entsprechender Eintrag in die toc gesetzt: \protected@edef\@currentlabel{\therunner}% + \else% + #2 \fi% do NOT delete the percentage sign \ifthenelse{\equal{#1}{\@empty}}% {}% nix @@ -1533,7 +1522,7 @@ \renewcommand{\part}{% \if@openright\cleardoublepage\else\clearpage\fi% \chapterlevel% - \thispagestyle{empty}% + \jubo@thispagestyle@empty% \if@twocolumn \onecolumn \@tempswatrue @@ -1549,6 +1538,9 @@ \secdef\@part\@spart% } + +\newcommand{\jb@partintro@style}{\huge\bfseries} +\newcommand{\jb@part@style}{\Huge\bfseries} % opt #1: title in text, possibly incl. \hnewline = \par % #2: title @@ -1573,11 +1565,11 @@ \interlinepenalty \@M% \normalfont% \ifnum \c@secnumdepth >-2\relax - \huge\bfseries \thepart~\partname\ + \jb@partintro@style\thepart~\partname\ \par \vskip 20\p@ \fi - \Huge\bfseries% + \jb@part@style% \ifthenelse{\equal{#1}{\@empty}}% {#2\par}% {\let\hnewline\@@part@hnewline% @@ -1594,7 +1586,7 @@ \newpage% \if@twoside% \null% - \thispagestyle{empty}% + \jubo@thispagestyle@empty% \newpage% \fi% \fi% @@ -1641,9 +1633,9 @@ \newcommand{\jubo@settocindents}{% \if@chapterprefix% - \settowidth{\chapternumwidth}{\chaptername~999\space}% warum drei x 9? zweimal ist zu knapp + \settowidth{\chapternumwidth}{\chaptername~999\chapterextra\space}% warum drei x 9? zweimal ist zu knapp \else% chaptersuffix: - \settowidth{\chapternumwidth}{999.~\chaptername\space}% + \settowidth{\chapternumwidth}{999.~\chaptername\chapterextra\space}% \fi% \settowidth{\sectionnumwidth}{VIII.\ }% \settowidth{\subsectionnumwidth}{88.\ }% @@ -1657,7 +1649,7 @@ \if@chapterprefix% \setlength{\sectiontocindent}{\chapternumwidth}% \else% - \settowidth{\@tempdima}{99.\space}% + \settowidth{\@tempdima}{\bfseries 99.\space}% \setlength{\sectiontocindent}{\@tempdima}% \fi \if@fixtocindent% @@ -1759,7 +1751,7 @@ \@chapterclearpagetrue% \fi% \chapterlevel% - \thispagestyle{empty}% + \jubo@thispagestyle@empty% \global\@topnum\z@% \@afterindentfalse \secdef\@chapter\@schapter% @@ -1832,6 +1824,8 @@ \newlength{\jb@chapterafter@length} \setlength{\jb@chapterafter@length}{40\p@} +\newcommand{\jb@chapter@style}{\huge\bfseries} + \renewcommand{\@makechapterhead}[1]{% \make@jubo@chaptercomplete% \chapterstartspace% @@ -1840,27 +1834,27 @@ \ifnum \c@secnumdepth >\m@ne \if@mainmatter \begingroup - \huge\bfseries\jubo@chaptercomplete\quad + \jb@chapter@style\jubo@chaptercomplete\quad #1\par \endgroup% \fi% \else% - \huge\bfseries #1% + \jb@chapter@style #1% \fi% }% \else% - \settowidth{\@chaptercompletelength}{\huge\bfseries \jubo@chaptercomplete\quad}% + \settowidth{\@chaptercompletelength}{\jb@chapter@style\jubo@chaptercomplete\quad}% {\parindent \z@ \jubo@csalign@hook \normalfont% \ifnum \c@secnumdepth >\m@ne% \if@mainmatter% \begingroup% \hangindent=\@chaptercompletelength% - \huge\bfseries\jubo@chaptercomplete\quad% + \jb@chapter@style\jubo@chaptercomplete\quad% {\raggedright #1\par}% \endgroup% \fi% \else% - \huge\bfseries #1% + \jb@chapter@style #1% \fi% }% \fi% @@ -1875,7 +1869,7 @@ {\parindent \z@ \jubo@csalign@hook \normalfont \interlinepenalty\@M - \Huge\bfseries #1\par\nobreak + \jb@chapter@style #1\par\nobreak \vspace*{\jb@chapterafter@length}% }} @@ -1895,7 +1889,7 @@ \typeout{#1}% \if@openright\cleardoublepage\else\clearpage\fi% \chapterlevel% - \thispagestyle{empty}% + \jubo@thispagestyle@empty% \global\@topnum\z@% \@afterindentfalse% \addcontentsline{toc}{extrajubostuff}{\protect\numberline{}#1}% @@ -1926,7 +1920,7 @@ \typeout{#1}% \if@openright\cleardoublepage\else\clearpage\fi% \chapterlevel% - \thispagestyle{empty}% + \jubo@thispagestyle@empty% \global\@topnum\z@% \@afterindentfalse% \markboth{#1}{#1}% @@ -1943,9 +1937,9 @@ \newcommand{\@makechapterhead@withoutnumber}[1]{% \chapterstartspace% \if@centeredlayout% - {\centering\normalfont\huge\bfseries #1\par}% + {\centering\normalfont\jb@chapter@style #1\par}% \else% - {\normalfont\huge\bfseries\noindent #1\par}% + {\normalfont\jb@chapter@style\noindent #1\par}% \fi% \vspace*{\jb@chapterafter@length}%% } @@ -1997,7 +1991,7 @@ \newcommand{\appendixchapter}{% \if@openright\cleardoublepage\else\clearpage\fi% \chapterlevel% - \thispagestyle{empty}% + \jubo@thispagestyle@empty% \global\@topnum\z@% \@afterindentfalse \secdef\@appendixchapter\@schapter% @@ -2018,7 +2012,7 @@ }% \if@openright\cleardoublepage\else\clearpage\fi% \chapterlevel% - \thispagestyle{empty}% + \jubo@thispagestyle@empty% \global\@topnum\z@% \@afterindentfalse \secdef\@appendixchapter\@schapter% @@ -2081,7 +2075,7 @@ \ifnum \c@secnumdepth >\m@ne \if@mainmatter \begingroup - \huge\bfseries + \jb@chapter@style% \if@lonely@appchap% \appendixname\quad% \else% @@ -2091,14 +2085,14 @@ \endgroup \fi \else - \huge\bfseries #1 + \jb@chapter@style #1 \fi% }% \else% {\if@lonely@appchap% - \settowidth{\@chaptercompletelength}{\huge\bfseries\appendixname\quad}% + \settowidth{\@chaptercompletelength}{\jb@chapter@style\appendixname\quad}% \else% - \settowidth{\@chaptercompletelength}{\huge\bfseries\appendixname~\thechapter\quad}% + \settowidth{\@chaptercompletelength}{\jb@chapter@style\appendixname~\thechapter\quad}% \fi% \begingroup% \parindent \z@ \jubo@csalign@hook \normalfont% @@ -2107,15 +2101,15 @@ \begingroup% \hangindent=\@chaptercompletelength% \if@lonely@appchap - \huge\bfseries\appendixname\quad% + \jb@chapter@style\appendixname\quad% \else% - \huge\bfseries\appendixname~\thechapter\quad% + \jb@chapter@style\appendixname~\thechapter\quad% \fi% {\raggedright #1\par}% \endgroup \fi \else - \huge\bfseries #1 + \jb@chapter@style #1 \fi% \endgroup% \vspace*{\jb@chapterafter@length}% -- cgit v1.2.3