summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-10-09 13:52:31 +0000
committerKarl Berry <karl@freefriends.org>2007-10-09 13:52:31 +0000
commit081c87916dc7d57780c8ab255924cdfb56825115 (patch)
tree005626d4a7c0d8ba5b3fbe8823a8706bf2d872e3
parent4b886a1c0f251dfb1a6603745c66fd60d041f925 (diff)
classicthesis update (7oct07)
git-svn-id: svn://tug.org/texlive/trunk@5148 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/CHANGES11
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex2
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdfbin308731 -> 307451 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex9
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps78
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdfbin143660 -> 160139 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdfbin47843 -> 41845 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex15
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdfbin35492 -> 35004 bytes
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex6
-rw-r--r--Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES4
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty2
-rw-r--r--Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty62
13 files changed, 140 insertions, 49 deletions
diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
index 516898870b0..52cf07e720e 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES
+++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES
@@ -1,3 +1,14 @@
+Changes in version 2.2 (October 2007)
+o \myChapter and \myPart now take an optional argument
+ just as the regular \part and \chapter commands
+o Did some minor changes to classicthesis-book.tex
+ so it's a better example
+o Inserted some \cleardoublepage before \myPart
+ occurences to avoid pdfbookmark problems
+o Introduced some general typographic fine-tuning
+ (linespread, penalties, etc.)
+o Did some fine-tuning of the \graffito command
+
Changes in version 2.1 (July 2007)
o Removed duplicate xcolor package call from
classicthesis-ldpkg.sty and shifed some color
diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
index 2f06ed23c01..3bdf7099022 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
@@ -11,7 +11,7 @@ This bundle for \LaTeX\ has two goals:
\item Provide a classic, high quality typographic style which is
inspired by \cauthor{bringhurst:2002}'s ``\emph{The Elements of
Typographic Style}'' \citep{bringhurst:2002}.
- \graffito{\myTitle Version 2.1}
+ \graffito{\myTitle Version 2.2}
\end{enumerate}
The bundle is configured to run with a \emph{full}
MiK\TeX\ or \TeX Live\footnote{See the file \texttt{LISTOFFILES} for
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
index 5d133f0a853..2dd52be988d 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 71f80e4c87f..c74981d541e 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
@@ -72,7 +72,7 @@
\newcommand{\myDepartment}{Put data here\xspace}
\newcommand{\myUni}{\protect{Put data here}\xspace}
\newcommand{\myLocation}{Hamburg\xspace}
-\newcommand{\myTime}{July 2007\xspace}
+\newcommand{\myTime}{October 2007\xspace}
%*******************************************************
% Packages with options that might require adjustments
%*******************************************************
@@ -158,16 +158,17 @@
% Mainmatter
%*******************************************************
\pagenumbering{arabic}
-\myPart{Some Kind of Manual}
+% use \cleardoublepage here to avoid problems with pdfbookmark
+\cleardoublepage\myPart{Some Kind of Manual}
\include{Chapters/Chapter01}
-\myPart{The Showcase}
+\cleardoublepage\myPart{The Showcase}
\include{Chapters/Chapter02}
\include{Chapters/Chapter03}
% ********************************************************************
% Backmatter
%*******************************************************
\appendix
-\myPart{Appendix}
+\cleardoublepage\myPart{Appendix}
\include{Chapters/Chapter0A}
%********************************************************************
% Other Stuff in the Back
diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
index 1b5d3cdc90a..9000c19f8b3 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
+++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps
@@ -4,12 +4,41 @@ Version=2
[SessionInfo]
ActiveTab=2
-FrameCount=1
-ActiveFrame=0
+FrameCount=3
+ActiveFrame=1
[Frame0]
Columns=1
Rows=1
+Flags=0
+ShowCmd=1
+MinPos.x=-1
+MinPos.y=-1
+MaxPos.x=-4
+MaxPos.y=-23
+NormalPos.left=66
+NormalPos.top=75
+NormalPos.right=994
+NormalPos.bottom=311
+Class=CLatexEdit
+Document=classicthesis-ldpkg.sty
+
+[Frame0_Row0]
+cyCur=189
+cyMin=10
+
+[Frame0_Col0]
+cxCur=900
+cxMin=10
+
+[Frame0_View0,0]
+Cursor.row=0
+Cursor.column=0
+TopSubLine=0
+
+[Frame1]
+Columns=1
+Rows=1
Flags=2
ShowCmd=3
MinPos.x=-1
@@ -23,16 +52,45 @@ NormalPos.bottom=165
Class=CLatexEdit
Document=ClassicThesis.tex
-[Frame0_Row0]
-cyCur=444
+[Frame1_Row0]
+cyCur=418
cyMin=10
-[Frame0_Col0]
-cxCur=860
+[Frame1_Col0]
+cxCur=728
cxMin=10
-[Frame0_View0,0]
-Cursor.row=49
-Cursor.column=2
-TopSubLine=47
+[Frame1_View0,0]
+Cursor.row=74
+Cursor.column=28
+TopSubLine=63
+
+[Frame2]
+Columns=1
+Rows=1
+Flags=0
+ShowCmd=1
+MinPos.x=-1
+MinPos.y=-1
+MaxPos.x=-4
+MaxPos.y=-23
+NormalPos.left=22
+NormalPos.top=22
+NormalPos.right=770
+NormalPos.bottom=325
+Class=CLatexEdit
+Document=classicthesis.sty
+
+[Frame2_Row0]
+cyCur=256
+cyMin=10
+
+[Frame2_Col0]
+cxCur=720
+cxMin=10
+
+[Frame2_View0,0]
+Cursor.row=191
+Cursor.column=29
+TopSubLine=187
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 34b679422f0..953d4b3f990 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 bbdc5e1b793..a9f2a22e612 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-book.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
index 9d62060d274..53eae761ec5 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
@@ -1,25 +1,20 @@
% book example for classicthesis.sty
\documentclass[10pt,a4paper]{scrbook} % KOMA-Script book
\usepackage{lipsum}
-\usepackage[parts,linedheaders,eulerchapternumbers]{../classicthesis}
+\usepackage[linedheaders,parts]{../classicthesis}
%\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false}
-% The pdfbookmarks in this document might not work properly.
-% Code to fix this is omitted to keep the example simple and short.
\begin{document}
\tableofcontents
- \myPart{Test Part}
+ % use \cleardoublepage here to avoid problems with pdfbookmark
+ \cleardoublepage\myPart{Test Part}
\myChapter{Test Chapter}
- %\lipsum[1]
- The pdfbookmarks in this document might not work properly.
- Code to fix this is omitted to keep the example simple
- and short.
+ \lipsum[1]
\section{A Section}
\lipsum[1]
- \myPart{Test Part}
\myChapter{Test Chapter}
\lipsum[1]
@@ -27,7 +22,7 @@
\lipsum[1]
\appendix
- \myPart{Appendix Part}
+ \cleardoublepage\myPart{Appendix}
\myChapter{Appendix Chapter}
\lipsum[1]
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 eed1575e4b8..6de2a60d367 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/FrontBackmatter/Acknowledgments.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
index caab63abada..efdeb7e6a43 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
+++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
@@ -27,9 +27,9 @@ Many thanks to everybody who already sent me a postcard!
Regarding the typography and other help, many thanks go to Marco
Kuhlmann, Philipp Lehman, Lothar Schlesier, Jim Young, Lorenzo
Pantieri\footnote{Member of GuIT (Gruppo Italiano Utilizzatori
-di \TeX\ e \LaTeX )}, J\"org Sommer, Joachim K\"ostler, and the
-whole \LaTeX-community for support, ideas and some great
-software.
+di \TeX\ e \LaTeX )}, J\"org Sommer, Joachim K\"ostler, Daniel
+Gottschlag, and the whole \LaTeX-community for support, ideas
+and some great software.
\endgroup
diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
index 80d4bb297aa..08777f49b9a 100644
--- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
+++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
@@ -14,7 +14,7 @@ inputenc.sty 2006/05/05 v1.1b Input encoding file
ngermanb.ldf 2004/02/20 v2.6m new German support from the babel system
english.ldf 2005/03/30 v3.3o English support from the babel system
natbib.sty 2007/02/05 8.0 (PWD)
-classicthesis-ldpkg.sty 2007/07/01 v2.1 Package Loader for Classic Thesis St
+classicthesis-ldpkg.sty 2007/10/01 v2.2 Package Loader for Classic Thesis St
yle
ifthen.sty 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
fontenc.sty
@@ -66,7 +66,7 @@ graphics.sty 2006/02/20 v1.0o Standard LaTeX Graphics (DPC,SPQR)
graphics.cfg 2007/01/18 v1.5 graphics configuration of teTeX/TeXLive
pdftex.def 2007/01/08 v0.04d Graphics/color for pdfTeX
hypcap.sty 2006/02/20 v1.5 Adjusting anchors of captions (HO)
-classicthesis.sty 2007/07/01 v2.1 Typographic Style for a classic-looking th
+classicthesis.sty 2007/10/01 v2.2 Typographic Style for a classic-looking th
esis
ifpdf.sty 2006/02/20 v1.4 Provides the ifpdf switch (HO)
xcolor.sty 2007/01/21 v2.11 LaTeX color extensions (UK)
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty
index d3991d68485..b2a8c11cac3 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}[2007/07/01 v2.1 Package Loader for Classic Thesis Style]
+\ProvidesPackage{classicthesis-ldpkg}[2007/10/01 v2.2 Package Loader for Classic Thesis Style]
% ********************************************************************
% Options
diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
index 2cfbb11a813..746917494dd 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/07/01 v2.1 Typographic Style for a classic-looking thesis]
+\ProvidesPackage{classicthesis}[2007/10/01 v2.2 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)
@@ -138,7 +138,8 @@
\RequirePackage[opticals,osf]{MinionPro} % opticals, fullfamily,
}{%
% default: Palatino
- \RequirePackage[osf,sc]{mathpazo} % Palatino with real small caps and old style figures\\
+ \RequirePackage[osf,sc]{mathpazo} % Palatino with real small caps and old style figures
+ \linespread{1.05} % a bit more for Palatino
% just some font experiments (ignore)
%\RequirePackage{lmodern}
%\RequirePackage[urw-garamond]{mathdesign}
@@ -161,6 +162,7 @@
{\newfont{\chapterNumber}{pplr9d scaled 7000}}
% Euler eurb10 / Palatino OSF pplr9d / Palatino SC pplrc9d
% Latin Modern cork-lmr10 / Minion MinionPro-Regular-osf-t1
+ % (MinionPro-SemiboldCapt-osf-t1 MinionPro-SemiboldDisp-osf-t1)
\RequirePackage{microtype} % character protruding and other micro-typography stuff
% [expansion=false]
@@ -201,12 +203,18 @@
% ********************************************************************
% Own Stuff
% ********************************************************************
+% Disable single lines at the start of a paragraph (Schusterjungen)
+\clubpenalty = 10000
+% Disable single lines at the end of a paragraph (Hurenkinder)
+\widowpenalty = 10000
+\displaywidowpenalty = 10000 % formulas
+
% Graffiti as in GKP's book "Concrete Mathematics"
\DeclareRobustCommand{\graffito}[1]{\marginpar{%
- \slshape\small%
- %\parindent=0pt\lineskip=0pt\lineskiplimit=0pt%\baselineskip=10pt
- %\tolerance=2000\hyphenpenalty=300\exhyphenpenalty=300%
- %\doublehyphendemerits=100000\finalhyphendemerits=\doublehyphendemerits%
+ \slshape\footnotesize%\small%
+ \parindent=0pt\lineskip=0pt\lineskiplimit=0pt%\baselineskip=10pt
+ \tolerance=2000\hyphenpenalty=300\exhyphenpenalty=300%
+ \doublehyphendemerits=100000\finalhyphendemerits=\doublehyphendemerits%
\raggedright\hspace{0pt}#1}}
% Enumeration environment with small caps
@@ -403,24 +411,42 @@
\ifthenelse{\boolean{nochapters}}%
{\relax}%
{%
- \newcommand{\myChapter}[1]{% for chapters
- \ifpdf\chapter[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#1}%
- \else\chapter[\spacedlowsmallcaps{#1}]{#1}\fi%
- }%
+ \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{#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 ;-(
\ifthenelse{\boolean{parts}}%
{%
- \newcommand{\myPart}[1]{% for parts
- \ifpdf%
- % ugly hack to remove the part number from the PDF bookmark entry
- \pdfstringdefDisableCommands{\let\thepart\@gobbletwo}%
- \part[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#1}% spacedallcaps spacedlowsmallcaps
- \else\part[\spacedlowsmallcaps{#1}]{#1}\fi%
- }%
+ \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.
\ifpdf\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}%
\else{#1}\fi%