classicthesis 2.3 (4nov07)

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

14 files changed, 142 insertions, 151 deletions

diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
index 52cf07e720e..00821c3947b 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES
+++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
@@ -1,3 +1,23 @@
+Changes in version 2.3 (November 2007)
+o Fixed serious bug with \myChapter command (using plain 
+  LaTeX)
+o Removed hypcap package from classicthesis-ldpkg.sty and
+  placeins package from classicthesis.sty. Put both into
+  ClassicThesis.sty for finer end-user control
+o Removed obsolete KOMA options from ClassicThesis.tex
+o Option "subfigure" deprecated, replaced by "subfig" (in 
+  classicthesis.sty)
+o Inserted some mechanisms to detect whether subfig(ure) 
+  package was loaded or not (in classicthesis.sty)
+o Inserted some mechanism to detect whether classicthesis
+  packackage was loaded or not (in classicthesis-ldpkg.sty)
+o Moved "headlines" code block a bit up in 
+  classicthesis.sty (seemed to cause problems with new
+  KOMA-Script classes)
+o Removed accidental "natbib" from classicthesis-ldpkg.sty  
+o Some fine-tuning in (Dirty)Titlepage.tex
+o Thanks to Lorenzo and Denis! :-)
+
 Changes in version 2.2 (October 2007)
 o \myChapter and \myPart now take an optional argument
   just as the regular \part and \chapter commands
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
index 3bdf7099022..bc45045697f 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
@@ -11,7 +11,7 @@ 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 2.2}
+    \graffito{\myTitle \myVersion}
 \end{enumerate}
 The bundle is configured to run with a \emph{full} 
 MiK\TeX\ or \TeX Live\footnote{See the file \texttt{LISTOFFILES} for
@@ -132,8 +132,8 @@ allow for a bit of freedom concerning the layout:
     figures, respectively.
     \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{subfig}(\texttt{ure}) 
+    \item\texttt{subfig}(\texttt{ure}): is passed to the \texttt{tocloft} 
+    package to enable compatibility with the \texttt{subfig}(\texttt{ure}) 
     package.
     \item\texttt{nochapters}: allows to use the look-and-feel with 
     classes that do not use chapters, \eg, for articles. Automatically
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
index 2dd52be988d..1c14f81b6bc 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 c74981d541e..13970437502 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
@@ -36,23 +36,22 @@
 %    * 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[ twoside,openright,titlepage,fleqn,%1headlines,% 
                 pointlessnumbers,headinclude,BCOR5mm,%
-                10pt,a4paper,footinclude,cleardoubleempty,abstractoff % <--- obsolete, remove (todo)
+                %10pt,a4paper,footinclude,cleardoubleempty,abstractoff % <--- obsolete, remove (todo)
                 ]{scrreprt}
 % ********************************************************************
-% KOMA-Script setup (todo)
+% KOMA-Script setup (new, see commented line above)
 % ********************************************************************
-%\KOMAoptions{%
-%    paper=a4,%
-%    fontsize=10pt,%
-%    cleardoublepage=empty,%
-%    footinclude=true,%
-%    abstract=false%
-%}
+\KOMAoptions{%
+    paper=a4,%
+    fontsize=10pt,%
+    cleardoublepage=empty,%
+    footinclude=true,%
+    abstract=false%
+}
 % ********************************************************************
 % Development Stuff
 % ********************************************************************
@@ -72,7 +71,8 @@
 \newcommand{\myDepartment}{Put data here\xspace}
 \newcommand{\myUni}{\protect{Put data here}\xspace}
 \newcommand{\myLocation}{Hamburg\xspace}
-\newcommand{\myTime}{October 2007\xspace}
+\newcommand{\myTime}{November 2007\xspace}
+\newcommand{\myVersion}{Version 2.3\xspace}
 %*******************************************************
 % Packages with options that might require adjustments
 %*******************************************************
@@ -84,9 +84,12 @@
 %*******************************************************
 % Options for classicthesis.sty:
 % tocaligned eulerchapternumbers drafting linedheaders listsseparated
-% subfigure nochapters beramono eulermath parts minionpro pdfspacing
+% subfig nochapters beramono eulermath parts minionpro pdfspacing
 \usepackage[eulerchapternumbers,drafting,%pdfspacing,%
-            subfigure,beramono,eulermath,parts]{classicthesis}
+            subfig,beramono,eulermath,parts]{classicthesis}
+%*******************************************************            
+%\usepackage[section,below]{placeins} <--- not everybody wants this
+%\usepackage[all]{hypcap} <--- does not work with MiKTeX 2.6
 % ********************************************************************
 % Language/strings for backrefs (change here, thanks, Lorenzo)
 %*******************************************************
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
index 9000c19f8b3..127a3f1182b 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
@@ -4,47 +4,18 @@ Version=2
 
 [SessionInfo]
 ActiveTab=2
