summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/classicthesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-11-04 23:58:58 +0000
committerKarl Berry <karl@freefriends.org>2007-11-04 23:58:58 +0000
commit1930b4a8fcbae4ae2d3782c0cc1f3eef42b7617e (patch)
tree9e883b40be3092f0bde19ffb77ad895bcacfb160 /Master/texmf-dist/tex/latex/classicthesis
parentd803dd9d281ca3b3671f2694da4f308bc759d51a (diff)
classicthesis 2.3 (4nov07)
git-svn-id: svn://tug.org/texlive/trunk@5340 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/classicthesis')
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty10
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty69
2 files changed, 51 insertions, 28 deletions
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%