classicthesis update (5jun07)

git-svn-id: svn://tug.org/texlive/trunk@4494 c570f23f-e606-0410-a88d-b1316a301751

21 files changed, 633 insertions, 234 deletions

diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
index 4e4f2c34728..f2e0f954c16 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES
+++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
@@ -1,3 +1,50 @@
+Changes in version 2.0 (June 2007)
+o Better setup of the list of acronyms 
+  (in classicthesis-ldpkg.sty)
+o Using KOMA option footinclude in ClassicThesis.tex
+  (text block sizes are adjusted to this)
+o New option for classicthesis.sty: minionpro
+o New option for classicthesis.sty: minionprospacing
+o New option for classicthesis.sty: pdfspacing
+  (Refer to the manual for more information.)
+
+Changes in version 1.7 (May 2007, cumulative release)
+o Removed \graphicspath from ClassicThesis.tex
+o Use the nag package to ensure "compliance"
+o Switched from ccaption to caption in classicthesis-ldpkg.sty
+  (setup via \captionsetup in ClassicThesis.tex)
+o Switched from subfigure to subfig in classicthesis-ldpkg.sty
+o Removed obsolete "usenames" option from loading xcolor package
+o Noticed problem with \thelstlisting on some installations
+  (commented out in classicthesis-ldpkg.sty)
+o Noticed problem with some hyperlinks on some installations
+  (could not determine cause)
+
+Changes in version 1.6 (April 2007, not released separately)
+o Included greetings to Lorenzo Pantieri for many very useful
+  suggestions
+o Introduced new commands in classicthesis-ldpkg.sty to make
+  adaptation of backrefs to different languages easier
+   - \backrefnotcitedstring (ref is not cited)
+   - \backrefcitedsinglestring (ref is cited on one page)
+   - \backrefcitedmultistring (ref is cited on multiple pages)
+o Removed ellipsis package from classicthesis-ldpkg.sty due to 
+  some undesired results for some users
+o Removed the following packages from classicthesis-ldpkg.sty as 
+  these seem to require changes to their options from most users:
+  inputenc, babel, natbib (now in ClassicThesis.tex)
+o New option for classicthesis-ldpkg.sty: nochapters
+  Use the package with classes that do not have chapter divisions 
+
+Changes in version 1.5 (April 2007, not released separately)
+o Fixed some bugs to use classicthesis.sty for article layout
+o Inserted some info/warnings when using nochapter/parts
+o Extended the manual: examples for using classicthesis.sty for
+  other projects than a thesis (source available in folder
+  "Examples")
+o Some minor adjustments in classicthesis-ldpkg.sty
+o Fixed some spelling mistakes
+
 Changes in version 1.4.2 (March 2007)
 o Renamed loadpackages.sty to classicthesis-ldpkg.sty due to
   TeX Live package tree issues
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
index 09968c67435..a3c2fce5abe 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
@@ -11,13 +11,13 @@ This bundle for \LaTeX\ has two goals:
     \item Provide a classic, high quality typographic style which is
     inspired by \cauthor{bringhurst:2002}'s ``\emph{The Elements of
     Typographic Style}'' \citep{bringhurst:2002}.
-    \graffito{\myTitle Version 1.4.2}
+    \graffito{\myTitle Version 2.0}
 \end{enumerate}
 The bundle is configured to run with a \emph{full} 
-MiK\TeX\footnote{MiK\TeX\ 2.4 or above. Furthermore, 
-\texttt{classicthesis} 
-works with most other \LaTeX\ distributions and, thus, with most 
-operating systems \LaTeX\ is available for. Just give it a try.} 
+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.} 
 installation right away and, therefore, it uses only freely available 
 fonts. (Minion fans can easily adjust the style to their needs.)
 
@@ -61,7 +61,8 @@ especially these:
     information to be on a page. And, no: the lines are not too short.
     \item The tables intentionally do not use vertical or double
     rules. See the documentation for the \texttt{booktabs} package for
-    a nice discussion of this topic.
+    a nice discussion of this topic.\footnote{To be found online at \\
+    \url{http://www.ctan.org/tex-archive/macros/latex/contrib/booktabs/}.}
     \item And last but not least, to provide the reader with a way
     easier access to page numbers in the table of contents, the page
     numbers are right behind the titles. Yes, they are \emph{not}
@@ -84,6 +85,8 @@ the following:
     body\dots}
     \item\texttt{Chapters/} is where all the ``real'' content goes in
     separate files such as \texttt{Chapter01.tex} etc.
+ %  \item\texttt{Examples/} is where you store all listings and other
+ %  examples you want to use for your text.
     \item\texttt{FrontBackMatter/} is where all the stuff goes that
     surrounds the ``real'' content, such as the acknowledgments,
     dedication, etc.
@@ -94,13 +97,16 @@ 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. 
     \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{loadpackages.sty}: a central place to load all nifty
-    packages that are used.
+    \item\texttt{classicthesis-ldpkg.sty}: a central place to load all 
+    nifty packages that are used. The package has only one option 
+    available, \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.
 \end{itemize}
 This should get you started in no time.
 
@@ -127,9 +133,12 @@ allow for a bit of freedom concerning the layout:
     \item\texttt{tocaligned}: aligns the whole table of contents on
     the left side. Some people like that, some don't.
     \item\texttt{subfigure}: is passed to the \texttt{tocloft} package
-    to enable compatibility with the \texttt{subfigure} package.
+    to enable compatibility with the \texttt{subfig}(\texttt{ure}) 
+    package.
     \item\texttt{nochapters}: allows to use the look-and-feel with 
-    classes that do not use chapters.
+    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. 
     (Default setting is using no typewriter font.)
     \item\texttt{eulermath}: loads the awesome Euler fonts for math. 
@@ -137,15 +146,28 @@ allow for a bit of freedom concerning the layout:
     \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.
+    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, ``ß'') 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}
 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{loadpackages.sty} contains
-some useful commands that might help you.
+To make things in general easier, \texttt{classicthesis-ldpkg.sty} 
+contains some useful commands that might help you.
 
 
 \section{Future Work}
@@ -162,7 +184,7 @@ template, as I do not have time for an answer. But if you have
 comments, suggestions, or improvements for the style or the template
 in general, do not hesitate to write them on that postcard of yours.
 
-%\longpage
+
 \section{License}
 \paragraph{GNU General Public License:} This program is free software;
 you can redistribute it and/or modify
@@ -184,6 +206,30 @@ you can redistribute it and/or modify
  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 