-FrameCount=3
-ActiveFrame=1
+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=75
-NormalPos.right=994
-NormalPos.bottom=311
-Class=CLatexEdit
-Document=classicthesis-ldpkg.sty
-
-[Frame0_Row0]
-cyCur=189
-cyMin=10
-
-[Frame0_Col0]
-cxCur=900
-cxMin=10
-
-[Frame0_View0,0]
-Cursor.row=0
-Cursor.column=0
-TopSubLine=0
-
-[Frame1]
-Columns=1
-Rows=1
 Flags=2
 ShowCmd=3
 MinPos.x=-1
 MinPos.y=-1
 MaxPos.x=-4
-MaxPos.y=-23
+MaxPos.y=-26
 NormalPos.left=0
 NormalPos.top=0
 NormalPos.right=704
@@ -52,45 +23,16 @@ NormalPos.bottom=165
 Class=CLatexEdit
 Document=ClassicThesis.tex
 
-[Frame1_Row0]
-cyCur=418
-cyMin=10
-
-[Frame1_Col0]
-cxCur=728
-cxMin=10
-
-[Frame1_View0,0]
-Cursor.row=74
-Cursor.column=28
-TopSubLine=63
-
-[Frame2]
-Columns=1
-Rows=1
-Flags=0
-ShowCmd=1
-MinPos.x=-1
-MinPos.y=-1
-MaxPos.x=-4
-MaxPos.y=-23
-NormalPos.left=22
-NormalPos.top=22
-NormalPos.right=770
-NormalPos.bottom=325
-Class=CLatexEdit
-Document=classicthesis.sty
-
-[Frame2_Row0]
-cyCur=256
+[Frame0_Row0]
+cyCur=317
 cyMin=10
 
-[Frame2_Col0]
-cxCur=720
+[Frame0_Col0]
+cxCur=997
 cxMin=10
 
-[Frame2_View0,0]
-Cursor.row=191
-Cursor.column=29
-TopSubLine=187
+[Frame0_View0,0]
+Cursor.row=45
+Cursor.column=50
+TopSubLine=38
 
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 953d4b3f990..0b2f7ca5944 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 a9f2a22e612..f68c5671628 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-cv.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
index 6de2a60d367..793d8828c52 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 efdeb7e6a43..754ac81eeb3 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
@@ -28,8 +28,8 @@ Regarding the typography and other help, many thanks go to Marco
 Kuhlmann, Philipp Lehman, Lothar Schlesier, Jim Young, Lorenzo 
 Pantieri\footnote{Member of GuIT (Gruppo Italiano Utilizzatori 
 di \TeX\ e \LaTeX )}, J\"org Sommer, Joachim K\"ostler, Daniel 
-Gottschlag, and the whole \LaTeX-community for support, ideas 
-and some great software.
+Gottschlag, Denis Aydin, and the whole \LaTeX-community for 
+support, ideas and some great software.
 
 \endgroup
 
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex
index e8701e1ef8f..1c9673e2077 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex
@@ -7,5 +7,7 @@
 \begin{center}
     \spacedlowsmallcaps{\myName} \\ \medskip                        
 
-    {\color{Maroon}\spacedallcaps{\myTitle}}       
+    \begingroup
+        \color{Maroon}\spacedallcaps{\myTitle}
+    \endgroup
 \end{center}        
diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
index 40dc3132552..d2158ba55cb 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
@@ -9,7 +9,9 @@
 
         \vfill
 
