diff options
17 files changed, 271 insertions, 158 deletions
diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES index 00821c3947b..c03a1443eaf 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.5 (October 2008, cumulative release) +o Increased text-width for better page layout (experimental) +o Cumulative release, some minor clean-up and bug-fixing + +Changes in version 2.4.{1--3} (February and April 2008, +released as betas) +o Switched back to "obsolete" KOMA options due to + compatibility issues on some installations +o Increased robustness of \cauthor command in + classicthesis-ldpk.sty +o Spacing fix for \sectionmark (in classicthesis.sty) +o Made Booleans private (in classicthesis.sty) +o Acronyms header for long acronym lists (in Contents.tex) +o Moved "amsmath" package from classicthesis.sty to + ClassicThesis.tex +o "MinionPro" package now loaded with "mathlf" option + instead of "osf" option (in classicthesis.sty) +o Fixed issue with contents headings (in classicthesis.sty + and in Contents.tex) +o Thanks to Lorenzo + Changes in version 2.3 (November 2007) o Fixed serious bug with \myChapter command (using plain LaTeX) diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex index 23bbe7464cc..5d4e114d671 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex @@ -53,7 +53,7 @@ nec. Autem timeam deleniti usu id, in nec nibh altera. %evertitur mel. Molestie conclusionemque vel at. -\section{Another Section in This Chapter} +\section{Another Section in This Chapter} % \ensuremath{\NoCaseChange{\mathbb{ZNR}}} Non vices medical da. Se qui peano distinguer demonstrate, personas internet in nos. Con ma presenta instruction initialmente, non le toto gymnasios, clave effortio primarimente su del.\footnote{Uno il nomine diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex index 2b1eb46c6a7..0248c1df7c2 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex @@ -1,5 +1,5 @@ %************************************************ -\myChapter{Math Test Chapter}\label{ch:mathtest} +\myChapter{Math Test Chapter}\label{ch:mathtest} % $\mathbb{ZNR}$ %************************************************ Ei choro aeterno antiopam mea, labitur bonorum pri no. His no decore nemore graecis. In eos meis nominavi, liber soluta vim cu. Sea commune @@ -23,7 +23,7 @@ energy transfer in a single collision with an atomic electron: \graffito{You might get unexpected results using math in chapter or section heads. Consider the \texttt{pdfspacing} option.} \[ -\kappa =\frac{\xi}{E_{\mathrm{max}}} +\kappa =\frac{\xi}{E_{\mathrm{max}}} \mathbb{ZNR} \] $E_{\mathrm{max}}$ is the maximum transferable energy in a single collision with diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf Binary files differindex 1c14f81b6bc..c5c09a12485 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex index 13970437502..2925ec6e79c 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) 2007 André Miede http://www.miede.de +% Copyright (C) 2008 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 @@ -37,21 +37,23 @@ % ************************************************************************************************************** % To Do: % * support a List of Listings that looks like the other lists +% * 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...}) % ************************************************************************************************************** -\documentclass[ twoside,openright,titlepage,fleqn,%1headlines,% - pointlessnumbers,headinclude,BCOR5mm,% - %10pt,a4paper,footinclude,cleardoubleempty,abstractoff % <--- obsolete, remove (todo) +\documentclass[ twoside,openright,titlepage,fleqn,pointlessnumbers,headinclude,%1headlines,% + 10pt,a4paper,BCOR5mm,footinclude,cleardoubleempty,abstractoff % <--- obsolete, remove (todo) ]{scrreprt} % ******************************************************************** -% KOMA-Script setup (new, see commented line above) +% KOMA-Script setup http://www.komascript.de/betaKOMAoptions % ******************************************************************** -\KOMAoptions{% - paper=a4,% - fontsize=10pt,% - cleardoublepage=empty,% - footinclude=true,% - abstract=false% -} +%\KOMAoptions{% +% paper=a4,% +% fontsize=10pt,% +% cleardoublepage=empty,% +% footinclude=true,% +% %abstract=false% +%} % ******************************************************************** % Development Stuff % ******************************************************************** @@ -70,15 +72,16 @@ \newcommand{\myFaculty}{Put data here\xspace} \newcommand{\myDepartment}{Put data here\xspace} \newcommand{\myUni}{\protect{Put data here}\xspace} -\newcommand{\myLocation}{Hamburg\xspace} -\newcommand{\myTime}{November 2007\xspace} -\newcommand{\myVersion}{Version 2.3\xspace} +\newcommand{\myLocation}{Darmstadt\xspace} +\newcommand{\myTime}{October 2008\xspace} +\newcommand{\myVersion}{Version 2.5\xspace} %******************************************************* % Packages with options that might require adjustments %******************************************************* \usepackage[latin1]{inputenc} \usepackage[ngerman,american]{babel} \usepackage[square,numbers]{natbib} +\usepackage[fleqn]{amsmath} % math environments and more by the AMS %******************************************************* \usepackage{classicthesis-ldpkg} %******************************************************* @@ -166,6 +169,7 @@ \include{Chapters/Chapter01} \cleardoublepage\myPart{The Showcase} \include{Chapters/Chapter02} +%\addtocontents{toc}{\protect\clearpage} % TEST \include{Chapters/Chapter03} % ******************************************************************** % Backmatter diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps index 127a3f1182b..49c61e9eedb 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps @@ -4,12 +4,70 @@ Version=2 [SessionInfo] ActiveTab=2 -FrameCount=1 -ActiveFrame=0 +FrameCount=3 +ActiveFrame=2 [Frame0] Columns=1 Rows=1 +Flags=0 +ShowCmd=1 +MinPos.x=-1 +MinPos.y=-1 +MaxPos.x=-4 +MaxPos.y=-26 +NormalPos.left=66 +NormalPos.top=66 +NormalPos.right=749 +NormalPos.bottom=372 +Class=CLatexEdit +Document=classicthesis.sty + +[Frame0_Row0] +cyCur=254 +cyMin=10 + +[Frame0_Col0] +cxCur=653 +cxMin=10 + +[Frame0_View0,0] +Cursor.row=213 +Cursor.column=58 +TopSubLine=218 + +[Frame1] +Columns=1 +Rows=1 +Flags=0 +ShowCmd=1 +MinPos.x=-1 +MinPos.y=-1 +MaxPos.x=-4 +MaxPos.y=-26 +NormalPos.left=44 +NormalPos.top=44 +NormalPos.right=727 +NormalPos.bottom=350 +Class=CLatexEdit +Document=classicthesis-ldpkg.sty + +[Frame1_Row0] +cyCur=254 +cyMin=10 + +[Frame1_Col0] +cxCur=653 +cxMin=10 + +[Frame1_View0,0] +Cursor.row=28 +Cursor.column=38 +TopSubLine=14 + +[Frame2] +Columns=1 +Rows=1 Flags=2 ShowCmd=3 MinPos.x=-1 @@ -23,16 +81,16 @@ NormalPos.bottom=165 Class=CLatexEdit Document=ClassicThesis.tex -[Frame0_Row0] -cyCur=317 +[Frame2_Row0] +cyCur=746 cyMin=10 -[Frame0_Col0] -cxCur=997 +[Frame2_Col0] +cxCur=1570 cxMin=10 -[Frame0_View0,0] -Cursor.row=45 -Cursor.column=50 -TopSubLine=38 +[Frame2_View0,0] +Cursor.row=71 +Cursor.column=45 +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 Binary files differindex 0b2f7ca5944..6aa1f671c97 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex index 3aa4641f5d5..1da6c489d26 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex @@ -1,9 +1,9 @@ % article example for classicthesis.sty -\documentclass[10pt,a4paper]{scrartcl} % KOMA-Script article +\documentclass[10pt,a4paper]{scrartcl} % KOMA-Script article \usepackage{lipsum} \usepackage{url} %\usepackage[nochapters]{../classicthesis-ldpkg} -\usepackage[nochapters,minionprospacing]{../classicthesis} +\usepackage[nochapters,minionprospacing]{../classicthesis} % nochapters \begin{document} \title{\rmfamily\normalfont\spacedallcaps{the title}} diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf Binary files differindex f68c5671628..4c230a4ce17 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf 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 53eae761ec5..40609c278fe 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[10pt,a4paper]{scrbook} % KOMA-Script book +\documentclass[12pt,a5paper]{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 Binary files differindex 793d8828c52..c61cbeffb99 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex index 754ac81eeb3..cc7ddf60c50 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex @@ -28,8 +28,9 @@ 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, and the whole \LaTeX-community for -support, ideas and some great software. +Gottschlag, Denis Aydin, Paride Legovini, Steffen Prochnow, +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 ac65ab69b16..dc0d859888f 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex @@ -5,8 +5,8 @@ \refstepcounter{dummy} \pdfbookmark[1]{\contentsname}{tableofcontents} \setcounter{tocdepth}{2} -\tableofcontents -\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 @@ -59,8 +59,9 @@ %\phantomsection \refstepcounter{dummy} \pdfbookmark[1]{Acronyms}{acronyms} + \markboth{\spacedlowsmallcaps{Acronyms}}{\spacedlowsmallcaps{Acronyms}} \chapter*{Acronyms} - \begin{acronym}[CSCW] + \begin{acronym}[UML] \acro{DRY}{Don't Repeat Yourself} \acro{API}{Application Programming Interface} \acro{UML}{Unified Modeling Language} diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES index caa68de67e4..7c5cc831b78 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES +++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES @@ -1,21 +1,26 @@ LIST OF FILES FOR ClassicThesis.tex - *File List* -scrreprt.cls 2007/10/12 v2.97d KOMA-Script document class (report) -scrkbase.sty 2007/10/12 v2.97d KOMA-Script package (basics and keyval use) + *File List* +scrreprt.cls 2007/12/24 v2.98 KOMA-Script document class (report) +scrkbase.sty 2007/12/24 v2.98 KOMA-Script package (basics and keyval use) keyval.sty 1999/03/16 v1.13 key=value parser (DPC) -scrlfile.sty 2007/03/07 v2.97a KOMA-Script package (loading files) +scrlfile.sty 2007/12/18 v2.98 KOMA-Script package (loading files) fleqn.clo 1998/08/17 v1.1c Standard LaTeX option (flush left equations) - size11.clo 2005/09/16 v1.4f Standard LaTeX file (size option) -typearea.sty 2007/10/12 v2.97d KOMA-Script package (type area) + size10.clo 2005/09/16 v1.4f Standard LaTeX file (size option) +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 2005/11/23 v3.8h The Babel package + babel.sty 2008/07/06 v3.8l The Babel package bblopts.cfg 2006/07/31 v1.0 MiKTeX 'babel' configuration -ngermanb.ldf 2004/02/20 v2.6m new German support from the babel system +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/02/05 8.0 (PWD) -classicthesis-ldpkg.sty 2007/11/01 v2.3 Package Loader for Classic Thesis St + natbib.sty 2007/10/30 8.1 (PWD) + amsmath.sty 2000/07/18 v2.13 AMS math features + amstext.sty 2000/06/29 v2.01 + 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 ifthen.sty 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC) fontenc.sty @@ -27,16 +32,11 @@ tabularx.sty 1999/01/07 v2.07 `tabularx' package (DPC) array.sty 2005/08/23 v2.4b Tabular extension package (FMi) mparhack.sty 2005/04/17 v1.4 (T. Sgouros and S. Ulrich) fixltx2e.sty 2006/03/24 v1.1n fixes to LaTeX - amsmath.sty 2000/07/18 v2.13 AMS math features - amstext.sty 2000/06/29 v2.01 - amsgen.sty 1999/11/30 v2.0 - amsbsy.sty 1999/11/29 v1.2d - amsopn.sty 1999/12/14 v2.01 operator names relsize.sty 2003/07/04 ver 3.1 - acronym.sty 2005/11/11 v1.25 Support for acronyms (Tobias Oetiker) + acronym.sty 2008/05/28 v1.32 Support for acronyms (Tobias Oetiker) suffix.sty 2006/07/15 1.5 Variant command support - caption.sty 2007/10/25 v3.1d Customising captions (AR) -caption3.sty 2007/10/25 v3.1d caption3 kernel (AR) + 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) @@ -52,33 +52,44 @@ 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 2007/06/14 v6.76i Hypertext links for LaTeX - hycolor.sty 2007/04/11 v1.1 Code for color options of hyperref/bookmark (HO +hyperref.sty 2008/09/13 v6.78j 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 + hycolor.sty 2008/09/08 v1.4 Code for color options of hyperref/bookmark (HO ) - pd1enc.def 2007/06/14 v6.76i Hyperref: PDFDocEncoding definition (HO) -etexcmds.sty 2007/09/09 v1.1 Prefix for e-TeX command names (HO) +xcolor-patch.sty 2008/09/08 xcolor patch + pd1enc.def 2008/09/13 v6.78j 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 kvoptions.sty 2007/10/18 v3.0 Keyval support for LaTeX options (HO) - backref.sty 2006/10/06 v1.27 Bibliographical back referencing - url.sty 2005/06/27 ver 3.2 Verb mode for urls, etc. - hpdftex.def 2007/06/14 v6.76i Hyperref driver for pdfTeX + backref.sty 2006/09/05 v1.28 Bibliographical back referencing + url.sty 2006/04/12 ver 3.3 Verb mode for urls, etc. + bitset.sty 2007/09/28 v1.0 Data type bit set (HO) + intcalc.sty 2007/09/27 v1.1 Expandable integer calculations (HO) +bigintcalc.sty 2007/11/11 v1.1 Expandable big integer calculations (HO) +pdftexcmds.sty 2007/12/12 v0.3 LuaTeX support for pdfTeX utility functions ( +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 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 2007/06/12 v0.04h Graphics/color for pdfTeX -classicthesis.sty 2007/11/01 v2.3 Typographic Style for a classic-looking th + 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 - ifpdf.sty 2007/09/09 v1.5 Provides the ifpdf switch (HO) 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) mathpazo.sty 2005/04/12 PSNFSS-v9.2a Palatino w/ Pazo Math (D.Puga, WaS) beramono.sty 2004/01/31 (WaS) eulervm.sty 2005/01/11 v4.0 (WaS) -microtype.sty 2007/07/14 v2.2 Micro-typography with pdfTeX (RS) -microtype.cfg 2007/07/14 v2.2 microtype main configuration file (RS) +microtype.sty 2008/06/04 v2.3b Micro-typography with pdfTeX (RS) +microtype.cfg 2008/06/04 v2.3b microtype main configuration file (RS) booktabs.sty 2005/04/14 v1.61803 publication quality tables textcase.sty 2004/10/07 v0.07 Text only upper/lower case changing (DPC) soul.sty 2003/11/17 v2.4 letterspacing/underlining (mf) @@ -91,4 +102,4 @@ everyshi.sty 2001/05/15 v3.00 EveryShipout Package (MS) 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 -refcount.sty 2006/02/20 v3.0 Data extraction from references (HO)
\ No newline at end of file +refcount.sty 2008/08/11 v3.1 Data extraction from references (HO)
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/classicthesis/README b/Master/texmf-dist/doc/latex/classicthesis/README index 0e0487513f9..3484d394db6 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) 2007 Andr\'e Miede http://www.miede.de +Copyright (C) 2008 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 dd1b9f9a85a..abbff96099f 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) 2007 André Miede http://www.miede.de +% Copyright (C) 2008 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}[2007/11/01 v2.3 Package Loader for Classic Thesis Style] +\ProvidesPackage{classicthesis-ldpkg}[2008/10/01 v2.5 Package Loader for Classic Thesis Style] \@ifpackageloaded{classicthesis}% {\PackageWarningNoLine{classicthesis-ldpkg}{Package "classicthesis" should be loaded AFTER "classicthesis-ldpkg".}}% @@ -36,8 +36,8 @@ % Options % ******************************************************************** \RequirePackage{ifthen} - \newboolean{@nochapters} % disable all chapter-specific commands -\DeclareOption{nochapters}{\setboolean{@nochapters}{true}} + \newboolean{cld@nochapters} % disable all chapter-specific commands +\DeclareOption{nochapters}{\setboolean{cld@nochapters}{true}} \ProcessOptions\relax % ******************************************************************** @@ -50,8 +50,7 @@ \RequirePackage{tabularx} % better tables \RequirePackage{mparhack} % get marginpar right \RequirePackage{fixltx2e} % fixes some LaTeX stuff -%\RequirePackage{ellipsis} % ... ;-) -\RequirePackage[fleqn]{amsmath} % math environments and more by the AMS +%\RequirePackage{ellipsis} % ... ;-) \RequirePackage{relsize} % scale font up or down \RequirePackage[smaller]{acronym} % nice macros for handling all acronyms in the thesis \renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms @@ -78,7 +77,11 @@ \newcommand{\system}[1]{\emph{#1}} \newcommand{\person}[1]{#1} \newcommand{\term}[1]{\emph{#1}} -\newcommand{\cauthor}[1]{\person{\citeauthor{#1}}} +\newcommand{\cauthor}[1]{\relax} +\@ifpackageloaded{natbib}% + {\renewcommand{\cauthor}[1]{\person{\citeauthor{#1}}}% + }{\PackageWarningNoLine{classicthesis-ldpk}{Package "natbib" not loaded, % + command "cauthor" will not work.}} \newcommand{\tableheadline}[1]{\multicolumn{1}{c}{\spacedlowsmallcaps{#1}}} % ******************************************************************** \newcommand{\RA}{\ensuremath{\Rightarrow}} @@ -96,14 +99,14 @@ % caption numbering now w/o chapter number \RequirePackage{remreset} \makeatletter - \ifthenelse{\boolean{@nochapters}}% + \ifthenelse{\boolean{cld@nochapters}}% {\relax}{% \@removefromreset{table}{chapter} % requires remreset package } \renewcommand{\thetable}{\arabic{table}} \makeatother \makeatletter - \ifthenelse{\boolean{@nochapters}}% + \ifthenelse{\boolean{cld@nochapters}}% {\relax}{% \@removefromreset{figure}{chapter} % requires remreset package } diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty index 5c40dfae73a..4546459be78 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) 2007 André Miede http://www.miede.de +% Copyright (C) 2008 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,80 +42,80 @@ % % ******************************************************************** \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{classicthesis}[2007/11/01 v2.3 Typographic Style for a classic-looking thesis] +\ProvidesPackage{classicthesis}[2008/10/01 v2.5 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) - \newboolean{drafting} % print version information on pages - \newboolean{linedheaders} % chaper headers will have line above and beneath - \newboolean{listsseparated} % toggles the vertical space between lof/lot entries of different chapters - \newboolean{nochapters} % disable all chapter-specific commands - \newboolean{beramono} % toggle nice monospaced font (w/ bold) + pre-installed - \newboolean{eulermath} % use awesome Euler fonts for math - \newboolean{parts} % use part division for the text - \newboolean{a5paper} % use those tiny DIN A5 pages - \newboolean{minionpro} % setup for minion pro font - \newboolean{minionprospacing} % use minion pro's textssc for letter spacing - \newboolean{pdfspacing} % use pdftex for letterspacing (via microtype) - \newboolean{subfig} % setupt for preloaded subfig package + \newboolean{@tocaligned} % the left column of the toc will be aligned (no indention) + \newboolean{@eulerchapternumbers} % use AMS Euler for chapter font (otherwise Palatino) + \newboolean{@drafting} % print version information on pages + \newboolean{@linedheaders} % chaper headers will have line above and beneath + \newboolean{@listsseparated} % toggles the vertical space between lof/lot entries of different chapters + \newboolean{@nochapters} % disable all chapter-specific commands + \newboolean{@beramono} % toggle nice monospaced font (w/ bold) + pre-installed + \newboolean{@eulermath} % use awesome Euler fonts for math + \newboolean{@parts} % use part division for the text + \newboolean{@minionpro} % setup for minion pro font + \newboolean{@minionprospacing} % use minion pro's textssc for letter spacing + \newboolean{@pdfspacing} % use pdftex for letterspacing (via microtype) + \newboolean{@subfig} % setup for preloaded @subfig package + \newboolean{@a5paper} % use those tiny DIN A5 pages % ******************************************************************** % Options % ******************************************************************** -\DeclareOption{tocaligned}{\setboolean{tocaligned}{true}} -\DeclareOption{eulerchapternumbers}{\setboolean{eulerchapternumbers}{true}} -\DeclareOption{drafting}{\setboolean{drafting}{true}} -\DeclareOption{linedheaders}{\setboolean{linedheaders}{true}} -\DeclareOption{listsseparated}{\setboolean{listsseparated}{true}} +\DeclareOption{tocaligned}{\setboolean{@tocaligned}{true}} +\DeclareOption{eulerchapternumbers}{\setboolean{@eulerchapternumbers}{true}} +\DeclareOption{drafting}{\setboolean{@drafting}{true}} +\DeclareOption{linedheaders}{\setboolean{@linedheaders}{true}} +\DeclareOption{listsseparated}{\setboolean{@listsseparated}{true}} \DeclareOption{subfigure}{% - \PackageWarningNoLine{classicthesis}{Package "subfigure" and option "subfigure are deprecated, used "subfig instead.} - \setboolean{subfig}{true}% + \PackageWarningNoLine{classicthesis}{Package "subfigure" and option "subfigure" are deprecated, used "subfig" instead.} + \setboolean{@subfig}{true}% } -\DeclareOption{subfig}{\setboolean{subfig}{true}} -\DeclareOption{nochapters}{\setboolean{nochapters}{true}} -\DeclareOption{beramono}{\setboolean{beramono}{true}} -\DeclareOption{eulermath}{\setboolean{eulermath}{true}} -\DeclareOption{parts}{\setboolean{parts}{true}} -\DeclareOption{a5paper}{\setboolean{a5paper}{true}} -\DeclareOption{minionpro}{\setboolean{minionpro}{true}} -\DeclareOption{minionprospacing}{\setboolean{minionprospacing}{true}} -\DeclareOption{pdfspacing}{\setboolean{pdfspacing}{true}} +\DeclareOption{subfig}{\setboolean{@subfig}{true}} +\DeclareOption{nochapters}{\setboolean{@nochapters}{true}} +\DeclareOption{beramono}{\setboolean{@beramono}{true}} +\DeclareOption{eulermath}{\setboolean{@eulermath}{true}} +\DeclareOption{parts}{\setboolean{@parts}{true}} +\DeclareOption{a5paper}{\setboolean{@a5paper}{true}} +\DeclareOption{minionpro}{\setboolean{@minionpro}{true}} +\DeclareOption{minionprospacing}{\setboolean{@minionprospacing}{true}} +\DeclareOption{pdfspacing}{\setboolean{@pdfspacing}{true}} \ProcessOptions\relax % subfig-related stuff \@ifpackageloaded{subfig}% - {\setboolean{subfig}{true}% + {\setboolean{@subfig}{true}% }{\relax} \@ifpackageloaded{subfigure}% - {\setboolean{subfig}{true}% - \PackageWarningNoLine{classicthesis}{Package "subfigure" and option "subfigure are deprecated, % - use "subfig instead.} + {\setboolean{@subfig}{true}% + \PackageWarningNoLine{classicthesis}{Package "subfigure" and option "subfigure" are deprecated, % + use "subfig" instead.} }{\relax} -\ifthenelse{\boolean{subfig}}% +\ifthenelse{\boolean{@subfig}}% {\PassOptionsToPackage{subfigure}{tocloft}% }{\relax}% % fine-tuning if we use minionprospacing -\ifthenelse{\boolean{minionprospacing}}% +\ifthenelse{\boolean{@minionprospacing}}% {% \PackageInfo{classicthesis}{Using option "minionprospacing". % This activates "minionpro" in general and turns off % the option "pdfspacing".}% % is the user trying to use pdfspacing at the same time? - \ifthenelse{\boolean{pdfspacing}}% + \ifthenelse{\boolean{@pdfspacing}}% {% both minionprospacing and pdfspacing are active \PackageWarningNoLine{classicthesis}{You cannot use "pdfspacing" at the same time % as "minionprospacing"!}% }{\relax}% - \setboolean{minionpro}{true}% - \setboolean{pdfspacing}{false}% + \setboolean{@minionpro}{true}% + \setboolean{@pdfspacing}{false}% }{\relax} % fine-tuning if we do not use chapters -\ifthenelse{\boolean{nochapters}}% +\ifthenelse{\boolean{@nochapters}}% {% % is the user trying to use parts at the same time? - \ifthenelse{\boolean{parts}}% + \ifthenelse{\boolean{@parts}}% {% both parts and nochapters are active \PackageWarningNoLine{classicthesis}{You cannot use "parts" at the same time % as "nochapters"!}% @@ -124,10 +124,10 @@ \PackageInfo{classicthesis}{Using option "nochapters" (probably for an article). % This turns off the options "linedheaders",% "listsseparated", "eulerchapternumbers", and "parts". Please be aware of that.} - \setboolean{linedheaders}{false}% - \setboolean{listsseparated}{false}% - \setboolean{eulerchapternumbers}{false}% - \setboolean{parts}{false} + \setboolean{@linedheaders}{false}% + \setboolean{@listsseparated}{false}% + \setboolean{@eulerchapternumbers}{false}% + \setboolean{@parts}{false} }{\relax}% % ******************************************************************** @@ -150,10 +150,10 @@ % ******************************************************************** % Font Stuff % ******************************************************************** -\ifthenelse{\boolean{minionpro}}% +\ifthenelse{\boolean{@minionpro}}% {% % specialists: MinionPro - \RequirePackage[opticals,osf]{MinionPro} % opticals, fullfamily, + \RequirePackage[opticals,mathlf]{MinionPro} % opticals, fullfamily, osf }{% % default: Palatino \RequirePackage[osf,sc]{mathpazo} % Palatino with real small caps and old style figures @@ -165,17 +165,17 @@ %\renewcommand{\sfdefault}{iwona} } -\ifthenelse{\boolean{beramono}}% +\ifthenelse{\boolean{@beramono}}% {\RequirePackage[scaled=0.85]{beramono}}% {% \relax% % put your own suitable typewriter font here %\renewcommand{\ttdefault}{\rmdefault} } -\ifthenelse{\boolean{eulermath}}% +\ifthenelse{\boolean{@eulermath}}% {\RequirePackage[euler-digits]{eulervm}} % Euler math fonts {\relax} -\ifthenelse{\boolean{eulerchapternumbers}}% font for the chapter numbers +\ifthenelse{\boolean{@eulerchapternumbers}}% font for the chapter numbers {\newfont{\chapterNumber}{eurb10 scaled 7000}}% {\newfont{\chapterNumber}{pplr9d scaled 7000}} % Euler eurb10 / Palatino OSF pplr9d / Palatino SC pplrc9d @@ -188,35 +188,41 @@ % ******************************************************************** % Textblock size %******************************************************* -\ifthenelse{\boolean{a5paper}}% +\ifthenelse{\boolean{@a5paper}}% {% A5 - \ifthenelse{\boolean{minionpro}}% + \ifthenelse{\boolean{@minionpro}}% {% Minion gets some extra sizes + \PackageInfo{classicthesis}{A5 paper, MinionPro} \areaset[5mm]{278pt}{556pt}% \setlength{\marginparwidth}{5em}% \setlength{\marginparsep}{1.25em}% - }{% Palatino or else + }{% Palatino or other + \PackageInfo{classicthesis}{A5 paper, Palatino or other} \areaset[5mm]{288pt}{555pt}% \setlength{\marginparwidth}{4em}% \setlength{\marginparsep}{1.25em}% }% }{% A4 - \ifthenelse{\boolean{minionpro}}% + \ifthenelse{\boolean{@minionpro}}% {% Minion gets some extra sizes + \PackageInfo{classicthesis}{A4 paper, MinionPro} \areaset[5mm]{288pt}{684pt}% 609 + 33 + 42 head \the\footskip \setlength{\marginparwidth}{7.5em}% \setlength{\marginparsep}{2em}% - }{% Palatino or else - \areaset[5mm]{312pt}{699pt} % 624 + 33 head + 42 head \the\footskip + }{% Palatino or other + \PackageInfo{classicthesis}{A4 paper, Palatino or other} + \areaset[5mm]{312pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip \setlength{\marginparwidth}{7em}% \setlength{\marginparsep}{2em}% }% } -% Here some suggestions for the text widths and heights: +% Here are some suggestions for the text widths and heights: % Palatino 10pt: 288--312pt | 609--657pt -% Palatino 11pt: 312--336pt | 657--705 -% Minion 10pt: 264--288pt | 561--609pt -% Minion 11pt: 288--312pt | 609--657pt +% Palatino 11pt: 312--336pt | 657--705pt +% Palatino 12pt: +% Minion 10pt: 264--288pt | 561--609pt +% Minion 11pt: 288--312pt | 609--657pt +% Minion 12pt: % ******************************************************************** % Own Stuff @@ -230,6 +236,7 @@ % 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% @@ -247,13 +254,13 @@ \RequirePackage{booktabs} % for better rules in tables \RequirePackage{textcase} % for \MakeTextUppercase -\ifthenelse{\boolean{minionprospacing}}% +\ifthenelse{\boolean{@minionprospacing}}% {% \PackageInfo{classicthesis}{Using MinionPro's textssc for character spacing.}% \DeclareRobustCommand{\spacedallcaps}[1]{\textssc{\MakeTextUppercase{#1}}}% \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textssc{\MakeTextLowercase{#1}}}% }{% - \ifthenelse{\boolean{pdfspacing}}% + \ifthenelse{\boolean{@pdfspacing}}% {% \PackageInfo{classicthesis}{Using pdftex/microtype for character spacing.% Make sure your pdftex is version 1.40 or higher.}% @@ -275,13 +282,20 @@ \RequirePackage[automark]{scrpage2} % provides headers and footers (KOMA Script) \clearscrheadings \setheadsepline{0pt} - \ifthenelse{\boolean{nochapters}}% + \ifthenelse{\boolean{@nochapters}}% {\relax}% - {\renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{}}} - \renewcommand{\sectionmark}[1]{\markright{\thesection\ \spacedlowsmallcaps{#1}}} + {\renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}}} + \renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}} \lehead{\mbox{\llap{\small\thepage\kern2em}\headmark\hfil}} \rohead{\mbox{\hfil{\headmark}\rlap{\small\kern2em\thepage}}} \renewcommand{\headfont}{\small} + %\DeclareRobustCommand{\fixBothHeadlines}[1]{} % <--- ToDo + % hack to get the content headlines right (thanks, Lorenzo!) + \def\toc@heading{% + \ifthenelse{\boolean{@nochapters}}% + {\section*{\contentsname}}%nochapters + {\chapter*{\contentsname}}%chapters + \@mkboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}}} % ******************************************************************** % figures are placed only within section they were declared in @@ -295,7 +309,7 @@ % ******************************************************************** \RequirePackage{titlesec} % parts - \ifthenelse{\boolean{parts}}% + \ifthenelse{\boolean{@parts}}% {% \titleformat{\part}[display] {\normalfont\centering\large}% @@ -303,7 +317,7 @@ {\color{Maroon}\spacedallcaps} }{\relax} % chapters - \ifthenelse{\boolean{linedheaders}}% + \ifthenelse{\boolean{@linedheaders}}% {% lines above and below, number right \titleformat{\chapter}[display]% {\relax}{\raggedleft{\color{halfgray}\chapterNumber\thechapter} \\ }{0pt}% @@ -328,7 +342,7 @@ % descriptionlabels \renewcommand{\descriptionlabel}[1]{\hspace*{\labelsep}\spacedlowsmallcaps{#1}} % spacedlowsmallcaps textit textsc % spacing - \ifthenelse{\boolean{nochapters}}% + \ifthenelse{\boolean{@nochapters}}% {\relax}% {\titlespacing*{\chapter}{0pt}{1\baselineskip}{1.2\baselineskip}} \titlespacing*{\section}{0pt}{1.25\baselineskip}{1\baselineskip} @@ -348,7 +362,7 @@ \setlength{\beforebibskip}{0em} % pagenumbers right after the titles % parts - \ifthenelse{\boolean{parts}}% + \ifthenelse{\boolean{@parts}}% {% \renewcommand{\thepart}{\roman{part}}% \renewcommand{\cftpartpresnum}{\scshape}% \MakeTextLowercase @@ -364,7 +378,7 @@ \setlength{\beforebibskip}{\cftbeforepartskip}% }{\relax} % chapters - \ifthenelse{\boolean{nochapters}}% + \ifthenelse{\boolean{@nochapters}}% {\relax}% {% \renewcommand{\cftchappresnum}{\scshape\MakeTextLowercase}% @@ -375,7 +389,7 @@ %\setlength{\cftbeforechapskip}{.1em}% } % sections - \ifthenelse{\boolean{nochapters}}% + \ifthenelse{\boolean{@nochapters}}% {% \setlength{\cftbeforesecskip}{.1em}% \setlength{\beforebibskip}{1em}% @@ -386,13 +400,13 @@ \renewcommand{\cftsecpagefont}{\normalfont}% \renewcommand{\cftsecleader}{\hspace{1.5em}} \renewcommand{\cftsecafterpnum}{\cftparfillskip} - \ifthenelse{\boolean{tocaligned}}{\renewcommand{\cftsecindent}{0em}}{\relax} + \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{@tocaligned}}{\renewcommand{\cftsubsecindent}{0em}}{\relax} % figures \renewcommand{\cftfigpresnum}{\scshape\MakeTextLowercase}% \renewcommand{\cftfigfont}{\normalfont}% @@ -416,17 +430,17 @@ \cftsetindents{table}{0em}{\figurelabelwidth} % dirty work-around to get the spacing after the toc/lot/lof-titles right - \ifthenelse{\boolean{parts}}% + \ifthenelse{\boolean{@parts}}% {% \AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforepartskip}}} }{% - \ifthenelse{\boolean{nochapters}}% + \ifthenelse{\boolean{@nochapters}}% {\relax}% {\AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforechapskip}}}} } % another dirty work-around to get the spaced low small caps into the toc ;-( - \ifthenelse{\boolean{nochapters}}% + \ifthenelse{\boolean{@nochapters}}% {\relax}% {% %% w/ optional parameter @@ -448,7 +462,7 @@ } % yet another dirty work-around to get the spaced low small caps into the toc ;-( - \ifthenelse{\boolean{parts}}% + \ifthenelse{\boolean{@parts}}% {% \newcommand{\myPart}[2][]{% for parts \ifthenelse{\equal{#1}{}}{% @@ -472,7 +486,7 @@ } % remove the vertical space between lof/lot entries of different chapters - \ifthenelse{\boolean{listsseparated}}{% + \ifthenelse{\boolean{@listsseparated}}{% \AtBeginDocument{% \addtocontents{lof}{\protect\vspace{-\cftbeforechapskip}}% \addtocontents{lot}{\protect\vspace{-\cftbeforechapskip}}% @@ -501,7 +515,7 @@ % ******************************************************************** \RequirePackage{scrtime} % time access \newcommand{\finalVersionString}{} -\ifthenelse{\boolean{drafting}}{% +\ifthenelse{\boolean{@drafting}}{% \RequirePackage[draft]{prelim2e} \renewcommand{\PrelimWords}{\relax} \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\,]} |