classicthesis update (11feb10)

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

18 files changed, 272 insertions, 219 deletions

diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
index edff6273683..6274e9be228 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES
+++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
@@ -1,3 +1,33 @@
+Changes in version 2.7 (February 2010, cumulative release)
+o Removed option for classicthesis-ldpkg.sty: nobackref 
+  Introduced instead option "backref" for consistency
+  which works the other way (no backrefs by default)
+  
+Changes in version 2.6.2 (January 2010, released as beta)
+o New option for classicthesis-ldpkg.sty: nobackref 
+  (removes links to cited page in bibliography)
+o Fixed some spacing issues for LoF, LoT, LoL with option
+  "listsseparated" (in classicthesis.sty)
+
+Changes in version 2.6.1 (October 2009, released as beta)
+o Removed \myChapter and \myPart, you can now use the regular
+  \chapter and \part commands (in classicthesis.sty)
+  (thanks to Hinrich Harms for this)
+o Fixed used KOMA-options: numbers=noenddot, cleardoublepage=empty
+  (in ClassicThesis.tex)
+o Included hack to use citations in float environments, will 
+  be fixed with caption package version 3.2 (in classicthesis.sty)
+o Included some font and text area fine-tuning code 
+  (in ClassicThesis.tex)
+o Some testing with Libertine font (classicthesis-book.tex)
+o Fixed numbering of listings used in different chapters
+  (in ClassicThesis.tex, classicthesis.sty, classicthesis-ldpkg.sty)
+o Spacing between listings in different chapters and after List 
+  of Listings header fixed (in classicthesis.sty)
+o Increased \newnumberwidth to sizeof(999) which is better for 
+  documents with more than 99 pages (in classicthesis.sty)
+o New option for classicthesis.sty: manychapters
+    
 Changes in version 2.6 (August 2009)
 o Centered the title page with the addmargin environment
   (thanks to Nicolas Repp for the hint)
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
index a1c2ab043f4..b1b31a8e566 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
@@ -1,5 +1,5 @@
 %************************************************
-\myChapter{Introduction}\label{ch:introduction}
+\chapter{Introduction}\label{ch:introduction}
 %************************************************
 This bundle for \LaTeX\ has two goals:
 \begin{enumerate}
@@ -103,10 +103,17 @@ the following:
     \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 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.
+    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}
 \end{itemize}
 This should get you started in no time.
 
@@ -157,7 +164,7 @@ allow for a bit of freedom concerning the layout:
     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. 
+    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
@@ -166,6 +173,12 @@ allow for a bit of freedom concerning the layout:
     table of contents.
     \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.
 \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.
@@ -211,7 +224,7 @@ you can redistribute it and/or modify
  Boston, \textsmaller{MA} 02111-1307, \textsmaller{USA}.
 
 
-\section{Beyond a thesis}
+\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.
@@ -225,13 +238,13 @@ be found the folder.
 %\texttt{classicthesis.sty} and \texttt{Bibliography.bib} within the 
 %examples.)
 
-\lstinputlisting[caption=testing, title=An Article]%
+\lstinputlisting[caption=An Article]%
     {Examples/classicthesis-article.tex}
     
-\lstinputlisting[title=A Book]%
+\lstinputlisting[caption=A Book]%
     {Examples/classicthesis-book.tex}
 
-\lstinputlisting[title=A Curriculum Vit\ae]%
+\lstinputlisting[caption=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 5d4e114d671..2d26c81fad8 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex
@@ -1,5 +1,5 @@
 %*****************************************
-\myChapter{Examples}\label{ch:examples}
+\chapter{Examples}\label{ch:examples}
 %*****************************************
 Ei choro aeterno antiopam mea, labitur bonorum pri no 
 \cauthor{dueck:trio} \citep{dueck:trio}. His no decore
@@ -131,13 +131,13 @@ Non tote tres germano se, lo parola periodicos non.
     suscipit instructior & titulo & personas \\
     %postulant quo & westeuropee & sanctificatec \\
     \midrule
-    quaestio philosophia & facto & demonstrated \\
+    quaestio philosophia & facto & demonstrated \cauthor{knuth:1976} \\
     %autem vulputate ex & parola & romanic \\
     %usu mucius iisque & studio & sanctificatef \\
     \bottomrule
   \end{tabularx}
   \caption[Autem timeam deleniti usu id]{Autem timeam deleniti usu
-  id.}
+  id. \cauthor{knuth:1976}}
   \label{tab:example}
 \end{table}
 
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex
index 0248c1df7c2..39a57eac5aa 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex
@@ -1,5 +1,5 @@
 %************************************************