-        {\color{Maroon}\spacedallcaps{\myTitle}} \\ \bigskip
+        \begingroup
+            \color{Maroon}\spacedallcaps{\myTitle} \\ \bigskip
+        \endgroup
 
         \spacedlowsmallcaps{\myName}
 
diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
index 08777f49b9a..caa68de67e4 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
+++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
@@ -1,20 +1,21 @@
 LIST OF FILES FOR ClassicThesis.tex
 
- *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)
+  *File List*
+scrreprt.cls    2007/10/12 v2.97d KOMA-Script document class (report)
+scrkbase.sty    2007/10/12 v2.97d KOMA-Script package (basics and keyval use)
   keyval.sty    1999/03/16 v1.13 key=value parser (DPC)
+scrlfile.sty    2007/03/07 v2.97a 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)
+  size11.clo    2005/09/16 v1.4f Standard LaTeX file (size option)
+typearea.sty    2007/10/12 v2.97d 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
    babel.sty    2005/11/23 v3.8h The Babel package
+ bblopts.cfg    2006/07/31 v1.0 MiKTeX 'babel' configuration
 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)
-classicthesis-ldpkg.sty    2007/10/01 v2.2 Package Loader for Classic Thesis St
+classicthesis-ldpkg.sty    2007/11/01 v2.3 Package Loader for Classic Thesis St
 yle
   ifthen.sty    2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
  fontenc.sty
@@ -24,7 +25,7 @@ textcomp.sty    2005/09/27 v1.99g Standard LaTeX package
   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)
-mparhack.sty    2003/05/22 v1.3a (T. Sgouros and S. Ulrich)
+mparhack.sty    2005/04/17 v1.4 (T. Sgouros and S. Ulrich)
 fixltx2e.sty    2006/03/24 v1.1n fixes to LaTeX
  amsmath.sty    2000/07/18 v2.13 AMS math features
  amstext.sty    2000/06/29 v2.01
@@ -32,16 +33,15 @@ fixltx2e.sty    2006/03/24 v1.1n fixes to LaTeX
   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    2006/06/26 v1.26 Support for acronyms (Tobias Oetiker)
+ acronym.sty    2005/11/11 v1.25 Support for acronyms (Tobias Oetiker)
   suffix.sty    2006/07/15 1.5 Variant command support
- caption.sty    2007/01/07 v3.0k Customising captions (AR)
-caption3.sty    2007/01/07 v3.0k caption3 kernel (AR)
+ caption.sty    2007/10/25 v3.1d Customising captions (AR)
+caption3.sty    2007/10/25 v3.1d 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
+listings.sty    2007/02/22 1.4 (Carsten Heinz)
+ lstmisc.sty    2007/02/22 1.4 (Carsten Heinz)
+listings.cfg    2007/02/22 1.4 listings configuration
 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
@@ -51,45 +51,44 @@ 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)
-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
+ lstmisc.sty    2007/02/22 1.4 (Carsten Heinz)
+hyperref.sty    2007/06/14 v6.76i Hypertext links for LaTeX
+ hycolor.sty    2007/04/11 v1.1 Code for color options of hyperref/bookmark (HO
 )
+  pd1enc.def    2007/06/14 v6.76i Hyperref: PDFDocEncoding definition (HO)
+etexcmds.sty    2007/09/09 v1.1 Prefix for e-TeX command names (HO)
+infwarerr.sty    2007/09/09 v1.2 Providing info/warning/message (HO)
+hyperref.cfg    2002/06/06 v1.2 hyperref configuration of TeXLive
+kvoptions.sty    2007/10/18 v3.0 Keyval support for 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
+ hpdftex.def    2007/06/14 v6.76i 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
-  pdftex.def    2007/01/08 v0.04d Graphics/color for pdfTeX
-  hypcap.sty    2006/02/20 v1.5 Adjusting anchors of captions (HO)
-classicthesis.sty    2007/10/01 v2.2 Typographic Style for a classic-looking th
+  pdftex.def    2007/06/12 v0.04h Graphics/color for pdfTeX
+classicthesis.sty    2007/11/01 v2.3 Typographic Style for a classic-looking th
 esis
