classicthesis (15aug12)

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

1 files changed, 56 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
index 6a8df68744c..2e6fd59c85d 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) 2011 Andr\'e Miede http://www.miede.de
+% Copyright (C) 2012 Andr\'e Miede http://www.miede.de
 %
 % If you like the style then I would appreciate a postcard. My address 
 % can be found in the file ClassicThesis.pdf. A collection of the 
@@ -28,7 +28,7 @@
 % Important:
 %
 % This style can also be used without the thesis template.
-% It works with both LaTeX and PDFLaTeX now.
+% It works with both LaTeX and PDFLaTeX now. XeLaTeX should also work.
 %
 % * You must not use "u etc. in strings/commands that will be spaced out 
 %   (use \"u or real umlauts instead)
@@ -39,7 +39,7 @@
 %
 % ********************************************************************  
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis}[2011/12/17 v4.0 Typographic style for a classic-looking thesis]
+\ProvidesPackage{classicthesis}[2012/08/12 v4.1 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)
@@ -56,9 +56,9 @@
     \newboolean{@subfig} % setup for preloaded @subfig package
     \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)
-		\newboolean{@floatperchapter} % numbering per chapter for all floats (i.e., Figure 1.1)
+	\newboolean{@listings} % load listings package (if not already) and setup LoL
+	\newboolean{@manychapters} % additional space in ToC after chapter number (if two digits are needed)
+	\newboolean{@floatperchapter} % numbering per chapter for all floats (i.e., Figure 1.1)
     
 % ********************************************************************
 % Options
@@ -156,11 +156,25 @@
     }{\relax}%
 
 % ********************************************************************                
-% PDF Stuff
+% PDF and XeLaTeX Stuff
 % ********************************************************************
 \RequirePackage{ifpdf}
 \ifpdf\RequirePackage{hyperref}\fi % for texorpdfstring command below
 
+% Necessary to rewrite hacks for chapters and parts and toc
+\RequirePackage{ifxetex}
+\ifxetex\RequirePackage{hyperref}\fi % for texorpdfstring command below
+
+% pdfspacing does not work with XeLaTeX
+\ifxetex%
+	\ifthenelse{\boolean{@pdfspacing}}%
+	    {% pdfspacing is used with XeLaTeX
+	        \PackageWarningNoLine{classicthesis}{You cannot use the option %
+	        "pdfspacing" with XeLaTeX!}%
+	    }{\relax}%
+	\setboolean{@pdfspacing}{false}%
+\fi
+
 % ********************************************************************                
 % Colors
 % ********************************************************************
@@ -567,7 +581,14 @@
                  \ifpdf\oldchap[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}%
                  \else\oldchap[\spacedlowsmallcaps{#1}]{#2}%
                  \fi%
-         }
+         }%
+		\ifxetex % thanks to Joerg Weber
+		\renewcommand\Chap[2][]{%
+					 \ifxetex\oldchap[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}%
+					 \else\oldchap[\spacedlowsmallcaps{#1}]{#2}%
+					 \fi%
+			 }%
+		\fi%
     }
     
     % yet another dirty work-around to get the spaced low small caps into the toc ;-(
@@ -579,21 +600,37 @@
 	               \secdef{\Part}{\PartS}%
 	       }%
 	       \newcommand\PartS[1]{\oldpart*{#1}}%
-	       \newcommand\Part[2][]{%
-	               \ifpdf\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}%
+				 \newcommand\Part[2][]{%
+	           \ifpdf\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}%
+	                 \oldpart[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps
+	           \else%
+	           			 \oldpart[\spacedlowsmallcaps{#1}]{#2}%
+	           \fi%
+%	         	 \renewcommand{\ct@parttext}{\relax}% Thanks to Ivo!
+					   \ctparttext{\relax}%
+	       }%
+				\ifxetex% thanks to Joerg Weber
+	       		\renewcommand\Part[2][]{%
+	               \ifxetex\pdfstringdefDisableCommands{\let\thepart=\@gobbletwo}%
 	                     \oldpart[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps
-	               \else\oldpart[\spacedlowsmallcaps{#1}]{#2}%
+	               \else%
+	               			\oldpart[\spacedlowsmallcaps{#1}]{#2}%
 	               \fi%
-%	               \renewcommand{\ct@parttext}{\relax}% Thanks to Ivo!
-									\ctparttext{\relax}%
+								\ctparttext{\relax}%
 	       }%
+				\fi%
      }{\relax}
              
     \newcommand{\tocEntry}[1]{% for bib, etc.
     	\ifpdf\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}%
         \else{#1}\fi%
     }
-
+		\ifxetex% thanks to Joerg Weber
+			\renewcommand{\tocEntry}[1]{% for bib, etc.
+    		\ifxetex\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}%
+       	\else{#1}\fi%
+    } \fi
+    
 %    % remove the vertical space between lof/lot entries of different chapters
 		\ifthenelse{\boolean{@listsseparated}}{%
 		 \PackageWarningNoLine{classicthesis}{Option "listsseparated" deprecated as of version 2.9.}%
@@ -638,8 +675,9 @@
 % Drafting Stuff
 % ********************************************************************
 \RequirePackage{scrtime} % time access
-\newcommand{\finalVersionString}{}
-\ifthenelse{\boolean{@drafting}}{% 
+\newcommand{\finalVersionString}{\relax}
+\providecommand{\myVersion}{$\!\!$} % w/o classicthesis-config.tex
+\ifthenelse{\boolean{@drafting}}{% 		
 %    \RequirePackage{draftwatermark}%
 %    	\SetWatermarkLightness{0.9}
 %			\SetWatermarkScale{.5}
@@ -647,8 +685,8 @@
 		\PassOptionsToPackage{draft}{prelim2e}
 		\RequirePackage{prelim2e}
         \renewcommand{\PrelimWords}{\relax}
-        \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\ -- \texttt{classicthesis} \myVersion\,]}
-}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ (\texttt{classicthesis} \myVersion).}}    
+        \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\ -- \texttt{classicthesis}~\myVersion\,]}
+}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ (\texttt{classicthesis}~\myVersion).}}    
 
 % ********************************************************************
 % Caption numbering now w/o chapter number