-\myChapter{Math Test Chapter}\label{ch:mathtest} % $\mathbb{ZNR}$
+\chapter{Math Test Chapter}\label{ch:mathtest} % $\mathbb{ZNR}$
 %************************************************
 Ei choro aeterno antiopam mea, labitur bonorum pri no. His no decore
 nemore graecis. In eos meis nominavi, liber soluta vim cu. Sea commune
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex
index 316dd37ad4f..8e458a05a01 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex
@@ -1,7 +1,7 @@
 %********************************************************************
 % Appendix
 %*******************************************************
-\myChapter{Appendix Test}
+\chapter{Appendix Test}
 Lorem ipsum at nusquam appellantur his, ut eos erant homero
 concludaturque. Albucius appellantur deterruisset id eam, vivendum
 partiendo dissentiet ei ius. Vis melius facilisis ea, sea id convenire
@@ -57,3 +57,11 @@ Ei solet nemore consectetuer nam. Ad eam porro impetus, te choro omnes
 evertitur mel. Molestie conclusionemque vel at, no qui omittam
 expetenda efficiendi. Eu quo nobis offendit, verterem scriptorem ne
 vix.
+
+  
+\begin{lstlisting}[float,caption=A floating example]
+for i:=maxint to 0 do
+begin
+{ do nothing }
+end;
+\end{lstlisting}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
index 6a830f30069..55f613286a0 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 db71a9a0d92..42e1254002b 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
@@ -2,7 +2,7 @@
 % A Classic Thesis Style
 % An Homage to The Elements of Typographic Style
 %
-% Copyright (C) 2009 André Miede http://www.miede.de
+% Copyright (C) 2010 André 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 
@@ -28,7 +28,6 @@
 % **************************************************************************************************************
 % Note:
 %    * 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)
 %    * New enumeration (small caps): \begin{aenumerate} \end{aenumerate}
 %    * For margin notes: \graffito{}
 %    * Do not use bold fonts in this style, it is designed around them
@@ -36,24 +35,16 @@
 %    * See classicthesis-ldpkg.sty for useful commands
 % **************************************************************************************************************
 % To Do:
-%    * fix space at beginning of List of Listings 
-%    * mathbb in section-titles/chapter-titles => disappears somehow in headlines!!!
-%    * think about processing a4paper, a5paper, 10pt, 11pt, 12pt etc. options for typearea layout
-%      (store values in internal variables and handle by \AtEndOfPackage{\areaset...})
+%		 * [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,pointlessnumbers,headinclude,%1headlines,% 
-                10pt,a4paper,BCOR5mm,footinclude,cleardoubleempty,abstractoff % <--- obsolete, remove (todo)
+\documentclass[ twoside,openright,titlepage,fleqn,numbers=noenddot,headinclude,%1headlines,% 
+                11pt,a4paper,BCOR5mm,footinclude,cleardoublepage=empty,abstractoff % <--- obsolete, remove (todo)
                 ]{scrreprt}
-% ********************************************************************
-% KOMA-Script setup http://www.komascript.de/betaKOMAoptions
-% ********************************************************************
-%\KOMAoptions{%
-%    paper=a4,%
-%    fontsize=10pt,%
-%    cleardoublepage=empty%
-%    %,footinclude=true%
-%    %,abstract=false%
-%}
+
 % ********************************************************************
 % Development Stuff
 % ********************************************************************
@@ -73,8 +64,8 @@
 \newcommand{\myDepartment}{Put data here\xspace}
 \newcommand{\myUni}{\protect{Put data here}\xspace}
 \newcommand{\myLocation}{Darmstadt\xspace}
-\newcommand{\myTime}{August 2009\xspace}
-\newcommand{\myVersion}{Version 2.6\xspace}
+\newcommand{\myTime}{February 2010\xspace}
+\newcommand{\myVersion}{Version 2.7\xspace}
 %*******************************************************
 % Packages with options that might require adjustments
 %*******************************************************
@@ -83,14 +74,42 @@
 \usepackage[square,numbers]{natbib} 
 \usepackage[fleqn]{amsmath} % math environments and more by the AMS 
 %*******************************************************
-\usepackage{classicthesis-ldpkg} 
+\usepackage{classicthesis-ldpkg} % [backref]
 %*******************************************************
 % Options for classicthesis.sty:
 % tocaligned eulerchapternumbers drafting linedheaders listsseparated 
 % subfig nochapters beramono eulermath parts minionpro pdfspacing 
-% listings dottedtoc
-\usepackage[eulerchapternumbers,drafting,listings,%pdfspacing,%
+% listings dottedtoc minionprospacing manychapters
+\usepackage[eulerchapternumbers,drafting,listings,listsseparated,%pdfspacing,%
             subfig,beramono,eulermath,parts]{classicthesis}
+
+%*******************************************************
+% Some font experiments
+%*******************************************************
+%\usepackage[osf]{libertine}
+%\usepackage{hfoldsty}
+%\usepackage[light,condensed,math]{iwona}
+%\renewcommand{\sfdefault}{iwona}
+%\usepackage{lmodern} % <-- no osf support :-(
+%\usepackage[urw-garamond]{mathdesign} <-- no osf support :-(
+
+%*******************************************************
+% Fine-tuning for the text area
+%*******************************************************
+%\linespread{1.05} % a bit more for Palatino
+%\areaset[5mm]{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
@@ -130,7 +149,9 @@
     showstringspaces=false,
     breaklines=true,
     frameround=ftff,
-    frame=single
+    frame=single,
+    belowcaptionskip=.75\baselineskip,
+    numberbychapter=false
     %frame=L
 } 
 % ********************************************************************
@@ -156,6 +177,7 @@
     pdfcreator={pdfLaTeX},%
     pdfproducer={LaTeX with hyperref and classicthesis}%
 }
+
 %********************************************************************
 % Hyphenation
 %*******************************************************
@@ -188,18 +210,18 @@
 %*******************************************************
 \pagenumbering{arabic}
 % use \cleardoublepage here to avoid problems with pdfbookmark
-\cleardoublepage\myPart{Some Kind of Manual}
+\cleardoublepage\part{Some Kind of Manual}
 \include{Chapters/Chapter01}
-\cleardoublepage\myPart{The Showcase}
+\cleardoublepage\part{The Showcase}
 \include{Chapters/Chapter02}
-%\addtocontents{toc}{\protect\clearpage} % TEST
+%\addtocontents{toc}{\protect\clearpage} % <--- just debug stuff, ignore
 \include{Chapters/Chapter03}
-%\include{multiToC}
+%\include{multiToC} % <--- just debug stuff, ignore for your documents
 % ********************************************************************
 % Backmatter
 %*******************************************************
 \appendix
-\cleardoublepage\myPart{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 babeebbda10..e07b625c103 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
@@ -4,70 +4,12 @@ Version=2
 
 [SessionInfo]
 ActiveTab=2
-FrameCount=4
-ActiveFrame=2
+FrameCount=1
+ActiveFrame=0
 
 [Frame0]
 Columns=1
 Rows=1
-Flags=0
-ShowCmd=1
-MinPos.x=-1
-MinPos.y=-1
-MaxPos.x=-4
-MaxPos.y=-23
-NormalPos.left=66
-NormalPos.top=66
-NormalPos.right=749
-NormalPos.bottom=372
-Class=CLatexEdit
-Document=classicthesis.sty
-
-[Frame0_Row0]
-cyCur=259
-cyMin=10
-
-[Frame0_Col0]
-cxCur=655
-cxMin=10
-
-[Frame0_View0,0]
-Cursor.row=441
-Cursor.column=62
-TopSubLine=490
-
-[Frame1]
-Columns=1
-Rows=1
-Flags=0
-ShowCmd=1
-MinPos.x=-1
-MinPos.y=-1
-MaxPos.x=-4
-MaxPos.y=-23
-NormalPos.left=44
-NormalPos.top=44
-NormalPos.right=727
-NormalPos.bottom=350
-Class=CLatexEdit
-Document=classicthesis-ldpkg.sty
-
-[Frame1_Row0]
-cyCur=259
-cyMin=10
-
-[Frame1_Col0]
-cxCur=655
-cxMin=10
-
-[Frame1_View0,0]
-Cursor.row=0
-Cursor.column=0
-TopSubLine=0
-
-[Frame2]
-Columns=1
-Rows=1
 Flags=2
 ShowCmd=3
 MinPos.x=-1
@@ -81,45 +23,16 @@ NormalPos.bottom=165
 Class=CLatexEdit
 Document=ClassicThesis.tex
 
-[Frame2_Row0]
-cyCur=402
-cyMin=10
-
-[Frame2_Col0]
-cxCur=996
-cxMin=10
-
-[Frame2_View0,0]
-Cursor.row=49
-Cursor.column=0
-TopSubLine=39
-
-[Frame3]
-Columns=1
-Rows=1
-Flags=0
-ShowCmd=1
-MinPos.x=-1
-MinPos.y=-1
-MaxPos.x=-4
-MaxPos.y=-23
-NormalPos.left=132
-NormalPos.top=132
-NormalPos.right=1016
-NormalPos.bottom=422
-Class=CLatexEdit
-Document=FrontBackmatter\Titlepage.tex
-
-[Frame3_Row0]
-cyCur=243
+[Frame0_Row0]
+cyCur=410
 cyMin=10
 
-[Frame3_Col0]
-cxCur=856
+[Frame0_Col0]
+cxCur=1006
 cxMin=10
 
-[Frame3_View0,0]
-Cursor.row=33
-Cursor.column=2
-TopSubLine=20
+[Frame0_View0,0]
+Cursor.row=76
+Cursor.column=11
+TopSubLine=70
 
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 6553569887a..4ac61ff341d 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
index 083b6955bdc..b5aeebbddff 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
index e652756a627..01afc74c0fc 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
@@ -1,29 +1,31 @@
 % book example for classicthesis.sty
 \documentclass[12pt,a5paper,footinclude]{scrbook} % KOMA-Script book
+\usepackage[T1]{fontenc}                
 \usepackage{lipsum}
-\usepackage[linedheaders,parts]{../classicthesis}
+\usepackage[linedheaders,parts]{../classicthesis} % ,manychapters
+\usepackage[osf]{libertine}
 %\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false}
 
 \begin{document}
     \tableofcontents
 
     % use \cleardoublepage here to avoid problems with pdfbookmark
-    \cleardoublepage\myPart{Test Part}
-    \myChapter{Test Chapter}
+    \cleardoublepage\part{Test Part}
+    \chapter{Test Chapter}
     \lipsum[1]
     
     \section{A Section}
     \lipsum[1]
     
-    \myChapter{Test Chapter}
+    \chapter{Test Chapter}
     \lipsum[1]
     
     \section{A Section}
     \lipsum[1]
 
     \appendix
-    \cleardoublepage\myPart{Appendix}
-    \myChapter{Appendix Chapter}
+    \cleardoublepage\part{Appendix}
+    \chapter{Appendix Chapter}
     \lipsum[1]
     
     \section{A Section}
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 27fb14cd653..9667710237a 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
index b0caef2a88f..850cb84094a 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
@@ -29,7 +29,7 @@ Kuhlmann, Philipp Lehman, Lothar Schlesier, Jim Young, Lorenzo
 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, 
+Legovini, Steffen Prochnow, Nicolas Repp, Hinrich Harms, 
 and the whole \LaTeX-community for support, ideas and some great software.
 
 \endgroup
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex
index 47f99d8310a..d277a14dcc4 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex
@@ -44,8 +44,8 @@ the corresponding lengths in the book:
 Please see the file \texttt{classicthesis.sty} for some precalculated 
 values for Palatino and Minion.
 
-%    \settowidth{\abcd}{abcdefghijklmnopqrstuvwxyz}
-%    \the\abcd\ % prints the value of the length
+    \settowidth{\abcd}{abcdefghijklmnopqrstuvwxyz}
+    \the\abcd\ % prints the value of the length
 
 
 \bigskip
diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
index 7f1164e1d66..8a66f03de47 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
+++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
@@ -6,7 +6,7 @@ scrkbase.sty    2007/12/24 v2.98 KOMA-Script package (basics and keyval use)
   keyval.sty    1999/03/16 v1.13 key=value parser (DPC)
 scrlfile.sty    2007/12/18 v2.98 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)
+  size11.clo    2005/09/16 v1.4f Standard LaTeX file (size option)
 typearea.sty    2007/12/24 v2.98 KOMA-Script package (type area)
 inputenc.sty    2006/05/05 v1.1b Input encoding file
   latin1.def    2006/05/05 v1.1b Input encoding file
@@ -19,7 +19,7 @@ ngermanb.ldf    2008/07/06 v2.6n new German support from the babel system
   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    2009/05/09 v2.5.1 Package Loader for Classic Thesis 
+classicthesis-ldpkg.sty    2009/10/04 v2.6.1 Package Loader for Classic Thesis 
 Style
   ifthen.sty    2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
  fontenc.sty
@@ -69,7 +69,7 @@ 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
   pdftex.def    2008/09/08 v0.04l Graphics/color for pdfTeX
-classicthesis.sty    2009/05/09 v2.5.1 Typographic Style for a classic-looking 
+classicthesis.sty    2009/10/04 v2.6.1 Typographic Style for a classic-looking 
 thesis
   xcolor.sty    2007/01/21 v2.11 LaTeX color extensions (UK)
    color.cfg    2007/01/18 v1.5 color configuration of teTeX/TeXLive
@@ -88,6 +88,7 @@ titlesec.sty    2007/08/12 v2.8 Sectioning titles
  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)
+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
diff --git a/Master/texmf-dist/doc/latex/classicthesis/README b/Master/texmf-dist/doc/latex/classicthesis/README
index 7487cd16661..da5d92f00f3 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) 2009 Andr\'e Miede http://www.miede.de
+Copyright (C) 2010 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
index 15d395d6292..fe55179a056 100644
--- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
+++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
@@ -1,7 +1,7 @@
 % ********************************************************************
 % classicthesis-ldpkg.sty (formerly known as loadpackages.sty)
 %
