summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/classicthesis
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2011-08-02 19:41:50 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2011-08-02 19:41:50 +0000
commitcc431448fc11b7deb158c2f56e4c0051cd6bd472 (patch)
treef9eeb7a5cccbffa83367cafbb33859401661d53d /Master/texmf-dist/tex/latex/classicthesis
parent431a9248967546aafb1ea6309939fdb8dc7a7415 (diff)
classithesis 3.0 (June 2011)
git-svn-id: svn://tug.org/texlive/trunk@23354 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/classicthesis')
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty168
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis-preamble.sty345
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty68
3 files changed, 385 insertions, 196 deletions
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
deleted file mode 100644
index 44a8407f99f..00000000000
--- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
+++ /dev/null
@@ -1,168 +0,0 @@
-% ********************************************************************
-% classicthesis-ldpkg.sty (formerly known as loadpackages.sty)
-%
-% Copyright (C) 2011 Andr\'e Miede http://www.miede.de
-%
-% If you like the style then I would appreciate a postcard. My address
-% can be found in the file ClassicThesis.pdf. A collection of the
-% postcards I received so far is available online at
-% http://postcards.miede.de
-%
-% License:
-% This program is free software; you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
-% (at your option) any later version.
-%
-% This program is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with this program; see the file COPYING. If not, write to
-% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
-%
-% ********************************************************************
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis-ldpkg}[2011/01/24 v2.9 Package Loader for Classic Thesis Style]
-
-\@ifpackageloaded{classicthesis}%
- {\PackageWarningNoLine{classicthesis-ldpkg}{Package "classicthesis" should be loaded AFTER "classicthesis-ldpkg".}}%
- {\relax}%
-
-% ********************************************************************
-% Options
-% ********************************************************************
-\RequirePackage{ifthen}
- \newboolean{cld@backref} % enable backrefs in the bibliography
-\DeclareOption{backref}{\setboolean{cld@backref}{true}}
-\ProcessOptions\relax
-
-% ********************************************************************
-% Packages
-% ********************************************************************
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-%\RequirePackage[dvipsnames]{xcolor}
-\RequirePackage{xspace} % to get the spacing after macros right
-\RequirePackage{tabularx} % better tables
-\RequirePackage{mparhack} % get marginpar right
-\RequirePackage{fixltx2e} % fixes some LaTeX stuff
-%\RequirePackage{ellipsis} % ... ;-)
-\RequirePackage{relsize} % scale font up or down
-\RequirePackage[printonlyused,smaller]{acronym} % nice macros for handling all acronyms in the thesis
-%\renewcommand*{\acsfont}[1]{\textssc{#1}}
-\renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms
-%\RequirePackage{natbib}
-
-% ********************************************************************
-% Commands
-% ********************************************************************
-\newcounter{dummy} % necessary for correct hyperlinks (to index, bib, etc.)
-\newcommand{\longpage}{\enlargethispage{3\baselineskip}}
-\newcommand{\medpage}{\enlargethispage{2\baselineskip}}
-\newcommand{\shortpage}{\enlargethispage{\baselineskip}}
-\newcommand{\concskip}{\medskip}
-\newcommand{\myPrimRef}[1]{\textit{#1}} % how primary index entries will be marked
-% ********************************************************************
-\newcommand{\ie}{i.\,e.}
-\newcommand{\Ie}{I.\,e.}
-\newcommand{\eg}{e.\,g.}
-\newcommand{\Eg}{E.\,g.}
-\newcommand{\etAl}{et al.\xspace}
-\newcommand{\twod}{2\textsc{d}\xspace}
-\newcommand{\threed}{3\textsc{d}\xspace}
-% ********************************************************************
-\newcommand{\system}[1]{\emph{#1}}
-\newcommand{\person}[1]{#1}
-\newcommand{\term}[1]{\emph{#1}}
-\newcommand{\cauthor}[1]{\relax}
-\@ifpackageloaded{natbib}%
- {\renewcommand{\cauthor}[1]{\person{\citeauthor{#1}}}%
- }{\PackageWarningNoLine{classicthesis-ldpk}{Package "natbib" not loaded, %
- command "cauthor" will not work.}}
-\newcommand{\tableheadline}[1]{\multicolumn{1}{c}{\spacedlowsmallcaps{#1}}}
-% ********************************************************************
-\newcommand{\RA}{\ensuremath{\Rightarrow}}
-\newcommand{\ra}{\ensuremath{\rightarrow}}
-\newcommand{\lra}{\ensuremath{\leftrightarrow}}
-\newcommand{\On}{\ensuremath{O(n)}\xspace}
-\newcommand{\Ologn}{\ensuremath{O(\log n)}\xspace}
-\newcommand{\Oone}{\ensuremath{O(1)}\xspace}
-
-% ********************************************************************
-% take care of the caption fonts and sizes (tables and figures)
-\RequirePackage{caption}
-
-% ********************************************************************
-% fine typesetting of code listings
-%\RequirePackage{listings}
-
-% ********************************************************************
-% enable subfigures in figures
-\RequirePackage{subfig}
-
-% ********************************************************************
-% Using PDFLaTeX:
-% ********************************************************************
-\RequirePackage[pdftex,hyperfootnotes=false,pdfpagelabels]{hyperref} % backref linktocpage pagebackref
-\pdfcompresslevel=9
-\pdfadjustspacing=1
-\RequirePackage[pdftex]{graphicx} % PDFTeX driver for graphicx
-%\DeclareGraphicsRule{*}{mps}{*}{} % enables use of MetaPost graphics with pdflatex
-
-%*******************************************************
-% for German texts to get \autoref macros right
-\renewcommand{\figureautorefname}{Figure}
-\renewcommand{\tableautorefname}{Table}
-\renewcommand{\partautorefname}{Part}
-\renewcommand{\chapterautorefname}{Chapter}
-\renewcommand{\sectionautorefname}{Section}
-\renewcommand{\subsectionautorefname}{Section}
-\renewcommand{\subsubsectionautorefname}{Section}
-%\renewcommand{\paragraphautorefname}{Absatz}
-%\renewcommand{\subparagraphautorefname}{Unterabsatz}
-%\renewcommand{\footnoteautorefname}{Fu\"snote}
-%\renewcommand{\FancyVerbLineautorefname}{Zeile}
-%\renewcommand{\theoremautorefname}{Theorem}
-%\renewcommand{\appendixautorefname}{Anhang}
-%\renewcommand{\equationautorefname}{Gleichung}
-%\renewcommand{\itemautorefname}{Punkt}
-%\newcommand*{\subfigureautorefname}{Abbildung}
-
-% ********************************************************************
-% get the links to the figures and tables right
-%\RequirePackage[all]{hypcap} % to be loaded after hyperref package
-
-% ********************************************************************
-% setup the style of the backrefs from the bibliography
-\newcommand{\backrefnotcitedstring}{\relax}%(Not cited.)
-\newcommand{\backrefcitedsinglestring}[1]{(Cited on page~#1.)}
-\newcommand{\backrefcitedmultistring}[1]{(Cited on pages~#1.)}
-
-\ifthenelse{\boolean{cld@backref}}%
-{%
- \RequirePackage[hyperpageref]{backref} % to be loaded after hyperref package
- \renewcommand{\backreftwosep}{ and~} % seperate 2 pages
- \renewcommand{\backreflastsep}{, and~} % seperate last of longer list
- \renewcommand*{\backref}[1]{} % Disable standard
- \renewcommand*{\backrefalt}[4]{% Detailed backref
- \ifcase #1 %
- \backrefnotcitedstring%
- \or%
- \backrefcitedsinglestring{#2}%
- \else%
- \backrefcitedmultistring{#2}%
- \fi}%
-}{\relax}
-
-% \hspace*{\fill}{\scriptsize\itshape\mbox{%
-% \ifnum#1=1 %
-% (Cited on page~%
-% \else
-% (Cited on pages~%
-% \fi
-% #2)}
-%} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-preamble.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-preamble.sty
new file mode 100644
index 00000000000..0e3a5d5f6f8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-preamble.sty
@@ -0,0 +1,345 @@
+% ********************************************************************
+% classicthesis-preamble.sty
+% formerly known as loadpackages.sty and classicthesis-ldpkg.sty
+%
+% Copyright (C) 2011 Andr\'e Miede http://www.miede.de
+%
+% If you like the style then I would appreciate a postcard. My address
+% can be found in the file ClassicThesis.pdf. A collection of the
+% postcards I received so far is available online at
+% http://postcards.miede.de
+%
+% License:
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program; see the file COPYING. If not, write to
+% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+% Boston, MA 02111-1307, USA.
+%
+% ********************************************************************
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%% This file contains the only definitions and calls you might want to change.
+%%%%% Use it at the beginning of your ClassicThesis.tex, or as a LaTeX Preamble in your ClassicThesis.lyx with
+%%%%% \usepackage{classicthesis-preamble}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{classicthesis-preamble}[2011/06/05 v3.0 Your Preamble and Package Loader for Classic Thesis Style]
+
+\@ifpackageloaded{classicthesis}%
+ {\PackageWarningNoLine{classicthesis-preamble}{Package "classicthesis" should be loaded AFTER "classicthesis-preamble".}}%
+ {\relax}%
+
+% ********************************************************************
+% Re-usable information
+% ********************************************************************
+\newcommand{\myTitle}{A Classic Thesis Style\xspace}
+\newcommand{\mySubtitle}{An Homage to The Elements of Typographic Style\xspace}
+\newcommand{\myDegree}{Doktor-Ingenieur (Dr.-Ing.)\xspace}
+\newcommand{\myName}{Andr\'e Miede\xspace}
+\newcommand{\myProf}{Put name here\xspace}
+\newcommand{\myOtherProf}{Put name here\xspace}
+\newcommand{\mySupervisor}{Put name here\xspace}
+\newcommand{\myFaculty}{Put data here\xspace}
+\newcommand{\myDepartment}{Put data here\xspace}
+\newcommand{\myUni}{\protect{Put data here}\xspace}
+\newcommand{\myLocation}{Darmstadt\xspace}
+\newcommand{\myTime}{June 2011\xspace}
+\newcommand{\myVersion}{Version 3.0\xspace}
+
+
+% ********************************************************************
+% Configure classicthesis for your needs here...
+% ********************************************************************
+\PassOptionsToPackage{eulerchapternumbers,drafting,listings,%linedheaders,%pdfspacing,%listings,
+ subfig,beramono,eulermath,parts}{classicthesis}
+%*******************************************************
+% Options for classicthesis.sty:
+% tocaligned eulerchapternumbers drafting linedheaders listings
+% subfig nochapters beramono eulermath parts minionpro pdfspacing
+% dottedtoc minionprospacing manychapters floatperchapter
+%*******************************************************
+
+% ********************************************************************
+% LyX option override
+% ********************************************************************
+%\PassOptionsToPackage{backref}{classicthesis-preamble}
+
+% ********************************************************************
+% Options
+% ********************************************************************
+\RequirePackage{ifthen}
+ \newboolean{cld@backref} % enable backrefs in the bibliography
+\setboolean{cld@backref}{false}
+\DeclareOption{backref}{\setboolean{cld@backref}{true}}
+\ProcessOptions\relax
+
+
+% ********************************************************************
+% Development Stuff
+% ********************************************************************
+\listfiles
+%\PassOptionsToPackage{l2tabu, orthodox, abort}{nag}
+% \RequirePackage{nag}
+%\PassOptionsToPackage{warning, all}{onlyamsmath}
+% \RequirePackage{onlyamsmath}
+
+
+%*******************************************************
+% Packages with options that might require adjustments
+%*******************************************************
+\PassOptionsToPackage{latin9}{inputenc} % latin9 (ISO-8859-9) = latin1+"Euro sign"
+ \RequirePackage{inputenc} % NB: LyX likes to set inputenc too, let's avoid clashes
+
+%\PassOptionsToPackage{ngerman,american}{babel} % change this to you language(s)
+ \RequirePackage{babel} % NB: LyX likes to set babel too, let's avoid clashes
+
+\PassOptionsToPackage{square,numbers}{natbib}
+ \RequirePackage{natbib} % NB: LyX likes to set natbib too, let's avoid clashes
+
+\PassOptionsToPackage{fleqn}{amsmath} % math environments and more by the AMS
+ \RequirePackage{amsmath}
+
+
+% ********************************************************************
+% figures are placed only within section they were declared in
+% provides command \FloatBarrier
+% ********************************************************************
+%\PassOptionsToPackage{section,above,below}{placeins}
+% \RequirePackage{placeins}
+
+
+% ********************************************************************
+% Packages
+% ********************************************************************
+\PassOptionsToPackage{T1}{fontenc}
+ \RequirePackage{fontenc}
+\RequirePackage{textcomp}
+%\RequirePackage[dvipsnames]{xcolor}
+\RequirePackage{xspace} % to get the spacing after macros right
+\RequirePackage{tabularx} % better tables
+\RequirePackage{mparhack} % get marginpar right
+\RequirePackage{fixltx2e} % fixes some LaTeX stuff
+%\RequirePackage{ellipsis} % ... ;-)
+\RequirePackage{relsize} % scale font up or down
+\PassOptionsToPackage{printonlyused,smaller}{acronym}
+ \RequirePackage{acronym} % nice macros for handling all acronyms in the thesis
+%\renewcommand*{\acsfont}[1]{\textssc{#1}}
+\renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms
+
+% ********************************************************************
+% Setup and Finetuning
+%*******************************************************
+\newlength{\abcd} % for ab..z string length calculation
+\newcommand{\myfloatalign}{\centering} % how all the floats will be aligned
+\setlength{\extrarowheight}{3pt} % increase table row height
+
+% ********************************************************************
+% Commands
+% ********************************************************************
+\newcounter{dummy} % necessary for correct hyperlinks (to index, bib, etc.)
+\newcommand{\longpage}{\enlargethispage{3\baselineskip}}
+\newcommand{\medpage}{\enlargethispage{2\baselineskip}}
+\newcommand{\shortpage}{\enlargethispage{\baselineskip}}
+\newcommand{\concskip}{\medskip}
+\newcommand{\myPrimRef}[1]{\textit{#1}} % how primary index entries will be marked
+% ********************************************************************
+\newcommand{\ie}{i.\,e.}
+\newcommand{\Ie}{I.\,e.}
+\newcommand{\eg}{e.\,g.}
+\newcommand{\Eg}{E.\,g.}
+\newcommand{\etAl}{et al.\xspace}
+\newcommand{\twod}{2\textsc{d}\xspace}
+\newcommand{\threed}{3\textsc{d}\xspace}
+% ********************************************************************
+\newcommand{\system}[1]{\emph{#1}}
+\newcommand{\person}[1]{#1}
+\newcommand{\term}[1]{\emph{#1}}
+\newcommand{\cauthor}[1]{\relax}
+\@ifpackageloaded{natbib}%
+ {\renewcommand{\cauthor}[1]{\person{\citeauthor{#1}}}%
+ }{\PackageWarningNoLine{classicthesis-preamble}{Package "natbib" not loaded, %
+ command "cauthor" will not work.}}
+\newcommand{\tableheadline}[1]{\multicolumn{1}{c}{\spacedlowsmallcaps{#1}}}
+% ********************************************************************
+\newcommand{\RA}{\ensuremath{\Rightarrow}}
+\newcommand{\ra}{\ensuremath{\rightarrow}}
+\newcommand{\lra}{\ensuremath{\leftrightarrow}}
+\newcommand{\On}{\ensuremath{O(n)}\xspace}
+\newcommand{\Ologn}{\ensuremath{O(\log n)}\xspace}
+\newcommand{\Oone}{\ensuremath{O(1)}\xspace}
+
+% ********************************************************************
+% take care of the caption fonts and sizes (tables and figures)
+\RequirePackage{caption}
+\captionsetup{format=hang,font=small}
+% or, like in arsclassica.sty by Lorenzo Pantieri:
+%\captionsetup{format=hang,font=small,labelfont={bf}}
+%\captionsetup[table]{skip=\medskipamount}
+
+%*******************************************************
+% hack to use citations in float environments
+% will be fixed with caption package version 3.2
+%*******************************************************
+%\RequirePackage{makerobust}
+%\makeatletter
+%\MakeRobustCommand\caption@xref
+%\makeatother
+
+% ********************************************************************
+% fine typesetting of code listings
+\RequirePackage{listings}
+
+% ********************************************************************
+% enable subfigures in figures
+\RequirePackage{subfig}
+
+% ********************************************************************
+% Using PDFLaTeX:
+% ********************************************************************
+\PassOptionsToPackage{pdftex,hyperfootnotes=false,pdfpagelabels}{hyperref}
+ \RequirePackage{hyperref} % backref linktocpage pagebackref
+\pdfcompresslevel=9
+\pdfadjustspacing=1
+\PassOptionsToPackage{pdftex}{graphicx}
+ \RequirePackage{graphicx} % PDFTeX driver for graphicx
+%\DeclareGraphicsRule{*}{mps}{*}{} % enables use of MetaPost graphics with pdflatex
+
+%*******************************************************
+% There are some issues regarding autorefnames
+% http://www.ureader.de/msg/136221647.aspx
+% http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexwords
+% you have to redefine the makros for the
+% language you use, e.g., american, ngerman
+% (as chosen when loading babel/AtBeginDocument)
+\@ifpackageloaded{babel}%
+ {%
+ \addto\extrasamerican{%
+ \renewcommand*{\figureautorefname}{Figure}%
+ \renewcommand*{\tableautorefname}{Table}%
+ \renewcommand*{\partautorefname}{Part}%
+ \renewcommand*{\chapterautorefname}{Chapter}%
+ \renewcommand*{\sectionautorefname}{Section}%
+ \renewcommand*{\subsectionautorefname}{Section}%
+ \renewcommand*{\subsubsectionautorefname}{Section}%
+ }%
+ \addto\extrasngerman{%
+ \renewcommand*{\paragraphautorefname}{Absatz}%
+ \renewcommand*{\subparagraphautorefname}{Unterabsatz}%
+ \renewcommand*{\footnoteautorefname}{Fu\"snote}%
+ \renewcommand*{\FancyVerbLineautorefname}{Zeile}%
+ \renewcommand*{\theoremautorefname}{Theorem}%
+ \renewcommand*{\appendixautorefname}{Anhang}%
+ \renewcommand*{\equationautorefname}{Gleichung}%
+ \renewcommand*{\itemautorefname}{Punkt}%
+ }%
+ % Fix to getting autorefs for subfigures right
+ \newcommand{\subfigureautorefname}{\figureautorefname}%
+ }{\relax}
+
+
+
+% ********************************************************************
+% get the links to the figures and tables right
+%\RequirePackage[all]{hypcap} % to be loaded after hyperref package
+
+% ********************************************************************
+% setup the style of the backrefs from the bibliography
+\newcommand{\backrefnotcitedstring}{\relax}%(Not cited.)
+\newcommand{\backrefcitedsinglestring}[1]{(Cited on page~#1.)}
+\newcommand{\backrefcitedmultistring}[1]{(Cited on pages~#1.)}
+
+\ifthenelse{\boolean{cld@backref}}%
+{%
+ \PassOptionsToPackage{hyperpageref}{backref}
+ \RequirePackage{backref} % to be loaded after hyperref package
+ \renewcommand{\backreftwosep}{ and~} % seperate 2 pages
+ \renewcommand{\backreflastsep}{, and~} % seperate last of longer list
+ \renewcommand*{\backref}[1]{} % Disable standard
+ \renewcommand*{\backrefalt}[4]{% Detailed backref
+ \ifcase #1 %
+ \backrefnotcitedstring%
+ \or%
+ \backrefcitedsinglestring{#2}%
+ \else%
+ \backrefcitedmultistring{#2}%
+ \fi}%
+}{\relax}
+
+% \hspace*{\fill}{\scriptsize\itshape\mbox{%
+% \ifnum#1=1 %
+% (Cited on page~%
+% \else
+% (Cited on pages~%
+% \fi
+% #2)}
+%}
+
+% ********************************************************************
+% Language/strings for backrefs (change here, thanks, Lorenzo)
+%*******************************************************
+%\renewcommand{\backrefnotcitedstring}{\relax}%(Not cited.)
+%\renewcommand{\backrefcitedsinglestring}[1]{(Citato a pagina~#1.)}
+%\renewcommand{\backrefcitedmultistring}[1]{(Citato alle pagine~#1.)}
+%\renewcommand{\backreftwosep}{ e~}
+%\renewcommand{\backreflastsep}{ e~}
+
+% ********************************************************************
+% Listings setup
+% ********************************************************************
+%\lstset{emph={trueIndex,root},emphstyle=\color{BlueViolet}}%\underbar} % for special keywords
+% ********************************************************************
+\lstset{language=[LaTeX]Tex,%C++,
+ keywordstyle=\color{RoyalBlue},%\bfseries,
+ basicstyle=\small\ttfamily,
+ %identifierstyle=\color{NavyBlue},
+ commentstyle=\color{Green}\ttfamily,
+ stringstyle=\rmfamily,
+ numbers=none,%left,%
+ numberstyle=\scriptsize,%\tiny
+ stepnumber=5,
+ numbersep=8pt,
+ showstringspaces=false,
+ breaklines=true,
+ frameround=ftff,
+ frame=single,
+ belowcaptionskip=.75\baselineskip
+ %frame=L
+}
+
+% ********************************************************************
+% Hyperreferences
+%*******************************************************
+\hypersetup{%
+ %draft, % = no hyperlinking at all (useful in b/w printouts)
+ colorlinks=true, linktocpage=true, pdfstartpage=3, pdfstartview=FitV,%
+ % uncomment the following line if you want to have black links (e.g., for printing)
+ %colorlinks=false, linktocpage=false, pdfborder={0 0 0}, pdfstartpage=3, pdfstartview=FitV,%
+ breaklinks=true, pdfpagemode=UseNone, pageanchor=true, pdfpagemode=UseOutlines,%
+ plainpages=false, bookmarksnumbered, bookmarksopen=true, bookmarksopenlevel=1,%
+ hypertexnames=true, pdfhighlight=/O,%hyperfootnotes=true,%nesting=true,%frenchlinks,%
+ urlcolor=webbrown, linkcolor=RoyalBlue, citecolor=webgreen, %pagecolor=RoyalBlue,%
+ %urlcolor=Black, linkcolor=Black, citecolor=Black, %pagecolor=Black,%
+ pdftitle={\myTitle},%
+ pdfauthor={\textcopyright\ \myName, \myUni, \myFaculty},%
+ pdfsubject={},%
+ pdfkeywords={},%
+ pdfcreator={pdfLaTeX},%
+ pdfproducer={LaTeX with hyperref and classicthesis}%
+}
+
+% ********************************************************************
+% Last, but not least...
+%*******************************************************
+\RequirePackage{classicthesis}
+
+
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