diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty | 90 |
1 files changed, 54 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty index ac1fee46ba3..6a8df68744c 100644 --- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty +++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty @@ -39,7 +39,7 @@ % % ******************************************************************** \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{classicthesis}[2011/06/05 v3.0 Typographic Style for a classic-looking thesis] +\ProvidesPackage{classicthesis}[2011/12/17 v4.0 Typographic style for a classic-looking thesis] \RequirePackage{ifthen} \newboolean{@tocaligned} % the left column of the toc will be aligned (no indention) \newboolean{@eulerchapternumbers} % use AMS Euler for chapter font (otherwise Palatino) @@ -58,7 +58,7 @@ \newboolean{@dottedtoc} % page numbers in ToC flushed right \newboolean{@listings} % load listings package (if not already) and setup LoL \newboolean{@manychapters} % additional space in ToC after chapter number (if two digits are needed) - \newboolean{@floatperchapter} % additional space in ToC after chapter number (if two digits are needed) + \newboolean{@floatperchapter} % numbering per chapter for all floats (i.e., Figure 1.1) % ******************************************************************** % Options @@ -81,7 +81,6 @@ \DeclareOption{minionpro}{\setboolean{@minionpro}{true}} \DeclareOption{minionprospacing}{\setboolean{@minionprospacing}{true}} \DeclareOption{pdfspacing}{\setboolean{@pdfspacing}{true}} -\DeclareOption{pdfspacing}{\setboolean{@pdfspacing}{true}} \DeclareOption{dottedtoc}{\setboolean{@dottedtoc}{true}} \DeclareOption{listings}{\setboolean{@listings}{true}} \DeclareOption{manychapters}{\setboolean{@manychapters}{true}} @@ -184,21 +183,21 @@ \ifthenelse{\boolean{@eulermath}}% {% \PassOptionsToPackage{opticals,mathlf,onlytext}{MinionPro}% - \RequirePackage{MinionPro} % opticals, fullfamily, osf + \RequirePackage{MinionPro} % opticals, fullfamily, osf }{% \PassOptionsToPackage{opticals,mathlf}{MinionPro}% - \RequirePackage{MinionPro} % opticals, fullfamily, osf + \RequirePackage{MinionPro} % opticals, fullfamily, osf }% }{% % default: Palatino \PassOptionsToPackage{osf,sc}{mathpazo}% - \RequirePackage{mathpazo} % Palatino with real small caps and old style figures + \RequirePackage{mathpazo} % Palatino with real small caps and old style figures \linespread{1.05} % a bit more for Palatino } \ifthenelse{\boolean{@beramono}}% {\PassOptionsToPackage{scaled=0.85}{beramono}% - \RequirePackage{beramono}}% + \RequirePackage{beramono}}% {% \relax% % put your own suitable typewriter font here @@ -206,7 +205,7 @@ } \ifthenelse{\boolean{@eulermath}}% {\PassOptionsToPackage{euler-digits}{eulervm}% - \RequirePackage{eulervm}} % Euler math fonts + \RequirePackage{eulervm}} % Euler math fonts {\relax} \ifthenelse{\boolean{@eulerchapternumbers}}% font for the chapter numbers @@ -222,32 +221,36 @@ % ******************************************************************** % Textblock size %******************************************************* +\@ifpackageloaded{typearea}% + {\relax}{% + \RequirePackage{typearea}% + } \ifthenelse{\boolean{@a5paper}}% {% A5 \ifthenelse{\boolean{@minionpro}}% - {% Minion gets some extra sizes - \PackageInfo{classicthesis}{A5 paper, MinionPro} + {% Minion gets some extra sizes + \PackageInfo{classicthesis}{A5 paper, MinionPro}% \areaset[current]{278pt}{556pt}% - \setlength{\marginparwidth}{5em}% - \setlength{\marginparsep}{1.25em}% + \setlength{\marginparwidth}{5em}% + \setlength{\marginparsep}{1.25em}% }{% Palatino or other - \PackageInfo{classicthesis}{A5 paper, Palatino or other} + \PackageInfo{classicthesis}{A5 paper, Palatino or other}% \areaset[current]{288pt}{555pt}% \setlength{\marginparwidth}{4em}% \setlength{\marginparsep}{1.25em}% }% }{% A4 \ifthenelse{\boolean{@minionpro}}% - {% Minion gets some extra sizes - \PackageInfo{classicthesis}{A4 paper, MinionPro} + {% Minion gets some extra sizes + \PackageInfo{classicthesis}{A4 paper, MinionPro}% \areaset[current]{312pt}{684pt}% 609 + 33 + 42 head \the\footskip \setlength{\marginparwidth}{7.5em}% \setlength{\marginparsep}{2em}% }{% Palatino or other - \PackageInfo{classicthesis}{A4 paper, Palatino or other} - \areaset[current]{336pt}{750pt} % ~ 336 * factor 2 + 33 head + 42 \the\footskip -% \areaset{336pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip 10pt - \setlength{\marginparwidth}{7em}% + \PackageInfo{classicthesis}{A4 paper, Palatino or other} + \areaset[current]{336pt}{750pt} % ~ 336 * factor 2 + 33 head + 42 \the\footskip +% \areaset{336pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip 10pt + \setlength{\marginparwidth}{7em}% \setlength{\marginparsep}{2em}% }% } @@ -261,6 +264,9 @@ % Libertine 10pt: % Libertine 11pt: % Libertine 12pt: +% kpfonts 10pt: +% kpfonts 11pt: +% kpfonts 12pt: % ******************************************************************** % Own Stuff @@ -286,8 +292,7 @@ \renewcommand{\marginpar}[1]{\oldmarginpar% [\graffito@setup\raggedleft\hspace{0pt}{#1}]% {\graffito@setup\raggedright\hspace{0pt}{#1}}} - - + % Enumeration environment with small caps \newenvironment{aenumerate} {\def\theenumi{\textsc{\alph{enumi}}}% @@ -318,7 +323,7 @@ \sodef\allcapsspacing{\upshape}{0.15em}{0.65em}{0.6em}% \sodef\lowsmallcapsspacing{\scshape}{0.075em}{0.5em}{0.6em}% \DeclareRobustCommand{\spacedallcaps}[1]{\MakeTextUppercase{\allcapsspacing{#1}}}% - \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\MakeTextLowercase{\textsc{\lowsmallcapsspacing{#1}}}}% + \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\MakeTextLowercase{\textsc{\lowsmallcapsspacing{#1}}}}%\protect }% } @@ -336,7 +341,7 @@ \lehead{\mbox{\llap{\small\thepage\kern2em}\headmark\hfil}} \rohead{\mbox{\hfil{\headmark}\rlap{\small\kern2em\thepage}}} \renewcommand{\headfont}{\small} - %\DeclareRobustCommand{\fixBothHeadlines}[1]{} % <--- ToDo +% \DeclareRobustCommand{\fixBothHeadlines}[2]{} % <--- ToDo % hack to get the content headlines right (thanks, Lorenzo!) \def\toc@heading{% \ifthenelse{\boolean{@nochapters}}% @@ -499,7 +504,7 @@ } \renewcommand{\cftfigpresnum}{\figurename~}%Fig.~} \newlength{\figurelabelwidth} - \settowidth{\figurelabelwidth}{\cftfigpresnum~99} + \settowidth{\figurelabelwidth}{\cftfigpresnum~999} \addtolength{\figurelabelwidth}{2.5em} \cftsetindents{figure}{0em}{\figurelabelwidth} % tables @@ -512,7 +517,7 @@ } \renewcommand{\cfttabpresnum}{\tablename~}%Tab.~} \newlength{\tablelabelwidth} - \settowidth{\tablelabelwidth}{\cfttabpresnum~99} + \settowidth{\tablelabelwidth}{\cfttabpresnum~999} \addtolength{\tablelabelwidth}{2.5em} %\cftsetindents{table}{0em}{\tablelabelwidth} \cftsetindents{table}{0em}{\figurelabelwidth} @@ -530,7 +535,7 @@ \renewcommand{\cftlistingsafterpnum}{\cftparfillskip}% } \newlength{\listingslabelwidth}% - \settowidth{\listingslabelwidth}{\cftlistingspresnum~99}% + \settowidth{\listingslabelwidth}{\cftlistingspresnum~999}% \addtolength{\listingslabelwidth}{2.5em}% %\cftsetindents{listings}{0em}{\listingslabelwidth}% \cftsetindents{listings}{0em}{\figurelabelwidth}% @@ -616,12 +621,18 @@ % ******************************************************************** % footnotes setup -% ******************************************************************** -%\RequirePackage{footmisc} % [bottom] norule para symbol* marginal perpage - % KOMA-command, footnotemark not superscripted at the bottom - \deffootnote{0em}{0em}{\thefootnotemark\hspace*{.5em}} - %\setfnsymbol{bringhurst} % use symbols recommended by guru Robert Bringhurst - %\setlength{\footnotemargin}{-1em} +% ******************************************************************** +\ifdefined\deffootnote + % KOMA-command, footnotemark not superscripted at the bottom + \deffootnote{0em}{0em}{\thefootnotemark\hspace*{.5em}}% + \message{Using KOMA-command "deffootnote" for footnote setup}% +\else + \PassOptionsToPackage{flushmargin}{footmisc}% + \RequirePackage{footmisc}% + \setlength{\footnotemargin}{-.5em}% + \PackageWarningNoLine{classicthesis}{Using package "footmisc" with option % + "flushmargin" for footnote setup (not 100\% the same as with KOMA)}% +\fi % ******************************************************************** % Drafting Stuff @@ -634,10 +645,10 @@ % \SetWatermarkScale{.5} % \SetWatermarkText{\today\ at \thistime} \PassOptionsToPackage{draft}{prelim2e} - \RequirePackage{prelim2e} - \renewcommand{\PrelimWords}{\relax} - \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\,]} -}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ at \thistime.}} + \RequirePackage{prelim2e} + \renewcommand{\PrelimWords}{\relax} + \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\ -- \texttt{classicthesis} \myVersion\,]} +}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ (\texttt{classicthesis} \myVersion).}} % ******************************************************************** % Caption numbering now w/o chapter number @@ -663,6 +674,13 @@ }% \renewcommand{\thefigure}{\arabic{figure}}% \makeatother% + \makeatletter% + \ifthenelse{\boolean{@nochapters}}% + {\relax}{% + \@removefromreset{equation}{chapter} % requires remreset package + }% + \renewcommand{\theequation}{\arabic{equation}}% + \makeatother% } % ******************************************************************** |