-% Copyright (C) 2009 André Miede http://www.miede.de
+% Copyright (C) 2010 André 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 
@@ -26,7 +26,7 @@
 %
 % ********************************************************************  
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis-ldpkg}[2009/08/01 v2.6 Package Loader for Classic Thesis Style]
+\ProvidesPackage{classicthesis-ldpkg}[2010/02/13 v2.7 Package Loader for Classic Thesis Style]
  
 \@ifpackageloaded{classicthesis}%
     {\PackageWarningNoLine{classicthesis-ldpkg}{Package "classicthesis" should be loaded AFTER "classicthesis-ldpkg".}}%
@@ -37,7 +37,9 @@
 % ******************************************************************** 
 \RequirePackage{ifthen}
     \newboolean{cld@nochapters} % disable all chapter-specific commands
+    \newboolean{cld@backref} % enable backrefs in the bibliography
 \DeclareOption{nochapters}{\setboolean{cld@nochapters}{true}}
+\DeclareOption{backref}{\setboolean{cld@backref}{true}}
 \ProcessOptions\relax
 
 % ******************************************************************** 
@@ -117,16 +119,20 @@
         }
         \renewcommand{\thefigure}{\arabic{figure}}  
     \makeatother
-		\makeatletter
-		    \@ifpackageloaded{listings}{%
-			    \ifthenelse{\boolean{cld@nochapters}}%
-			    {\relax}{%
-			        \@removefromreset{lstlisting}{chapter}% requires remreset package
-			    }
-			    \AtBeginDocument{\renewcommand{\thelstlisting}{\arabic{lstlisting}}} % <-- might cause an error with some TeX distributions
-			  }{\relax}
-		\makeatother
-
+%		\makeatletter
+%		    \@ifpackageloaded{listings}{%
+%			    \ifthenelse{\boolean{cld@nochapters}}%
+%			    {\relax}{%
+%			        \@removefromreset{lstlisting}{chapter}% requires remreset package
+%			        %\@removefromreset{listings}{chapter}% requires remreset package
+%			    }
+%			    \AtBeginDocument{%
+%			    	\renewcommand{\thelstlisting}{\arabic{lstlisting}}% % <-- might cause an error with some TeX distributions
+%			    	\renewcommand{\thelistings}{\arabic{listings}}% % <-- might cause an error with some TeX distributions
+%			    	}%
+%			  }{\relax}
+%		\makeatother
+		
 % ********************************************************************
 % enable subfigures in figures
 \RequirePackage{subfig}     
