diff options
| author | Karl Berry <karl@freefriends.org> | 2015-09-06 23:18:12 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2015-09-06 23:18:12 +0000 |
| commit | 32f50b97c2ae44e93225d1024afab9727fc02e00 (patch) | |
| tree | 187dac7ca2741019f383cfa896478cc2e71906c8 /Master | |
| parent | 63722ff891bacc71b43c6f75341ed5a563434866 (diff) | |
classicthesis (6sep15)
git-svn-id: svn://tug.org/texlive/trunk@38304 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
29 files changed, 812 insertions, 706 deletions
diff --git a/Master/texmf-dist/doc/latex/classicthesis/AMiede_Publications.bib b/Master/texmf-dist/doc/latex/classicthesis/AMiede_Publications.bib new file mode 100644 index 00000000000..a223159192b --- /dev/null +++ b/Master/texmf-dist/doc/latex/classicthesis/AMiede_Publications.bib @@ -0,0 +1,85 @@ +% This file was created with JabRef 2.8.1. +% 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} +} + +@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} +} + +@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} +} + +@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} +} + +@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} +} + +@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} +} + +@comment{jabref-meta: groupsversion:3;} + +@comment{jabref-meta: groupstree: +0 AllEntriesGroup:; +1 KeywordGroup:ERGNZEN\;0\;keywords\;ergnzen\;0\;0\;; +1 KeywordGroup:classicthesis\;0\;keywords\;classicthesis\;0\;0\;; +} + diff --git a/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib b/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib index 5a4b7e63449..a34e2bbc1b8 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib +++ b/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib @@ -1,4 +1,4 @@ -% This file was created with JabRef 2.6. +% This file was created with JabRef 2.8.1. % Encoding: Cp1252 @BOOK{bentley:1999, @@ -13,25 +13,25 @@ @BOOK{bringhurst:2002, title = {{T}he {E}lements of {T}ypographic {S}tyle}, publisher = {Hartley \& Marks Publishers}, - year = {2008}, + year = {2013}, author = {Robert Bringhurst}, - series = {Version 3.2}, + 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 = {2001}, + year = {2009}, author = {Cormen, Thomas H. and Leiserson, Charles E. and Rivest, Ronald L. and Clifford Stein}, address = {Cambridge, MA, USA}, - edition = {2nd} + edition = {3rd} } @BOOK{dueck:trio, title = {{D}ueck's {T}rilogie: {O}mnisophie -- {S}upramanie -- {T}opothesie}, - publisher = {Springer, Berlin}, + publisher = {Springer, Berlin, Germany}, year = {2005}, author = {Gunter Dueck}, note = {\url{http://www.omnisophie.com}} @@ -45,7 +45,6 @@ volume = {8}, pages = {18--24}, number = {2}, - month = {April/June}, address = {New York, NY, USA}, publisher = {ACM Press} } @@ -58,7 +57,6 @@ volume = {17}, pages = {667--673}, number = {12}, - month = {December }, address = {New York, NY, USA}, publisher = {ACM Press} } @@ -66,9 +64,18 @@ @BOOK{sommerville:1992, title = {{S}oftware {E}ngineering}, publisher = {Addison-Wesley}, - year = {1992}, + year = {2015}, author = {Ian Sommerville}, address = {Boston, MA, USA}, - edition = {4th} + edition = {10th} +} + +@BOOK{taleb:2012, + title = {{A}ntifragile: {T}hings {T}hat {G}ain from {D}isorder ({I}ncerto + {B}ook 3)}, + publisher = {Random House}, + year = {2012}, + author = {Nassim Nicholas Taleb}, + address = {New York, NY, USA} } diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES index d5b7caa206d..13eb31db4a9 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES +++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES @@ -1,3 +1,41 @@ +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 + (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 + to appropriate position in ClassicThesis.tex +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 + classicthesis-config.tex and Bibliography.tex + (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 + in classicthesis.sty (thanks to Ivo Pletìkosić). +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] +X Removed fixltx2e from classicthesis-config.tex and + 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] + Changes in version 4.1 (August 2012) o Working towards XeLaTeX support: - "ifxetex" package for checking whether diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex index 1b1765ed6b6..a473fdb330f 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex @@ -27,7 +27,7 @@ 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 -and Ivo Pletikosi\'c. The \mLyX\ version of this manual will contain +and Ivo Pletikosić. The \mLyX\ version of this manual will contain more information on the details. This should enable anyone with a basic knowledge of \LaTeXe\ or \mLyX\ to @@ -36,12 +36,12 @@ 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 -\textsmaller{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 Strae 32 \\ + André Miede \\ + Detmolder Straße 32 \\ 31737 Rinteln \\ Germany \end{center} @@ -68,8 +68,8 @@ 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 \\ - \url{http://www.ctan.org/tex-archive/macros/latex/contrib/booktabs/}.} + 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 numbers are right behind the titles. Yes, they are \emph{not} @@ -82,6 +82,28 @@ especially these: 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 +\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, +I will reach out to the \LaTeX\ community for their expertise and help. + \section{Organization} A very important factor for successful thesis writing is the @@ -112,9 +134,9 @@ the following: \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). + 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} @@ -122,104 +144,106 @@ the following: 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. +\clearpage \section{Style Options}\label{sec:options} There are a couple of options for \texttt{classicthesis.sty} that allow for a bit of freedom concerning the layout: \marginpar{\dots or your supervisor might use the margins for some comments of her own while reading.} \begin{itemize} - \item General: - \begin{itemize} - \item\texttt{drafting}: prints the date and time at the bottom of + \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. - \end{itemize} - - \item Parts and Chapters: - \begin{itemize} - \item\texttt{parts}: if you use Part divisions for your document, + \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 + \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. + \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} + \end{itemize} \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. + \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. - (Default setting is using the standard CM typewriter font.) - \item\texttt{eulermath}: loads the awesome Euler fonts for math. - (Palatino is used as default 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. + 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 and overrides - the \texttt{pdfspacing} option. + \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} - - \item Table of Contents: - \begin{itemize} - \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 - 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. - - \end{itemize} + \end{itemize} + + \item Table of Contents: + \begin{itemize} + \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 + 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. + + \end{itemize} - \item Floats: - \begin{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). + 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 classicthesis with the - \texttt{subfig} package. - + \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} + \end{itemize} -% \item\texttt{a5paper}: adjusts the page layout according to the +% \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 @@ -227,17 +251,16 @@ allow for a bit of freedom concerning the layout: \end{itemize} The best way to figure these options out is to try the different -possibilities and see, what you and your supervisor like best. +possibilities and see what you and your supervisor like best. -In order to make things easier in general, -\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 give you some hints about how to adapt +This section will show you some hints how to adapt \texttt{classicthesis} to your needs. The file \texttt{classicthesis.sty} @@ -251,30 +274,20 @@ the data in the following lines of \texttt{classicthesis-config.tex:}% \marginpar{Modifications in \texttt{classic\-thesis-config.tex}% } -\begin{lstlisting}[frame=lt] -% ************************************************** -% 2. Personal data and user ad-hoc commands -% ************************************************** -\newcommand{\myTitle}{A Classic Thesis Style\xspace} -\newcommand{\mySubtitle}{An Homage to...\xspace} +\begin{lstlisting} + % ************************************************** + % 2. Personal data and user ad-hoc commands + % ************************************************** + \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} (see~\autoref{sec:options}) in a line that looks like this: -\begin{lstlisting}[frame=lt] -\PassOptionsToPackage{eulerchapternumbers,drafting,listings,subfig,eulermath,parts}{classicthesis} -\end{lstlisting} - -If you want to use backreferences from your citations to the pages -they were cited on, change the following line from: -\begin{lstlisting}[breaklines=false,frame=lt] -\setboolean{enable-backrefs}{false} % true false -\end{lstlisting} -to -\begin{lstlisting}[breaklines=false,frame=lt] -\setboolean{enable-backrefs}{true} % true false +\begin{lstlisting} + \PassOptionsToPackage{eulerchapternumbers,drafting,listings,subfig,eulermath,parts}{classicthesis} \end{lstlisting} Many other customizations in \texttt{classicthesis-config.tex} are @@ -292,60 +305,47 @@ to get longer lines of text. This section will list some information about problems using \texttt{classic\-thesis} in general or using it with other packages. -Beta versions of \texttt{classicthesis} can be found at the following -Google code repository: +Beta versions of \texttt{classicthesis} can be found at Bitbucket: \begin{center} - \url{http://code.google.com/p/classicthesis/} + \url{https://bitbucket.org/amiede/classicthesis/} \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{verbatim} - \usepackage[style=long,nolist]{glossaries} -\end{verbatim} +\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{verbatim} - \usepackage[spanish,es-lcroman]{babel} -\end{verbatim} -Thanks to an unknown person for this information (via Google Code issue reporting). +\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{verbatim} - \selectlanguage{spanish} -\end{verbatim} - -In order to get the bibliography style right, you can use the following: -\begin{verbatim} - \bibliographystyle{babplain} -\end{verbatim} - -For this, it is necessary to load the package: -\begin{verbatim} - \usepackage[spanish,fixlanguage]{babelbib} - \selectbiblanguage{spanish} -\end{verbatim} - +\begin{lstlisting} + \selectlanguage{spanish} +\end{lstlisting} + If there are issues changing \verb|\tablename|, \eg, using this: -\begin{verbatim} - \renewcommand{\bibname}{Referencias} - \renewcommand{\tablename}{Tabla} -\end{verbatim} +\begin{lstlisting} + \renewcommand{\tablename}{Tabla} +\end{lstlisting} This can be solved by passing \texttt{es-tabla} parameter to \texttt{babel}: -\begin{verbatim} - \PassOptionsToPackage{es-tabla,spanish,es-lcroman,english}{babel} - \usepackage{babel} -\end{verbatim} +\begin{lstlisting} + \PassOptionsToPackage{es-tabla,spanish,es-lcroman,english}{babel} + \usepackage{babel} +\end{lstlisting} -But it is also necessary set \texttt{spanish} in the \verb|\documentclass|. +But it is also necessary to set \texttt{spanish} in the \verb|\documentclass|. Thanks to Alvaro Jaramillo Duque for this information. @@ -372,49 +372,47 @@ in general, do not hesitate to write them on that postcard of yours. \section{Beyond a Thesis} -It is easy to use the layout of \texttt{classicthesis.sty} without the -framework of this bundle. To make it even easier, this section offers -some plug-and-play-examples. - -The \LaTeX -sources of these examples can be found in the folder -with the name \texttt{Examples}. They have been tested with +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 -assure you even a bit more, PDFs built from the sources can also -be found in the folder. +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} +%\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} \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 \textsmaller{GNU} General Public License as + 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{merchantability} or \emph{fitness for a particular purpose}. + \emph{merchant\-ability} or \emph{fitness for a particular purpose}. See the - \textsmaller{GNU} General Public License for more details. + \acsfont{GNU} General Public License for more details. - You should have received a copy of the \textsmaller{GNU} General + 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, \textsmaller{MA} 02111-1307, \textsmaller{USA}. + Boston, MA 02111-1307, USA. %***************************************** %***************************************** diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex index 34ac3173720..da807c61d94 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex @@ -4,9 +4,11 @@ %\setcounter{figure}{10} % \NoCaseChange{Homo Sapiens} Ei choro aeterno antiopam mea, labitur bonorum pri no -\citeauthor{dueck:trio} \citep{dueck:trio}. His no decore +\citeauthor{taleb:2012} \citep{taleb:2012}. His no decore nemore graecis. In eos meis nominavi, liber soluta vim cu. Sea commune suavitate interpretaris eu, vix eu libris efficiantur. + + \section{A New Section} Illo principalmente su nos. Non message \emph{occidental} angloromanic da. Debitas effortio simplificate sia se, auxiliar summarios da que, @@ -18,6 +20,9 @@ se. Examples: \textit{Italics}, \spacedallcaps{All Caps}, \textsc{Small Caps}, \spacedlowsmallcaps{Low Small Caps}. +Acronym testing: \ac{UML} -- \acs{UML} -- \acf{UML} -- \acp{UML} + + \subsection{Test for a Subsection} \graffito{Note: The content of this chapter is just some dummy text. It is not a real language.} @@ -27,7 +32,7 @@ partiendo dissentiet ei ius. Vis melius facilisis ea, sea id convenire referrentur, takimata adolescens ex duo. Ei harum argumentum per. Eam vidit exerci appetere ad, ut vel zzril intellegam interpretaris. -Errem omnium ea per, pro \ac{UML} congue populo ornatus cu, ex qui +Errem omnium ea per, pro \ac{UML} con populo ornatus cu, ex qui dicant nemore melius. No pri diam iriure euismod. Graecis eleifend appellantur quo id. Id corpora inimicus nam, facer nonummy ne pro, kasd repudiandae ei mei. Mea menandri mediocrem dissentiet cu, ex @@ -78,12 +83,12 @@ qui. Lo malo laborava anteriormente uso. publicava le. Es que historia encyclopedia, sed terra celos avantiate in. Su pro effortio appellate, o. \end{description} + Tu uno veni americano sanctificate. Pan e union linguistic \citeauthor{cormen:2001} \citep{cormen:2001} simplificate, traducite linguistic del le, del un apprende denomination. - \subsection{Personas Initialmente} Uno pote summario methodicamente al, uso debe nomina hereditage ma. Iala rapide ha del, ma nos esser parlar. Maximo dictionario sed al. @@ -91,7 +96,12 @@ Iala rapide ha del, ma nos esser parlar. Maximo dictionario sed al. \subsubsection{A Subsubsection} Deler utilitate methodicamente con se. Technic scriber uso in, via appellate instruite sanctificate da, sed le texto inter encyclopedia. -Ha iste americas que, qui ma tempore capital. +Ha iste americas que, qui ma tempore capital. \citeauthor{dueck:trio} \citep{dueck:trio} + +\begin{aenumerate} + \item Enumeration with small caps (alpha) + \item Second item +\end{aenumerate} \paragraph{A Paragraph Example} Uno de membros summario preparation, es inter disuso qualcunque que. Del hodie philologos occidental al, @@ -102,10 +112,7 @@ americano initialmente ma. De duo deler personas initialmente. Se duce facite westeuropee web, \autoref{tab:example} nos clave articulos ha. -\begin{aenumerate} - \item Enumeration with small caps (alpha) - \item Second item -\end{aenumerate} + Medio integre lo per, non \citeauthor{sommerville:1992} \citep{sommerville:1992} es linguas integre. Al web altere integre @@ -166,7 +173,7 @@ methodicamente o uno, nos al. \subfloat[Titulo debitas.] {\includegraphics[width=.45\linewidth]{gfx/example_4}} \caption[Tu duo titulo debitas latente]{Tu duo titulo debitas - latente.}\label{fig:example} + latente. \ac{DRY}}\label{fig:example} \end{figure} diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex index 6d6f8370a91..23cd65247ac 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter0A.tex @@ -9,35 +9,23 @@ concludaturque. Albucius appellantur deterruisset id eam, vivendum partiendo dissentiet ei ius. Vis melius facilisis ea, sea id convenire referrentur, takimata adolescens ex duo. Ei harum argumentum per. Eam vidit exerci appetere ad, ut vel zzril intellegam interpretaris. +\graffito{More dummy text.} -Errem omnium ea per, pro congue populo ornatus cu, ex qui dicant -nemore melius. No pri diam iriure euismod. Graecis eleifend -appellantur quo id. Id corpora inimicus nam, facer nonummy ne pro, -kasd repudiandae ei mei. Mea menandri mediocrem dissentiet cu, ex -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. +%Errem omnium ea per, pro congue populo ornatus cu, ex qui dicant +%nemore melius. No pri diam iriure euismod. Graecis eleifend +%appellantur quo id. Id corpora inimicus nam, facer nonummy ne pro, +%kasd repudiandae ei mei. Mea menandri mediocrem dissentiet cu, ex +%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. \section{Appendix Section Test} -Ei choro aeterno antiopam mea, labitur bonorum pri no. His no decore -nemore graecis. In eos meis nominavi, liber soluta vim cu. Sea commune -suavitate interpretaris eu, vix eu libris efficiantur. - -\graffito{More dummy text.} -Nulla fastidii ea ius, exerci suscipit instructior te nam, in ullum -postulant quo. Congue quaestio philosophia his at, sea odio autem -vulputate ex. Cu usu mucius iisque voluptua. Sit maiorum propriae at, -ea cum primis intellegat. Hinc cotidieque reprehendunt eu nec. Autem -timeam deleniti usu id, in nec nibh altera. - -\section{Another Appendix Section Test} -Equidem detraxit cu nam, vix eu delenit periculis. Eos ut vero -constituto, no vidit propriae complectitur sea. Diceret nonummy in -has, no qui eligendi recteque consetetur. Mel eu dictas suscipiantur, -et sed placerat oporteat. At ipsum electram mei, ad aeque atomorum -mea. +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} +\begin{table}[h] \myfloatalign \begin{tabularx}{\textwidth}{Xll} \toprule \tableheadline{labitur bonorum pri no} & \tableheadline{que vista} @@ -55,15 +43,31 @@ mea. \label{tab:moreexample} \end{table} -Ei solet nemore consectetuer nam. Ad eam porro impetus, te choro omnes -evertitur mel. Molestie conclusionemque vel at, no qui omittam -expetenda efficiendi. Eu quo nobis offendit, verterem scriptorem ne -vix. +%Nulla fastidii ea ius, exerci suscipit instructior te nam, in ullum +%postulant quo. Congue quaestio philosophia his at, sea odio autem +%vulputate ex. Cu usu mucius iisque voluptua. Sit maiorum propriae at, +%ea cum primis intellegat. Hinc cotidieque reprehendunt eu nec. Autem +%timeam deleniti usu id, in nec nibh altera. + - -\begin{lstlisting}[float,caption=A floating example] -for i:=maxint to 0 do + + +\section{Another Appendix Section Test} +Equidem detraxit cu nam, vix eu delenit periculis. Eos ut vero +constituto, no vidit propriae complectitur sea. Diceret nonummy in +has, no qui eligendi recteque consetetur. Mel eu dictas suscipiantur, +et sed placerat oporteat. At ipsum electram mei, ad aeque atomorum +mea. There is also a useless Pascal listing below: \autoref{lst:useless}. + +\begin{lstlisting}[float=b,language=Pascal,frame=tb,caption={A floating example (\texttt{listings} manual)},label=lst:useless] +for i:=maxint downto 0 do begin { do nothing } end; -\end{lstlisting}
\ No newline at end of file +\end{lstlisting} + +%Ei solet nemore consectetuer nam. Ad eam porro impetus, te choro omnes +%evertitur mel. Molestie conclusionemque vel at, no qui omittam +%expetenda efficiendi. Eu quo nobis offendit, verterem scriptorem ne +%vix. + diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf Binary files differindex ee2c43e0f08..04f97c15db0 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 3826894c3d7..bf6b3087314 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex @@ -2,7 +2,7 @@ % A Classic Thesis Style % An Homage to The Elements of Typographic Style % -% Copyright (C) 2012 Andr\'e Miede http://www.miede.de +% Copyright (C) 2015 André Miede http://www.miede.de % % If you like the style then I would appreciate a postcard. My address % can be found in the file ClassicThesis.pdf. A collection of the @@ -26,18 +26,7 @@ % Boston, MA 02111-1307, USA. % % ************************************************************************************************************** -% Note: -% * You must not use "u etc. in strings/commands that will be spaced out (use \"u or real umlauts instead) -% * New enumeration (small caps): \begin{aenumerate} \end{aenumerate} -% * For margin notes: \marginpar or \graffito{} -% * Do not use bold fonts in this style, it is designed around them -% * Use tables as in the examples -% * See classicthesis-preamble.sty for useful commands -% ************************************************************************************************************** -% To Do: -% * [high] Check this out: http://www.golatex.de/koma-script-warnung-in-verbindung-mit-listings-package-t2058.html -% * [medium] mathbb in section-titles/chapter-titles => disappears somehow in headlines!!! -% ************************************************************************************************************** +\RequirePackage{fix-cm} % fix some latex issues see: http://texdoc.net/texmf-dist/doc/latex/base/fixltx2e.pdf \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,% @@ -50,6 +39,12 @@ \input{classicthesis-config} %******************************************************************** +% Bibliographies +%******************************************************* +\addbibresource{Bibliography.bib} +\addbibresource[label=ownpubs]{AMiede_Publications.bib} + +%******************************************************************** % Hyphenation %******************************************************* %\hyphenation{put special hyphenation here} @@ -74,14 +69,14 @@ \cleardoublepage\include{FrontBackmatter/Dedication} %\cleardoublepage\include{FrontBackmatter/Foreword} \cleardoublepage\include{FrontBackmatter/Abstract} -\cleardoublepage\include{FrontBackmatter/Publication} +\cleardoublepage\include{FrontBackmatter/Publications} \cleardoublepage\include{FrontBackmatter/Acknowledgments} \pagestyle{scrheadings} \cleardoublepage\include{FrontBackmatter/Contents} %******************************************************************** % Mainmatter %******************************************************* -\pagenumbering{arabic} +\cleardoublepage\pagenumbering{arabic} %\setcounter{page}{90} % use \cleardoublepage here to avoid problems with pdfbookmark \cleardoublepage @@ -103,6 +98,7 @@ da. Le usate medical addresses pro, europa origine sanctificate nos se.} % Backmatter %******************************************************* \appendix +%\renewcommand{\thechapter}{\alph{chapter}} \cleardoublepage \part{Appendix} \include{Chapters/Chapter0A} @@ -110,8 +106,8 @@ da. Le usate medical addresses pro, europa origine sanctificate nos se.} % Other Stuff in the Back %******************************************************* \cleardoublepage\include{FrontBackmatter/Bibliography} -\cleardoublepage\include{FrontBackmatter/Colophon} \cleardoublepage\include{FrontBackmatter/Declaration} +\cleardoublepage\include{FrontBackmatter/Colophon} % ******************************************************************** % Game Over: Restore, Restart, or Quit? %******************************************************* diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps index cc7ad45608f..67a5f0149ed 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=26 -NormalPos.right=1242 -NormalPos.bottom=610 +NormalPos.top=32 +NormalPos.right=1916 +NormalPos.bottom=630 Class=LaTeXView -Document=Chapters\Chapter01.tex +Document=classicthesis-config.tex [Frame0_View0,0] -TopLine=313 -Cursor=13737 +TopLine=0 +Cursor=583 [Frame1] Flags=0 @@ -28,15 +28,15 @@ MinPos.y=-1 MaxPos.x=-1 MaxPos.y=-1 NormalPos.left=4 -NormalPos.top=26 -NormalPos.right=1242 -NormalPos.bottom=610 +NormalPos.top=32 +NormalPos.right=1916 +NormalPos.bottom=630 Class=LaTeXView -Document=Chapters\Chapter03.tex +Document=ClassicThesis.tex [Frame1_View0,0] -TopLine=0 -Cursor=0 +TopLine=18 +Cursor=1765 [Frame2] Flags=0 @@ -46,15 +46,15 @@ MinPos.y=-1 MaxPos.x=-1 MaxPos.y=-1 NormalPos.left=4 -NormalPos.top=26 -NormalPos.right=1242 -NormalPos.bottom=610 +NormalPos.top=32 +NormalPos.right=1916 +NormalPos.bottom=630 Class=LaTeXView -Document=classicthesis-config.tex +Document=Chapters\Chapter01.tex [Frame2_View0,0] -TopLine=0 -Cursor=0 +TopLine=51 +Cursor=3243 [Frame3] Flags=0 @@ -64,15 +64,15 @@ MinPos.y=-1 MaxPos.x=-1 MaxPos.y=-1 NormalPos.left=4 -NormalPos.top=26 -NormalPos.right=1242 -NormalPos.bottom=610 +NormalPos.top=32 +NormalPos.right=1916 +NormalPos.bottom=630 Class=LaTeXView -Document=ClassicThesis.tex +Document=Chapters\Chapter0A.tex [Frame3_View0,0] -TopLine=0 -Cursor=0 +TopLine=42 +Cursor=2800 [Frame4] Flags=0 @@ -82,53 +82,17 @@ MinPos.y=-1 MaxPos.x=-1 MaxPos.y=-1 NormalPos.left=4 -NormalPos.top=26 -NormalPos.right=1242 -NormalPos.bottom=610 -Class=LaTeXView -Document=CHANGES - -[Frame4_View0,0] -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=1242 -NormalPos.bottom=610 -Class=LaTeXView -Document=classicthesis.sty - -[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=1242 -NormalPos.bottom=610 +NormalPos.top=32 +NormalPos.right=1916 +NormalPos.bottom=630 Class=LaTeXView Document=Chapters\Chapter02.tex -[Frame6_View0,0] -TopLine=0 -Cursor=0 +[Frame4_View0,0] +TopLine=11 +Cursor=920 [SessionInfo] -FrameCount=7 -ActiveFrame=0 +FrameCount=5 +ActiveFrame=1 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 0acc413c14e..aba82e818de 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 d6d6bcf235d..3af881d8a01 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex @@ -5,6 +5,7 @@ \usepackage[nochapters]{../classicthesis} % nochapters \begin{document} + \pagestyle{plain} \title{\rmfamily\normalfont\spacedallcaps{the title}} \author{\spacedlowsmallcaps{tyler durden}} \date{} % no date diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.pdf Binary files differindex c0ea92125e2..377d6d5798b 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.pdf +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.pdf 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 13817876ec7..2d6ec9e5f62 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 @@ -8,15 +8,15 @@ %\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false} \begin{document} -% \pagestyle{scrheadings} -% \manualmark -% \markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} - - \tableofcontents +% \pagestyle{scrheadings} +% \manualmark +% \markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} + + \tableofcontents -% \automark[section]{chapter} -% \renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}} -% \renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}} +% \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} @@ -32,7 +32,7 @@ \section{A Section} \lipsum[1] -% \include{multiToC} +% \include{multiToC} \appendix \cleardoublepage\part{Appendix} 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 19c5dadfa52..7d9f82d57b9 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 bb18366e0b7..74aeb30052d 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex @@ -1,52 +1,26 @@ % book example for classicthesis.sty -\documentclass[11pt,a5paper,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book +\documentclass[11pt,paper=a5,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book \usepackage[T1]{fontenc} \usepackage{lipsum} -\usepackage[linedheaders,parts,pdfspacing]{../classicthesis} % ,manychapters +\usepackage[linedheaders,parts,a5paper]{../classicthesis} % ,manychapters %\usepackage[osf]{libertine} -\usepackage{amsthm} - \begin{document} -% \pagestyle{scrheadings} -% \manualmark -% \markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} - - \tableofcontents +% \pagestyle{scrheadings} +% \manualmark +% \markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} + + \tableofcontents -% \automark[section]{chapter} -% \renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}} -% \renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}} +% \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} \chapter{Some Math Testing} - \newtheoremstyle{note}% hnamei - {3pt}% hSpace abovei - {3pt}% hSpace belowi note - {}% hBody fonti - {}% hIndent amounti1 - {\itshape}% hTheorem head fonti -% {\spacedlowsmallcaps}% - {:}% hPunctuation after theorem headi - {.5em}% hSpace after theorem headi2 - {}% - \theoremstyle{note} - \newtheorem{note}{Definition} - \begin{note} - Here is a new definition - \end{note} - - - \begin{proof} - Here is my proof: - \[ - a^2 + b^2 = c^2 \qedhere - \] - \end{proof} - - - + \lipsum[1] + \chapter{Test Chapter} \lipsum[1] @@ -59,7 +33,7 @@ \section{A Section} \lipsum[1] -% \include{multiToC} +% \include{multiToC} \appendix \cleardoublepage\part{Appendix} 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 b744616fcd6..c382cfe8bef 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 84d6284f376..916b72f01fb 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex @@ -4,29 +4,24 @@ \usepackage{url} \usepackage[ngerman]{babel} \usepackage[nochapters]{../classicthesis} -% Some font experiments -%\usepackage[osf]{libertine} -%\usepackage{hfoldsty} -%\usepackage[math]{iwona} %[light,condensed,math] -%\renewcommand{\sfdefault}{iwona} -%\usepackage{lmodern} % <-- no osf support :-( -%\usepackage[urw-garamond]{mathdesign} %<-- no osf support :-( \renewcommand*{\cvheadingfont}{\LARGE\color{Maroon}} \renewcommand*{\cvlistheadingfont}{\large} \renewcommand*{\cvlabelfont}{\qquad} \begin{document} + \pagestyle{plain} \begin{cv}{\spacedallcaps{Curriculum Vit\ae}} %\pdfbookmark[1]{Pers\"onliche Daten}{PersDat} - \begin{cvlist}{\spacedlowsmallcaps{Pers\"onliche Daten}}\label{PersDat} - \item Dr.-Ing.~Andr\'e Miede - \item Geboren am \dots\ \texttt{(-;} \\ + \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 \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 diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex index d90ac391302..bb483ee22b3 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex @@ -9,15 +9,19 @@ \let\cleardoublepage\relax \chapter*{Abstract} -Short summary of the contents in English\dots - +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} \vfill +\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 diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex index 9d13e692ebc..51343f0dc2f 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex @@ -30,7 +30,8 @@ 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\"org Weber, + 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. @@ -39,7 +40,7 @@ Legovini, Steffen Prochnow, Nicolas Repp, Hinrich Harms, \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 the contributions to the original style. +work and for the contributions to the original style. \endgroup diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex index 45970d91eb0..13e34864a42 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Bibliography.tex @@ -8,6 +8,5 @@ \refstepcounter{dummy} \addtocontents{toc}{\protect\vspace{\beforebibskip}} % to have the bib a bit from the rest in the toc \addcontentsline{toc}{chapter}{\tocEntry{\bibname}} -\bibliographystyle{plainnat} -\label{app:bibliography} -\bibliography{Bibliography}
\ No newline at end of file +\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 60e1b5ddc41..c063b53c998 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Colophon.tex @@ -11,7 +11,7 @@ This document was typeset using the typographical look-and-feel \texttt{classict 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{http://code.google.com/p/classicthesis/} +\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: \begin{center} diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex index 2463fe951cc..091d8519ffd 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex @@ -30,7 +30,7 @@ \pdfbookmark[1]{\listfigurename}{lof} \listoffigures - \vspace*{8ex} + \vspace{8ex} %******************************************************* % List of Tables @@ -41,19 +41,19 @@ \pdfbookmark[1]{\listtablename}{lot} \listoftables - \vspace*{8ex} + \vspace{8ex} % \newpage %******************************************************* % List of Listings %******************************************************* - %\phantomsection + %\phantomsection \refstepcounter{dummy} %\addcontentsline{toc}{chapter}{\lstlistlistingname} \pdfbookmark[1]{\lstlistlistingname}{lol} \lstlistoflistings - \vspace*{8ex} + \vspace{8ex} %******************************************************* % Acronyms @@ -63,11 +63,9 @@ \pdfbookmark[1]{Acronyms}{acronyms} \markboth{\spacedlowsmallcaps{Acronyms}}{\spacedlowsmallcaps{Acronyms}} \chapter*{Acronyms} - \begin{acronym}[UML] + \begin{acronym}[UMLX] \acro{DRY}{Don't Repeat Yourself} \acro{API}{Application Programming Interface} \acro{UML}{Unified Modeling Language} \end{acronym} \endgroup - -\cleardoublepage
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publication.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publication.tex deleted file mode 100644 index df9ed0ed09c..00000000000 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publication.tex +++ /dev/null @@ -1,10 +0,0 @@ -%******************************************************* -% Publications -%******************************************************* -\pdfbookmark[1]{Publications}{publications} -\chapter*{Publications} -Some ideas and figures have appeared previously in the following publications: - -\bigskip - -\noindent Put your publications from the thesis here. The packages \texttt{multibib} or \texttt{bibtopic} etc. can be used to handle multiple different bibliographies in your document.
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publications.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publications.tex new file mode 100644 index 00000000000..998e4ce9e42 --- /dev/null +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Publications.tex @@ -0,0 +1,16 @@ +%******************************************************* +% Publications +%******************************************************* +\pdfbookmark[1]{Publications}{publications} +\chapter*{Publications}\graffito{This is just an early --~and currently ugly~-- test!} +This might come in handy for PhD theses: some ideas and figures have appeared previously in the following publications: + +%\noindent Put your publications from the thesis here. The packages \texttt{multibib} or \texttt{bibtopic} etc. can be used to handle multiple different bibliographies in your document. + +\begin{refsection}[ownpubs] + \small + \nocite{*} % is local to to the enclosing refsection + \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 diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex index 06b118ce180..47dd9a7ebf3 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex @@ -2,8 +2,8 @@ % Titlepage %******************************************************* \begin{titlepage} - % if you want the titlepage to be centered, uncomment and fine-tune the line below (KOMA classes environment) - \begin{addmargin}[-1cm]{-3cm} + % 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 diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES index 8194d297d34..aaeb4f5ea8e 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES +++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES @@ -1,26 +1,46 @@ LIST OF FILES FOR ClassicThesis.tex *File List* -scrreprt.cls 2012/07/29 v3.11b KOMA-Script document class (report) -scrkbase.sty 2012/07/29 v3.11b KOMA-Script package (KOMA-Script-dependent ba -sics and keyval usage) - scrbase.sty 2012/07/29 v3.11b KOMA-Script package (KOMA-Script-independent -basics and keyval usage) - keyval.sty 1999/03/16 v1.13 key=value parser (DPC) -scrlfile.sty 2012/06/15 v3.12 KOMA-Script package (loading files) -tocbasic.sty 2012/04/04 v3.10b KOMA-Script package (handling toc-files) -scrsize11pt.clo 2012/07/29 v3.11b KOMA-Script font size class option (11pt) -typearea.sty 2012/07/29 v3.11b KOMA-Script package (type area) + 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) + 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) classicthesis-config.tex - ifthen.sty 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC) -inputenc.sty 2008/03/30 v1.1d Input encoding file - latin9.def 2008/03/30 v1.1d Input encoding file - babel.sty 2008/07/08 v3.8m The Babel package +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 -ngermanb.ldf 2008/07/06 v2.6n new German support from the babel system - english.ldf 2005/03/30 v3.3o English support from the babel system - natbib.sty 2010/09/13 8.31b (PWD, AO) - amsmath.sty 2000/07/18 v2.13 AMS math features + 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) +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) + 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) +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 @@ -29,33 +49,34 @@ ngermanb.ldf 2008/07/06 v2.6n new German support from the babel system t1enc.def 2005/09/27 v1.99g Standard LaTeX file textcomp.sty 2005/09/27 v1.99g Standard LaTeX package ts1enc.def 2001/06/05 v3.0e (jk/car/fm) Standard LaTeX file - scrhack.sty 2012/07/29 v3.11b KOMA-Script package (hacking other packages) - xspace.sty 2009/10/20 v1.13 Space after command names (DPC,MH) + scrhack.sty 2015/07/02 v3.18 KOMA-Script package + 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 2006/09/13 v1.1m fixes to LaTeX - acronym.sty 2010/09/08 v1.36 Support for acronyms (Tobias Oetiker) - suffix.sty 2006/07/15 1.5 Variant command support +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 1999/01/07 v2.07 `tabularx' package (DPC) - array.sty 2008/09/09 v2.4c Tabular extension package (FMi) - caption.sty 2012/02/19 v3.2f Customizing captions (AR) -caption3.sty 2012/01/12 v1.4b caption3 kernel (AR) +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) subfig.sty 2005/06/28 ver: 1.3 subfig package -listings.sty 2007/02/22 1.4 (Carsten Heinz) - lstmisc.sty 2007/02/22 1.4 (Carsten Heinz) -listings.cfg 2007/02/22 1.4 listings configuration -listings.hak 2012/07/29 v3.11b KOMA-Script hacking package listings -lstlang1.sty 2004/09/05 1.3 listings language file -lstlang2.sty 2004/09/05 1.3 listings language file -lstlang3.sty 2004/09/05 1.3 listings language file -lstlang1.sty 2004/09/05 1.3 listings language file -lstlang2.sty 2004/09/05 1.3 listings language file -lstlang3.sty 2004/09/05 1.3 listings language file -lstlang1.sty 2004/09/05 1.3 listings language file -lstlang2.sty 2004/09/05 1.3 listings language file -lstlang3.sty 2004/09/05 1.3 listings language file - lstmisc.sty 2007/02/22 1.4 (Carsten Heinz) -hyperref.sty 2012/08/03 v6.82y Hypertext links for LaTeX +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) +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 +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 +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) @@ -83,38 +104,43 @@ refcount.sty 2011/10/16 v3.4 Data extraction from label references (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/08/03 v6.82y Hyperref: PDFDocEncoding definition (HO) + pd1enc.def 2012/11/06 v6.83m Hyperref: PDFDocEncoding definition (HO) hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive - url.sty 2006/04/12 ver 3.3 Verb mode for urls, etc. - hpdftex.def 2012/08/03 v6.82y Hyperref driver for pdfTeX + 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 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR) -graphics.sty 2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR) +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 2012/08/12 v4.1 Typographic style for a classic-looking th -esis +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 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR) +dvipsnam.def 2014/10/14 v3.0j 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 2010/01/10 v2.4 Micro-typography with pdfTeX (RS) -microtype.cfg 2010/01/10 v2.4 microtype main configuration file (RS) +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) booktabs.sty 2005/04/14 v1.61803 publication quality tables textcase.sty 2004/10/07 v0.07 Text only upper/lower case changing (DPC) -scrpage2.sty 2010/04/22 v2.5 LaTeX2e KOMA-Script package +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 2010/10/13 v2.3e parameterised ToC, etc., typesetting - scrtime.sty 2012/07/29 v3.11b KOMA-Script package (time of LaTeX run) + 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) prelim2e.sty 2009/05/29 v1.3 prelim2e Package (MS) everyshi.sty 2001/05/15 v3.00 EveryShipout Package (MS) remreset.sty - ts1cmr.fd 1999/05/25 v2.5h Standard LaTeX font definitions + 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) t1pplj.fd 2004/09/06 font definitions for T1/pplj. - nameref.sty 2012/07/31 v2.42 Cross-referencing by name of section +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) ClassicThesis.out ClassicThesis.out @@ -128,20 +154,16 @@ FrontBackmatter/Titleback.tex ts1pplj.fd 2004/09/06 font definitions for TS1/pplj. FrontBackmatter/Dedication.tex FrontBackmatter/Abstract.tex -FrontBackmatter/Publication.tex -FrontBackmatter/Acknowledgments.tex uzeur.fd 2005/01/11 v4.0 (WaS) mt-eur.cfg 2006/07/31 v1.1 microtype config. file: AMS Euler Roman (RS) uzeus.fd 2005/01/11 v4.0 (WaS) mt-eus.cfg 2006/07/28 v1.2 microtype config. file: AMS Euler Script (RS) uzeuex.fd 2005/01/11 v4.0 (WaS) ot1zplm.fd 2002/09/08 Fontinst v1.914 font definitions for OT1/zplm. +FrontBackmatter/Publications.tex +FrontBackmatter/Acknowledgments.tex FrontBackmatter/Contents.tex - t1cmss.fd 1999/05/25 v2.5h Standard LaTeX font definitions Chapters/Chapter01.tex -Examples/classicthesis-article.tex -Examples/classicthesis-book.tex -Examples/classicthesis-cv.tex Chapters/Chapter02.tex gfx/example_1.jpg gfx/example_2.jpg @@ -149,8 +171,8 @@ gfx/example_3.jpg gfx/example_4.jpg Chapters/Chapter03.tex Chapters/Chapter0A.tex +lstlang1.sty 2015/06/04 1.6 listings language file FrontBackmatter/Bibliography.tex -ClassicThesis.bbl -FrontBackmatter/Colophon.tex FrontBackmatter/Declaration.tex +FrontBackmatter/Colophon.tex ***********
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/classicthesis/README b/Master/texmf-dist/doc/latex/classicthesis/README index 4a912040f3d..1a6dab2f535 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/README +++ b/Master/texmf-dist/doc/latex/classicthesis/README @@ -1,6 +1,6 @@ -A Classic Thesis Style +A Classic Thesis Style v4.2 An Homage to The Elements of Typographic Style -Copyright (C) 2012 Andr\'e Miede http://www.miede.de +Copyright (C) 2015 André Miede http://www.miede.de Please see the file ClassicThesis.pdf for more information. Your comments are highly appreciated. diff --git a/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex b/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex index bf6280ac2df..e6d8bc18271 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex @@ -10,13 +10,22 @@ % http://postcards.miede.de % **************************************************************************************************** + +% **************************************************************************************************** +% 0. Set the encoding of your files. UTF-8 is the only sensible encoding nowadays. If you can't read +% äöüßáéçèê∂åëæƒÏ€ then change the encoding setting in your editor, not the line below. If your editor +% does not support utf8 use another editor! +% **************************************************************************************************** +\PassOptionsToPackage{utf8}{inputenc} + \usepackage{inputenc} + % **************************************************************************************************** % 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} + pdfspacing,%floatperchapter,%linedheaders,% + subfig,beramono,eulermath,parts}{classicthesis} % ******************************************************************** % Available options for classicthesis.sty % (see ClassicThesis.pdf for more information): @@ -27,14 +36,6 @@ % listings floatperchapter subfig % ******************************************************************** -% ******************************************************************** -% Triggers for this config -% ******************************************************************** -\usepackage{ifthen} -\newboolean{enable-backrefs} % enable backrefs in the bibliography -\setboolean{enable-backrefs}{false} % true false -% **************************************************************************************************** - % **************************************************************************************************** % 2. Personal data and user ad-hoc commands @@ -42,16 +43,16 @@ \newcommand{\myTitle}{A Classic Thesis Style\xspace} \newcommand{\mySubtitle}{An Homage to The Elements of Typographic Style\xspace} \newcommand{\myDegree}{Doktor-Ingenieur (Dr.-Ing.)\xspace} -\newcommand{\myName}{Andr\'e Miede\xspace} +\newcommand{\myName}{André Miede\xspace} \newcommand{\myProf}{Put name here\xspace} \newcommand{\myOtherProf}{Put name here\xspace} \newcommand{\mySupervisor}{Put name here\xspace} \newcommand{\myFaculty}{Put data here\xspace} \newcommand{\myDepartment}{Put data here\xspace} \newcommand{\myUni}{Put data here\xspace} -\newcommand{\myLocation}{Darmstadt\xspace} -\newcommand{\myTime}{August 2012\xspace} -\newcommand{\myVersion}{version 4.1\xspace} +\newcommand{\myLocation}{Saarbrücken\xspace} +\newcommand{\myTime}{September 2015\xspace} +\newcommand{\myVersion}{version 4.2\xspace} % ******************************************************************** % Setup, finetuning, and useful commands @@ -72,34 +73,45 @@ % ******************************************************************** % Packages with options that might require adjustments % ******************************************************************** -\PassOptionsToPackage{latin9}{inputenc} % latin9 (ISO-8859-9) = latin1+"Euro sign" - \usepackage{inputenc} - %\PassOptionsToPackage{ngerman,american}{babel} % change this to your language(s) % Spanish languages need extra options in order to work with this template %\PassOptionsToPackage{spanish,es-lcroman}{babel} - \usepackage{babel} + \usepackage{babel} -\PassOptionsToPackage{square,numbers}{natbib} - \usepackage{natbib} +\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) +}{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{mparhack} % get marginpar right -\usepackage{fixltx2e} % fixes some LaTeX stuff -\PassOptionsToPackage{printonlyused,smaller}{acronym} - \usepackage{acronym} % nice macros for handling all acronyms in the thesis -%\renewcommand*{\acsfont}[1]{\textssc{#1}} % for MinionPro -\renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms +\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}} % **************************************************************************************************** @@ -107,11 +119,16 @@ % 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} -\captionsetup{format=hang,font=small} +% Thanks to cgnieder and Claus Lahiri +% http://tex.stackexchange.com/questions/69349/spacedlowsmallcaps-in-caption-label +% [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} % **************************************************************************************************** @@ -122,6 +139,7 @@ \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}, @@ -133,12 +151,12 @@ numbersep=8pt, showstringspaces=false, breaklines=true, - frameround=ftff, - frame=single, + %frameround=ftff, + %frame=single, belowcaptionskip=.75\baselineskip %frame=L } -% **************************************************************************************************** +% **************************************************************************************************** % **************************************************************************************************** @@ -148,44 +166,21 @@ % Using PDFLaTeX % ******************************************************************** \PassOptionsToPackage{pdftex,hyperfootnotes=false,pdfpagelabels}{hyperref} - \usepackage{hyperref} % backref linktocpage pagebackref + \usepackage{hyperref} % backref linktocpage pagebackref \pdfcompresslevel=9 \pdfadjustspacing=1 \PassOptionsToPackage{pdftex}{graphicx} - \usepackage{graphicx} - -% ******************************************************************** -% Setup the style of the backrefs from the bibliography -% (translate the options to any language you use) -% ******************************************************************** -\newcommand{\backrefnotcitedstring}{\relax}%(Not cited.) -\newcommand{\backrefcitedsinglestring}[1]{(Cited on page~#1.)} -\newcommand{\backrefcitedmultistring}[1]{(Cited on pages~#1.)} -\ifthenelse{\boolean{enable-backrefs}}% -{% - \PassOptionsToPackage{hyperpageref}{backref} - \usepackage{backref} % to be loaded after hyperref package - \renewcommand{\backreftwosep}{ and~} % separate 2 pages - \renewcommand{\backreflastsep}{, and~} % separate last of longer list - \renewcommand*{\backref}[1]{} % disable standard - \renewcommand*{\backrefalt}[4]{% detailed backref - \ifcase #1 % - \backrefnotcitedstring% - \or% - \backrefcitedsinglestring{#2}% - \else% - \backrefcitedmultistring{#2}% - \fi}% -}{\relax} + \usepackage{graphicx} + % ******************************************************************** % Hyperreferences % ******************************************************************** \hypersetup{% - %draft, % = no hyperlinking at all (useful in b/w printouts) + %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, pdfborder={0 0 0}, pdfstartpage=3, pdfstartview=FitV,% + %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,% @@ -213,26 +208,26 @@ \@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}% - }% + \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}% + \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 @@ -245,9 +240,9 @@ % ******************************************************************** \listfiles %\PassOptionsToPackage{l2tabu,orthodox,abort}{nag} -% \usepackage{nag} +% \usepackage{nag} %\PassOptionsToPackage{warning, all}{onlyamsmath} -% \usepackage{onlyamsmath} +% \usepackage{onlyamsmath} % ******************************************************************** % Last, but not least... @@ -272,9 +267,11 @@ % ******************************************************************** %\usepackage[oldstylenums]{kpfonts} % oldstyle notextcomp %\usepackage[osf]{libertine} -%\usepackage{hfoldsty} % Computer Modern with osf %\usepackage[light,condensed,math]{iwona} %\renewcommand{\sfdefault}{iwona} %\usepackage{lmodern} % <-- no osf support :-( +%\usepackage{cfr-lm} % %\usepackage[urw-garamond]{mathdesign} <-- no osf support :-( +%\usepackage[default,osfigures]{opensans} % scale=0.95 +%\usepackage[sfdefault]{FiraSans} % **************************************************************************************************** diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty index 2e6fd59c85d..a82277c21b7 100644 --- a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty +++ b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty @@ -1,7 +1,7 @@ % ******************************************************************** % classicthesis.sty % -% Copyright (C) 2012 Andr\'e Miede http://www.miede.de +% Copyright (C) 2015 André Miede http://www.miede.de % % If you like the style then I would appreciate a postcard. My address % can be found in the file ClassicThesis.pdf. A collection of the @@ -38,8 +38,10 @@ % option pdfspacing of this package % % ******************************************************************** -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{classicthesis}[2012/08/12 v4.1 Typographic style for a classic-looking thesis] +\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 \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) @@ -56,9 +58,9 @@ \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) + \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 @@ -103,7 +105,7 @@ % listings-related stuff \ifthenelse{\boolean{@listings}}% {\@ifpackageloaded{listings}% - {\relax}{\RequirePackage{listings}}% + {\relax}{\RequirePackage{listings}}% }{\relax}% % fine-tuning if we use minionprospacing @@ -167,19 +169,19 @@ % 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}% + \ifthenelse{\boolean{@pdfspacing}}% + {% pdfspacing is used with XeLaTeX + \PackageWarningNoLine{classicthesis}{You cannot use the option % + "pdfspacing" with XeLaTeX!}% + }{\relax}% + \setboolean{@pdfspacing}{false}% \fi % ******************************************************************** % 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} @@ -193,14 +195,14 @@ % 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 + % 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 + \PassOptionsToPackage{opticals,mathlf}{MinionPro}% + \RequirePackage{MinionPro} % opticals, fullfamily, osf }% }{% % default: Palatino @@ -213,9 +215,9 @@ {\PassOptionsToPackage{scaled=0.85}{beramono}% \RequirePackage{beramono}}% {% - \relax% - % put your own suitable typewriter font here - %\renewcommand{\ttdefault}{\rmdefault} + \relax% + % put your own suitable typewriter font here + %\renewcommand{\ttdefault}{\rmdefault} } \ifthenelse{\boolean{@eulermath}}% {\PassOptionsToPackage{euler-digits}{eulervm}% @@ -236,45 +238,45 @@ % Textblock size %******************************************************* \@ifpackageloaded{typearea}% - {\relax}{% - \RequirePackage{typearea}% - } + {\relax}{% + \RequirePackage{typearea}% + } \ifthenelse{\boolean{@a5paper}}% {% A5 \ifthenelse{\boolean{@minionpro}}% - {% Minion gets some extra sizes - \PackageInfo{classicthesis}{A5 paper, MinionPro}% + {% Minion gets some extra sizes + \PackageInfo{classicthesis}{A5 paper, MinionPro}% \areaset[current]{278pt}{556pt}% - \setlength{\marginparwidth}{5em}% - \setlength{\marginparsep}{1.25em}% + \setlength{\marginparwidth}{5em}% + \setlength{\marginparsep}{1.25em}% }{% Palatino or other - \PackageInfo{classicthesis}{A5 paper, Palatino or other}% + \PackageInfo{classicthesis}{A5 paper, Palatino or other}% \areaset[current]{288pt}{555pt}% \setlength{\marginparwidth}{4em}% \setlength{\marginparsep}{1.25em}% }% - }{% A4 + }{% A4 \ifthenelse{\boolean{@minionpro}}% - {% Minion gets some extra sizes - \PackageInfo{classicthesis}{A4 paper, 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 - \setlength{\marginparwidth}{7em}% + \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 + \setlength{\marginparwidth}{7em}% \setlength{\marginparsep}{2em}% }% - } + } % Here are some suggestions for the text widths and heights: -% Palatino 10pt: 288--312pt | 609--657pt -% Palatino 11pt: 312--336pt | 657--705pt -% Palatino 12pt: 360--384pt | 768pt -% Minion 10pt: 264--288pt | 561--609pt -% Minion 11pt: 288--312pt | 609--657pt -% Minion 12pt: 336pt | 672pt +% Palatino 10pt: 288--312pt | 609--657pt +% Palatino 11pt: 312--336pt | 657--705pt +% Palatino 12pt: 360--384pt | 768pt +% Minion 10pt: 264--288pt | 561--609pt +% Minion 11pt: 288--312pt | 609--657pt +% Minion 12pt: 336pt | 672pt % Libertine 10pt: % Libertine 11pt: % Libertine 12pt: @@ -294,7 +296,8 @@ % Graffiti as in GKP's book "Concrete Mathematics" % thanks to Lorenzo Pantieri and Enrico Gregorio \def\graffito@setup{% - \slshape\footnotesize% +% \slshape\footnotesize% this was due to \slhape in above book + \itshape\footnotesize\leavevmode\color{Black}% \parindent=0pt \lineskip=0pt \lineskiplimit=0pt % \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300% \doublehyphendemerits=100000% @@ -337,17 +340,19 @@ \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 + \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\MakeTextLowercase{\textsc{\lowsmallcapsspacing{#1}}}}%\protect }% } % ******************************************************************** % headlines % ******************************************************************** -\PassOptionsToPackage{automark}{scrpage2} - \RequirePackage{scrpage2} % provides headers and footers (KOMA Script) +%\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 - \setheadsepline{0pt} + %\setheadsepline{0pt} \ifthenelse{\boolean{@nochapters}}% {\relax}% {\renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}}} @@ -357,24 +362,24 @@ \renewcommand{\headfont}{\small} % \DeclareRobustCommand{\fixBothHeadlines}[2]{} % <--- ToDo % hack to get the content headlines right (thanks, Lorenzo!) - \def\toc@heading{% - \ifthenelse{\boolean{@nochapters}}% - {\section*{\contentsname}}%nochapters - {\chapter*{\contentsname}}%chapters - \@mkboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}}} - + \def\toc@heading{% + \ifthenelse{\boolean{@nochapters}}% + {\section*{\contentsname}}%nochapters + {\chapter*{\contentsname}}%chapters + \@mkboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}}} + % ******************************************************************** % 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}} + % parts + \ifthenelse{\boolean{@parts}}% + {% +% \newcommand{\ctparttext}{\relax} + \newcommand{\ct@parttext}{\relax} % Thanks to Ivo + \newcommand{\ctparttext}[1]{\renewcommand{\ct@parttext}{#1 \relax}} \titleformat{\part}[display] {\normalfont\centering\large}% {\thispagestyle{empty}\partname~\MakeTextUppercase{\thepart}}{1em}% @@ -417,7 +422,7 @@ % layout of the TOC, LOF and LOT (LOL-workaround see next section) % ******************************************************************** \PassOptionsToPackage{titles}{tocloft} - \RequirePackage{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 @@ -432,14 +437,14 @@ \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}% - + \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}}% @@ -453,8 +458,8 @@ \renewcommand{\cftpartpagefont}{\normalfont}% \ifthenelse{\boolean{@dottedtoc}}{\relax}% {% - \renewcommand{\cftpartleader}{\hspace{1.5em}}% - \renewcommand{\cftpartafterpnum}{\cftparfillskip}% + \renewcommand{\cftpartleader}{\hspace{1.5em}}% + \renewcommand{\cftpartafterpnum}{\cftparfillskip}% }% \setlength{\cftbeforepartskip}{1em}% \setlength{\cftbeforechapskip}{.1em}% @@ -464,13 +469,13 @@ \ifthenelse{\boolean{@nochapters}}% {\relax}% {% - \renewcommand{\cftchappresnum}{\scshape\MakeTextLowercase}% + \renewcommand{\cftchappresnum}{\scshape\MakeTextLowercase}% \renewcommand{\cftchapfont}{\normalfont}% \renewcommand{\cftchappagefont}{\normalfont}% \ifthenelse{\boolean{@dottedtoc}}{\relax}% - {% - \renewcommand{\cftchapleader}{\hspace{1.5em}}% - \renewcommand{\cftchapafterpnum}{\cftparfillskip}% + {% + \renewcommand{\cftchapleader}{\hspace{1.5em}}% + \renewcommand{\cftchapafterpnum}{\cftparfillskip}% } %\setlength{\cftbeforechapskip}{.1em}% } @@ -481,40 +486,40 @@ \setlength{\beforebibskip}{1em}% }% {\relax} - \renewcommand{\cftsecpresnum}{\scshape\MakeTextLowercase}% - \renewcommand{\cftsecfont}{\normalfont}% + \renewcommand{\cftsecpresnum}{\scshape\MakeTextLowercase}% + \renewcommand{\cftsecfont}{\normalfont}% \renewcommand{\cftsecpagefont}{\normalfont}% - \ifthenelse{\boolean{@dottedtoc}}{\relax}% - {% - \renewcommand{\cftsecleader}{\hspace{1.5em}}% - \renewcommand{\cftsecafterpnum}{\cftparfillskip}% + \ifthenelse{\boolean{@dottedtoc}}{\relax}% + {% + \renewcommand{\cftsecleader}{\hspace{1.5em}}% + \renewcommand{\cftsecafterpnum}{\cftparfillskip}% } \ifthenelse{\boolean{@tocaligned}}{\renewcommand{\cftsecindent}{0em}}{\relax} % subsections - \renewcommand{\cftsubsecpresnum}{\scshape\MakeTextLowercase}% - \renewcommand{\cftsubsecfont}{\normalfont}% + \renewcommand{\cftsubsecpresnum}{\scshape\MakeTextLowercase}% + \renewcommand{\cftsubsecfont}{\normalfont}% \ifthenelse{\boolean{@dottedtoc}}{\relax}% {% - \renewcommand{\cftsubsecleader}{\hspace{1.5em}}% - \renewcommand{\cftsubsecafterpnum}{\cftparfillskip}% + \renewcommand{\cftsubsecleader}{\hspace{1.5em}}% + \renewcommand{\cftsubsecafterpnum}{\cftparfillskip}% } \ifthenelse{\boolean{@tocaligned}}{\renewcommand{\cftsubsecindent}{0em}}{\relax} % subsubsections - \renewcommand{\cftsubsubsecpresnum}{\scshape\MakeTextLowercase}% - \renewcommand{\cftsubsubsecfont}{\normalfont}% + \renewcommand{\cftsubsubsecpresnum}{\scshape\MakeTextLowercase}% + \renewcommand{\cftsubsubsecfont}{\normalfont}% \ifthenelse{\boolean{@dottedtoc}}{\relax}% {% - \renewcommand{\cftsubsubsecleader}{\hspace{1.5em}}% - \renewcommand{\cftsubsubsecafterpnum}{\cftparfillskip}% + \renewcommand{\cftsubsubsecleader}{\hspace{1.5em}}% + \renewcommand{\cftsubsubsecafterpnum}{\cftparfillskip}% } \ifthenelse{\boolean{@tocaligned}}{\renewcommand{\cftsubsubsecindent}{0em}}{\relax} % figures - \renewcommand{\cftfigpresnum}{\scshape\MakeTextLowercase}% - \renewcommand{\cftfigfont}{\normalfont}% + \renewcommand{\cftfigpresnum}{\scshape\MakeTextLowercase}% + \renewcommand{\cftfigfont}{\normalfont}% \ifthenelse{\boolean{@dottedtoc}}{\relax}% {% - \renewcommand{\cftfigleader}{\hspace{1.5em}}% - \renewcommand{\cftfigafterpnum}{\cftparfillskip}% + \renewcommand{\cftfigleader}{\hspace{1.5em}}% + \renewcommand{\cftfigafterpnum}{\cftparfillskip}% } \renewcommand{\cftfigpresnum}{\figurename~}%Fig.~} \newlength{\figurelabelwidth} @@ -522,12 +527,12 @@ \addtolength{\figurelabelwidth}{2.5em} \cftsetindents{figure}{0em}{\figurelabelwidth} % tables - \renewcommand{\cfttabpresnum}{\scshape\MakeTextLowercase}% - \renewcommand{\cfttabfont}{\normalfont}% - \ifthenelse{\boolean{@dottedtoc}}{\relax}% + \renewcommand{\cfttabpresnum}{\scshape\MakeTextLowercase}% + \renewcommand{\cfttabfont}{\normalfont}% + \ifthenelse{\boolean{@dottedtoc}}{\relax}% {% - \renewcommand{\cfttableader}{\hspace{1.5em}}% - \renewcommand{\cfttabafterpnum}{\cftparfillskip}% + \renewcommand{\cfttableader}{\hspace{1.5em}}% + \renewcommand{\cfttabafterpnum}{\cftparfillskip}% } \renewcommand{\cfttabpresnum}{\tablename~}%Tab.~} \newlength{\tablelabelwidth} @@ -538,33 +543,33 @@ % 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}% + \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}% + \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}}% {% - \AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforepartskip}}} + \AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforepartskip}}} }{% \ifthenelse{\boolean{@nochapters}}% - {\relax}% - {\AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforechapskip}}}} + {\relax}% + {\AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforechapskip}}}} } % another dirty work-around to get the spaced low small caps into the toc ;-( @@ -582,66 +587,71 @@ \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% + \ifxetex % thanks to Joerg Weber + \renewcommand\Chap[2][]{% + \ifxetex\oldchap[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% + \else\oldchap[\spacedlowsmallcaps{#1}]{#2}% + \fi% + }% + \fi% } % 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}% - }% - \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% + {% + %% 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}% + \ifpdf\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}% \else{#1}\fi% } - \ifxetex% thanks to Joerg Weber - \renewcommand{\tocEntry}[1]{% for bib, etc. - \ifxetex\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}% - \else{#1}\fi% + \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}}{% + \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}}% +% {% +% \addtocontents{lol}{\protect\vspace{-\cftbeforechapskip}}% % }{\relax}% % }% % }{% @@ -649,9 +659,9 @@ \AtBeginDocument{% \addtocontents{lof}{\deactivateaddvspace}% \addtocontents{lot}{\deactivateaddvspace}% - \ifthenelse{\boolean{@listings}}% - {% - \addtocontents{lol}{\deactivateaddvspace}% + \ifthenelse{\boolean{@listings}}% + {% + \addtocontents{lol}{\deactivateaddvspace}% }{\relax}% }% % } @@ -664,11 +674,11 @@ \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)}% + \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 % ******************************************************************** @@ -677,13 +687,13 @@ \RequirePackage{scrtime} % time access \newcommand{\finalVersionString}{\relax} \providecommand{\myVersion}{$\!\!$} % w/o classicthesis-config.tex -\ifthenelse{\boolean{@drafting}}{% +\ifthenelse{\boolean{@drafting}}{% % \RequirePackage{draftwatermark}% -% \SetWatermarkLightness{0.9} -% \SetWatermarkScale{.5} -% \SetWatermarkText{\today\ at \thistime} - \PassOptionsToPackage{draft}{prelim2e} - \RequirePackage{prelim2e} +% \SetWatermarkLightness{0.9} +% \SetWatermarkScale{.5} +% \SetWatermarkText{\today\ at \thistime} + \PassOptionsToPackage{draft}{prelim2e} + \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).}} @@ -692,12 +702,12 @@ % Caption numbering now w/o chapter number % ******************************************************************** \ifthenelse{\boolean{@floatperchapter}}{% - \ifthenelse{\boolean{@listings}}{% - \lstset{numberbychapter=true}}{\relax}% numberbychapter works in listings>=1.4 + \ifthenelse{\boolean{@listings}}{% + \lstset{numberbychapter=true}}{\relax}% numberbychapter works in listings>=1.4 }{% - \ifthenelse{\boolean{@listings}}{% - \lstset{numberbychapter=false}}{\relax}% - \RequirePackage{remreset}% + \ifthenelse{\boolean{@listings}}{% + \lstset{numberbychapter=false}}{\relax}% + \RequirePackage{remreset}% \makeatletter% \ifthenelse{\boolean{@nochapters}}% {\relax}{% |