-   ifpdf.sty    2006/02/20 v1.4 Provides the ifpdf switch (HO)
+   ifpdf.sty    2007/09/09 v1.5 Provides the ifpdf switch (HO)
   xcolor.sty    2007/01/21 v2.11 LaTeX color extensions (UK)
    color.cfg    2007/01/18 v1.5 color configuration of teTeX/TeXLive
 dvipsnam.def    1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
 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    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
+microtype.sty    2007/07/14 v2.2 Micro-typography with pdfTeX (RS)
+microtype.cfg    2007/07/14 v2.2 microtype main configuration file (RS)
+booktabs.sty    2005/04/14 v1.61803 publication quality tables
 textcase.sty    2004/10/07 v0.07 Text only upper/lower case changing (DPC)
     soul.sty    2003/11/17 v2.4 letterspacing/underlining (mf)
-placeins.sty    2005/04/18  v 2.2
-titlesec.sty    2005/01/22 v2.6 Sectioning titles
-scrpage2.sty    2006/03/29 v2.2c LaTeX2e KOMA-Script package
+scrpage2.sty    2007/07/23 v2.2e LaTeX2e KOMA-Script package
+titlesec.sty    2007/08/12 v2.8 Sectioning titles
  tocloft.sty    2003/09/26 v2.3c parameterised ToC, etc., typesetting
  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.
-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
+ nameref.sty    2007/05/29 v2.31 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 b2a8c11cac3..dd1b9f9a85a 100644
--- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
+++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
@@ -26,7 +26,11 @@
 %
 % ********************************************************************  
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis-ldpkg}[2007/10/01 v2.2 Package Loader for Classic Thesis Style]
+\ProvidesPackage{classicthesis-ldpkg}[2007/11/01 v2.3 Package Loader for Classic Thesis Style]
+ 
+\@ifpackageloaded{classicthesis}%
+    {\PackageWarningNoLine{classicthesis-ldpkg}{Package "classicthesis" should be loaded AFTER "classicthesis-ldpkg".}}%
+    {\relax}%    
  
 % ********************************************************************
 % Options
@@ -51,7 +55,7 @@
 \RequirePackage{relsize} % scale font up or down                                        
 \RequirePackage[smaller]{acronym} % nice macros for handling all acronyms in the thesis
 \renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms
-\RequirePackage{natbib}
+%\RequirePackage{natbib}
 
 % ********************************************************************
 % Commands
@@ -196,7 +200,7 @@
 
 % ********************************************************************
 % get the links to the figures and tables right
-\RequirePackage[all]{hypcap} % to be loaded after hyperref package
+%\RequirePackage[all]{hypcap} % to be loaded after hyperref package
 
 % ********************************************************************
 % setup the style of the backrefs from the bibliography
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
index 746917494dd..5c40dfae73a 100644
--- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
+++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
@@ -42,7 +42,7 @@
 %
 % ********************************************************************  
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis}[2007/10/01 v2.2 Typographic Style for a classic-looking thesis]
+\ProvidesPackage{classicthesis}[2007/11/01 v2.3 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)
@@ -57,6 +57,7 @@
     \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)
+    \newboolean{subfig} % setupt for preloaded subfig package
     
 % ********************************************************************
 % Options
@@ -66,7 +67,11 @@
 \DeclareOption{drafting}{\setboolean{drafting}{true}}
 \DeclareOption{linedheaders}{\setboolean{linedheaders}{true}}
 \DeclareOption{listsseparated}{\setboolean{listsseparated}{true}}
-\DeclareOption{subfigure}{\PassOptionsToPackage{subfigure}{tocloft}}
+\DeclareOption{subfigure}{%
+    \PackageWarningNoLine{classicthesis}{Package "subfigure" and option "subfigure are deprecated, used "subfig instead.}
+    \setboolean{subfig}{true}%
+    }
+\DeclareOption{subfig}{\setboolean{subfig}{true}}
 \DeclareOption{nochapters}{\setboolean{nochapters}{true}}
 \DeclareOption{beramono}{\setboolean{beramono}{true}} 
 \DeclareOption{eulermath}{\setboolean{eulermath}{true}} 
