diff options
20 files changed, 610 insertions, 653 deletions
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib b/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib index f252f825994..5a4b7e63449 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib +++ b/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib @@ -1,70 +1,74 @@ -@BOOK{sommerville:1992, - Address = {Boston, MA, USA}, - Author = {Ian Sommerville}, - Edition = {4th}, - Publisher = {Addison-Wesley}, - Title = {{S}oftware {E}ngineering}, - Year = {1992} +% This file was created with JabRef 2.6. +% Encoding: Cp1252 + +@BOOK{bentley:1999, + title = {{P}rogramming {P}earls}, + publisher = {Addison--Wesley}, + year = {1999}, + author = {Jon Bentley}, + address = {Boston, MA, USA}, + edition = {2nd} } -@ARTICLE{knuth:1974, - Address = {New York, NY, USA}, - Author = {Knuth, Donald E.}, - Journal = {Communications of the ACM}, - Month = {December }, - Number = {12}, - Pages = {667--673}, - Publisher = {ACM Press}, - Title = {{C}omputer {P}rogramming as an {A}rt}, - Volume = {17}, - Year = {1974} +@BOOK{bringhurst:2002, + title = {{T}he {E}lements of {T}ypographic {S}tyle}, + publisher = {Hartley \& Marks Publishers}, + year = {2008}, + author = {Robert Bringhurst}, + series = {Version 3.2}, + address = {Point Roberts, WA, USA} } -@BOOK{bentley:1999, - Address = {Boston, MA, USA}, - Author = {Jon Bentley}, - Edition = {2nd}, - Publisher = {Addison--Wesley}, - Title = {{P}rogramming {P}earls}, - Year = {1999} +@BOOK{cormen:2001, + title = {{I}ntroduction to {A}lgorithms}, + publisher = {The MIT Press}, + year = {2001}, + author = {Cormen, Thomas H. and Leiserson, Charles E. and Rivest, Ronald L. + and Clifford Stein}, + address = {Cambridge, MA, USA}, + edition = {2nd} } +@BOOK{dueck:trio, + title = {{D}ueck's {T}rilogie: {O}mnisophie -- {S}upramanie -- {T}opothesie}, + publisher = {Springer, Berlin}, + year = {2005}, + author = {Gunter Dueck}, + note = {\url{http://www.omnisophie.com}} +} @ARTICLE{knuth:1976, - Address = {New York, NY, USA}, - Author = {Knuth, Donald E.}, - Journal = {SIGACT News}, - Month = {April/June}, - Number = {2}, - Pages = {18--24}, - Publisher = {ACM Press}, - Title = {{B}ig {O}micron and {B}ig {O}mega and {B}ig {T}heta}, - Volume = {8}, - Year = {1976} + author = {Knuth, Donald E.}, + title = {{B}ig {O}micron and {B}ig {O}mega and {B}ig {T}heta}, + journal = {SIGACT News}, + year = {1976}, + volume = {8}, + pages = {18--24}, + number = {2}, + month = {April/June}, + address = {New York, NY, USA}, + publisher = {ACM Press} } -@BOOK{cormen:2001, - Address = {Cambridge, MA, USA}, - Author = {Cormen, Thomas H. and Leiserson, Charles E. and Rivest, Ronald L. and Clifford Stein}, - Edition = {2nd}, - Publisher = {The MIT Press}, - Title = {{I}ntroduction to {A}lgorithms}, - Year = {2001} +@ARTICLE{knuth:1974, + author = {Knuth, Donald E.}, + title = {{C}omputer {P}rogramming as an {A}rt}, + journal = {Communications of the ACM}, + year = {1974}, + volume = {17}, + pages = {667--673}, + number = {12}, + month = {December }, + address = {New York, NY, USA}, + publisher = {ACM Press} } -@BOOK{dueck:trio, - Author = {Gunter Dueck}, - Note = {\url{http://www.omnisophie.com}}, - Publisher = {Springer, Berlin}, - Title = {Dueck's Trilogie: Omnisophie -- Supramanie -- Topothesie}, - Year = {2005}, +@BOOK{sommerville:1992, + title = {{S}oftware {E}ngineering}, + publisher = {Addison-Wesley}, + year = {1992}, + author = {Ian Sommerville}, + address = {Boston, MA, USA}, + edition = {4th} } -@BOOK{bringhurst:2002, - Address = {Point Roberts, WA, USA}, - Author = {Robert Bringhurst}, - Publisher = {Hartley \& Marks, Publishers}, - Series = {Version 2.5}, - Title = {The Elements of Typographic Style}, - Year = {2002}, -}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES index a3a65aadc62..30e82f6a273 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES +++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES @@ -1,3 +1,30 @@ +Changes in version 4.0 (December 2011) +o Due to lots of issues and complaints, + classicthesis-preamble.sty is replaced by + classicthesis-config.tex (which is cleaner, + nicer, better, etc. than before!) +o No per-chapter-numbering also for equations + (classicthesis.sty and Chapter03.tex) +o classicthesis.sty now also works without the + KOMA-classes (scrbook, scrartcl, etc.): + - This affects the text body shape, where the + package "typearea" is always loaded in order + to use \areaset + - And affects the layout of footnotes where the + package "footmisc" is loaded otherwise + (not 100\% identical look-and-feel but OK) +o Help for using spanish babel with classicthesis + (classicthesis-config.tex) +o Note about pdfsync issues with graffiti + (Chapter01.tex) +o Minor clean-up of comments and duplicate lines + (classicthesis.sty) +o Adjusted the colophon text (Colophon.tex) +o Increased space for labels in the LoF, LoT, LoL +o Included version information on the title page and + in the drafting and final version information + (classicthesis.sty and Titlepage.tex) + Changes in version 3.0 (June 2011) o There have been some major changes in order to port classicthesis to LyX easily. See below for details. diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex index 36533f7079c..a76ffc66892 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex @@ -9,7 +9,7 @@ This bundle for \LaTeX\ has two goals: authors for reports, books, etc.) \item Provide a classic, high-quality typographic style that is - inspired by \cauthor{bringhurst:2002}'s ``\emph{The Elements of + inspired by \citeauthor{bringhurst:2002}'s ``\emph{The Elements of Typographic Style}'' \citep{bringhurst:2002}. \marginpar{\myTitle \myVersion} \end{enumerate} @@ -26,11 +26,11 @@ now use the style stand-alone via the file \texttt{classicthesis.sty}. This works now also with ``plain'' \LaTeX. As of version 3.0, \texttt{classicthesis} can also be easily used with -LyX\footnote{\url{http://www.lyx.org}} thanks to Nicholas Mariette -and Ivo Pletikosi\'c. The LyX version of this manual will contain +\mLyX\footnote{\url{http://www.lyx.org}} thanks to Nicholas Mariette +and Ivo Pletikosi\'c. The \mLyX\ version of this manual will contain more information on the details. -This should enable anyone with a basic knowledge of \LaTeXe\ or LyX to +This should enable anyone with a basic knowledge of \LaTeXe\ or \mLyX\ to produce beautiful documents without too much effort. In the end, this is my overall goal: more beautiful documents, especially theses, as I am tired of seeing so many ugly ones. @@ -106,15 +106,15 @@ the following: \item\texttt{classicthesis.sty}: the style definition to get this awesome look and feel. Does not only work with this thesis template but also on its own (see folder \texttt{Examples}). Bonus: works - with both \LaTeX\ and \textsc{pdf}\LaTeX\dots and LyX. + with both \LaTeX\ and \textsc{pdf}\LaTeX\dots and \mLyX. \item\texttt{ClassicThesis.tcp} a \TeX nicCenter project file. Great tool and it's free! \item\texttt{ClassicThesis.tex}: the main file of your thesis where all gets bundled together. - \item\texttt{classicthesis-preamble.sty}: a central place to load all - nifty packages that are used. You can also load it with the option - \texttt{backref} in order to have information about where a source - was cited in the bibliography. + \item\texttt{classicthesis-config.tex}: a central place to load all + nifty packages that are used. In there, you can also activate + backrefs in order to have information in the bibliography about + where a source was cited in the text (\ie, the page number). \emph{Make your changes and adjustments here.} This means that you specify here the options you want to load \texttt{classicthesis.sty} @@ -123,7 +123,7 @@ the following: information. This had to change as of version 3.0 in order to enable an easy - transition from the ``basic'' style to LyX. + transition from the ``basic'' style to \mLyX. \end{itemize} In total, this should get you started in no time. @@ -230,54 +230,54 @@ The best way to figure these options out is to try the different possibilities and see, what you and your supervisor like best. In order to make things easier in general, -\texttt{classicthesis-preamble.sty} +\texttt{classicthesis-config.tex} contains some useful commands that might help you. \section{Customization}\label{sec:custom} -%(As of v3.0, the Classic Thesis Style for \LaTeX{} and \LyX{} share +%(As of v3.0, the Classic Thesis Style for \LaTeX{} and \mLyX{} share %the same two \texttt{.sty} files.) This section will give you some hints about how to adapt \texttt{classicthesis} to your needs. The file \texttt{classicthesis.sty} contains the core functionality of the style and in most cases will -be left intact, whereas the file \texttt{classic\-thesis-preamble.sty} +be left intact, whereas the file \texttt{classic\-thesis-config.tex} is used for some common user customizations. The first customization you are about to make is to alter the document title, author name, and other thesis details. In order to do this, replace -the data in the following lines of \texttt{classicthesis-preamble.sty:}% -\marginpar{Modifications in \texttt{classic\-thesis-preamble.sty}% +the data in the following lines of \texttt{classicthesis-config.tex:}% +\marginpar{Modifications in \texttt{classic\-thesis-config.tex}% } \begin{lstlisting}[frame=lt] % ************************************************** -% Re-usable information +% 2. Personal data and user ad-hoc commands % ************************************************** \newcommand{\myTitle}{A Classic Thesis Style\xspace} \newcommand{\mySubtitle}{An Homage to...\xspace} \end{lstlisting} - -Further customization can be made in \texttt{classicthesis-preamble.sty} +Further customization can be made in \texttt{classicthesis-config.tex} by choosing the options to \texttt{classicthesis.sty} (see~\autoref{sec:options}) in a line that looks like this: - \begin{lstlisting}[frame=lt] \PassOptionsToPackage{eulerchapternumbers,drafting,listings,subfig,eulermath,parts}{classicthesis} \end{lstlisting} - If you want to use backreferences from your citations to the pages -they were cited on, uncomment the following line: +they were cited on, change the following line from: \begin{lstlisting}[breaklines=false,frame=lt] -\PassOptionsToPackage{backref}{classicthesis-preamble} +\setboolean{enable-backrefs}{false} % true false +\end{lstlisting} +to +\begin{lstlisting}[breaklines=false,frame=lt] +\setboolean{enable-backrefs}{true} % true false \end{lstlisting} - -Many other customizations in \texttt{classicthesis-preamble.sty} are +Many other customizations in \texttt{classicthesis-config.tex} are possible, but you should be careful making changes there, since some changes could cause errors. @@ -308,6 +308,19 @@ with the following options: Thanks to Sven Staehs for this information. +\subsection*{Compatibility with the (Spanish) \texttt{babel} Package} +Spanish languages need an extra option in order to work with this template: +\begin{verbatim} + \usepackage[spanish,es-lcroman]{babel} +\end{verbatim} +Thanks to an unknown person for this information (via Google Code issue reporting). + + +\subsection*{Compatibility with the \texttt{pdfsync} Package} +Using the \texttt{pdfsync} package leads to linebreaking problems with the \texttt{graffito} command. +Thanks to Henrik Schumacher for this information. + + \section{Future Work} So far, this is a quite stable version that served a couple of people well during their thesis time. However, some things are still not as diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex index b2e4867e85d..34ac3173720 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex @@ -1,8 +1,10 @@ %***************************************** \chapter{Examples}\label{ch:examples} %***************************************** +%\setcounter{figure}{10} +% \NoCaseChange{Homo Sapiens} Ei choro aeterno antiopam mea, labitur bonorum pri no -\cauthor{dueck:trio} \citep{dueck:trio}. His no decore +\citeauthor{dueck:trio} \citep{dueck:trio}. His no decore nemore graecis. In eos meis nominavi, liber soluta vim cu. Sea commune suavitate interpretaris eu, vix eu libris efficiantur. \section{A New Section} @@ -60,7 +62,7 @@ gymnasios, clave effortio primarimente su del.\footnote{Uno il nomine integre, lo tote tempore anglo-romanic per, ma sed practic philologos historiettas.} -Sia ma sine svedese americas. Asia \cauthor{bentley:1999} +Sia ma sine svedese americas. Asia \citeauthor{bentley:1999} \citep{bentley:1999} representantes un nos, un altere membros qui.\footnote{De web nostre historia angloromanic.} Medical representantes al uso, con lo unic vocabulos, tu peano essentialmente @@ -77,7 +79,7 @@ qui. Lo malo laborava anteriormente uso. avantiate in. Su pro effortio appellate, o. \end{description} Tu uno veni americano sanctificate. Pan e union linguistic -\cauthor{cormen:2001} \citep{cormen:2001} simplificate, traducite +\citeauthor{cormen:2001} \citep{cormen:2001} simplificate, traducite linguistic del le, del un apprende denomination. @@ -93,7 +95,7 @@ Ha iste americas que, qui ma tempore capital. \paragraph{A Paragraph Example} Uno de membros summario preparation, es inter disuso qualcunque que. Del hodie philologos occidental al, -como publicate litteratura in web. Veni americano \cauthor{knuth:1976} +como publicate litteratura in web. Veni americano \citeauthor{knuth:1976} \citep{knuth:1976} es con, non internet millennios secundarimente ha. Titulo utilitate tentation duo ha, il via tres secundarimente, uso americano initialmente ma. De duo deler personas initialmente. Se @@ -105,7 +107,7 @@ articulos ha. \item Second item \end{aenumerate} -Medio integre lo per, non \cauthor{sommerville:1992} +Medio integre lo per, non \citeauthor{sommerville:1992} \citep{sommerville:1992} es linguas integre. Al web altere integre periodicos, in nos hodie basate. Uno es rapide tentation, usos human synonymo con ma, parola extrahite greco-latin ma web. Veni signo @@ -131,15 +133,16 @@ rapide nos da. suscipit instructior & titulo & personas \\ %postulant quo & westeuropee & sanctificatec \\ \midrule - quaestio philosophia & facto & demonstrated \cauthor{knuth:1976} \\ + quaestio philosophia & facto & demonstrated \citeauthor{knuth:1976} \\ %autem vulputate ex & parola & romanic \\ %usu mucius iisque & studio & sanctificatef \\ \bottomrule \end{tabularx} \caption[Autem timeam deleniti usu id]{Autem timeam deleniti usu - id. \cauthor{knuth:1976}} \label{tab:example} + id. \citeauthor{knuth:1976}} \label{tab:example} \end{table} +\enlargethispage{2cm} \subsection{Linguistic Registrate} Veni introduction es pro, qui finalmente demonstrate il. E tamben anglese programma uno. Sed le debitas demonstrate. Non russo existe o, @@ -151,7 +154,6 @@ studio. \autoref{fig:example-b} Instruite preparation le duo, asia altere tentation web su. Via unic facto rapide de, iste questiones methodicamente o uno, nos al. -\longpage \begin{figure}[bth] \myfloatalign \subfloat[Asia personas duo.] diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex index 73cceecd708..c06b7e5d58a 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex @@ -22,9 +22,9 @@ proportional to the ratio of mean energy loss to the maximum allowed energy transfer in a single collision with an atomic electron: \graffito{You might get unexpected results using math in chapter or section heads. Consider the \texttt{pdfspacing} option.} -\[ +\begin{equation} \kappa =\frac{\xi}{E_{\mathrm{max}}} %\mathbb{ZNR} -\] +\end{equation} $E_{\mathrm{max}}$ is the maximum transferable energy in a single collision with an atomic electron. \[ diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf Binary files differindex 198ee05ed40..1fe868ee5e4 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex index f35c9fa8000..cd61cdc47de 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex @@ -47,25 +47,7 @@ %******************************************************************** % Note: Make all your adjustments in here %******************************************************* -\usepackage{classicthesis-preamble} % [backref] - -%******************************************************* -% Some font experiments -%******************************************************* -%\usepackage[osf]{libertine} -%\usepackage{hfoldsty} -%\usepackage[light,condensed,math]{iwona} -%\renewcommand{\sfdefault}{iwona} -%\usepackage{lmodern} % <-- no osf support :-( -%\usepackage[urw-garamond]{mathdesign} <-- no osf support :-( - -%******************************************************* -% Fine-tuning for the text area -%******************************************************* -%\linespread{1.05} % a bit more for Palatino -%\areaset[current]{312pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip -%\setlength{\marginparwidth}{7em}% -%\setlength{\marginparsep}{2em}% +\input{classicthesis-config} %******************************************************************** % Hyphenation @@ -90,6 +72,7 @@ \include{FrontBackmatter/Titlepage} \include{FrontBackmatter/Titleback} \cleardoublepage\include{FrontBackmatter/Dedication} +%\cleardoublepage\include{FrontBackmatter/Foreword} \cleardoublepage\include{FrontBackmatter/Abstract} \cleardoublepage\include{FrontBackmatter/Publication} \cleardoublepage\include{FrontBackmatter/Acknowledgments} diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps index 6527a06db32..234c96a7341 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps @@ -4,8 +4,8 @@ Version=2 [SessionInfo] ActiveTab=0 -FrameCount=5 -ActiveFrame=2 +FrameCount=4 +ActiveFrame=3 [Frame0] Columns=1 @@ -16,25 +16,25 @@ MinPos.x=-1 MinPos.y=-1 MaxPos.x=-8 MaxPos.y=-30 -NormalPos.left=22 -NormalPos.top=22 -NormalPos.right=1184 -NormalPos.bottom=262 +NormalPos.left=25 +NormalPos.top=25 +NormalPos.right=1035 +NormalPos.bottom=327 Class=CLatexEdit -Document=classicthesis-preamble.sty +Document=CHANGES [Frame0_Row0] -cyCur=181 +cyCur=243 cyMin=10 [Frame0_Col0] -cxCur=1125 +cxCur=973 cxMin=10 [Frame0_View0,0] -Cursor.row=129 -Cursor.column=38 -TopSubLine=119 +Cursor.row=15 +Cursor.column=49 +TopSubLine=1 [Frame1] Columns=1 @@ -45,12 +45,12 @@ MinPos.x=-1 MinPos.y=-1 MaxPos.x=-8 MaxPos.y=-30 -NormalPos.left=66 -NormalPos.top=66 -NormalPos.right=1228 -NormalPos.bottom=333 +NormalPos.left=44 +NormalPos.top=44 +NormalPos.right=1206 +NormalPos.bottom=311 Class=CLatexEdit -Document=CHANGES +Document=ClassicThesis.tex [Frame1_Row0] cyCur=208 @@ -68,66 +68,37 @@ TopSubLine=0 [Frame2] Columns=1 Rows=1 -Flags=2 -ShowCmd=3 +Flags=0 +ShowCmd=1 MinPos.x=-1 MinPos.y=-1 MaxPos.x=-8 MaxPos.y=-30 -NormalPos.left=88 -NormalPos.top=88 -NormalPos.right=365 -NormalPos.bottom=324 +NormalPos.left=0 +NormalPos.top=0 +NormalPos.right=1035 +NormalPos.bottom=266 Class=CLatexEdit -Document=classicthesis.sty +Document=classicthesis-config.tex [Frame2_Row0] -cyCur=307 +cyCur=207 cyMin=10 [Frame2_Col0] -cxCur=1337 +cxCur=998 cxMin=10 [Frame2_View0,0] -Cursor.row=231 -Cursor.column=45 -TopSubLine=214 +Cursor.row=53 +Cursor.column=35 +TopSubLine=53 [Frame3] Columns=1 Rows=1 -Flags=0 -ShowCmd=1 -MinPos.x=-1 -MinPos.y=-1 -MaxPos.x=-8 -MaxPos.y=-30 -NormalPos.left=44 -NormalPos.top=44 -NormalPos.right=1206 -NormalPos.bottom=311 -Class=CLatexEdit -Document=ClassicThesis.tex - -[Frame3_Row0] -cyCur=208 -cyMin=10 - -[Frame3_Col0] -cxCur=1125 -cxMin=10 - -[Frame3_View0,0] -Cursor.row=0 -Cursor.column=0 -TopSubLine=0 - -[Frame4] -Columns=1 -Rows=1 -Flags=0 -ShowCmd=1 +Flags=2 +ShowCmd=3 MinPos.x=-1 MinPos.y=-1 MaxPos.x=-8 @@ -137,18 +108,18 @@ NormalPos.top=100 NormalPos.right=1240 NormalPos.bottom=414 Class=CLatexEdit -Document=Chapters\Chapter02.tex +Document=classicthesis.sty -[Frame4_Row0] -cyCur=255 +[Frame3_Row0] +cyCur=443 cyMin=10 -[Frame4_Col0] -cxCur=1103 +[Frame3_Col0] +cxCur=1269 cxMin=10 -[Frame4_View0,0] -Cursor.row=0 -Cursor.column=0 -TopSubLine=0 +[Frame3_View0,0] +Cursor.row=35 +Cursor.column=27 +TopSubLine=48 diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf Binary files differindex 61a37230f2e..26436afd31f 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex index ced5cd52eee..a648ac0e5e4 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex @@ -1,5 +1,5 @@ % article example for classicthesis.sty -\documentclass[10pt,a4paper]{scrartcl} % KOMA-Script article +\documentclass[10pt,a4paper]{article} % KOMA-Script article scrartcl \usepackage{lipsum} \usepackage{url} \usepackage[nochapters]{../classicthesis} % nochapters @@ -12,7 +12,7 @@ \maketitle \begin{abstract} - \noindent\lipsum[1] + \noindent\lipsum[1] Just a test.\footnote{This is a footnote.} \end{abstract} \tableofcontents diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf Binary files differindex 0f1f52f5c64..51c18c9a95d 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex index d9e7a36ee2f..9001cf8c797 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex @@ -2,12 +2,20 @@ \documentclass[11pt,a5paper,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book \usepackage[T1]{fontenc} \usepackage{lipsum} -\usepackage[linedheaders,parts]{../classicthesis} % ,manychapters +\usepackage[linedheaders,parts,pdfspacing]{../classicthesis} % ,manychapters %\usepackage[osf]{libertine} %\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false} \begin{document} - \tableofcontents +% \pagestyle{scrheadings} +% \manualmark +% \markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} + + \tableofcontents + +% \automark[section]{chapter} +% \renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}} +% \renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}} % use \cleardoublepage here to avoid problems with pdfbookmark \cleardoublepage\part{Test Part} @@ -23,6 +31,8 @@ \section{A Section} \lipsum[1] +% \include{multiToC} + \appendix \cleardoublepage\part{Appendix} \chapter{Appendix Chapter} diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf Binary files differindex 13c68f491bb..5781a481961 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex index bc72455d3de..02340401d18 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex @@ -36,7 +36,7 @@ Legovini, Steffen Prochnow, Nicolas Repp, Hinrich Harms, \bigskip -\noindent\emph{Regarding LyX}: The LyX port was intially done by +\noindent\emph{Regarding \mLyX}: The \mLyX\ port was intially done by \emph{Nicholas Mariette} in March 2009 and continued by \emph{Ivo Pletikosi\'c} in 2011. Thank you very much for your work and the contributions to the original style. diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex index d277a14dcc4..60e1b5ddc41 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex @@ -7,50 +7,52 @@ \pdfbookmark[0]{Colophon}{colophon} \section*{Colophon} -This thesis was typeset with \LaTeXe\ using Hermann Zapf's -\emph{Palatino} -and \emph{Euler} type faces (Type~1 PostScript fonts \emph{URW -Palladio L} -and \emph{FPL} were used). The listings are typeset in \emph{Bera -Mono}, originally developed by Bitstream, Inc. as ``Bitstream Vera''. -(Type~1 PostScript fonts were made available by Malte Rosenau and -Ulrich Dirr.) - -The typographic style was inspired by \cauthor{bringhurst:2002}'s genius as -presented in \emph{The Elements of Typographic Style} -\citep{bringhurst:2002}. It is available for \LaTeX\ via \textsmaller{CTAN} as -``\href{http://www.ctan.org/tex-archive/macros/latex/contrib/classicthesis/}% -{\texttt{classicthesis}}''. - -\paragraph{note:} The custom size of the textblock was calculated -using the directions given by Mr. Bringhurst (pages 26--29 and -175/176). 10~pt Palatino needs 133.21~pt for the string -``abcdefghijklmnopqrstuvwxyz''. This yields a good line length between -24--26~pc (288--312~pt). Using a ``\emph{double square textblock}'' -with a 1:2 ratio this results in a textblock of 312:624~pt (which -includes the headline in this design). A good alternative would be the -``\emph{golden section textblock}'' with a ratio of 1:1.62, here -312:505.44~pt. For comparison, \texttt{DIV9} of the \texttt{typearea} -package results in a line length of 389~pt (32.4~pc), which is by far -too long. However, this information will only be of interest for -hardcore pseudo-typographers like me.% - -To make your own calculations, use the following commands and look up -the corresponding lengths in the book: -\begin{verbatim} - \settowidth{\abcd}{abcdefghijklmnopqrstuvwxyz} - \the\abcd\ % prints the value of the length -\end{verbatim} -Please see the file \texttt{classicthesis.sty} for some precalculated -values for Palatino and Minion. - - \settowidth{\abcd}{abcdefghijklmnopqrstuvwxyz} - \the\abcd\ % prints the value of the length - - +This document was typeset using the typographical look-and-feel \texttt{classicthesis} developed by Andr\'e Miede. +The style was inspired by Robert Bringhurst's seminal book on typography ``\emph{The Elements of Typographic Style}''. +\texttt{classicthesis} is available for both \LaTeX\ and \mLyX: +\begin{center} +\url{http://code.google.com/p/classicthesis/} +\end{center} +Happy users of \texttt{classicthesis} usually send a real postcard to the author, a collection of postcards received so far is featured here: +\begin{center} +\url{http://postcards.miede.de/} +\end{center} + \bigskip \noindent\finalVersionString +%Hermann Zapf's \emph{Palatino} and \emph{Euler} type faces (Type~1 PostScript fonts \emph{URW +%Palladio L} and \emph{FPL}) are used. The ``typewriter'' text is typeset in \emph{Bera Mono}, +%originally developed by Bitstream, Inc. as ``Bitstream Vera''. (Type~1 PostScript fonts were made +%available by Malte Rosenau and +%Ulrich Dirr.) + +%\paragraph{note:} The custom size of the textblock was calculated +%using the directions given by Mr. Bringhurst (pages 26--29 and +%175/176). 10~pt Palatino needs 133.21~pt for the string +%``abcdefghijklmnopqrstuvwxyz''. This yields a good line length between +%24--26~pc (288--312~pt). Using a ``\emph{double square textblock}'' +%with a 1:2 ratio this results in a textblock of 312:624~pt (which +%includes the headline in this design). A good alternative would be the +%``\emph{golden section textblock}'' with a ratio of 1:1.62, here +%312:505.44~pt. For comparison, \texttt{DIV9} of the \texttt{typearea} +%package results in a line length of 389~pt (32.4~pc), which is by far +%too long. However, this information will only be of interest for +%hardcore pseudo-typographers like me.% +% +%To make your own calculations, use the following commands and look up +%the corresponding lengths in the book: +%\begin{verbatim} +% \settowidth{\abcd}{abcdefghijklmnopqrstuvwxyz} +% \the\abcd\ % prints the value of the length +%\end{verbatim} +%Please see the file \texttt{classicthesis.sty} for some precalculated +%values for Palatino and Minion. +% +% \settowidth{\abcd}{abcdefghijklmnopqrstuvwxyz} +% \the\abcd\ % prints the value of the length + + diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex index c1767a836ee..06b118ce180 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex @@ -27,7 +27,7 @@ %\myFaculty \\ %\myUni \\ \bigskip - \myTime + \myTime\ -- \myVersion \vfill diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES index 51916218223..67302480047 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES +++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES @@ -1,22 +1,21 @@ LIST OF FILES FOR ClassicThesis.tex *File List* -scrreprt.cls 2011/04/02 v3.09 KOMA-Script document class (report) -scrkbase.sty 2011/04/02 v3.09 KOMA-Script package (KOMA-Script-dependent bas -ics and keyval usage) - scrbase.sty 2011/04/02 v3.09 KOMA-Script package (KOMA-Script-independent b -asics and keyval usage) +scrreprt.cls 2011/06/16 v3.09a KOMA-Script document class (report) +scrkbase.sty 2011/06/16 v3.09a KOMA-Script package (KOMA-Script-dependent ba +sics and keyval usage) + scrbase.sty 2011/06/16 v3.09a KOMA-Script package (KOMA-Script-independent +basics and keyval usage) keyval.sty 1999/03/16 v1.13 key=value parser (DPC) scrlfile.sty 2011/03/09 v3.09 KOMA-Script package (loading files) -tocbasic.sty 2011/03/23 v3.09 KOMA-Script package (handling toc-files) -scrsize11pt.clo 2011/04/02 v3.09 KOMA-Script font size class option (11pt) -typearea.sty 2011/04/02 v3.09 KOMA-Script package (type area) -classicthesis-preamble.sty 2011/06/01 v3.0 Your Preamble and Package Loader -for Classic Thesis Style +tocbasic.sty 2011/05/30 v3.09a KOMA-Script package (handling toc-files) +scrsize11pt.clo 2011/06/16 v3.09a KOMA-Script font size class option (11pt) +typearea.sty 2011/06/16 v3.09a KOMA-Script package (type area) +classicthesis-config.tex ifthen.sty 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC) inputenc.sty 2008/03/30 v1.1d Input encoding file latin9.def 2008/03/30 v1.1d Input encoding file - babel.sty 2008/07/06 v3.8l The Babel package + babel.sty 2008/07/08 v3.8m The Babel package bblopts.cfg 2006/07/31 v1.0 MiKTeX 'babel' configuration ngermanb.ldf 2008/07/06 v2.6n new German support from the babel system english.ldf 2005/03/30 v3.3o English support from the babel system @@ -28,26 +27,34 @@ ngermanb.ldf 2008/07/06 v2.6n new German support from the babel system amsopn.sty 1999/12/14 v2.01 operator names fontenc.sty t1enc.def 2005/09/27 v1.99g Standard LaTeX file -textcomp.sty 2005/09/27 v1.99g Standard LaTeX package - ts1enc.def 2001/06/05 v3.0e (jk/car/fm) Standard LaTeX file - xspace.sty 2006/05/08 v1.12 Space after command names (DPC,MH) -tabularx.sty 1999/01/07 v2.07 `tabularx' package (DPC) - array.sty 2008/09/09 v2.4c Tabular extension package (FMi) + xspace.sty 2009/10/20 v1.13 Space after command names (DPC,MH) mparhack.sty 2005/04/17 v1.4 (T. Sgouros and S. Ulrich) fixltx2e.sty 2006/09/13 v1.1m fixes to LaTeX - relsize.sty 2003/07/04 ver 3.1 acronym.sty 2010/09/08 v1.36 Support for acronyms (Tobias Oetiker) suffix.sty 2006/07/15 1.5 Variant command support - caption.sty 2010/01/09 v3.1m Customizing captions (AR) -caption3.sty 2010/01/14 v3.1m caption3 kernel (AR) + relsize.sty 2003/07/04 ver 3.1 +tabularx.sty 1999/01/07 v2.07 `tabularx' package (DPC) + array.sty 2008/09/09 v2.4c Tabular extension package (FMi) + caption.sty 2011/11/02 v3.2d Customizing captions (AR) +caption3.sty 2011/11/01 v1.4a caption3 kernel (AR) + subfig.sty 2005/06/28 ver: 1.3 subfig package listings.sty 2007/02/22 1.4 (Carsten Heinz) lstmisc.sty 2007/02/22 1.4 (Carsten Heinz) listings.cfg 2007/02/22 1.4 listings configuration - subfig.sty 2005/06/28 ver: 1.3 subfig package -hyperref.sty 2011/04/17 v6.82g Hypertext links for LaTeX -hobsub-hyperref.sty 2011/04/18 v1.3 Bundle oberdiek, subset hyperref (HO) -hobsub-generic.sty 2011/04/18 v1.3 Bundle oberdiek, subset generic (HO) - hobsub.sty 2011/04/18 v1.3 Subsetting bundle oberdiek (HO) +lstlang1.sty 2004/09/05 1.3 listings language file +lstlang2.sty 2004/09/05 1.3 listings language file +lstlang3.sty 2004/09/05 1.3 listings language file +lstlang1.sty 2004/09/05 1.3 listings language file +lstlang2.sty 2004/09/05 1.3 listings language file +lstlang3.sty 2004/09/05 1.3 listings language file +lstlang1.sty 2004/09/05 1.3 listings language file +lstlang2.sty 2004/09/05 1.3 listings language file +lstlang3.sty 2004/09/05 1.3 listings language file + lstmisc.sty 2007/02/22 1.4 (Carsten Heinz) +hyperref.sty 2011/10/01 v6.82j Hypertext links for LaTeX +hobsub-hyperref.sty 2011/04/23 v1.4 Bundle oberdiek, subset hyperref (HO) +hobsub-generic.sty 2011/04/23 v1.4 Bundle oberdiek, subset generic (HO) + hobsub.sty 2011/04/23 v1.4 Subsetting bundle oberdiek (HO) infwarerr.sty 2010/04/08 v1.3 Providing info/warning/message (HO) ltxcmds.sty 2011/04/18 v1.20 LaTeX kernel commands for general use (HO) ifluatex.sty 2010/03/01 v1.3 Provides the ifluatex switch (HO) @@ -57,7 +64,7 @@ ifluatex.sty 2010/03/01 v1.3 Provides the ifluatex switch (HO) etexcmds.sty 2011/02/16 v1.5 Prefix for e-TeX command names (HO) kvsetkeys.sty 2011/04/07 v1.13 Key value parser (HO) kvdefinekeys.sty 2011/04/07 v1.3 Defining keys (HO) -pdftexcmds.sty 2011/04/16 v0.15 Utilities of pdfTeX for LuaTeX (HO) +pdftexcmds.sty 2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO) pdfescape.sty 2011/04/04 v1.12 Provides string conversions (HO) bigintcalc.sty 2011/01/30 v1.2 Expandable big integer calculations (HO) bitset.sty 2011/01/30 v1.1 Data type bit set (HO) @@ -65,33 +72,23 @@ uniquecounter.sty 2011/01/30 v1.2 Provides unlimited unique counter (HO) letltxmacro.sty 2010/09/02 v1.4 Let assignment for LaTeX macros (HO) hopatch.sty 2011/01/30 v1.0 Wrapper for package hooks (HO) xcolor-patch.sty 2011/01/30 xcolor patch -atveryend.sty 2011/04/15 v1.6 Hooks at very end of document (HO) +atveryend.sty 2011/04/23 v1.7 Hooks at very end of document (HO) atbegshi.sty 2011/01/30 v1.15 At begin shipout hook (HO) refcount.sty 2010/12/01 v3.2 Data extraction from references (HO) hycolor.sty 2011/01/30 v1.7 Color options of hyperref/bookmark (HO) ifxetex.sty 2010/09/12 v0.6 Provides ifxetex conditional kvoptions.sty 2010/12/23 v3.10 Keyval support for LaTeX options (HO) - pd1enc.def 2011/04/17 v6.82g Hyperref: PDFDocEncoding definition (HO) + pd1enc.def 2011/10/01 v6.82j Hyperref: PDFDocEncoding definition (HO) hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive url.sty 2006/04/12 ver 3.3 Verb mode for urls, etc. - hpdftex.def 2011/04/17 v6.82g Hyperref driver for pdfTeX + hpdftex.def 2011/10/01 v6.82j Hyperref driver for pdfTeX rerunfilecheck.sty 2011/04/15 v1.7 Rerun checks for auxiliary files (HO) graphicx.sty 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR) graphics.sty 2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR) trig.sty 1999/03/16 v1.09 sin cos tan (DPC) graphics.cfg 2007/01/18 v1.5 graphics configuration of teTeX/TeXLive - pdftex.def 2011/01/28 v0.05d Graphics/color for pdfTeX -lstlang1.sty 2004/09/05 1.3 listings language file -lstlang2.sty 2004/09/05 1.3 listings language file -lstlang3.sty 2004/09/05 1.3 listings language file -lstlang1.sty 2004/09/05 1.3 listings language file -lstlang2.sty 2004/09/05 1.3 listings language file -lstlang3.sty 2004/09/05 1.3 listings language file -lstlang1.sty 2004/09/05 1.3 listings language file -lstlang2.sty 2004/09/05 1.3 listings language file -lstlang3.sty 2004/09/05 1.3 listings language file - lstmisc.sty 2007/02/22 1.4 (Carsten Heinz) -classicthesis.sty 2011/06/01 v3.0 Typographic Style for a classic-looking th + pdftex.def 2011/05/27 v0.06d Graphics/color for pdfTeX +classicthesis.sty 2011/10/01 v3.1 Typographic style for a classic-looking th esis xcolor.sty 2007/01/21 v2.11 LaTeX color extensions (UK) color.cfg 2007/01/18 v1.5 color configuration of teTeX/TeXLive @@ -103,31 +100,28 @@ microtype.sty 2010/01/10 v2.4 Micro-typography with pdfTeX (RS) microtype.cfg 2010/01/10 v2.4 microtype main configuration file (RS) booktabs.sty 2005/04/14 v1.61803 publication quality tables textcase.sty 2004/10/07 v0.07 Text only upper/lower case changing (DPC) - soul.sty 2003/11/17 v2.4 letterspacing/underlining (mf) scrpage2.sty 2010/04/22 v2.5 LaTeX2e KOMA-Script package -titlesec.sty 2007/08/12 v2.8 Sectioning titles +titlesec.sty 2011/08/28 v2.9.1 Sectioning titles tocloft.sty 2010/10/13 v2.3e parameterised ToC, etc., typesetting - scrtime.sty 2011/04/02 v3.09 KOMA-Script package (time of LaTeX run) + scrtime.sty 2011/06/16 v3.09a KOMA-Script package (time of LaTeX run) prelim2e.sty 2009/05/29 v1.3 prelim2e Package (MS) everyshi.sty 2001/05/15 v3.00 EveryShipout Package (MS) remreset.sty - ts1cmr.fd 1999/05/25 v2.5h Standard LaTeX font definitions t1pplj.fd 2004/09/06 font definitions for T1/pplj. nameref.sty 2010/04/30 v2.40 Cross-referencing by name of section gettitlestring.sty 2010/12/03 v1.4 Cleanup title references (HO) ClassicThesis.out ClassicThesis.out -supp-pdf.tex +supp-pdf.mkii mt-ppl.cfg 2005/11/16 v1.6 microtype config. file: Palatino (RS) FrontBackmatter/DirtyTitlepage.tex + t1fvm.fd 2004/09/07 scalable font definitions for T1/fvm. FrontBackmatter/Titlepage.tex gfx/TFZsuperellipse_bw.pdf FrontBackmatter/Titleback.tex - ts1pplj.fd 2004/09/06 font definitions for TS1/pplj. FrontBackmatter/Dedication.tex FrontBackmatter/Abstract.tex FrontBackmatter/Publication.tex - t1fvm.fd 2004/09/07 scalable font definitions for T1/fvm. FrontBackmatter/Acknowledgments.tex uzeur.fd 2005/01/11 v4.0 (WaS) mt-eur.cfg 2006/07/31 v1.1 microtype config. file: AMS Euler Roman (RS) diff --git a/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex b/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex new file mode 100644 index 00000000000..b2ebc011da0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex @@ -0,0 +1,278 @@ +% **************************************************************************************************** +% classicthesis-config.tex +% formerly known as loadpackages.sty, classicthesis-ldpkg.sty, and classicthesis-preamble.sty +% Use it at the beginning of your ClassicThesis.tex, or as a LaTeX Preamble +% in your ClassicThesis.{tex,lyx} with \input{classicthesis-config} +% **************************************************************************************************** +% If you like the classicthesis, 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 +% **************************************************************************************************** + +% **************************************************************************************************** +% 1. Configure classicthesis for your needs here, e.g., remove "drafting" below +% in order to deactivate the time-stamp on the pages +% **************************************************************************************************** +\PassOptionsToPackage{eulerchapternumbers,listings,drafting,% + pdfspacing,%floatperchapter,%linedheaders,% + subfig,beramono,eulermath,parts}{classicthesis} +% ******************************************************************** +% Available options for classicthesis.sty +% (see ClassicThesis.pdf for more information): +% drafting +% parts nochapters linedheaders +% eulerchapternumbers beramono eulermath pdfspacing minionprospacing +% tocaligned dottedtoc manychapters +% listings floatperchapter subfig +% ******************************************************************** + +% ******************************************************************** +% Triggers for this config +% ******************************************************************** +\usepackage{ifthen} +\newboolean{enable-backrefs} % enable backrefs in the bibliography +\setboolean{enable-backrefs}{false} % true false +% **************************************************************************************************** + + +% **************************************************************************************************** +% 2. Personal data and user ad-hoc commands +% **************************************************************************************************** +\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}{Put data here\xspace} +\newcommand{\myLocation}{Darmstadt\xspace} +\newcommand{\myTime}{December 2011\xspace} +\newcommand{\myVersion}{version 4.0\xspace} + +% ******************************************************************** +% Setup, finetuning, and useful commands +% ******************************************************************** +\newcounter{dummy} % necessary for correct hyperlinks (to index, bib, etc.) +\newlength{\abcd} % for ab..z string length calculation +\providecommand{\mLyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@} +\newcommand{\ie}{i.\,e.} +\newcommand{\Ie}{I.\,e.} +\newcommand{\eg}{e.\,g.} +\newcommand{\Eg}{E.\,g.} +% **************************************************************************************************** + + +% **************************************************************************************************** +% 3. Loading some handy packages +% **************************************************************************************************** +% ******************************************************************** +% Packages with options that might require adjustments +% ******************************************************************** +\PassOptionsToPackage{latin9}{inputenc} % latin9 (ISO-8859-9) = latin1+"Euro sign" + \usepackage{inputenc} + +%\PassOptionsToPackage{ngerman,american}{babel} % change this to your language(s) +% Spanish languages need extra options in order to work with this template +%\PassOptionsToPackage{spanish,es-lcroman}{babel} + \usepackage{babel} + +\PassOptionsToPackage{square,numbers}{natbib} + \usepackage{natbib} + +\PassOptionsToPackage{fleqn}{amsmath} % math environments and more by the AMS + \usepackage{amsmath} + +% ******************************************************************** +% General useful packages +% ******************************************************************** +\PassOptionsToPackage{T1}{fontenc} % T2A for cyrillics + \usepackage{fontenc} +\usepackage{xspace} % to get the spacing after macros right +\usepackage{mparhack} % get marginpar right +\usepackage{fixltx2e} % fixes some LaTeX stuff +\PassOptionsToPackage{printonlyused,smaller}{acronym} + \usepackage{acronym} % nice macros for handling all acronyms in the thesis +%\renewcommand*{\acsfont}[1]{\textssc{#1}} % for MinionPro +\renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms +% **************************************************************************************************** + + +% **************************************************************************************************** +% 4. Setup floats: tables, (sub)figures, and captions +% **************************************************************************************************** +\usepackage{tabularx} % better tables + \setlength{\extrarowheight}{3pt} % increase table row height +\newcommand{\tableheadline}[1]{\multicolumn{1}{c}{\spacedlowsmallcaps{#1}}} +\newcommand{\myfloatalign}{\centering} % to be used with each float for alignment +\usepackage{caption} +\captionsetup{format=hang,font=small} +\usepackage{subfig} +% **************************************************************************************************** + + +% **************************************************************************************************** +% 5. Setup code listings +% **************************************************************************************************** +\usepackage{listings} +%\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 +} +% **************************************************************************************************** + + +% **************************************************************************************************** +% 6. PDFLaTeX, hyperreferences and citation backreferences +% **************************************************************************************************** +% ******************************************************************** +% Using PDFLaTeX +% ******************************************************************** +\PassOptionsToPackage{pdftex,hyperfootnotes=false,pdfpagelabels}{hyperref} + \usepackage{hyperref} % backref linktocpage pagebackref +\pdfcompresslevel=9 +\pdfadjustspacing=1 +\PassOptionsToPackage{pdftex}{graphicx} + \usepackage{graphicx} + +% ******************************************************************** +% Setup the style of the backrefs from the bibliography +% (translate the options to any language you use) +% ******************************************************************** +\newcommand{\backrefnotcitedstring}{\relax}%(Not cited.) +\newcommand{\backrefcitedsinglestring}[1]{(Cited on page~#1.)} +\newcommand{\backrefcitedmultistring}[1]{(Cited on pages~#1.)} +\ifthenelse{\boolean{enable-backrefs}}% +{% + \PassOptionsToPackage{hyperpageref}{backref} + \usepackage{backref} % to be loaded after hyperref package + \renewcommand{\backreftwosep}{ and~} % separate 2 pages + \renewcommand{\backreflastsep}{, and~} % separate 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} + +% ******************************************************************** +% 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,%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}% +} + +% ******************************************************************** +% Setup autoreferences +% ******************************************************************** +% 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) +% ******************************************************************** +\makeatletter +\@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 (thanks to Belinda Vogt for changing the definition) + \providecommand{\subfigureautorefname}{\figureautorefname}% + }{\relax} +\makeatother + + +% **************************************************************************************************** +% 7. Last calls before the bar closes +% **************************************************************************************************** +% ******************************************************************** +% Development Stuff +% ******************************************************************** +\listfiles +%\PassOptionsToPackage{l2tabu,orthodox,abort}{nag} +% \usepackage{nag} +%\PassOptionsToPackage{warning, all}{onlyamsmath} +% \usepackage{onlyamsmath} + +% ******************************************************************** +% Last, but not least... +% ******************************************************************** +\usepackage{classicthesis} +% **************************************************************************************************** + + +% **************************************************************************************************** +% 8. Further adjustments (experimental) +% **************************************************************************************************** +% ******************************************************************** +% Changing the text area +% ******************************************************************** +%\linespread{1.05} % a bit more for Palatino +%\areaset[current]{312pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip +%\setlength{\marginparwidth}{7em}% +%\setlength{\marginparsep}{2em}% + +% ******************************************************************** +% Using different fonts +% ******************************************************************** +%\usepackage[oldstylenums]{kpfonts} % oldstyle notextcomp +%\usepackage[osf]{libertine} +%\usepackage{hfoldsty} % Computer Modern with osf +%\usepackage[light,condensed,math]{iwona} +%\renewcommand{\sfdefault}{iwona} +%\usepackage{lmodern} % <-- no osf support :-( +%\usepackage[urw-garamond]{mathdesign} <-- no osf support :-( +% **************************************************************************************************** diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-preamble.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-preamble.sty deleted file mode 100644 index 0e3a5d5f6f8..00000000000 --- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-preamble.sty +++ /dev/null @@ -1,345 +0,0 @@ -% ******************************************************************** -% 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 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% } % ******************************************************************** |