+some plug-and-play-examples.
+
+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. 
+%(It might be necessary to adjust the path to 
+%\texttt{classicthesis.sty} and \texttt{Bibliography.bib} within the 
+%examples.)
+
+\lstinputlisting[title=An Article]%
+    {Examples/classicthesis-article.tex}
+    
+\lstinputlisting[title=A Book]%
+    {Examples/classicthesis-book.tex}
+
+\lstinputlisting[title=A Curriculum Vit\ae]%
+    {Examples/classicthesis-cv.tex}
+
 %*****************************************
 %*****************************************
 %*****************************************
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex
index d126c9f5d92..23bbe7464cc 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex
@@ -16,7 +16,7 @@ se.
 Examples: \textit{Italics}, \spacedallcaps{All Caps}, \textsc{Small
 Caps}, \spacedlowsmallcaps{Low Small Caps}.
 
-\subsection{Test For a Subsection}
+\subsection{Test for a Subsection}
 \graffito{Note: The content of this chapter is just some dummy text.
 It is not a real language.}
 Lorem ipsum at nusquam appellantur his, ut eos erant homero
@@ -43,14 +43,14 @@ vulputate ex. Cu usu mucius iisque voluptua. Sit maiorum propriae at,
 ea cum \ac{API} primis intellegat. Hinc cotidieque reprehendunt eu
 nec. Autem timeam deleniti usu id, in nec nibh altera.
 
-Equidem detraxit cu nam, vix eu delenit periculis. Eos ut vero
-constituto, no vidit propriae complectitur sea. Diceret nonummy in
-has, no qui eligendi recteque consetetur. Mel eu dictas suscipiantur,
-et sed placerat oporteat. At ipsum electram mei, ad aeque atomorum
-mea.
-
-Ei solet nemore consectetuer nam. Ad eam porro impetus, te choro omnes
-evertitur mel. Molestie conclusionemque vel at.
+%Equidem detraxit cu nam, vix eu delenit periculis. Eos ut vero
+%constituto, no vidit propriae complectitur sea. Diceret nonummy in
+%has, no qui eligendi recteque consetetur. Mel eu dictas suscipiantur,
+%et sed placerat oporteat. At ipsum electram mei, ad aeque atomorum
+%mea.
+%
+%Ei solet nemore consectetuer nam. Ad eam porro impetus, te choro omnes
+%evertitur mel. Molestie conclusionemque vel at.
 
 
 \section{Another Section in This Chapter}
@@ -148,20 +148,22 @@ 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. Instruite preparation le duo, asia altere tentation web su.
-Via unic facto rapide de, iste questiones methodicamente o uno, nos al.
+studio. Figure~\ref{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
-        \subfigure[Asia personas duo.]
-        {\includegraphics[width=.45\linewidth]{example_1}} \quad
-        \subfigure[Pan ma signo.]
-        {\includegraphics[width=.45\linewidth]{example_2}} \\
-        \subfigure[Methodicamente o uno.]
-        {\includegraphics[width=.45\linewidth]{example_3}} \quad
-        \subfigure[Titulo debitas.]
-        {\includegraphics[width=.45\linewidth]{example_4}}
+        \subfloat[Asia personas duo.]
+        {\includegraphics[width=.45\linewidth]{gfx/example_1}} \quad
+        \subfloat[Pan ma signo.]
+        {\label{fig:example-b}%
+         \includegraphics[width=.45\linewidth]{gfx/example_2}} \\
+        \subfloat[Methodicamente o uno.]
+        {\includegraphics[width=.45\linewidth]{gfx/example_3}} \quad
+        \subfloat[Titulo debitas.]
+        {\includegraphics[width=.45\linewidth]{gfx/example_4}}
         \caption[Tu duo titulo debitas latente]{Tu duo titulo debitas
         latente.}\label{fig:example}
 \end{figure}
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex
index e960dafbc64..2b1eb46c6a7 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex
@@ -21,7 +21,7 @@ characterised by the significance parameter $\kappa$, which is
 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.}
+section heads. Consider the \texttt{pdfspacing} option.}
 \[
 \kappa =\frac{\xi}{E_{\mathrm{max}}}
 \]
@@ -96,12 +96,7 @@ alternative definition
 \[
   t[u_1,\dots,u_n] = t\bigl[t[u_1,u_2],\dots,t[u_{n-1},u_n]\bigr]
 \]
-gives the same result.  Indeed, we have
-\[
-  t[u_1,\dots,u_n] = \sum_{k=1}^n{{n-1} \choose {k-1}} (1-t)^{n-k}
-  t^{k-1}u_k,
-\]
-a Bernstein polynomial of order $n-1$.
+gives the same result.  
 
 %*****************************************
 %*****************************************
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
index 19a7186ff8a..a91f5c088d6 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 dd7d664f269..70e54c03ad2 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
@@ -33,23 +33,32 @@
 %    * For margin notes: \graffito{}
 %    * Do not use bold fonts in this style, it is designed around them
 %    * Use tables as in the examples
