summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty')
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty68
1 files changed, 40 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
index 926208d3cd5..ac1fee46ba3 100644
--- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
+++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
@@ -32,9 +32,6 @@
%
% * You must not use "u etc. in strings/commands that will be spaced out
% (use \"u or real umlauts instead)
-% * Chapters must be marked with the \myChapter{Foo} command
-% (sorry for the inconvenience at this point)
-% * For margin notes: \graffito{}
% * There is a problem with the case of math text in part-,
% chapter-, and section titles (either the case or the spacing breaks).
% => this can be fixed by using pdftex 1.40 or later and enabling the
@@ -42,7 +39,7 @@
%
% ********************************************************************
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis}[2011/01/24 v2.9 Typographic Style for a classic-looking thesis]
+\ProvidesPackage{classicthesis}[2011/06/05 v3.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)
@@ -168,7 +165,8 @@
% ********************************************************************
% Colors
% ********************************************************************
-\RequirePackage[dvipsnames]{xcolor} % [dvipsnames]
+\PassOptionsToPackage{dvipsnames}{xcolor}
+ \RequirePackage{xcolor} % [dvipsnames]
\definecolor{halfgray}{gray}{0.55} % chapter numbers will be semi transparent .5 .55 .6 .0
\definecolor{webgreen}{rgb}{0,.5,0}
\definecolor{webbrown}{rgb}{.6,0,0}
@@ -185,25 +183,30 @@
% in order have Euler math fonts work with Minion, special option is needed
\ifthenelse{\boolean{@eulermath}}%
{%
- \RequirePackage[opticals,mathlf,onlytext]{MinionPro} % opticals, fullfamily, osf
+ \PassOptionsToPackage{opticals,mathlf,onlytext}{MinionPro}%
+ \RequirePackage{MinionPro} % opticals, fullfamily, osf
}{%
- \RequirePackage[opticals,mathlf]{MinionPro} % opticals, fullfamily, osf
+ \PassOptionsToPackage{opticals,mathlf}{MinionPro}%
+ \RequirePackage{MinionPro} % opticals, fullfamily, osf
}%
}{%
% default: Palatino
- \RequirePackage[osf,sc]{mathpazo} % Palatino with real small caps and old style figures
+ \PassOptionsToPackage{osf,sc}{mathpazo}%
+ \RequirePackage{mathpazo} % Palatino with real small caps and old style figures
\linespread{1.05} % a bit more for Palatino
}
\ifthenelse{\boolean{@beramono}}%
- {\RequirePackage[scaled=0.85]{beramono}}%
+ {\PassOptionsToPackage{scaled=0.85}{beramono}%
+ \RequirePackage{beramono}}%
{%
\relax%
% put your own suitable typewriter font here
%\renewcommand{\ttdefault}{\rmdefault}
}
\ifthenelse{\boolean{@eulermath}}%
- {\RequirePackage[euler-digits]{eulervm}} % Euler math fonts
+ {\PassOptionsToPackage{euler-digits}{eulervm}%
+ \RequirePackage{eulervm}} % Euler math fonts
{\relax}
\ifthenelse{\boolean{@eulerchapternumbers}}% font for the chapter numbers
@@ -224,12 +227,12 @@
\ifthenelse{\boolean{@minionpro}}%
{% Minion gets some extra sizes
\PackageInfo{classicthesis}{A5 paper, MinionPro}
- \areaset[5mm]{278pt}{556pt}%
+ \areaset[current]{278pt}{556pt}%
\setlength{\marginparwidth}{5em}%
\setlength{\marginparsep}{1.25em}%
}{% Palatino or other
\PackageInfo{classicthesis}{A5 paper, Palatino or other}
- \areaset[5mm]{288pt}{555pt}%
+ \areaset[current]{288pt}{555pt}%
\setlength{\marginparwidth}{4em}%
\setlength{\marginparsep}{1.25em}%
}%
@@ -237,13 +240,13 @@
\ifthenelse{\boolean{@minionpro}}%
{% Minion gets some extra sizes
\PackageInfo{classicthesis}{A4 paper, MinionPro}
- \areaset[5mm]{312pt}{684pt}% 609 + 33 + 42 head \the\footskip
+ \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[5mm]{336pt}{750pt} % ~ 336 * factor 2 + 33 head + 42 \the\footskip
-% \areaset[5mm]{336pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip 10pt
+ \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}%
}%
@@ -276,9 +279,14 @@
\tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
\doublehyphendemerits=100000%
\finalhyphendemerits=\doublehyphendemerits}
-\DeclareRobustCommand{\graffito}[1]{\marginpar%
+%\DeclareRobustCommand{\graffito}[1]{\marginpar%
+% [\graffito@setup\raggedleft\hspace{0pt}{#1}]%
+% {\graffito@setup\raggedright\hspace{0pt}{#1}}}
+\let\oldmarginpar\marginpar
+\renewcommand{\marginpar}[1]{\oldmarginpar%
[\graffito@setup\raggedleft\hspace{0pt}{#1}]%
{\graffito@setup\raggedright\hspace{0pt}{#1}}}
+
% Enumeration environment with small caps
\newenvironment{aenumerate}
@@ -317,7 +325,8 @@
% ********************************************************************
% headlines
% ********************************************************************
-\RequirePackage[automark]{scrpage2} % provides headers and footers (KOMA Script)
+\PassOptionsToPackage{automark}{scrpage2}
+ \RequirePackage{scrpage2} % provides headers and footers (KOMA Script)
\clearscrheadings
\setheadsepline{0pt}
\ifthenelse{\boolean{@nochapters}}%
@@ -334,12 +343,7 @@
{\section*{\contentsname}}%nochapters
{\chapter*{\contentsname}}%chapters
\@mkboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}}}
-
-% ********************************************************************
-% figures are placed only within section they were declared in
-% provides command \FloatBarrier
-% ********************************************************************
-%\RequirePackage[section,below]{placeins}
+
% ********************************************************************
% layout of the chapter-, section-, subsection-, subsubsection-,
@@ -349,10 +353,13 @@
% parts
\ifthenelse{\boolean{@parts}}%
{%
+% \newcommand{\ctparttext}{\relax}
+ \newcommand{\ct@parttext}{\relax} % Thanks to Ivo
+ \newcommand{\ctparttext}[1]{\renewcommand{\ct@parttext}{#1 \relax}}
\titleformat{\part}[display]
{\normalfont\centering\large}%
{\thispagestyle{empty}\partname~\MakeTextUppercase{\thepart}}{1em}%
- {\color{Maroon}\spacedallcaps}
+ {\color{Maroon}\spacedallcaps}[\bigskip\normalfont\normalsize\color{Black}\begin{quote}\ct@parttext\end{quote}]
}{\relax}
% chapters
\ifthenelse{\boolean{@linedheaders}}%
@@ -362,7 +369,7 @@
{\titlerule\vspace*{.9\baselineskip}\raggedright\spacedallcaps}[\normalsize\vspace*{.8\baselineskip}\titlerule]%
}{% something like Bringhurst
\titleformat{\chapter}[display]%
- {\relax}{\mbox{}\marginpar{\vspace*{-3\baselineskip}\color{halfgray}\chapterNumber\thechapter}}{0pt}%
+ {\relax}{\mbox{}\oldmarginpar{\vspace*{-3\baselineskip}\color{halfgray}\chapterNumber\thechapter}}{0pt}%
{\raggedright\spacedallcaps}[\normalsize\vspace*{.8\baselineskip}\titlerule]%
}
% sections \FloatBarrier
@@ -390,7 +397,8 @@
% ********************************************************************
% layout of the TOC, LOF and LOT (LOL-workaround see next section)
% ********************************************************************
-\RequirePackage[titles]{tocloft}
+\PassOptionsToPackage{titles}{tocloft}
+ \RequirePackage{tocloft}
% avoid page numbers being right-aligned in fixed-size box
\newlength{\newnumberwidth}
\settowidth{\newnumberwidth}{999} % yields overfull hbox warnings for pages > 999
@@ -571,6 +579,8 @@
\oldpart[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps
\else\oldpart[\spacedlowsmallcaps{#1}]{#2}%
\fi%
+% \renewcommand{\ct@parttext}{\relax}% Thanks to Ivo!
+ \ctparttext{\relax}%
}%
}{\relax}
@@ -623,7 +633,8 @@
% \SetWatermarkLightness{0.9}
% \SetWatermarkScale{.5}
% \SetWatermarkText{\today\ at \thistime}
- \RequirePackage[draft]{prelim2e}
+ \PassOptionsToPackage{draft}{prelim2e}
+ \RequirePackage{prelim2e}
\renewcommand{\PrelimWords}{\relax}
\renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\,]}
}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ at \thistime.}}
@@ -633,7 +644,7 @@
% ********************************************************************
\ifthenelse{\boolean{@floatperchapter}}{%
\ifthenelse{\boolean{@listings}}{%
- \lstset{numberbychapter=true}}{\relax}%
+ \lstset{numberbychapter=true}}{\relax}% numberbychapter works in listings>=1.4
}{%
\ifthenelse{\boolean{@listings}}{%
\lstset{numberbychapter=false}}{\relax}%
@@ -659,3 +670,4 @@
% ********************************************************************
\let\myChapter\chapter
\let\myPart\part
+\let\graffito\marginpar