diff options
author | Karl Berry <karl@freefriends.org> | 2011-01-27 19:02:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-01-27 19:02:15 +0000 |
commit | 957cdf929357b4c2fe6d581b81450567e2e792ea (patch) | |
tree | 70e4640c5e93c2411e82b7115e81e8db20700032 /Master/texmf-dist/tex/latex | |
parent | 2b311b90f06b68e1cb123c58c3b380ea6533eea0 (diff) |
classicthesis (25jan11)
git-svn-id: svn://tug.org/texlive/trunk@21196 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty | 41 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty | 103 |
2 files changed, 77 insertions, 67 deletions
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty index 283fd6f4a42..44a8407f99f 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) 2010 André Miede http://www.miede.de +% Copyright (C) 2011 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 @@ -26,7 +26,7 @@ % % ******************************************************************** \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{classicthesis-ldpkg}[2010/05/01 v2.8 Package Loader for Classic Thesis Style] +\ProvidesPackage{classicthesis-ldpkg}[2011/01/24 v2.9 Package Loader for Classic Thesis Style] \@ifpackageloaded{classicthesis}% {\PackageWarningNoLine{classicthesis-ldpkg}{Package "classicthesis" should be loaded AFTER "classicthesis-ldpkg".}}% @@ -36,9 +36,7 @@ % Options % ******************************************************************** \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 @@ -100,39 +98,8 @@ % ******************************************************************** % fine typesetting of code listings -\RequirePackage{listings} - -% ******************************************************************** -% caption numbering now w/o chapter number -\RequirePackage{remreset} - \makeatletter - \ifthenelse{\boolean{cld@nochapters}}% - {\relax}{% - \@removefromreset{table}{chapter} % requires remreset package - } - \renewcommand{\thetable}{\arabic{table}} - \makeatother - \makeatletter - \ifthenelse{\boolean{cld@nochapters}}% - {\relax}{% - \@removefromreset{figure}{chapter} % requires remreset package - } - \renewcommand{\thefigure}{\arabic{figure}} - \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 - +%\RequirePackage{listings} + % ******************************************************************** % enable subfigures in figures \RequirePackage{subfig} diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty index 61d28fc8cea..926208d3cd5 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) 2010 André Miede http://www.miede.de +% Copyright (C) 2011 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 @@ -42,7 +42,7 @@ % % ******************************************************************** \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{classicthesis}[2010/05/01 v2.8 Typographic Style for a classic-looking thesis] +\ProvidesPackage{classicthesis}[2011/01/24 v2.9 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) @@ -61,13 +61,8 @@ \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) - -% ******************************************************************** -% Backward-compatibility -% ******************************************************************** -\let\myChapter\chapter -\let\myPart\part - + \newboolean{@floatperchapter} % additional space in ToC after chapter number (if two digits are needed) + % ******************************************************************** % Options % ******************************************************************** @@ -93,6 +88,7 @@ \DeclareOption{dottedtoc}{\setboolean{@dottedtoc}{true}} \DeclareOption{listings}{\setboolean{@listings}{true}} \DeclareOption{manychapters}{\setboolean{@manychapters}{true}} +\DeclareOption{floatperchapter}{\setboolean{@floatperchapter}{true}} \ProcessOptions\relax % subfig-related stuff @@ -145,15 +141,22 @@ \PackageWarningNoLine{classicthesis}{You cannot use "manychapters" at the same time % as "nochapters"!}% }{\relax}% + % is the user trying to use floatperchapter at the same time? + \ifthenelse{\boolean{@floatperchapter}}% + {% both manychapters and nochapters are active + \PackageWarningNoLine{classicthesis}{You cannot use "floatperchapter" 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", "manychapters",% + This turns off the options "linedheaders", "manychapters", "floatperchapter",% "listsseparated", "eulerchapternumbers", and "parts". Please be aware of that.} \setboolean{@linedheaders}{false}% \setboolean{@listsseparated}{false}% \setboolean{@eulerchapternumbers}{false}% \setboolean{@parts}{false}% \setboolean{@manychapters}{false}% + \setboolean{@floatperchapter}{false}% }{\relax}% % ******************************************************************** @@ -176,10 +179,16 @@ % ******************************************************************** % Font Stuff % ******************************************************************** +% specialists: MinionPro \ifthenelse{\boolean{@minionpro}}% {% - % specialists: MinionPro - \RequirePackage[opticals,mathlf]{MinionPro} % opticals, fullfamily, osf + % in order have Euler math fonts work with Minion, special option is needed + \ifthenelse{\boolean{@eulermath}}% + {% + \RequirePackage[opticals,mathlf,onlytext]{MinionPro} % opticals, fullfamily, osf + }{% + \RequirePackage[opticals,mathlf]{MinionPro} % opticals, fullfamily, osf + }% }{% % default: Palatino \RequirePackage[osf,sc]{mathpazo} % Palatino with real small caps and old style figures @@ -228,13 +237,14 @@ \ifthenelse{\boolean{@minionpro}}% {% Minion gets some extra sizes \PackageInfo{classicthesis}{A4 paper, MinionPro} - \areaset[5mm]{288pt}{684pt}% 609 + 33 + 42 head \the\footskip + \areaset[5mm]{312pt}{684pt}% 609 + 33 + 42 head \the\footskip \setlength{\marginparwidth}{7.5em}% \setlength{\marginparsep}{2em}% }{% 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}% + \areaset[5mm]{336pt}{750pt} % ~ 336 * factor 2 + 33 head + 42 \the\footskip +% \areaset[5mm]{336pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip 10pt + \setlength{\marginparwidth}{7em}% \setlength{\marginparsep}{2em}% }% } @@ -559,7 +569,7 @@ \newcommand\Part[2][]{% \ifpdf\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}% \oldpart[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps -% \else\oldpart[\spacedlowsmallcaps{#1}]{#2}% + \else\oldpart[\spacedlowsmallcaps{#1}]{#2}% \fi% }% }{\relax} @@ -569,17 +579,20 @@ \else{#1}\fi% } - % remove the vertical space between lof/lot entries of different chapters - \ifthenelse{\boolean{@listsseparated}}{% - \AtBeginDocument{% - \addtocontents{lof}{\protect\vspace{-10\cftbeforechapskip}}% - \addtocontents{lot}{\protect\vspace{-10\cftbeforechapskip}}% - \ifthenelse{\boolean{@listings}}% - {% - \addtocontents{lol}{\protect\vspace{-10\cftbeforechapskip}}% - }{\relax}% - }% - }{% +% % remove the vertical space between lof/lot entries of different chapters + \ifthenelse{\boolean{@listsseparated}}{% + \PackageWarningNoLine{classicthesis}{Option "listsseparated" deprecated as of version 2.9.}% + }{\relax} +% \ifthenelse{\boolean{@listsseparated}}{% +% \AtBeginDocument{% +% \addtocontents{lof}{\protect\vspace{-\cftbeforechapskip}}% +% \addtocontents{lot}{\protect\vspace{-\cftbeforechapskip}}% +% \ifthenelse{\boolean{@listings}}% +% {% +% \addtocontents{lol}{\protect\vspace{-\cftbeforechapskip}}% +% }{\relax}% +% }% +% }{% \DeclareRobustCommand*{\deactivateaddvspace}{\let\addvspace\@gobble}% \AtBeginDocument{% \addtocontents{lof}{\deactivateaddvspace}% @@ -588,10 +601,8 @@ {% \addtocontents{lol}{\deactivateaddvspace}% }{\relax}% - %\addtocontents{lof}{\protect\renewcommand*{\protect\addvspace}[1]{}}% - %\addtocontents{lot}{\protect\renewcommand*{\protect\addvspace}[1]{}}% }% - } +% } % ******************************************************************** % footnotes setup @@ -616,3 +627,35 @@ \renewcommand{\PrelimWords}{\relax} \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\,]} }{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ at \thistime.}} + +% ******************************************************************** +% Caption numbering now w/o chapter number +% ******************************************************************** +\ifthenelse{\boolean{@floatperchapter}}{% + \ifthenelse{\boolean{@listings}}{% + \lstset{numberbychapter=true}}{\relax}% +}{% + \ifthenelse{\boolean{@listings}}{% + \lstset{numberbychapter=false}}{\relax}% + \RequirePackage{remreset}% + \makeatletter% + \ifthenelse{\boolean{@nochapters}}% + {\relax}{% + \@removefromreset{table}{chapter} % requires remreset package + }% + \renewcommand{\thetable}{\arabic{table}}% + \makeatother% + \makeatletter% + \ifthenelse{\boolean{@nochapters}}% + {\relax}{% + \@removefromreset{figure}{chapter} % requires remreset package + }% + \renewcommand{\thefigure}{\arabic{figure}}% + \makeatother% +} + +% ******************************************************************** +% Backward-compatibility +% ******************************************************************** +\let\myChapter\chapter +\let\myPart\part |