summaryrefslogtreecommitdiff
path: root/Master
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
parent83c112dcf58f19f5b3b1cc8ab677f35cc09db642 (diff)
classicthesis update (30apr10)
git-svn-id: svn://tug.org/texlive/trunk@18063 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/CHANGES9
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdfbin349355 -> 354506 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex10
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps78
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdfbin166546 -> 166546 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdfbin128623 -> 128623 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdfbin41454 -> 40624 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex2
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty4
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty82
10 files changed, 118 insertions, 67 deletions
diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
index 6274e9be228..bafd0c560dc 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES
+++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
@@ -1,3 +1,12 @@
+Changes in version 2.8 (March/May 2010)
+o Fixed serious \graffito bug in classicthesis.sty
+ (thanks to Lorenzo Pantieri and Enrico Gregorio)
+o Included backward compatibility regarding old commands
+ \myChapter and \myPart in classicthesis.sty
+o Fixed drafting issues (draft information not shown at all)
+ caused by wrong code for listings and listsseparated options
+ in classicthesis.sty
+
Changes in version 2.7 (February 2010, cumulative release)
o Removed option for classicthesis-ldpkg.sty: nobackref
Introduced instead option "backref" for consistency
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
index 55f613286a0..55537c69a59 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
index 42e1254002b..d368ca4cc5a 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
@@ -64,8 +64,8 @@
\newcommand{\myDepartment}{Put data here\xspace}
\newcommand{\myUni}{\protect{Put data here}\xspace}
\newcommand{\myLocation}{Darmstadt\xspace}
-\newcommand{\myTime}{February 2010\xspace}
-\newcommand{\myVersion}{Version 2.7\xspace}
+\newcommand{\myTime}{May 2010\xspace}
+\newcommand{\myVersion}{Version 2.8\xspace}
%*******************************************************
% Packages with options that might require adjustments
%*******************************************************
@@ -73,6 +73,7 @@
\usepackage[ngerman,american]{babel}
\usepackage[square,numbers]{natbib}
\usepackage[fleqn]{amsmath} % math environments and more by the AMS
+
%*******************************************************
\usepackage{classicthesis-ldpkg} % [backref]
%*******************************************************
@@ -80,8 +81,8 @@
% tocaligned eulerchapternumbers drafting linedheaders listsseparated
% subfig nochapters beramono eulermath parts minionpro pdfspacing
% listings dottedtoc minionprospacing manychapters
-\usepackage[eulerchapternumbers,drafting,listings,listsseparated,%pdfspacing,%
- subfig,beramono,eulermath,parts]{classicthesis}
+\usepackage[eulerchapternumbers,drafting,listings,listsseparated,%pdfspacing,%listings,
+ subfig,beramono,eulermath,parts]{classicthesis}
%*******************************************************
% Some font experiments
@@ -154,6 +155,7 @@
numberbychapter=false
%frame=L
}
+
% ********************************************************************
% Where to look for graphics
%*******************************************************
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
index e07b625c103..61a444efb8d 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
@@ -3,8 +3,8 @@ Type=TeXnicCenterProjectSessionInformation
Version=2
[SessionInfo]
-ActiveTab=2
-FrameCount=1
+ActiveTab=0
+FrameCount=3
ActiveFrame=0
[Frame0]
@@ -16,15 +16,15 @@ MinPos.x=-1
MinPos.y=-1
MaxPos.x=-4
MaxPos.y=-23
-NormalPos.left=0
-NormalPos.top=0
-NormalPos.right=704
-NormalPos.bottom=165
+NormalPos.left=44
+NormalPos.top=44
+NormalPos.right=938
+NormalPos.bottom=342
Class=CLatexEdit
Document=ClassicThesis.tex
[Frame0_Row0]
-cyCur=410
+cyCur=411
cyMin=10
[Frame0_Col0]
@@ -32,7 +32,65 @@ cxCur=1006
cxMin=10
[Frame0_View0,0]
-Cursor.row=76
-Cursor.column=11
-TopSubLine=70
+Cursor.row=66
+Cursor.column=37
+TopSubLine=48
+
+[Frame1]
+Columns=1
+Rows=1
+Flags=0
+ShowCmd=1
+MinPos.x=-1
+MinPos.y=-1
+MaxPos.x=-4
+MaxPos.y=-23
+NormalPos.left=44
+NormalPos.top=44
+NormalPos.right=938
+NormalPos.bottom=342
+Class=CLatexEdit
+Document=CHANGES
+
+[Frame1_Row0]
+cyCur=251
+cyMin=10
+
+[Frame1_Col0]
+cxCur=866
+cxMin=10
+
+[Frame1_View0,0]
+Cursor.row=0
+Cursor.column=33
+TopSubLine=0
+
+[Frame2]
+Columns=1
+Rows=1
+Flags=0
+ShowCmd=1
+MinPos.x=-1
+MinPos.y=-1
+MaxPos.x=-4
+MaxPos.y=-23
+NormalPos.left=88
+NormalPos.top=88
+NormalPos.right=982
+NormalPos.bottom=387
+Class=CLatexEdit
+Document=Chapters\Chapter01.tex
+
+[Frame2_Row0]
+cyCur=252
+cyMin=10
+
+[Frame2_Col0]
+cxCur=866
+cxMin=10
+
+[Frame2_View0,0]
+Cursor.row=1
+Cursor.column=0
+TopSubLine=0
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
index 4ac61ff341d..49fb31d07c1 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
index b5aeebbddff..30a5063bef1 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
index 9667710237a..564be7568b9 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex
index 57119ea829a..53abe660788 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex
@@ -13,7 +13,7 @@
%\pdfbookmark[1]{Pers\"onliche Daten}{PersDat}
\begin{cvlist}{\spacedlowsmallcaps{Pers\"onliche Daten}}\label{PersDat}
\item Andr\'e Miede
- \item Geboren am 4.\ Dezember~1977 \\
+ \item Geboren am \dots \\
Europ\"aer, Deutsche Staatsb\"urgerschaft
\item \url{http://www.miede.de} \\
\url{https://www.xing.com/profile/Andre_Miede}
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.}}