@@ -134,7 +140,7 @@
 % ********************************************************************
 % Using PDFLaTeX:
 % ********************************************************************
-\RequirePackage[pdftex,hyperfootnotes=false,pdfpagelabels,pagebackref]{hyperref}  % backref linktocpage pagebackref
+\RequirePackage[pdftex,hyperfootnotes=false,pdfpagelabels]{hyperref}  % backref linktocpage pagebackref
 \pdfcompresslevel=9
 \pdfadjustspacing=1 
 \RequirePackage[pdftex]{graphicx} % PDFTeX driver for graphicx
@@ -169,18 +175,22 @@
 \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}
+\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~%
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
index 5f7d2fad04f..c62d37b6ca5 100644
--- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
+++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
@@ -1,7 +1,7 @@
 % ********************************************************************
 % classicthesis.sty
 %
-% Copyright (C) 2009 André Miede http://www.miede.de
+% Copyright (C) 2010 André 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 
@@ -42,7 +42,7 @@
 %
 % ********************************************************************  
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis}[2009/08/01 v2.6 Typographic Style for a classic-looking thesis]
+\ProvidesPackage{classicthesis}[2010/02/13 v2.7 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)
@@ -60,6 +60,7 @@
     \newboolean{@a5paper} % use those tiny DIN A5 pages
     \newboolean{@dottedtoc} % page numbers in ToC flushed right
 		\newboolean{@listings} % load listings package (if not already) and setup LoL
