summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/classicthesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-30 22:56:49 +0000
committerKarl Berry <karl@freefriends.org>2010-04-30 22:56:49 +0000
commit83a688b19e2f7bfe4ee28cdd766b087b0d00a2cb (patch)
tree6add876d5cdf6ae269deacf3308ccf00c67d5e40 /Master/texmf-dist/tex/latex/classicthesis
parent83c112dcf58f19f5b3b1cc8ab677f35cc09db642 (diff)
classicthesis update (30apr10)
git-svn-id: svn://tug.org/texlive/trunk@18063 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.sty4
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty82
2 files changed, 34 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
index fe55179a056..283fd6f4a42 100644
--- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
+++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
@@ -26,7 +26,7 @@
%
% ********************************************************************
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{classicthesis-ldpkg}[2010/02/13 v2.7 Package Loader for Classic Thesis Style]
+\ProvidesPackage{classicthesis-ldpkg}[2010/05/01 v2.8 Package Loader for Classic Thesis Style]
\@ifpackageloaded{classicthesis}%
{\PackageWarningNoLine{classicthesis-ldpkg}{Package "classicthesis" should be loaded AFTER "classicthesis-ldpkg".}}%
@@ -144,7 +144,7 @@
\pdfcompresslevel=9
\pdfadjustspacing=1
\RequirePackage[pdftex]{graphicx} % PDFTeX driver for graphicx
-\DeclareGraphicsRule{*}{mps}{*}{} % enables use of MetaPost graphics with pdflatex
+%\DeclareGraphicsRule{*}{mps}{*}{} % enables use of MetaPost graphics with pdflatex
%*******************************************************
% for German texts to get \autoref macros right
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
index c62d37b6ca5..61d28fc8cea 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}[2010/02/13 v2.7 Typographic Style for a classic-looking thesis]
+\ProvidesPackage{classicthesis}[2010/05/01 v2.8 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,7 +61,13 @@
\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
+
% ********************************************************************
% Options
% ********************************************************************
@@ -253,15 +259,17 @@
\displaywidowpenalty = 10000 % formulas
% 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%
- %\raggedright%
- \hspace{0pt}#1}}
-
+% thanks to Lorenzo Pantieri and Enrico Gregorio
+\def\graffito@setup{%
+ \slshape\footnotesize%
+ \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
+ \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
+ \doublehyphendemerits=100000%
+ \finalhyphendemerits=\doublehyphendemerits}
+\DeclareRobustCommand{\graffito}[1]{\marginpar%
+ [\graffito@setup\raggedleft\hspace{0pt}{#1}]%
+ {\graffito@setup\raggedright\hspace{0pt}{#1}}}
+
% Enumeration environment with small caps
\newenvironment{aenumerate}
{\def\theenumi{\textsc{\alph{enumi}}}%
@@ -537,22 +545,6 @@
\else\oldchap[\spacedlowsmallcaps{#1}]{#2}%
\fi%
}
-%% Old version w/ optional parameter
-% \newcommand{\myChapter}[2][]{% for chapters
-% \ifthenelse{\equal{#1}{}}{%
-% %\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%
-% }}%
-%% Old version w/o optional parameter
-% \newcommand{\myChapter}[1]{% for chapters
-% \ifpdf\chapter[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#1}%
-% \else\chapter[\spacedlowsmallcaps{#1}]{#1}\fi%
-% }%
}
% yet another dirty work-around to get the spaced low small caps into the toc ;-(
@@ -570,21 +562,6 @@
% \else\oldpart[\spacedlowsmallcaps{#1}]{#2}%
\fi%
}%
-%% Old version w/ optional parameter
-% \newcommand{\myPart}[2][]{% for parts
-% \ifthenelse{\equal{#1}{}}{%
-% \ifpdf%
-% % ugly hack to remove the part number from the PDF bookmark entry
-% \pdfstringdefDisableCommands{\let\thepart\@gobbletwo}%
-% \part[\texorpdfstring{\spacedlowsmallcaps{#2}}{#2}]{#2}% spacedallcaps spacedlowsmallcaps
-% \else\part[\spacedlowsmallcaps{#2}]{#2}\fi%
-% }{%
-% \ifpdf%
-% % ugly hack to remove the part number from the PDF bookmark entry
-% \pdfstringdefDisableCommands{\let\thepart\@gobbletwo}%
-% \part[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps
-% \else\part[\spacedlowsmallcaps{#1}]{#2}\fi%
-% }}%
}{\relax}
\newcommand{\tocEntry}[1]{% for bib, etc.
@@ -600,16 +577,17 @@
\ifthenelse{\boolean{@listings}}%
{%
\addtocontents{lol}{\protect\vspace{-10\cftbeforechapskip}}%
- }%
+ }{\relax}%
}%
}{%
\DeclareRobustCommand*{\deactivateaddvspace}{\let\addvspace\@gobble}%
\AtBeginDocument{%
\addtocontents{lof}{\deactivateaddvspace}%
\addtocontents{lot}{\deactivateaddvspace}%
- {%
+ \ifthenelse{\boolean{@listings}}%
+ {%
\addtocontents{lol}{\deactivateaddvspace}%
- }%
+ }{\relax}%
%\addtocontents{lof}{\protect\renewcommand*{\protect\addvspace}[1]{}}%
%\addtocontents{lot}{\protect\renewcommand*{\protect\addvspace}[1]{}}%
}%
@@ -623,14 +601,18 @@
\deffootnote{0em}{0em}{\thefootnotemark\hspace*{.5em}}
%\setfnsymbol{bringhurst} % use symbols recommended by guru Robert Bringhurst
%\setlength{\footnotemargin}{-1em}
-
+
% ********************************************************************
% Drafting Stuff
% ********************************************************************
\RequirePackage{scrtime} % time access
\newcommand{\finalVersionString}{}
\ifthenelse{\boolean{@drafting}}{%
- \RequirePackage[draft]{prelim2e}
- \renewcommand{\PrelimWords}{\relax}
- \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\,]}
-}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ at \thistime.}}
+% \RequirePackage{draftwatermark}%
+% \SetWatermarkLightness{0.9}
+% \SetWatermarkScale{.5}
+% \SetWatermarkText{\today\ at \thistime}
+ \RequirePackage[draft]{prelim2e}
+ \renewcommand{\PrelimWords}{\relax}
+ \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\,]}
+}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ at \thistime.}}