@@ -77,6 +82,19 @@
 \DeclareOption{pdfspacing}{\setboolean{pdfspacing}{true}} 
 \ProcessOptions\relax
 
+% subfig-related stuff
+\@ifpackageloaded{subfig}%
+    {\setboolean{subfig}{true}%
+    }{\relax}
+\@ifpackageloaded{subfigure}%
+    {\setboolean{subfig}{true}%
+     \PackageWarningNoLine{classicthesis}{Package "subfigure" and option "subfigure are deprecated, %
+                                            use "subfig instead.}
+    }{\relax}
+\ifthenelse{\boolean{subfig}}%
+    {\PassOptionsToPackage{subfigure}{tocloft}%
+    }{\relax}%
+
 % fine-tuning if we use minionprospacing
 \ifthenelse{\boolean{minionprospacing}}%
     {%
@@ -250,12 +268,26 @@
 	            \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\MakeTextLowercase{\textsc{\lowsmallcapsspacing{#1}}}}%
         }%
     }
-    
+
+% ********************************************************************                
+% headlines
+% ********************************************************************  
+\RequirePackage[automark]{scrpage2} % provides headers and footers (KOMA Script)
+    \clearscrheadings
+    \setheadsepline{0pt}
+    \ifthenelse{\boolean{nochapters}}%
+        {\relax}%
+        {\renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{}}}
+    \renewcommand{\sectionmark}[1]{\markright{\thesection\ \spacedlowsmallcaps{#1}}}
+    \lehead{\mbox{\llap{\small\thepage\kern2em}\headmark\hfil}}
+    \rohead{\mbox{\hfil{\headmark}\rlap{\small\kern2em\thepage}}}
+    \renewcommand{\headfont}{\small}  
+
 % ********************************************************************
 % figures are placed only within section they were declared in
 % provides command \FloatBarrier
 % ********************************************************************
-\RequirePackage[section,below]{placeins}    
+%\RequirePackage[section,below]{placeins}    
     
 % ********************************************************************
 % layout of the chapter-, section-, subsection-, subsubsection-,
@@ -304,20 +336,6 @@
     \titlespacing*{\paragraph}{0pt}{1\baselineskip}{1\baselineskip}
 
 % ********************************************************************                
-% headlines
-% ********************************************************************  
-\RequirePackage[automark]{scrpage2} % provides headers and footers (KOMA Script)
-    \clearscrheadings
-    \setheadsepline{0pt}
-    \ifthenelse{\boolean{nochapters}}%
-        {\relax}%
-        {\renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{}}}
-    \renewcommand{\sectionmark}[1]{\markright{\thesection\ \spacedlowsmallcaps{#1}}}
-    \lehead{\mbox{\llap{\small\thepage\kern2em}\headmark\hfil}}
-    \rohead{\mbox{\hfil{\headmark}\rlap{\small\kern2em\thepage}}}
-    \renewcommand{\headfont}{\small}    
-  
-% ********************************************************************                
 % layout of the TOC, LOF and LOT (LOL-workaround see next section)
 % ********************************************************************
 \RequirePackage[titles]{tocloft}
@@ -411,17 +429,18 @@
     \ifthenelse{\boolean{nochapters}}%
     {\relax}%
     {%
+%% w/ optional parameter 
         \newcommand{\myChapter}[2][]{% for chapters
         	\ifthenelse{\equal{#1}{}}{%  
-        			\chapter[\tocEntry{#2}]{#2}    
-            	%\ifpdf\chapter[\texorpdfstring{\spacedlowsmallcaps{#2}}{#2}]{#2}%
-            	%\else\chapter[\spacedlowsmallcaps{#2}]{#2}\fi%
+        		%\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%
+          		%\chapter[\tocEntry{#1}]{#2}
+          		\ifpdf\chapter[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}%
+            	\else\chapter[\spacedlowsmallcaps{#1}]{#2}\fi%
         }}%
-%				 % Old version w/o optional parameter
+%% Old version w/o optional parameter
 %        \newcommand{\myChapter}[1]{% for chapters      
 %            \ifpdf\chapter[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#1}%
 %            \else\chapter[\spacedlowsmallcaps{#1}]{#1}\fi%