+		\newboolean{@manychapters} % additional space in ToC after chapter number (if two digits are needed)
     
 % ********************************************************************
 % Options
@@ -85,6 +86,7 @@
 \DeclareOption{pdfspacing}{\setboolean{@pdfspacing}{true}} 
 \DeclareOption{dottedtoc}{\setboolean{@dottedtoc}{true}} 
 \DeclareOption{listings}{\setboolean{@listings}{true}}
+\DeclareOption{manychapters}{\setboolean{@manychapters}{true}}
 \ProcessOptions\relax
 
 % subfig-related stuff
@@ -131,14 +133,21 @@
                 \PackageWarningNoLine{classicthesis}{You cannot use "parts" at the same time %
                     as "nochapters"!}%
             }{\relax}%
+        % is the user trying to use manychapters at the same time?
+        \ifthenelse{\boolean{@manychapters}}%
+            {% both manychapters and nochapters are active
+                \PackageWarningNoLine{classicthesis}{You cannot use "manychapters" 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",%
+                This turns off the options "linedheaders", "manychapters",%
                 "listsseparated", "eulerchapternumbers", and "parts". Please be aware of that.}
         \setboolean{@linedheaders}{false}%
         \setboolean{@listsseparated}{false}%
         \setboolean{@eulerchapternumbers}{false}%
-        \setboolean{@parts}{false}
+        \setboolean{@parts}{false}%
+        \setboolean{@manychapters}{false}%
     }{\relax}%
 
 % ********************************************************************                
@@ -169,11 +178,6 @@
         % default: Palatino
         \RequirePackage[osf,sc]{mathpazo} % Palatino with real small caps and old style figures
         \linespread{1.05} % a bit more for Palatino
-        % just some font experiments (ignore)
-        %\RequirePackage{lmodern}
-        %\RequirePackage[urw-garamond]{mathdesign}
-        %\RequirePackage[light,condensed,math]{iwona}
-        %\renewcommand{\sfdefault}{iwona}
     }
 
 \ifthenelse{\boolean{@beramono}}%
@@ -186,6 +190,7 @@
 \ifthenelse{\boolean{@eulermath}}%
     {\RequirePackage[euler-digits]{eulervm}} % Euler math fonts
     {\relax}
+
 \ifthenelse{\boolean{@eulerchapternumbers}}% font for the chapter numbers
     {\newfont{\chapterNumber}{eurb10 scaled 7000}}%
     {\newfont{\chapterNumber}{pplr9d scaled 7000}}          