-%    * There is a problem with the case of math text in part-,
-%      chapter-, and section titles and I have no clue on how to fix this
-%      (either the case or the spacing breaks). So far, I chose the case. :-(
 %    * See classicthesis-ldpkg.sty for useful commands
 % **************************************************************************************************************
 % To Do:
 %	 * remove obsolete KOMA options and use \KOMAoptions instead
 %    * support a List of Listings that looks like the other lists
 % **************************************************************************************************************
-\documentclass[ 10pt,a4paper,twoside,openright,titlepage,fleqn,%1headlines,% a4paper letterpaper
-                cleardoubleempty,abstractoff,pointlessnumbers,%
-                headinclude,footexclude,BCOR5mm,%
+\documentclass[ twoside,openright,titlepage,fleqn,%1headlines,% 
+                pointlessnumbers,headinclude,BCOR5mm,%
+                10pt,a4paper,footinclude,cleardoubleempty,abstractoff % <--- obsolete, remove (todo)
                 ]{scrreprt}
 % ********************************************************************
-% List of Files (written to .log file)
+% KOMA-Script setup (todo)
 % ********************************************************************
-\listfiles
+%\KOMAoptions{%
+%    paper=a4,%
+%    fontsize=10pt,%
+%    cleardoublepage=empty,%
+%    footinclude=true,%
+%    abstract=false%
+%}
+% ********************************************************************
+% Development Stuff
+% ********************************************************************
+%\listfiles
+%\usepackage[l2tabu, orthodox, abort]{nag}
+%\usepackage[warning, all]{onlyamsmath}
 % ********************************************************************
 % Re-usable information
 % ********************************************************************
@@ -63,26 +72,43 @@
 \newcommand{\myDepartment}{Put data here\xspace}
 \newcommand{\myUni}{\protect{Put data here}\xspace}
 \newcommand{\myLocation}{Hamburg\xspace}
-\newcommand{\myTime}{March 2007\xspace}
-% ********************************************************************
-% Load Packages
+\newcommand{\myTime}{June 2007\xspace}
+%*******************************************************
+% Packages with options that might require adjustments
+%*******************************************************
+\usepackage[latin1]{inputenc} 
+\usepackage[ngerman,american]{babel}           
+\usepackage[square,numbers]{natbib} 
+%*******************************************************
+\usepackage{classicthesis-ldpkg} 
 %*******************************************************
-\usepackage{classicthesis-ldpkg}
 % Options for classicthesis.sty:
 % tocaligned eulerchapternumbers drafting linedheaders listsseparated
-% subfigure nochapters beramono eulermath parts
-\usepackage[eulerchapternumbers,drafting,%
+% subfigure nochapters beramono eulermath parts minionpro pdfspacing
+\usepackage[eulerchapternumbers,drafting,pdfspacing,%
             subfigure,beramono,eulermath,parts]{classicthesis}
 % ********************************************************************
+% 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}
+% ********************************************************************
 % Where to look for graphics
 %*******************************************************
-\graphicspath{{gfx/}{misc/}}
+%\graphicspath{{gfx/}{misc/}} % considered harmful according to l2tabu
 % ********************************************************************
 % Hyperreferences
 %*******************************************************
@@ -90,16 +116,16 @@
     colorlinks=true, linktocpage=true, 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,%
+    hypertexnames=true, pdfhighlight=/O,%hyperfootnotes=true,%nesting=true,%frenchlinks,%
+    urlcolor=webbrown, linkcolor=RoyalBlue, citecolor=webgreen, %pagecolor=RoyalBlue,%
     % uncomment the following line if you want to have black links (e.g., for printing)
-    %urlcolor=Black, linkcolor=Black, citecolor=Black, pagecolor=Black,%
+    %urlcolor=Black, linkcolor=Black, citecolor=Black, %pagecolor=Black,%
     pdftitle={\myTitle},%
     pdfauthor={\textcopyright\ \myName, \myUni, \myFaculty},%
     pdfsubject={},%
     pdfkeywords={},%
     pdfcreator={pdfLaTeX},%
-    pdfproducer={LaTeX with hyperref}%
+    pdfproducer={LaTeX with hyperref and classicthesis}%
 }
 %********************************************************************
 % Hyphenation
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
index 41fad43b84a..fd762efebe6 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
@@ -4,6 +4,93 @@ Version=2
 
 [SessionInfo]
 ActiveTab=2
-FrameCount=0
-ActiveFrame=-1
+FrameCount=3
+ActiveFrame=2
+
+[Frame0]
+Columns=1
+Rows=1
+Flags=0
+ShowCmd=1
+MinPos.x=-1
+MinPos.y=-1
+MaxPos.x=-4
+MaxPos.y=-26
+NormalPos.left=0
+NormalPos.top=0
+NormalPos.right=704
+NormalPos.bottom=165
+Class=CLatexEdit
+Document=ClassicThesis.tex
+
+[Frame0_Row0]
+cyCur=116
+cyMin=10
+
+[Frame0_Col0]
+cxCur=677
+cxMin=10
+
+[Frame0_View0,0]
+Cursor.row=125
+Cursor.column=56
+TopSubLine=136
+
+[Frame1]
+Columns=1
+Rows=1
+Flags=0
+ShowCmd=1
+MinPos.x=-1
+MinPos.y=-1
+MaxPos.x=-4
+MaxPos.y=-26
+NormalPos.left=22
+NormalPos.top=25
+NormalPos.right=928
+NormalPos.bottom=317
+Class=CLatexEdit
+Document=classicthesis-ldpkg.sty
+
+[Frame1_Row0]
+cyCur=243
+cyMin=10
+
+[Frame1_Col0]
+cxCur=879
+cxMin=10
+
+[Frame1_View0,0]
+Cursor.row=247
+Cursor.column=2
+TopSubLine=235
+
+[Frame2]
+Columns=1
+Rows=1
+Flags=2
+ShowCmd=3
+MinPos.x=-1
+MinPos.y=-1
+MaxPos.x=-4
+MaxPos.y=-26
+NormalPos.left=44
+NormalPos.top=50
+NormalPos.right=950
+NormalPos.bottom=342
+Class=CLatexEdit
+Document=classicthesis.sty
+
+[Frame2_Row0]
+cyCur=398
+cyMin=10
+
+[Frame2_Col0]
+cxCur=997
+cxMin=10
+
+[Frame2_View0,0]
+Cursor.row=128
+Cursor.column=1
+TopSubLine=124
 
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
new file mode 100644
index 00000000000..f6bfad586a5
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..3aa4641f5d5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex
@@ -0,0 +1,36 @@
+% article example for classicthesis.sty
+\documentclass[10pt,a4paper]{scrartcl} % KOMA-Script article
+\usepackage{lipsum}
+\usepackage{url}
+%\usepackage[nochapters]{../classicthesis-ldpkg}
+\usepackage[nochapters,minionprospacing]{../classicthesis}
+
+\begin{document}
+    \title{\rmfamily\normalfont\spacedallcaps{the title}}
+    \author{\spacedlowsmallcaps{tyler durden}}
+    \date{} % no date
+    
+    \maketitle
+    
+    \begin{abstract}
+        \noindent\lipsum[1]
+    \end{abstract}
+    
+    \tableofcontents
+    
+    \section{A Section}
+    \lipsum[1]
+    \subsection{A Subsection}
+    \lipsum[1]
+    \subsection{A Subsection}
+    
+    \section{A Section}
+    \lipsum[1]
+    
+    % bib stuff
+    \nocite{*}
+    \addtocontents{toc}{\protect\vspace{\beforebibskip}}
+    \addcontentsline{toc}{section}{\refname}    
+    \bibliographystyle{plain}
+    \bibliography{../Bibliography}
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
new file mode 100644
index 00000000000..48466367958
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..9d62060d274
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
@@ -0,0 +1,37 @@
+% book example for classicthesis.sty
+\documentclass[10pt,a4paper]{scrbook} % KOMA-Script book
+\usepackage{lipsum}
+\usepackage[parts,linedheaders,eulerchapternumbers]{../classicthesis}
+%\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false}
+
+% The pdfbookmarks in this document might not work properly.
+% Code to fix this is omitted to keep the example simple and short.
+\begin{document}
+    \tableofcontents
+
+    \myPart{Test Part}
+    \myChapter{Test Chapter}
+    %\lipsum[1]
+    The pdfbookmarks in this document might not work properly.
+    Code to fix this is omitted to keep the example simple
+    and short.
+    
+    \section{A Section}
+    \lipsum[1]
+    
+    \myPart{Test Part}
+    \myChapter{Test Chapter}
+    \lipsum[1]
+    
+    \section{A Section}
+    \lipsum[1]
+
+    \appendix
+    \myPart{Appendix Part}
+    \myChapter{Appendix Chapter}
+    \lipsum[1]
+    
+    \section{A Section}
+    \lipsum[1]
+
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
new file mode 100644
index 00000000000..6178818e8b3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex
new file mode 100644
index 00000000000..57119ea829a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex
@@ -0,0 +1,27 @@
+% cv example for classicthesis.sty
+\documentclass[10pt,a4paper]{scrartcl}
+\usepackage[LabelsAligned]{currvita} % nice cv style
+\usepackage{url}
+\usepackage[nochapters]{../classicthesis}
+
+\renewcommand*{\cvheadingfont}{\LARGE\color{Maroon}}
+\renewcommand*{\cvlistheadingfont}{\large}
+\renewcommand*{\cvlabelfont}{\qquad}
+
+\begin{document}
+    \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 4.\ Dezember~1977 \\	
+                    Europ\"aer, Deutsche Staatsb\"urgerschaft 
+            \item   \url{http://www.miede.de} \\				
+                    \url{https://www.xing.com/profile/Andre_Miede}				
+        \end{cvlist}
+        
+        %\pdfbookmark[1]{Irgendwas}{irgendwas}
+        \begin{cvlist}{\spacedlowsmallcaps{Irgendwas}}\label{irgendwas}
+            \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 739483ea028..1640f714ab2 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
@@ -25,8 +25,10 @@ Put your acknowledgments here.
 Many thanks to everybody who already sent me a postcard!
 
 Regarding the typography and other help, many thanks go to Marco 
-Kuhlmann, Philipp Lehman, Lothar Schlesier, Jim Young, and the 
-whole \LaTeX-community for support, ideas and some great software.
+Kuhlmann, Philipp Lehman, Lothar Schlesier, Jim Young, Lorenzo 
+Pantieri\footnote{Member of GuIT (Gruppo Italiano Utilizzatori 
+di \TeX\ e \LaTeX )}, J\"org Sommer, and the whole 
+\LaTeX-community for support, ideas and some great software.
 
 \endgroup
 
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex
index 54a86b59c69..45970d91eb0 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex
@@ -4,6 +4,7 @@
 % work-around to have small caps also here in the headline
 \manualmark
 \markboth{\spacedlowsmallcaps{\bibname}}{\spacedlowsmallcaps{\bibname}} % work-around to have small caps also
+%\phantomsection 
 \refstepcounter{dummy}
 \addtocontents{toc}{\protect\vspace{\beforebibskip}} % to have the bib a bit from the rest in the toc
 \addcontentsline{toc}{chapter}{\tocEntry{\bibname}}
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex
index 68fc7f9eea1..ac65ab69b16 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex
@@ -1,6 +1,7 @@
 %*******************************************************
 % Table of Contents
 %*******************************************************
+%\phantomsection
 \refstepcounter{dummy}
 \pdfbookmark[1]{\contentsname}{tableofcontents}
 \setcounter{tocdepth}{2}
@@ -23,6 +24,7 @@
     %*******************************************************
     % List of Figures
     %*******************************************************    
+    %\phantomsection 
     \refstepcounter{dummy}
     %\addcontentsline{toc}{chapter}{\listfigurename}
     \pdfbookmark[1]{\listfigurename}{lof}
@@ -33,6 +35,7 @@
     %*******************************************************
     % List of Tables
     %*******************************************************
+    %\phantomsection 
     \refstepcounter{dummy}
     %\addcontentsline{toc}{chapter}{\listtablename}
     \pdfbookmark[1]{\listtablename}{lot}
@@ -44,6 +47,7 @@
     %*******************************************************
     % List of Listings
     %*******************************************************      
+%	%\phantomsection 
 %   \refstepcounter{dummy}
 %   %\addcontentsline{toc}{chapter}{\lstlistlistingname}
 %   \pdfbookmark[1]{\lstlistlistingname}{lol}
@@ -52,6 +56,7 @@
     %*******************************************************
     % Acronyms
     %*******************************************************
+    %\phantomsection 
     \refstepcounter{dummy}
     \pdfbookmark[1]{Acronyms}{acronyms}
     \chapter*{Acronyms}
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex
index ae0f7fd0944..c9a94fbb19b 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex
@@ -2,6 +2,7 @@
 % Dedication
 %*******************************************************
 \thispagestyle{empty}
+%\phantomsection 
 \refstepcounter{dummy}
 \pdfbookmark[1]{Dedication}{Dedication}
 
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
index 00671471dd4..40dc3132552 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
@@ -15,7 +15,7 @@
 
         \vfill
 
-        \includegraphics[width=6cm]{TFZsuperellipse_bw} \\ \medskip
+        \includegraphics[width=6cm]{gfx/TFZsuperellipse_bw} \\ \medskip
 
         \myDegree \\ \medskip   
         %\myDepartment \\                            
diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
index 06dfb9a4d46..78c73d9e9ad 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
+++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
@@ -1,6 +1,6 @@
 LIST OF FILES FOR ClassicThesis.tex
 
-  *File List*
+*File List*
 scrreprt.cls    2006/07/30 v2.95b KOMA-Script document class (report)
 scrkbase.sty    2006/07/30 v2.95b KOMA-Script package (basics and keyval use)
 scrlfile.sty    2006/03/28 v2.95 KOMA-Script package (loading files)
@@ -8,87 +8,88 @@ scrlfile.sty    2006/03/28 v2.95 KOMA-Script package (loading files)
    fleqn.clo    1998/08/17 v1.1c Standard LaTeX option (flush left equations)
   size10.clo    2005/09/16 v1.4f Standard LaTeX file (size option)
 typearea.sty    2006/07/30 v2.95b KOMA-Script package (type area)
-classicthesis-ldpkg.sty    2007/03/21 v1.4.2 Package Loader for Classic Thesis 
-Style
+classicthesis-ldpkg.sty    2007/06/01 v2.0 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
   ts1enc.def    2001/06/05 v3.0e (jk/car/fm) Standard LaTeX file
 inputenc.sty    2006/05/05 v1.1b Input encoding file
   latin1.def    2006/05/05 v1.1b Input encoding file
-  xcolor.sty    2006/11/28 v2.10 LaTeX color extensions (UK)
-   color.cfg    2005/12/29 v1.1 MiKTeX 'color' configuration
-  pdftex.def    2006/08/14 v0.03t Graphics/color for pdfTeX
-dvipsnam.def    1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
-   babel.sty    2005/05/21 v3.8g The Babel package
- bblopts.cfg    2006/07/31 v1.0 MiKTeX 'babel' configuration
+   babel.sty    2005/11/23 v3.8h The Babel package
 ngermanb.ldf    2004/02/20 v2.6m new German support from the babel system
  english.ldf    2005/03/30 v3.3o English support from the babel system
+  natbib.sty    2007/02/05 8.0 (PWD)
+  xcolor.sty    2007/01/21 v2.11 LaTeX color extensions (UK)
+   color.cfg    2007/01/18 v1.5 color configuration of teTeX/TeXLive
+  pdftex.def    2007/01/08 v0.04d Graphics/color for pdfTeX
+dvipsnam.def    1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
   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    2005/08/23 v2.4b Tabular extension package (FMi)
-remreset.sty    
-mparhack.sty    2005/04/17 v1.4 (T. Sgouros and S. Ulrich)
+mparhack.sty    2003/05/22 v1.3a (T. Sgouros and S. Ulrich)
 fixltx2e.sty    2006/03/24 v1.1n fixes to LaTeX
-ellipsis.sty    2004/9/28 v1.6 ellipsis: fixes spacing around \global\let .\ker
-n \fontdimen 3\font .\kern \fontdimen 3\font .\kern \fontdimen 3\font .\kern \f
-ontdimen 3\font .\kern \fontdimen 3\font .\kern \fontdimen 3\font .\kern \fontd
-imen 3\font .\kern \fontdimen 3\font .\kern \fontdimen 3\font 
-  natbib.sty    2006/09/06 7.4a (PWD)
  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
  relsize.sty    2003/07/04 ver 3.1
- acronym.sty    2005/11/11 v1.25 Support for acronyms (Tobias Oetiker)
+ acronym.sty    2006/06/26 v1.26 Support for acronyms (Tobias Oetiker)
   suffix.sty    2006/07/15 1.5 Variant command support
-hyperref.sty    2006/12/30 v6.75k Hypertext links for LaTeX
-  pd1enc.def    2006/12/30 v6.75k Hyperref: PDFDocEncoding definition (HO)
-hyperref.cfg    2006/02/14 v1.1 MiKTeX 'hyperref' configuration
-kvoptions.sty    2006/08/22 v2.4 Connects package keyval with LaTeX options (HO
-)
-     url.sty    2005/06/27  ver 3.2  Verb mode for urls, etc.
- hpdftex.def    2006/12/30 v6.75k Hyperref driver for pdfTeX
-graphicx.sty    1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
-graphics.sty    2006/02/20 v1.0o Standard LaTeX Graphics (DPC,SPQR)
-    trig.sty    1999/03/16 v1.09 sin cos tan (DPC)
-graphics.cfg    2005/12/29 v1.2 MiKTeX 'graphics' configuration
-  hypcap.sty    2006/02/20 v1.5 Adjusting anchors of captions (HO)
- backref.sty    2006/10/06 v1.27 Bibliographical back referencing
-ccaption.sty    2005/03/29 v3.2a Extended captioning and new floats
-subfigure.sty    2002/07/30 v2.1.4 subfigure package
-subfigure.cfg
+ caption.sty    2007/01/07 v3.0k Customising captions (AR)
+caption3.sty    2007/01/07 v3.0k caption3 kernel (AR)
+remreset.sty    
+  subfig.sty    2005/06/28 ver: 1.3 subfig package
 listings.sty    2004/10/17 1.3b (Carsten Heinz)
 lstpatch.sty    2004/10/17 1.3b (Carsten Heinz)
  lstmisc.sty    2004/09/07 1.3 (Carsten Heinz)
 listings.cfg    2004/09/05 1.3 listings configuration
 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    2004/09/07 1.3 (Carsten Heinz)
-classicthesis.sty    2007/03/21 v1.4.2 Typographic Style for a classic-looking 
-thesis
-  ifthen.sty    2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
+hyperref.sty    2007/02/07 v6.75r Hypertext links for LaTeX
+  pd1enc.def    2007/02/07 v6.75r Hyperref: PDFDocEncoding definition (HO)
+hyperref.cfg    2002/06/06 v1.2 hyperref configuration of TeXLive
+kvoptions.sty    2006/08/22 v2.4 Connects package keyval with LaTeX options (HO
+)
+ backref.sty    2006/10/06 v1.27 Bibliographical back referencing
+     url.sty    2005/06/27  ver 3.2  Verb mode for urls, etc.
+ hpdftex.def    2007/02/07 v6.75r Hyperref driver for pdfTeX
+graphicx.sty    1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
+graphics.sty    2006/02/20 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
+  hypcap.sty    2006/02/20 v1.5 Adjusting anchors of captions (HO)
+classicthesis.sty    2007/06/01 v2.0 Typographic Style for a classic-looking th
+esis
    ifpdf.sty    2006/02/20 v1.4 Provides the ifpdf switch (HO)
 mathpazo.sty    2005/04/12 PSNFSS-v9.2a Palatino w/ Pazo Math (D.Puga, WaS) 
 beramono.sty    2004/01/31 (WaS)
  eulervm.sty    2005/01/11 v4.0 (WaS)
-microtype.sty    2006/09/09 v1.9f Micro-typography with pdfTeX (RS)
-microtype.cfg    2006/04/20 v1.8 microtype main configuration file (RS)
-booktabs.sty    2005/04/14 v1.61803 publication quality tables
+microtype.sty    2007/01/21 v2.0 Micro-typography with pdfTeX (RS)
+microtype.cfg    2007/01/14 v2.0 microtype main configuration file (RS)
+booktabs.sty    2005/03/16 v1.6180 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)
 placeins.sty    2005/04/18  v 2.2
 titlesec.sty    2005/01/22 v2.6 Sectioning titles
-titlesec.new
 scrpage2.sty    2006/03/29 v2.2c LaTeX2e KOMA-Script package
  tocloft.sty    2003/09/26 v2.3c parameterised ToC, etc., typesetting
-footmisc.sty    2005/03/17 v5.3d a miscellany of footnote facilities
  scrtime.sty    2006/03/30 v1.1o LaTeX2e KOMA-Script package
 prelim2e.sty    2001/02/17 v1.23 prelim2e Package (MS)
 everyshi.sty    2001/05/15 v3.00 EveryShipout Package (MS)
   ts1cmr.fd    1999/05/25 v2.5h Standard LaTeX font definitions
   t1pplj.fd    2004/09/06 font definitions for T1/pplj.
 supp-pdf.tex
+ragged2e.sty    2003/03/25 v2.04 ragged2e Package (MS)
+everysel.sty    1999/06/08 v1.03 EverySelectfont Package (MS)
  nameref.sty    2006/12/27 v2.28 Cross-referencing by name of section
 refcount.sty    2006/02/20 v3.0 Data extraction from references (HO)
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
index 9dcd592fdea..7871445d401 100644
--- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
+++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
@@ -26,28 +26,32 @@
 %
 % ********************************************************************  
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis-ldpkg}[2007/03/21 v1.4.2 Package Loader for Classic Thesis Style]
-  
+\ProvidesPackage{classicthesis-ldpkg}[2007/06/01 v2.0 Package Loader for Classic Thesis Style]
+ 
+% ********************************************************************
+% Options
+% ******************************************************************** 
+\RequirePackage{ifthen}
+    \newboolean{@nochapters} % disable all chapter-specific commands
+\DeclareOption{nochapters}{\setboolean{@nochapters}{true}}
+\ProcessOptions\relax
+
 % ******************************************************************** 
 % Packages
 % ******************************************************************** 
 \RequirePackage[T1]{fontenc}                
 \RequirePackage{textcomp}
