summaryrefslogtreecommitdiff
path: root/Master
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
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')
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/CHANGES37
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex323
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex18
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex3
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdfbin349497 -> 360773 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex150
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps108
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdfbin66471 -> 66512 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex1
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdfbin44778 -> 44179 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex2
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdfbin40624 -> 41172 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex14
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex12
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titleback.tex3
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex3
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES113
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/README2
-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
21 files changed, 817 insertions, 553 deletions
diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
index 3ee235d077d..a3a65aadc62 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES
+++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
@@ -1,3 +1,40 @@
+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.
+ Special thanks go to Ivo Pletikosi\'c for all his
+ hard work he put into this project!
+o Changes in ClassicThesis.tex:
+ - Redundant fleqn removed from documentclass options
+ (will be set by amsmath package in preamble)
+ - KOMA adjustments for documentclass:
+ fontsize=11pt,paper=14
+ - Moved language options into documentclass due to LyX
+ issues with babel
+o Changes in classicthesis.sty:
+ - Removed bcor from areaset command so that it can
+ be set via \documentclass option (BCOR=)
+ - New \ctparttext command for putting preamble text
+ after part titles (see ClassicThesis.tex for examples)
+ - \graffito command now also available as original
+ \marginpar (backward compatibility is enabled)
+ - Chapter number in margin done with \oldmarginpar
+o Changes to classicthesis-preamble.sty:
+ - Fixed autoref for subfigures (see Chapter 2 for example)
+ - Fixed issues with redefining autoref strings (for
+ different languages)
+ - Now contains all configuration information, such as
+ the title, your name etc.
+ - This package now also loads classicthesis.sty, change
+ the options classicthesis to be loaded with here
+ - Package inputenc now loaded with latin9 option
+ - Package listings now also loaded here
+ - Now safer package loading regarding options by
+ using \PassOptionsToPackage command extensively
+ - Inserted new string for \mySubtitle
+o Changes in Titlepage.tex and Titleback.tex because of new
+ string \mySubtitle
+o Changed a lot of the documentation, e.g., in Chapter01.tex
+
Changes in version 2.9 (January 2011)
o Fixed onlytext euler font for MinionPro font (in
classicthesis.sty)
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
index 2d52ddedbbc..36533f7079c 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
@@ -8,16 +8,16 @@ This bundle for \LaTeX\ has two goals:
or PhD thesis. (Though it might also be used by other types of
authors
for reports, books, etc.)
- \item Provide a classic, high quality typographic style which is
+ \item Provide a classic, high-quality typographic style that is
inspired by \cauthor{bringhurst:2002}'s ``\emph{The Elements of
Typographic Style}'' \citep{bringhurst:2002}.
- \graffito{\myTitle \myVersion}
+ \marginpar{\myTitle \myVersion}
\end{enumerate}
The bundle is configured to run with a \emph{full}
MiK\TeX\ or \TeX Live\footnote{See the file \texttt{LISTOFFILES} for
needed packages. Furthermore, \texttt{classicthesis}
-works with most other distributions and, thus, with most operating
-systems \LaTeX\ is available for.}
+works with most other distributions and, thus, with most systems
+\LaTeX\ is available for.}
installation right away and, therefore, it uses only freely available
fonts. (Minion fans can easily adjust the style to their needs.)
@@ -25,7 +25,12 @@ People interested only in the nice style and not the whole bundle can
now use the style stand-alone via the file \texttt{classicthesis.sty}.
This works now also with ``plain'' \LaTeX.
-This should enable anyone with a basic knowledge of \LaTeXe\ to
+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
+more information on the details.
+
+This should enable anyone with a basic knowledge of \LaTeXe\ or LyX 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.
@@ -40,15 +45,17 @@ If you like the style then I would appreciate a postcard:
31737 Rinteln \\
Germany
\end{center}
-The postcards I got so far are available at \url{http://postcards.miede.de}.
-
-Hopefully, this thesis template is done well enough for your needs and
-does not have too many flaws. So far, a couple of theses have been
-typeset successfully with it. If you are interested in some
+The postcards I received so far are available at:
+\begin{center}
+ \url{http://postcards.miede.de}
+\end{center}
+\marginpar{A well-balanced line width improves the legibility of
+the text. That's what typography is all about, right?}
+So far, many theses, some books, and several other publications have
+been typeset successfully with it. If you are interested in some
typographic details behind it, enjoy Robert Bringhurst's wonderful book.
+% \citep{bringhurst:2002}.
-\graffito{A well-balanced line width improves the legibility of
-the text. That's what typography is all about, right?}
\paragraph{Important Note:} Some things of this style might look
unusual at first glance, many people feel so in the beginning.
However, all things are intentionally designed to be as they are,
@@ -81,7 +88,7 @@ A very important factor for successful thesis writing is the
organization of the material. This template suggests a structure as
the following:
\begin{itemize}
- \graffito{You can use these margins for summaries of the text
+ \marginpar{You can use these margins for summaries of the text
body\dots}
\item\texttt{Chapters/} is where all the ``real'' content goes in
separate files such as \texttt{Chapter01.tex} etc.
@@ -97,98 +104,210 @@ the following:
\item\texttt{Bibliography.bib}: the Bib\TeX\ database to organize
all the references you might want to cite.
\item\texttt{classicthesis.sty}: the style definition to get this
- awesome look and feel.
+ 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.
\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-ldpkg.sty}: a central place to load all
- nifty packages that are used. The package has the following options
- available:
- \begin{itemize}
-% \item\texttt{nochapters}, which defaults to \texttt{false}.
-% Activate it if you want to use the package with a class which does
-% not have chapter divisions, \eg, an article.
- \item\texttt{backref}, which also defaults to \texttt{false}.
- Activate it if you do want to show in the bibliography on which
- page(s) each reference was cited. %See page~\pageref{app:bibliography}
- for an example of the default setting.
- \end{itemize}
+ \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.
+
+ \emph{Make your changes and adjustments here.} This means that you
+ specify here the options you want to load \texttt{classicthesis.sty}
+ with. You also adjust the title of your thesis, your name, and all
+ similar information here. Refer to \autoref{sec:custom} for more
+ information.
+
+ This had to change as of version 3.0 in order to enable an easy
+ transition from the ``basic'' style to LyX.
+
\end{itemize}
-This should get you started in no time.
+In total, this should get you started in no time.
-\section{Style Options}
+\section{Style Options}\label{sec:options}
There are a couple of options for \texttt{classicthesis.sty} that
allow for a bit of freedom concerning the layout:
-\begin{itemize}
- \graffito{\dots or your supervisor might use the margins for some
+\marginpar{\dots or your supervisor might use the margins for some
comments of her own while reading.}
- \item\texttt{drafting}: prints the date and time at the bottom of
+\begin{itemize}
+ \item General:
+ \begin{itemize}
+ \item\texttt{drafting}: prints the date and time at the bottom of
each page, so you always know which version you are dealing with.
Might come in handy not to give your Prof. that old draft.
- \item\texttt{eulerchapternumbers}: use figures from Hermann Zapf's
- Euler math font for the chapter numbers. By default, old style
- figures from the Palatino font are used.
- \item\texttt{linedheaders}: changes the look of the chapter
- headings a bit by adding a horizontal line above the chapter
- title. The chapter number will also be moved to the top of the
- page, above the chapter title.
-% \item\texttt{listsseparated}: will add extra space between table
-% and figure entries of different chapters in the list of tables or
-% figures, respectively. % Deprecated as of version 2.9.
- \item\texttt{tocaligned}: aligns the whole table of contents on
- the left side. Some people like that, some don't.
- \item\texttt{subfig}(\texttt{ure}): is passed to the \texttt{tocloft}
- package to enable compatibility with the \texttt{subfig}(\texttt{ure})
- package.
- \item\texttt{nochapters}: allows to use the look-and-feel with
+ \end{itemize}
+
+ \item Parts and Chapters:
+ \begin{itemize}
+ \item\texttt{parts}: if you use Part divisions for your document,
+ you should choose this option. (Cannot be used together with
+ \texttt{nochapters}.)
+
+ \item\texttt{nochapters}: allows to use the look-and-feel with
classes that do not use chapters, \eg, for articles. Automatically
turns off a couple of other options: \texttt{eulerchapternumbers},
- \texttt{linedheaders}, \texttt{listsseparated}, and \texttt{parts}.
- \item\texttt{beramono}: loads Bera Mono as typewriter font.
+ \texttt{linedheaders}, \texttt{listsseparated}, and \texttt{parts}.
+
+ \item\texttt{linedheaders}: changes the look of the chapter
+ headings a bit by adding a horizontal line above the chapter
+ title. The chapter number will also be moved to the top of the
+ page, above the chapter title.
+
+ \end{itemize}
+
+ \item Typography:
+ \begin{itemize}
+ \item\texttt{eulerchapternumbers}: use figures from Hermann Zapf's
+ Euler math font for the chapter numbers. By default, old style
+ figures from the Palatino font are used.
+
+ \item\texttt{beramono}: loads Bera Mono as typewriter font.
(Default setting is using the standard CM typewriter font.)
\item\texttt{eulermath}: loads the awesome Euler fonts for math.
(Palatino is used as default font.)
- \item\texttt{parts}: if you use Part divisions for your document,
- you should choose this option. It provides you with the command
- \verb|\myPart{}| which takes care of the style and the entry
- into the Table of Contents. (Cannot be used together with
- \texttt{nochapters}.)
- \item\texttt{a5paper}: adjusts the page layout according to the
- global \texttt{a5paper} option (\emph{experimental} feature).
- \item\texttt{minionpro}: sets Robert Slimbach's Minion as the
- main font of the document. The textblock size is adjusted
- accordingly.
- \item\texttt{pdfspacing}: makes use of pdftex' letter spacing
- capabilities via the \texttt{microtype} package.\footnote{Use
- \texttt{microtype}'s \texttt{DVIoutput} option to generate
- DVI with pdftex.} This fixes some serious issues regarding
- math formul\ae\ etc. (\eg, ``\ss'') in headers.
- \item\texttt{minionprospacing}: uses the internal \texttt{textssc}
- command of the \texttt{MinionPro} package for letter spacing. This
- automatically enables the \texttt{minionpro} option and overrides
- the \texttt{pdfspacing} option.
- \item\texttt{dottedtoc}: sets pagenumbers flushed right in the
- table of contents.
+
+ \item\texttt{pdfspacing}: makes use of pdftex' letter spacing
+ capabilities via the \texttt{microtype} package.\footnote{Use
+ \texttt{microtype}'s \texttt{DVIoutput} option to generate
+ DVI with pdftex.} This fixes some serious issues regarding
+ math formul\ae\ etc. (\eg, ``\ss'') in headers.
+
+ \item\texttt{minionprospacing}: uses the internal \texttt{textssc}
+ command of the \texttt{MinionPro} package for letter spacing. This
+ automatically enables the \texttt{minionpro} option and overrides
+ the \texttt{pdfspacing} option.
+
+ \end{itemize}
+
+ \item Table of Contents:
+ \begin{itemize}
+ \item\texttt{tocaligned}: aligns the whole table of contents on
+ the left side. Some people like that, some don't.
+
+ \item\texttt{dottedtoc}: sets pagenumbers flushed right in the
+ table of contents.
+
+ \item\texttt{manychapters}: if you need more than nine chapters for
+ your document, you might not be happy with the spacing between the
+ chapter number and the chapter title in the Table of Contents.
+ This option allows for additional space in this context.
+ However, it does not look as ``perfect'' if you use
+ \verb|\parts| for structuring your document.
+
+ \end{itemize}
+
+ \item Floats:
+ \begin{itemize}
\item\texttt{listings}: loads the \texttt{listings} package (if not
already done) and configures the List of Listings accordingly.
- \item\texttt{manychapters}: if you need more than nine chapters for
- your document, you might not be happy with the spacing between the
- chapter number and the chapter title in the Table of Contents.
- This option allows for additional space in this context.
- However, it does not look as ``perfect'' if you use
- \verb|\parts| for structuring your document.
+
\item\texttt{floatperchapter}: activates numbering per chapter for
- all floats such as figures, tables, and listings (if used).
-\end{itemize}
+ all floats such as figures, tables, and listings (if used).
+
+ \item\texttt{subfig}(\texttt{ure}): is passed to the \texttt{tocloft}
+ package to enable compatibility with the \texttt{subfig}(\texttt{ure})
+ package. Use this option if you want use classicthesis with the
+ \texttt{subfig} package.
+
+% \item\texttt{listsseparated}: will add extra space between table
+% and figure entries of different chapters in the list of tables or
+% figures, respectively. % Deprecated as of version 2.9.
+ \end{itemize}
+
+% \item\texttt{a5paper}: adjusts the page layout according to the
+% global \texttt{a5paper} option (\emph{experimental} feature).
+% \item\texttt{minionpro}: sets Robert Slimbach's Minion as the
+% main font of the document. The textblock size is adjusted
+% accordingly.
+
+ \end{itemize}
The best way to figure these options out is to try the different
possibilities and see, what you and your supervisor like best.
-To make things in general easier, \texttt{classicthesis-ldpkg.sty}
+In order to make things easier in general,
+\texttt{classicthesis-preamble.sty}
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
+%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}
+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}%
+}
+
+\begin{lstlisting}[frame=lt]
+% **************************************************
+% Re-usable information
+% **************************************************
+\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}
+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:
+\begin{lstlisting}[breaklines=false,frame=lt]
+\PassOptionsToPackage{backref}{classicthesis-preamble}
+\end{lstlisting}
+
+
+Many other customizations in \texttt{classicthesis-preamble.sty} are
+possible, but you should be careful making changes there, since some
+changes could cause errors.
+
+Finally, changes can be made in the file \texttt{classicthesis.sty},%
+\marginpar{Modifications in \texttt{classicthesis.sty}%
+} although this is mostly not designed for user customization. The
+main change that might be made here is the text-block size, for example,
+to get longer lines of text.
+
+
+\section{Issues}\label{sec:issues}
+This section will list some information about problems using
+\texttt{classic\-thesis} in general or using it with other packages.
+
+Beta versions of \texttt{classicthesis} can be found at the following
+Google code repository:
+\begin{center}
+ \url{http://code.google.com/p/classicthesis/}
+\end{center}
+There, you can also post serious bugs and problems you encounter.
+
+\subsection*{Compatibility with the \texttt{glossaries} Package}
+If you want to use the \texttt{glossaries} package, take care of loading it
+with the following options:
+\begin{verbatim}
+ \usepackage[style=long,nolist]{glossaries}
+\end{verbatim}
+Thanks to Sven Staehs 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
@@ -204,28 +323,6 @@ comments, suggestions, or improvements for the style or the template
in general, do not hesitate to write them on that postcard of yours.
-\section{License}
-\paragraph{GNU General Public License:} This program is free software;
-you can redistribute it and/or modify
- it under the terms of the \textsmaller{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 \emph{without any warranty}; without even the implied warranty of
- \emph{merchantability} or \emph{fitness for a particular purpose}.
- See the
- \textsmaller{GNU} General Public License for more details.
-
- You should have received a copy of the \textsmaller{GNU} General
- Public License
- along with this program; see the file \texttt{COPYING}. If not,
- write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, \textsmaller{MA} 02111-1307, \textsmaller{USA}.
-
-
\section{Beyond a Thesis}
It is easy to use the layout of \texttt{classicthesis.sty} without the
framework of this bundle. To make it even easier, this section offers
@@ -235,7 +332,7 @@ The \LaTeX -sources of these examples can be found in the folder
with the name \texttt{Examples}. They have been tested with
\texttt{latex} and \texttt{pdflatex} and are easy to compile. To
assure you even a bit more, PDFs built from the sources can also
-be found the folder.
+be found in the folder.
%(It might be necessary to adjust the path to
%\texttt{classicthesis.sty} and \texttt{Bibliography.bib} within the
%examples.)
@@ -249,6 +346,28 @@ be found the folder.
\lstinputlisting[caption=A Curriculum Vit\ae]%
{Examples/classicthesis-cv.tex}
+
+\section{License}
+\paragraph{GNU General Public License:} This program is free software;
+you can redistribute it and/or modify
+ it under the terms of the \textsmaller{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 \emph{without any warranty}; without even the implied warranty of
+ \emph{merchantability} or \emph{fitness for a particular purpose}.
+ See the
+ \textsmaller{GNU} General Public License for more details.
+
+ You should have received a copy of the \textsmaller{GNU} General
+ Public License
+ along with this program; see the file \texttt{COPYING}. If not,
+ write to
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, \textsmaller{MA} 02111-1307, \textsmaller{USA}.
+
%*****************************************
%*****************************************
%*****************************************
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex
index 1f22c818228..b2e4867e85d 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex
@@ -112,15 +112,15 @@ synonymo con ma, parola extrahite greco-latin ma web. Veni signo
rapide nos da.
%Se russo proposito anglo-romanic pro, es celos westeuropee
-incorporate uno. Il web unic periodicos. Que usate scientia ma, sed
-tres unidirectional al, asia personas duo de. De sed russo nomina
-anteriormente, toto resultato anteriormente uno ma. Non se signo
-romanic technologia, un medio millennios con.
-%
+%incorporate uno. Il web unic periodicos. Que usate scientia ma, sed
+%tres unidirectional al, asia personas duo de. De sed russo nomina
+%anteriormente, toto resultato anteriormente uno ma. Non se signo
+%romanic technologia, un medio millennios con.
+
%Major facto sia es, con o titulo maximo international. Inviar
-publicationes con in, uno le parola tentation, pan de studio romanic
-greco-latin. Tu duo titulo debitas latente, que vista programma ma.
-Non tote tres germano se, lo parola periodicos non.
+%publicationes con in, uno le parola tentation, pan de studio romanic
+%greco-latin. Tu duo titulo debitas latente, que vista programma ma.
+%Non tote tres germano se, lo parola periodicos non.
\begin{table}
\myfloatalign
@@ -147,7 +147,7 @@ facite linguistic registrate se nos. Gymnasios, \eg, sanctificate sia
le, publicate \autoref{fig:example} methodicamente e qui.
Lo sed apprende instruite. Que altere responder su, pan ma, \ie, signo
-studio. Figure~\ref{fig:example-b} Instruite preparation le duo, asia
+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.
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex
index fede5157cff..73cceecd708 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex
@@ -26,8 +26,7 @@ section heads. Consider the \texttt{pdfspacing} option.}
\kappa =\frac{\xi}{E_{\mathrm{max}}} %\mathbb{ZNR}
\]
$E_{\mathrm{max}}$ is the maximum transferable energy in a single
-collision with
-an atomic electron.
+collision with an atomic electron.
\[
E_{\mathrm{max}} =\frac{2 m_{\mathrm{e}} \beta^2\gamma^2 }{1 +
2\gamma m_{\mathrm{e}}/m_{\mathrm{x}} + \left ( m_{\mathrm{e}}
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
index 07f0b12db8e..198ee05ed40 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
index a5911defbbd..f35c9fa8000 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
@@ -29,60 +29,25 @@
% Note:
% * You must not use "u etc. in strings/commands that will be spaced out (use \"u or real umlauts instead)
% * New enumeration (small caps): \begin{aenumerate} \end{aenumerate}
-% * For margin notes: \graffito{}
+% * For margin notes: \marginpar or \graffito{}
% * Do not use bold fonts in this style, it is designed around them
% * Use tables as in the examples
-% * See classicthesis-ldpkg.sty for useful commands
+% * See classicthesis-preamble.sty for useful commands
% **************************************************************************************************************
% To Do:
% * [high] Check this out: http://www.golatex.de/koma-script-warnung-in-verbindung-mit-listings-package-t2058.html
% * [medium] mathbb in section-titles/chapter-titles => disappears somehow in headlines!!!
-% * [low] Calculate text block size for Libertine font
-% * [low] Think about processing a4paper, a5paper, 10pt, 11pt, 12pt etc. options for typearea layout
-% (store values in internal variables and handle by \AtEndOfPackage{\areaset...})
% **************************************************************************************************************
-\documentclass[ twoside,openright,titlepage,fleqn,numbers=noenddot,headinclude,%1headlines,% letterpaper a4paper
- 11pt,a4paper,BCOR5mm,footinclude=true,cleardoublepage=empty,abstractoff % <--- obsolete, remove (todo)
+\documentclass[ twoside,openright,titlepage,numbers=noenddot,headinclude,%1headlines,% letterpaper a4paper
+ footinclude=true,cleardoublepage=empty,abstractoff, % <--- obsolete, remove (todo)
+ BCOR=5mm,paper=a4,fontsize=11pt,%11pt,a4paper,%
+ ngerman,american,%
]{scrreprt}
-% ********************************************************************
-% Development Stuff
-% ********************************************************************
-\listfiles
-%\usepackage[l2tabu, orthodox, abort]{nag}
-%\usepackage[warning, all]{onlyamsmath}
-% ********************************************************************
-% Re-usable information
-% ********************************************************************
-\newcommand{\myTitle}{A Classic Thesis Style\xspace}
-\newcommand{\myDegree}{An Homage to The Elements of Typographic Style\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}{January 2011\xspace}
-\newcommand{\myVersion}{Version 2.9\xspace}
-%*******************************************************
-% Packages with options that might require adjustments
-%*******************************************************
-\usepackage[latin1]{inputenc}
-\usepackage[ngerman,american]{babel}
-\usepackage[square,numbers]{natbib}
-\usepackage[fleqn]{amsmath} % math environments and more by the AMS
-%\usepackage{varioref} % load BEFORE classicthesis-ldpkg
-%*******************************************************
-\usepackage{classicthesis-ldpkg} % [backref]
+%********************************************************************
+% Note: Make all your adjustments in here
%*******************************************************
-% Options for classicthesis.sty:
-% tocaligned eulerchapternumbers drafting linedheaders listings
-% subfig nochapters beramono eulermath parts minionpro pdfspacing
-% dottedtoc minionprospacing manychapters floatperchapter
-\usepackage[eulerchapternumbers,drafting,listings,%linedheaders,%pdfspacing,%listings,
- subfig,beramono,eulermath,parts,dottedtoc,floatperchapter]{classicthesis}%
+\usepackage{classicthesis-preamble} % [backref]
%*******************************************************
% Some font experiments
@@ -98,91 +63,15 @@
% Fine-tuning for the text area
%*******************************************************
%\linespread{1.05} % a bit more for Palatino
-%\areaset[5mm]{312pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip
+%\areaset[current]{312pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip
%\setlength{\marginparwidth}{7em}%
%\setlength{\marginparsep}{2em}%
-%*******************************************************
-% hack to use citations in float environments
-% will be fixed with caption package version 3.2
-%*******************************************************
-\usepackage{makerobust}
-\makeatletter
-\MakeRobustCommand\caption@xref
-\makeatother
-
-%*******************************************************
-%\usepackage[section,below]{placeins} <--- not everybody wants this
-%\usepackage[all]{hypcap} <--- does not work with MiKTeX 2.6
-% ********************************************************************
-% 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~}
-% ********************************************************************
-% 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
-% ********************************************************************
-% Captions look and feel
-%*******************************************************
-\captionsetup{format=hang,font=small}
-% ********************************************************************
-% 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
-}
-
-% ********************************************************************
-% Where to look for graphics
-%*******************************************************
-%\graphicspath{{gfx/}{misc/}} % considered harmful according to l2tabu
-% ********************************************************************
-% Hyperreferences
-%*******************************************************
-\hypersetup{%
- 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}%
-}
-
%********************************************************************
% Hyphenation
%*******************************************************
%\hyphenation{put special hyphenation here}
+
% ********************************************************************
% GO!GO!GO! MOVE IT!
%*******************************************************
@@ -210,11 +99,19 @@
% Mainmatter
%*******************************************************
\pagenumbering{arabic}
-\setcounter{page}{90}
+%\setcounter{page}{90}
% use \cleardoublepage here to avoid problems with pdfbookmark
-\cleardoublepage\myPart{Some Kind of Manual}
+\cleardoublepage
+\part{Some Kind of Manual}
\include{Chapters/Chapter01}
-\cleardoublepage\part{The Showcase}
+\cleardoublepage
+\ctparttext{You can put some informational part preamble text here.
+Illo principalmente su nos. Non message \emph{occidental} angloromanic
+da. Debitas effortio simplificate sia se, auxiliar summarios da que,
+se avantiate publicationes via. Pan in terra summarios, capital
+interlingua se que. Al via multo esser specimen, campo responder que
+da. Le usate medical addresses pro, europa origine sanctificate nos se.}
+\part{The Showcase}
\include{Chapters/Chapter02}
%\addtocontents{toc}{\protect\clearpage} % <--- just debug stuff, ignore
\include{Chapters/Chapter03}
@@ -223,7 +120,8 @@
% Backmatter
%*******************************************************
\appendix
-\cleardoublepage\part{Appendix}
+\cleardoublepage
+\part{Appendix}
\include{Chapters/Chapter0A}
%********************************************************************
% Other Stuff in the Back
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
index 2b1b22f25f6..6527a06db32 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
@@ -5,7 +5,7 @@ Version=2
[SessionInfo]
ActiveTab=0
FrameCount=5
-ActiveFrame=1
+ActiveFrame=2
[Frame0]
Columns=1
@@ -16,83 +16,83 @@ MinPos.x=-1
MinPos.y=-1
MaxPos.x=-8
MaxPos.y=-30
-NormalPos.left=88
-NormalPos.top=88
-NormalPos.right=951
-NormalPos.bottom=328
+NormalPos.left=22
+NormalPos.top=22
+NormalPos.right=1184
+NormalPos.bottom=262
Class=CLatexEdit
-Document=FrontBackmatter\Contents.tex
+Document=classicthesis-preamble.sty
[Frame0_Row0]
cyCur=181
cyMin=10
[Frame0_Col0]
-cxCur=826
+cxCur=1125
cxMin=10
[Frame0_View0,0]
-Cursor.row=65
-Cursor.column=4
-TopSubLine=55
+Cursor.row=129
+Cursor.column=38
+TopSubLine=119
[Frame1]
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=44
-NormalPos.top=44
-NormalPos.right=938
-NormalPos.bottom=342
+NormalPos.left=66
+NormalPos.top=66
+NormalPos.right=1228
+NormalPos.bottom=333
Class=CLatexEdit
-Document=ClassicThesis.tex
+Document=CHANGES
[Frame1_Row0]
-cyCur=443
+cyCur=208
cyMin=10
[Frame1_Col0]
-cxCur=1335
+cxCur=1125
cxMin=10
[Frame1_View0,0]
-Cursor.row=129
+Cursor.row=0
Cursor.column=0
-TopSubLine=119
+TopSubLine=0
[Frame2]
Columns=1
Rows=1
-Flags=0
-ShowCmd=1
+Flags=2
+ShowCmd=3
MinPos.x=-1
MinPos.y=-1
-MaxPos.x=-4
-MaxPos.y=-23
-NormalPos.left=100
-NormalPos.top=100
-NormalPos.right=1306
-NormalPos.bottom=414
+MaxPos.x=-8
+MaxPos.y=-30
+NormalPos.left=88
+NormalPos.top=88
+NormalPos.right=365
+NormalPos.bottom=324
Class=CLatexEdit
-Document=CHANGES
+Document=classicthesis.sty
[Frame2_Row0]
-cyCur=255
+cyCur=307
cyMin=10
[Frame2_Col0]
-cxCur=1169
+cxCur=1337
cxMin=10
[Frame2_View0,0]
-Cursor.row=12
-Cursor.column=29
-TopSubLine=8
+Cursor.row=231
+Cursor.column=45
+TopSubLine=214
[Frame3]
Columns=1
@@ -101,27 +101,27 @@ Flags=0
ShowCmd=1
MinPos.x=-1
MinPos.y=-1
-MaxPos.x=-4
-MaxPos.y=-23
-NormalPos.left=125
-NormalPos.top=125
-NormalPos.right=1331
-NormalPos.bottom=439
+MaxPos.x=-8
+MaxPos.y=-30
+NormalPos.left=44
+NormalPos.top=44
+NormalPos.right=1206
+NormalPos.bottom=311
Class=CLatexEdit
-Document=classicthesis-ldpkg.sty
+Document=ClassicThesis.tex
[Frame3_Row0]
-cyCur=255
+cyCur=208
cyMin=10
[Frame3_Col0]
-cxCur=1169
+cxCur=1125
cxMin=10
[Frame3_View0,0]
Cursor.row=0
Cursor.column=0
-TopSubLine=105
+TopSubLine=0
[Frame4]
Columns=1
@@ -132,23 +132,23 @@ MinPos.x=-1
MinPos.y=-1
MaxPos.x=-8
MaxPos.y=-30
-NormalPos.left=75
-NormalPos.top=75
-NormalPos.right=1281
-NormalPos.bottom=389
+NormalPos.left=100
+NormalPos.top=100
+NormalPos.right=1240
+NormalPos.bottom=414
Class=CLatexEdit
-Document=classicthesis.sty
+Document=Chapters\Chapter02.tex
[Frame4_Row0]
cyCur=255
cyMin=10
[Frame4_Col0]
-cxCur=1169
+cxCur=1103
cxMin=10
[Frame4_View0,0]
-Cursor.row=61
-Cursor.column=23
-TopSubLine=50
+Cursor.row=0
+Cursor.column=0
+TopSubLine=0
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
index 44c7b0fc3fb..61a37230f2e 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
Binary files differ
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 4318336a5d3..ced5cd52eee 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex
@@ -2,7 +2,6 @@
\documentclass[10pt,a4paper]{scrartcl} % KOMA-Script article
\usepackage{lipsum}
\usepackage{url}
-%\usepackage{../classicthesis-ldpkg}
\usepackage[nochapters]{../classicthesis} % nochapters
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
index 834208b4d0c..0f1f52f5c64 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
Binary files differ
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 6af44c726b7..d9e7a36ee2f 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
@@ -1,5 +1,5 @@
% book example for classicthesis.sty
-\documentclass[12pt,a5paper,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book
+\documentclass[11pt,a5paper,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book
\usepackage[T1]{fontenc}
\usepackage{lipsum}
\usepackage[linedheaders,parts]{../classicthesis} % ,manychapters
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
index 78de54a9eed..13c68f491bb 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex
index 53abe660788..84d6284f376 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex
@@ -2,7 +2,15 @@
\documentclass[10pt,a4paper]{scrartcl}
\usepackage[LabelsAligned]{currvita} % nice cv style
\usepackage{url}
+\usepackage[ngerman]{babel}
\usepackage[nochapters]{../classicthesis}
+% Some font experiments
+%\usepackage[osf]{libertine}
+%\usepackage{hfoldsty}
+%\usepackage[math]{iwona} %[light,condensed,math]
+%\renewcommand{\sfdefault}{iwona}
+%\usepackage{lmodern} % <-- no osf support :-(
+%\usepackage[urw-garamond]{mathdesign} %<-- no osf support :-(
\renewcommand*{\cvheadingfont}{\LARGE\color{Maroon}}
\renewcommand*{\cvlistheadingfont}{\large}
@@ -12,8 +20,8 @@
\begin{cv}{\spacedallcaps{Curriculum Vit\ae}}
%\pdfbookmark[1]{Pers\"onliche Daten}{PersDat}
\begin{cvlist}{\spacedlowsmallcaps{Pers\"onliche Daten}}\label{PersDat}
- \item Andr\'e Miede
- \item Geboren am \dots \\
+ \item Dr.-Ing.~Andr\'e Miede
+ \item Geboren am \dots\ \texttt{(-;} \\
Europ\"aer, Deutsche Staatsb\"urgerschaft
\item \url{http://www.miede.de} \\
\url{https://www.xing.com/profile/Andre_Miede}
@@ -21,7 +29,7 @@
%\pdfbookmark[1]{Irgendwas}{irgendwas}
\begin{cvlist}{\spacedlowsmallcaps{Irgendwas}}\label{irgendwas}
- \item \dots
+ \item \dots
\end{cvlist}
\end{cv}
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
index 850cb84094a..bc72455d3de 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
@@ -30,7 +30,17 @@ Pantieri and Enrico Gregorio\footnote{Members of GuIT (Gruppo
Italiano Utilizzatori di \TeX\ e \LaTeX )}, J\"org Sommer,
Joachim K\"ostler, Daniel Gottschlag, Denis Aydin, Paride
Legovini, Steffen Prochnow, Nicolas Repp, Hinrich Harms,
-and the whole \LaTeX-community for support, ideas and some great software.
+ Roland Winkler,
+ and the whole \LaTeX-community for support, ideas and
+ some great software.
+
+\bigskip
+
+\noindent\emph{Regarding LyX}: The LyX 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.
+
\endgroup
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titleback.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titleback.tex
index 307a5783894..9a1ac6945c1 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titleback.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titleback.tex
@@ -4,7 +4,8 @@
\vfill
-\noindent\myName: \textit{\myTitle,} \myDegree, \textcopyright\ \myTime
+\noindent\myName: \textit{\myTitle,} \mySubtitle, %\myDegree,
+\textcopyright\ \myTime
%\bigskip
%
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
index 92bdc4cd165..c1767a836ee 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
@@ -21,7 +21,8 @@
\includegraphics[width=6cm]{gfx/TFZsuperellipse_bw} \\ \medskip
- \myDegree \\ \medskip
+ \mySubtitle \\ \medskip
+ %\myDegree \\
%\myDepartment \\
%\myFaculty \\
%\myUni \\ \bigskip
diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
index d5d266d0cea..51916218223 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
+++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
@@ -1,32 +1,31 @@
LIST OF FILES FOR ClassicThesis.tex
*File List*
-scrreprt.cls 2010/09/17 v3.07 KOMA-Script document class (report)
-scrkbase.sty 2010/09/17 v3.07 KOMA-Script package (KOMA-Script-dependent bas
+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 2010/09/17 v3.07 KOMA-Script package (KOMA-Script-independent b
+ scrbase.sty 2011/04/02 v3.09 KOMA-Script package (KOMA-Script-independent b
asics and keyval usage)
keyval.sty 1999/03/16 v1.13 key=value parser (DPC)
-scrlfile.sty 2009/03/25 v3.03 KOMA-Script package (loading files)
-tocbasic.sty 2010/09/14 v3.06a KOMA-Script package (handling toc-files)
- fleqn.clo 1998/08/17 v1.1c Standard LaTeX option (flush left equations)
-scrsize11pt.clo 2010/09/17 v3.07 KOMA-Script font size class option (11pt)
-typearea.sty 2010/09/17 v3.07 KOMA-Script package (type area)
+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
+ ifthen.sty 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
inputenc.sty 2008/03/30 v1.1d Input encoding file
- latin1.def 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
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
- natbib.sty 2009/11/07 8.31a (PWD, AO)
+ natbib.sty 2010/09/13 8.31b (PWD, AO)
amsmath.sty 2000/07/18 v2.13 AMS math features
amstext.sty 2000/06/29 v2.01
amsgen.sty 1999/11/30 v2.0
amsbsy.sty 1999/11/29 v1.2d
amsopn.sty 1999/12/14 v2.01 operator names
-classicthesis-ldpkg.sty 2011/01/01 v2.9 Package Loader for Classic Thesis St
-yle
- ifthen.sty 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
fontenc.sty
t1enc.def 2005/09/27 v1.99g Standard LaTeX file
textcomp.sty 2005/09/27 v1.99g Standard LaTeX package
@@ -41,44 +40,59 @@ fixltx2e.sty 2006/09/13 v1.1m fixes to LaTeX
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)
+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 2010/09/17 v6.81q Hypertext links for LaTeX
- ltxcmds.sty 2010/04/26 v1.7 LaTeX kernel commands for general use (HO)
+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)
infwarerr.sty 2010/04/08 v1.3 Providing info/warning/message (HO)
-kvsetkeys.sty 2010/03/01 v1.9 Key value parser (HO)
-etexcmds.sty 2010/01/28 v1.3 Prefix for e-TeX command names (HO)
-pdfescape.sty 2010/03/01 v1.9 Provides hex, PDF name and string conversions
-(HO)
-pdftexcmds.sty 2010/04/01 v0.9 Utility functions of pdfTeX for LuaTeX (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)
- ifpdf.sty 2010/01/28 v2.1 Provides the ifpdf switch (HO)
ifvtex.sty 2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)
- ifxetex.sty 2010/09/12 v0.6 Provides ifxetex conditional
- hycolor.sty 2009/12/12 v1.6 Color options of hyperref/bookmark (HO)
-xcolor-patch.sty 2009/12/12 xcolor patch
-letltxmacro.sty 2008/06/24 v1.3 Let assignment for LaTeX macros (HO)
-kvoptions.sty 2010/02/22 v3.7 Keyval support for LaTeX options (HO)
- pd1enc.def 2010/09/17 v6.81q Hyperref: PDFDocEncoding definition (HO)
intcalc.sty 2007/09/27 v1.1 Expandable integer calculations (HO)
+ ifpdf.sty 2011/01/30 v2.3 Provides the ifpdf 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)
+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)
+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)
+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)
hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive
url.sty 2006/04/12 ver 3.3 Verb mode for urls, etc.
- bitset.sty 2007/09/28 v1.0 Data type bit set (HO)
-bigintcalc.sty 2007/11/11 v1.1 Expandable big integer calculations (HO)
-atbegshi.sty 2010/03/25 v1.12 At begin shipout hook (HO)
- hpdftex.def 2010/09/17 v6.81q Hyperref driver for pdfTeX
-atveryend.sty 2010/03/24 v1.5 Hooks at very end of document (HO)
-rerunfilecheck.sty 2010/03/16 v1.6 Rerun checks for auxiliary files (HO)
-uniquecounter.sty 2009/12/18 v1.1 Provides unlimited unique counter (HO)
+ hpdftex.def 2011/04/17 v6.82g 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 2010/09/14 v0.05b Graphics/color for pdfTeX
-classicthesis.sty 2011/01/01 v2.9 Typographic Style for a classic-looking th
-esis
-listings.sty 2007/02/22 1.4 (Carsten Heinz)
+ 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)
-listings.cfg 2007/02/22 1.4 listings configuration
+classicthesis.sty 2011/06/01 v3.0 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
dvipsnam.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
@@ -92,26 +106,15 @@ 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
- tocloft.sty 2009/09/04 v2.3d parameterised ToC, etc., typesetting
- scrtime.sty 2010/09/17 v3.07 KOMA-Script package (time of LaTeX run)
+ 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)
prelim2e.sty 2009/05/29 v1.3 prelim2e Package (MS)
everyshi.sty 2001/05/15 v3.00 EveryShipout Package (MS)
-makerobust.sty 2006/03/18 v1.0 Making a macro robust (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)
+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
-refcount.sty 2008/08/11 v3.1 Data extraction from references (HO)
-gettitlestring.sty 2009/12/18 v1.3 Cleanup title references (HO)
+gettitlestring.sty 2010/12/03 v1.4 Cleanup title references (HO)
ClassicThesis.out
ClassicThesis.out
supp-pdf.tex
@@ -124,6 +127,7 @@ FrontBackmatter/Titleback.tex
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)
@@ -134,7 +138,6 @@ FrontBackmatter/Acknowledgments.tex
FrontBackmatter/Contents.tex
t1cmss.fd 1999/05/25 v2.5h Standard LaTeX font definitions
Chapters/Chapter01.tex
- t1fvm.fd 2004/09/07 scalable font definitions for T1/fvm.
Examples/classicthesis-article.tex
Examples/classicthesis-book.tex
Examples/classicthesis-cv.tex
diff --git a/Master/texmf-dist/doc/latex/classicthesis/README b/Master/texmf-dist/doc/latex/classicthesis/README
index da5d92f00f3..2826476ba2d 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/README
+++ b/Master/texmf-dist/doc/latex/classicthesis/README
@@ -1,6 +1,6 @@
A Classic Thesis Style
An Homage to The Elements of Typographic Style
-Copyright (C) 2010 Andr\'e Miede http://www.miede.de
+Copyright (C) 2011 Andr\'e Miede http://www.miede.de
Please see the file ClassicThesis.pdf for more information.
Your comments are highly appreciated.
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