classicthesis update (23sep08)

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

2 files changed, 107 insertions, 90 deletions

diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
index dd1b9f9a85a..abbff96099f 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) 2007 André Miede http://www.miede.de
+% Copyright (C) 2008 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}[2007/11/01 v2.3 Package Loader for Classic Thesis Style]
+\ProvidesPackage{classicthesis-ldpkg}[2008/10/01 v2.5 Package Loader for Classic Thesis Style]
  
 \@ifpackageloaded{classicthesis}%
     {\PackageWarningNoLine{classicthesis-ldpkg}{Package "classicthesis" should be loaded AFTER "classicthesis-ldpkg".}}%
@@ -36,8 +36,8 @@
 % Options
 % ******************************************************************** 
 \RequirePackage{ifthen}
-    \newboolean{@nochapters} % disable all chapter-specific commands
-\DeclareOption{nochapters}{\setboolean{@nochapters}{true}}
+    \newboolean{cld@nochapters} % disable all chapter-specific commands
+\DeclareOption{nochapters}{\setboolean{cld@nochapters}{true}}
 \ProcessOptions\relax
 
 % ******************************************************************** 
@@ -50,8 +50,7 @@
 \RequirePackage{tabularx} % better tables
 \RequirePackage{mparhack} % get marginpar right
 \RequirePackage{fixltx2e} % fixes some LaTeX stuff
-%\RequirePackage{ellipsis} % ... ;-)
-\RequirePackage[fleqn]{amsmath} % math environments and more by the AMS                   
+%\RequirePackage{ellipsis} % ... ;-)                  
 \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
