From da0e0b99c435f4dbdf0423f98a795ea6410b05e7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 15 Aug 2012 23:11:00 +0000 Subject: classicthesis (15aug12) git-svn-id: svn://tug.org/texlive/trunk@27416 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/classicthesis/CHANGES | 20 ++- .../doc/latex/classicthesis/Chapters/Chapter01.tex | 37 ++++- .../doc/latex/classicthesis/Chapters/Chapter03.tex | 26 +-- .../doc/latex/classicthesis/ClassicThesis.pdf | Bin 368021 -> 339738 bytes .../doc/latex/classicthesis/ClassicThesis.tcp | 2 +- .../doc/latex/classicthesis/ClassicThesis.tex | 2 +- .../doc/latex/classicthesis/ClassicThesis.tps | 185 +++++++++++---------- .../Examples/classicthesis-article.pdf | Bin 76681 -> 77783 bytes .../Examples/classicthesis-article.tex | 2 +- .../Examples/classicthesis-book-xelatex.pdf | Bin 0 -> 24099 bytes .../Examples/classicthesis-book-xelatex.tex | 45 +++++ .../classicthesis/Examples/classicthesis-book.pdf | Bin 43559 -> 65670 bytes .../classicthesis/Examples/classicthesis-book.tex | 32 +++- .../classicthesis/Examples/classicthesis-cv.pdf | Bin 41157 -> 40757 bytes .../FrontBackmatter/Acknowledgments.tex | 2 +- .../texmf-dist/doc/latex/classicthesis/LISTOFFILES | 81 ++++----- Master/texmf-dist/doc/latex/classicthesis/README | 2 +- .../latex/classicthesis/classicthesis-config.tex | 8 +- .../tex/latex/classicthesis/classicthesis.sty | 74 +++++++-- 19 files changed, 350 insertions(+), 168 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.pdf create mode 100644 Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.tex (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/classicthesis/CHANGES b/Master/texmf-dist/doc/latex/classicthesis/CHANGES index 30e82f6a273..d5b7caa206d 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/CHANGES +++ b/Master/texmf-dist/doc/latex/classicthesis/CHANGES @@ -1,3 +1,21 @@ +Changes in version 4.1 (August 2012) +o Working towards XeLaTeX support: + - "ifxetex" package for checking whether + XeTeX is in use (classicthesis.sty) + - Adjusted part, chapter, and tocEntry + - Thanks to Joerg Weber for his ideas and code + - Option "pdfspacing" does not work for XeTeX + and is disabled when XeTeX is running + (maybe implement spacing with fontspec later) +o Load additional packages in order to + reduce warnings (classicthesis-config.tex) + - "textcomp" to fix warnings with missing font + shapes + - "scrhack" to fix warnings when using KOMA + with listings package +o Replaced \mathrm-command with \textrm-command + (Chapter03.tex) + Changes in version 4.0 (December 2011) o Due to lots of issues and complaints, classicthesis-preamble.sty is replaced by @@ -38,7 +56,7 @@ o Changes in ClassicThesis.tex: - Moved language options into documentclass due to LyX issues with babel o Changes in classicthesis.sty: - - Removed bcor from areaset command so that it can + - Removed bcor from \areaset command so that it can be set via \documentclass option (BCOR=) - New \ctparttext command for putting preamble text after part titles (see ClassicThesis.tex for examples) diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex index a76ffc66892..1b1765ed6b6 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex @@ -316,10 +316,45 @@ Spanish languages need an extra option in order to work with this template: Thanks to an unknown person for this information (via Google Code 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} + +If there are issues changing \verb|\tablename|, \eg, using this: +\begin{verbatim} + \renewcommand{\bibname}{Referencias} + \renewcommand{\tablename}{Tabla} +\end{verbatim} + +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} + +But it is also necessary set \texttt{spanish} in the \verb|\documentclass|. + +Thanks to Alvaro Jaramillo Duque for this information. + + \subsection*{Compatibility with the \texttt{pdfsync} Package} Using the \texttt{pdfsync} package leads to linebreaking problems with the \texttt{graffito} command. Thanks to Henrik Schumacher for this information. - + + \section{Future Work} So far, this is a quite stable version that served a couple of people diff --git a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex index c06b7e5d58a..d7fdeeec58e 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter03.tex @@ -23,30 +23,30 @@ energy transfer in a single collision with an atomic electron: \graffito{You might get unexpected results using math in chapter or section heads. Consider the \texttt{pdfspacing} option.} \begin{equation} -\kappa =\frac{\xi}{E_{\mathrm{max}}} %\mathbb{ZNR} +\kappa =\frac{\xi}{E_{\textrm{max}}} %\mathbb{ZNR} \end{equation} -$E_{\mathrm{max}}$ is the maximum transferable energy in a single +$E_{\textrm{max}}$ is the maximum transferable energy in a single collision with an atomic electron. \[ -E_{\mathrm{max}} =\frac{2 m_{\mathrm{e}} \beta^2\gamma^2 }{1 + -2\gamma m_{\mathrm{e}}/m_{\mathrm{x}} + \left ( m_{\mathrm{e}} -/m_{\mathrm{x}}\right)^2}\ , +E_{\textrm{max}} =\frac{2 m_{\textrm{e}} \beta^2\gamma^2 }{1 + +2\gamma m_{\textrm{e}}/m_{\textrm{x}} + \left ( m_{\textrm{e}} +/m_{\textrm{x}}\right)^2}\ , \] -where $\gamma = E/m_{\mathrm{x}}$, $E$ is energy and -$m_{\mathrm{x}}$ the mass of the incident particle, -$\beta^2 = 1 - 1/\gamma^2$ and $m_{\mathrm{e}}$ is the electron mass. +where $\gamma = E/m_{\textrm{x}}$, $E$ is energy and +$m_{\textrm{x}}$ the mass of the incident particle, +$\beta^2 = 1 - 1/\gamma^2$ and $m_{\textrm{e}}$ is the electron mass. $\xi$ comes from the Rutherford scattering cross section and is defined as: -\begin{eqnarray*} \xi = \frac{2\pi z^2 e^4 N_{\mathrm{Av}} Z \rho -\delta x}{m_{\mathrm{e}} \beta^2 c^2 A} = 153.4 \frac{z^2}{\beta^2} +\begin{eqnarray*} \xi = \frac{2\pi z^2 e^4 N_{\textrm{Av}} Z \rho +\delta x}{m_{\textrm{e}} \beta^2 c^2 A} = 153.4 \frac{z^2}{\beta^2} \frac{Z}{A} - \rho \delta x \quad\mathrm{keV}, + \rho \delta x \quad\textrm{keV}, \end{eqnarray*} where \begin{tabular}{ll} $z$ & charge of the incident particle \\ -$N_{\mathrm{Av}}$ & Avogadro's number \\ +$N_{\textrm{Av}}$ & Avogadro's number \\ $Z$ & atomic number of the material \\ $A$ & atomic weight of the material \\ $\rho$ & density \\ @@ -54,7 +54,7 @@ $ \delta x$ & thickness of the material \\ \end{tabular} $\kappa$ measures the contribution of the collisions with energy -transfer close to $E_{\mathrm{max}}$. For a given absorber, $\kappa$ +transfer close to $E_{\textrm{max}}$. For a given absorber, $\kappa$ tends towards large values if $\delta x$ is large and/or if $\beta$ is small. Likewise, $\kappa$ tends towards zero if $\delta x $ is small diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf index 1fe868ee5e4..ee2c43e0f08 100644 Binary files a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf and b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf differ diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tcp b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tcp index f97555cd70f..27de69e0986 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tcp +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tcp @@ -6,7 +6,7 @@ Version=4 MainFile=ClassicThesis.tex UseBibTeX=1 UseMakeIndex=0 -ActiveProfile=LaTeX => PDF +ActiveProfile=LaTeX ⇨ PDF ProjectLanguage=en ProjectDialect=US diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex index cd61cdc47de..3826894c3d7 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) 2011 Andr\'e Miede http://www.miede.de +% Copyright (C) 2012 Andr\'e Miede http://www.miede.de % % If you like the style then I would appreciate a postcard. My address % can be found in the file ClassicThesis.pdf. A collection of the diff --git a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps index 234c96a7341..cc7ad45608f 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps +++ b/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tps @@ -2,124 +2,133 @@ Type=TeXnicCenterProjectSessionInformation Version=2 -[SessionInfo] -ActiveTab=0 -FrameCount=4 -ActiveFrame=3 - [Frame0] -Columns=1 -Rows=1 Flags=0 ShowCmd=1 MinPos.x=-1 MinPos.y=-1 -MaxPos.x=-8 -MaxPos.y=-30 -NormalPos.left=25 -NormalPos.top=25 -NormalPos.right=1035 -NormalPos.bottom=327 -Class=CLatexEdit -Document=CHANGES - -[Frame0_Row0] -cyCur=243 -cyMin=10 - -[Frame0_Col0] -cxCur=973 -cxMin=10 +MaxPos.x=-1 +MaxPos.y=-1 +NormalPos.left=4 +NormalPos.top=26 +NormalPos.right=1242 +NormalPos.bottom=610 +Class=LaTeXView +Document=Chapters\Chapter01.tex [Frame0_View0,0] -Cursor.row=15 -Cursor.column=49 -TopSubLine=1 +TopLine=313 +Cursor=13737 [Frame1] -Columns=1 -Rows=1 Flags=0 ShowCmd=1 MinPos.x=-1 MinPos.y=-1 -MaxPos.x=-8 -MaxPos.y=-30 -NormalPos.left=44 -NormalPos.top=44 -NormalPos.right=1206 -NormalPos.bottom=311 -Class=CLatexEdit -Document=ClassicThesis.tex - -[Frame1_Row0] -cyCur=208 -cyMin=10 - -[Frame1_Col0] -cxCur=1125 -cxMin=10 +MaxPos.x=-1 +MaxPos.y=-1 +NormalPos.left=4 +NormalPos.top=26 +NormalPos.right=1242 +NormalPos.bottom=610 +Class=LaTeXView +Document=Chapters\Chapter03.tex [Frame1_View0,0] -Cursor.row=0 -Cursor.column=0 -TopSubLine=0 +TopLine=0 +Cursor=0 [Frame2] -Columns=1 -Rows=1 Flags=0 ShowCmd=1 MinPos.x=-1 MinPos.y=-1 -MaxPos.x=-8 -MaxPos.y=-30 -NormalPos.left=0 -NormalPos.top=0 -NormalPos.right=1035 -NormalPos.bottom=266 -Class=CLatexEdit +MaxPos.x=-1 +MaxPos.y=-1 +NormalPos.left=4 +NormalPos.top=26 +NormalPos.right=1242 +NormalPos.bottom=610 +Class=LaTeXView Document=classicthesis-config.tex -[Frame2_Row0] -cyCur=207 -cyMin=10 - -[Frame2_Col0] -cxCur=998 -cxMin=10 - [Frame2_View0,0] -Cursor.row=53 -Cursor.column=35 -TopSubLine=53 +TopLine=0 +Cursor=0 [Frame3] -Columns=1 -Rows=1 -Flags=2 -ShowCmd=3 +Flags=0 +ShowCmd=1 MinPos.x=-1 MinPos.y=-1 -MaxPos.x=-8 -MaxPos.y=-30 -NormalPos.left=100 -NormalPos.top=100 -NormalPos.right=1240 -NormalPos.bottom=414 -Class=CLatexEdit +MaxPos.x=-1 +MaxPos.y=-1 +NormalPos.left=4 +NormalPos.top=26 +NormalPos.right=1242 +NormalPos.bottom=610 +Class=LaTeXView +Document=ClassicThesis.tex + +[Frame3_View0,0] +TopLine=0 +Cursor=0 + +[Frame4] +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=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 -[Frame3_Row0] -cyCur=443 -cyMin=10 +[Frame5_View0,0] +TopLine=0 +Cursor=0 -[Frame3_Col0] -cxCur=1269 -cxMin=10 +[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 +Class=LaTeXView +Document=Chapters\Chapter02.tex + +[Frame6_View0,0] +TopLine=0 +Cursor=0 -[Frame3_View0,0] -Cursor.row=35 -Cursor.column=27 -TopSubLine=48 +[SessionInfo] +FrameCount=7 +ActiveFrame=0 diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf index 26436afd31f..0acc413c14e 100644 Binary files a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf and b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf differ diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex index a648ac0e5e4..d6d6bcf235d 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex @@ -18,7 +18,7 @@ \tableofcontents \section{A Section} - \lipsum[1] + \finalVersionString \lipsum[1] \subsection{A Subsection} \lipsum[1] \subsection{A Subsection} 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 new file mode 100644 index 00000000000..c0ea92125e2 Binary files /dev/null and b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.pdf differ 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 new file mode 100644 index 00000000000..13817876ec7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.tex @@ -0,0 +1,45 @@ +% book example for classicthesis.sty +\documentclass[11pt,a5paper,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book +\usepackage[T1]{fontenc} +\usepackage{lipsum} +%\usepackage{hyperref} +\usepackage[parts]{../classicthesis} % ,manychapters +%\usepackage[osf]{libertine} +%\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false} + +\begin{document} +% \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}}} + + % use \cleardoublepage here to avoid problems with pdfbookmark + \cleardoublepage\part{Test Part} + \chapter{Test Chapter} + \lipsum[1] + + \section{A Section} + \lipsum[1] + + \chapter{Test Chapter} + \lipsum[1] + + \section{A Section} + \lipsum[1] + +% \include{multiToC} + + \appendix + \cleardoublepage\part{Appendix} + \chapter{Appendix Chapter} + \lipsum[1] + + \section{A Section} + \lipsum[1] + +\end{document} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf index 51c18c9a95d..19c5dadfa52 100644 Binary files a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf and b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf differ diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex index 9001cf8c797..bb18366e0b7 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex @@ -4,7 +4,8 @@ \usepackage{lipsum} \usepackage[linedheaders,parts,pdfspacing]{../classicthesis} % ,manychapters %\usepackage[osf]{libertine} -%\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false} +\usepackage{amsthm} + \begin{document} % \pagestyle{scrheadings} @@ -19,9 +20,36 @@ % 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} + + + \chapter{Test Chapter} \lipsum[1] - + \section{A Section} \lipsum[1] diff --git a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf index 5781a481961..b744616fcd6 100644 Binary files a/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf and b/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf differ diff --git a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex index 02340401d18..9d13e692ebc 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex @@ -30,7 +30,7 @@ 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, + Roland Winkler, J\"org Weber, and the whole \LaTeX-community for support, ideas and some great software. diff --git a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES index 67302480047..8194d297d34 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES +++ b/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES @@ -1,16 +1,16 @@ LIST OF FILES FOR ClassicThesis.tex *File List* -scrreprt.cls 2011/06/16 v3.09a KOMA-Script document class (report) -scrkbase.sty 2011/06/16 v3.09a KOMA-Script package (KOMA-Script-dependent ba +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 2011/06/16 v3.09a KOMA-Script package (KOMA-Script-independent + 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 2011/03/09 v3.09 KOMA-Script package (loading files) -tocbasic.sty 2011/05/30 v3.09a KOMA-Script package (handling toc-files) -scrsize11pt.clo 2011/06/16 v3.09a KOMA-Script font size class option (11pt) -typearea.sty 2011/06/16 v3.09a KOMA-Script package (type area) +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) 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 @@ -27,6 +27,9 @@ ngermanb.ldf 2008/07/06 v2.6n new German support from the babel system amsopn.sty 1999/12/14 v2.01 operator names fontenc.sty 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) mparhack.sty 2005/04/17 v1.4 (T. Sgouros and S. Ulrich) fixltx2e.sty 2006/09/13 v1.1m fixes to LaTeX @@ -35,12 +38,13 @@ fixltx2e.sty 2006/09/13 v1.1m fixes to LaTeX 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 2011/11/02 v3.2d Customizing captions (AR) -caption3.sty 2011/11/01 v1.4a caption3 kernel (AR) + caption.sty 2012/02/19 v3.2f Customizing captions (AR) +caption3.sty 2012/01/12 v1.4b 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 @@ -51,44 +55,45 @@ 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 2011/10/01 v6.82j Hypertext links for LaTeX -hobsub-hyperref.sty 2011/04/23 v1.4 Bundle oberdiek, subset hyperref (HO) -hobsub-generic.sty 2011/04/23 v1.4 Bundle oberdiek, subset generic (HO) - hobsub.sty 2011/04/23 v1.4 Subsetting bundle oberdiek (HO) -infwarerr.sty 2010/04/08 v1.3 Providing info/warning/message (HO) - ltxcmds.sty 2011/04/18 v1.20 LaTeX kernel commands for general use (HO) +hyperref.sty 2012/08/03 v6.82y Hypertext links for LaTeX +hobsub-hyperref.sty 2012/04/25 v1.12 Bundle oberdiek, subset hyperref (HO) +hobsub-generic.sty 2012/04/25 v1.12 Bundle oberdiek, subset generic (HO) + hobsub.sty 2012/04/25 v1.12 Construct package bundles (HO) +infwarerr.sty 2010/04/08 v1.3 Providing info/warning/error messages (HO) + ltxcmds.sty 2011/11/09 v1.22 LaTeX kernel commands for general use (HO) ifluatex.sty 2010/03/01 v1.3 Provides the ifluatex switch (HO) - ifvtex.sty 2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO) - intcalc.sty 2007/09/27 v1.1 Expandable integer calculations (HO) + ifvtex.sty 2010/03/01 v1.5 Detect VTeX and its facilities (HO) + intcalc.sty 2007/09/27 v1.1 Expandable calculations with integers (HO) ifpdf.sty 2011/01/30 v2.3 Provides the ifpdf switch (HO) -etexcmds.sty 2011/02/16 v1.5 Prefix for e-TeX command names (HO) -kvsetkeys.sty 2011/04/07 v1.13 Key value parser (HO) -kvdefinekeys.sty 2011/04/07 v1.3 Defining keys (HO) -pdftexcmds.sty 2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO) -pdfescape.sty 2011/04/04 v1.12 Provides string conversions (HO) -bigintcalc.sty 2011/01/30 v1.2 Expandable big integer calculations (HO) - bitset.sty 2011/01/30 v1.1 Data type bit set (HO) -uniquecounter.sty 2011/01/30 v1.2 Provides unlimited unique counter (HO) +etexcmds.sty 2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO) +kvsetkeys.sty 2012/04/25 v1.16 Key value parser (HO) +kvdefinekeys.sty 2011/04/07 v1.3 Define keys (HO) +pdftexcmds.sty 2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO) +pdfescape.sty 2011/11/25 v1.13 Implements pdfTeX's escape features (HO) +bigintcalc.sty 2012/04/08 v1.3 Expandable calculations on big integers (HO) + bitset.sty 2011/01/30 v1.1 Handle bit-vector datatype (HO) +uniquecounter.sty 2011/01/30 v1.2 Provide unlimited unique counter (HO) letltxmacro.sty 2010/09/02 v1.4 Let assignment for LaTeX macros (HO) - hopatch.sty 2011/01/30 v1.0 Wrapper for package hooks (HO) + hopatch.sty 2011/06/24 v1.1 Wrapper for package hooks (HO) xcolor-patch.sty 2011/01/30 xcolor patch -atveryend.sty 2011/04/23 v1.7 Hooks at very end of document (HO) -atbegshi.sty 2011/01/30 v1.15 At begin shipout hook (HO) -refcount.sty 2010/12/01 v3.2 Data extraction from references (HO) - hycolor.sty 2011/01/30 v1.7 Color options of hyperref/bookmark (HO) +atveryend.sty 2011/06/30 v1.8 Hooks at the very end of document (HO) +atbegshi.sty 2011/10/05 v1.16 At begin shipout hook (HO) +refcount.sty 2011/10/16 v3.4 Data extraction from label references (HO) + hycolor.sty 2011/01/30 v1.7 Color options for hyperref/bookmark (HO) ifxetex.sty 2010/09/12 v0.6 Provides ifxetex conditional -kvoptions.sty 2010/12/23 v3.10 Keyval support for LaTeX options (HO) - pd1enc.def 2011/10/01 v6.82j Hyperref: PDFDocEncoding definition (HO) + 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) 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 2011/10/01 v6.82j Hyperref driver for pdfTeX + hpdftex.def 2012/08/03 v6.82y 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) 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 2011/10/01 v3.1 Typographic style for a classic-looking th +classicthesis.sty 2012/08/12 v4.1 Typographic style for a classic-looking th esis xcolor.sty 2007/01/21 v2.11 LaTeX color extensions (UK) color.cfg 2007/01/18 v1.5 color configuration of teTeX/TeXLive @@ -101,14 +106,15 @@ microtype.cfg 2010/01/10 v2.4 microtype main configuration file (RS) booktabs.sty 2005/04/14 v1.61803 publication quality tables textcase.sty 2004/10/07 v0.07 Text only upper/lower case changing (DPC) scrpage2.sty 2010/04/22 v2.5 LaTeX2e KOMA-Script package -titlesec.sty 2011/08/28 v2.9.1 Sectioning titles +titlesec.sty 2011/12/15 v2.10.0 Sectioning titles tocloft.sty 2010/10/13 v2.3e parameterised ToC, etc., typesetting - scrtime.sty 2011/06/16 v3.09a KOMA-Script package (time of LaTeX run) + scrtime.sty 2012/07/29 v3.11b 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 t1pplj.fd 2004/09/06 font definitions for T1/pplj. - nameref.sty 2010/04/30 v2.40 Cross-referencing by name of section + nameref.sty 2012/07/31 v2.42 Cross-referencing by name of section gettitlestring.sty 2010/12/03 v1.4 Cleanup title references (HO) ClassicThesis.out ClassicThesis.out @@ -119,6 +125,7 @@ FrontBackmatter/DirtyTitlepage.tex FrontBackmatter/Titlepage.tex gfx/TFZsuperellipse_bw.pdf FrontBackmatter/Titleback.tex + ts1pplj.fd 2004/09/06 font definitions for TS1/pplj. FrontBackmatter/Dedication.tex FrontBackmatter/Abstract.tex FrontBackmatter/Publication.tex diff --git a/Master/texmf-dist/doc/latex/classicthesis/README b/Master/texmf-dist/doc/latex/classicthesis/README index 2826476ba2d..4a912040f3d 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/README +++ b/Master/texmf-dist/doc/latex/classicthesis/README @@ -1,6 +1,6 @@ A Classic Thesis Style An Homage to The Elements of Typographic Style -Copyright (C) 2011 Andr\'e Miede http://www.miede.de +Copyright (C) 2012 Andr\'e Miede http://www.miede.de Please see the file ClassicThesis.pdf for more information. Your comments are highly appreciated. diff --git a/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex b/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex index b2ebc011da0..bf6280ac2df 100644 --- a/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex +++ b/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex @@ -50,8 +50,8 @@ \newcommand{\myDepartment}{Put data here\xspace} \newcommand{\myUni}{Put data here\xspace} \newcommand{\myLocation}{Darmstadt\xspace} -\newcommand{\myTime}{December 2011\xspace} -\newcommand{\myVersion}{version 4.0\xspace} +\newcommand{\myTime}{August 2012\xspace} +\newcommand{\myVersion}{version 4.1\xspace} % ******************************************************************** % Setup, finetuning, and useful commands @@ -90,7 +90,9 @@ % 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 diff --git a/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty b/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty index 6a8df68744c..2e6fd59c85d 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) 2011 Andr\'e Miede http://www.miede.de +% Copyright (C) 2012 Andr\'e Miede http://www.miede.de % % If you like the style then I would appreciate a postcard. My address % can be found in the file ClassicThesis.pdf. A collection of the @@ -28,7 +28,7 @@ % Important: % % This style can also be used without the thesis template. -% It works with both LaTeX and PDFLaTeX now. +% It works with both LaTeX and PDFLaTeX now. XeLaTeX should also work. % % * You must not use "u etc. in strings/commands that will be spaced out % (use \"u or real umlauts instead) @@ -39,7 +39,7 @@ % % ******************************************************************** \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{classicthesis}[2011/12/17 v4.0 Typographic style for a classic-looking thesis] +\ProvidesPackage{classicthesis}[2012/08/12 v4.1 Typographic style for a classic-looking thesis] \RequirePackage{ifthen} \newboolean{@tocaligned} % the left column of the toc will be aligned (no indention) \newboolean{@eulerchapternumbers} % use AMS Euler for chapter font (otherwise Palatino) @@ -56,9 +56,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 @@ -156,11 +156,25 @@ }{\relax}% % ******************************************************************** -% PDF Stuff +% PDF and XeLaTeX Stuff % ******************************************************************** \RequirePackage{ifpdf} \ifpdf\RequirePackage{hyperref}\fi % for texorpdfstring command below +% Necessary to rewrite hacks for chapters and parts and toc +\RequirePackage{ifxetex} +\ifxetex\RequirePackage{hyperref}\fi % for texorpdfstring command below + +% pdfspacing does not work with XeLaTeX +\ifxetex% + \ifthenelse{\boolean{@pdfspacing}}% + {% pdfspacing is used with XeLaTeX + \PackageWarningNoLine{classicthesis}{You cannot use the option % + "pdfspacing" with XeLaTeX!}% + }{\relax}% + \setboolean{@pdfspacing}{false}% +\fi + % ******************************************************************** % Colors % ******************************************************************** @@ -567,7 +581,14 @@ \ifpdf\oldchap[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% \else\oldchap[\spacedlowsmallcaps{#1}]{#2}% \fi% - } + }% + \ifxetex % thanks to Joerg Weber + \renewcommand\Chap[2][]{% + \ifxetex\oldchap[\texorpdfstring{\spacedlowsmallcaps{#1}}{#1}]{#2}% + \else\oldchap[\spacedlowsmallcaps{#1}]{#2}% + \fi% + }% + \fi% } % yet another dirty work-around to get the spaced low small caps into the toc ;-( @@ -579,21 +600,37 @@ \secdef{\Part}{\PartS}% }% \newcommand\PartS[1]{\oldpart*{#1}}% - \newcommand\Part[2][]{% - \ifpdf\pdfstringdefDisableCommands{\let\thepart\@gobbletwo}% + \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}% + \else% + \oldpart[\spacedlowsmallcaps{#1}]{#2}% \fi% -% \renewcommand{\ct@parttext}{\relax}% Thanks to Ivo! - \ctparttext{\relax}% + \ctparttext{\relax}% }% + \fi% }{\relax} \newcommand{\tocEntry}[1]{% for bib, etc. \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% + } \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.}% @@ -638,8 +675,9 @@ % Drafting Stuff % ******************************************************************** \RequirePackage{scrtime} % time access -\newcommand{\finalVersionString}{} -\ifthenelse{\boolean{@drafting}}{% +\newcommand{\finalVersionString}{\relax} +\providecommand{\myVersion}{$\!\!$} % w/o classicthesis-config.tex +\ifthenelse{\boolean{@drafting}}{% % \RequirePackage{draftwatermark}% % \SetWatermarkLightness{0.9} % \SetWatermarkScale{.5} @@ -647,8 +685,8 @@ \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).}} + \renewcommand{\PrelimText}{\footnotesize[\,\today\ at \thistime\ -- \texttt{classicthesis}~\myVersion\,]} +}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ (\texttt{classicthesis}~\myVersion).}} % ******************************************************************** % Caption numbering now w/o chapter number -- cgit v1.2.3