diff options
| author | Karl Berry <karl@freefriends.org> | 2017-10-22 19:51:42 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-10-22 19:51:42 +0000 |
| commit | d326671c4777b4897d5ecc23008d3d53f6101fc2 (patch) | |
| tree | 62679eb03b1838237e21de9b758d78e3ff3aecb1 /Master | |
| parent | b2fad8915b87bb45e4d3ffafd0f8119da45a921e (diff) | |
classicthesis (22oct17)
git-svn-id: svn://tug.org/texlive/trunk@45578 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
33 files changed, 1603 insertions, 1407 deletions
diff --git a/Master/texmf-dist/doc/latex/classicthesis/AMiede_Publications.bib b/Master/texmf-dist/doc/latex/classicthesis/AMiede_Publications.bib index a223159192b..da05371e6ad 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/AMiede_Publications.bib +++ b/Master/texmf-dist/doc/latex/classicthesis/AMiede_Publications.bib @@ -2,77 +2,77 @@ % Encoding: Cp1252 @INPROCEEDINGS{Isenberg2006, - author = {Tobias Isenberg and Andr{\'e} Miede and Sheelagh Carpendale}, - title = {{A} {B}uffer {F}ramework for {S}upporting {R}esponsive {I}nteraction - in {I}nformation {V}isualization {I}nterfaces}, - booktitle = {Proceedings of the Fourth International Conference on Creating, Connecting, - and Collaborating through Computing (C\textsuperscript{\,5} 2006)}, - year = {2006}, - pages = {262--269}, - publisher = {IEEE}, - isbn = {978-0-7695-2563-1} + author = {Tobias Isenberg and Andr{\'e} Miede and Sheelagh Carpendale}, + title = {{A} {B}uffer {F}ramework for {S}upporting {R}esponsive {I}nteraction + in {I}nformation {V}isualization {I}nterfaces}, + booktitle = {Proceedings of the Fourth International Conference on Creating, Connecting, + and Collaborating through Computing (C\textsuperscript{\,5} 2006)}, + year = {2006}, + pages = {262--269}, + publisher = {IEEE}, + isbn = {978-0-7695-2563-1} } @INPROCEEDINGS{Lampe2013c, - author = {Ulrich Lampe and Markus Kieselmann and Andr{\'e} Miede and Sebastian - Z{\"o}l\-ler and Ralf Steinmetz}, - title = {{A} {T}ale of {M}illis and {N}anos: {O}n the {A}ccuracy of {T}ime - {M}easurements in {V}irtual {M}achines}, - booktitle = {Proceedings of the Second European Conference on Service-Oriented - and Cloud Computing (ESOCC 2013)}, - year = {2013}, - pages = {172--179}, - publisher = {Springer}, - isbn = {978-3-642-40650-8} + author = {Ulrich Lampe and Markus Kieselmann and Andr{\'e} Miede and Sebastian + Z{\"o}l\-ler and Ralf Steinmetz}, + title = {{A} {T}ale of {M}illis and {N}anos: {O}n the {A}ccuracy of {T}ime + {M}easurements in {V}irtual {M}achines}, + booktitle = {Proceedings of the Second European Conference on Service-Oriented + and Cloud Computing (ESOCC 2013)}, + year = {2013}, + pages = {172--179}, + publisher = {Springer}, + isbn = {978-3-642-40650-8} } @INPROCEEDINGS{Lampe2013a, - author = {Ulrich Lampe and Qiong Wu and Ronny Hans and Andr\'e Miede and Ralf - Steinmetz}, - title = {{T}o {F}rag {O}r {T}o {B}e {F}ragged -- {A}n {E}mpirical {A}ssessment - of {L}atency in {C}loud {G}aming}, - booktitle = {Proceedings of the Third International Conference on Cloud Computing - and Services Science (CLOSER 2013)}, - year = {2013}, - pages = {5--12}, - isbn = {978-898-8565-52-5} + author = {Ulrich Lampe and Qiong Wu and Ronny Hans and Andr\'e Miede and Ralf + Steinmetz}, + title = {{T}o {F}rag {O}r {T}o {B}e {F}ragged -- {A}n {E}mpirical {A}ssessment + of {L}atency in {C}loud {G}aming}, + booktitle = {Proceedings of the Third International Conference on Cloud Computing + and Services Science (CLOSER 2013)}, + year = {2013}, + pages = {5--12}, + isbn = {978-898-8565-52-5} } @ARTICLE{Miede2010:tugboat, - author = {Andr{\'e} Miede}, - title = {{T}heses and other {B}eautiful {D}ocuments with \texttt{clas\-sic\-the\-sis}}, - journal = {TUGboat -- The Communications of the \TeX\ Users Group}, - year = {2010}, - volume = {31}, - pages = {18--20}, - number = {1}, - issn = {0896-3207}, - keywords = {classicthesis} + author = {Andr{\'e} Miede}, + title = {{T}heses and other {B}eautiful {D}ocuments with \texttt{clas\-sic\-the\-sis}}, + journal = {TUGboat -- The Communications of the \TeX\ Users Group}, + year = {2010}, + volume = {31}, + pages = {18--20}, + number = {1}, + issn = {0896-3207}, + keywords = {classicthesis} } @INPROCEEDINGS{Miede2011, - author = {Andr{\'e} Miede and G\"{o}khan \c{S}im\c{s}ek and Stefan Schulte - and Abawi, Daniel F. and Julian Eckert and Ralf Steinmetz}, - title = {{R}evealing {B}usiness {R}elationships -- {E}avesdropping {C}ross-organizational - {C}ollaboration in the {I}nternet of {S}ervices}, - booktitle = {Proceedings of the Tenth International Conference Wirtschaftsinformatik - (WI 2011)}, - year = {2011}, - volume = {2}, - pages = {1083--1092}, - isbn = {978-1-4467-9236-0} + author = {Andr{\'e} Miede and G\"{o}khan \c{S}im\c{s}ek and Stefan Schulte + and Abawi, Daniel F. and Julian Eckert and Ralf Steinmetz}, + title = {{R}evealing {B}usiness {R}elationships -- {E}avesdropping {C}ross-organizational + {C}ollaboration in the {I}nternet of {S}ervices}, + booktitle = {Proceedings of the Tenth International Conference Wirtschaftsinformatik + (WI 2011)}, + year = {2011}, + volume = {2}, + pages = {1083--1092}, + isbn = {978-1-4467-9236-0} } @ARTICLE{Tsai2012, - author = {Hsin-Yi Tsai and Melanie Siebenhaar and Andr{\'e} Miede and Yu-Lun - Huang and Ralf Steinmetz}, - title = {{T}hreat as a {S}ervice? {V}irtualization's {I}mpact on {C}loud {S}ecurity}, - journal = {IEEE IT Professional}, - year = {2012}, - volume = {14}, - pages = {32--37}, - number = {1}, - issn = {1520-9202} + author = {Hsin-Yi Tsai and Melanie Siebenhaar and Andr{\'e} Miede and Yu-Lun + Huang and Ralf Steinmetz}, + title = {{T}hreat as a {S}ervice? {V}irtualization's {I}mpact on {C}loud {S}ecurity}, + journal = {IEEE IT Professional}, + year = {2012}, + volume = {14}, + pages = {32--37}, + number = {1}, + issn = {1520-9202} } @comment{jabref-meta: groupsversion:3;} diff --git a/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib b/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib index a34e2bbc1b8..f812295c83a 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib +++ b/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib @@ -1,81 +1,204 @@ -% This file was created with JabRef 2.8.1. -% Encoding: Cp1252 - -@BOOK{bentley:1999, - title = {{P}rogramming {P}earls}, - publisher = {Addison--Wesley}, - year = {1999}, - author = {Jon Bentley}, - address = {Boston, MA, USA}, - edition = {2nd} +% Encoding: windows-1252 + +@Book{bentley:1999, + title = {{P}rogramming {P}earls}, + publisher = {Ad\-dison--Wesley}, + year = {1999}, + author = {Jon Bentley}, + address = {Boston, MA, USA}, + edition = {2}, } @BOOK{bringhurst:2002, - title = {{T}he {E}lements of {T}ypographic {S}tyle}, - publisher = {Hartley \& Marks Publishers}, - year = {2013}, - author = {Robert Bringhurst}, - series = {Version 4.0: 20th Anniversary Edition}, - address = {Point Roberts, WA, USA} + title = {{T}he {E}lements of {T}ypographic {S}tyle}, + publisher = {Hartley \& Marks Publishers}, + year = {2013}, + author = {Robert Bringhurst}, + series = {Version 4.0: 20th Anniversary Edition}, + address = {Point Roberts, WA, USA} } @BOOK{cormen:2001, - title = {{I}ntroduction to {A}lgorithms}, - publisher = {The MIT Press}, - year = {2009}, - author = {Cormen, Thomas H. and Leiserson, Charles E. and Rivest, Ronald L. - and Clifford Stein}, - address = {Cambridge, MA, USA}, - edition = {3rd} + title = {{I}ntroduction to {A}lgorithms}, + publisher = {The MIT Press}, + year = {2009}, + author = {Cormen, Thomas H. and Leiserson, Charles E. and Rivest, Ronald L. + and Clifford Stein}, + address = {Cambridge, MA, USA}, + edition = 3 } @BOOK{dueck:trio, - title = {{D}ueck's {T}rilogie: {O}mnisophie -- {S}upramanie -- {T}opothesie}, - publisher = {Springer, Berlin, Germany}, - year = {2005}, - author = {Gunter Dueck}, - note = {\url{http://www.omnisophie.com}} + title = {{D}ueck's {T}rilogie 2.1: {O}mnisophie -- {S}upramanie -- {T}opothesie}, + publisher = {Springer}, + address = {Berlin, Germany}, + year = {2013}, + author = {Gunter Dueck} } @ARTICLE{knuth:1976, - author = {Knuth, Donald E.}, - title = {{B}ig {O}micron and {B}ig {O}mega and {B}ig {T}heta}, - journal = {SIGACT News}, - year = {1976}, - volume = {8}, - pages = {18--24}, - number = {2}, - address = {New York, NY, USA}, - publisher = {ACM Press} + author = {Knuth, Donald E.}, + title = {{B}ig {O}micron and {B}ig {O}mega and {B}ig {T}heta}, + journal = {SIGACT News}, + year = {1976}, + volume = {8}, + pages = {18--24}, + number = {2}, + address = {New York, NY, USA}, + publisher = {ACM Press} } @ARTICLE{knuth:1974, - author = {Knuth, Donald E.}, - title = {{C}omputer {P}rogramming as an {A}rt}, - journal = {Communications of the ACM}, - year = {1974}, - volume = {17}, - pages = {667--673}, - number = {12}, - address = {New York, NY, USA}, - publisher = {ACM Press} + author = {Knuth, Donald E.}, + title = {{C}omputer {P}rogramming as an {A}rt}, + journal = {Communications of the ACM}, + year = {1974}, + volume = {17}, + pages = {667--673}, + number = {12}, + address = {New York, NY, USA}, + publisher = {ACM Press} } @BOOK{sommerville:1992, - title = {{S}oftware {E}ngineering}, - publisher = {Addison-Wesley}, - year = {2015}, - author = {Ian Sommerville}, - address = {Boston, MA, USA}, - edition = {10th} + title = {{S}oftware {E}ngineering}, + publisher = {Addison-Wesley}, + year = {2015}, + author = {Ian Sommerville}, + address = {Boston, MA, USA}, + edition = 10 } -@BOOK{taleb:2012, - title = {{A}ntifragile: {T}hings {T}hat {G}ain from {D}isorder ({I}ncerto - {B}ook 3)}, +@Book{taleb:2012, + title = {{A}ntifragile: {T}hings {T}hat {G}ain from {D}isorder}, publisher = {Random House}, - year = {2012}, - author = {Nassim Nicholas Taleb}, - address = {New York, NY, USA} + year = {2012}, + author = {Taleb, Nassim Nicholas}, + address = {New York, NY, USA}, +} + +@Book{taleb:2010, + title = {The Black Swan: The Impact of the Highly Improbable}, + publisher = {Random House}, + year = {2010}, + author = {Taleb, Nassim Nicholas}, + address = {New York, NY, USA} + } + + +@BOOK{ferriss:2016, +title={Tools of Titans: The Tactics, Routines, and Habits of Billionaires, Icons, and World-Class Performers}, +author={Timothy Ferriss}, +publisher={Houghton Mifflin Harcourt}, +year={2016}, +address = {Boston, MA, USA}, +} + +@Book{adams:1996, + author = {Adams, Scott}, + title = {The Dilbert Principle}, + publisher = {Harper Business}, + year = {1996}, + address = {New York, NY, USA} + } + +@Book{adams:2013, + author = {Adams, Scott}, + title = {How to Fail at Almost Everything and Still Win Big: Kind of the Story of My Life}, + publisher = {Portfolio Penguin}, + year = {2013}, + address = {London, United Kingdom}, + } + +@Book{aurelius:2002, + author = {Aurelius, Marcus}, + title = {Meditations (A New Translation)}, + publisher = {Modern Library}, + year = {2002}, + address = {New York, NY, USA}, + } + +@Book{cialdini:1984, + author = {Cialdini, Robert B.}, + title = {Influence: The Psychology of Persuasion}, + publisher = {Harper Business}, + year = {1984}, + address = {New York, NY, USA} + } + +@Book{feynman:1985, + title = {{S}urely {Y}ou're {J}oking, {M}r. {F}eynman: {A}dventures of a {C}urious {C}haracter}, + publisher = {W. W. Norton}, + year = {1985}, + author = {Feynman, Richard P.}, + address = {New York, NY, USA}, +} + +@Book{greenwald:2014, + title = {{N}o {P}lace to {H}ide: {E}dward {S}nowden, the {NSA}, and the {S}urveillance {S}tate}, + publisher = {Metropolitan Books}, + year = {2014}, + author = {Greenwald, Glenn}, + address = {New York, NY, USA}, +} + +@Book{orwell:1949, + author = {Orwell, George}, + title = {Nineteen Eighty-Four}, + publisher = {Secker \& Warburg}, + year = {1949}, + address = {London, United Kingdom} + } + +@Book{pausch:2008, + title = {The Last Lecture}, + publisher = {Hodder \& Stoughton}, + year = {2008}, + author = {Pausch, Randy}, + editor = {Zaslow, Jeffrey}, + address = {London, United Kingdom}, +} + +@Book{seneca, + author = {Seneca, Lucius}, + title = {Letters from a Stoic: Epistulae Morales ad Lucilium}, + publisher = {Penguin}, + year = {1969}, + address = {Harmondsworth, United Kingdom} + } + +@Book{trump:1987, + author = {Trump, Donald J. and Schwartz, Tony}, + title = {Trump: The Art of the Deal}, + publisher = {Random House}, + year = {1987}, + address = {New York, NY, USA} + } + + @Book{frankl:1959, + author = {Frankl, Viktor E.}, + title = {Man's Search for Meaning}, + publisher = {Beacon Press}, + year = {1959}, + address = {Boston, MA, USA} + } + +@Book{munger:2008, + title = {Poor Charlie's Almanack: The Wit and Wisdom of Charles T. Munger}, + publisher = {Donning Company}, + year = {2008}, + author = {Munger, Charles T.}, + editor = {Kaufman, Peter D.}, + address = {Virginia Beach, VA, USA}, + edition = {3}, } + + @Book{postman:2005, + author = {Postman, Neil}, + title = {Amusing Ourselves to Death: Public Discourse in the Age of Show Business (20th Anniversary Edition)}, + publisher = {Penguin Books}, + year = {2005}, + address = {New York, NY, USA} + } +@Comment{jabref-meta: databaseType:bibtex;} diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES index 13eb31db4a9..a6f268b0b7e 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES +++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES @@ -1,125 +1,171 @@ +Changes in version 4.4 (October 2017) +o Minor clean-up, also of .gitignore + (thanks to Jörn Hees) +o \marginpar improved (thanks to Jörn Hees) +o Workaround for removong headlines in "list of *" + environments (Contents.tex and ClassicThesis.tex) +o Bibliography section headers now correctly using + spacedlowsmallcaps with biblatex (thanks to Ivo + and Enrico Gregorio) +o Added some more books to bibliography for testing +o Added help for external TikZ/PGF usage in + classicthesis-config.tex (thanks to Andreas Nautsch) +o Fixed redefining \marginpar for two arguments (Ivo) +o Fixed some spacing definitions and using the + soulutf8 package now (Ivo) +o Reimplementation of \chapter and \part using solely + titlesec and tocloft (Ivo) +o \ctparttext logic fixed (Ivo) +o Logic for detecting PDF engines, pdftex, xetex, + luatex (Ivo) +o Support for fontspec and OpenType fonts for suitable + PDF engines (Ivo) +o Using kvoptions package so option=value is + available in classichtesis.sty (Ivo) +o Support for more paper sizes, fixes for headinclude + and footinclude (Ivo) +o Fixed use of subfigure (Ivo) +o Fixed use of scrlayer-scrpage (Ivo) +o Updated the documentation (Chapter01.tex) +o Removed fixltx2e from classicthesis-config.tex and + inserted latexrelease there and classicthesis.sty +o Added clarifications regarding use of GPL + (ClassicThesis.tex, Chapter01.tex) + +Changes in version 4.3 (not released) +o When redefining the acronym label, check for the + acronym package's version (thanks to Scott Lowe) +o Several minor fixes (comments, whitespaces removed, + .gitignore, .editorconfig, etc.; thanks to Jörn + Hees) +o Updated comments regarding hyperref's draft option + (thanks to Claudio Diaspero) +o Silenced the warnings from KOMA and titlesec about + each other, also in the examples (thanks to Jörg + Weber) + Changes in version 4.2 (September 2015) o Fixed issue between titlesec and tocloft regarding - part numbering in the ToC (classicthesis.sty). - Thanks to Enrico Gregorio and Henri Menke. -o Fixed bug with colored lines and graffiti + part numbering in the ToC (classicthesis.sty). + Thanks to Enrico Gregorio and Henri Menke. +o Fixed bug with colored lines and graffiti (classicthesis.sty). Thanks to Enrico Gregorio and Stefano Bragaglia for the fix! (Also switched graffiti from \slshape to \itshape.) -o Changed \vspace*{8ex} to \vspace{8ex} (Contents.tex) -o Moved \cleardoublepage from end of Contents.tex +o Changed \vspace*{8ex} to \vspace{8ex} (Contents.tex) +o Moved \cleardoublepage from end of Contents.tex to appropriate position in ClassicThesis.tex -o \bflabel of acronym package removed, as it was +o \bflabel of acronym package removed, as it was removed from acronym package and caused errors. Now set \aclabelfont to \acsfont for consistency. o Converted major files to UTF-8 (thanks to Jörn Hees) (Bibliography.bib excluded for now as BibTeX cannot handle UTF-8) -o Added support for BibLaTeX in +o Added support for BibLaTeX in classicthesis-config.tex and Bibliography.tex - (thanks to Jörn Hees). - For LyX we will have a work-around for testing. + (thanks to Jörn Hees). + For LyX we will have a work-around for testing. o Added an example for one's own publication list - (via BibLaTeX) in Publications.tex (renamed from - Publication.tex) -o Replaced/updated scrpage2 with scrlayer-scrpage + (via BibLaTeX) in Publications.tex (renamed from + Publication.tex) +o Replaced/updated scrpage2 with scrlayer-scrpage in classicthesis.sty (thanks to Ivo Pletìkosić). -X Worked on Appendix case with floatperchapter +X Worked on Appendix case with floatperchapter (works for captions but not for references so far) - Thanks to Claus Lahiri and Clemens Niederberger - for their help on this. - [REMOVED DUE TO OTHER PROBLEMS, SEE ISSUE #82] + Thanks to Claus Lahiri and Clemens Niederberger + for their help on this. + [REMOVED DUE TO OTHER PROBLEMS, SEE ISSUE #82] X Removed fixltx2e from classicthesis-config.tex and - have classicthesis.sty use or emulate the latest - LaTeX kernel via latexrelease (option: latest) + have classicthesis.sty use or emulate the latest + LaTeX kernel via latexrelease (option: latest) (thanks to Jörn Hees). - [REMOVED AS IT IS NOT AVAILABLE IN MANY - DISTRIBUTIONS, SEE ISSUE #107] - + [REMOVED AS IT IS NOT AVAILABLE IN MANY + DISTRIBUTIONS, SEE ISSUE #107] + Changes in version 4.1 (August 2012) o Working towards XeLaTeX support: - - "ifxetex" package for checking whether - XeTeX is in use (classicthesis.sty) - - Adjusted part, chapter, and tocEntry - - Thanks to Joerg Weber for his ideas and code - - Option "pdfspacing" does not work for XeTeX - and is disabled when XeTeX is running - (maybe implement spacing with fontspec later) -o Load additional packages in order to + - "ifxetex" package for checking whether + XeTeX is in use (classicthesis.sty) + - Adjusted part, chapter, and tocEntry + - Thanks to Joerg Weber for his ideas and code + - Option "pdfspacing" does not work for XeTeX + and is disabled when XeTeX is running + (maybe implement spacing with fontspec later) +o Load additional packages in order to reduce warnings (classicthesis-config.tex) - - "textcomp" to fix warnings with missing font - shapes - - "scrhack" to fix warnings when using KOMA - with listings package + - "textcomp" to fix warnings with missing font + shapes + - "scrhack" to fix warnings when using KOMA + with listings package o Replaced \mathrm-command with \textrm-command (Chapter03.tex) Changes in version 4.0 (December 2011) -o Due to lots of issues and complaints, - classicthesis-preamble.sty is replaced by +o Due to lots of issues and complaints, + classicthesis-preamble.sty is replaced by classicthesis-config.tex (which is cleaner, nicer, better, etc. than before!) -o No per-chapter-numbering also for equations +o No per-chapter-numbering also for equations (classicthesis.sty and Chapter03.tex) -o classicthesis.sty now also works without the +o classicthesis.sty now also works without the KOMA-classes (scrbook, scrartcl, etc.): - - This affects the text body shape, where the - package "typearea" is always loaded in order - to use \areaset - - And affects the layout of footnotes where the - package "footmisc" is loaded otherwise - (not 100\% identical look-and-feel but OK) -o Help for using spanish babel with classicthesis + - This affects the text body shape, where the + package "typearea" is always loaded in order + to use \areaset + - And affects the layout of footnotes where the + package "footmisc" is loaded otherwise + (not 100\% identical look-and-feel but OK) +o Help for using spanish babel with classicthesis (classicthesis-config.tex) -o Note about pdfsync issues with graffiti +o Note about pdfsync issues with graffiti (Chapter01.tex) -o Minor clean-up of comments and duplicate lines +o Minor clean-up of comments and duplicate lines (classicthesis.sty) o Adjusted the colophon text (Colophon.tex) o Increased space for labels in the LoF, LoT, LoL o Included version information on the title page and - in the drafting and final version information + in the drafting and final version information (classicthesis.sty and Titlepage.tex) Changes in version 3.0 (June 2011) -o There have been some major changes in order to port +o There have been some major changes in order to port classicthesis to LyX easily. See below for details. - Special thanks go to Ivo Pletikosi\'c for all his + Special thanks go to Ivo Pletikosi\'c for all his hard work he put into this project! o Changes in ClassicThesis.tex: - - Redundant fleqn removed from documentclass options - (will be set by amsmath package in preamble) - - KOMA adjustments for documentclass: - fontsize=11pt,paper=14 - - Moved language options into documentclass due to LyX - issues with babel + - Redundant fleqn removed from documentclass options + (will be set by amsmath package in preamble) + - KOMA adjustments for documentclass: + fontsize=11pt,paper=14 + - Moved language options into documentclass due to LyX + issues with babel o Changes in classicthesis.sty: - - Removed bcor from \areaset command so that it can - be set via \documentclass option (BCOR=) - - New \ctparttext command for putting preamble text - after part titles (see ClassicThesis.tex for examples) - - \graffito command now also available as original - \marginpar (backward compatibility is enabled) - - Chapter number in margin done with \oldmarginpar + - Removed bcor from \areaset command so that it can + be set via \documentclass option (BCOR=) + - New \ctparttext command for putting preamble text + after part titles (see ClassicThesis.tex for examples) + - \graffito command now also available as original + \marginpar (backward compatibility is enabled) + - Chapter number in margin done with \oldmarginpar o Changes to classicthesis-preamble.sty: - Fixed autoref for subfigures (see Chapter 2 for example) - Fixed issues with redefining autoref strings (for different languages) - - Now contains all configuration information, such as - the title, your name etc. - - This package now also loads classicthesis.sty, change - the options classicthesis to be loaded with here - - Package inputenc now loaded with latin9 option - - Package listings now also loaded here - - Now safer package loading regarding options by - using \PassOptionsToPackage command extensively - - Inserted new string for \mySubtitle -o Changes in Titlepage.tex and Titleback.tex because of new + - Now contains all configuration information, such as + the title, your name etc. + - This package now also loads classicthesis.sty, change + the options classicthesis to be loaded with here + - Package inputenc now loaded with latin9 option + - Package listings now also loaded here + - Now safer package loading regarding options by + using \PassOptionsToPackage command extensively + - Inserted new string for \mySubtitle +o Changes in Titlepage.tex and Titleback.tex because of new string \mySubtitle o Changed a lot of the documentation, e.g., in Chapter01.tex Changes in version 2.9 (January 2011) -o Fixed onlytext euler font for MinionPro font (in +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) @@ -127,7 +173,7 @@ 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 +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 @@ -143,15 +189,15 @@ o Included backward compatibility regarding old commands \myChapter and \myPart in classicthesis.sty o Fixed drafting issues (draft information not shown at all) caused by wrong code for listings and listsseparated options - in classicthesis.sty + in classicthesis.sty Changes in version 2.7 (February 2010, cumulative release) -o Removed option for classicthesis-ldpkg.sty: nobackref +o Removed option for classicthesis-ldpkg.sty: nobackref Introduced instead option "backref" for consistency which works the other way (no backrefs by default) - + Changes in version 2.6.2 (January 2010, released as beta) -o New option for classicthesis-ldpkg.sty: nobackref +o New option for classicthesis-ldpkg.sty: nobackref (removes links to cited page in bibliography) o Fixed some spacing issues for LoF, LoT, LoL with option "listsseparated" (in classicthesis.sty) @@ -162,23 +208,23 @@ o Removed \myChapter and \myPart, you can now use the regular (thanks to Hinrich Harms for this) o Fixed used KOMA-options: numbers=noenddot, cleardoublepage=empty (in ClassicThesis.tex) -o Included hack to use citations in float environments, will +o Included hack to use citations in float environments, will be fixed with caption package version 3.2 (in classicthesis.sty) -o Included some font and text area fine-tuning code +o Included some font and text area fine-tuning code (in ClassicThesis.tex) o Some testing with Libertine font (classicthesis-book.tex) o Fixed numbering of listings used in different chapters (in ClassicThesis.tex, classicthesis.sty, classicthesis-ldpkg.sty) -o Spacing between listings in different chapters and after List +o Spacing between listings in different chapters and after List of Listings header fixed (in classicthesis.sty) -o Increased \newnumberwidth to sizeof(999) which is better for +o Increased \newnumberwidth to sizeof(999) which is better for documents with more than 99 pages (in classicthesis.sty) o New option for classicthesis.sty: manychapters - + 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 +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 @@ -202,11 +248,11 @@ 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 +o Switched back to "obsolete" KOMA options due to compatibility issues on some installations -o Increased robustness of \cauthor command in +o Increased robustness of \cauthor command in classicthesis-ldpk.sty -o Spacing fix for \sectionmark (in classicthesis.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 @@ -218,22 +264,22 @@ o Fixed issue with contents headings (in classicthesis.sty o Thanks to Lorenzo Changes in version 2.3 (November 2007) -o Fixed serious bug with \myChapter command (using plain +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.tex for finer end-user control o Removed obsolete KOMA options from ClassicThesis.tex -o Option "subfigure" deprecated, replaced by "subfig" (in +o Option "subfigure" deprecated, replaced by "subfig" (in classicthesis.sty) -o Inserted some mechanisms to detect whether subfig(ure) +o Inserted some mechanisms to detect whether subfig(ure) package was loaded or not (in classicthesis.sty) o Inserted some mechanism to detect whether classicthesis packackage was loaded or not (in classicthesis-ldpkg.sty) -o Moved "headlines" code block a bit up in +o Moved "headlines" code block a bit up in classicthesis.sty (seemed to cause problems with new KOMA-Script classes) -o Removed accidental "natbib" from classicthesis-ldpkg.sty +o Removed accidental "natbib" from classicthesis-ldpkg.sty o Some fine-tuning in (Dirty)Titlepage.tex o Thanks to Lorenzo and Denis! :-) @@ -242,20 +288,20 @@ o \myChapter and \myPart now take an optional argument just as the regular \part and \chapter commands o Did some minor changes to classicthesis-book.tex so it's a better example -o Inserted some \cleardoublepage before \myPart +o Inserted some \cleardoublepage before \myPart occurences to avoid pdfbookmark problems o Introduced some general typographic fine-tuning (linespread, penalties, etc.) o Did some fine-tuning of the \graffito command Changes in version 2.1 (July 2007) -o Removed duplicate xcolor package call from +o Removed duplicate xcolor package call from classicthesis-ldpkg.sty and shifed some color definitions around o Removed re-definition of \ttdefault Changes in version 2.0 (June 2007, cumulative release) -o Better setup of the list of acronyms +o Better setup of the list of acronyms (in classicthesis-ldpkg.sty) o Using KOMA option footinclude in ClassicThesis.tex (text block sizes are adjusted to this) @@ -284,13 +330,13 @@ o Introduced new commands in classicthesis-ldpkg.sty to make - \backrefnotcitedstring (ref is not cited) - \backrefcitedsinglestring (ref is cited on one page) - \backrefcitedmultistring (ref is cited on multiple pages) -o Removed ellipsis package from classicthesis-ldpkg.sty due to +o Removed ellipsis package from classicthesis-ldpkg.sty due to some undesired results for some users -o Removed the following packages from classicthesis-ldpkg.sty as +o Removed the following packages from classicthesis-ldpkg.sty as these seem to require changes to their options from most users: inputenc, babel, natbib (now in ClassicThesis.tex) o New option for classicthesis-ldpkg.sty: nochapters - Use the package with classes that do not have chapter divisions + Use the package with classes that do not have chapter divisions Changes in version 1.5 (April 2007, not released separately) o Fixed some bugs to use classicthesis.sty for article layout @@ -315,13 +361,13 @@ o Some minor bug fixes Changes in version 1.4 (January 2007) o Replaced \lineheight with \baselineskip in classicthesis.sty o Removed obsolete "usenames" option from xcolor package (classicthesis.sty) -o Now classicthesis.sty processes the global a5paper option and adjusts +o Now classicthesis.sty processes the global a5paper option and adjusts the layout accordingly (experimental!) Changes in version 1.3.1 (August 2006) o Urgent bug concerning ToC spacing etc. fixed -Changes in version 1.3 (August 2006) +Changes in version 1.3 (August 2006) o New option for classicthesis.sty: parts Turn this on if you use Part divisions. It fine-tunes the ToC and adds support for Part division via \myPart{} (cf. \myChapter{}) @@ -329,15 +375,15 @@ o New option for classicthesis.sty: parts o New option for classicthesis.sty: eulermath Uses the awesome Euler fonts for math (Palatino fonts are default). o Added mparhack package to loadpackages.sty to get the graffiti right -o Added a hint to loadpackages.sty on how to typeset the List of +o Added a hint to loadpackages.sty on how to typeset the List of Listings consistently with classicthesis o Some minor fine-tuning of typographic details o Collaboration with babel package improved (now easier to use with other languages than English) o Added appropriate textwidth values for 11pt Palatino and Minion (See comments near \areaset in classicthesis.sty) -o Note: There is a problem with the case of math text in part-, - chapter-, and section titles and I have no clue how to fix this +o Note: There is a problem with the case of math text in part-, + chapter-, and section titles and I have no clue how to fix this (either the case or the spacing breaks). So far, I chose the case. :-( Changes in version 1.2 (June 2006) @@ -347,7 +393,7 @@ o New option for classicthesis.sty: nochapters Allows to use the look-and-feel with classes that do not use chapters. o New option for classicthesis.sty: beramono Loads Bera Mono as typewriter font. (Default = no typewriter font.) -o Included list of files, see LISTOFFILES. +o Included list of files, see LISTOFFILES. Changes in version 1.1 (May 2006) o classicthesis.sty now stand-alone and usable w/o whole bundle! @@ -364,4 +410,4 @@ o Files are a bit more "ASCII-friendly" (all) o Note: Thanks to all the folks who already sent me a postcard! :-) Version 1.0 (March 2006) -o First public release
\ No newline at end of file +o First public release diff --git a/Master/texmf-dist/doc/latex/classicthesis/COPYING b/Master/texmf-dist/doc/latex/classicthesis/COPYING index 3912109b5cd..7b1e1eade03 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/COPYING +++ b/Master/texmf-dist/doc/latex/classicthesis/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex index a473fdb330f..3643aefb00f 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex @@ -13,20 +13,20 @@ This bundle for \LaTeX\ has two goals: Typographic Style}'' \citep{bringhurst:2002}. \marginpar{\myTitle \myVersion} \end{enumerate} -The bundle is configured to run with a \emph{full} +The bundle is configured to run with a \emph{full} MiK\TeX\ or \TeX Live\footnote{See the file \texttt{LISTOFFILES} for -needed packages. Furthermore, \texttt{classicthesis} -works with most other distributions and, thus, with most systems -\LaTeX\ is available for.} -installation right away and, therefore, it uses only freely available +needed packages. Furthermore, \texttt{classicthesis} +works with most other distributions and, thus, with most systems +\LaTeX\ is available for.} +installation right away and, therefore, it uses only freely available fonts. (Minion fans can easily adjust the style to their needs.) People interested only in the nice style and not the whole bundle can now use the style stand-alone via the file \texttt{classicthesis.sty}. This works now also with ``plain'' \LaTeX. -As of version 3.0, \texttt{classicthesis} can also be easily used with -\mLyX\footnote{\url{http://www.lyx.org}} thanks to Nicholas Mariette +As of version 3.0, \texttt{classicthesis} can also be easily used with +\mLyX\footnote{\url{http://www.lyx.org}} thanks to Nicholas Mariette and Ivo Pletikosić. The \mLyX\ version of this manual will contain more information on the details. @@ -36,22 +36,22 @@ is my overall goal: more beautiful documents, especially theses, as I am tired of seeing so many ugly ones. The whole template and the used style is released under the -\acsfont{GNU} General Public License. +\acsfont{GNU} General Public License. If you like the style then I would appreciate a postcard: \begin{center} - André Miede \\ - Detmolder Straße 32 \\ - 31737 Rinteln \\ - Germany + André Miede \\ + Detmolder Straße 32 \\ + 31737 Rinteln \\ + Germany \end{center} The postcards I received so far are available at: \begin{center} - \url{http://postcards.miede.de} + \url{http://postcards.miede.de} \end{center} \marginpar{A well-balanced line width improves the legibility of the text. That's what typography is all about, right?} -So far, many theses, some books, and several other publications have +So far, many theses, some books, and several other publications have been typeset successfully with it. If you are interested in some typographic details behind it, enjoy Robert Bringhurst's wonderful book. % \citep{bringhurst:2002}. @@ -68,7 +68,7 @@ especially these: information to be on a page. And, no: the lines are not too short. \item The tables intentionally do not use vertical or double rules. See the documentation for the \texttt{booktabs} package for - a nice discussion of this topic.\footnote{To be found online at + a nice discussion of this topic.\footnote{To be found online at \url{http://mirror.ctan.org/macros/latex/contrib/booktabs/}.} \item And last but not least, to provide the reader with a way easier access to page numbers in the table of contents, the page @@ -83,25 +83,25 @@ Therefore, please do not break the beauty of the style by changing these things unless you really know what you are doing! Please. \paragraph{Yet Another Important Note:} Since \texttt{classicthesis}' -first release in 2006, many things have changed in the \LaTeX\ world. -Trying to keep up-to-date, \texttt{classicthesis} grew and evolved -into many directions, trying to stay (some kind of) stable and be -compatible with its port to \mLyX. However, there are still many -remains from older times in the code, many dirty workarounds here and -there, and several other things I am absolutely not proud of (for -example my unwise combination of \acsfont{KOMA} and +first release in 2006, many things have changed in the \LaTeX\ world. +Trying to keep up-to-date, \texttt{classicthesis} grew and evolved +into many directions, trying to stay (some kind of) stable and be +compatible with its port to \mLyX. However, there are still many +remains from older times in the code, many dirty workarounds here and +there, and several other things I am absolutely not proud of (for +example my unwise combination of \acsfont{KOMA} and \texttt{titlesec} etc.). \graffito{An outlook into the future of \texttt{classicthesis}.} -Currently, I am looking into how to completely re-design and -re-implement \texttt{classicthesis} making it easier to maintain and -to use. As a general idea, \texttt{classicthesis.sty} should be -developed and distributed separately from the template bundle itself. -Excellent spin-offs such as \texttt{arsclassica} could also be -integrated (with permission by their authors) as format configurations. -Also, current trends of \texttt{microtype}, \texttt{fontspec}, etc. -should be included as well. As I am not really into deep -\LaTeX\ programming, +Currently, I am looking into how to completely re-design and +re-implement \texttt{classicthesis} making it easier to maintain and +to use. As a general idea, \texttt{classicthesis.sty} should be +developed and distributed separately from the template bundle itself. +Excellent spin-offs such as \texttt{arsclassica} could also be +integrated (with permission by their authors) as format configurations. +Also, current trends of \texttt{microtype}, \texttt{fontspec}, etc. +should be included as well. As I am not really into deep +\LaTeX\ programming, I will reach out to the \LaTeX\ community for their expertise and help. @@ -114,8 +114,8 @@ the following: body\dots} \item\texttt{Chapters/} is where all the ``real'' content goes in separate files such as \texttt{Chapter01.tex} etc. - % \item\texttt{Examples/} is where you store all listings and other - % examples you want to use for your text. + % \item\texttt{Examples/} is where you store all listings and other + % examples you want to use for your text. \item\texttt{FrontBackMatter/} is where all the stuff goes that surrounds the ``real'' content, such as the acknowledgments, dedication, etc. @@ -129,24 +129,23 @@ the following: awesome look and feel. Does not only work with this thesis template but also on its own (see folder \texttt{Examples}). Bonus: works with both \LaTeX\ and \textsc{pdf}\LaTeX\dots and \mLyX. - \item\texttt{ClassicThesis.tcp} a \TeX nicCenter project file. + % \item\texttt{ClassicThesis.tcp} a \TeX nicCenter project file. Great tool and it's free! \item\texttt{ClassicThesis.tex}: the main file of your thesis where all gets bundled together. - \item\texttt{classicthesis-config.tex}: a central place to load all - nifty packages that are used. %In there, you can also activate - %backrefs in order to have information in the bibliography about - %where a source was cited in the text (\ie, the page number). - - \emph{Make your changes and adjustments here.} This means that you - specify here the options you want to load \texttt{classicthesis.sty} - with. You also adjust the title of your thesis, your name, and all - similar information here. Refer to \autoref{sec:custom} for more + \item\texttt{classicthesis-config.tex}: a central place to load all + nifty packages that are used. % In there, you can also activate + % backrefs in order to have information in the bibliography about + % where a source was cited in the text (\ie, the page number). + + \emph{Make your changes and adjustments here.} This means that you + specify here the options you want to load \texttt{classicthesis.sty} + with. You also adjust the title of your thesis, your name, and all + similar information here. Refer to \autoref{sec:custom} for more information. - - This had to change as of version 3.0 in order to enable an easy - transition from the ``basic'' style to \mLyX. - + + This had to change as of version 3.0 in order to enable an easy + transition from the ``basic'' style to \mLyX. \end{itemize} In total, this should get you started in no time. @@ -161,112 +160,83 @@ allow for a bit of freedom concerning the layout: \item General: \begin{itemize} \item\texttt{drafting}: prints the date and time at the bottom of - each page, so you always know which version you are dealing with. - Might come in handy not to give your Prof. that old draft. + each page, so you always know which version you are dealing with. + Might come in handy not to give your Prof. that old draft. \end{itemize} - + \item Parts and Chapters: \begin{itemize} \item\texttt{parts}: if you use Part divisions for your document, - you should choose this option. (Cannot be used together with - \texttt{nochapters}.) - - \item\texttt{nochapters}: allows to use the look-and-feel with - classes that do not use chapters, \eg, for articles. Automatically - turns off a couple of other options: \texttt{eulerchapternumbers}, - \texttt{linedheaders}, \texttt{listsseparated}, and \texttt{parts}. - - \item\texttt{linedheaders}: changes the look of the chapter - 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. - + you should choose this option. (Cannot be used together with + \texttt{nochapters}.) + + \item\texttt{linedheaders}: changes the look of the chapter + 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. \end{itemize} - \item Typography: + \item Typography: \begin{itemize} \item\texttt{eulerchapternumbers}: use figures from Hermann Zapf's Euler math font for the chapter numbers. By default, old style figures from the Palatino font are used. - - \item\texttt{beramono}: loads Bera Mono as typewriter font. + + \item\texttt{beramono}: loads Bera Mono as typewriter font. (Default setting is using the standard CM typewriter font.) - - \item\texttt{eulermath}: loads the awesome Euler fonts for math. + + \item\texttt{eulermath}: loads the awesome Euler fonts for math. Pala\-tino is used as default font. - - \item\texttt{pdfspacing}: makes use of pdftex' letter spacing - capabilities via the \texttt{microtype} package.\footnote{Use - \texttt{microtype}'s \texttt{DVIoutput} option to generate - DVI with pdftex.} This fixes some serious issues regarding - math formul\ae\ etc. (\eg, ``\ss'') in headers. - - \item\texttt{minionprospacing}: uses the internal \texttt{textssc} - command of the \texttt{MinionPro} package for letter spacing. This - automatically enables the \texttt{minionpro} option, overriding - \texttt{pdfspacing}. - - \end{itemize} + \end{itemize} + + \marginpar{Options are enabled via \texttt{option=true}} \item Table of Contents: \begin{itemize} - \item\texttt{tocaligned}: aligns the whole table of contents on + \item\texttt{tocaligned}: aligns the whole table of contents on the left side. Some people like that, some don't. - - \item\texttt{dottedtoc}: sets pagenumbers flushed right in the + + \item\texttt{dottedtoc}: sets pagenumbers flushed right in the table of contents. - \item\texttt{manychapters}: if you need more than nine chapters for - your document, you might not be happy with the spacing between the - chapter number and the chapter title in the Table of Contents. - 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{manychapters}: if you need more than nine chapters for + your document, you might not be happy with the spacing between the + chapter number and the chapter title in the Table of Contents. + 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. \end{itemize} - + \item Floats: \begin{itemize} - \item\texttt{listings}: loads the \texttt{listings} package (if not - already done) and configures the List of Listings accordingly. - - \item\texttt{floatperchapter}: activates numbering per chapter for - all floats such as figures, tables, and listings (if used). - - \item\texttt{subfig}(\texttt{ure}): is passed to the \texttt{tocloft} - package to enable compatibility with the \texttt{subfig}(\texttt{ure}) - package. Use this option if you want use \texttt{classicthesis} with the - \texttt{subfig} package. - -% \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. - \end{itemize} - -% \item\texttt{a5paper}: adjusts the page layout according to the -% global \texttt{a5paper} option (\emph{experimental} feature). -% \item\texttt{minionpro}: sets Robert Slimbach's Minion as the -% main font of the document. The textblock size is adjusted -% accordingly. - - \end{itemize} + \item\texttt{listings}: loads the \texttt{listings} package (if not + already done) and configures the List of Listings accordingly. + + \item\texttt{floatperchapter}: activates numbering per chapter for + all floats such as figures, tables, and listings (if used). + \end{itemize} + +\end{itemize} + +Furthermore, pre-defined margins for different paper sizes are available, \eg, \texttt{a4paper}, \texttt{a5paper}, and \texttt{letterpaper}. These are based on your chosen option of \verb|\documentclass|. + The best way to figure these options out is to try the different possibilities and see what you and your supervisor like best. -In order to make things easier, \texttt{classicthesis-config.tex} +In order to make things easier, \texttt{classicthesis-config.tex} contains some useful commands that might help you. \section{Customization}\label{sec:custom} %(As of v3.0, the Classic Thesis Style for \LaTeX{} and \mLyX{} share %the same two \texttt{.sty} files.) -This section will show you some hints how to adapt +This section will show you some hints how to adapt \texttt{classicthesis} to your needs. The file \texttt{classicthesis.sty} contains the core functionality of the style and in most cases will be left intact, whereas the file \texttt{classic\-thesis-config.tex} -is used for some common user customizations. +is used for some common user customizations. The first customization you are about to make is to alter the document title, author name, and other thesis details. In order to do this, replace @@ -278,27 +248,40 @@ the data in the following lines of \texttt{classicthesis-config.tex:}% % ************************************************** % 2. Personal data and user ad-hoc commands % ************************************************** - \newcommand{\myTitle}{A Classic Thesis Style\xspace} - \newcommand{\mySubtitle}{An Homage to...\xspace} + \newcommand{\myTitle}{A Classic Thesis Style\xspace} + \newcommand{\mySubtitle}{An Homage to...\xspace} \end{lstlisting} Further customization can be made in \texttt{classicthesis-config.tex} -by choosing the options to \texttt{classicthesis.sty} +by choosing the options to \texttt{classicthesis.sty} (see~\autoref{sec:options}) in a line that looks like this: \begin{lstlisting} - \PassOptionsToPackage{eulerchapternumbers,drafting,listings,subfig,eulermath,parts}{classicthesis} + \PassOptionsToPackage{ + drafting=true, % print version information on the bottom of the pages + tocaligned=false, % the left column of the toc will be aligned (no indentation) + dottedtoc=false, % page numbers in ToC flushed right + parts=true, % use part division + eulerchapternumbers=true, % use AMS Euler for chapter font (otherwise Palatino) + linedheaders=false, % chaper headers will have line above and beneath + floatperchapter=true, % numbering per chapter for all floats (i.e., Figure 1.1) + listings=true, % load listings package and setup LoL + subfig=true, % setup for preloaded subfig package + eulermath=false, % use awesome Euler fonts for mathematical formulae (only with pdfLaTeX) + beramono=true, % toggle a nice monospaced font (w/ bold) + minionpro=false % setup for minion pro font; use minion pro small caps as well (only with pdfLaTeX) + }{classicthesis} \end{lstlisting} Many other customizations in \texttt{classicthesis-config.tex} are possible, but you should be careful making changes there, since some changes could cause errors. -Finally, changes can be made in the file \texttt{classicthesis.sty},% -\marginpar{Modifications in \texttt{classicthesis.sty}% -} although this is mostly not designed for user customization. The -main change that might be made here is the text-block size, for example, -to get longer lines of text. +% Finally, changes can be made in the file \texttt{classicthesis.sty},% +% \marginpar{Modifications in \texttt{classicthesis.sty}% +% } although this is mostly not designed for user customization. The +% main change that might be made here is the text-block size, for example, +% to get longer lines of text. \section{Issues}\label{sec:issues} @@ -311,50 +294,6 @@ Beta versions of \texttt{classicthesis} can be found at Bitbucket: \end{center} There, you can also post serious bugs and problems you encounter. -\subsection*{Compatibility with the \texttt{glossaries} Package} -If you want to use the \texttt{glossaries} package, take care of loading it -with the following options: -\begin{lstlisting} - \usepackage[style=long,nolist]{glossaries} -\end{lstlisting} -Thanks to Sven Staehs for this information. - - -\subsection*{Compatibility with the (Spanish) \texttt{babel} Package} -Spanish languages need an extra option in order to work with this template: -\begin{lstlisting} - \usepackage[spanish,es-lcroman]{babel} -\end{lstlisting} -Thanks to an unknown person for this information (via the issue reporting). - - -\paragraph{Further information for using \texttt{classicthesis} with Spanish (in addition to the above)} -In the file \texttt{ClassicThesis.tex} activate the language: -\begin{lstlisting} - \selectlanguage{spanish} -\end{lstlisting} - -If there are issues changing \verb|\tablename|, \eg, using this: -\begin{lstlisting} - \renewcommand{\tablename}{Tabla} -\end{lstlisting} - -This can be solved by passing \texttt{es-tabla} parameter to \texttt{babel}: -\begin{lstlisting} - \PassOptionsToPackage{es-tabla,spanish,es-lcroman,english}{babel} - \usepackage{babel} -\end{lstlisting} - -But it is also necessary to set \texttt{spanish} in the \verb|\documentclass|. - -Thanks to Alvaro Jaramillo Duque for this information. - - -\subsection*{Compatibility with the \texttt{pdfsync} Package} -Using the \texttt{pdfsync} package leads to linebreaking problems with the \texttt{graffito} command. -Thanks to Henrik Schumacher for this information. - - \section{Future Work} So far, this is a quite stable version that served a couple of people @@ -373,53 +312,50 @@ in general, do not hesitate to write them on that postcard of yours. \section{Beyond a Thesis} The layout of \texttt{classicthesis.sty} can be easily used without the -framework of this template. A few examples where it was used to typeset -an article, a book or a curriculum vitae can be found in the folder -\texttt{Examples}. The examples have been tested with -\texttt{latex} and \texttt{pdflatex} and are easy to compile. To -encourage you even more, PDFs built from the sources can be found in the -same folder. -%(It might be necessary to adjust the path to -%\texttt{classicthesis.sty} and \texttt{Bibliography.bib} within the -%examples.) - -%\lstinputlisting[caption=An Article]% - %{Examples/classicthesis-article.tex} - % -%\lstinputlisting[caption=A Book]% - %{Examples/classicthesis-book.tex} -% -%\lstinputlisting[caption=A Curriculum Vit\ae]% - %{Examples/classicthesis-cv.tex} +framework of this template. A few examples where it was used to typeset +an article, a book or a curriculum vitae can be found in the folder +\texttt{Examples}. The examples have been tested with +\texttt{latex} and \texttt{pdflatex} and are easy to compile. To +encourage you even more, PDFs built from the sources can be found in the +same folder. \section{License} \paragraph{GNU General Public License:} This program is free software; you can redistribute it and/or modify - it under the terms of the \acsfont{GNU} General Public License as - published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but \emph{without any warranty}; without even the implied warranty of - \emph{merchant\-ability} or \emph{fitness for a particular purpose}. - See the - \acsfont{GNU} General Public License for more details. - - You should have received a copy of the \acsfont{GNU} General - Public License - along with this program; see the file \texttt{COPYING}. If not, - write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. +it under the terms of the \acsfont{GNU} General Public License as +published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but \emph{without any warranty}; without even the implied warranty of +\emph{merchant\-ability} or \emph{fitness for a particular purpose}. +See the +\acsfont{GNU} General Public License for more details. + +You should have received a copy of the \acsfont{GNU} General +Public License +along with this program; see the file \texttt{COPYING}. If not, +write to +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. + +\paragraph{classichthesis Authors' note:} There have been some discussions about the GPL's implications on using \texttt{classicthesis} for theses etc. Details can be found here: +\begin{center} + \url{https://bitbucket.org/amiede/classicthesis/issues/123/} +\end{center} + +We chose (and currently stick with) the GPL because we would not like to compete with proprietary modified versions of our own work. However, the whole template is free as free beer and free speech. We will not demand the sources for theses, books, CVs, etc. that were created using \texttt{classicthesis}. + +Postcards are still highly appreciated. + + + + %***************************************** %***************************************** %***************************************** %***************************************** %***************************************** - - - - diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex index da807c61d94..f6d878dc631 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex @@ -3,11 +3,20 @@ %***************************************** %\setcounter{figure}{10} % \NoCaseChange{Homo Sapiens} -Ei choro aeterno antiopam mea, labitur bonorum pri no +Ei choro aeterno antiopam mea, labitur bonorum pri no \citeauthor{taleb:2012} \citep{taleb:2012}. His no decore -nemore graecis. In eos meis nominavi, liber soluta vim cu. Sea commune +nemore graecis. %In eos meis nominavi, liber soluta vim cu. Sea commune suavitate interpretaris eu, vix eu libris efficiantur. + Some interesting books in order to get a multi-page bibliography: \cite{ferriss:2016,greenwald:2014,adams:2013,pausch:2008,aurelius:2002,adams:1996,trump:1987,feynman:1985,cialdini:1984,seneca,orwell:1949,taleb:2010,munger:2008,postman:2005,frankl:1959} %\nocite{*} +% Ugly work-around +% Part~\textsc{\ref{pt:showcase}} + +% Does not work +% \begingroup +% \renewcommand{\thepart}{\Roman{part}} +% Part~\ref{pt:showcase} +% \endgroup \section{A New Section} Illo principalmente su nos. Non message \emph{occidental} angloromanic @@ -40,7 +49,7 @@ nominati imperdiet nec, sea odio duis vocent ei. Tempor everti appareat cu ius, ridens audiam an qui, aliquid admodum conceptam ne qui. Vis ea melius nostrum, mel alienum euripidis eu. -Ei choro aeterno antiopam mea, labitur bonorum pri no. His no decore +%Ei choro aeterno antiopam mea, labitur bonorum pri no. His no decore nemore graecis. In eos meis nominavi, liber soluta vim cu. \subsection{Autem Timeam} @@ -74,10 +83,10 @@ representantes al uso, con lo unic vocabulos, tu peano essentialmente qui. Lo malo laborava anteriormente uso. \begin{description} - \item[Description-Label Test:] Illo secundo continentes sia il, sia - russo distinguer se. Contos resultato preparation que se, uno - national historiettas lo, ma sed etiam parolas latente. Ma unic - quales sia. Pan in patre altere summario, le pro latino resultato. + \item[Description-Label Test:] Illo secundo continentes sia il, sia + russo distinguer se. Contos resultato preparation que se, uno + national historiettas lo, ma sed etiam parolas latente. Ma unic + quales sia. Pan in patre altere summario, le pro latino resultato. \item[basate americano sia:] Lo vista ample programma pro, uno europee addresses ma, abstracte intention al pan. Nos duce infra publicava le. Es que historia encyclopedia, sed terra celos @@ -108,8 +117,8 @@ es inter disuso qualcunque que. Del hodie philologos occidental al, como publicate litteratura in web. Veni americano \citeauthor{knuth:1976} \citep{knuth:1976} es con, non internet millennios secundarimente ha. Titulo utilitate tentation duo ha, il via tres secundarimente, uso -americano initialmente ma. De duo deler personas initialmente. Se -duce facite westeuropee web, \autoref{tab:example} nos clave +americano initialmente ma. De duo deler personas initialmente. Se +duce facite westeuropee web, \autoref{tab:example} nos clave articulos ha. @@ -133,20 +142,20 @@ rapide nos da. \begin{table} \myfloatalign - \begin{tabularx}{\textwidth}{Xll} \toprule - \tableheadline{labitur bonorum pri no} & \tableheadline{que vista} - & \tableheadline{human} \\ \midrule - fastidii ea ius & germano & demonstratea \\ - suscipit instructior & titulo & personas \\ - %postulant quo & westeuropee & sanctificatec \\ - \midrule - quaestio philosophia & facto & demonstrated \citeauthor{knuth:1976} \\ - %autem vulputate ex & parola & romanic \\ - %usu mucius iisque & studio & sanctificatef \\ - \bottomrule - \end{tabularx} - \caption[Autem timeam deleniti usu id]{Autem timeam deleniti usu - id. \citeauthor{knuth:1976}} \label{tab:example} + \begin{tabularx}{\textwidth}{Xll} \toprule + \tableheadline{labitur bonorum pri no} & \tableheadline{que vista} + & \tableheadline{human} \\ \midrule + fastidii ea ius & germano & demonstratea \\ + suscipit instructior & titulo & personas \\ + %postulant quo & westeuropee & sanctificatec \\ + \midrule + quaestio philosophia & facto & demonstrated \citeauthor{knuth:1976} \\ + %autem vulputate ex & parola & romanic \\ + %usu mucius iisque & studio & sanctificatef \\ + \bottomrule + \end{tabularx} + \caption[Autem timeam deleniti usu id]{Autem timeam deleniti usu + id. \citeauthor{knuth:1976}} \label{tab:example} \end{table} \enlargethispage{2cm} @@ -157,23 +166,23 @@ facite linguistic registrate se nos. Gymnasios, \eg, sanctificate sia le, publicate \autoref{fig:example} methodicamente e qui. Lo sed apprende instruite. Que altere responder su, pan ma, \ie, signo -studio. \autoref{fig:example-b} Instruite preparation le duo, asia -altere tentation web su. Via unic facto rapide de, iste questiones +studio. \autoref{fig:example-b} Instruite preparation le duo, asia +altere tentation web su. Via unic facto rapide de, iste questiones methodicamente o uno, nos al. \begin{figure}[bth] - \myfloatalign - \subfloat[Asia personas duo.] - {\includegraphics[width=.45\linewidth]{gfx/example_1}} \quad - \subfloat[Pan ma signo.] - {\label{fig:example-b}% - \includegraphics[width=.45\linewidth]{gfx/example_2}} \\ - \subfloat[Methodicamente o uno.] - {\includegraphics[width=.45\linewidth]{gfx/example_3}} \quad - \subfloat[Titulo debitas.] - {\includegraphics[width=.45\linewidth]{gfx/example_4}} - \caption[Tu duo titulo debitas latente]{Tu duo titulo debitas - latente. \ac{DRY}}\label{fig:example} + \myfloatalign + \subfloat[Asia personas duo.] + {\includegraphics[width=.45\linewidth]{gfx/example_1}} \quad + \subfloat[Pan ma signo.] + {\label{fig:example-b}% + \includegraphics[width=.45\linewidth]{gfx/example_2}} \\ + \subfloat[Methodicamente o uno.] + {\includegraphics[width=.45\linewidth]{gfx/example_3}} \quad + \subfloat[Titulo debitas.] + {\includegraphics[width=.45\linewidth]{gfx/example_4}} + \caption[Tu duo titulo debitas latente]{Tu duo titulo debitas + latente. \ac{DRY}}\label{fig:example} \end{figure} diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex index d7fdeeec58e..e9515a08000 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex @@ -65,37 +65,37 @@ description of ionisation fluctuations: \begin{enumerate} \item A large number of collisions involving the loss of all or most - of the incident particle energy during the traversal of an absorber. + of the incident particle energy during the traversal of an absorber. - As the total energy transfer is composed of a multitude of small - energy losses, we can apply the central limit theorem and describe - the fluctuations by a Gaussian distribution. This case is - applicable to non-relativistic particles and is described by the - inequality $\kappa > 10 $ (\ie, when the mean energy loss in the - absorber is greater than the maximum energy transfer in a single - collision). + As the total energy transfer is composed of a multitude of small + energy losses, we can apply the central limit theorem and describe + the fluctuations by a Gaussian distribution. This case is + applicable to non-relativistic particles and is described by the + inequality $\kappa > 10 $ (\ie, when the mean energy loss in the + absorber is greater than the maximum energy transfer in a single + collision). \item Particles traversing thin counters and incident electrons under - any conditions. + any conditions. - The relevant inequalities and distributions are $ 0.01 < \kappa < 10 - $, - Vavilov distribution, and $\kappa < 0.01 $, Landau distribution. + The relevant inequalities and distributions are $ 0.01 < \kappa < 10 + $, + Vavilov distribution, and $\kappa < 0.01 $, Landau distribution. \end{enumerate} \section{Various Mathematical Examples} If $n > 2$, the identity \[ - t[u_1,\dots,u_n] = t\bigl[t[u_1,\dots,u_{n_1}], t[u_2,\dots,u_n] - \bigr] + t[u_1,\dots,u_n] = t\bigl[t[u_1,\dots,u_{n_1}], t[u_2,\dots,u_n] + \bigr] \] defines $t[u_1,\dots,u_n]$ recursively, and it can be shown that the alternative definition \[ - t[u_1,\dots,u_n] = t\bigl[t[u_1,u_2],\dots,t[u_{n-1},u_n]\bigr] + t[u_1,\dots,u_n] = t\bigl[t[u_1,u_2],\dots,t[u_{n-1},u_n]\bigr] \] -gives the same result. +gives the same result. %***************************************** %***************************************** diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex index 23cd65247ac..586f763f68d 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex @@ -20,27 +20,27 @@ vidit exerci appetere ad, ut vel zzril intellegam interpretaris. %qui. Vis ea melius nostrum, mel alienum euripidis eu. \section{Appendix Section Test} -Test: \autoref{tab:moreexample} (This reference should have a -lowercase, small caps \spacedlowsmallcaps{A} if the option +Test: \autoref{tab:moreexample} (This reference should have a +lowercase, small caps \spacedlowsmallcaps{A} if the option \texttt{floatperchapter} is activated, just as in the table itself $\rightarrow$ however, this does not work at the moment.) \begin{table}[h] \myfloatalign - \begin{tabularx}{\textwidth}{Xll} \toprule - \tableheadline{labitur bonorum pri no} & \tableheadline{que vista} - & \tableheadline{human} \\ \midrule - fastidii ea ius & germano & demonstratea \\ - suscipit instructior & titulo & personas \\ - %postulant quo & westeuropee & sanctificatec \\ - \midrule - quaestio philosophia & facto & demonstrated \\ - %autem vulputate ex & parola & romanic \\ - %usu mucius iisque & studio & sanctificatef \\ - \bottomrule - \end{tabularx} - \caption[Autem usu id]{Autem usu id.} - \label{tab:moreexample} + \begin{tabularx}{\textwidth}{Xll} \toprule + \tableheadline{labitur bonorum pri no} & \tableheadline{que vista} + & \tableheadline{human} \\ \midrule + fastidii ea ius & germano & demonstratea \\ + suscipit instructior & titulo & personas \\ + %postulant quo & westeuropee & sanctificatec \\ + \midrule + quaestio philosophia & facto & demonstrated \\ + %autem vulputate ex & parola & romanic \\ + %usu mucius iisque & studio & sanctificatef \\ + \bottomrule + \end{tabularx} + \caption[Autem usu id]{Autem usu id.} + \label{tab:moreexample} \end{table} %Nulla fastidii ea ius, exerci suscipit instructior te nam, in ullum diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf Binary files differindex 04f97c15db0..67c2c03b997 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 bf6b3087314..3437adbd174 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex @@ -2,11 +2,11 @@ % A Classic Thesis Style % An Homage to The Elements of Typographic Style % -% Copyright (C) 2015 André Miede http://www.miede.de +% Copyright (C) 2017 André Miede and Ivo Pletikosić % -% 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 -% postcards I received so far is available online at +% 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 +% postcards I received so far is available online at % http://postcards.miede.de % % License: @@ -25,8 +25,13 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % +% PLEASE SEE ALSO THE AUTHORS' NOTE REGARDING THIS LICENSE +% IN THE DOCUMENTATION (ClassicThesis.pdf --> Chapter 1 / Chapter01.tex) % ************************************************************************************************************** -\RequirePackage{fix-cm} % fix some latex issues see: http://texdoc.net/texmf-dist/doc/latex/base/fixltx2e.pdf +\RequirePackage{silence} % :-\ + \WarningFilter{scrreprt}{Usage of package `titlesec'} + %\WarningFilter{scrreprt}{Activating an ugly workaround} + \WarningFilter{titlesec}{Non standard sectioning command detected} \documentclass[ twoside,openright,titlepage,numbers=noenddot,headinclude,%1headlines,% letterpaper a4paper footinclude=true,cleardoublepage=empty,abstractoff, % <--- obsolete, remove (todo) BCOR=5mm,paper=a4,fontsize=11pt,%11pt,a4paper,% @@ -71,25 +76,26 @@ \cleardoublepage\include{FrontBackmatter/Abstract} \cleardoublepage\include{FrontBackmatter/Publications} \cleardoublepage\include{FrontBackmatter/Acknowledgments} -\pagestyle{scrheadings} \cleardoublepage\include{FrontBackmatter/Contents} %******************************************************************** % Mainmatter %******************************************************* -\cleardoublepage\pagenumbering{arabic} +\cleardoublepage +\pagestyle{scrheadings} +\pagenumbering{arabic} %\setcounter{page}{90} % use \cleardoublepage here to avoid problems with pdfbookmark \cleardoublepage -\part{Some Kind of Manual} +\part{Some Kind of Manual}\label{pt:manual} \include{Chapters/Chapter01} \cleardoublepage -\ctparttext{You can put some informational part preamble text here. +\ctparttext{You can put some informational part preamble text here. Illo principalmente su nos. Non message \emph{occidental} angloromanic da. Debitas effortio simplificate sia se, auxiliar summarios da que, se avantiate publicationes via. Pan in terra summarios, capital interlingua se que. Al via multo esser specimen, campo responder que da. Le usate medical addresses pro, europa origine sanctificate nos se.} -\part{The Showcase} +\part{The Showcase}\label{pt:showcase} \include{Chapters/Chapter02} %\addtocontents{toc}{\protect\clearpage} % <--- just debug stuff, ignore \include{Chapters/Chapter03} diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps index 67a5f0149ed..49ad2e0ac9d 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps @@ -10,15 +10,15 @@ MinPos.y=-1 MaxPos.x=-1 MaxPos.y=-1 NormalPos.left=4 -NormalPos.top=32 -NormalPos.right=1916 -NormalPos.bottom=630 +NormalPos.top=26 +NormalPos.right=1562 +NormalPos.bottom=539 Class=LaTeXView -Document=classicthesis-config.tex +Document=Chapters\Chapter02.tex [Frame0_View0,0] -TopLine=0 -Cursor=583 +TopLine=21 +Cursor=2195 [Frame1] Flags=0 @@ -28,15 +28,15 @@ MinPos.y=-1 MaxPos.x=-1 MaxPos.y=-1 NormalPos.left=4 -NormalPos.top=32 -NormalPos.right=1916 -NormalPos.bottom=630 +NormalPos.top=26 +NormalPos.right=1562 +NormalPos.bottom=539 Class=LaTeXView -Document=ClassicThesis.tex +Document=CHANGES [Frame1_View0,0] -TopLine=18 -Cursor=1765 +TopLine=0 +Cursor=215 [Frame2] Flags=0 @@ -46,15 +46,15 @@ MinPos.y=-1 MaxPos.x=-1 MaxPos.y=-1 NormalPos.left=4 -NormalPos.top=32 -NormalPos.right=1916 -NormalPos.bottom=630 +NormalPos.top=26 +NormalPos.right=1562 +NormalPos.bottom=539 Class=LaTeXView -Document=Chapters\Chapter01.tex +Document=classicthesis-config.tex [Frame2_View0,0] -TopLine=51 -Cursor=3243 +TopLine=36 +Cursor=3581 [Frame3] Flags=0 @@ -64,15 +64,15 @@ MinPos.y=-1 MaxPos.x=-1 MaxPos.y=-1 NormalPos.left=4 -NormalPos.top=32 -NormalPos.right=1916 -NormalPos.bottom=630 +NormalPos.top=26 +NormalPos.right=1562 +NormalPos.bottom=539 Class=LaTeXView -Document=Chapters\Chapter0A.tex +Document=ClassicThesis.tex [Frame3_View0,0] -TopLine=42 -Cursor=2800 +TopLine=47 +Cursor=2542 [Frame4] Flags=0 @@ -82,17 +82,71 @@ MinPos.y=-1 MaxPos.x=-1 MaxPos.y=-1 NormalPos.left=4 -NormalPos.top=32 -NormalPos.right=1916 -NormalPos.bottom=630 +NormalPos.top=26 +NormalPos.right=1562 +NormalPos.bottom=539 Class=LaTeXView -Document=Chapters\Chapter02.tex +Document=Chapters\Chapter01.tex [Frame4_View0,0] -TopLine=11 -Cursor=920 +TopLine=0 +Cursor=0 + +[Frame5] +Flags=0 +ShowCmd=1 +MinPos.x=-1 +MinPos.y=-1 +MaxPos.x=-1 +MaxPos.y=-1 +NormalPos.left=4 +NormalPos.top=26 +NormalPos.right=1562 +NormalPos.bottom=539 +Class=LaTeXView +Document=Chapters\Chapter0A.tex + +[Frame5_View0,0] +TopLine=0 +Cursor=0 + +[Frame6] +Flags=0 +ShowCmd=1 +MinPos.x=-1 +MinPos.y=-1 +MaxPos.x=-1 +MaxPos.y=-1 +NormalPos.left=4 +NormalPos.top=26 +NormalPos.right=1562 +NormalPos.bottom=539 +Class=LaTeXView +Document=classicthesis.sty + +[Frame6_View0,0] +TopLine=12 +Cursor=1132 + +[Frame7] +Flags=0 +ShowCmd=1 +MinPos.x=-1 +MinPos.y=-1 +MaxPos.x=-1 +MaxPos.y=-1 +NormalPos.left=4 +NormalPos.top=26 +NormalPos.right=1562 +NormalPos.bottom=539 +Class=LaTeXView +Document=FrontBackmatter\Bibliography.tex + +[Frame7_View0,0] +TopLine=0 +Cursor=591 [SessionInfo] -FrameCount=5 -ActiveFrame=1 +FrameCount=8 +ActiveFrame=6 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 aba82e818de..d5304bdd481 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 3af881d8a01..97c8d8f911e 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex @@ -2,35 +2,35 @@ \documentclass[10pt,a4paper]{article} % KOMA-Script article scrartcl \usepackage{lipsum} \usepackage{url} -\usepackage[nochapters]{../classicthesis} % nochapters +\usepackage[nochapters]{classicthesis} % nochapters \begin{document} \pagestyle{plain} \title{\rmfamily\normalfont\spacedallcaps{the title}} \author{\spacedlowsmallcaps{tyler durden}} \date{} % no date - + \maketitle - + \begin{abstract} \noindent\lipsum[1] Just a test.\footnote{This is a footnote.} \end{abstract} - + \tableofcontents - + \section{A Section} \finalVersionString \lipsum[1] \subsection{A Subsection} \lipsum[1] \subsection{A Subsection} - + \section{A Section} \lipsum[1] - + % bib stuff \nocite{*} \addtocontents{toc}{\protect\vspace{\beforebibskip}} - \addcontentsline{toc}{section}{\refname} + \addcontentsline{toc}{section}{\refname} \bibliographystyle{plain} \bibliography{../Bibliography} -\end{document}
\ No newline at end of file +\end{document} diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.tex index 2d6ec9e5f62..705ac182c5b 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.tex @@ -1,9 +1,12 @@ % book example for classicthesis.sty +\RequirePackage{silence} % :-\ + \WarningFilter{scrbook}{Usage of package `titlesec'} + \WarningFilter{titlesec}{Non standard sectioning command detected} \documentclass[11pt,a5paper,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book -\usepackage[T1]{fontenc} +\usepackage[T1]{fontenc} \usepackage{lipsum} %\usepackage{hyperref} -\usepackage[parts]{../classicthesis} % ,manychapters +\usepackage[parts]{classicthesis} % ,manychapters %\usepackage[osf]{libertine} %\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false} @@ -11,8 +14,8 @@ % \pagestyle{scrheadings} % \manualmark % \markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} - - \tableofcontents + + \tableofcontents % \automark[section]{chapter} % \renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}} @@ -22,13 +25,13 @@ \cleardoublepage\part{Test Part} \chapter{Test Chapter} \lipsum[1] - + \section{A Section} \lipsum[1] - + \chapter{Test Chapter} \lipsum[1] - + \section{A Section} \lipsum[1] @@ -38,8 +41,8 @@ \cleardoublepage\part{Appendix} \chapter{Appendix Chapter} \lipsum[1] - + \section{A Section} \lipsum[1] -\end{document}
\ No newline at end of file +\end{document} 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 7d9f82d57b9..b464cce6a70 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 74aeb30052d..f68e8607577 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex @@ -1,35 +1,44 @@ % book example for classicthesis.sty +\RequirePackage{silence} % :-\ + \WarningFilter{scrbook}{Usage of package `titlesec'} + \WarningFilter{titlesec}{Non standard sectioning command detected} \documentclass[11pt,paper=a5,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book -\usepackage[T1]{fontenc} +\usepackage[T1]{fontenc} \usepackage{lipsum} -\usepackage[linedheaders,parts,a5paper]{../classicthesis} % ,manychapters +\usepackage[ linedheaders=true,% + parts=true]{../classicthesis} % ,manychapters %\usepackage[osf]{libertine} +\usepackage{hyperref} + \begin{document} % \pagestyle{scrheadings} % \manualmark % \markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} - - \tableofcontents + + \tableofcontents % \automark[section]{chapter} % \renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}} % \renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}} % use \cleardoublepage here to avoid problems with pdfbookmark - \cleardoublepage\part{Test Part} + \cleardoublepage\part{Test Part}\label{part:testpart} \chapter{Some Math Testing} + We discuss in Part~\ref{part:testpart} the test results. + + We discuss in Part~\textsc{\ref{part:testpart}} the test results. \lipsum[1] - - \chapter{Test Chapter} + + \chapter{Test Chapter ABC} \lipsum[1] \section{A Section} \lipsum[1] - - \chapter{Test Chapter} + + \chapter{Test Chapter DEF} \lipsum[1] - + \section{A Section} \lipsum[1] @@ -39,8 +48,8 @@ \cleardoublepage\part{Appendix} \chapter{Appendix Chapter} \lipsum[1] - + \section{A Section} \lipsum[1] -\end{document}
\ No newline at end of file +\end{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 Binary files differindex c382cfe8bef..628345dce5a 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/Examples/classicthesis-cv.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex index 916b72f01fb..8bde90ea8ab 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex @@ -1,9 +1,12 @@ % cv example for classicthesis.sty +\RequirePackage{silence} % :-\ + \WarningFilter{scrartcl}{Usage of package `titlesec'} + \WarningFilter{titlesec}{Non standard sectioning command detected} \documentclass[10pt,a4paper]{scrartcl} \usepackage[LabelsAligned]{currvita} % nice cv style \usepackage{url} \usepackage[ngerman]{babel} -\usepackage[nochapters]{../classicthesis} +\usepackage[nochapters]{classicthesis} \renewcommand*{\cvheadingfont}{\LARGE\color{Maroon}} \renewcommand*{\cvlistheadingfont}{\large} @@ -15,16 +18,16 @@ %\pdfbookmark[1]{Pers\"onliche Daten}{PersDat} \begin{cvlist}{\spacedlowsmallcaps{Pers\"onliche Daten}}\label{PersDat} % should be fixed one day \item Andr\'e Miede - \item Geboren am \dots\ \texttt{(-;} \\ - Europ\"aer, Deutsche Staatsb\"urgerschaft - \item \url{http://www.miede.de} \\ - \url{https://www.xing.com/profile/Andre_Miede} + \item Geboren am \dots\ \texttt{(-;} \\ + Europ\"aer, Deutsche Staatsb\"urgerschaft + \item \url{http://www.miede.de} \\ + \url{https://www.xing.com/profile/Andre_Miede} \end{cvlist} - + \clearpage %\pdfbookmark[1]{Irgendwas}{irgendwas} \begin{cvlist}{\spacedlowsmallcaps{Irgendwas}}\label{irgendwas} - \item \dots + \item \dots \end{cvlist} \end{cv} -\end{document}
\ No newline at end of file +\end{document} diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex index bb483ee22b3..d6fc0bc3f75 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex @@ -9,8 +9,8 @@ \let\cleardoublepage\relax \chapter*{Abstract} -Short summary of the contents in English\dots a great guide by -Kent Beck how to write good abstracts can be found here: +Short summary of the contents in English\dots a great guide by +Kent Beck how to write good abstracts can be found here: \begin{center} \url{https://plg.uwaterloo.ca/~migod/research/beckOOPSLA.html} \end{center} @@ -20,9 +20,9 @@ Kent Beck how to write good abstracts can be found here: \begin{otherlanguage}{ngerman} \pdfbookmark[1]{Zusammenfassung}{Zusammenfassung} \chapter*{Zusammenfassung} -Kurze Zusammenfassung des Inhaltes in deutscher Sprache\dots +Kurze Zusammenfassung des Inhaltes in deutscher Sprache\dots \end{otherlanguage} -\endgroup +\endgroup -\vfill
\ No newline at end of file +\vfill diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex index 51343f0dc2f..11323406e66 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex @@ -3,9 +3,9 @@ %******************************************************* \pdfbookmark[1]{Acknowledgments}{acknowledgments} -\begin{flushright}{\slshape - We have seen that computer programming is an art, \\ - because it applies accumulated knowledge to the world, \\ +\begin{flushright}{\slshape + We have seen that computer programming is an art, \\ + because it applies accumulated knowledge to the world, \\ because it requires skill and ingenuity, and especially \\ because it produces objects of beauty.} \\ \medskip --- \defcitealias{knuth:1974}{Donald E. Knuth}\citetalias{knuth:1974} \citep{knuth:1974} @@ -30,16 +30,17 @@ 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, Hinrich Harms, - Roland Winkler, Jörg Weber, Henri Menke, Claus Lahiri, - Clemens Niederberger, Stefano Bragaglia, Jörn Hees, - and the whole \LaTeX-community for support, ideas and - some great software. +Roland Winkler, Jörg Weber, Henri Menke, Claus Lahiri, +Clemens Niederberger, Stefano Bragaglia, Jörn Hees, +Scott Lowe, Dave Howcroft, +and the whole \LaTeX-community for support, ideas and +some great software. \bigskip -\noindent\emph{Regarding \mLyX}: The \mLyX\ port was intially done by -\emph{Nicholas Mariette} in March 2009 and continued by -\emph{Ivo Pletikosi\'c} in 2011. Thank you very much for your +\noindent\emph{Regarding \mLyX}: The \mLyX\ port was intially done by +\emph{Nicholas Mariette} in March 2009 and continued by +\emph{Ivo Pletikosi\'c} in 2011. Thank you very much for your work and for the contributions to the original style. diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex index 13e34864a42..21bc38884cd 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex @@ -2,11 +2,25 @@ % Bibliography %******************************************************* % work-around to have small caps also here in the headline -\manualmark -\markboth{\spacedlowsmallcaps{\bibname}}{\spacedlowsmallcaps{\bibname}} % work-around to have small caps also -%\phantomsection -\refstepcounter{dummy} -\addtocontents{toc}{\protect\vspace{\beforebibskip}} % to have the bib a bit from the rest in the toc -\addcontentsline{toc}{chapter}{\tocEntry{\bibname}} -\label{app:bibliography} -\printbibliography +% https://tex.stackexchange.com/questions/188126/wrong-header-in-bibliography-classicthesis +% Thanks to Enrico Gregorio +\defbibheading{bibintoc}[\bibname]{% + \phantomsection + \manualmark + \markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}% + \addtocontents{toc}{\protect\vspace{\beforebibskip}}% + \addcontentsline{toc}{chapter}{\tocEntry{#1}}% + \chapter*{#1}% +} +\printbibliography[heading=bibintoc] + +% Old version, will be removed later +% work-around to have small caps also here in the headline +%\manualmark +%\markboth{\spacedlowsmallcaps{\bibname}}{\spacedlowsmallcaps{\bibname}} % work-around to have small caps also +%\phantomsection +%\refstepcounter{dummy} +%\addtocontents{toc}{\protect\vspace{\beforebibskip}} % to have the bib a bit from the rest in the toc +%\addcontentsline{toc}{chapter}{\tocEntry{\bibname}} +%\label{app:bibliography} +%\printbibliography diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex index c063b53c998..94876042bd3 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex @@ -7,24 +7,25 @@ \pdfbookmark[0]{Colophon}{colophon} \section*{Colophon} -This document was typeset using the typographical look-and-feel \texttt{classicthesis} developed by Andr\'e Miede. -The style was inspired by Robert Bringhurst's seminal book on typography ``\emph{The Elements of Typographic Style}''. -\texttt{classicthesis} is available for both \LaTeX\ and \mLyX: +This document was typeset using the typographical look-and-feel \texttt{classicthesis} developed by Andr\'e Miede and Ivo Pletikosić. +The style was inspired by Robert Bringhurst's seminal book on typography ``\emph{The Elements of Typographic Style}''. +\texttt{classicthesis} is available for both \LaTeX\ and \mLyX: \begin{center} \url{https://bitbucket.org/amiede/classicthesis/} \end{center} -Happy users of \texttt{classicthesis} usually send a real postcard to the author, a collection of postcards received so far is featured here: +Happy users of \texttt{classicthesis} usually send a real postcard to the author, a collection of postcards received so far is featured here: \begin{center} \url{http://postcards.miede.de/} \end{center} - +Thank you very much for your feedback and contribution. + \bigskip \noindent\finalVersionString %Hermann Zapf's \emph{Palatino} and \emph{Euler} type faces (Type~1 PostScript fonts \emph{URW -%Palladio L} and \emph{FPL}) are used. The ``typewriter'' text is typeset in \emph{Bera Mono}, -%originally developed by Bitstream, Inc. as ``Bitstream Vera''. (Type~1 PostScript fonts were made +%Palladio L} and \emph{FPL}) are used. The ``typewriter'' text is typeset in \emph{Bera Mono}, +%originally developed by Bitstream, Inc. as ``Bitstream Vera''. (Type~1 PostScript fonts were made %available by Malte Rosenau and %Ulrich Dirr.) @@ -47,12 +48,8 @@ Happy users of \texttt{classicthesis} usually send a real postcard to the author % \settowidth{\abcd}{abcdefghijklmnopqrstuvwxyz} % \the\abcd\ % prints the value of the length %\end{verbatim} -%Please see the file \texttt{classicthesis.sty} for some precalculated +%Please see the file \texttt{classicthesis.sty} for some precalculated %values for Palatino and Minion. % % \settowidth{\abcd}{abcdefghijklmnopqrstuvwxyz} % \the\abcd\ % prints the value of the length - - - - diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex index 091d8519ffd..adb3af0038f 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex @@ -1,6 +1,7 @@ %******************************************************* % Table of Contents %******************************************************* +\pagestyle{scrheadings} %\phantomsection \refstepcounter{dummy} \pdfbookmark[1]{\contentsname}{tableofcontents} @@ -8,7 +9,7 @@ \setcounter{secnumdepth}{3} % <-- 3 numbers up to subsubsections \manualmark \markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} -\tableofcontents +\tableofcontents \automark[section]{chapter} \renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}} \renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}} @@ -16,15 +17,14 @@ % List of Figures and of the Tables %******************************************************* \clearpage - -\begingroup +% \pagestyle{empty} % Uncomment this line if your lists should not have any headlines with section name and page number +\begingroup \let\clearpage\relax \let\cleardoublepage\relax - \let\cleardoublepage\relax %******************************************************* % List of Figures - %******************************************************* - %\phantomsection + %******************************************************* + %\phantomsection \refstepcounter{dummy} %\addcontentsline{toc}{chapter}{\listfigurename} \pdfbookmark[1]{\listfigurename}{lof} @@ -35,30 +35,30 @@ %******************************************************* % List of Tables %******************************************************* - %\phantomsection + %\phantomsection \refstepcounter{dummy} %\addcontentsline{toc}{chapter}{\listtablename} \pdfbookmark[1]{\listtablename}{lot} \listoftables - + \vspace{8ex} -% \newpage - + % \newpage + %******************************************************* % List of Listings - %******************************************************* - %\phantomsection + %******************************************************* + %\phantomsection \refstepcounter{dummy} %\addcontentsline{toc}{chapter}{\lstlistlistingname} \pdfbookmark[1]{\lstlistlistingname}{lol} - \lstlistoflistings + \lstlistoflistings \vspace{8ex} - + %******************************************************* % Acronyms %******************************************************* - %\phantomsection + %\phantomsection \refstepcounter{dummy} \pdfbookmark[1]{Acronyms}{acronyms} \markboth{\spacedlowsmallcaps{Acronyms}}{\spacedlowsmallcaps{Acronyms}} @@ -67,5 +67,6 @@ \acro{DRY}{Don't Repeat Yourself} \acro{API}{Application Programming Interface} \acro{UML}{Unified Modeling Language} - \end{acronym} + \end{acronym} + \endgroup diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Declaration.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Declaration.tex index 6661e881609..a384655514b 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Declaration.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Declaration.tex @@ -7,7 +7,7 @@ \thispagestyle{empty} Put your declaration here. \bigskip - + \noindent\textit{\myLocation, \myTime} \smallskip diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex index c9a94fbb19b..d2ce602820f 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex @@ -2,7 +2,7 @@ % Dedication %******************************************************* \thispagestyle{empty} -%\phantomsection +%\phantomsection \refstepcounter{dummy} \pdfbookmark[1]{Dedication}{Dedication} @@ -11,7 +11,7 @@ \begin{center} \emph{Ohana} means family. \\ Family means nobody gets left behind, or forgotten. \\ \medskip - --- Lilo \& Stitch + --- Lilo \& Stitch \end{center} \medskip @@ -19,4 +19,4 @@ \begin{center} Dedicated to the loving memory of Rudolf Miede. \\ \smallskip 1939\,--\,2005 -\end{center}
\ No newline at end of file +\end{center} diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex index 1c9673e2077..f24a1acbd2f 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex @@ -5,9 +5,9 @@ %\pdfbookmark[1]{Titel}{title} %******************************************************* \begin{center} - \spacedlowsmallcaps{\myName} \\ \medskip + \spacedlowsmallcaps{\myName} \\ \medskip \begingroup \color{Maroon}\spacedallcaps{\myTitle} \endgroup -\end{center} +\end{center} diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publications.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publications.tex index 998e4ce9e42..0e90baf4fb4 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publications.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publications.tex @@ -13,4 +13,4 @@ This might come in handy for PhD theses: some ideas and figures have appeared pr \printbibliography[heading=none] \end{refsection} -\emph{Attention}: This requires a separate run of \texttt{bibtex} for your \texttt{refsection}, \eg, \texttt{ClassicThesis1-blx} for this file. You might also use \texttt{biber} as the backend for \texttt{biblatex}. See also \url{http://tex.stackexchange.com/questions/128196/problem-with-refsection}.
\ No newline at end of file +\emph{Attention}: This requires a separate run of \texttt{bibtex} for your \texttt{refsection}, \eg, \texttt{ClassicThesis1-blx} for this file. You might also use \texttt{biber} as the backend for \texttt{biblatex}. See also \url{http://tex.stackexchange.com/questions/128196/problem-with-refsection}. diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titleback.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titleback.tex index 9a1ac6945c1..e962a728aea 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titleback.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titleback.tex @@ -4,14 +4,14 @@ \vfill -\noindent\myName: \textit{\myTitle,} \mySubtitle, %\myDegree, +\noindent\myName: \textit{\myTitle,} \mySubtitle, %\myDegree, \textcopyright\ \myTime %\bigskip % %\noindent\spacedlowsmallcaps{Supervisors}: \\ %\myProf \\ -%\myOtherProf \\ +%\myOtherProf \\ %\mySupervisor % %\medskip diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex index 47dd9a7ebf3..1b734c7e350 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex @@ -5,7 +5,7 @@ % 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 + \large \hfill @@ -21,16 +21,16 @@ \includegraphics[width=6cm]{gfx/TFZsuperellipse_bw} \\ \medskip - \mySubtitle \\ \medskip + \mySubtitle \\ \medskip %\myDegree \\ - %\myDepartment \\ + %\myDepartment \\ %\myFaculty \\ %\myUni \\ \bigskip \myTime\ -- \myVersion - \vfill + \vfill - \end{center} - \end{addmargin} -\end{titlepage}
\ No newline at end of file + \end{center} + \end{addmargin} +\end{titlepage} diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES index aaeb4f5ea8e..ac77cd51224 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES +++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES @@ -1,71 +1,90 @@ LIST OF FILES FOR ClassicThesis.tex *File List* - fix-cm.sty 2015/01/14 v1.1t fixes to LaTeX - ts1enc.def 2001/06/05 v3.0e (jk/car/fm) Standard LaTeX file -scrreprt.cls 2015/07/02 v3.18 KOMA-Script document class (report) -scrkbase.sty 2015/07/02 v3.18 KOMA-Script package (KOMA-Script-dependent basics and keyval usage) - scrbase.sty 2015/07/02 v3.18 KOMA-Script package (KOMA-Script-independent basics and keyval usage) + silence.sty 2012/07/02 v1.5b Selective filtering of warnings and error mess +ages +scrreprt.cls 2017/09/07 v3.24 KOMA-Script document class (report) +scrkbase.sty 2017/09/07 v3.24 KOMA-Script package (KOMA-Script-dependent bas +ics and keyval usage) + scrbase.sty 2017/09/07 v3.24 KOMA-Script package (KOMA-Script-independent b +asics and keyval usage) keyval.sty 2014/10/28 v1.15 key=value parser (DPC) -scrlfile.sty 2015/07/02 v3.18 KOMA-Script package (loading files) -tocbasic.sty 2015/07/02 v3.18 KOMA-Script package (handling toc-files) -scrsize11pt.clo 2015/07/02 v3.18 KOMA-Script font size class option (11pt) -typearea.sty 2015/07/02 v3.18 KOMA-Script package (type area) +scrlfile.sty 2017/09/07 v3.24 KOMA-Script package (loading files) +tocbasic.sty 2017/09/07 v3.24 KOMA-Script package (handling toc-files) +scrsize11pt.clo 2017/09/07 v3.24 KOMA-Script font size class option (11pt) +typearea.sty 2017/09/07 v3.24 KOMA-Script package (type area) classicthesis-config.tex inputenc.sty 2015/03/17 v1.2c Input encoding file - utf8.def 2015/06/27 v1.1n UTF-8 support for inputenc - t1enc.dfu 2015/06/27 v1.1n UTF-8 support for inputenc - ot1enc.dfu 2015/06/27 v1.1n UTF-8 support for inputenc - omsenc.dfu 2015/06/27 v1.1n UTF-8 support for inputenc - ts1enc.dfu 2015/06/27 v1.1n UTF-8 support for inputenc - babel.sty 2015/08/03 3.9m The Babel package - bblopts.cfg 2006/07/31 v1.0 MiKTeX 'babel' configuration - ngerman.ldf 2013/12/13 v2.7 German support for babel (new orthography) - english.ldf 2012/08/20 v3.3p English support from the babel system -csquotes.sty 2015/07/18 v5.1f context-sensitive quotations (JAW) -etoolbox.sty 2015/08/02 v2.2a e-TeX tools for LaTeX (JAW) -csquotes.def 2015/07/18 v5.1f csquotes generic definitions (JAW) + utf8.def 2017/01/28 v1.1t UTF-8 support for inputenc + t1enc.dfu 2017/01/28 v1.1t UTF-8 support for inputenc + ot1enc.dfu 2017/01/28 v1.1t UTF-8 support for inputenc + omsenc.dfu 2017/01/28 v1.1t UTF-8 support for inputenc + babel.sty 2017/10/04 3.14 The Babel package + bblopts.cfg 2005/09/08 v0.1 add Arabic and Farsi to "declared" options of b +abel + ngerman.ldf 2016/11/02 v2.9 German support for babel (new orthography) +american.ldf 2017/06/06 v3.3r English support from the babel system +csquotes.sty 2017/03/11 v5.2b context-sensitive quotations (JAW) +etoolbox.sty 2017/01/02 v2.4 e-TeX tools for LaTeX (JAW) +csquotes.def 2017/03/11 v5.2b csquotes generic definitions (JAW) csquotes.cfg -biblatex.sty 2013/01/10 v2.5 programmable bibliographies (PK/JW/AB) -biblatex1.sty 2013/01/10 v2.5 programmable bibliographies (bibtex) (PK/JW/AB) +biblatex.sty 2016/12/05 v3.7 programmable bibliographies (PK/JW/AB) +pdftexcmds.sty 2017/03/19 v0.25 Utility functions of pdfTeX for LuaTeX (HO) +infwarerr.sty 2016/05/16 v1.4 Providing info/warning/error messages (HO) +ifluatex.sty 2016/05/16 v1.4 Provides the ifluatex switch (HO) + ltxcmds.sty 2016/05/16 v1.23 LaTeX kernel commands for general use (HO) + ifpdf.sty 2017/03/15 v3.2 Provides the ifpdf switch +kvoptions.sty 2016/05/16 v3.12 Key value format for package options (HO) +kvsetkeys.sty 2016/05/16 v1.17 Key value parser (HO) +etexcmds.sty 2016/05/16 v1.6 Avoid name clashes with e-TeX commands (HO) logreq.sty 2010/08/04 v1.0 xml request logger logreq.def 2010/08/04 v1.0 logreq spec v1.0 ifthen.sty 2014/09/29 v1.1c Standard LaTeX ifthen package (DPC) url.sty 2013/09/16 ver 3.4 Verb mode for urls, etc. -blx-compat.def 2013/01/10 v2.5 biblatex compatibility (PK/JW/AB) -biblatex.def -blx-natbib.def 2013/01/10 v2.5 biblatex compatibility (PK/JW/AB) -standard.bbx 2013/01/10 v2.5 biblatex bibliography style (PK/JW/AB) - numeric.bbx 2013/01/10 v2.5 biblatex bibliography style (PK/JW/AB) -numeric-comp.bbx 2013/01/10 v2.5 biblatex bibliography style (PK/JW/AB) -numeric-comp.cbx 2013/01/10 v2.5 biblatex citation style (PK/JW/AB) + xstring.sty 2013/10/13 v1.7c String manipulations (C Tellechea) + blx-dm.def +numeric-comp.dbx +biblatex-dm.cfg +blx-compat.def 2016/12/05 v3.7 biblatex compatibility (PK/JW/AB) +blx-bibtex.def 2016/12/05 v3.7 biblatex compatibility (PK/JW/AB) +biblatex.def 2016/12/05 v3.7 biblatex compatibility (PK/JW/AB) +blx-natbib.def 2016/12/05 v3.7 biblatex compatibility (PK/JW/AB) +standard.bbx 2016/12/05 v3.7 biblatex bibliography style (PK/JW/AB) + numeric.bbx 2016/12/05 v3.7 biblatex bibliography style (PK/JW/AB) +numeric-comp.bbx 2016/12/05 v3.7 biblatex bibliography style (PK/JW/AB) +numeric-comp.cbx 2016/12/05 v3.7 biblatex citation style (PK/JW/AB) biblatex.cfg - amsmath.sty 2013/01/14 v2.14 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 + amsmath.sty 2017/09/02 v2.17a AMS math features + amstext.sty 2000/06/29 v2.01 AMS text + amsgen.sty 1999/11/30 v2.0 generic functions + amsbsy.sty 1999/11/29 v1.2d Bold Symbols + amsopn.sty 2016/03/08 v2.02 operator names fontenc.sty - t1enc.def 2005/09/27 v1.99g Standard LaTeX file -textcomp.sty 2005/09/27 v1.99g Standard LaTeX package + t1enc.def 2017/04/05 v2.0i Standard LaTeX file +textcomp.sty 2017/04/05 v2.0i Standard LaTeX package ts1enc.def 2001/06/05 v3.0e (jk/car/fm) Standard LaTeX file - scrhack.sty 2015/07/02 v3.18 KOMA-Script package + ts1enc.dfu 2017/01/28 v1.1t UTF-8 support for inputenc + scrhack.sty 2017/09/07 v3.24 KOMA-Script package + xpatch.sty 2012/10/02 v0.3 Extending etoolbox patching commands + expl3.sty 2017/09/18 L3 programming layer (loader) +expl3-code.tex 2017/09/18 L3 programming layer +l3pdfmode.def 2017/03/18 v L3 Experimental driver: PDF mode + xparse.sty 2017/09/18 L3 Experimental document command parser xspace.sty 2014/10/28 v1.13 Space after command names (DPC,MH) mparhack.sty 2005/04/17 v1.4 (T. Sgouros and S. Ulrich) -fixltx2e.sty 2015/06/22 v2.0b fixes to LaTeX (obsolete) acronym.sty 2015/03/21 v1.41 Support for acronyms (Tobias Oetiker) suffix.sty 2006/07/15 1.5a Variant command support - xstring.sty 2013/10/13 v1.7c String manipulations (C Tellechea) relsize.sty 2003/07/04 ver 3.1 -tabularx.sty 2014/10/28 v2.10 `tabularx' package (DPC) - array.sty 2014/10/28 v2.4c Tabular extension package (FMi) - caption.sty 2013/05/02 v3.3-89 Customizing captions (AR) -caption3.sty 2013/05/02 v1.6-88 caption3 kernel (AR) +tabularx.sty 2016/02/03 v2.11 `tabularx' package (DPC) + array.sty 2016/10/06 v2.4d Tabular extension package (FMi) + caption.sty 2016/02/21 v3.3-144 Customizing captions (AR) +caption3.sty 2016/05/22 v1.7-166 caption3 kernel (AR) subfig.sty 2005/06/28 ver: 1.3 subfig package listings.sty 2015/06/04 1.6 (Carsten Heinz) lstmisc.sty 2015/06/04 1.6 (Carsten Heinz) listings.cfg 2015/06/04 1.6 listings configuration -listings.hak 2015/07/02 v3.18 KOMA-Script package (hacking package listings) +listings.hak 2017/09/07 v3.24 KOMA-Script package (hacking package listings) + lstlang1.sty 2015/06/04 1.6 listings language file lstlang2.sty 2015/06/04 1.6 listings language file lstlang3.sty 2015/06/04 1.6 listings language file @@ -76,77 +95,80 @@ lstlang1.sty 2015/06/04 1.6 listings language file lstlang2.sty 2015/06/04 1.6 listings language file lstlang3.sty 2015/06/04 1.6 listings language file lstmisc.sty 2015/06/04 1.6 (Carsten Heinz) -hyperref.sty 2012/11/06 v6.83m Hypertext links for LaTeX -hobsub-hyperref.sty 2012/04/25 v1.12 Bundle oberdiek, subset hyperref (HO) -hobsub-generic.sty 2012/04/25 v1.12 Bundle oberdiek, subset generic (HO) - hobsub.sty 2012/04/25 v1.12 Construct package bundles (HO) -infwarerr.sty 2010/04/08 v1.3 Providing info/warning/error messages (HO) - ltxcmds.sty 2011/11/09 v1.22 LaTeX kernel commands for general use (HO) -ifluatex.sty 2010/03/01 v1.3 Provides the ifluatex switch (HO) - ifvtex.sty 2010/03/01 v1.5 Detect VTeX and its facilities (HO) - intcalc.sty 2007/09/27 v1.1 Expandable calculations with integers (HO) - ifpdf.sty 2011/01/30 v2.3 Provides the ifpdf switch (HO) -etexcmds.sty 2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO) -kvsetkeys.sty 2012/04/25 v1.16 Key value parser (HO) -kvdefinekeys.sty 2011/04/07 v1.3 Define keys (HO) -pdftexcmds.sty 2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO) -pdfescape.sty 2011/11/25 v1.13 Implements pdfTeX's escape features (HO) -bigintcalc.sty 2012/04/08 v1.3 Expandable calculations on big integers (HO) - bitset.sty 2011/01/30 v1.1 Handle bit-vector datatype (HO) -uniquecounter.sty 2011/01/30 v1.2 Provide unlimited unique counter (HO) -letltxmacro.sty 2010/09/02 v1.4 Let assignment for LaTeX macros (HO) - hopatch.sty 2011/06/24 v1.1 Wrapper for package hooks (HO) -xcolor-patch.sty 2011/01/30 xcolor patch -atveryend.sty 2011/06/30 v1.8 Hooks at the very end of document (HO) -atbegshi.sty 2011/10/05 v1.16 At begin shipout hook (HO) -refcount.sty 2011/10/16 v3.4 Data extraction from label references (HO) - hycolor.sty 2011/01/30 v1.7 Color options for hyperref/bookmark (HO) +hyperref.sty 2017/03/14 v6.85a Hypertext links for LaTeX +hobsub-hyperref.sty 2016/05/16 v1.14 Bundle oberdiek, subset hyperref (HO) +hobsub-generic.sty 2016/05/16 v1.14 Bundle oberdiek, subset generic (HO) + hobsub.sty 2016/05/16 v1.14 Construct package bundles (HO) + ifvtex.sty 2016/05/16 v1.6 Detect VTeX and its facilities (HO) + intcalc.sty 2016/05/16 v1.2 Expandable calculations with integers (HO) +kvdefinekeys.sty 2016/05/16 v1.4 Define keys (HO) +pdfescape.sty 2016/05/16 v1.14 Implements pdfTeX's escape features (HO) +bigintcalc.sty 2016/05/16 v1.4 Expandable calculations on big integers (HO) + bitset.sty 2016/05/16 v1.2 Handle bit-vector datatype (HO) +uniquecounter.sty 2016/05/16 v1.3 Provide unlimited unique counter (HO) +letltxmacro.sty 2016/05/16 v1.5 Let assignment for LaTeX macros (HO) + hopatch.sty 2016/05/16 v1.3 Wrapper for package hooks (HO) +xcolor-patch.sty 2016/05/16 xcolor patch +atveryend.sty 2016/05/16 v1.9 Hooks at the very end of document (HO) +atbegshi.sty 2016/06/09 v1.18 At begin shipout hook (HO) +refcount.sty 2016/05/16 v3.5 Data extraction from label references (HO) + hycolor.sty 2016/05/16 v1.8 Color options for hyperref/bookmark (HO) ifxetex.sty 2010/09/12 v0.6 Provides ifxetex conditional - auxhook.sty 2011/03/04 v1.3 Hooks for auxiliary files (HO) -kvoptions.sty 2011/06/30 v3.11 Key value format for package options (HO) - pd1enc.def 2012/11/06 v6.83m Hyperref: PDFDocEncoding definition (HO) + auxhook.sty 2016/05/16 v1.4 Hooks for auxiliary files (HO) + pd1enc.def 2017/03/14 v6.85a Hyperref: PDFDocEncoding definition (HO) hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive - hpdftex.def 2012/11/06 v6.83m Hyperref driver for pdfTeX -rerunfilecheck.sty 2011/04/15 v1.7 Rerun checks for auxiliary files (HO) -graphicx.sty 2014/10/28 v1.0g Enhanced LaTeX Graphics (DPC,SPQR) -graphics.sty 2014/10/28 v1.0p 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 2011/05/27 v0.06d Graphics/color for pdfTeX -classicthesis.sty 2015/09/06 v4.2 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 2014/10/14 v3.0j Driver-dependent file (DPC,SPQR) + hpdftex.def 2017/03/14 v6.85a Hyperref driver for pdfTeX +rerunfilecheck.sty 2016/05/16 v1.8 Rerun checks for auxiliary files (HO) +graphicx.sty 2017/06/01 v1.1a Enhanced LaTeX Graphics (DPC,SPQR) +graphics.sty 2017/06/25 v1.2c Standard LaTeX Graphics (DPC,SPQR) + trig.sty 2016/01/03 v1.10 sin cos tan (DPC) +graphics.cfg 2016/06/04 v1.11 sample graphics configuration + pdftex.def 2017/06/24 v1.0g Graphics/color driver for pdftex +classicthesis.sty 2017/10/13 v4.4 Typographic style for a classic-looking th +esis +latexrelease.sty 2016/12/29 v1.0h LaTeX release emulation and tests + xcolor.sty 2016/05/11 v2.12 LaTeX color extensions (UK) + color.cfg 2016/01/02 v1.6 sample color configuration +dvipsnam.def 2016/06/17 v3.0m Driver-dependent 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 2013/05/23 v2.5a Micro-typographical refinements (RS) -microtype-pdftex.def 2013/05/23 v2.5a Definitions specific to pdftex (RS) -microtype.cfg 2013/05/23 v2.5a microtype main configuration file (RS) + ueur.fd 2013/01/14 v3.01 Euler Roman +microtype.sty 2017/07/07 v2.7 Micro-typographical refinements (RS) +microtype-pdftex.def 2017/07/07 v2.7 Definitions specific to pdftex (RS) +microtype.cfg 2017/07/07 v2.7 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) -scrlayer-scrpage.sty 2015/07/02 v3.18 KOMA-Script package (end user interface for scrlayer) -scrlayer.sty 2015/07/02 v3.18 KOMA-Script package (defining layers and page styles) -titlesec.sty 2011/12/15 v2.10.0 Sectioning titles - tocloft.sty 2013/05/02 v2.3f parameterised ToC, etc., typesetting - scrtime.sty 2015/07/02 v3.18 KOMA-Script package (time of LaTeX run) +scrlayer-scrpage.sty 2017/09/07 v3.24 KOMA-Script package (end user interfac +e for scrlayer) +scrlayer.sty 2017/09/07 v3.24 KOMA-Script package (defining layers and page +styles) +titlesec.sty 2016/03/21 v2.10.2 Sectioning titles + tocloft.sty 2017/08/31 v2.3i parameterised ToC, etc., typesetting + scrtime.sty 2017/09/07 v3.24 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) -remreset.sty - english.lbx 2013/01/10 v2.5 biblatex localization (PK/JW/AB) -american.lbx 2013/01/10 v2.5 biblatex localization (PK/JW/AB) - german.lbx 2013/01/10 v2.5 biblatex localization (PK/JW/AB) - ngerman.lbx 2013/01/10 v2.5 biblatex localization (PK/JW/AB) + english.lbx 2016/12/05 v3.7 biblatex localization (PK/JW/AB) +american.lbx 2016/12/05 v3.7 biblatex localization (PK/JW/AB) + german.lbx 2016/12/05 v3.7 biblatex localization (PK/JW/AB) + ngerman.lbx 2016/12/05 v3.7 biblatex localization (PK/JW/AB) + ts1cmr.fd 2014/09/29 v2.5h Standard LaTeX font definitions t1pplj.fd 2004/09/06 font definitions for T1/pplj. ClassicThesis.bbl ClassicThesis1-blx.bbl - nameref.sty 2012/10/27 v2.43 Cross-referencing by name of section -gettitlestring.sty 2010/12/03 v1.4 Cleanup title references (HO) + nameref.sty 2016/05/21 v2.44 Cross-referencing by name of section +gettitlestring.sty 2016/05/16 v1.5 Cleanup title references (HO) ClassicThesis.out ClassicThesis.out supp-pdf.mkii +epstopdf-base.sty 2016/05/15 v2.6 Base part for package epstopdf + grfext.sty 2016/05/16 v1.2 Manage graphics extensions (HO) mt-ppl.cfg 2005/11/16 v1.6 microtype config. file: Palatino (RS) FrontBackmatter/DirtyTitlepage.tex + ot1pplx.fd 2004/09/06 font definitions for OT1/pplx. + omlzplm.fd 2002/09/08 Fontinst v1.914 font definitions for OML/zplm. + omszplm.fd 2002/09/08 Fontinst v1.914 font definitions for OMS/zplm. + omxzplm.fd 2002/09/08 Fontinst v1.914 font definitions for OMX/zplm. + ot1zplm.fd 2002/09/08 Fontinst v1.914 font definitions for OT1/zplm. t1fvm.fd 2004/09/07 scalable font definitions for T1/fvm. FrontBackmatter/Titlepage.tex gfx/TFZsuperellipse_bw.pdf @@ -154,12 +176,6 @@ FrontBackmatter/Titleback.tex ts1pplj.fd 2004/09/06 font definitions for TS1/pplj. FrontBackmatter/Dedication.tex FrontBackmatter/Abstract.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/Publications.tex FrontBackmatter/Acknowledgments.tex FrontBackmatter/Contents.tex diff --git a/Master/texmf-dist/doc/latex/classicthesis/README b/Master/texmf-dist/doc/latex/classicthesis/README index 1a6dab2f535..b322a239156 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/README +++ b/Master/texmf-dist/doc/latex/classicthesis/README @@ -1,13 +1,13 @@ -A Classic Thesis Style v4.2 +A Classic Thesis Style v4.4 An Homage to The Elements of Typographic Style -Copyright (C) 2015 André Miede http://www.miede.de +Copyright (C) 2017 André Miede http://www.miede.de Please see the file ClassicThesis.pdf for more information. Your comments are highly appreciated. -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 -postcards I received so far is available online at +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 +postcards I received so far is available online at http://postcards.miede.de License: @@ -25,3 +25,6 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +PLEASE SEE ALSO THE AUTHORS' NOTE REGARDING THIS LICENSE +IN THE DOCUMENTATION (ClassicThesis.pdf --> Chapter 1 / Chapter01.tex) diff --git a/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex b/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex index e6d8bc18271..56e42ca2b69 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex @@ -1,12 +1,12 @@ % **************************************************************************************************** -% classicthesis-config.tex -% formerly known as loadpackages.sty, classicthesis-ldpkg.sty, and classicthesis-preamble.sty -% Use it at the beginning of your ClassicThesis.tex, or as a LaTeX Preamble +% classicthesis-config.tex +% formerly known as loadpackages.sty, classicthesis-ldpkg.sty, and classicthesis-preamble.sty +% Use it at the beginning of your ClassicThesis.tex, or as a LaTeX Preamble % in your ClassicThesis.{tex,lyx} with \input{classicthesis-config} -% **************************************************************************************************** -% If you like the classicthesis, then I would appreciate a postcard. -% My address can be found in the file ClassicThesis.pdf. A collection -% of the postcards I received so far is available online at +% **************************************************************************************************** +% If you like the classicthesis, then I would appreciate a postcard. +% My address can be found in the file ClassicThesis.pdf. A collection +% of the postcards I received so far is available online at % http://postcards.miede.de % **************************************************************************************************** @@ -17,24 +17,27 @@ % does not support utf8 use another editor! % **************************************************************************************************** \PassOptionsToPackage{utf8}{inputenc} - \usepackage{inputenc} + \usepackage{inputenc} % **************************************************************************************************** -% 1. Configure classicthesis for your needs here, e.g., remove "drafting" below +% 1. Configure classicthesis for your needs here, e.g., remove "drafting" below % in order to deactivate the time-stamp on the pages -% **************************************************************************************************** -\PassOptionsToPackage{eulerchapternumbers,listings,drafting,% - pdfspacing,%floatperchapter,%linedheaders,% - subfig,beramono,eulermath,parts}{classicthesis} -% ******************************************************************** -% Available options for classicthesis.sty % (see ClassicThesis.pdf for more information): -% drafting -% parts nochapters linedheaders -% eulerchapternumbers beramono eulermath pdfspacing minionprospacing -% tocaligned dottedtoc manychapters -% listings floatperchapter subfig -% ******************************************************************** +% **************************************************************************************************** +\PassOptionsToPackage{ + drafting=true, % print version information on the bottom of the pages + tocaligned=false, % the left column of the toc will be aligned (no indentation) + dottedtoc=false, % page numbers in ToC flushed right + parts=true, % use part division + eulerchapternumbers=true, % use AMS Euler for chapter font (otherwise Palatino) + linedheaders=false, % chaper headers will have line above and beneath + floatperchapter=true, % numbering per chapter for all floats (i.e., Figure 1.1) + listings=true, % load listings package and setup LoL + subfig=true, % setup for preloaded subfig package + eulermath=false, % use awesome Euler fonts for mathematical formulae (only with pdfLaTeX) + beramono=true, % toggle a nice monospaced font (w/ bold) + minionpro=false % setup for minion pro font; use minion pro small caps as well (only with pdfLaTeX) +}{classicthesis} % **************************************************************************************************** @@ -51,8 +54,8 @@ \newcommand{\myDepartment}{Put data here\xspace} \newcommand{\myUni}{Put data here\xspace} \newcommand{\myLocation}{Saarbrücken\xspace} -\newcommand{\myTime}{September 2015\xspace} -\newcommand{\myVersion}{version 4.2\xspace} +\newcommand{\myTime}{October 2017\xspace} +\newcommand{\myVersion}{version 4.4} % ******************************************************************** % Setup, finetuning, and useful commands @@ -63,55 +66,62 @@ \newcommand{\ie}{i.\,e.} \newcommand{\Ie}{I.\,e.} \newcommand{\eg}{e.\,g.} -\newcommand{\Eg}{E.\,g.} +\newcommand{\Eg}{E.\,g.} % **************************************************************************************************** % **************************************************************************************************** % 3. Loading some handy packages % **************************************************************************************************** -% ******************************************************************** +% ******************************************************************** % Packages with options that might require adjustments -% ******************************************************************** -%\PassOptionsToPackage{ngerman,american}{babel} % change this to your language(s) +% ******************************************************************** +%\PassOptionsToPackage{ngerman,american}{babel} % change this to your language(s), main language last % Spanish languages need extra options in order to work with this template %\PassOptionsToPackage{spanish,es-lcroman}{babel} - \usepackage{babel} + \usepackage{babel} \usepackage{csquotes} \PassOptionsToPackage{% - %backend=biber, %instead of bibtex - backend=bibtex8,bibencoding=ascii,% - language=auto,% - style=numeric-comp,% - %style=authoryear-comp, % Author 1999, 2010 - %bibstyle=authoryear,dashed=false, % dashed: substitute rep. author with --- - sorting=nyt, % name, year, title - maxbibnames=10, % default: 3, et al. - %backref=true,% - natbib=true % natbib compatibility mode (\citep and \citet still work) + %backend=biber,bibencoding=utf8, %instead of bibtex + backend=bibtex8,bibencoding=ascii,% + language=auto,% + style=numeric-comp,% + %style=authoryear-comp, % Author 1999, 2010 + %bibstyle=authoryear,dashed=false, % dashed: substitute rep. author with --- + sorting=nyt, % name, year, title + maxbibnames=10, % default: 3, et al. + %backref=true,% + natbib=true % natbib compatibility mode (\citep and \citet still work) }{biblatex} \usepackage{biblatex} -\PassOptionsToPackage{fleqn}{amsmath} % math environments and more by the AMS - \usepackage{amsmath} +\PassOptionsToPackage{fleqn}{amsmath} % math environments and more by the AMS + \usepackage{amsmath} -% ******************************************************************** +% ******************************************************************** % General useful packages -% ******************************************************************** +% ******************************************************************** \PassOptionsToPackage{T1}{fontenc} % T2A for cyrillics - \usepackage{fontenc} + \usepackage{fontenc} \usepackage{textcomp} % fix warning with missing font shapes -\usepackage{scrhack} % fix warnings when using KOMA with listings package -\usepackage{xspace} % to get the spacing after macros right +\usepackage{scrhack} % fix warnings when using KOMA with listings package +\usepackage{xspace} % to get the spacing after macros right \usepackage{mparhack} % get marginpar right -\usepackage{fixltx2e} % fixes some LaTeX stuff --> since 2015 in the LaTeX kernel (see below) -%\usepackage[latest]{latexrelease} % will be used once available in more distributions (ISSUE #107) -\PassOptionsToPackage{printonlyused,smaller}{acronym} - \usepackage{acronym} % nice macros for handling all acronyms in the thesis - %\renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms --> no longer working - %\renewcommand*{\acsfont}[1]{\textsc{#1}} - \renewcommand*{\aclabelfont}[1]{\acsfont{#1}} +%\usepackage{fixltx2e} % fixes some LaTeX stuff --> since 2015 in the LaTeX kernel (see below) +% \usepackage[latest]{latexrelease} % emulate newer kernel version if older is detected +\PassOptionsToPackage{printonlyused,smaller}{acronym} + \usepackage{acronym} % nice macros for handling all acronyms in the thesis + %\renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms --> no longer working + %\renewcommand*{\acsfont}[1]{\textsc{#1}} + %\renewcommand*{\aclabelfont}[1]{\acsfont{#1}} + %\def\bflabel#1{{#1\hfill}} + \def\bflabel#1{{\acsfont{#1}\hfill}} + \def\aclabelfont#1{\acsfont{#1}} +% **************************************************************************************************** +%\usepackage{pgfplots} % External TikZ/PGF support (thanks to Andreas Nautsch) +%\usetikzlibrary{external} +%\tikzexternalize[mode=list and make, prefix=ext-tikz/] % **************************************************************************************************** @@ -119,80 +129,82 @@ % 4. Setup floats: tables, (sub)figures, and captions % **************************************************************************************************** \usepackage{tabularx} % better tables - \setlength{\extrarowheight}{3pt} % increase table row height + \setlength{\extrarowheight}{3pt} % increase table row height \newcommand{\tableheadline}[1]{\multicolumn{1}{c}{\spacedlowsmallcaps{#1}}} \newcommand{\myfloatalign}{\centering} % to be used with each float for alignment \usepackage{caption} % Thanks to cgnieder and Claus Lahiri % http://tex.stackexchange.com/questions/69349/spacedlowsmallcaps-in-caption-label -% [REMOVED DUE TO OTHER PROBLEMS, SEE ISSUE #82] +% [REMOVED DUE TO OTHER PROBLEMS, SEE ISSUE #82] %\DeclareCaptionLabelFormat{smallcaps}{\bothIfFirst{#1}{~}\MakeTextLowercase{\textsc{#2}}} %\captionsetup{font=small,labelformat=smallcaps} % format=hang, \captionsetup{font=small} % format=hang, -\usepackage{subfig} +\usepackage{subfig} % **************************************************************************************************** % **************************************************************************************************** % 5. Setup code listings % **************************************************************************************************** -\usepackage{listings} +\usepackage{listings} %\lstset{emph={trueIndex,root},emphstyle=\color{BlueViolet}}%\underbar} % for special keywords \lstset{language=[LaTeX]Tex,%C++, - morekeywords={PassOptionsToPackage,selectlanguage}, - 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, - belowcaptionskip=.75\baselineskip - %frame=L -} -% **************************************************************************************************** + morekeywords={PassOptionsToPackage,selectlanguage}, + 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, + belowcaptionskip=.75\baselineskip + %frame=L +} +% **************************************************************************************************** % **************************************************************************************************** -% 6. PDFLaTeX, hyperreferences and citation backreferences +% 6. PDFLaTeX, hyperreferences, and citation backreferences % **************************************************************************************************** % ******************************************************************** % Using PDFLaTeX % ******************************************************************** -\PassOptionsToPackage{pdftex,hyperfootnotes=false,pdfpagelabels}{hyperref} - \usepackage{hyperref} % backref linktocpage pagebackref -\pdfcompresslevel=9 -\pdfadjustspacing=1 -\PassOptionsToPackage{pdftex}{graphicx} - \usepackage{graphicx} - +\PassOptionsToPackage{hyperfootnotes=false,pdfpagelabels}{hyperref} + \usepackage{hyperref} % backref linktocpage pagebackref +%\ifpdf +%\pdfcompresslevel=9 +%\pdfadjustspacing=1 +%\fi +%\PassOptionsToPackage{pdftex}{graphicx} %%%IVO: driver will be chosen automatically + \usepackage{graphicx} + % ******************************************************************** % Hyperreferences % ******************************************************************** \hypersetup{% - %draft, % = no hyperlinking at all (useful in b/w printouts) - 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, pdfstartpage=3, pdfstartview=FitV, pdfborder={0 0 0},% - breaklinks=true, pdfpagemode=UseNone, pageanchor=true, pdfpagemode=UseOutlines,% - plainpages=false, bookmarksnumbered, bookmarksopen=true, bookmarksopenlevel=1,% - hypertexnames=true, pdfhighlight=/O,%nesting=true,%frenchlinks,% - urlcolor=webbrown, linkcolor=RoyalBlue, citecolor=webgreen, %pagecolor=RoyalBlue,% - %urlcolor=Black, linkcolor=Black, citecolor=Black, %pagecolor=Black,% - pdftitle={\myTitle},% - pdfauthor={\textcopyright\ \myName, \myUni, \myFaculty},% - pdfsubject={},% - pdfkeywords={},% - pdfcreator={pdfLaTeX},% - pdfproducer={LaTeX with hyperref and classicthesis}% -} + %draft, % hyperref's draft mode, for printing see below + 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, pdfstartpage=3, pdfstartview=FitV, pdfborder={0 0 0},% + breaklinks=true, pdfpagemode=UseNone, pageanchor=true, pdfpagemode=UseOutlines,% + plainpages=false, bookmarksnumbered, bookmarksopen=true, bookmarksopenlevel=1,% + hypertexnames=true, pdfhighlight=/O,%nesting=true,%frenchlinks,% + urlcolor=webbrown, linkcolor=RoyalBlue, citecolor=webgreen, %pagecolor=RoyalBlue,% + %urlcolor=Black, linkcolor=Black, citecolor=Black, %pagecolor=Black,% + pdftitle={\myTitle},% + pdfauthor={\textcopyright\ \myName, \myUni, \myFaculty},% + pdfsubject={},% + pdfkeywords={},% + pdfcreator={pdfLaTeX},% + pdfproducer={LaTeX with hyperref and classicthesis}% +} % ******************************************************************** % Setup autoreferences @@ -200,34 +212,34 @@ % There are some issues regarding autorefnames % http://www.ureader.de/msg/136221647.aspx % http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexwords -% you have to redefine the makros for the +% you have to redefine the makros for the % language you use, e.g., american, ngerman % (as chosen when loading babel/AtBeginDocument) % ******************************************************************** \makeatletter \@ifpackageloaded{babel}% - {% - \addto\extrasamerican{% - \renewcommand*{\figureautorefname}{Figure}% - \renewcommand*{\tableautorefname}{Table}% - \renewcommand*{\partautorefname}{Part}% - \renewcommand*{\chapterautorefname}{Chapter}% - \renewcommand*{\sectionautorefname}{Section}% - \renewcommand*{\subsectionautorefname}{Section}% - \renewcommand*{\subsubsectionautorefname}{Section}% - }% - \addto\extrasngerman{% - \renewcommand*{\paragraphautorefname}{Absatz}% - \renewcommand*{\subparagraphautorefname}{Unterabsatz}% - \renewcommand*{\footnoteautorefname}{Fu\"snote}% - \renewcommand*{\FancyVerbLineautorefname}{Zeile}% - \renewcommand*{\theoremautorefname}{Theorem}% - \renewcommand*{\appendixautorefname}{Anhang}% - \renewcommand*{\equationautorefname}{Gleichung}% - \renewcommand*{\itemautorefname}{Punkt}% - }% - % Fix to getting autorefs for subfigures right (thanks to Belinda Vogt for changing the definition) - \providecommand{\subfigureautorefname}{\figureautorefname}% + {% + \addto\extrasamerican{% + \renewcommand*{\figureautorefname}{Figure}% + \renewcommand*{\tableautorefname}{Table}% + \renewcommand*{\partautorefname}{Part}% + \renewcommand*{\chapterautorefname}{Chapter}% + \renewcommand*{\sectionautorefname}{Section}% + \renewcommand*{\subsectionautorefname}{Section}% + \renewcommand*{\subsubsectionautorefname}{Section}% + }% + \addto\extrasngerman{% + \renewcommand*{\paragraphautorefname}{Absatz}% + \renewcommand*{\subparagraphautorefname}{Unterabsatz}% + \renewcommand*{\footnoteautorefname}{Fu\"snote}% + \renewcommand*{\FancyVerbLineautorefname}{Zeile}% + \renewcommand*{\theoremautorefname}{Theorem}% + \renewcommand*{\appendixautorefname}{Anhang}% + \renewcommand*{\equationautorefname}{Gleichung}% + \renewcommand*{\itemautorefname}{Punkt}% + }% + % Fix to getting autorefs for subfigures right (thanks to Belinda Vogt for changing the definition) + \providecommand{\subfigureautorefname}{\figureautorefname}% }{\relax} \makeatother @@ -240,14 +252,14 @@ % ******************************************************************** \listfiles %\PassOptionsToPackage{l2tabu,orthodox,abort}{nag} -% \usepackage{nag} +% \usepackage{nag} %\PassOptionsToPackage{warning, all}{onlyamsmath} -% \usepackage{onlyamsmath} +% \usepackage{onlyamsmath} % ******************************************************************** % Last, but not least... % ******************************************************************** -\usepackage{classicthesis} +\usepackage{classicthesis} % **************************************************************************************************** @@ -257,7 +269,6 @@ % ******************************************************************** % Changing the text area % ******************************************************************** -%\linespread{1.05} % a bit more for Palatino %\areaset[current]{312pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip %\setlength{\marginparwidth}{7em}% %\setlength{\marginparsep}{2em}% @@ -270,8 +281,15 @@ %\usepackage[light,condensed,math]{iwona} %\renewcommand{\sfdefault}{iwona} %\usepackage{lmodern} % <-- no osf support :-( -%\usepackage{cfr-lm} % +%\usepackage{cfr-lm} % %\usepackage[urw-garamond]{mathdesign} <-- no osf support :-( -%\usepackage[default,osfigures]{opensans} % scale=0.95 +%\usepackage[default,osfigures]{opensans} % scale=0.95 %\usepackage[sfdefault]{FiraSans} +% ******************************************************************** +% \usepackage[largesc,osf]{newpxtext} +% Used to fix these: +% https://bitbucket.org/amiede/classicthesis/issues/139/italics-in-pallatino-capitals-chapter +% https://bitbucket.org/amiede/classicthesis/issues/45/problema-testatine-su-classicthesis-style +% ******************************************************************** +%\linespread{1.05} % a bit more for Palatino % **************************************************************************************************** diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty index a82277c21b7..fa2793fce20 100644 --- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty +++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty @@ -1,11 +1,11 @@ % ******************************************************************** % classicthesis.sty % -% Copyright (C) 2015 André Miede http://www.miede.de +% Copyright (C) 2017 André Miede and Ivo Pletikosić % -% 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 -% postcards I received so far is available online at +% 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 +% postcards I received so far is available online at % http://postcards.miede.de % % License: @@ -24,164 +24,127 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% ******************************************************************** +% ******************************************************************** % Important: % % This style can also be used without the thesis template. -% It works with both LaTeX and PDFLaTeX now. XeLaTeX should also work. -% -% * You must not use "u etc. in strings/commands that will be spaced out -% (use \"u or real umlauts instead) -% * There is a problem with the case of math text in part-, -% chapter-, and section titles (either the case or the spacing breaks). -% => this can be fixed by using pdftex 1.40 or later and enabling the -% option pdfspacing of this package +% It works with LaTeX, PDFLaTeX, XeLaTeX and LuaLaTeX. % -% ******************************************************************** +% ******************************************************************** \NeedsTeXFormat{LaTeX2e}%[2015/01/01] % fixed via latexrelease package, see below -\ProvidesPackage{classicthesis}[2015/09/06 v4.2 Typographic style for a classic-looking thesis] -%\PassOptionsToPackage{latest}{latexrelease} % replacement for fixltx2e, emulate newer kernel version if older is detected - %\RequirePackage{latexrelease} % will be put back in once it is available in more distributions +\ProvidesPackage{classicthesis}[2017/10/13 v4.4 Typographic style for a classic-looking thesis] +\PassOptionsToPackage{latest}{latexrelease} % replacement for fixltx2e, + \RequirePackage{latexrelease} % emulate newer kernel version if older is detected + \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{@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 - \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) - \newboolean{@floatperchapter} % numbering per chapter for all floats (i.e., Figure 1.1) - + % ******************************************************************** % 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{subfigure}{% - \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{dottedtoc}{\setboolean{@dottedtoc}{true}} -\DeclareOption{listings}{\setboolean{@listings}{true}} -\DeclareOption{manychapters}{\setboolean{@manychapters}{true}} -\DeclareOption{floatperchapter}{\setboolean{@floatperchapter}{true}} -\ProcessOptions\relax +% ******************************************************************** +\RequirePackage{kvoptions} +\SetupKeyvalOptions{family=ct, prefix=ct@} + +\DeclareBoolOption{drafting} % print version information on all pages + +\DeclareBoolOption{tocaligned} % the left column of the toc will be aligned (no indentation) +\DeclareBoolOption{dottedtoc} % page numbers in ToC flushed right +\DeclareBoolOption{listsseparated} % OBSOLETE; toggles the vertical space between lof/lot entries of different chapters + +\DeclareBoolOption{parts} % use part division + +\DeclareBoolOption{nochapters} % OBSOLETE - automatic check; disable all chapter-specific commands +\DeclareBoolOption{eulerchapternumbers} % use AMS Euler for chapter font (otherwise Palatino) +\DeclareBoolOption{linedheaders} % chaper headers will have line above and beneath +\DeclareBoolOption{floatperchapter} % numbering per chapter for all floats (i.e., Figure 1.1) +\DeclareBoolOption{manychapters} % additional space in ToC after chapter number (if two digits are needed) + +\DeclareBoolOption{listings} % load listings package and setup LoL +\DeclareBoolOption{subfig} % setup for preloaded @subfig package + +\DeclareBoolOption{eulermath} % use awesome Euler fonts for mathematical formulae; only with pdflatex +\DeclareBoolOption{beramono} % toggle a nice monospaced font (w/ bold) + pre-installed +\DeclareBoolOption{minionpro} % setup for minion pro font; use minion pro small caps as well; only with pdflatex + +\DeclareBoolOption{minionprospacing} % OBSOLETE; use minion pro's textssc for letter spacing +\DeclareBoolOption{pdfspacing} % OBSOLETE; use pdftex for letterspacing (via microtype) + +\DeclareBoolOption{a4paper} +\DeclareBoolOption{a5paper} +\DeclareBoolOption{letterpaper} +\DeclareStringOption[a4]{paper} % paper size defaults to A4 +\ProcessKeyvalOptions{ct} + + + + +%%% seems that KOMA-Script gives preference to old-style paper options, thus first +\ifthenelse{\boolean{ct@letterpaper}}{\renewcommand*{\ct@paper}{letter}}{} +\ifthenelse{\boolean{ct@a5paper}}{\renewcommand*{\ct@paper}{a5}}{} +\ifthenelse{\boolean{ct@a4paper}}{\renewcommand*{\ct@paper}{a4}}{} +%%% then +\ifthenelse{\equal{\ct@paper}{a4}}% + {\setboolean{ct@a4paper}{true} \setboolean{ct@a5paper}{false} \setboolean{ct@letterpaper}{false}}% + {} +\ifthenelse{\equal{\ct@paper}{a5}}% + {\setboolean{ct@a4paper}{false} \setboolean{ct@a5paper}{true} \setboolean{ct@letterpaper}{false}}% + {} +\ifthenelse{\equal{\ct@paper}{letter}}% + {\setboolean{ct@a4paper}{false} \setboolean{ct@a5paper}{false} \setboolean{ct@letterpaper}{true}}% + {} + + + % subfig-related stuff \@ifpackageloaded{subfig}% - {\setboolean{@subfig}{true}% - }{\relax} -\@ifpackageloaded{subfigure}% - {\setboolean{@subfig}{true}% - \PackageWarningNoLine{classicthesis}{Package "subfigure" and option "subfigure" are deprecated, % - use "subfig" instead.} + {\setboolean{ct@subfig}{true}% }{\relax} -\ifthenelse{\boolean{@subfig}}% + +\ifthenelse{\boolean{ct@subfig}}% {\PassOptionsToPackage{subfigure}{tocloft}% }{\relax}% % listings-related stuff -\ifthenelse{\boolean{@listings}}% +\ifthenelse{\boolean{ct@listings}}% {\@ifpackageloaded{listings}% {\relax}{\RequirePackage{listings}}% }{\relax}% -% fine-tuning if we use 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}}% - {% 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}% - }{\relax} % fine-tuning if we do not use chapters -\ifthenelse{\boolean{@nochapters}}% - {% - % is the user trying to use parts at the same time? - \ifthenelse{\boolean{@parts}}% - {% both parts and nochapters are active - \PackageWarningNoLine{classicthesis}{You cannot use "parts" at the same time % - as "nochapters"!}% - }{\relax}% - % is the user trying to use manychapters at the same time? - \ifthenelse{\boolean{@manychapters}}% - {% both manychapters and nochapters are active - \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", "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}% -% ******************************************************************** +\ifthenelse{\isundefined{\chapter}\OR\boolean{ct@nochapters}} + { + \PackageWarningNoLine{classicthesis}{Chapter sectioning command not present in this document class. % + Deactivating options floatperchapter, linedheaders, manychapters, listsseparated, eulerchapternumbers and parts}% + \setboolean{ct@linedheaders}{false}% + \setboolean{ct@listsseparated}{false}% + \setboolean{ct@eulerchapternumbers}{false}% + \setboolean{ct@parts}{false}% %%%IVO: note that parts exist even when chapters are not defined! + \setboolean{ct@manychapters}{false}% + \setboolean{ct@floatperchapter}{false}% + \setboolean{ct@nochapters}{true} + }{\relax} + +% ******************************************************************** % PDF and XeLaTeX Stuff % ******************************************************************** \RequirePackage{ifpdf} -\ifpdf\RequirePackage{hyperref}\fi % for texorpdfstring command below - -% Necessary to rewrite hacks for chapters and parts and toc \RequirePackage{ifxetex} -\ifxetex\RequirePackage{hyperref}\fi % for texorpdfstring command below - -% pdfspacing does not work with XeLaTeX -\ifxetex% - \ifthenelse{\boolean{@pdfspacing}}% - {% pdfspacing is used with XeLaTeX - \PackageWarningNoLine{classicthesis}{You cannot use the option % - "pdfspacing" with XeLaTeX!}% - }{\relax}% - \setboolean{@pdfspacing}{false}% -\fi +\RequirePackage{ifluatex} +\ifthenelse{\boolean{pdf}\OR\boolean{luatex}\OR\boolean{xetex}}% + { + \RequirePackage{hyperref} + \pdfstringdefDisableCommands{\let\thepart=\relax} % no part numbers (i, ii, iii) in PDF outline IVO + %\pdfstringdefDisableCommands{\renewcommand{\thepart}{\Roman{part}}} %%%IVO bring back Part numbers in PDF outline + }{} + -% ******************************************************************** +% ******************************************************************** % Colors % ******************************************************************** \PassOptionsToPackage{dvipsnames}{xcolor} - \RequirePackage{xcolor} % [dvipsnames] + \RequirePackage{xcolor} % [dvipsnames] \definecolor{halfgray}{gray}{0.55} % chapter numbers will be semi transparent .5 .55 .6 .0 \definecolor{webgreen}{rgb}{0,.5,0} \definecolor{webbrown}{rgb}{.6,0,0} @@ -191,60 +154,99 @@ % ******************************************************************** % Font Stuff -% ******************************************************************** -% specialists: MinionPro -\ifthenelse{\boolean{@minionpro}}% - {% - % in order have Euler math fonts work with Minion, special option is needed - \ifthenelse{\boolean{@eulermath}}% - {% - \PassOptionsToPackage{opticals,mathlf,onlytext}{MinionPro}% - \RequirePackage{MinionPro} % opticals, fullfamily, osf - }{% - \PassOptionsToPackage{opticals,mathlf}{MinionPro}% - \RequirePackage{MinionPro} % opticals, fullfamily, osf - }% - }{% - % default: Palatino - \PassOptionsToPackage{osf,sc}{mathpazo}% - \RequirePackage{mathpazo} % Palatino with real small caps and old style figures - \linespread{1.05} % a bit more for Palatino - } +% ******************************************************************** +\ifthenelse{\boolean{xetex}\OR\boolean{luatex}} + { % use fontspec and OpenType fonts with utf8 engines + \RequirePackage{fontspec} + \setmainfont[Ligatures=TeX,Numbers=OldStyle]{TeX Gyre Pagella} % Palatino clone + \linespread{1.05} % a bit more for Palatino + \ifthenelse{\boolean{ct@beramono}}% + {\setmonofont[Scale=0.85]{DejaVu Sans Mono}} % like Bera; Scale=MatchLowercase + {\setmonofont[Scale=1]{Latin Modern Mono}} + \RequirePackage{unicode-math} + \setmathfont{TeX Gyre Pagella Math} + % font for the chapter numbers will be defined in the old way below + % because there is no OpenType Euler font; this is how it should be done: + %\newfontface\chapterNumber[Scale=7,Color=000000]{TeX Gyre Pagella Bold} + } + { % use Type 1 fonts with pdflatex + \ifthenelse{\boolean{ct@minionpro}}% specialists: MinionPro + {% + % in order have Euler math fonts work with Minion, special option is needed + \ifthenelse{\boolean{ct@eulermath}}% + {% + \PassOptionsToPackage{opticals,mathlf,onlytext}{MinionPro}% + \RequirePackage{MinionPro} % opticals, fullfamily, osf + }{% + \PassOptionsToPackage{opticals,mathlf}{MinionPro}% + \RequirePackage{MinionPro} % opticals, fullfamily, osf + } + }{ + % default: Palatino + \PassOptionsToPackage{osf,sc}{mathpazo}% + \RequirePackage{mathpazo} % Palatino with real small caps and old style figures + \linespread{1.05} % a bit more for Palatino + } + + \ifthenelse{\boolean{ct@beramono}}% + {\PassOptionsToPackage{scaled=0.85}{beramono}% + \RequirePackage{beramono}% + }{% + \relax% + % put your own suitable typewriter font here + %\renewcommand{\ttdefault}{\rmdefault} + } + + \ifthenelse{\boolean{ct@eulermath}}% + {\PassOptionsToPackage{euler-digits}{eulervm}% + \RequirePackage{eulervm}} % Euler math fonts + {\relax} + } + + \ifthenelse{\boolean{ct@eulerchapternumbers}}% font for the chapter numbers + {\DeclareFixedFont{\chapterNumber}{U}{eur}{b}{n}{70}}% + {\DeclareFixedFont{\chapterNumber}{T1}{pplj}{m}{n}{70}}% + %{\newfont{\chapterNumber}{eurb10 scaled 7000}}% + %{\newfont{\chapterNumber}{pplr9d scaled 7000}} + % Euler eurb10 / Palatino OSF pplr9d / Palatino SC pplrc9d + % Latin Modern cork-lmr10 / Minion MinionPro-Regular-osf-t1 + % (MinionPro-SemiboldCapt-osf-t1 MinionPro-SemiboldDisp-osf-t1) + -\ifthenelse{\boolean{@beramono}}% - {\PassOptionsToPackage{scaled=0.85}{beramono}% - \RequirePackage{beramono}}% - {% - \relax% - % put your own suitable typewriter font here - %\renewcommand{\ttdefault}{\rmdefault} - } -\ifthenelse{\boolean{@eulermath}}% - {\PassOptionsToPackage{euler-digits}{eulervm}% - \RequirePackage{eulervm}} % Euler math fonts - {\relax} -\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 - % Latin Modern cork-lmr10 / Minion MinionPro-Regular-osf-t1 - % (MinionPro-SemiboldCapt-osf-t1 MinionPro-SemiboldDisp-osf-t1) \RequirePackage{microtype} % character protruding and other micro-typography stuff % [expansion=false] + % ******************************************************************** % Textblock size %******************************************************* \@ifpackageloaded{typearea}% {\relax}{% + \PassOptionsToPackage{headinclude,footinclude}{typearea} \RequirePackage{typearea}% } -\ifthenelse{\boolean{@a5paper}}% + +\ifthenelse{\boolean{ct@letterpaper}}% + {% A4 + \ifthenelse{\boolean{ct@minionpro}}% + {% Minion gets some extra sizes + \PackageInfo{classicthesis}{letter paper, MinionPro}% + \areaset[current]{332pt}{634pt}% guessing from A4 values + \setlength{\marginparwidth}{7.5em}% + \setlength{\marginparsep}{2em}% + }{% Palatino or other + \PackageInfo{classicthesis}{letter paper, Palatino or other} + \areaset[current]{356pt}{700pt} % guessing from A4 values + \setlength{\marginparwidth}{7em}% + \setlength{\marginparsep}{2em}% + }% + }{\relax} +\ifthenelse{\boolean{ct@a5paper}}% {% A5 - \ifthenelse{\boolean{@minionpro}}% - {% Minion gets some extra sizes + \ifthenelse{\boolean{ct@minionpro}}% + {% Minion gets some extra sizes \PackageInfo{classicthesis}{A5 paper, MinionPro}% \areaset[current]{278pt}{556pt}% \setlength{\marginparwidth}{5em}% @@ -255,21 +257,24 @@ \setlength{\marginparwidth}{4em}% \setlength{\marginparsep}{1.25em}% }% - }{% A4 - \ifthenelse{\boolean{@minionpro}}% - {% Minion gets some extra sizes + }{\relax} +\ifthenelse{\boolean{ct@a4paper}}% + {% A4 + \ifthenelse{\boolean{ct@minionpro}}% + {% Minion gets some extra sizes \PackageInfo{classicthesis}{A4 paper, MinionPro}% \areaset[current]{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[current]{336pt}{750pt} % ~ 336 * factor 2 + 33 head + 42 \the\footskip -% \areaset{336pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip 10pt + \areaset[current]{336pt}{750pt} % ~ 336 * factor 2 + 33 head + 42 \the\footskip + % \areaset{336pt}{761pt} % 686 (factor 2.2) + 33 head + 42 head \the\footskip 10pt \setlength{\marginparwidth}{7em}% \setlength{\marginparsep}{2em}% }% - } + }{\relax} + % Here are some suggestions for the text widths and heights: % Palatino 10pt: 288--312pt | 609--657pt % Palatino 11pt: 312--336pt | 657--705pt @@ -290,7 +295,7 @@ % Disable single lines at the start of a paragraph (Schusterjungen) \clubpenalty = 10000 % Disable single lines at the end of a paragraph (Hurenkinder) -\widowpenalty = 10000 +\widowpenalty = 10000 \displaywidowpenalty = 10000 % formulas % Graffiti as in GKP's book "Concrete Mathematics" @@ -305,11 +310,17 @@ %\DeclareRobustCommand{\graffito}[1]{\marginpar% % [\graffito@setup\raggedleft\hspace{0pt}{#1}]% % {\graffito@setup\raggedright\hspace{0pt}{#1}}} + \let\oldmarginpar\marginpar -\renewcommand{\marginpar}[1]{\oldmarginpar% - [\graffito@setup\raggedleft\hspace{0pt}{#1}]% - {\graffito@setup\raggedright\hspace{0pt}{#1}}} - +\renewcommand{\marginpar}[2][]{% always add optional parameter, make it empty by default + \if\relax\detokenize{#1}\relax% optional parameter empty, in all normal document calls + \oldmarginpar[\graffito@setup\raggedleft\hspace{0pt}#2]{\graffito@setup\raggedright\hspace{0pt}#2}% + \else%two parameters, let them use their styling + \oldmarginpar[#1]{#2}% + \fi% +} + + % Enumeration environment with small caps \newenvironment{aenumerate} {\def\theenumi{\textsc{\alph{enumi}}}% @@ -318,376 +329,328 @@ % ******************************************************************** % Fancy Stuff -% ******************************************************************** +% ******************************************************************** \RequirePackage{booktabs} % for better rules in tables \RequirePackage{textcase} % for \MakeTextUppercase -\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}}% - {% +%%% engine-dependent letterspacing: microtype for pdflatex, fontspec for xelatex and luatex +\ifthenelse{\boolean{ct@minionpro}}{% MinionPro small caps + \PackageInfo{classicthesis}{Using MinionPro's textssc for character spacing.} + \DeclareRobustCommand{\spacedallcaps}[1]{\textssc{\MakeTextUppercase{#1}}} + \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textssc{\MakeTextLowercase{#1}}} + }{ + % engine-based spacedallcaps and spacedlowsmallcaps + \ifthenelse{\boolean{pdf}\OR\boolean{luatex}}{ % pdf will soon test true for both pdflatex and luatex; \AND\NOT\boolean{luatex} \PackageInfo{classicthesis}{Using pdftex/microtype for character spacing.% Make sure your pdftex is version 1.40 or higher.}% - \microtypesetup{expansion=false}% - \DeclareRobustCommand{\spacedallcaps}[1]{\textls[160]{\MakeTextUppercase{#1}}}% - \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textls[80]{\scshape\MakeTextLowercase{#1}}}% - }{% - \RequirePackage{soul} % for letterspacing + \microtypesetup{expansion=false} + \DeclareRobustCommand{\spacedallcaps}[1]{\textls[160]{\MakeTextUppercase{#1}}} + \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textls[80]{\scshape\MakeTextLowercase{#1}}} + }{\relax} + + \ifthenelse{\boolean{xetex}}{ % use fontspec features; \OR\boolean{luatex} does not work well + \DeclareRobustCommand{\spacedallcaps}[1]{{\addfontfeature{LetterSpace=18.0}\MakeTextUppercase{#1}}}% WordSpace=1.8 + \DeclareRobustCommand{\spacedlowsmallcaps}[1]{{\addfontfeatures{LetterSpace=14.0}\scshape\MakeTextLowercase{#1}}}% WordSpace=1.8 + }{\relax} + + \ifthenelse{\boolean{pdf}\OR\boolean{xetex}\OR\boolean{luatex}}% ever used? only dvi engines remain + {\relax}{% + \RequirePackage{soulutf8} % for letterspacing \sodef\allcapsspacing{\upshape}{0.15em}{0.65em}{0.6em}% - \sodef\lowsmallcapsspacing{\scshape}{0.075em}{0.5em}{0.6em}% - \DeclareRobustCommand{\spacedallcaps}[1]{\MakeTextUppercase{\allcapsspacing{#1}}}% - \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\MakeTextLowercase{\textsc{\lowsmallcapsspacing{#1}}}}%\protect - }% - } + \sodef\lowsmallcapsspacing{\scshape}{0.075em}{0.5em}{0.6em}% + \DeclareRobustCommand{\spacedallcaps}[1]{\MakeTextUppercase{\allcapsspacing{#1}}}% + \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\MakeTextLowercase{\lowsmallcapsspacing{#1}}}%\protect + }% + } -% ******************************************************************** +% ******************************************************************** % headlines -% ******************************************************************** +% ******************************************************************** %\PassOptionsToPackage{automark}{scrpage2} \PassOptionsToPackage{automark}{scrlayer-scrpage} %\RequirePackage{scrpage2} % provides headers and footers (KOMA Script) \RequirePackage{scrlayer-scrpage} % provides headers and footers (KOMA Script) - \clearscrheadings + \clearpairofpagestyles %\setheadsepline{0pt} - \ifthenelse{\boolean{@nochapters}}% + \let\MakeMarkcase\spacedlowsmallcaps + \ifthenelse{\boolean{ct@nochapters}}% {\relax}% {\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} + \renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}} + \lehead{\mbox{\llap{\small\pagemark\kern2em}\headmark\hfil}} + \rohead{\mbox{\hfil{\headmark}\rlap{\small\kern2em\pagemark}}} + \renewcommand{\headfont}{\small} % \DeclareRobustCommand{\fixBothHeadlines}[2]{} % <--- ToDo % hack to get the content headlines right (thanks, Lorenzo!) \def\toc@heading{% - \ifthenelse{\boolean{@nochapters}}% + \ifthenelse{\boolean{ct@nochapters}}% {\section*{\contentsname}}%nochapters {\chapter*{\contentsname}}%chapters - \@mkboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}}} - - + \@mkboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}}} %%%IVO what does this do? + + % ******************************************************************** % layout of the chapter-, section-, subsection-, subsubsection-, % paragraph and description-headings -% ******************************************************************** -\RequirePackage{titlesec} - % parts - \ifthenelse{\boolean{@parts}}% - {% -% \newcommand{\ctparttext}{\relax} - \newcommand{\ct@parttext}{\relax} % Thanks to Ivo - \newcommand{\ctparttext}[1]{\renewcommand{\ct@parttext}{#1 \relax}} +% ******************************************************************** +\RequirePackage[newparttoc]{titlesec} % newparttoc to write \part to .toc with \numberline +\ifthenelse{\boolean{ct@nochapters}}{\relax}{\titleclass{\chapter}{top}} % thanks to Javier Bezos of titlesec +\def\ttl@addcontentsline#1#2{% this is from titlesec.sty + \addcontentsline{toc}{#1}{\ifttl@toclabel\ttl@a\fi{#2}}% write titles as a group inside {} + \nobreak} +% parts +\ifthenelse{\boolean{ct@parts}}% +{% + \newcommand{\ctparttext}[1]{\renewcommand{\ctparttext@keep}{#1}} + \def\ctparttext@keep{} % Thanks to Ivo + \def\ctparttext@print{\ctparttext@keep \gdef\ctparttext@keep{}} \titleformat{\part}[display] - {\normalfont\centering\large}% - {\thispagestyle{empty}\partname~\MakeTextUppercase{\thepart}}{1em}% - {\color{Maroon}\spacedallcaps}[\bigskip\normalfont\normalsize\color{Black}\begin{quote}\ct@parttext\end{quote}] - }{\relax} - % chapters - \ifthenelse{\boolean{@linedheaders}}% - {% lines above and below, number right - \titleformat{\chapter}[display]% - {\relax}{\raggedleft{\color{halfgray}\chapterNumber\thechapter} \\ }{0pt}% - {\titlerule\vspace*{.9\baselineskip}\raggedright\spacedallcaps}[\normalsize\vspace*{.8\baselineskip}\titlerule]% - }{% something like Bringhurst + {\normalfont\centering\large}% + {\thispagestyle{empty}\partname~\MakeTextUppercase{\thepart}}{1em}% + {\color{Maroon}\spacedallcaps}[\bigskip\normalfont\normalsize\color{Black}\begin{quote}\ctparttext@print\end{quote}] +}{\relax} +% chapters +\ifthenelse{\boolean{ct@linedheaders}}% +{% lines above and below, number right \titleformat{\chapter}[display]% - {\relax}{\mbox{}\oldmarginpar{\vspace*{-3\baselineskip}\color{halfgray}\chapterNumber\thechapter}}{0pt}% - {\raggedright\spacedallcaps}[\normalsize\vspace*{.8\baselineskip}\titlerule]% - } - % sections \FloatBarrier - \titleformat{\section} - {\relax}{\textsc{\MakeTextLowercase{\thesection}}}{1em}{\spacedlowsmallcaps} - % subsections - \titleformat{\subsection} - {\relax}{\textsc{\MakeTextLowercase{\thesubsection}}}{1em}{\normalsize\itshape} - % subsubsections - \titleformat{\subsubsection} - {\relax}{\textsc{\MakeTextLowercase{\thesubsubsection}}}{1em}{\normalsize\itshape} - % paragraphs - \titleformat{\paragraph}[runin] - {\normalfont\normalsize}{\theparagraph}{0pt}{\spacedlowsmallcaps} - % descriptionlabels - \renewcommand{\descriptionlabel}[1]{\hspace*{\labelsep}\spacedlowsmallcaps{#1}} % spacedlowsmallcaps textit textsc - % spacing - \ifthenelse{\boolean{@nochapters}}% - {\relax}% - {\titlespacing*{\chapter}{0pt}{1\baselineskip}{1.2\baselineskip}} - \titlespacing*{\section}{0pt}{1.25\baselineskip}{1\baselineskip} - \titlespacing*{\subsection}{0pt}{1.25\baselineskip}{1\baselineskip} - \titlespacing*{\paragraph}{0pt}{1\baselineskip}{1\baselineskip} + {\relax}{\raggedleft{\color{halfgray}\chapterNumber\thechapter} \\ }{0pt}% + {\titlerule\vspace*{.9\baselineskip}\raggedright\spacedallcaps}[\normalsize\vspace*{.8\baselineskip}\titlerule]% +}{% something like Bringhurst + \titleformat{\chapter}[display]% + {\relax}{\mbox{}\oldmarginpar{\vspace*{-3\baselineskip}\color{halfgray}\chapterNumber\thechapter}}{0pt}% + {\raggedright\spacedallcaps}[\normalsize\vspace*{.8\baselineskip}\titlerule]% +} +% sections \FloatBarrier +\titleformat{\section} + {\relax}{\textsc{\MakeTextLowercase{\thesection}}}{1em}{\spacedlowsmallcaps} +% subsections +\titleformat{\subsection} + {\relax}{\textsc{\MakeTextLowercase{\thesubsection}}}{1em}{\normalsize\itshape} +% subsubsections +\titleformat{\subsubsection} + {\relax}{\textsc{\MakeTextLowercase{\thesubsubsection}}}{1em}{\normalsize\itshape} +% paragraphs +\titleformat{\paragraph}[runin] + {\normalfont\normalsize}{\theparagraph}{0pt}{\spacedlowsmallcaps} +% descriptionlabels + \renewcommand{\descriptionlabel}[1]{\hspace*{\labelsep}\spacedlowsmallcaps{#1}} % spacedlowsmallcaps textit textsc +% spacing +\ifthenelse{\boolean{ct@nochapters}}% + {\relax}% + {\titlespacing*{\chapter}{0pt}{1\baselineskip}{1.2\baselineskip}} +\titlespacing*{\section}{0pt}{1.25\baselineskip}{1\baselineskip} +\titlespacing*{\subsection}{0pt}{1.25\baselineskip}{1\baselineskip} +\titlespacing*{\paragraph}{0pt}{1\baselineskip}{1\baselineskip} -% ******************************************************************** +% ******************************************************************** % layout of the TOC, LOF and LOT (LOL-workaround see next section) % ******************************************************************** \PassOptionsToPackage{titles}{tocloft} - \RequirePackage{tocloft} - % avoid page numbers being right-aligned in fixed-size box - \newlength{\newnumberwidth} - \settowidth{\newnumberwidth}{999} % yields overfull hbox warnings for pages > 999 - \cftsetpnumwidth{\newnumberwidth} - - % have the bib neatly positioned after the rest - \newlength{\beforebibskip} - \setlength{\beforebibskip}{0em} - - % space for more than nine chapters - \newlength{\newchnumberwidth} - \settowidth{\newchnumberwidth}{.} % <--- tweak here if more space required - \ifthenelse{\boolean{@manychapters}}% <--- many chapters option - {% - \addtolength{\cftchapnumwidth}{\newchnumberwidth}% - \addtolength{\cftsecnumwidth}{\newchnumberwidth} - \addtolength{\cftsecindent}{\newchnumberwidth} - \addtolength{\cftsubsecnumwidth}{\newchnumberwidth} - \addtolength{\cftsubsecindent}{2\newchnumberwidth} - \addtolength{\cftsubsubsecnumwidth}{\newchnumberwidth} - }{\relax}% - - % pagenumbers right after the titles - % parts - \ifthenelse{\boolean{@parts}}% - {% - \renewcommand{\thepart}{\roman{part}}% - \renewcommand{\cftpartpresnum}{\scshape}% \MakeTextLowercase -% \renewcommand{\cftpartaftersnum}{\cftchapaftersnum}% -% \renewcommand{\cftpartaftersnumb}{\quad}% -% \setlength{\cftpartnumwidth}{\cftpartnumwidth} - \renewcommand{\cftpartfont}{\color{Maroon}\normalfont}% - \renewcommand{\cftpartpagefont}{\normalfont}% - \ifthenelse{\boolean{@dottedtoc}}{\relax}% +\RequirePackage{tocloft} +% avoid page numbers being right-aligned in fixed-size box +\newlength{\newnumberwidth} +\settowidth{\newnumberwidth}{999} % yields overfull hbox warnings for pages > 999 +\cftsetpnumwidth{\newnumberwidth} + +% have the bib neatly positioned after the rest +\newlength{\beforebibskip} +\setlength{\beforebibskip}{0em} + +% space for more than nine chapters +\newlength{\newchnumberwidth} +\settowidth{\newchnumberwidth}{.} % <--- tweak here if more space required +\ifthenelse{\boolean{ct@manychapters}}% <--- many chapters option +{% + \addtolength{\cftchapnumwidth}{\newchnumberwidth}% + \addtolength{\cftsecnumwidth}{\newchnumberwidth} + \addtolength{\cftsecindent}{\newchnumberwidth} + \addtolength{\cftsubsecnumwidth}{\newchnumberwidth} + \addtolength{\cftsubsecindent}{2\newchnumberwidth} + \addtolength{\cftsubsubsecnumwidth}{\newchnumberwidth} +}{\relax}% + +% pagenumbers right after the titles +% parts +\ifthenelse{\boolean{ct@parts}}% +{% + \renewcommand{\thepart}{\roman{part}}% + \renewcommand{\cftpartpresnum}{\scshape}% \MakeTextLowercase + \renewcommand{\cftpartaftersnum}{}% + \renewcommand{\cftpartaftersnumb}{\spacedlowsmallcaps}% + \setlength{\cftpartnumwidth}{\cftchapnumwidth} + \renewcommand{\cftpartfont}{\color{Maroon}\normalfont}% + \cftpagenumbersoff{part} + \renewcommand{\cftpartpagefont}{\normalfont}% + \ifthenelse{\boolean{ct@dottedtoc}}{\relax}% {% - \renewcommand{\cftpartleader}{\hspace{1.5em}}% + \renewcommand{\cftpartleader}{\hspace{1.5em}}% \renewcommand{\cftpartafterpnum}{\cftparfillskip}% - }% - \setlength{\cftbeforepartskip}{1em}% - \setlength{\cftbeforechapskip}{.1em}% - \setlength{\beforebibskip}{\cftbeforepartskip}% - }{\relax} - % chapters - \ifthenelse{\boolean{@nochapters}}% - {\relax}% - {% - \renewcommand{\cftchappresnum}{\scshape\MakeTextLowercase}% - \renewcommand{\cftchapfont}{\normalfont}% - \renewcommand{\cftchappagefont}{\normalfont}% - \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} - \renewcommand{\cftsecpresnum}{\scshape\MakeTextLowercase}% - \renewcommand{\cftsecfont}{\normalfont}% - \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}% - \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}% - \ifthenelse{\boolean{@dottedtoc}}{\relax}% - {% - \renewcommand{\cftfigleader}{\hspace{1.5em}}% - \renewcommand{\cftfigafterpnum}{\cftparfillskip}% - } - \renewcommand{\cftfigpresnum}{\figurename~}%Fig.~} - \newlength{\figurelabelwidth} - \settowidth{\figurelabelwidth}{\cftfigpresnum~999} - \addtolength{\figurelabelwidth}{2.5em} - \cftsetindents{figure}{0em}{\figurelabelwidth} - % tables - \renewcommand{\cfttabpresnum}{\scshape\MakeTextLowercase}% - \renewcommand{\cfttabfont}{\normalfont}% - \ifthenelse{\boolean{@dottedtoc}}{\relax}% - {% - \renewcommand{\cfttableader}{\hspace{1.5em}}% - \renewcommand{\cfttabafterpnum}{\cftparfillskip}% - } - \renewcommand{\cfttabpresnum}{\tablename~}%Tab.~} - \newlength{\tablelabelwidth} - \settowidth{\tablelabelwidth}{\cfttabpresnum~999} - \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~999}% - \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}}% + \setlength{\cftbeforepartskip}{1em}% + \setlength{\cftbeforechapskip}{.1em}% + \setlength{\beforebibskip}{1.5\cftbeforepartskip}% +}{\relax} +% chapters +\ifthenelse{\boolean{ct@nochapters}}% + {\relax}% {% - \AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforepartskip}}} - }{% - \ifthenelse{\boolean{@nochapters}}% - {\relax}% - {\AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforechapskip}}}} + \renewcommand{\cftchappresnum}{\spacedlowsmallcaps}% + \renewcommand{\cftchapaftersnumb}{\spacedlowsmallcaps}% + \renewcommand{\cftchapfont}{\normalfont}% + \renewcommand{\cftchappagefont}{\normalfont}% + \ifthenelse{\boolean{ct@dottedtoc}}{\relax}% + {% + \renewcommand{\cftchapleader}{\hspace{1.5em}}% + \renewcommand{\cftchapafterpnum}{\cftparfillskip}% + } + %\setlength{\cftbeforechapskip}{.1em}% } - - % another dirty work-around to get the spaced low small caps into the toc ;-( - \ifthenelse{\boolean{@nochapters}}% - {\relax}% +% sections +\ifthenelse{\boolean{ct@nochapters}}% {% -%% use modified \chapter (thanks to Hinrich Harms) - \let\oldchap=\chapter - \renewcommand*{\chapter}{% - \secdef{\Chap}{\ChapS}% - } - \newcommand\ChapS[1]{\oldchap*{#1}}% - \newcommand\Chap[2][]{% - \ifpdf\oldchap[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% - \else\oldchap[\spacedlowsmallcaps{#1}]{#2}% - \fi% - }% - \ifxetex % thanks to Joerg Weber - \renewcommand\Chap[2][]{% - \ifxetex\oldchap[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% - \else\oldchap[\spacedlowsmallcaps{#1}]{#2}% - \fi% - }% - \fi% + \setlength{\cftbeforesecskip}{.1em}% + \setlength{\beforebibskip}{1em}% + }% + {\relax} +\renewcommand{\cftsecpresnum}{\scshape\MakeTextLowercase}% +\renewcommand{\cftsecfont}{\normalfont}% +\renewcommand{\cftsecpagefont}{\normalfont}% +\ifthenelse{\boolean{ct@dottedtoc}}{\relax}% + {% + \renewcommand{\cftsecleader}{\hspace{1.5em}}% + \renewcommand{\cftsecafterpnum}{\cftparfillskip}% } - - % yet another dirty work-around to get the spaced low small caps into the toc ;-( - \ifthenelse{\boolean{@parts}}% - {% - %% use modified \part (thanks to Hinrich Harms) - \let\oldpart=\part% - \renewcommand*{\part}{% - \secdef{\Part}{\PartS}% - }% - \newcommand\PartS[1]{\oldpart*{#1}}% - \newcommand\Part[2][]{% - \ifpdf\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}% - \oldpart[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps - \else% - \oldpart[\spacedlowsmallcaps{#1}]{#2}% - \fi% -% \renewcommand{\ct@parttext}{\relax}% Thanks to Ivo! - \ctparttext{\relax}% - }% - % Fix titlesec and tocloft issue (thanks to Enrico Gregorio) - % http://tex.stackexchange.com/questions/120708/problem-with-classicthesis-and-small-caps - \def\ttl@tocpart{% - \def\ttl@a{\protect\numberline{\thepart}\@gobble{}}}% - % XeLaTeX case - \ifxetex% thanks to Joerg Weber - \renewcommand\Part[2][]{% - \ifxetex\pdfstringdefDisableCommands{\let\thepart=\@gobbletwo}% - \oldpart[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% spacedallcaps spacedlowsmallcaps - \else% - \oldpart[\spacedlowsmallcaps{#1}]{#2}% - \fi% - \ctparttext{\relax}% - }% - \fi% - }{\relax} - - \newcommand{\tocEntry}[1]{% for bib, etc. - \ifpdf\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}% - \else{#1}\fi% + \ifthenelse{\boolean{ct@tocaligned}}{\renewcommand{\cftsecindent}{0em}}{\relax} +% subsections +\renewcommand{\cftsubsecpresnum}{\scshape\MakeTextLowercase}% +\renewcommand{\cftsubsecfont}{\normalfont}% +\ifthenelse{\boolean{ct@dottedtoc}}{\relax}% +{% + \renewcommand{\cftsubsecleader}{\hspace{1.5em}}% + \renewcommand{\cftsubsecafterpnum}{\cftparfillskip}% +} +\ifthenelse{\boolean{ct@tocaligned}}{\renewcommand{\cftsubsecindent}{0em}}{\relax} +% subsubsections +\renewcommand{\cftsubsubsecpresnum}{\scshape\MakeTextLowercase}% +\renewcommand{\cftsubsubsecfont}{\normalfont}% +\ifthenelse{\boolean{ct@dottedtoc}}{\relax}% +{% + \renewcommand{\cftsubsubsecleader}{\hspace{1.5em}}% + \renewcommand{\cftsubsubsecafterpnum}{\cftparfillskip}% +} +\ifthenelse{\boolean{ct@tocaligned}}{\renewcommand{\cftsubsubsecindent}{0em}}{\relax} +% figures +\renewcommand{\cftfigpresnum}{\scshape\MakeTextLowercase}% +\renewcommand{\cftfigfont}{\normalfont}% +\ifthenelse{\boolean{ct@dottedtoc}}{\relax}% +{% + \renewcommand{\cftfigleader}{\hspace{1.5em}}% + \renewcommand{\cftfigafterpnum}{\cftparfillskip}% +} +\renewcommand{\cftfigpresnum}{\figurename~}%Fig.~} +\newlength{\figurelabelwidth} +\settowidth{\figurelabelwidth}{\cftfigpresnum~999} +\addtolength{\figurelabelwidth}{2.5em} +\cftsetindents{figure}{0em}{\figurelabelwidth} +% tables +\renewcommand{\cfttabpresnum}{\scshape\MakeTextLowercase}% +\renewcommand{\cfttabfont}{\normalfont}% +\ifthenelse{\boolean{ct@dottedtoc}}{\relax}% +{% + \renewcommand{\cfttableader}{\hspace{1.5em}}% + \renewcommand{\cfttabafterpnum}{\cftparfillskip}% +} +\renewcommand{\cfttabpresnum}{\tablename~}%Tab.~} +\newlength{\tablelabelwidth} +\settowidth{\tablelabelwidth}{\cfttabpresnum~999} +\addtolength{\tablelabelwidth}{2.5em} +%\cftsetindents{table}{0em}{\tablelabelwidth} +\cftsetindents{table}{0em}{\figurelabelwidth} +% listings +\ifthenelse{\boolean{ct@listings}}% +{% + \newlistof{listings}{lol}{\lstlistlistingname}% + \renewcommand{\cftlistingspresnum}{\scshape\MakeTextLowercase}% + \renewcommand{\cftlistingsfont}{\normalfont}% + \renewcommand{\cftlistingspresnum}{\lstlistingname~}% + \renewcommand{\cftlistingspagefont}{\normalfont}% + \ifthenelse{\boolean{ct@dottedtoc}}{\relax}% + {% + \renewcommand{\cftlistingsleader}{\hspace{1.5em}}% + \renewcommand{\cftlistingsafterpnum}{\cftparfillskip}% } - \ifxetex% thanks to Joerg Weber - \renewcommand{\tocEntry}[1]{% for bib, etc. - \ifxetex\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}% - \else{#1}\fi% - } \fi - -% % 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}% - \addtocontents{lot}{\deactivateaddvspace}% - \ifthenelse{\boolean{@listings}}% - {% + \newlength{\listingslabelwidth}% + \settowidth{\listingslabelwidth}{\cftlistingspresnum~999}% + \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{ct@parts}}% +{% + \AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforepartskip}}} +}{% + \ifthenelse{\boolean{ct@nochapters}}% + {\relax}% + {\AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforechapskip}}}} +} + + +\newcommand{\tocEntry}[1]{\protect\numberline {}{#1}}% + + +%% remove the vertical space between lof/lot entries of different chapters +\ifthenelse{\boolean{ct@listsseparated}}{% + \PackageWarningNoLine{classicthesis}{Option "listsseparated" deprecated as of version 2.9.}% +}{\relax} +% \ifthenelse{\boolean{ct@listsseparated}}{% +% \AtBeginDocument{% +% \addtocontents{lof}{\protect\vspace{-\cftbeforechapskip}}% +% \addtocontents{lot}{\protect\vspace{-\cftbeforechapskip}}% +% \ifthenelse{\boolean{ct@listings}}% +% {% +% \addtocontents{lol}{\protect\vspace{-\cftbeforechapskip}}% +% }{\relax}% +% }% +% }{% + + +\DeclareRobustCommand*{\deactivateaddvspace}{\let\addvspace\@gobble}% +\AtBeginDocument{% + \addtocontents{lof}{\deactivateaddvspace}% + \addtocontents{lot}{\deactivateaddvspace}% + \ifthenelse{\boolean{ct@listings}}% + {% \addtocontents{lol}{\deactivateaddvspace}% - }{\relax}% - }% -% } - + }{\relax}% +}% +% } + +% ******************************************************************** +% footnotes setup % ******************************************************************** -% footnotes setup -% ******************************************************************** \ifdefined\deffootnote - % KOMA-command, footnotemark not superscripted at the bottom - \deffootnote{0em}{0em}{\thefootnotemark\hspace*{.5em}}% - \message{Using KOMA-command "deffootnote" for footnote setup}% + % KOMA-command, footnotemark not superscripted at the bottom + \deffootnote{0em}{0em}{\thefootnotemark\hspace*{.5em}}% + \message{Using KOMA-command "deffootnote" for footnote setup}% \else \PassOptionsToPackage{flushmargin}{footmisc}% \RequirePackage{footmisc}% \setlength{\footnotemargin}{-.5em}% \PackageWarningNoLine{classicthesis}{Using package "footmisc" with option % - "flushmargin" for footnote setup (not 100\% the same as with KOMA)}% -\fi - + "flushmargin" for footnote setup (not 100\% the same as with KOMA)}% +\fi + % ******************************************************************** % Drafting Stuff % ******************************************************************** \RequirePackage{scrtime} % time access \newcommand{\finalVersionString}{\relax} \providecommand{\myVersion}{$\!\!$} % w/o classicthesis-config.tex -\ifthenelse{\boolean{@drafting}}{% +\ifthenelse{\boolean{ct@drafting}}{% % \RequirePackage{draftwatermark}% % \SetWatermarkLightness{0.9} % \SetWatermarkScale{.5} @@ -696,44 +659,38 @@ \RequirePackage{prelim2e} \renewcommand{\PrelimWords}{\relax} \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\ -- \texttt{classicthesis}~\myVersion\,]} -}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ (\texttt{classicthesis}~\myVersion).}} +}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ (\texttt{classicthesis}~\myVersion).}} % ******************************************************************** % Caption numbering now w/o chapter number % ******************************************************************** -\ifthenelse{\boolean{@floatperchapter}}{% - \ifthenelse{\boolean{@listings}}{% +\ifthenelse{\boolean{ct@floatperchapter}}{% + \ifthenelse{\boolean{ct@listings}}{% \lstset{numberbychapter=true}}{\relax}% numberbychapter works in listings>=1.4 }{% - \ifthenelse{\boolean{@listings}}{% + \ifthenelse{\boolean{ct@listings}}{% \lstset{numberbychapter=false}}{\relax}% \RequirePackage{remreset}% - \makeatletter% - \ifthenelse{\boolean{@nochapters}}% + \ifthenelse{\boolean{ct@nochapters}}% {\relax}{% \@removefromreset{table}{chapter} % requires remreset package }% \renewcommand{\thetable}{\arabic{table}}% - \makeatother% - \makeatletter% - \ifthenelse{\boolean{@nochapters}}% + \ifthenelse{\boolean{ct@nochapters}}% {\relax}{% \@removefromreset{figure}{chapter} % requires remreset package }% - \renewcommand{\thefigure}{\arabic{figure}}% - \makeatother% - \makeatletter% - \ifthenelse{\boolean{@nochapters}}% + \renewcommand{\thefigure}{\arabic{figure}}% + \ifthenelse{\boolean{ct@nochapters}}% {\relax}{% \@removefromreset{equation}{chapter} % requires remreset package }% - \renewcommand{\theequation}{\arabic{equation}}% - \makeatother% + \renewcommand{\theequation}{\arabic{equation}}% } % ******************************************************************** % Backward-compatibility -% ******************************************************************** +% ******************************************************************** \let\myChapter\chapter \let\myPart\part \let\graffito\marginpar |