@@ -230,10 +235,13 @@
 % Here are some suggestions for the text widths and heights:
 % Palatino 	10pt: 288--312pt | 609--657pt
 % Palatino 	11pt: 312--336pt | 657--705pt
-% Palatino 	12pt: 
+% Palatino 	12pt: 360--384pt | 768pt
 % Minion 	  10pt: 264--288pt | 561--609pt
 % Minion 	  11pt: 288--312pt | 609--657pt
-% Minion 	  12pt: 
+% Minion 	  12pt: 336pt      | 672pt
+% Libertine 10pt:
+% Libertine 11pt:
+% Libertine 12pt:
 
 % ********************************************************************
 % Own Stuff
@@ -367,11 +375,26 @@
 \RequirePackage[titles]{tocloft}
     % avoid page numbers being right-aligned in fixed-size box              
     \newlength{\newnumberwidth}
-    \settowidth{\newnumberwidth}{99} % yields overfull hbox warnings for pages > 99
+    \settowidth{\newnumberwidth}{999} % yields overfull hbox warnings for pages > 999
     \cftsetpnumwidth{\newnumberwidth}
+    
     % have the bib neatly positioned after the rest
     \newlength{\beforebibskip}  
     \setlength{\beforebibskip}{0em}
+    
+    % space for more than nine chapters
+    \newlength{\newchnumberwidth}
+    \settowidth{\newchnumberwidth}{.} % <--- tweak here if more space required
+    \ifthenelse{\boolean{@manychapters}}% <--- many chapters option
+    {%    
+    	\addtolength{\cftchapnumwidth}{\newchnumberwidth}%
+	    \addtolength{\cftsecnumwidth}{\newchnumberwidth}
+	    \addtolength{\cftsecindent}{\newchnumberwidth}
+	    \addtolength{\cftsubsecnumwidth}{\newchnumberwidth}
+	    \addtolength{\cftsubsecindent}{2\newchnumberwidth}
+	    \addtolength{\cftsubsubsecnumwidth}{\newchnumberwidth}
+	  }{\relax}%
+	  
     % pagenumbers right after the titles
     % parts
     \ifthenelse{\boolean{@parts}}%