-\RequirePackage[latin1]{inputenc} % latin1 utf8
-\RequirePackage[usenames,dvipsnames]{xcolor} 
-\RequirePackage[ngerman,american]{babel}           
+\RequirePackage[dvipsnames]{xcolor} 
 \RequirePackage{xspace} % to get the spacing after macros right
 \RequirePackage{tabularx} % better tables
-\RequirePackage{remreset}
 \RequirePackage{mparhack} % get marginpar right
 \RequirePackage{fixltx2e} % fixes some LaTeX stuff
-\RequirePackage{ellipsis} % ... ;-)
-\RequirePackage[square,numbers]{natbib} % quite good bib style
+%\RequirePackage{ellipsis} % ... ;-)
 \RequirePackage[fleqn]{amsmath} % math environments and more by the AMS                   
 \RequirePackage{relsize} % scale font up or down                                        
 \RequirePackage[smaller]{acronym} % nice macros for handling all acronyms in the thesis
-\renewcommand{\textsf}[1]{\textrm{#1}}  % to get the acronyms list right (we don't use sans-serif or bold anyway)
-\renewcommand{\textbf}[1]{\textsmaller{#1}}
+\renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms
+\RequirePackage{natbib}
 
 % ********************************************************************
 % Commands
@@ -80,105 +84,44 @@
 \newcommand{\Ologn}{\ensuremath{O(\log n)}\xspace}
 \newcommand{\Oone}{\ensuremath{O(1)}\xspace}
 
-
-% ********************************************************************
-% 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 
-
-%*******************************************************
-% new colors for better readability
-\definecolor{webgreen}{rgb}{0,.5,0}
-\definecolor{webbrown}{rgb}{.6,0,0}
-
-%*******************************************************
-% 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
-\RequirePackage[hyperpageref]{backref} % to be loaded after hyperref package 
-   \renewcommand*{\backref}[1]{}  % Disable standard
-   \renewcommand*{\backrefalt}[4]{% Detailed backref
-      \ifcase #1 %
-         \relax%(Not cited.)%
-      \or
-         (Cited on page~#2.)%
-      \else
-         (Cited on pages~#2.)
-      \fi}
-%   \hspace*{\fill}{\scriptsize\itshape\mbox{%
-%   \ifnum#1=1 %
-%     (Cited on page~%
-%   \else
-%     (Cited on pages~%
-%   \fi
-%   #2)}
-%}
-
 % ********************************************************************
 % take care of the caption fonts and sizes (tables and figures)
-\RequirePackage[subfigure]{ccaption}
-    \hangcaption
-    \captionnamefont{\small\normalfont}
-    \captiontitlefont{\small}
-    \captiondelim{.\ }
-    \setlength{\abovecaptionskip}{\baselineskip}
-    \setlength{\belowcaptionskip}{\baselineskip}
+\RequirePackage{caption}
     
 % ********************************************************************
 % caption numbering now w/o chapter number
 \RequirePackage{remreset}
     \makeatletter
-        \@removefromreset{table}{chapter}  % requires remreset package
+        \ifthenelse{\boolean{@nochapters}}%
+        {\relax}{%
+            \@removefromreset{table}{chapter}  % requires remreset package
+        }
         \renewcommand{\thetable}{\arabic{table}}
     \makeatother
     \makeatletter
-        \@removefromreset{figure}{chapter}  % requires remreset package
+        \ifthenelse{\boolean{@nochapters}}%
+        {\relax}{%
+            \@removefromreset{figure}{chapter}  % requires remreset package
+        }
         \renewcommand{\thefigure}{\arabic{figure}}  
     \makeatother
 
 % ********************************************************************
 % enable subfigures in figures
-\RequirePackage[hang]{subfigure}
-    \makeatletter
-        \@removefromreset{subfigure}{chapter}  % requires remreset package
-        \renewcommand{\thesubfigure}{(\alph{subfigure})}
-        \renewcommand{\p@subfigure}{}
-    \makeatother    
-    
+\RequirePackage{subfig}  
+
 % ********************************************************************
 % fine typesetting of code listings
 \RequirePackage{listings}  
 % ********************************************************************
 % caption numbering now w/o chapter number
-\makeatletter
-    \@removefromreset{lstlisting}{chapter}  % requires remreset package
-    \renewcommand{\thelstlisting}{\arabic{lstlisting}}
-\makeatother
+%\makeatletter
+%    \ifthenelse{\boolean{@nochapters}}%
+%    {\relax}{%
+%        \@removefromreset{lstlisting}{chapter}% requires remreset package
+%    }
+%    \renewcommand{\thelstlisting}{\arabic{lstlisting}} % <-- might cause an error with some TeX distributions
+%\makeatother
 % ********************************************************************
 % ...and get the layout of the list of listings right (dirty workaround)
 %\makeatletter
@@ -206,20 +149,83 @@
 % ********************************************************************
 %\lstset{emph={trueIndex,root},emphstyle=\color{BlueViolet}}%\underbar} % for special keywords
 % ********************************************************************
-\lstset{language=C++,
+\lstset{language=[LaTeX]Tex,%C++,
     keywordstyle=\color{RoyalBlue},%\bfseries,
     basicstyle=\small\ttfamily,
     %identifierstyle=\color{NavyBlue},
     commentstyle=\color{Green}\ttfamily,
     stringstyle=\rmfamily,
-    numbers=left,%none
+    numbers=none,%left,%
     numberstyle=\scriptsize,%\tiny
-    stepnumber=2,
+    stepnumber=5,
     numbersep=8pt,
     showstringspaces=false,
     breaklines=true,
     frameround=ftff,
     frame=single
     %frame=L
-}   
-              
\ No newline at end of file
+}    
+
+% ********************************************************************
+% Using PDFLaTeX:
+% ********************************************************************
+\RequirePackage[pdftex,hyperfootnotes=false,pdfpagelabels,pagebackref]{hyperref}  % backref linktocpage pagebackref
+\pdfcompresslevel=9
+\pdfadjustspacing=1 
+\RequirePackage[pdftex]{graphicx} % PDFTeX driver for graphicx
+\DeclareGraphicsRule{*}{mps}{*}{} % enables use of MetaPost graphics with pdflatex 
+
+%*******************************************************
+% new colors for better readability
+\definecolor{webgreen}{rgb}{0,.5,0}
+\definecolor{webbrown}{rgb}{.6,0,0}
+
+%*******************************************************
+% 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.)}
+
+\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}
+%   \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.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
index 800173daa98..22f8b8938af 100644
--- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
+++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
@@ -36,12 +36,13 @@
 %   (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 and I have got no clue on how to fix this 
-%   (either the case or the spacing breaks). So far, I chose the case. :-(
+%   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
+%      option pdfspacing of this package
 %
 % ********************************************************************  
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis}[2007/03/21 v1.4.2 Typographic Style for a classic-looking thesis]
+\ProvidesPackage{classicthesis}[2007/06/01 v2.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)
@@ -53,6 +54,13 @@
     \newboolean{eulermath} % use awesome Euler fonts for math
     \newboolean{parts} % use part division for the text
     \newboolean{a5paper} % use those tiny DIN A5 pages
+    \newboolean{minionpro} % setup for minion pro font
+    \newboolean{minionprospacing} % use minion pro's textssc for letter spacing
+    \newboolean{pdfspacing} % use pdftex for letterspacing (via microtype)
+    
+% ********************************************************************
+% Options
+% ******************************************************************** 
 \DeclareOption{tocaligned}{\setboolean{tocaligned}{true}}
 \DeclareOption{eulerchapternumbers}{\setboolean{eulerchapternumbers}{true}}
 \DeclareOption{drafting}{\setboolean{drafting}{true}}
@@ -64,17 +72,45 @@
 \DeclareOption{eulermath}{\setboolean{eulermath}{true}} 
 \DeclareOption{parts}{\setboolean{parts}{true}} 
 \DeclareOption{a5paper}{\setboolean{a5paper}{true}}
+\DeclareOption{minionpro}{\setboolean{minionpro}{true}} 
+\DeclareOption{minionprospacing}{\setboolean{minionprospacing}{true}} 
+\DeclareOption{pdfspacing}{\setboolean{pdfspacing}{true}} 
 \ProcessOptions\relax
 
-% turn off some things if we do not use chapters
+% fine-tuning if we use minionprospacing
+\ifthenelse{\boolean{minionprospacing}}%
+    {%
+        \PackageInfo{classicthesis}{Using option "minionprospacing". %
+            This activates "minionpro" in general and turns off %
+            the option "pdfspacing".}%
+        % is the user trying to use pdfspacing at the same time?    
+        \ifthenelse{\boolean{pdfspacing}}%
+            {% both minionprospacing and pdfspacing are active
+                \PackageWarningNoLine{classicthesis}{You cannot use "pdfspacing" at the same time %
+                    as "minionprospacing"!}%
+            }{\relax}%
+        \setboolean{minionpro}{true}%
+        \setboolean{pdfspacing}{false}%
+    }{\relax}
+
+% fine-tuning if we do not use chapters
 \ifthenelse{\boolean{nochapters}}%
     {%
+        % is the user trying to use parts at the same time?
+        \ifthenelse{\boolean{parts}}%
+            {% both parts and nochapters are active
+                \PackageWarningNoLine{classicthesis}{You cannot use "parts" at the same time %
+                    as "nochapters"!}%
+            }{\relax}%
+        % turn off some things if we do not use chapters
+        \PackageInfo{classicthesis}{Using option "nochapters" (probably for an article). %
+                This turns off the options "linedheaders",%
+                "listsseparated", "eulerchapternumbers", and "parts". Please be aware of that.}
         \setboolean{linedheaders}{false}%
         \setboolean{listsseparated}{false}%
         \setboolean{eulerchapternumbers}{false}%
         \setboolean{parts}{false}
-    }%
-    {\relax}%
+    }{\relax}%
 
 % ********************************************************************                
 % PDF Stuff
@@ -90,13 +126,20 @@
 % ********************************************************************
 % Font Stuff
 % ********************************************************************   
-\RequirePackage[osf,sc]{mathpazo} % Palatino with real small caps and old style figures\\
-% just some font experiments (ignore)
-%\RequirePackage[opticals,osf]{MinionPro} %  opticals, fullfamily,
-%\RequirePackage{lmodern}
-%\RequirePackage[urw-garamond]{mathdesign}
-%\RequirePackage[light,condensed,math]{iwona}
-%\renewcommand{\sfdefault}{iwona}
+\ifthenelse{\boolean{minionpro}}%
+    {%
+        % specialists: MinionPro
+        \RequirePackage[opticals,osf]{MinionPro} %  opticals, fullfamily,
+    }{%
+        % default: Palatino
+        \RequirePackage[osf,sc]{mathpazo} % Palatino with real small caps and old style figures\\
+        % just some font experiments (ignore)
+        %\RequirePackage{lmodern}
+        %\RequirePackage[urw-garamond]{mathdesign}
+        %\RequirePackage[light,condensed,math]{iwona}
+        %\renewcommand{\sfdefault}{iwona}
+    }
+
 \ifthenelse{\boolean{beramono}}%
     {\RequirePackage[scaled=0.85]{beramono}}%
     {\renewcommand{\ttdefault}{\rmdefault}} % put your own suitable typewriter font here
@@ -110,21 +153,35 @@
     % Latin Modern cork-lmr10     
 \definecolor{halfgray}{gray}{0.55} % chapter numbers will be semi transparent .5 .55 .6 .0
 
-%\RequirePackage[expansion=false]{microtype} % character protruding and other micro-typography stuff
 \RequirePackage{microtype} % character protruding and other micro-typography stuff
+% [expansion=false]
 
 % ********************************************************************
 % Textblock size
 %*******************************************************
 \ifthenelse{\boolean{a5paper}}%
     {% A5
-    	\areaset[5mm]{288pt}{555pt}
-    	\setlength{\marginparwidth}{4em}%
-		\setlength{\marginparsep}{1.25em}%
+        \ifthenelse{\boolean{minionpro}}%
+        {% Minion gets some extra sizes
+            \areaset[5mm]{278pt}{556pt}%
+            \setlength{\marginparwidth}{5em}%
+            \setlength{\marginparsep}{1.25em}%
+        }{% Palatino or else
+            \areaset[5mm]{288pt}{555pt}%
+            \setlength{\marginparwidth}{4em}%
+            \setlength{\marginparsep}{1.25em}%
+        }%
 	}{% A4
-		\areaset[5mm]{312pt}{657pt} % 624 + 33 head % 5mm for binding
-		\setlength{\marginparwidth}{7em}%
-		\setlength{\marginparsep}{2em}%
+        \ifthenelse{\boolean{minionpro}}%
+        {% Minion gets some extra sizes
+            \areaset[5mm]{288pt}{684pt}% 609 + 33 + 42 head \the\footskip
+            \setlength{\marginparwidth}{7.5em}%
+            \setlength{\marginparsep}{2em}%
+        }{% Palatino or else
+            \areaset[5mm]{312pt}{699pt} % 624 + 33 head + 42 head \the\footskip
+            \setlength{\marginparwidth}{7em}%
+            \setlength{\marginparsep}{2em}%
+        }%
 	}
 % Here some suggestions for the text widths and heights:
 % Palatino 	10pt: 288--312pt | 609--657pt
@@ -154,16 +211,28 @@
 % ********************************************************************  
 \RequirePackage{booktabs} % for better rules in tables
 \RequirePackage{textcase} % for \MakeTextUppercase
-\RequirePackage{soul} % for letterspacing 
-    \sodef\allcapsspacing{\upshape}{0.15em}{0.65em}{0.6em}  
-    \sodef\lowsmallcapsspacing{\scshape}{0.075em}{0.5em}{0.6em}     
-	%\DeclareRobustCommand{\spacedallcaps}[1]{%
-	%	\protected@edef\@myXtemp{\MakeTextUppercase{\allcapsspacing{#1}}}\@myXtemp}
-    \DeclareRobustCommand{\spacedallcaps}[1]{\MakeTextUppercase{\allcapsspacing{#1}}}     
-	%\DeclareRobustCommand{\spacedlowsmallcaps}[1]{%
-	%	%\protected@edef\@myYtemp{\textsc{\lowsmallcapsspacing{\MakeTextLowercase{#1}}}}\@myYtemp}
-	%	\protected@edef\@myYtemp{\MakeTextLowercase{\textsc{\lowsmallcapsspacing{#1}}}}\@myYtemp}
-	\DeclareRobustCommand{\spacedlowsmallcaps}[1]{\MakeTextLowercase{\textsc{\lowsmallcapsspacing{#1}}}}   
+
+\ifthenelse{\boolean{minionprospacing}}%
+    {%
+        \PackageInfo{classicthesis}{Using MinionPro's textssc for character spacing.}%
+        \DeclareRobustCommand{\spacedallcaps}[1]{\textssc{\MakeTextUppercase{#1}}}%
+        \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textssc{\MakeTextLowercase{#1}}}%
+    }{%
+        \ifthenelse{\boolean{pdfspacing}}%
+        {%
+            \PackageInfo{classicthesis}{Using pdftex/microtype for character spacing.%
+                                        Make sure your pdftex is version 1.40 or higher.}%
+            \microtypesetup{expansion=false}%
+            \DeclareRobustCommand{\spacedallcaps}[1]{\textls[160]{\MakeTextUppercase{#1}}}%
+            \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textls[80]{\scshape\MakeTextLowercase{#1}}}%
+        }{%
+            \RequirePackage{soul} % for letterspacing 
+                \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}}}}%
+        }%
+    }
     
 % ********************************************************************
 % figures are placed only within section they were declared in
@@ -257,7 +326,7 @@
       \renewcommand{\cftpartafterpnum}{\cftparfillskip}%        
       \setlength{\cftbeforepartskip}{1em}%
       \setlength{\cftbeforechapskip}{.1em}%
-      \setlength{\beforebibskip}{\cftbeforepartskip}
+      \setlength{\beforebibskip}{\cftbeforepartskip}%
      }{\relax}
     % chapters
     \ifthenelse{\boolean{nochapters}}%
@@ -271,17 +340,27 @@
             %\setlength{\cftbeforechapskip}{.1em}%           
         }
     % sections
+    \ifthenelse{\boolean{nochapters}}%        
+        {%
+            \setlength{\cftbeforesecskip}{.1em}%
+            \setlength{\beforebibskip}{1em}%
+        }%
+        {\relax}
     	\renewcommand{\cftsecpresnum}{\scshape\MakeTextLowercase}%
+    	\renewcommand{\cftsecfont}{\normalfont}%
+        \renewcommand{\cftsecpagefont}{\normalfont}%
         \renewcommand{\cftsecleader}{\hspace{1.5em}} 
         \renewcommand{\cftsecafterpnum}{\cftparfillskip}
         \ifthenelse{\boolean{tocaligned}}{\renewcommand{\cftsecindent}{0em}}{\relax}
     % subsections
     	\renewcommand{\cftsubsecpresnum}{\scshape\MakeTextLowercase}%
+    	\renewcommand{\cftsubsecfont}{\normalfont}%
         \renewcommand{\cftsubsecleader}{\hspace{1.5em}} 
         \renewcommand{\cftsubsecafterpnum}{\cftparfillskip}                
         \ifthenelse{\boolean{tocaligned}}{\renewcommand{\cftsubsecindent}{0em}}{\relax}
     % figures     
-    	\renewcommand{\cftfigpresnum}{\scshape\MakeTextLowercase}%                  
+    	\renewcommand{\cftfigpresnum}{\scshape\MakeTextLowercase}% 
+    	\renewcommand{\cftfigfont}{\normalfont}%                 
         \renewcommand{\cftfigleader}{\hspace{1.5em}} 
         \renewcommand{\cftfigpresnum}{\figurename~}%Fig.~}
         \renewcommand{\cftfigafterpnum}{\cftparfillskip}
@@ -291,6 +370,7 @@
         \cftsetindents{figure}{0em}{\figurelabelwidth}
     % tables
     	\renewcommand{\cfttabpresnum}{\scshape\MakeTextLowercase}%
+    	\renewcommand{\cfttabfont}{\normalfont}%
         \renewcommand{\cfttableader}{\hspace{1.5em}} 
         \renewcommand{\cfttabpresnum}{\tablename~}%Tab.~}
         \renewcommand{\cfttabafterpnum}{\cftparfillskip}    
@@ -356,7 +436,7 @@
 % ********************************************************************
 % footnotes setup   
 % ********************************************************************
-\RequirePackage[bottom]{footmisc}  % norule para symbol* marginal perpage
+%\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