@@ -78,7 +77,11 @@
 \newcommand{\system}[1]{\emph{#1}}
 \newcommand{\person}[1]{#1}
 \newcommand{\term}[1]{\emph{#1}}
-\newcommand{\cauthor}[1]{\person{\citeauthor{#1}}}
+\newcommand{\cauthor}[1]{\relax}
+\@ifpackageloaded{natbib}%
+    {\renewcommand{\cauthor}[1]{\person{\citeauthor{#1}}}%
+    }{\PackageWarningNoLine{classicthesis-ldpk}{Package "natbib" not loaded, %
+        command "cauthor" will not work.}}
 \newcommand{\tableheadline}[1]{\multicolumn{1}{c}{\spacedlowsmallcaps{#1}}}
 % ******************************************************************** 
 \newcommand{\RA}{\ensuremath{\Rightarrow}}
@@ -96,14 +99,14 @@
 % caption numbering now w/o chapter number
 \RequirePackage{remreset}
     \makeatletter
-        \ifthenelse{\boolean{@nochapters}}%
+        \ifthenelse{\boolean{cld@nochapters}}%
         {\relax}{%
             \@removefromreset{table}{chapter}  % requires remreset package
         }
         \renewcommand{\thetable}{\arabic{table}}
     \makeatother
     \makeatletter
-        \ifthenelse{\boolean{@nochapters}}%
+        \ifthenelse{\boolean{cld@nochapters}}%
         {\relax}{%
             \@removefromreset{figure}{chapter}  % requires remreset package
         }
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
index 5c40dfae73a..4546459be78 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) 2007 André Miede http://www.miede.de
+% Copyright (C) 2008 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,80 +42,80 @@
 %
 % ********************************************************************  
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis}[2007/11/01 v2.3 Typographic Style for a classic-looking thesis]
+\ProvidesPackage{classicthesis}[2008/10/01 v2.5 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)
-    \newboolean{drafting} % print version information on pages
-    \newboolean{linedheaders} % chaper headers will have line above and beneath
-    \newboolean{listsseparated} % toggles the vertical space between lof/lot entries of different chapters
-    \newboolean{nochapters} % disable all chapter-specific commands 
-    \newboolean{beramono} % toggle nice monospaced font (w/ bold) + pre-installed 
-    \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)
-    \newboolean{subfig} % setupt for preloaded subfig package
+    \newboolean{@tocaligned} % the left column of the toc will be aligned (no indention)
+    \newboolean{@eulerchapternumbers} % use AMS Euler for chapter font (otherwise Palatino)
+    \newboolean{@drafting} % print version information on pages
+    \newboolean{@linedheaders} % chaper headers will have line above and beneath
+    \newboolean{@listsseparated} % toggles the vertical space between lof/lot entries of different chapters
+    \newboolean{@nochapters} % disable all chapter-specific commands 
+    \newboolean{@beramono} % toggle nice monospaced font (w/ bold) + pre-installed 
+    \newboolean{@eulermath} % use awesome Euler fonts for math
+    \newboolean{@parts} % use part division for the text
+    \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} % setup for preloaded @subfig package
+    \newboolean{@a5paper} % use those tiny DIN A5 pages
     
 % ********************************************************************
 % Options
 % ******************************************************************** 
-\DeclareOption{tocaligned}{\setboolean{tocaligned}{true}}
-\DeclareOption{eulerchapternumbers}{\setboolean{eulerchapternumbers}{true}}
-\DeclareOption{drafting}{\setboolean{drafting}{true}}
-\DeclareOption{linedheaders}{\setboolean{linedheaders}{true}}
-\DeclareOption{listsseparated}{\setboolean{listsseparated}{true}}
+\DeclareOption{tocaligned}{\setboolean{@tocaligned}{true}}
+\DeclareOption{eulerchapternumbers}{\setboolean{@eulerchapternumbers}{true}}
+\DeclareOption{drafting}{\setboolean{@drafting}{true}}
+\DeclareOption{linedheaders}{\setboolean{@linedheaders}{true}}
+\DeclareOption{listsseparated}{\setboolean{@listsseparated}{true}}
 \DeclareOption{subfigure}{%
-    \PackageWarningNoLine{classicthesis}{Package "subfigure" and option "subfigure are deprecated, used "subfig instead.}
-    \setboolean{subfig}{true}%
+    \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}} 
-\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}} 
+\DeclareOption{subfig}{\setboolean{@subfig}{true}}
+\DeclareOption{nochapters}{\setboolean{@nochapters}{true}}
+\DeclareOption{beramono}{\setboolean{@beramono}{true}} 
+\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
 
 % subfig-related stuff
 \@ifpackageloaded{subfig}%
-    {\setboolean{subfig}{true}%
+    {\setboolean{@subfig}{true}%
     }{\relax}
 \@ifpackageloaded{subfigure}%
-    {\setboolean{subfig}{true}%
-     \PackageWarningNoLine{classicthesis}{Package "subfigure" and option "subfigure are deprecated, %
-                                            use "subfig instead.}
+    {\setboolean{@subfig}{true}%
+     \PackageWarningNoLine{classicthesis}{Package "subfigure" and option "subfigure" are deprecated, %
+                                            use "subfig" instead.}
     }{\relax}
-\ifthenelse{\boolean{subfig}}%
+\ifthenelse{\boolean{@subfig}}%
     {\PassOptionsToPackage{subfigure}{tocloft}%
     }{\relax}%
 
 % fine-tuning if we use minionprospacing
-\ifthenelse{\boolean{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}}%
+        \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}%
+        \setboolean{@minionpro}{true}%
+        \setboolean{@pdfspacing}{false}%
     }{\relax}
 
 % fine-tuning if we do not use chapters
-\ifthenelse{\boolean{nochapters}}%
+\ifthenelse{\boolean{@nochapters}}%
     {%
         % is the user trying to use parts at the same time?
-        \ifthenelse{\boolean{parts}}%
+        \ifthenelse{\boolean{@parts}}%
             {% both parts and nochapters are active
                 \PackageWarningNoLine{classicthesis}{You cannot use "parts" at the same time %
                     as "nochapters"!}%
@@ -124,10 +124,10 @@
         \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}
+        \setboolean{@linedheaders}{false}%
+        \setboolean{@listsseparated}{false}%
+        \setboolean{@eulerchapternumbers}{false}%
+        \setboolean{@parts}{false}
     }{\relax}%
 
 % ********************************************************************                
@@ -150,10 +150,10 @@
 % ********************************************************************
 % Font Stuff
 % ********************************************************************   
-\ifthenelse{\boolean{minionpro}}%
+\ifthenelse{\boolean{@minionpro}}%
     {%
         % specialists: MinionPro
-        \RequirePackage[opticals,osf]{MinionPro} %  opticals, fullfamily,
+        \RequirePackage[opticals,mathlf]{MinionPro} %  opticals, fullfamily, osf
     }{%
         % default: Palatino
         \RequirePackage[osf,sc]{mathpazo} % Palatino with real small caps and old style figures
@@ -165,17 +165,17 @@
         %\renewcommand{\sfdefault}{iwona}
     }
 
-\ifthenelse{\boolean{beramono}}%
+\ifthenelse{\boolean{@beramono}}%
     {\RequirePackage[scaled=0.85]{beramono}}%
     {%
     	\relax%
     	% put your own suitable typewriter font here
     	%\renewcommand{\ttdefault}{\rmdefault}
     } 
-\ifthenelse{\boolean{eulermath}}%
+\ifthenelse{\boolean{@eulermath}}%
     {\RequirePackage[euler-digits]{eulervm}} % Euler math fonts
     {\relax}
-\ifthenelse{\boolean{eulerchapternumbers}}% font for the chapter numbers
+\ifthenelse{\boolean{@eulerchapternumbers}}% font for the chapter numbers
     {\newfont{\chapterNumber}{eurb10 scaled 7000}}%
     {\newfont{\chapterNumber}{pplr9d scaled 7000}}          
     % Euler eurb10 / Palatino OSF pplr9d / Palatino SC pplrc9d
@@ -188,35 +188,41 @@
 % ********************************************************************
 % Textblock size
 %*******************************************************
-\ifthenelse{\boolean{a5paper}}%
+\ifthenelse{\boolean{@a5paper}}%
     {% A5
-        \ifthenelse{\boolean{minionpro}}%
+        \ifthenelse{\boolean{@minionpro}}%
         {% Minion gets some extra sizes
+        		\PackageInfo{classicthesis}{A5 paper, MinionPro}
             \areaset[5mm]{278pt}{556pt}%
             \setlength{\marginparwidth}{5em}%
             \setlength{\marginparsep}{1.25em}%
-        }{% Palatino or else
+        }{% Palatino or other
+        		\PackageInfo{classicthesis}{A5 paper, Palatino or other}
             \areaset[5mm]{288pt}{555pt}%
             \setlength{\marginparwidth}{4em}%
             \setlength{\marginparsep}{1.25em}%
         }%
 	}{% A4
-        \ifthenelse{\boolean{minionpro}}%
+        \ifthenelse{\boolean{@minionpro}}%
         {% Minion gets some extra sizes
+        		\PackageInfo{classicthesis}{A4 paper, MinionPro}
             \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
+        }{% Palatino or other
+        		\PackageInfo{classicthesis}{A4 paper, Palatino or other}
+            \areaset[5mm]{312pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip
             \setlength{\marginparwidth}{7em}%
             \setlength{\marginparsep}{2em}%
         }%
 	}
-% Here some suggestions for the text widths and heights:
+% Here are some suggestions for the text widths and heights:
 % Palatino 	10pt: 288--312pt | 609--657pt
-% Palatino 	11pt: 312--336pt | 657--705
-% Minion 	10pt: 264--288pt | 561--609pt
-% Minion 	11pt: 288--312pt | 609--657pt
+% Palatino 	11pt: 312--336pt | 657--705pt
+% Palatino 	12pt: 
+% Minion 	  10pt: 264--288pt | 561--609pt
+% Minion 	  11pt: 288--312pt | 609--657pt
+% Minion 	  12pt: 
 
 % ********************************************************************
 % Own Stuff
@@ -230,6 +236,7 @@
 % Graffiti as in GKP's book "Concrete Mathematics"
 \DeclareRobustCommand{\graffito}[1]{\marginpar{%
     \slshape\footnotesize%\small%
+    %\ifodd\thepage\raggedright\else\raggedleft\fi%
     \parindent=0pt\lineskip=0pt\lineskiplimit=0pt%\baselineskip=10pt
     \tolerance=2000\hyphenpenalty=300\exhyphenpenalty=300%
     \doublehyphendemerits=100000\finalhyphendemerits=\doublehyphendemerits%
@@ -247,13 +254,13 @@
 \RequirePackage{booktabs} % for better rules in tables
 \RequirePackage{textcase} % for \MakeTextUppercase
 
-\ifthenelse{\boolean{minionprospacing}}%
+\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}}%
+        \ifthenelse{\boolean{@pdfspacing}}%
         {%
             \PackageInfo{classicthesis}{Using pdftex/microtype for character spacing.%
                                         Make sure your pdftex is version 1.40 or higher.}%
@@ -275,13 +282,20 @@
 \RequirePackage[automark]{scrpage2} % provides headers and footers (KOMA Script)
     \clearscrheadings
     \setheadsepline{0pt}
-    \ifthenelse{\boolean{nochapters}}%
+    \ifthenelse{\boolean{@nochapters}}%
         {\relax}%
-        {\renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{}}}
-    \renewcommand{\sectionmark}[1]{\markright{\thesection\ \spacedlowsmallcaps{#1}}}
+        {\renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}}}
+    \renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}} 
     \lehead{\mbox{\llap{\small\thepage\kern2em}\headmark\hfil}}
     \rohead{\mbox{\hfil{\headmark}\rlap{\small\kern2em\thepage}}}
     \renewcommand{\headfont}{\small}  
+    %\DeclareRobustCommand{\fixBothHeadlines}[1]{} % <--- ToDo
+    % hack to get the content headlines right (thanks, Lorenzo!)
+		\def\toc@heading{%
+	 		\ifthenelse{\boolean{@nochapters}}%
+	 		{\section*{\contentsname}}%nochapters
+	 		{\chapter*{\contentsname}}%chapters
+	 		\@mkboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}}}
 
 % ********************************************************************
 % figures are placed only within section they were declared in
@@ -295,7 +309,7 @@
 % ********************************************************************             
 \RequirePackage{titlesec}
 		% parts
-		\ifthenelse{\boolean{parts}}%
+		\ifthenelse{\boolean{@parts}}%
 		{%
     \titleformat{\part}[display]
         {\normalfont\centering\large}%
@@ -303,7 +317,7 @@
         {\color{Maroon}\spacedallcaps}
     }{\relax}
     % chapters
-    \ifthenelse{\boolean{linedheaders}}%
+    \ifthenelse{\boolean{@linedheaders}}%
     {% lines above and below, number right
     \titleformat{\chapter}[display]%             
         {\relax}{\raggedleft{\color{halfgray}\chapterNumber\thechapter} \\ }{0pt}%
@@ -328,7 +342,7 @@
     % descriptionlabels
         \renewcommand{\descriptionlabel}[1]{\hspace*{\labelsep}\spacedlowsmallcaps{#1}}   % spacedlowsmallcaps textit textsc                  
     % spacing
-    \ifthenelse{\boolean{nochapters}}%
+    \ifthenelse{\boolean{@nochapters}}%
         {\relax}%
         {\titlespacing*{\chapter}{0pt}{1\baselineskip}{1.2\baselineskip}}
     \titlespacing*{\section}{0pt}{1.25\baselineskip}{1\baselineskip} 
@@ -348,7 +362,7 @@
     \setlength{\beforebibskip}{0em}
     % pagenumbers right after the titles
     % parts
-    \ifthenelse{\boolean{parts}}%
+    \ifthenelse{\boolean{@parts}}%
     {%
       \renewcommand{\thepart}{\roman{part}}%
       \renewcommand{\cftpartpresnum}{\scshape}%  \MakeTextLowercase
@@ -364,7 +378,7 @@
       \setlength{\beforebibskip}{\cftbeforepartskip}%
      }{\relax}
     % chapters
-    \ifthenelse{\boolean{nochapters}}%
+    \ifthenelse{\boolean{@nochapters}}%
         {\relax}%
         {%
         	\renewcommand{\cftchappresnum}{\scshape\MakeTextLowercase}%
@@ -375,7 +389,7 @@
             %\setlength{\cftbeforechapskip}{.1em}%           
         }
     % sections
-    \ifthenelse{\boolean{nochapters}}%        
+    \ifthenelse{\boolean{@nochapters}}%        
         {%
             \setlength{\cftbeforesecskip}{.1em}%
             \setlength{\beforebibskip}{1em}%
@@ -386,13 +400,13 @@
         \renewcommand{\cftsecpagefont}{\normalfont}%
         \renewcommand{\cftsecleader}{\hspace{1.5em}} 
         \renewcommand{\cftsecafterpnum}{\cftparfillskip}
-        \ifthenelse{\boolean{tocaligned}}{\renewcommand{\cftsecindent}{0em}}{\relax}
+        \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}
+        \ifthenelse{\boolean{@tocaligned}}{\renewcommand{\cftsubsecindent}{0em}}{\relax}
     % figures     
     	\renewcommand{\cftfigpresnum}{\scshape\MakeTextLowercase}% 
     	\renewcommand{\cftfigfont}{\normalfont}%                 
@@ -416,17 +430,17 @@
         \cftsetindents{table}{0em}{\figurelabelwidth}
 
     % dirty work-around to get the spacing after the toc/lot/lof-titles right    
-    \ifthenelse{\boolean{parts}}%        
+    \ifthenelse{\boolean{@parts}}%        
     {%
     		\AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforepartskip}}}
     }{%
-        \ifthenelse{\boolean{nochapters}}%
+        \ifthenelse{\boolean{@nochapters}}%
     		{\relax}%
     		{\AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforechapskip}}}}
     }
                                        
     % another dirty work-around to get the spaced low small caps into the toc ;-(
-    \ifthenelse{\boolean{nochapters}}%
+    \ifthenelse{\boolean{@nochapters}}%
     {\relax}%
     {%
 %% w/ optional parameter 
@@ -448,7 +462,7 @@
     }
     
     % yet another dirty work-around to get the spaced low small caps into the toc ;-(
-    \ifthenelse{\boolean{parts}}%
+    \ifthenelse{\boolean{@parts}}%
     {% 
 	    	\newcommand{\myPart}[2][]{% for parts     
 	    		\ifthenelse{\equal{#1}{}}{%  
@@ -472,7 +486,7 @@
     }
 
     % remove the vertical space between lof/lot entries of different chapters
-    \ifthenelse{\boolean{listsseparated}}{%
+    \ifthenelse{\boolean{@listsseparated}}{%
         \AtBeginDocument{%
             \addtocontents{lof}{\protect\vspace{-\cftbeforechapskip}}%
             \addtocontents{lot}{\protect\vspace{-\cftbeforechapskip}}%
@@ -501,7 +515,7 @@
 % ********************************************************************
 \RequirePackage{scrtime} % time access
 \newcommand{\finalVersionString}{}
-\ifthenelse{\boolean{drafting}}{% 
+\ifthenelse{\boolean{@drafting}}{% 
     \RequirePackage[draft]{prelim2e}
         \renewcommand{\PrelimWords}{\relax}
         \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\,]}