From 957cdf929357b4c2fe6d581b81450567e2e792ea Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 27 Jan 2011 19:02:15 +0000 Subject: classicthesis (25jan11) git-svn-id: svn://tug.org/texlive/trunk@21196 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/classicthesis/CHANGES | 20 ++- .../doc/latex/classicthesis/Chapters/Chapter01.tex | 14 +- .../doc/latex/classicthesis/Chapters/Chapter02.tex | 3 +- .../doc/latex/classicthesis/Chapters/Chapter03.tex | 2 +- .../doc/latex/classicthesis/Chapters/Chapter0A.tex | 2 + .../doc/latex/classicthesis/ClassicThesis.pdf | Bin 354506 -> 349497 bytes .../doc/latex/classicthesis/ClassicThesis.tex | 28 ++-- .../doc/latex/classicthesis/ClassicThesis.tps | 128 +++++++++++++----- .../Examples/classicthesis-article.pdf | Bin 166546 -> 66471 bytes .../Examples/classicthesis-article.tex | 6 +- .../classicthesis/Examples/classicthesis-book.pdf | Bin 128623 -> 44778 bytes .../classicthesis/Examples/classicthesis-book.tex | 4 +- .../classicthesis/Examples/classicthesis-cv.pdf | Bin 40624 -> 40624 bytes .../classicthesis/FrontBackmatter/Contents.tex | 3 +- .../classicthesis/FrontBackmatter/Publication.tex | 2 +- .../texmf-dist/doc/latex/classicthesis/LISTOFFILES | 147 ++++++++++++++------- .../latex/classicthesis/classicthesis-ldpkg.sty | 41 +----- .../tex/latex/classicthesis/classicthesis.sty | 103 ++++++++++----- 18 files changed, 320 insertions(+), 183 deletions(-) diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES index bafd0c560dc..3ee235d077d 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES +++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES @@ -1,3 +1,21 @@ +Changes in version 2.9 (January 2011) +o Fixed onlytext euler font for MinionPro font (in + classicthesis.sty) +o Option "listsseparated" deprecated, because it led to some + strange side-effects (in classicthesis.sty) +o Changed default font size to 11pt (in ClassicThesis.tex) and + adjusted text block size accordingly (in classicthesis.sty) +o Fixed bug with backward compatibility regarding old commands + \myChapter and \myPart in classicthesis.sty +o New option "floatperchapter" for classicthesis.sty, removed + all code for that from classicthesis-ldpkg.sty +o Removed "nochapters" option from classicthesis-ldpkg.sty +o Removed redundant loading of listings package (in + classicthesis-ldpkg.sty) +o Fixed some headline bug in example classicthesis-book.tex +o Fixed a bug when using parts with plain latex as in example + classicthesis-book.tex (in classicthesis.sty) + Changes in version 2.8 (March/May 2010) o Fixed serious \graffito bug in classicthesis.sty (thanks to Lorenzo Pantieri and Enrico Gregorio) @@ -84,7 +102,7 @@ o Fixed serious bug with \myChapter command (using plain LaTeX) o Removed hypcap package from classicthesis-ldpkg.sty and placeins package from classicthesis.sty. Put both into - ClassicThesis.sty for finer end-user control + ClassicThesis.tex for finer end-user control o Removed obsolete KOMA options from ClassicThesis.tex o Option "subfigure" deprecated, replaced by "subfig" (in classicthesis.sty) diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex index b1b31a8e566..2d52ddedbbc 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex @@ -106,9 +106,9 @@ the following: nifty packages that are used. The package has the following options available: \begin{itemize} - \item\texttt{nochapters}, which defaults to \texttt{false}. - Activate it if you want to use the package with a class which does - not have chapter divisions, \eg, an article. +% \item\texttt{nochapters}, which defaults to \texttt{false}. +% Activate it if you want to use the package with a class which does +% not have chapter divisions, \eg, an article. \item\texttt{backref}, which also defaults to \texttt{false}. Activate it if you do want to show in the bibliography on which page(s) each reference was cited. %See page~\pageref{app:bibliography} @@ -134,9 +134,9 @@ allow for a bit of freedom concerning the layout: headings a bit by adding a horizontal line above the chapter title. The chapter number will also be moved to the top of the page, above the chapter title. - \item\texttt{listsseparated}: will add extra space between table - and figure entries of different chapters in the list of tables or - figures, respectively. +% \item\texttt{listsseparated}: will add extra space between table +% and figure entries of different chapters in the list of tables or +% figures, respectively. % Deprecated as of version 2.9. \item\texttt{tocaligned}: aligns the whole table of contents on the left side. Some people like that, some don't. \item\texttt{subfig}(\texttt{ure}): is passed to the \texttt{tocloft} @@ -179,6 +179,8 @@ allow for a bit of freedom concerning the layout: This option allows for additional space in this context. However, it does not look as ``perfect'' if you use \verb|\parts| for structuring your document. + \item\texttt{floatperchapter}: activates numbering per chapter for + all floats such as figures, tables, and listings (if used). \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. diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex index 2d26c81fad8..1f22c818228 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex @@ -137,8 +137,7 @@ Non tote tres germano se, lo parola periodicos non. \bottomrule \end{tabularx} \caption[Autem timeam deleniti usu id]{Autem timeam deleniti usu - id. \cauthor{knuth:1976}} - \label{tab:example} + id. \cauthor{knuth:1976}} \label{tab:example} \end{table} \subsection{Linguistic Registrate} diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex index 39a57eac5aa..fede5157cff 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex @@ -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}}} \mathbb{ZNR} +\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/Chapters/Chapter0A.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex index 8e458a05a01..6d6f8370a91 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex @@ -1,6 +1,8 @@ %******************************************************************** % Appendix %******************************************************* +% If problems with the headers: get headings in appendix etc. right +%\markboth{\spacedlowsmallcaps{Appendix}}{\spacedlowsmallcaps{Appendix}} \chapter{Appendix Test} Lorem ipsum at nusquam appellantur his, ut eos erant homero concludaturque. Albucius appellantur deterruisset id eam, vivendum diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf index 55537c69a59..07f0b12db8e 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 d368ca4cc5a..a5911defbbd 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) 2010 André Miede http://www.miede.de +% Copyright (C) 2011 Andr\'e 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 @@ -41,8 +41,8 @@ % * [low] 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,numbers=noenddot,headinclude,%1headlines,% - 11pt,a4paper,BCOR5mm,footinclude,cleardoublepage=empty,abstractoff % <--- obsolete, remove (todo) +\documentclass[ twoside,openright,titlepage,fleqn,numbers=noenddot,headinclude,%1headlines,% letterpaper a4paper + 11pt,a4paper,BCOR5mm,footinclude=true,cleardoublepage=empty,abstractoff % <--- obsolete, remove (todo) ]{scrreprt} % ******************************************************************** @@ -64,8 +64,8 @@ \newcommand{\myDepartment}{Put data here\xspace} \newcommand{\myUni}{\protect{Put data here}\xspace} \newcommand{\myLocation}{Darmstadt\xspace} -\newcommand{\myTime}{May 2010\xspace} -\newcommand{\myVersion}{Version 2.8\xspace} +\newcommand{\myTime}{January 2011\xspace} +\newcommand{\myVersion}{Version 2.9\xspace} %******************************************************* % Packages with options that might require adjustments %******************************************************* @@ -73,16 +73,16 @@ \usepackage[ngerman,american]{babel} \usepackage[square,numbers]{natbib} \usepackage[fleqn]{amsmath} % math environments and more by the AMS - +%\usepackage{varioref} % load BEFORE classicthesis-ldpkg %******************************************************* \usepackage{classicthesis-ldpkg} % [backref] %******************************************************* % Options for classicthesis.sty: -% tocaligned eulerchapternumbers drafting linedheaders listsseparated +% tocaligned eulerchapternumbers drafting linedheaders listings % subfig nochapters beramono eulermath parts minionpro pdfspacing -% listings dottedtoc minionprospacing manychapters -\usepackage[eulerchapternumbers,drafting,listings,listsseparated,%pdfspacing,%listings, - subfig,beramono,eulermath,parts]{classicthesis} +% dottedtoc minionprospacing manychapters floatperchapter +\usepackage[eulerchapternumbers,drafting,listings,%linedheaders,%pdfspacing,%listings, + subfig,beramono,eulermath,parts,dottedtoc,floatperchapter]{classicthesis}% %******************************************************* % Some font experiments @@ -151,8 +151,7 @@ breaklines=true, frameround=ftff, frame=single, - belowcaptionskip=.75\baselineskip, - numberbychapter=false + belowcaptionskip=.75\baselineskip %frame=L } @@ -211,8 +210,9 @@ % Mainmatter %******************************************************* \pagenumbering{arabic} +\setcounter{page}{90} % use \cleardoublepage here to avoid problems with pdfbookmark -\cleardoublepage\part{Some Kind of Manual} +\cleardoublepage\myPart{Some Kind of Manual} \include{Chapters/Chapter01} \cleardoublepage\part{The Showcase} \include{Chapters/Chapter02} @@ -232,7 +232,7 @@ \cleardoublepage\include{FrontBackmatter/Colophon} \cleardoublepage\include{FrontBackmatter/Declaration} % ******************************************************************** -% Game Over: Restart, Restore or Quit? +% Game Over: Restore, Restart, or Quit? %******************************************************* \end{document} % ******************************************************************** diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps index 61a444efb8d..2b1b22f25f6 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps @@ -4,66 +4,66 @@ Version=2 [SessionInfo] ActiveTab=0 -FrameCount=3 -ActiveFrame=0 +FrameCount=5 +ActiveFrame=1 [Frame0] Columns=1 Rows=1 -Flags=2 -ShowCmd=3 +Flags=0 +ShowCmd=1 MinPos.x=-1 MinPos.y=-1 -MaxPos.x=-4 -MaxPos.y=-23 -NormalPos.left=44 -NormalPos.top=44 -NormalPos.right=938 -NormalPos.bottom=342 +MaxPos.x=-8 +MaxPos.y=-30 +NormalPos.left=88 +NormalPos.top=88 +NormalPos.right=951 +NormalPos.bottom=328 Class=CLatexEdit -Document=ClassicThesis.tex +Document=FrontBackmatter\Contents.tex [Frame0_Row0] -cyCur=411 +cyCur=181 cyMin=10 [Frame0_Col0] -cxCur=1006 +cxCur=826 cxMin=10 [Frame0_View0,0] -Cursor.row=66 -Cursor.column=37 -TopSubLine=48 +Cursor.row=65 +Cursor.column=4 +TopSubLine=55 [Frame1] Columns=1 Rows=1 -Flags=0 -ShowCmd=1 +Flags=2 +ShowCmd=3 MinPos.x=-1 MinPos.y=-1 -MaxPos.x=-4 -MaxPos.y=-23 +MaxPos.x=-8 +MaxPos.y=-30 NormalPos.left=44 NormalPos.top=44 NormalPos.right=938 NormalPos.bottom=342 Class=CLatexEdit -Document=CHANGES +Document=ClassicThesis.tex [Frame1_Row0] -cyCur=251 +cyCur=443 cyMin=10 [Frame1_Col0] -cxCur=866 +cxCur=1335 cxMin=10 [Frame1_View0,0] -Cursor.row=0 -Cursor.column=33 -TopSubLine=0 +Cursor.row=129 +Cursor.column=0 +TopSubLine=119 [Frame2] Columns=1 @@ -74,23 +74,81 @@ MinPos.x=-1 MinPos.y=-1 MaxPos.x=-4 MaxPos.y=-23 -NormalPos.left=88 -NormalPos.top=88 -NormalPos.right=982 -NormalPos.bottom=387 +NormalPos.left=100 +NormalPos.top=100 +NormalPos.right=1306 +NormalPos.bottom=414 Class=CLatexEdit -Document=Chapters\Chapter01.tex +Document=CHANGES [Frame2_Row0] -cyCur=252 +cyCur=255 cyMin=10 [Frame2_Col0] -cxCur=866 +cxCur=1169 cxMin=10 [Frame2_View0,0] -Cursor.row=1 +Cursor.row=12 +Cursor.column=29 +TopSubLine=8 + +[Frame3] +Columns=1 +Rows=1 +Flags=0 +ShowCmd=1 +MinPos.x=-1 +MinPos.y=-1 +MaxPos.x=-4 +MaxPos.y=-23 +NormalPos.left=125 +NormalPos.top=125 +NormalPos.right=1331 +NormalPos.bottom=439 +Class=CLatexEdit +Document=classicthesis-ldpkg.sty + +[Frame3_Row0] +cyCur=255 +cyMin=10 + +[Frame3_Col0] +cxCur=1169 +cxMin=10 + +[Frame3_View0,0] +Cursor.row=0 Cursor.column=0 -TopSubLine=0 +TopSubLine=105 + +[Frame4] +Columns=1 +Rows=1 +Flags=0 +ShowCmd=1 +MinPos.x=-1 +MinPos.y=-1 +MaxPos.x=-8 +MaxPos.y=-30 +NormalPos.left=75 +NormalPos.top=75 +NormalPos.right=1281 +NormalPos.bottom=389 +Class=CLatexEdit +Document=classicthesis.sty + +[Frame4_Row0] +cyCur=255 +cyMin=10 + +[Frame4_Col0] +cxCur=1169 +cxMin=10 + +[Frame4_View0,0] +Cursor.row=61 +Cursor.column=23 +TopSubLine=50 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 49fb31d07c1..44c7b0fc3fb 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-article.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex index 1da6c489d26..4318336a5d3 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex @@ -2,8 +2,8 @@ \documentclass[10pt,a4paper]{scrartcl} % KOMA-Script article \usepackage{lipsum} \usepackage{url} -%\usepackage[nochapters]{../classicthesis-ldpkg} -\usepackage[nochapters,minionprospacing]{../classicthesis} % nochapters +%\usepackage{../classicthesis-ldpkg} +\usepackage[nochapters]{../classicthesis} % nochapters \begin{document} \title{\rmfamily\normalfont\spacedallcaps{the title}} @@ -15,7 +15,7 @@ \begin{abstract} \noindent\lipsum[1] \end{abstract} - + \tableofcontents \section{A Section} 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 30a5063bef1..834208b4d0c 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 01afc74c0fc..6af44c726b7 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex @@ -1,9 +1,9 @@ % book example for classicthesis.sty -\documentclass[12pt,a5paper,footinclude]{scrbook} % KOMA-Script book +\documentclass[12pt,a5paper,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book \usepackage[T1]{fontenc} \usepackage{lipsum} \usepackage[linedheaders,parts]{../classicthesis} % ,manychapters -\usepackage[osf]{libertine} +%\usepackage[osf]{libertine} %\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false} \begin{document} 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 564be7568b9..78de54a9eed 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/Contents.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex index 3f7b73c8c83..2463fe951cc 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex @@ -11,7 +11,8 @@ \tableofcontents \automark[section]{chapter} \renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}} -\renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}}%******************************************************* +\renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}} +%******************************************************* % List of Figures and of the Tables %******************************************************* \clearpage diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publication.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publication.tex index 27c9d56eab5..df9ed0ed09c 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publication.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publication.tex @@ -7,4 +7,4 @@ Some ideas and figures have appeared previously in the following publications: \bigskip -\noindent Put your publications from the thesis here. \ No newline at end of file +\noindent Put your publications from the thesis here. The packages \texttt{multibib} or \texttt{bibtopic} etc. can be used to handle multiple different bibliographies in your document. \ 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 8a66f03de47..d5d266d0cea 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES +++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES @@ -1,26 +1,31 @@ LIST OF FILES FOR ClassicThesis.tex *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) +scrreprt.cls 2010/09/17 v3.07 KOMA-Script document class (report) +scrkbase.sty 2010/09/17 v3.07 KOMA-Script package (KOMA-Script-dependent bas +ics and keyval usage) + scrbase.sty 2010/09/17 v3.07 KOMA-Script package (KOMA-Script-independent b +asics and keyval usage) keyval.sty 1999/03/16 v1.13 key=value parser (DPC) -scrlfile.sty 2007/12/18 v2.98 KOMA-Script package (loading files) +scrlfile.sty 2009/03/25 v3.03 KOMA-Script package (loading files) +tocbasic.sty 2010/09/14 v3.06a KOMA-Script package (handling toc-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/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 +scrsize11pt.clo 2010/09/17 v3.07 KOMA-Script font size class option (11pt) +typearea.sty 2010/09/17 v3.07 KOMA-Script package (type area) +inputenc.sty 2008/03/30 v1.1d Input encoding file + latin1.def 2008/03/30 v1.1d 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) + natbib.sty 2009/11/07 8.31a (PWD, AO) 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 2009/10/04 v2.6.1 Package Loader for Classic Thesis -Style +classicthesis-ldpkg.sty 2011/01/01 v2.9 Package Loader for Classic Thesis St +yle ifthen.sty 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC) fontenc.sty t1enc.def 2005/09/27 v1.99g Standard LaTeX file @@ -28,65 +33,68 @@ textcomp.sty 2005/09/27 v1.99g Standard LaTeX package ts1enc.def 2001/06/05 v3.0e (jk/car/fm) Standard LaTeX file xspace.sty 2006/05/08 v1.12 Space after command names (DPC,MH) tabularx.sty 1999/01/07 v2.07 `tabularx' package (DPC) - array.sty 2005/08/23 v2.4b Tabular extension package (FMi) + array.sty 2008/09/09 v2.4c 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 +fixltx2e.sty 2006/09/13 v1.1m fixes to LaTeX relsize.sty 2003/07/04 ver 3.1 - acronym.sty 2008/05/28 v1.32 Support for acronyms (Tobias Oetiker) + acronym.sty 2010/09/08 v1.36 Support for acronyms (Tobias Oetiker) 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) -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 -remreset.sty + caption.sty 2010/01/09 v3.1m Customizing captions (AR) +caption3.sty 2010/01/14 v3.1m caption3 kernel (AR) 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 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/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.sty 2010/09/17 v6.81q Hypertext links for LaTeX + ltxcmds.sty 2010/04/26 v1.7 LaTeX kernel commands for general use (HO) +infwarerr.sty 2010/04/08 v1.3 Providing info/warning/message (HO) +kvsetkeys.sty 2010/03/01 v1.9 Key value parser (HO) +etexcmds.sty 2010/01/28 v1.3 Prefix for e-TeX command names (HO) +pdfescape.sty 2010/03/01 v1.9 Provides hex, PDF name and string conversions +(HO) +pdftexcmds.sty 2010/04/01 v0.9 Utility functions of pdfTeX for LuaTeX (HO) +ifluatex.sty 2010/03/01 v1.3 Provides the ifluatex switch (HO) + ifpdf.sty 2010/01/28 v2.1 Provides the ifpdf switch (HO) + ifvtex.sty 2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO) + ifxetex.sty 2010/09/12 v0.6 Provides ifxetex conditional + hycolor.sty 2009/12/12 v1.6 Color options of hyperref/bookmark (HO) +xcolor-patch.sty 2009/12/12 xcolor patch +letltxmacro.sty 2008/06/24 v1.3 Let assignment for LaTeX macros (HO) +kvoptions.sty 2010/02/22 v3.7 Keyval support for LaTeX options (HO) + pd1enc.def 2010/09/17 v6.81q Hyperref: PDFDocEncoding definition (HO) + intcalc.sty 2007/09/27 v1.1 Expandable integer calculations (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/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/29 v6.78l Hyperref driver for pdfTeX +atbegshi.sty 2010/03/25 v1.12 At begin shipout hook (HO) + hpdftex.def 2010/09/17 v6.81q Hyperref driver for pdfTeX +atveryend.sty 2010/03/24 v1.5 Hooks at very end of document (HO) +rerunfilecheck.sty 2010/03/16 v1.6 Rerun checks for auxiliary files (HO) +uniquecounter.sty 2009/12/18 v1.1 Provides unlimited unique counter (HO) graphicx.sty 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR) -graphics.sty 2006/02/20 v1.0o Standard LaTeX Graphics (DPC,SPQR) +graphics.sty 2009/02/05 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 2009/10/04 v2.6.1 Typographic Style for a classic-looking -thesis + pdftex.def 2010/09/14 v0.05b Graphics/color for pdfTeX +classicthesis.sty 2011/01/01 v2.9 Typographic Style for a classic-looking th +esis +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 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 2008/06/04 v2.3b Micro-typography with pdfTeX (RS) -microtype.cfg 2008/06/04 v2.3b microtype main configuration file (RS) +microtype.sty 2010/01/10 v2.4 Micro-typography with pdfTeX (RS) +microtype.cfg 2010/01/10 v2.4 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) -scrpage2.sty 2007/07/23 v2.2e LaTeX2e KOMA-Script package +scrpage2.sty 2010/04/22 v2.5 LaTeX2e KOMA-Script package titlesec.sty 2007/08/12 v2.8 Sectioning titles - tocloft.sty 2003/09/26 v2.3c parameterised ToC, etc., typesetting - scrtime.sty 2006/03/30 v1.1o LaTeX2e KOMA-Script package -prelim2e.sty 2001/02/17 v1.23 prelim2e Package (MS) + tocloft.sty 2009/09/04 v2.3d parameterised ToC, etc., typesetting + scrtime.sty 2010/09/17 v3.07 KOMA-Script package (time of LaTeX run) +prelim2e.sty 2009/05/29 v1.3 prelim2e Package (MS) everyshi.sty 2001/05/15 v3.00 EveryShipout Package (MS) makerobust.sty 2006/03/18 v1.0 Making a macro robust (HO) lstlang1.sty 2004/09/05 1.3 listings language file @@ -101,5 +109,44 @@ 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 -refcount.sty 2008/08/11 v3.1 Data extraction from references (HO) \ No newline at end of file + nameref.sty 2010/04/30 v2.40 Cross-referencing by name of section +refcount.sty 2008/08/11 v3.1 Data extraction from references (HO) +gettitlestring.sty 2009/12/18 v1.3 Cleanup title references (HO) +ClassicThesis.out +ClassicThesis.out +supp-pdf.tex + mt-ppl.cfg 2005/11/16 v1.6 microtype config. file: Palatino (RS) +FrontBackmatter/DirtyTitlepage.tex +FrontBackmatter/Titlepage.tex +gfx/TFZsuperellipse_bw.pdf +FrontBackmatter/Titleback.tex + ts1pplj.fd 2004/09/06 font definitions for TS1/pplj. +FrontBackmatter/Dedication.tex +FrontBackmatter/Abstract.tex +FrontBackmatter/Publication.tex +FrontBackmatter/Acknowledgments.tex + uzeur.fd 2005/01/11 v4.0 (WaS) + mt-eur.cfg 2006/07/31 v1.1 microtype config. file: AMS Euler Roman (RS) + uzeus.fd 2005/01/11 v4.0 (WaS) + mt-eus.cfg 2006/07/28 v1.2 microtype config. file: AMS Euler Script (RS) + uzeuex.fd 2005/01/11 v4.0 (WaS) + ot1zplm.fd 2002/09/08 Fontinst v1.914 font definitions for OT1/zplm. +FrontBackmatter/Contents.tex + t1cmss.fd 1999/05/25 v2.5h Standard LaTeX font definitions +Chapters/Chapter01.tex + t1fvm.fd 2004/09/07 scalable font definitions for T1/fvm. +Examples/classicthesis-article.tex +Examples/classicthesis-book.tex +Examples/classicthesis-cv.tex +Chapters/Chapter02.tex +gfx/example_1.jpg +gfx/example_2.jpg +gfx/example_3.jpg +gfx/example_4.jpg +Chapters/Chapter03.tex +Chapters/Chapter0A.tex +FrontBackmatter/Bibliography.tex +ClassicThesis.bbl +FrontBackmatter/Colophon.tex +FrontBackmatter/Declaration.tex + *********** \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis-ldpkg.sty index 283fd6f4a42..44a8407f99f 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) 2010 André Miede http://www.miede.de +% Copyright (C) 2011 Andr\'e 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}[2010/05/01 v2.8 Package Loader for Classic Thesis Style] +\ProvidesPackage{classicthesis-ldpkg}[2011/01/24 v2.9 Package Loader for Classic Thesis Style] \@ifpackageloaded{classicthesis}% {\PackageWarningNoLine{classicthesis-ldpkg}{Package "classicthesis" should be loaded AFTER "classicthesis-ldpkg".}}% @@ -36,9 +36,7 @@ % Options % ******************************************************************** \RequirePackage{ifthen} - \newboolean{cld@nochapters} % disable all chapter-specific commands \newboolean{cld@backref} % enable backrefs in the bibliography -\DeclareOption{nochapters}{\setboolean{cld@nochapters}{true}} \DeclareOption{backref}{\setboolean{cld@backref}{true}} \ProcessOptions\relax @@ -100,39 +98,8 @@ % ******************************************************************** % fine typesetting of code listings -\RequirePackage{listings} - -% ******************************************************************** -% caption numbering now w/o chapter number -\RequirePackage{remreset} - \makeatletter - \ifthenelse{\boolean{cld@nochapters}}% - {\relax}{% - \@removefromreset{table}{chapter} % requires remreset package - } - \renewcommand{\thetable}{\arabic{table}} - \makeatother - \makeatletter - \ifthenelse{\boolean{cld@nochapters}}% - {\relax}{% - \@removefromreset{figure}{chapter} % requires remreset package - } - \renewcommand{\thefigure}{\arabic{figure}} - \makeatother -% \makeatletter -% \@ifpackageloaded{listings}{% -% \ifthenelse{\boolean{cld@nochapters}}% -% {\relax}{% -% \@removefromreset{lstlisting}{chapter}% requires remreset package -% %\@removefromreset{listings}{chapter}% requires remreset package -% } -% \AtBeginDocument{% -% \renewcommand{\thelstlisting}{\arabic{lstlisting}}% % <-- might cause an error with some TeX distributions -% \renewcommand{\thelistings}{\arabic{listings}}% % <-- might cause an error with some TeX distributions -% }% -% }{\relax} -% \makeatother - +%\RequirePackage{listings} + % ******************************************************************** % enable subfigures in figures \RequirePackage{subfig} diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty index 61d28fc8cea..926208d3cd5 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) 2010 André Miede http://www.miede.de +% Copyright (C) 2011 Andr\'e 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}[2010/05/01 v2.8 Typographic Style for a classic-looking thesis] +\ProvidesPackage{classicthesis}[2011/01/24 v2.9 Typographic Style for a classic-looking thesis] \RequirePackage{ifthen} \newboolean{@tocaligned} % the left column of the toc will be aligned (no indention) \newboolean{@eulerchapternumbers} % use AMS Euler for chapter font (otherwise Palatino) @@ -61,13 +61,8 @@ \newboolean{@dottedtoc} % page numbers in ToC flushed right \newboolean{@listings} % load listings package (if not already) and setup LoL \newboolean{@manychapters} % additional space in ToC after chapter number (if two digits are needed) - -% ******************************************************************** -% Backward-compatibility -% ******************************************************************** -\let\myChapter\chapter -\let\myPart\part - + \newboolean{@floatperchapter} % additional space in ToC after chapter number (if two digits are needed) + % ******************************************************************** % Options % ******************************************************************** @@ -93,6 +88,7 @@ \DeclareOption{dottedtoc}{\setboolean{@dottedtoc}{true}} \DeclareOption{listings}{\setboolean{@listings}{true}} \DeclareOption{manychapters}{\setboolean{@manychapters}{true}} +\DeclareOption{floatperchapter}{\setboolean{@floatperchapter}{true}} \ProcessOptions\relax % subfig-related stuff @@ -145,15 +141,22 @@ \PackageWarningNoLine{classicthesis}{You cannot use "manychapters" at the same time % as "nochapters"!}% }{\relax}% + % is the user trying to use floatperchapter at the same time? + \ifthenelse{\boolean{@floatperchapter}}% + {% both manychapters and nochapters are active + \PackageWarningNoLine{classicthesis}{You cannot use "floatperchapter" at the same time % + as "nochapters"!}% + }{\relax}% % turn off some things if we do not use chapters \PackageInfo{classicthesis}{Using option "nochapters" (probably for an article). % - This turns off the options "linedheaders", "manychapters",% + This turns off the options "linedheaders", "manychapters", "floatperchapter",% "listsseparated", "eulerchapternumbers", and "parts". Please be aware of that.} \setboolean{@linedheaders}{false}% \setboolean{@listsseparated}{false}% \setboolean{@eulerchapternumbers}{false}% \setboolean{@parts}{false}% \setboolean{@manychapters}{false}% + \setboolean{@floatperchapter}{false}% }{\relax}% % ******************************************************************** @@ -176,10 +179,16 @@ % ******************************************************************** % Font Stuff % ******************************************************************** +% specialists: MinionPro \ifthenelse{\boolean{@minionpro}}% {% - % specialists: MinionPro - \RequirePackage[opticals,mathlf]{MinionPro} % opticals, fullfamily, osf + % in order have Euler math fonts work with Minion, special option is needed + \ifthenelse{\boolean{@eulermath}}% + {% + \RequirePackage[opticals,mathlf,onlytext]{MinionPro} % opticals, fullfamily, osf + }{% + \RequirePackage[opticals,mathlf]{MinionPro} % opticals, fullfamily, osf + }% }{% % default: Palatino \RequirePackage[osf,sc]{mathpazo} % Palatino with real small caps and old style figures @@ -228,13 +237,14 @@ \ifthenelse{\boolean{@minionpro}}% {% Minion gets some extra sizes \PackageInfo{classicthesis}{A4 paper, MinionPro} - \areaset[5mm]{288pt}{684pt}% 609 + 33 + 42 head \the\footskip + \areaset[5mm]{312pt}{684pt}% 609 + 33 + 42 head \the\footskip \setlength{\marginparwidth}{7.5em}% \setlength{\marginparsep}{2em}% }{% 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}% + \areaset[5mm]{336pt}{750pt} % ~ 336 * factor 2 + 33 head + 42 \the\footskip +% \areaset[5mm]{336pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip 10pt + \setlength{\marginparwidth}{7em}% \setlength{\marginparsep}{2em}% }% } @@ -559,7 +569,7 @@ \newcommand\Part[2][]{% \ifpdf\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}% \oldpart[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps -% \else\oldpart[\spacedlowsmallcaps{#1}]{#2}% + \else\oldpart[\spacedlowsmallcaps{#1}]{#2}% \fi% }% }{\relax} @@ -569,17 +579,20 @@ \else{#1}\fi% } - % remove the vertical space between lof/lot entries of different chapters - \ifthenelse{\boolean{@listsseparated}}{% - \AtBeginDocument{% - \addtocontents{lof}{\protect\vspace{-10\cftbeforechapskip}}% - \addtocontents{lot}{\protect\vspace{-10\cftbeforechapskip}}% - \ifthenelse{\boolean{@listings}}% - {% - \addtocontents{lol}{\protect\vspace{-10\cftbeforechapskip}}% - }{\relax}% - }% - }{% +% % remove the vertical space between lof/lot entries of different chapters + \ifthenelse{\boolean{@listsseparated}}{% + \PackageWarningNoLine{classicthesis}{Option "listsseparated" deprecated as of version 2.9.}% + }{\relax} +% \ifthenelse{\boolean{@listsseparated}}{% +% \AtBeginDocument{% +% \addtocontents{lof}{\protect\vspace{-\cftbeforechapskip}}% +% \addtocontents{lot}{\protect\vspace{-\cftbeforechapskip}}% +% \ifthenelse{\boolean{@listings}}% +% {% +% \addtocontents{lol}{\protect\vspace{-\cftbeforechapskip}}% +% }{\relax}% +% }% +% }{% \DeclareRobustCommand*{\deactivateaddvspace}{\let\addvspace\@gobble}% \AtBeginDocument{% \addtocontents{lof}{\deactivateaddvspace}% @@ -588,10 +601,8 @@ {% \addtocontents{lol}{\deactivateaddvspace}% }{\relax}% - %\addtocontents{lof}{\protect\renewcommand*{\protect\addvspace}[1]{}}% - %\addtocontents{lot}{\protect\renewcommand*{\protect\addvspace}[1]{}}% }% - } +% } % ******************************************************************** % footnotes setup @@ -616,3 +627,35 @@ \renewcommand{\PrelimWords}{\relax} \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\,]} }{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ at \thistime.}} + +% ******************************************************************** +% Caption numbering now w/o chapter number +% ******************************************************************** +\ifthenelse{\boolean{@floatperchapter}}{% + \ifthenelse{\boolean{@listings}}{% + \lstset{numberbychapter=true}}{\relax}% +}{% + \ifthenelse{\boolean{@listings}}{% + \lstset{numberbychapter=false}}{\relax}% + \RequirePackage{remreset}% + \makeatletter% + \ifthenelse{\boolean{@nochapters}}% + {\relax}{% + \@removefromreset{table}{chapter} % requires remreset package + }% + \renewcommand{\thetable}{\arabic{table}}% + \makeatother% + \makeatletter% + \ifthenelse{\boolean{@nochapters}}% + {\relax}{% + \@removefromreset{figure}{chapter} % requires remreset package + }% + \renewcommand{\thefigure}{\arabic{figure}}% + \makeatother% +} + +% ******************************************************************** +% Backward-compatibility +% ******************************************************************** +\let\myChapter\chapter +\let\myPart\part -- cgit v1.2.3