From 081c87916dc7d57780c8ab255924cdfb56825115 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 9 Oct 2007 13:52:31 +0000 Subject: classicthesis update (7oct07) git-svn-id: svn://tug.org/texlive/trunk@5148 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/classicthesis/classicthesis-ldpkg.sty | 2 +- .../tex/latex/classicthesis/classicthesis.sty | 62 +++++++++++++++------- 2 files changed, 45 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex/latex/classicthesis') 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% -- cgit v1.2.3