@@ -503,17 +526,28 @@
     \ifthenelse{\boolean{@nochapters}}%
     {\relax}%
     {%
-%% w/ optional parameter 
-        \newcommand{\myChapter}[2][]{% for chapters
-        	\ifthenelse{\equal{#1}{}}{%  
-        		%\chapter[\tocEntry{#2}]{#2} % causes soul "reconstruction failed" with plain LaTeX    
-            	\ifpdf\chapter[\texorpdfstring{\spacedlowsmallcaps{#2}}{#2}]{#2}%
-            	\else\chapter[\spacedlowsmallcaps{#2}]{#2}\fi%
-          }{%
-          		%\chapter[\tocEntry{#1}]{#2}
-          		\ifpdf\chapter[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}%
-            	\else\chapter[\spacedlowsmallcaps{#1}]{#2}\fi%
-        }}%
+%% use modified \chapter (thanks to Hinrich Harms)
+         \let\oldchap=\chapter
+         \renewcommand*{\chapter}{%
+                 \secdef{\Chap}{\ChapS}%
+         }
+         \newcommand\ChapS[1]{\oldchap*{#1}}%
+         \newcommand\Chap[2][]{%
+                 \ifpdf\oldchap[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}%
+                 \else\oldchap[\spacedlowsmallcaps{#1}]{#2}%
+                 \fi%
+         }
+%% Old version w/ optional parameter 
+%        \newcommand{\myChapter}[2][]{% for chapters
+%        	\ifthenelse{\equal{#1}{}}{%  
+%        		%\chapter[\tocEntry{#2}]{#2} % causes soul "reconstruction failed" with plain LaTeX    
+%            	\ifpdf\chapter[\texorpdfstring{\spacedlowsmallcaps{#2}}{#2}]{#2}%
+%            	\else\chapter[\spacedlowsmallcaps{#2}]{#2}\fi%
+%          }{%
+%          		%\chapter[\tocEntry{#1}]{#2}
+%          		\ifpdf\chapter[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}%
+%            	\else\chapter[\spacedlowsmallcaps{#1}]{#2}\fi%
+%        }}%
 %% Old version w/o optional parameter
 %        \newcommand{\myChapter}[1]{% for chapters      
 %            \ifpdf\chapter[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#1}%
@@ -524,20 +558,33 @@
     % yet another dirty work-around to get the spaced low small caps into the toc ;-(
     \ifthenelse{\boolean{@parts}}%
     {% 
-	    	\newcommand{\myPart}[2][]{% for parts     
-	    		\ifthenelse{\equal{#1}{}}{%  
-		        	\ifpdf%
-		        	% ugly hack to remove the part number from the PDF bookmark entry
-		        	\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}% 	        
-		        	\part[\texorpdfstring{\spacedlowsmallcaps{#2}}{#2}]{#2}% spacedallcaps spacedlowsmallcaps	
-		        	\else\part[\spacedlowsmallcaps{#2}]{#2}\fi%
-		      }{%
-		      		\ifpdf%
-		        	% ugly hack to remove the part number from the PDF bookmark entry
-		        	\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}% 	        
-		        	\part[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps	
-		        	\else\part[\spacedlowsmallcaps{#1}]{#2}\fi%
-     		}}%
+%% use modified \part (thanks to Hinrich Harms)
+	    	 \let\oldpart=\part%
+	       \renewcommand*{\part}{%
+	               \secdef{\Part}{\PartS}%
+	       }%
+	       \newcommand\PartS[1]{\oldpart*{#1}}%
+	       \newcommand\Part[2][]{%
+	               \ifpdf\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}%
+	                     \oldpart[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps
+%	               \else\oldpart[\spacedlowsmallcaps{#1}]{#2}%
+	               \fi%
+	       }%
+%% Old version w/ optional parameter 
+%	    	\newcommand{\myPart}[2][]{% for parts     
+%	    		\ifthenelse{\equal{#1}{}}{%  
+%		        	\ifpdf%
+%		        	% ugly hack to remove the part number from the PDF bookmark entry
+%		        	\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}% 	        
+%		        	\part[\texorpdfstring{\spacedlowsmallcaps{#2}}{#2}]{#2}% spacedallcaps spacedlowsmallcaps	
+%		        	\else\part[\spacedlowsmallcaps{#2}]{#2}\fi%
+%		      }{%
+%		      		\ifpdf%
+%		        	% ugly hack to remove the part number from the PDF bookmark entry
+%		        	\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}% 	        
+%		        	\part[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps	
+%		        	\else\part[\spacedlowsmallcaps{#1}]{#2}\fi%
+%     		}}%
      }{\relax}
              
     \newcommand{\tocEntry}[1]{% for bib, etc.
@@ -548,14 +595,21 @@
     % remove the vertical space between lof/lot entries of different chapters
     \ifthenelse{\boolean{@listsseparated}}{%
         \AtBeginDocument{%
-            \addtocontents{lof}{\protect\vspace{-\cftbeforechapskip}}%
-            \addtocontents{lot}{\protect\vspace{-\cftbeforechapskip}}%
+            \addtocontents{lof}{\protect\vspace{-10\cftbeforechapskip}}%
+            \addtocontents{lot}{\protect\vspace{-10\cftbeforechapskip}}%
+            \ifthenelse{\boolean{@listings}}%        
+    				{%
+             	\addtocontents{lol}{\protect\vspace{-10\cftbeforechapskip}}%
+            }%
         }%
     }{%
         \DeclareRobustCommand*{\deactivateaddvspace}{\let\addvspace\@gobble}% 
         \AtBeginDocument{%      
             \addtocontents{lof}{\deactivateaddvspace}% 
-            \addtocontents{lot}{\deactivateaddvspace}%      
+            \addtocontents{lot}{\deactivateaddvspace}%
+    				 {%
+             	\addtocontents{lol}{\deactivateaddvspace}%
+             }%                  
             %\addtocontents{lof}{\protect\renewcommand*{\protect\addvspace}[1]{}}% 
             %\addtocontents{lot}{\protect\renewcommand*{\protect\addvspace}[1]{}}% 
         }%