From 9da4c719065a4811463ba831d25a81135a531894 Mon Sep 17 00:00:00 2001 From: "Dr. Clea F. Rees" Date: Fri, 7 Aug 2009 00:41:50 +0000 Subject: classicthesis new version git-svn-id: svn://tug.org/texlive/trunk@14558 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/classicthesis/CHANGES | 21 ++++ .../doc/latex/classicthesis/Chapters/Chapter01.tex | 6 +- .../doc/latex/classicthesis/ClassicThesis.pdf | Bin 313246 -> 313727 bytes .../doc/latex/classicthesis/ClassicThesis.tex | 46 +++++-- .../doc/latex/classicthesis/ClassicThesis.tps | 67 ++++++++--- .../Examples/classicthesis-article.pdf | Bin 160400 -> 160398 bytes .../classicthesis/Examples/classicthesis-book.pdf | Bin 44217 -> 44672 bytes .../classicthesis/Examples/classicthesis-book.tex | 2 +- .../classicthesis/Examples/classicthesis-cv.pdf | Bin 35164 -> 34811 bytes .../FrontBackmatter/Acknowledgments.tex | 10 +- .../classicthesis/FrontBackmatter/Contents.tex | 27 +++-- .../classicthesis/FrontBackmatter/Titlepage.tex | 5 +- .../texmf-dist/doc/latex/classicthesis/LISTOFFILES | 41 ++++--- Master/texmf-dist/doc/latex/classicthesis/README | 2 +- .../latex/classicthesis/classicthesis-ldpkg.sty | 80 +++---------- .../tex/latex/classicthesis/classicthesis.sty | 132 +++++++++++++++------ 16 files changed, 269 insertions(+), 170 deletions(-) diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES index c03a1443eaf..edff6273683 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES +++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES @@ -1,3 +1,24 @@ +Changes in version 2.6 (August 2009) +o Centered the title page with the addmargin environment + (thanks to Nicolas Repp for the hint) +o Fixed header for page two of Table of Contents (with 3 + or more pages) (in Contents.tex) +o Added numbering of \subsubsection (in Contents.tex) +o Added correct Table of Contents entries for \subsubsection + (in classicthesis.sty) +o Added printonlyused option to loading acronym package + (in classicthesis-ldpkg.sty) +o Some code for "clean" hyperlinks (w/o color and w/o boxes) +o Minor fix for \graffito (in classicthesis.sty) + +Changes in version 2.5.1 (May 2009, released as beta) +o New option for classicthesis.sty: dottedtoc + (Refer to the manual for more information.) +o New option for classicthesis.sty: listings + (Refer to the manual for more information.) + (Credit + thanks to Prof. Enrico Gregorio) +o Minor clean-up and bug-fixing + Changes in version 2.5 (October 2008, cumulative release) o Increased text-width for better page layout (experimental) o Cumulative release, some minor clean-up and bug-fixing diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex index bc45045697f..a1c2ab043f4 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex @@ -162,6 +162,10 @@ allow for a bit of freedom concerning the layout: command of the \texttt{MinionPro} package for letter spacing. This automatically enables the \texttt{minionpro} option and overrides the \texttt{pdfspacing} option. + \item\texttt{dottedtoc}: sets pagenumbers flushed right in the + table of contents. + \item\texttt{listings}: loads the \texttt{listings} package (if not + already done) and configures the List of Listings accordingly. \end{itemize} The best way to figure these options out is to try the different possibilities and see, what you and your supervisor like best. @@ -221,7 +225,7 @@ be found the folder. %\texttt{classicthesis.sty} and \texttt{Bibliography.bib} within the %examples.) -\lstinputlisting[title=An Article]% +\lstinputlisting[caption=testing, title=An Article]% {Examples/classicthesis-article.tex} \lstinputlisting[title=A Book]% diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf index c5c09a12485..6a830f30069 100644 Binary files a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf and b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf differ diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex index 2925ec6e79c..db71a9a0d92 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex @@ -2,7 +2,7 @@ % A Classic Thesis Style % An Homage to The Elements of Typographic Style % -% Copyright (C) 2008 André Miede http://www.miede.de +% Copyright (C) 2009 André 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 @@ -36,7 +36,7 @@ % * See classicthesis-ldpkg.sty for useful commands % ************************************************************************************************************** % To Do: -% * support a List of Listings that looks like the other lists +% * fix space at beginning of List of Listings % * mathbb in section-titles/chapter-titles => disappears somehow in headlines!!! % * think about processing a4paper, a5paper, 10pt, 11pt, 12pt etc. options for typearea layout % (store values in internal variables and handle by \AtEndOfPackage{\areaset...}) @@ -50,9 +50,9 @@ %\KOMAoptions{% % paper=a4,% % fontsize=10pt,% -% cleardoublepage=empty,% -% footinclude=true,% -% %abstract=false% +% cleardoublepage=empty% +% %,footinclude=true% +% %,abstract=false% %} % ******************************************************************** % Development Stuff @@ -73,8 +73,8 @@ \newcommand{\myDepartment}{Put data here\xspace} \newcommand{\myUni}{\protect{Put data here}\xspace} \newcommand{\myLocation}{Darmstadt\xspace} -\newcommand{\myTime}{October 2008\xspace} -\newcommand{\myVersion}{Version 2.5\xspace} +\newcommand{\myTime}{August 2009\xspace} +\newcommand{\myVersion}{Version 2.6\xspace} %******************************************************* % Packages with options that might require adjustments %******************************************************* @@ -86,9 +86,10 @@ \usepackage{classicthesis-ldpkg} %******************************************************* % Options for classicthesis.sty: -% tocaligned eulerchapternumbers drafting linedheaders listsseparated -% subfig nochapters beramono eulermath parts minionpro pdfspacing -\usepackage[eulerchapternumbers,drafting,%pdfspacing,% +% tocaligned eulerchapternumbers drafting linedheaders listsseparated +% subfig nochapters beramono eulermath parts minionpro pdfspacing +% listings dottedtoc +\usepackage[eulerchapternumbers,drafting,listings,%pdfspacing,% subfig,beramono,eulermath,parts]{classicthesis} %******************************************************* %\usepackage[section,below]{placeins} <--- not everybody wants this @@ -112,6 +113,27 @@ %******************************************************* \captionsetup{format=hang,font=small} % ******************************************************************** +% Listings setup +% ******************************************************************** +%\lstset{emph={trueIndex,root},emphstyle=\color{BlueViolet}}%\underbar} % for special keywords +% ******************************************************************** +\lstset{language=[LaTeX]Tex,%C++, + keywordstyle=\color{RoyalBlue},%\bfseries, + basicstyle=\small\ttfamily, + %identifierstyle=\color{NavyBlue}, + commentstyle=\color{Green}\ttfamily, + stringstyle=\rmfamily, + numbers=none,%left,% + numberstyle=\scriptsize,%\tiny + stepnumber=5, + numbersep=8pt, + showstringspaces=false, + breaklines=true, + frameround=ftff, + frame=single + %frame=L +} +% ******************************************************************** % Where to look for graphics %******************************************************* %\graphicspath{{gfx/}{misc/}} % considered harmful according to l2tabu @@ -120,11 +142,12 @@ %******************************************************* \hypersetup{% colorlinks=true, linktocpage=true, pdfstartpage=3, pdfstartview=FitV,% + % uncomment the following line if you want to have black links (e.g., for printing) + %colorlinks=false, linktocpage=false, pdfborder={0 0 0}, pdfstartpage=3, pdfstartview=FitV,% breaklinks=true, pdfpagemode=UseNone, pageanchor=true, pdfpagemode=UseOutlines,% plainpages=false, bookmarksnumbered, bookmarksopen=true, bookmarksopenlevel=1,% hypertexnames=true, pdfhighlight=/O,%hyperfootnotes=true,%nesting=true,%frenchlinks,% urlcolor=webbrown, linkcolor=RoyalBlue, citecolor=webgreen, %pagecolor=RoyalBlue,% - % uncomment the following line if you want to have black links (e.g., for printing) %urlcolor=Black, linkcolor=Black, citecolor=Black, %pagecolor=Black,% pdftitle={\myTitle},% pdfauthor={\textcopyright\ \myName, \myUni, \myFaculty},% @@ -171,6 +194,7 @@ \include{Chapters/Chapter02} %\addtocontents{toc}{\protect\clearpage} % TEST \include{Chapters/Chapter03} +%\include{multiToC} % ******************************************************************** % Backmatter %******************************************************* diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps index 49c61e9eedb..babeebbda10 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps @@ -4,7 +4,7 @@ Version=2 [SessionInfo] ActiveTab=2 -FrameCount=3 +FrameCount=4 ActiveFrame=2 [Frame0] @@ -15,7 +15,7 @@ ShowCmd=1 MinPos.x=-1 MinPos.y=-1 MaxPos.x=-4 -MaxPos.y=-26 +MaxPos.y=-23 NormalPos.left=66 NormalPos.top=66 NormalPos.right=749 @@ -24,17 +24,17 @@ Class=CLatexEdit Document=classicthesis.sty [Frame0_Row0] -cyCur=254 +cyCur=259 cyMin=10 [Frame0_Col0] -cxCur=653 +cxCur=655 cxMin=10 [Frame0_View0,0] -Cursor.row=213 -Cursor.column=58 -TopSubLine=218 +Cursor.row=441 +Cursor.column=62 +TopSubLine=490 [Frame1] Columns=1 @@ -44,7 +44,7 @@ ShowCmd=1 MinPos.x=-1 MinPos.y=-1 MaxPos.x=-4 -MaxPos.y=-26 +MaxPos.y=-23 NormalPos.left=44 NormalPos.top=44 NormalPos.right=727 @@ -53,17 +53,17 @@ Class=CLatexEdit Document=classicthesis-ldpkg.sty [Frame1_Row0] -cyCur=254 +cyCur=259 cyMin=10 [Frame1_Col0] -cxCur=653 +cxCur=655 cxMin=10 [Frame1_View0,0] -Cursor.row=28 -Cursor.column=38 -TopSubLine=14 +Cursor.row=0 +Cursor.column=0 +TopSubLine=0 [Frame2] Columns=1 @@ -73,7 +73,7 @@ ShowCmd=3 MinPos.x=-1 MinPos.y=-1 MaxPos.x=-4 -MaxPos.y=-26 +MaxPos.y=-23 NormalPos.left=0 NormalPos.top=0 NormalPos.right=704 @@ -82,15 +82,44 @@ Class=CLatexEdit Document=ClassicThesis.tex [Frame2_Row0] -cyCur=746 +cyCur=402 cyMin=10 [Frame2_Col0] -cxCur=1570 +cxCur=996 cxMin=10 [Frame2_View0,0] -Cursor.row=71 -Cursor.column=45 -TopSubLine=0 +Cursor.row=49 +Cursor.column=0 +TopSubLine=39 + +[Frame3] +Columns=1 +Rows=1 +Flags=0 +ShowCmd=1 +MinPos.x=-1 +MinPos.y=-1 +MaxPos.x=-4 +MaxPos.y=-23 +NormalPos.left=132 +NormalPos.top=132 +NormalPos.right=1016 +NormalPos.bottom=422 +Class=CLatexEdit +Document=FrontBackmatter\Titlepage.tex + +[Frame3_Row0] +cyCur=243 +cyMin=10 + +[Frame3_Col0] +cxCur=856 +cxMin=10 + +[Frame3_View0,0] +Cursor.row=33 +Cursor.column=2 +TopSubLine=20 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 6aa1f671c97..6553569887a 100644 Binary files a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf and b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf 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 4c230a4ce17..083b6955bdc 100644 Binary files a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf and b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf 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 40609c278fe..e652756a627 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex @@ -1,5 +1,5 @@ % book example for classicthesis.sty -\documentclass[12pt,a5paper]{scrbook} % KOMA-Script book +\documentclass[12pt,a5paper,footinclude]{scrbook} % KOMA-Script book \usepackage{lipsum} \usepackage[linedheaders,parts]{../classicthesis} %\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false} 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 c61cbeffb99..27fb14cd653 100644 Binary files a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf and b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf differ diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex index cc7ddf60c50..b0caef2a88f 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex @@ -26,11 +26,11 @@ 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, Daniel -Gottschlag, Denis Aydin, Paride Legovini, Steffen Prochnow, -and the whole \LaTeX-community for support, ideas and some great -software. +Pantieri and Enrico Gregorio\footnote{Members of GuIT (Gruppo +Italiano Utilizzatori di \TeX\ e \LaTeX )}, J\"org Sommer, +Joachim K\"ostler, Daniel Gottschlag, Denis Aydin, Paride +Legovini, Steffen Prochnow, Nicolas Repp, +and the whole \LaTeX-community for support, ideas and some great software. \endgroup diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex index dc0d859888f..3f7b73c8c83 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex @@ -4,15 +4,14 @@ %\phantomsection \refstepcounter{dummy} \pdfbookmark[1]{\contentsname}{tableofcontents} -\setcounter{tocdepth}{2} +\setcounter{tocdepth}{2} % <-- 2 includes up to subsections in the ToC +\setcounter{secnumdepth}{3} % <-- 3 numbers up to subsubsections +\manualmark +\markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} \tableofcontents -%\markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} -%******************************************************* -% work-around to have small caps also here in the headline -% will not work at this place if the TOC has more than 2 pages -% use \manualmark and then the \markboth as above -% later a modification of \automark[section]{chapter} -%******************************************************* +\automark[section]{chapter} +\renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}} +\renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}}%******************************************************* % List of Figures and of the Tables %******************************************************* \clearpage @@ -47,11 +46,13 @@ %******************************************************* % List of Listings %******************************************************* -% %\phantomsection -% \refstepcounter{dummy} -% %\addcontentsline{toc}{chapter}{\lstlistlistingname} -% \pdfbookmark[1]{\lstlistlistingname}{lol} -% \lstlistoflistings + %\phantomsection + \refstepcounter{dummy} + %\addcontentsline{toc}{chapter}{\lstlistlistingname} + \pdfbookmark[1]{\lstlistlistingname}{lol} + \lstlistoflistings + + \vspace*{8ex} %******************************************************* % Acronyms diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex index d2158ba55cb..92bdc4cd165 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex @@ -2,6 +2,8 @@ % Titlepage %******************************************************* \begin{titlepage} + % if you want the titlepage to be centered, uncomment and fine-tune the line below (KOMA classes environment) + \begin{addmargin}[-1cm]{-3cm} \begin{center} \large @@ -28,5 +30,6 @@ \vfill - \end{center} + \end{center} + \end{addmargin} \end{titlepage} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES index 7c5cc831b78..7f1164e1d66 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES +++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES @@ -11,7 +11,6 @@ typearea.sty 2007/12/24 v2.98 KOMA-Script package (type area) inputenc.sty 2006/05/05 v1.1b Input encoding file latin1.def 2006/05/05 v1.1b Input encoding file babel.sty 2008/07/06 v3.8l The Babel package - bblopts.cfg 2006/07/31 v1.0 MiKTeX 'babel' configuration ngermanb.ldf 2008/07/06 v2.6n new German support from the babel system english.ldf 2005/03/30 v3.3o English support from the babel system natbib.sty 2007/10/30 8.1 (PWD) @@ -20,8 +19,8 @@ ngermanb.ldf 2008/07/06 v2.6n new German support from the babel system amsgen.sty 1999/11/30 v2.0 amsbsy.sty 1999/11/29 v1.2d amsopn.sty 1999/12/14 v2.01 operator names -classicthesis-ldpkg.sty 2008/10/01 v2.5 Package Loader for Classic Thesis St -yle +classicthesis-ldpkg.sty 2009/05/09 v2.5.1 Package Loader for Classic Thesis +Style ifthen.sty 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC) fontenc.sty t1enc.def 2005/09/27 v1.99g Standard LaTeX file @@ -37,29 +36,19 @@ fixltx2e.sty 2006/03/24 v1.1n fixes to LaTeX suffix.sty 2006/07/15 1.5 Variant command support caption.sty 2008/08/24 v3.1j Customizing captions (AR) caption3.sty 2008/08/24 v3.1j caption3 kernel (AR) -remreset.sty - subfig.sty 2005/06/28 ver: 1.3 subfig package listings.sty 2007/02/22 1.4 (Carsten Heinz) lstmisc.sty 2007/02/22 1.4 (Carsten Heinz) listings.cfg 2007/02/22 1.4 listings configuration -lstlang1.sty 2004/09/05 1.3 listings language file -lstlang2.sty 2004/09/05 1.3 listings language file -lstlang3.sty 2004/09/05 1.3 listings language file -lstlang1.sty 2004/09/05 1.3 listings language file -lstlang2.sty 2004/09/05 1.3 listings language file -lstlang3.sty 2004/09/05 1.3 listings language file -lstlang1.sty 2004/09/05 1.3 listings language file -lstlang2.sty 2004/09/05 1.3 listings language file -lstlang3.sty 2004/09/05 1.3 listings language file - lstmisc.sty 2007/02/22 1.4 (Carsten Heinz) -hyperref.sty 2008/09/13 v6.78j Hypertext links for LaTeX +remreset.sty + subfig.sty 2005/06/28 ver: 1.3 subfig package +hyperref.sty 2008/09/29 v6.78l Hypertext links for LaTeX ifpdf.sty 2007/12/12 v1.6 Provides the ifpdf switch (HO) ifvtex.sty 2007/09/09 v1.3 Switches for detecting VTeX and its modes (HO) - ifxetex.sty 2006/08/21 v0.3 Provides ifxetex conditional + ifxetex.sty 2008/09/18 v0.4 Provides ifxetex conditional hycolor.sty 2008/09/08 v1.4 Code for color options of hyperref/bookmark (HO ) xcolor-patch.sty 2008/09/08 xcolor patch - pd1enc.def 2008/09/13 v6.78j Hyperref: PDFDocEncoding definition (HO) + pd1enc.def 2008/09/29 v6.78l Hyperref: PDFDocEncoding definition (HO) etexcmds.sty 2007/12/12 v1.2 Prefix for e-TeX command names (HO) infwarerr.sty 2007/09/09 v1.2 Providing info/warning/message (HO) hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive @@ -74,14 +63,14 @@ HO) kvsetkeys.sty 2007/09/29 v1.3 Key value parser with default handler support (HO) atbegshi.sty 2008/07/31 v1.9 At begin shipout hook (HO) - hpdftex.def 2008/09/13 v6.78j Hyperref driver for pdfTeX + hpdftex.def 2008/09/29 v6.78l Hyperref driver for pdfTeX graphicx.sty 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR) graphics.sty 2006/02/20 v1.0o Standard LaTeX Graphics (DPC,SPQR) trig.sty 1999/03/16 v1.09 sin cos tan (DPC) graphics.cfg 2007/01/18 v1.5 graphics configuration of teTeX/TeXLive pdftex.def 2008/09/08 v0.04l Graphics/color for pdfTeX -classicthesis.sty 2008/10/01 v2.5 Typographic Style for a classic-looking th -esis +classicthesis.sty 2009/05/09 v2.5.1 Typographic Style for a classic-looking +thesis xcolor.sty 2007/01/21 v2.11 LaTeX color extensions (UK) color.cfg 2007/01/18 v1.5 color configuration of teTeX/TeXLive dvipsnam.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR) @@ -99,6 +88,16 @@ titlesec.sty 2007/08/12 v2.8 Sectioning titles scrtime.sty 2006/03/30 v1.1o LaTeX2e KOMA-Script package prelim2e.sty 2001/02/17 v1.23 prelim2e Package (MS) everyshi.sty 2001/05/15 v3.00 EveryShipout Package (MS) +lstlang1.sty 2004/09/05 1.3 listings language file +lstlang2.sty 2004/09/05 1.3 listings language file +lstlang3.sty 2004/09/05 1.3 listings language file +lstlang1.sty 2004/09/05 1.3 listings language file +lstlang2.sty 2004/09/05 1.3 listings language file +lstlang3.sty 2004/09/05 1.3 listings language file +lstlang1.sty 2004/09/05 1.3 listings language file +lstlang2.sty 2004/09/05 1.3 listings language file +lstlang3.sty 2004/09/05 1.3 listings language file + lstmisc.sty 2007/02/22 1.4 (Carsten Heinz) ts1cmr.fd 1999/05/25 v2.5h Standard LaTeX font definitions t1pplj.fd 2004/09/06 font definitions for T1/pplj. nameref.sty 2007/05/29 v2.31 Cross-referencing by name of section diff --git a/Master/texmf-dist/doc/latex/classicthesis/README b/Master/texmf-dist/doc/latex/classicthesis/README index 3484d394db6..7487cd16661 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/README +++ b/Master/texmf-dist/doc/latex/classicthesis/README @@ -1,6 +1,6 @@ A Classic Thesis Style An Homage to The Elements of Typographic Style -Copyright (C) 2008 Andr\'e Miede http://www.miede.de +Copyright (C) 2009 Andr\'e Miede http://www.miede.de Please see the file ClassicThesis.pdf for more information. Your comments are highly appreciated. diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty index abbff96099f..15d395d6292 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) 2008 André Miede http://www.miede.de +% Copyright (C) 2009 André 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}[2008/10/01 v2.5 Package Loader for Classic Thesis Style] +\ProvidesPackage{classicthesis-ldpkg}[2009/08/01 v2.6 Package Loader for Classic Thesis Style] \@ifpackageloaded{classicthesis}% {\PackageWarningNoLine{classicthesis-ldpkg}{Package "classicthesis" should be loaded AFTER "classicthesis-ldpkg".}}% @@ -51,8 +51,9 @@ \RequirePackage{mparhack} % get marginpar right \RequirePackage{fixltx2e} % fixes some LaTeX stuff %\RequirePackage{ellipsis} % ... ;-) -\RequirePackage{relsize} % scale font up or down -\RequirePackage[smaller]{acronym} % nice macros for handling all acronyms in the thesis +\RequirePackage{relsize} % scale font up or down +\RequirePackage[printonlyused,smaller]{acronym} % nice macros for handling all acronyms in the thesis +%\renewcommand*{\acsfont}[1]{\textssc{#1}} \renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms %\RequirePackage{natbib} @@ -94,6 +95,10 @@ % ******************************************************************** % take care of the caption fonts and sizes (tables and figures) \RequirePackage{caption} + +% ******************************************************************** +% fine typesetting of code listings +\RequirePackage{listings} % ******************************************************************** % caption numbering now w/o chapter number @@ -112,66 +117,19 @@ } \renewcommand{\thefigure}{\arabic{figure}} \makeatother + \makeatletter + \@ifpackageloaded{listings}{% + \ifthenelse{\boolean{cld@nochapters}}% + {\relax}{% + \@removefromreset{lstlisting}{chapter}% requires remreset package + } + \AtBeginDocument{\renewcommand{\thelstlisting}{\arabic{lstlisting}}} % <-- might cause an error with some TeX distributions + }{\relax} + \makeatother % ******************************************************************** % enable subfigures in figures -\RequirePackage{subfig} - -% ******************************************************************** -% fine typesetting of code listings -\RequirePackage{listings} -% ******************************************************************** -% caption numbering now w/o chapter number -%\makeatletter -% \ifthenelse{\boolean{@nochapters}}% -% {\relax}{% -% \@removefromreset{lstlisting}{chapter}% requires remreset package -% } -% \renewcommand{\thelstlisting}{\arabic{lstlisting}} % <-- might cause an error with some TeX distributions -%\makeatother -% ******************************************************************** -% ...and get the layout of the list of listings right (dirty workaround) -%\makeatletter -% \def\@dottedtocline#1#2#3#4#5{% -% \ifnum #1>\c@tocdepth \else -% \vskip \z@ \@plus.2\p@ -% {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip -% \parindent #2\relax\@afterindenttrue -% \interlinepenalty\@M -% \leavevmode -% \@tempdima #3\relax -% \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip -% \hbox{{#4}\nobreak -% \hspace{1.5em} -% \nobreak -% \hb@xt@\@pnumwidth{\normalfont \normalcolor #5}}% -% \par}% -% \fi} -% \def\@pnumwidth{0em} -%\makeatother -% ******************************************************************** -% to get the LoL entries right, change line 1461 in listings.sty (v1.3a) to -% {\protect\hspace{-\parindent}Listing~\thelstlisting\hspace{1.5em}\lst@@caption}% -% really nasty, if you know of a better way, please let me know -% ******************************************************************** -%\lstset{emph={trueIndex,root},emphstyle=\color{BlueViolet}}%\underbar} % for special keywords -% ******************************************************************** -\lstset{language=[LaTeX]Tex,%C++, - keywordstyle=\color{RoyalBlue},%\bfseries, - basicstyle=\small\ttfamily, - %identifierstyle=\color{NavyBlue}, - commentstyle=\color{Green}\ttfamily, - stringstyle=\rmfamily, - numbers=none,%left,% - numberstyle=\scriptsize,%\tiny - stepnumber=5, - numbersep=8pt, - showstringspaces=false, - breaklines=true, - frameround=ftff, - frame=single - %frame=L -} +\RequirePackage{subfig} % ******************************************************************** % Using PDFLaTeX: diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty index 4546459be78..5f7d2fad04f 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) 2008 André Miede http://www.miede.de +% Copyright (C) 2009 André 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}[2008/10/01 v2.5 Typographic Style for a classic-looking thesis] +\ProvidesPackage{classicthesis}[2009/08/01 v2.6 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) @@ -58,6 +58,8 @@ \newboolean{@pdfspacing} % use pdftex for letterspacing (via microtype) \newboolean{@subfig} % setup for preloaded @subfig package \newboolean{@a5paper} % use those tiny DIN A5 pages + \newboolean{@dottedtoc} % page numbers in ToC flushed right + \newboolean{@listings} % load listings package (if not already) and setup LoL % ******************************************************************** % Options @@ -80,6 +82,9 @@ \DeclareOption{minionpro}{\setboolean{@minionpro}{true}} \DeclareOption{minionprospacing}{\setboolean{@minionprospacing}{true}} \DeclareOption{pdfspacing}{\setboolean{@pdfspacing}{true}} +\DeclareOption{pdfspacing}{\setboolean{@pdfspacing}{true}} +\DeclareOption{dottedtoc}{\setboolean{@dottedtoc}{true}} +\DeclareOption{listings}{\setboolean{@listings}{true}} \ProcessOptions\relax % subfig-related stuff @@ -95,6 +100,12 @@ {\PassOptionsToPackage{subfigure}{tocloft}% }{\relax}% +% listings-related stuff +\ifthenelse{\boolean{@listings}}% + {\@ifpackageloaded{listings}% + {\relax}{\RequirePackage{listings}}% + }{\relax}% + % fine-tuning if we use minionprospacing \ifthenelse{\boolean{@minionprospacing}}% {% @@ -236,12 +247,13 @@ % Graffiti as in GKP's book "Concrete Mathematics" \DeclareRobustCommand{\graffito}[1]{\marginpar{% \slshape\footnotesize%\small% - %\ifodd\thepage\raggedright\else\raggedleft\fi% + \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}} - + %\raggedright% + \hspace{0pt}#1}} + % Enumeration environment with small caps \newenvironment{aenumerate} {\def\theenumi{\textsc{\alph{enumi}}}% @@ -371,8 +383,11 @@ % \setlength{\cftpartnumwidth}{\cftpartnumwidth} \renewcommand{\cftpartfont}{\color{Maroon}\normalfont}% \renewcommand{\cftpartpagefont}{\normalfont}% - \renewcommand{\cftpartleader}{\hspace{1.5em}}% - \renewcommand{\cftpartafterpnum}{\cftparfillskip}% + \ifthenelse{\boolean{@dottedtoc}}{\relax}% + {% + \renewcommand{\cftpartleader}{\hspace{1.5em}}% + \renewcommand{\cftpartafterpnum}{\cftparfillskip}% + }% \setlength{\cftbeforepartskip}{1em}% \setlength{\cftbeforechapskip}{.1em}% \setlength{\beforebibskip}{\cftbeforepartskip}% @@ -384,50 +399,95 @@ \renewcommand{\cftchappresnum}{\scshape\MakeTextLowercase}% \renewcommand{\cftchapfont}{\normalfont}% \renewcommand{\cftchappagefont}{\normalfont}% - \renewcommand{\cftchapleader}{\hspace{1.5em}}% - \renewcommand{\cftchapafterpnum}{\cftparfillskip}% + \ifthenelse{\boolean{@dottedtoc}}{\relax}% + {% + \renewcommand{\cftchapleader}{\hspace{1.5em}}% + \renewcommand{\cftchapafterpnum}{\cftparfillskip}% + } %\setlength{\cftbeforechapskip}{.1em}% } % sections \ifthenelse{\boolean{@nochapters}}% - {% - \setlength{\cftbeforesecskip}{.1em}% - \setlength{\beforebibskip}{1em}% - }% - {\relax} + {% + \setlength{\cftbeforesecskip}{.1em}% + \setlength{\beforebibskip}{1em}% + }% + {\relax} \renewcommand{\cftsecpresnum}{\scshape\MakeTextLowercase}% \renewcommand{\cftsecfont}{\normalfont}% - \renewcommand{\cftsecpagefont}{\normalfont}% - \renewcommand{\cftsecleader}{\hspace{1.5em}} - \renewcommand{\cftsecafterpnum}{\cftparfillskip} - \ifthenelse{\boolean{@tocaligned}}{\renewcommand{\cftsecindent}{0em}}{\relax} + \renewcommand{\cftsecpagefont}{\normalfont}% + \ifthenelse{\boolean{@dottedtoc}}{\relax}% + {% + \renewcommand{\cftsecleader}{\hspace{1.5em}}% + \renewcommand{\cftsecafterpnum}{\cftparfillskip}% + } + \ifthenelse{\boolean{@tocaligned}}{\renewcommand{\cftsecindent}{0em}}{\relax} % subsections \renewcommand{\cftsubsecpresnum}{\scshape\MakeTextLowercase}% \renewcommand{\cftsubsecfont}{\normalfont}% - \renewcommand{\cftsubsecleader}{\hspace{1.5em}} - \renewcommand{\cftsubsecafterpnum}{\cftparfillskip} - \ifthenelse{\boolean{@tocaligned}}{\renewcommand{\cftsubsecindent}{0em}}{\relax} + \ifthenelse{\boolean{@dottedtoc}}{\relax}% + {% + \renewcommand{\cftsubsecleader}{\hspace{1.5em}}% + \renewcommand{\cftsubsecafterpnum}{\cftparfillskip}% + } + \ifthenelse{\boolean{@tocaligned}}{\renewcommand{\cftsubsecindent}{0em}}{\relax} + % subsubsections + \renewcommand{\cftsubsubsecpresnum}{\scshape\MakeTextLowercase}% + \renewcommand{\cftsubsubsecfont}{\normalfont}% + \ifthenelse{\boolean{@dottedtoc}}{\relax}% + {% + \renewcommand{\cftsubsubsecleader}{\hspace{1.5em}}% + \renewcommand{\cftsubsubsecafterpnum}{\cftparfillskip}% + } + \ifthenelse{\boolean{@tocaligned}}{\renewcommand{\cftsubsubsecindent}{0em}}{\relax} % figures \renewcommand{\cftfigpresnum}{\scshape\MakeTextLowercase}% \renewcommand{\cftfigfont}{\normalfont}% - \renewcommand{\cftfigleader}{\hspace{1.5em}} - \renewcommand{\cftfigpresnum}{\figurename~}%Fig.~} - \renewcommand{\cftfigafterpnum}{\cftparfillskip} - \newlength{\figurelabelwidth} - \settowidth{\figurelabelwidth}{\cftfigpresnum~99} - \addtolength{\figurelabelwidth}{2.5em} - \cftsetindents{figure}{0em}{\figurelabelwidth} + \ifthenelse{\boolean{@dottedtoc}}{\relax}% + {% + \renewcommand{\cftfigleader}{\hspace{1.5em}}% + \renewcommand{\cftfigafterpnum}{\cftparfillskip}% + } + \renewcommand{\cftfigpresnum}{\figurename~}%Fig.~} + \newlength{\figurelabelwidth} + \settowidth{\figurelabelwidth}{\cftfigpresnum~99} + \addtolength{\figurelabelwidth}{2.5em} + \cftsetindents{figure}{0em}{\figurelabelwidth} % tables \renewcommand{\cfttabpresnum}{\scshape\MakeTextLowercase}% \renewcommand{\cfttabfont}{\normalfont}% - \renewcommand{\cfttableader}{\hspace{1.5em}} - \renewcommand{\cfttabpresnum}{\tablename~}%Tab.~} - \renewcommand{\cfttabafterpnum}{\cftparfillskip} - \newlength{\tablelabelwidth} - \settowidth{\tablelabelwidth}{\cfttabpresnum~99} - \addtolength{\tablelabelwidth}{2.5em} - %\cftsetindents{table}{0em}{\tablelabelwidth} - \cftsetindents{table}{0em}{\figurelabelwidth} + \ifthenelse{\boolean{@dottedtoc}}{\relax}% + {% + \renewcommand{\cfttableader}{\hspace{1.5em}}% + \renewcommand{\cfttabafterpnum}{\cftparfillskip}% + } + \renewcommand{\cfttabpresnum}{\tablename~}%Tab.~} + \newlength{\tablelabelwidth} + \settowidth{\tablelabelwidth}{\cfttabpresnum~99} + \addtolength{\tablelabelwidth}{2.5em} + %\cftsetindents{table}{0em}{\tablelabelwidth} + \cftsetindents{table}{0em}{\figurelabelwidth} + % listings + \ifthenelse{\boolean{@listings}}% + {% + \newlistof{listings}{lol}{\lstlistlistingname}% + \renewcommand{\cftlistingspresnum}{\scshape\MakeTextLowercase}% + \renewcommand{\cftlistingsfont}{\normalfont}% + \renewcommand{\cftlistingspresnum}{\lstlistingname~}% + \renewcommand{\cftlistingspagefont}{\normalfont}% + \ifthenelse{\boolean{@dottedtoc}}{\relax}% + {% + \renewcommand{\cftlistingsleader}{\hspace{1.5em}}% + \renewcommand{\cftlistingsafterpnum}{\cftparfillskip}% + } + \newlength{\listingslabelwidth}% + \settowidth{\listingslabelwidth}{\cftlistingspresnum~99}% + \addtolength{\listingslabelwidth}{2.5em}% + %\cftsetindents{listings}{0em}{\listingslabelwidth}% + \cftsetindents{listings}{0em}{\figurelabelwidth}% + \let\l@lstlisting\l@listings% + \let\lstlistoflistings\listoflistings% + }{\relax}% % dirty work-around to get the spacing after the toc/lot/lof-titles right \ifthenelse{\boolean{@parts}}% -- cgit v1.2.3