texlive[48041] Master/texmf-dist: classicthesis (17jun18)
commits+karl at tug.org
commits+karl at tug.org
Sun Jun 17 23:04:56 CEST 2018
Revision: 48041
http://tug.org/svn/texlive?view=revision&revision=48041
Author: karl
Date: 2018-06-17 23:04:56 +0200 (Sun, 17 Jun 2018)
Log Message:
-----------
classicthesis (17jun18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib
trunk/Master/texmf-dist/doc/latex/classicthesis/CHANGES
trunk/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
trunk/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.pdf
trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Declaration.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
trunk/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
trunk/Master/texmf-dist/doc/latex/classicthesis/README
trunk/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex
trunk/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.pdf
trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.tex
trunk/Master/texmf-dist/tex/latex/classicthesis/classicthesis-arsclassica.sty
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/Bibliography.bib 2018-06-17 21:04:56 UTC (rev 48041)
@@ -69,10 +69,10 @@
edition = 10
}
- at Book{taleb:2012,
- title = {{A}ntifragile: {T}hings {T}hat {G}ain from {D}isorder},
+ at Book{taleb:2018,
+ title = {Skin in the Game: Hidden Asymmetries in Daily Life},
publisher = {Random House},
- year = {2012},
+ year = {2018},
author = {Taleb, Nassim Nicholas},
address = {New York, NY, USA},
}
@@ -201,4 +201,28 @@
address = {New York, NY, USA}
}
+ at Book{taleb:2012,
+ title = {{A}ntifragile: {T}hings {T}hat {G}ain from {D}isorder},
+ publisher = {Random House},
+ year = {2012},
+ author = {Taleb, Nassim Nicholas},
+ address = {New York, NY, USA},
+}
+
+ at Book{peterson:2018,
+ title = {12 Rules for Life: An Antidote to Chaos},
+ publisher = {Random House Canada},
+ year = {2018},
+ author = {Peterson, Jordan B.},
+ address = {Toronto, ON, Canada},
+}
+
+ at Book{harari:2014,
+ title = {Sapiens: A Brief History of Humankind},
+ publisher = {Random House},
+ year = {2014},
+ author = {Harari, Yuval Noah},
+ address = {New York, NY, USA},
+}
+
@Comment{jabref-meta: databaseType:bibtex;}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/CHANGES 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/CHANGES 2018-06-17 21:04:56 UTC (rev 48041)
@@ -1,14 +1,68 @@
+Changes in version 4.6 (June 2018)
+o Integration of arsclassica
+ (with permission from Lorenzo Pantieri)
+o Introduced style option for classicthesis,
+ allowing for changing style to arsclassica
+ (see classicthesis-arsclassica-book.tex as
+ an example)
+o Provision of customization and hooks, e.g.,
+ \ct at altfont and \ct at caps
+o Loading caption package in classicthesis.sty
+ (for better arsclassica integration)
+o Changed footmisc's option from "flushmargin"
+ to "marginal" in order to fix spacing
+ problems in non-KOMA settings (thanks to
+ Hugues de Lassus) #154
+X Removed double occurrence of "pdfpagemode"
+ in classicthesis-config.tex (thanks to
+ Csaba Hajdu)
+X Removed latexrelease (thanks to David
+ Carlisle and Ulrike Fischer)
+X Removed textcomp
+o Re-arranged package loading order, i.e.,
+ hyperref for avoiding problems
+o Generalized color names for easier user
+ customization (CTsemi, CTtitle)
+o Got rid of \refstepcounter{dummy}
+o Introduced \classicthesis to access version
+o Activating protrusion and expansion for
+ microtype if pdfLaTeX is used (beta-test)
+
+Changes in version 4.5 (December 2017)
+o Fixed vanished page numbers on chapter
+ opening pages (thanks to Ivo and Jos\'e M.
+ Alcaide) #144
+o Added support for B5 paper (thanks to
+ Jos\'e M. Alcaide) #145
+o Removed option "abstractoff" from
+ documentclass
+o Moved language selection from
+ documentclass to classicthesis-config.tex
+ (\PassOptionsToPackage for babel) #146
+o Added some protection to the optional
+ parameter of marginpar (Ivo) #143
+o Removed support for MinionPro (Ivo)
+ (can be manually included, see wiki)
+o Options "subfig" and "listings" now obsolete,
+ as correct treating done automatically (Ivo)
+o Many corrections and some clean-up of
+ the code (Ivo)
+o Changed \tableheadline to be left-aligned (in
+ classicthesis-config.tex)
+o Checked compatibility with arsclassica
+ package (successful)
+
Changes in version 4.4 (October 2017)
-o Minor clean-up, also of .gitignore
+o Minor clean-up, also of .gitignore
(thanks to Jörn Hees)
o \marginpar improved (thanks to Jörn Hees)
-o Workaround for removong headlines in "list of *"
+o Workaround for removong headlines in "list of *"
environments (Contents.tex and ClassicThesis.tex)
-o Bibliography section headers now correctly using
- spacedlowsmallcaps with biblatex (thanks to Ivo
+o Bibliography section headers now correctly using
+ spacedlowsmallcaps with biblatex (thanks to Ivo
and Enrico Gregorio)
o Added some more books to bibliography for testing
-o Added help for external TikZ/PGF usage in
+o Added help for external TikZ/PGF usage in
classicthesis-config.tex (thanks to Andreas Nautsch)
o Fixed redefining \marginpar for two arguments (Ivo)
o Fixed some spacing definitions and using the
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter01.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -166,9 +166,10 @@
\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{parts}: use this option if you \emph{use} Part
+ divisions in your document. This is necessary to get the
+ spacing of the Table of Contents right.
+ (Cannot be used together with \texttt{nochapters}.)
\item\texttt{linedheaders}: changes the look of the chapter
headings a bit by adding a horizontal line above the chapter
@@ -178,6 +179,12 @@
\item Typography:
\begin{itemize}
+ \item\texttt{style}: this offers a comfortable way of changing the look and feel easily. Default style is \texttt{classicthesis}.
+
+ As a new feature, Lorenzo Pantieri's \texttt{arsclassica} is available as well. As Lorenzo's package is discontinued and with his permission, \texttt{classicthesis-arsclassica.sty} is now part of \texttt{classicthesis} and will be maintained here.
+
+ \item\texttt{palatino}: Hermann Zapf's classic font is the free standard font for this style. Robert Bringhurst's book uses Adobe's commercial font Minion Pro. However, there are other free alternatives also available. Deactivate this option for loading such alternatives and see \texttt{classicthesis-config.tex} for some suggestions.
+
\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.
@@ -187,6 +194,7 @@
\item\texttt{eulermath}: loads the awesome Euler fonts for math.
Pala\-tino is used as default font.
+
\end{itemize}
\marginpar{Options are enabled via \texttt{option=true}}
@@ -209,16 +217,27 @@
\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{listings}: loads the \texttt{listings} package (if not already done) and configures the List of Listings accordingly.
\item\texttt{floatperchapter}: activates numbering per chapter for
all floats such as figures, tables, and listings (if used).
\end{itemize}
+ \item Tweaking colors and fonts -- please use this with great care!:
+ \begin{itemize}
+ \item\verb|\ct at altfont|: comfortable hook to alter the basic look and feel of everything that uses spaced caps or spaced small caps. For example, for \texttt{arsclassica} we used \\ \verb|\renewcommand*{\ct at altfont}{\sffamily}|. Coloring is also possible this way.
+
+ % \item\verb|\ct at caps|: spacedallcaps spacedlowsmallcaps
+
+ \item\texttt{CTsemi}: Change the semi gray color used, \eg, for the chapter number. Default is: \verb|\definecolor{CTsemi}{gray}{0.55}|
+
+ \item\texttt{CTtitle}: Change the red color used, \eg, for the title. Default is: \verb|\definecolor{CTtitle}{named}{Maroon}|
+
+ \end{itemize}
+
\end{itemize}
-Furthermore, pre-defined margins for different paper sizes are available, \eg, \texttt{a4paper}, \texttt{a5paper}, and \texttt{letterpaper}. These are based on your chosen option of \verb|\documentclass|.
+Furthermore, pre-defined margins for different paper sizes are available, \eg, \texttt{a4paper}, \texttt{a5paper}, \texttt{b5paper}, and \texttt{letterpaper}. These are based on your chosen option of \verb|\documentclass|.
The best way to figure these options out is to try the different
possibilities and see what you and your supervisor like best.
@@ -245,11 +264,11 @@
}
\begin{lstlisting}
- % **************************************************
+ % *********************************************
% 2. Personal data and user ad-hoc commands
- % **************************************************
- \newcommand{\myTitle}{A Classic Thesis Style\xspace}
- \newcommand{\mySubtitle}{An Homage to...\xspace}
+ % *********************************************
+ \newcommand{\myTitle}{A Classic Thesis Style}
+ \newcommand{\mySubtitle}{An Homage to...}
\end{lstlisting}
Further customization can be made in \texttt{classicthesis-config.tex}
@@ -257,20 +276,18 @@
(see~\autoref{sec:options}) in a line that looks like this:
\begin{lstlisting}
- \PassOptionsToPackage{
- drafting=true, % print version information on the bottom of the pages
- tocaligned=false, % the left column of the toc will be aligned (no indentation)
- dottedtoc=false, % page numbers in ToC flushed right
- parts=true, % use part division
- eulerchapternumbers=true, % use AMS Euler for chapter font (otherwise Palatino)
- linedheaders=false, % chaper headers will have line above and beneath
- floatperchapter=true, % numbering per chapter for all floats (i.e., Figure 1.1)
- listings=true, % load listings package and setup LoL
- subfig=true, % setup for preloaded subfig package
- eulermath=false, % use awesome Euler fonts for mathematical formulae (only with pdfLaTeX)
- beramono=true, % toggle a nice monospaced font (w/ bold)
- minionpro=false % setup for minion pro font; use minion pro small caps as well (only with pdfLaTeX)
- }{classicthesis}
+\PassOptionsToPackage{
+ drafting=true,
+ tocaligned=false,
+ dottedtoc=false,
+ eulerchapternumbers=true,
+ linedheaders=false,
+ floatperchapter=true,
+ eulermath=false,
+ beramono=true,
+ palatino=true,
+ style=classicthesis
+}{classicthesis}
\end{lstlisting}
Many other customizations in \texttt{classicthesis-config.tex} are
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/Chapters/Chapter02.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -2,12 +2,15 @@
\chapter{Examples}\label{ch:examples}
%*****************************************
%\setcounter{figure}{10}
+% \begin{flushright}
+% \itshape Robert Cialdini, Scott Adams, and Tony Robbins
+% \end{flushright}
% \NoCaseChange{Homo Sapiens}
Ei choro aeterno antiopam mea, labitur bonorum pri no
\citeauthor{taleb:2012} \citep{taleb:2012}. His no decore
nemore graecis. %In eos meis nominavi, liber soluta vim cu. Sea commune
suavitate interpretaris eu, vix eu libris efficiantur.
- Some interesting books in order to get a multi-page bibliography: \cite{ferriss:2016,greenwald:2014,adams:2013,pausch:2008,aurelius:2002,adams:1996,trump:1987,feynman:1985,cialdini:1984,seneca,orwell:1949,taleb:2010,munger:2008,postman:2005,frankl:1959} %\nocite{*}
+ Some interesting books in order to get a multi-page bibliography: \cite{ferriss:2016,greenwald:2014,adams:2013,pausch:2008,aurelius:2002,adams:1996,trump:1987,feynman:1985,cialdini:1984,seneca,orwell:1949,taleb:2010,munger:2008,postman:2005,harari:2014,peterson:2018,taleb:2018,frankl:1959} %\nocite{*}
% Ugly work-around
% Part~\textsc{\ref{pt:showcase}}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/ClassicThesis.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -2,7 +2,7 @@
% A Classic Thesis Style
% An Homage to The Elements of Typographic Style
%
-% Copyright (C) 2017 André Miede and Ivo Pletikosić
+% Copyright (C) 2018 André Miede and Ivo Pletikosić
%
% If you like the style then I would appreciate a postcard. My address
% can be found in the file ClassicThesis.pdf. A collection of the
@@ -32,10 +32,9 @@
\WarningFilter{scrreprt}{Usage of package `titlesec'}
%\WarningFilter{scrreprt}{Activating an ugly workaround}
\WarningFilter{titlesec}{Non standard sectioning command detected}
-\documentclass[ twoside,openright,titlepage,numbers=noenddot,headinclude,%1headlines,% letterpaper a4paper
- footinclude=true,cleardoublepage=empty,abstractoff, % <--- obsolete, remove (todo)
- BCOR=5mm,paper=a4,fontsize=11pt,%11pt,a4paper,%
- ngerman,american,%
+\documentclass[ twoside,openright,titlepage,numbers=noenddot,%1headlines,
+ headinclude,footinclude,cleardoublepage=empty,abstract=on,
+ BCOR=5mm,paper=a4,fontsize=11pt
]{scrreprt}
%********************************************************************
Added: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.pdf 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.pdf 2018-06-17 21:04:56 UTC (rev 48041)
Property changes on: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -0,0 +1,35 @@
+% book example for classicthesis.sty
+\RequirePackage{silence} % :-\
+ \WarningFilter{scrbook}{Usage of package `titlesec'}
+ \WarningFilter{titlesec}{Non standard sectioning command detected}
+\documentclass[11pt,paper=b5,footinclude,headinclude]{scrbook} % KOMA-Script book
+\usepackage[T1]{fontenc}
+\usepackage{lipsum}
+\usepackage[style=arsclassica, parts=false]{classicthesis}
+
+\begin{document}
+
+ \tableofcontents
+
+ \chapter{Some Testing}
+ \lipsum[1]
+
+ \chapter{Test Chapter ABC}
+ \lipsum[1]
+
+ \section{A Section}
+ \lipsum[1]
+
+ \section{A Section}
+ \lipsum[1]
+
+ \section{A Section}
+ \lipsum[1]
+
+ \chapter{Test Chapter DEF}
+ \lipsum[1]
+
+ \section{A Section}
+ \lipsum[1]
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-arsclassica-book.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-article.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -2,7 +2,7 @@
\documentclass[10pt,a4paper]{article} % KOMA-Script article scrartcl
\usepackage{lipsum}
\usepackage{url}
-\usepackage[nochapters]{classicthesis} % nochapters
+\usepackage[nochapters]{../classicthesis} % nochapters
\begin{document}
\pagestyle{plain}
@@ -22,6 +22,17 @@
\finalVersionString \lipsum[1]
\subsection{A Subsection}
\lipsum[1]
+ \footnote{Footnote with one digit}
+ \footnote{Footnote with one digit}
+ \footnote{Footnote with one digit}
+ \footnote{Footnote with one digit}
+ \footnote{Footnote with one digit}
+ \footnote{Footnote with one digit}
+ \footnote{Footnote with one digit}
+ \footnote{Footnote with one digit}
+ \footnote{Footnote with one digit}
+ \footnote{Footnote with two digits} % "0" and "F" should not overlap here.
+
\subsection{A Subsection}
\section{A Section}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book-xelatex.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -2,11 +2,11 @@
\RequirePackage{silence} % :-\
\WarningFilter{scrbook}{Usage of package `titlesec'}
\WarningFilter{titlesec}{Non standard sectioning command detected}
-\documentclass[11pt,a5paper,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book
+\documentclass[11pt,a5paper,footinclude,headinclude]{scrbook} % KOMA-Script book
\usepackage[T1]{fontenc}
\usepackage{lipsum}
%\usepackage{hyperref}
-\usepackage[parts]{classicthesis} % ,manychapters
+\usepackage[parts]{../classicthesis} % ,manychapters
%\usepackage[osf]{libertine}
%\hypersetup{linktocpage=true,bookmarksnumbered=true,pageanchor=true,hypertexnames=false,naturalnames=true,plainpages=false}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-book.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -2,15 +2,12 @@
\RequirePackage{silence} % :-\
\WarningFilter{scrbook}{Usage of package `titlesec'}
\WarningFilter{titlesec}{Non standard sectioning command detected}
-\documentclass[11pt,paper=a5,footinclude=true,headinclude=true]{scrbook} % KOMA-Script book
+\documentclass[11pt,paper=b5,footinclude,headinclude]{scrbook} % KOMA-Script book
\usepackage[T1]{fontenc}
\usepackage{lipsum}
-\usepackage[ linedheaders=true,%
- parts=true]{../classicthesis} % ,manychapters
+\usepackage[linedheaders=true]{../classicthesis} % ,manychapters
%\usepackage[osf]{libertine}
-\usepackage{hyperref}
-
\begin{document}
% \pagestyle{scrheadings}
% \manualmark
@@ -24,13 +21,13 @@
% use \cleardoublepage here to avoid problems with pdfbookmark
\cleardoublepage\part{Test Part}\label{part:testpart}
- \chapter{Some Math Testing}
+ \chapter{Some Testing}
We discuss in Part~\ref{part:testpart} the test results.
-
+
We discuss in Part~\textsc{\ref{part:testpart}} the test results.
\lipsum[1]
- \chapter{Test Chapter ABC}
+ \chapter{Test Chapter \NoCaseChange{Ag}}
\lipsum[1]
\section{A Section}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/Examples/classicthesis-cv.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -2,16 +2,20 @@
\RequirePackage{silence} % :-\
\WarningFilter{scrartcl}{Usage of package `titlesec'}
\WarningFilter{titlesec}{Non standard sectioning command detected}
-\documentclass[10pt,a4paper]{scrartcl}
+\documentclass[fontsize=10pt,paper=a4]{scrartcl}
\usepackage[LabelsAligned]{currvita} % nice cv style
\usepackage{url}
+ \urlstyle{rm}
\usepackage[ngerman]{babel}
-\usepackage[nochapters]{classicthesis}
+\usepackage[nochapters]{../classicthesis}
\renewcommand*{\cvheadingfont}{\LARGE\color{Maroon}}
\renewcommand*{\cvlistheadingfont}{\large}
-\renewcommand*{\cvlabelfont}{\qquad}
+\renewcommand*{\cvlabelfont}{\itshape} % \qquad
+\areaset[current]{390pt}{730pt} % need some extra space
+%\usepackage[pass,showframe]{geometry}
+
\begin{document}
\pagestyle{plain}
\begin{cv}{\spacedallcaps{Curriculum Vit\ae}}
@@ -20,14 +24,15 @@
\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}
\end{cvlist}
- \clearpage
+ % \clearpage
%\pdfbookmark[1]{Irgendwas}{irgendwas}
\begin{cvlist}{\spacedlowsmallcaps{Irgendwas}}\label{irgendwas}
- \item \dots
+ \item[Fusce mauris] Vestibulum luctus nibh at lectus. Sed bibendum, nulla a faucibus semper, leo velit ultricies tellus, ac venenatis arcu wisi vel nisl. Vestibulum diam. Aliquam pellentesque, augue quis sagittis posuere, turpis lacus congue quam, in hendrerit risus eros eget felis.
+ \item[Nulla facilisi] Sed a turpis eu lacus commodo facilisis. Morbi fringilla, wisi in dignissim interdum, justo lectus sagittis dui, et vehicula libero dui cursus dui. Mauris tempor ligula sed lacus. Duis cursus enim ut augue. Cras ac magna. Cras nulla. Nulla egestas.
+ \item[Curabitur a leo] Quisque egestas wisi eget nunc. Nam feugiat lacus vel est. Curabitur consectetuer.
\end{cvlist}
\end{cv}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Abstract.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -3,6 +3,7 @@
%*******************************************************
%\renewcommand{\abstractname}{Abstract}
\pdfbookmark[1]{Abstract}{Abstract}
+% \addcontentsline{toc}{chapter}{\tocEntry{Abstract}}
\begingroup
\let\clearpage\relax
\let\cleardoublepage\relax
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Acknowledgments.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -24,16 +24,17 @@
Many thanks to everybody who already sent me a postcard!
-Regarding the typography and other help, many thanks go to Marco
-Kuhlmann, Philipp Lehman, Lothar Schlesier, Jim Young, Lorenzo
-Pantieri and Enrico Gregorio\footnote{Members of GuIT (Gruppo
-Italiano Utilizzatori di \TeX\ e \LaTeX )}, J\"org Sommer,
-Joachim K\"ostler, Daniel Gottschlag, Denis Aydin, Paride
-Legovini, Steffen Prochnow, Nicolas Repp, Hinrich Harms,
-Roland Winkler, Jörg Weber, Henri Menke, Claus Lahiri,
-Clemens Niederberger, Stefano Bragaglia, Jörn Hees,
-Scott Lowe, Dave Howcroft,
-and the whole \LaTeX-community for support, ideas and
+Regarding the typography and other help, many thanks go to Marco
+Kuhlmann, Philipp Lehman, Lothar Schlesier, Jim Young, Lorenzo
+Pantieri and Enrico Gregorio\footnote{Members of GuIT (Gruppo
+Italiano Utilizzatori di \TeX\ e \LaTeX )}, J\"org Sommer,
+Joachim K\"ostler, Daniel Gottschlag, Denis Aydin, Paride
+Legovini, Steffen Prochnow, Nicolas Repp, Hinrich Harms,
+Roland Winkler, Jörg Weber, Henri Menke, Claus Lahiri,
+Clemens Niederberger, Stefano Bragaglia, Jörn Hees,
+Scott Lowe, Dave Howcroft, Jos\'e M. Alcaide, David Carlisle,
+Ulrike Fischer, Hugues de Lassus, Csaba Hajdu, Dave Howcroft,
+and the whole \LaTeX-community for support, ideas and
some great software.
\bigskip
@@ -45,6 +46,3 @@
\endgroup
-
-
-
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Contents.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -3,7 +3,6 @@
%*******************************************************
\pagestyle{scrheadings}
%\phantomsection
-\refstepcounter{dummy}
\pdfbookmark[1]{\contentsname}{tableofcontents}
\setcounter{tocdepth}{2} % <-- 2 includes up to subsections in the ToC
\setcounter{secnumdepth}{3} % <-- 3 numbers up to subsubsections
@@ -12,7 +11,7 @@
\tableofcontents
\automark[section]{chapter}
\renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}}
-\renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}}
+\renewcommand{\sectionmark}[1]{\markright{\textsc{\thesection}\enspace\spacedlowsmallcaps{#1}}}
%*******************************************************
% List of Figures and of the Tables
%*******************************************************
@@ -25,7 +24,6 @@
% List of Figures
%*******************************************************
%\phantomsection
- \refstepcounter{dummy}
%\addcontentsline{toc}{chapter}{\listfigurename}
\pdfbookmark[1]{\listfigurename}{lof}
\listoffigures
@@ -36,7 +34,6 @@
% List of Tables
%*******************************************************
%\phantomsection
- \refstepcounter{dummy}
%\addcontentsline{toc}{chapter}{\listtablename}
\pdfbookmark[1]{\listtablename}{lot}
\listoftables
@@ -48,7 +45,6 @@
% List of Listings
%*******************************************************
%\phantomsection
- \refstepcounter{dummy}
%\addcontentsline{toc}{chapter}{\lstlistlistingname}
\pdfbookmark[1]{\lstlistlistingname}{lol}
\lstlistoflistings
@@ -59,7 +55,6 @@
% Acronyms
%*******************************************************
%\phantomsection
- \refstepcounter{dummy}
\pdfbookmark[1]{Acronyms}{acronyms}
\markboth{\spacedlowsmallcaps{Acronyms}}{\spacedlowsmallcaps{Acronyms}}
\chapter*{Acronyms}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Declaration.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Declaration.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Declaration.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -1,7 +1,6 @@
%*******************************************************
% Declaration
%*******************************************************
-\refstepcounter{dummy}
\pdfbookmark[0]{Declaration}{declaration}
\chapter*{Declaration}
\thispagestyle{empty}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Dedication.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -2,8 +2,7 @@
% Dedication
%*******************************************************
\thispagestyle{empty}
-%\phantomsection
-\refstepcounter{dummy}
+\phantomsection
\pdfbookmark[1]{Dedication}{Dedication}
\vspace*{3cm}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/DirtyTitlepage.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -8,6 +8,6 @@
\spacedlowsmallcaps{\myName} \\ \medskip
\begingroup
- \color{Maroon}\spacedallcaps{\myTitle}
+ \color{CTtitle}\spacedallcaps{\myTitle}
\endgroup
\end{center}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/FrontBackmatter/Titlepage.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -2,6 +2,7 @@
% Titlepage
%*******************************************************
\begin{titlepage}
+ %\pdfbookmark[1]{\myTitle}{titlepage}
% if you want the titlepage to be centered, uncomment and fine-tune the line below (KOMA classes environment)
\begin{addmargin}[-1cm]{-3cm}
\begin{center}
@@ -12,7 +13,7 @@
\vfill
\begingroup
- \color{Maroon}\spacedallcaps{\myTitle} \\ \bigskip
+ \color{CTtitle}\spacedallcaps{\myTitle} \\ \bigskip
\endgroup
\spacedlowsmallcaps{\myName}
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/LISTOFFILES 2018-06-17 21:04:56 UTC (rev 48041)
@@ -19,16 +19,16 @@
t1enc.dfu 2017/01/28 v1.1t UTF-8 support for inputenc
ot1enc.dfu 2017/01/28 v1.1t UTF-8 support for inputenc
omsenc.dfu 2017/01/28 v1.1t UTF-8 support for inputenc
- babel.sty 2017/10/04 3.14 The Babel package
+ babel.sty 2017/11/03 3.15 The Babel package
bblopts.cfg 2005/09/08 v0.1 add Arabic and Farsi to "declared" options of b
abel
ngerman.ldf 2016/11/02 v2.9 German support for babel (new orthography)
american.ldf 2017/06/06 v3.3r English support from the babel system
csquotes.sty 2017/03/11 v5.2b context-sensitive quotations (JAW)
-etoolbox.sty 2017/01/02 v2.4 e-TeX tools for LaTeX (JAW)
+etoolbox.sty 2017/11/22 v2.5 e-TeX tools for LaTeX (JAW)
csquotes.def 2017/03/11 v5.2b csquotes generic definitions (JAW)
csquotes.cfg
-biblatex.sty 2016/12/05 v3.7 programmable bibliographies (PK/JW/AB)
+biblatex.sty 2017/11/21 v3.9 programmable bibliographies (PK/JW/AB)
pdftexcmds.sty 2017/03/19 v0.25 Utility functions of pdfTeX for LuaTeX (HO)
infwarerr.sty 2016/05/16 v1.4 Providing info/warning/error messages (HO)
ifluatex.sty 2016/05/16 v1.4 Provides the ifluatex switch (HO)
@@ -45,14 +45,14 @@
blx-dm.def
numeric-comp.dbx
biblatex-dm.cfg
-blx-compat.def 2016/12/05 v3.7 biblatex compatibility (PK/JW/AB)
-blx-bibtex.def 2016/12/05 v3.7 biblatex compatibility (PK/JW/AB)
-biblatex.def 2016/12/05 v3.7 biblatex compatibility (PK/JW/AB)
-blx-natbib.def 2016/12/05 v3.7 biblatex compatibility (PK/JW/AB)
-standard.bbx 2016/12/05 v3.7 biblatex bibliography style (PK/JW/AB)
- numeric.bbx 2016/12/05 v3.7 biblatex bibliography style (PK/JW/AB)
-numeric-comp.bbx 2016/12/05 v3.7 biblatex bibliography style (PK/JW/AB)
-numeric-comp.cbx 2016/12/05 v3.7 biblatex citation style (PK/JW/AB)
+blx-compat.def 2017/11/21 v3.9 biblatex compatibility (PK/JW/AB)
+blx-bibtex.def 2017/11/21 v3.9 biblatex compatibility (PK/JW/AB)
+biblatex.def 2017/11/21 v3.9 biblatex compatibility (PK/JW/AB)
+blx-natbib.def 2017/11/21 v3.9 biblatex compatibility (PK/JW/AB)
+standard.bbx 2017/11/21 v3.9 biblatex bibliography style (PK/JW/AB)
+ numeric.bbx 2017/11/21 v3.9 biblatex bibliography style (PK/JW/AB)
+numeric-comp.bbx 2017/11/21 v3.9 biblatex bibliography style (PK/JW/AB)
+numeric-comp.cbx 2017/11/21 v3.9 biblatex citation style (PK/JW/AB)
biblatex.cfg
amsmath.sty 2017/09/02 v2.17a AMS math features
amstext.sty 2000/06/29 v2.01 AMS text
@@ -66,10 +66,10 @@
ts1enc.dfu 2017/01/28 v1.1t UTF-8 support for inputenc
scrhack.sty 2017/09/07 v3.24 KOMA-Script package
xpatch.sty 2012/10/02 v0.3 Extending etoolbox patching commands
- expl3.sty 2017/09/18 L3 programming layer (loader)
-expl3-code.tex 2017/09/18 L3 programming layer
+ expl3.sty 2017/12/16 L3 programming layer (loader)
+expl3-code.tex 2017/12/16 L3 programming layer
l3pdfmode.def 2017/03/18 v L3 Experimental driver: PDF mode
- xparse.sty 2017/09/18 L3 Experimental document command parser
+ xparse.sty 2017/12/16 L3 Experimental document command parser
xspace.sty 2014/10/28 v1.13 Space after command names (DPC,MH)
mparhack.sty 2005/04/17 v1.4 (T. Sgouros and S. Ulrich)
acronym.sty 2015/03/21 v1.41 Support for acronyms (Tobias Oetiker)
@@ -123,8 +123,8 @@
graphics.sty 2017/06/25 v1.2c Standard LaTeX Graphics (DPC,SPQR)
trig.sty 2016/01/03 v1.10 sin cos tan (DPC)
graphics.cfg 2016/06/04 v1.11 sample graphics configuration
- pdftex.def 2017/06/24 v1.0g Graphics/color driver for pdftex
-classicthesis.sty 2017/10/13 v4.4 Typographic style for a classic-looking th
+ pdftex.def 2017/12/07 v1.0i Graphics/color driver for pdftex
+classicthesis.sty 2017/12/12 v4.5 Typographic style for a classic-looking th
esis
latexrelease.sty 2016/12/29 v1.0h LaTeX release emulation and tests
xcolor.sty 2016/05/11 v2.12 LaTeX color extensions (UK)
@@ -147,10 +147,10 @@
scrtime.sty 2017/09/07 v3.24 KOMA-Script package (time of LaTeX run)
prelim2e.sty 2009/05/29 v1.3 prelim2e Package (MS)
everyshi.sty 2001/05/15 v3.00 EveryShipout Package (MS)
- english.lbx 2016/12/05 v3.7 biblatex localization (PK/JW/AB)
-american.lbx 2016/12/05 v3.7 biblatex localization (PK/JW/AB)
- german.lbx 2016/12/05 v3.7 biblatex localization (PK/JW/AB)
- ngerman.lbx 2016/12/05 v3.7 biblatex localization (PK/JW/AB)
+ english.lbx 2017/11/21 v3.9 biblatex localization (PK/JW/AB)
+american.lbx 2017/11/21 v3.9 biblatex localization (PK/JW/AB)
+ german.lbx 2017/11/21 v3.9 biblatex localization (PK/JW/AB)
+ ngerman.lbx 2017/11/21 v3.9 biblatex localization (PK/JW/AB)
ts1cmr.fd 2014/09/29 v2.5h Standard LaTeX font definitions
t1pplj.fd 2004/09/06 font definitions for T1/pplj.
ClassicThesis.bbl
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/README 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/README 2018-06-17 21:04:56 UTC (rev 48041)
@@ -1,6 +1,6 @@
-A Classic Thesis Style v4.4
+A Classic Thesis Style v4.6
An Homage to The Elements of Typographic Style
-Copyright (C) 2017 André Miede http://www.miede.de
+Copyright (C) 2018 André Miede and Ivo Pletikosić
Please see the file ClassicThesis.pdf for more information.
Your comments are highly appreciated.
Modified: trunk/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/doc/latex/classicthesis/classicthesis-config.tex 2018-06-17 21:04:56 UTC (rev 48041)
@@ -19,6 +19,10 @@
\PassOptionsToPackage{utf8}{inputenc}
\usepackage{inputenc}
+\PassOptionsToPackage{T1}{fontenc} % T2A for cyrillics
+ \usepackage{fontenc}
+
+
% ****************************************************************************************************
% 1. Configure classicthesis for your needs here, e.g., remove "drafting" below
% in order to deactivate the time-stamp on the pages
@@ -28,25 +32,23 @@
drafting=true, % print version information on the bottom of the pages
tocaligned=false, % the left column of the toc will be aligned (no indentation)
dottedtoc=false, % page numbers in ToC flushed right
- parts=true, % use part division
eulerchapternumbers=true, % use AMS Euler for chapter font (otherwise Palatino)
linedheaders=false, % chaper headers will have line above and beneath
floatperchapter=true, % numbering per chapter for all floats (i.e., Figure 1.1)
- listings=true, % load listings package and setup LoL
- subfig=true, % setup for preloaded subfig package
eulermath=false, % use awesome Euler fonts for mathematical formulae (only with pdfLaTeX)
beramono=true, % toggle a nice monospaced font (w/ bold)
- minionpro=false % setup for minion pro font; use minion pro small caps as well (only with pdfLaTeX)
+ palatino=true, % deactivate standard font for loading another one, see the last section at the end of this file for suggestions
+ style=classicthesis % classicthesis, arsclassica
}{classicthesis}
% ****************************************************************************************************
-% 2. Personal data and user ad-hoc commands
+% 2. Personal data and user ad-hoc commands (insert your own data here)
% ****************************************************************************************************
\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é Miede\xspace}
+\newcommand{\myName}{André Miede \& Ivo Pletikosić\xspace}
\newcommand{\myProf}{Put name here\xspace}
\newcommand{\myOtherProf}{Put name here\xspace}
\newcommand{\mySupervisor}{Put name here\xspace}
@@ -54,14 +56,12 @@
\newcommand{\myDepartment}{Put data here\xspace}
\newcommand{\myUni}{Put data here\xspace}
\newcommand{\myLocation}{Saarbrücken\xspace}
-\newcommand{\myTime}{October 2017\xspace}
-\newcommand{\myVersion}{version 4.4}
+\newcommand{\myTime}{June 2018\xspace}
+\newcommand{\myVersion}{\classicthesis}
% ********************************************************************
% Setup, finetuning, and useful commands
% ********************************************************************
-\newcounter{dummy} % necessary for correct hyperlinks (to index, bib, etc.)
-\newlength{\abcd} % for ab..z string length calculation
\providecommand{\mLyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
\newcommand{\ie}{i.\,e.}
\newcommand{\Ie}{I.\,e.}
@@ -76,7 +76,7 @@
% ********************************************************************
% Packages with options that might require adjustments
% ********************************************************************
-%\PassOptionsToPackage{ngerman,american}{babel} % change this to your language(s), main language last
+\PassOptionsToPackage{ngerman,american}{babel} % change this to your language(s), main language last
% Spanish languages need extra options in order to work with this template
%\PassOptionsToPackage{spanish,es-lcroman}{babel}
\usepackage{babel}
@@ -102,14 +102,9 @@
% ********************************************************************
% General useful packages
% ********************************************************************
-\PassOptionsToPackage{T1}{fontenc} % T2A for cyrillics
- \usepackage{fontenc}
-\usepackage{textcomp} % fix warning with missing font shapes
+\usepackage{graphicx} %
\usepackage{scrhack} % fix warnings when using KOMA with listings package
\usepackage{xspace} % to get the spacing after macros right
-\usepackage{mparhack} % get marginpar right
-%\usepackage{fixltx2e} % fixes some LaTeX stuff --> since 2015 in the LaTeX kernel (see below)
-% \usepackage[latest]{latexrelease} % emulate newer kernel version if older is detected
\PassOptionsToPackage{printonlyused,smaller}{acronym}
\usepackage{acronym} % nice macros for handling all acronyms in the thesis
%\renewcommand{\bflabel}[1]{{#1}\hfill} % fix the list of acronyms --> no longer working
@@ -130,15 +125,8 @@
% ****************************************************************************************************
\usepackage{tabularx} % better tables
\setlength{\extrarowheight}{3pt} % increase table row height
-\newcommand{\tableheadline}[1]{\multicolumn{1}{c}{\spacedlowsmallcaps{#1}}}
+\newcommand{\tableheadline}[1]{\multicolumn{1}{l}{\spacedlowsmallcaps{#1}}}
\newcommand{\myfloatalign}{\centering} % to be used with each float for alignment
-\usepackage{caption}
-% Thanks to cgnieder and Claus Lahiri
-% http://tex.stackexchange.com/questions/69349/spacedlowsmallcaps-in-caption-label
-% [REMOVED DUE TO OTHER PROBLEMS, SEE ISSUE #82]
-%\DeclareCaptionLabelFormat{smallcaps}{\bothIfFirst{#1}{~}\MakeTextLowercase{\textsc{#2}}}
-%\captionsetup{font=small,labelformat=smallcaps} % format=hang,
-\captionsetup{font=small} % format=hang,
\usepackage{subfig}
% ****************************************************************************************************
@@ -169,24 +157,19 @@
% ****************************************************************************************************
+
+
% ****************************************************************************************************
-% 6. PDFLaTeX, hyperreferences, and citation backreferences
+% 6. Last calls before the bar closes
% ****************************************************************************************************
% ********************************************************************
-% Using PDFLaTeX
+% Her Majesty herself
% ********************************************************************
-\PassOptionsToPackage{hyperfootnotes=false,pdfpagelabels}{hyperref}
- \usepackage{hyperref} % backref linktocpage pagebackref
-%\ifpdf
-%\pdfcompresslevel=9
-%\pdfadjustspacing=1
-%\fi
-%\PassOptionsToPackage{pdftex}{graphicx} %%%IVO: driver will be chosen automatically
- \usepackage{graphicx}
+\usepackage{classicthesis}
% ********************************************************************
-% Hyperreferences
+% Fine-tune hyperreferences (hyperref should be called last)
% ********************************************************************
\hypersetup{%
%draft, % hyperref's draft mode, for printing see below
@@ -193,10 +176,12 @@
colorlinks=true, linktocpage=true, pdfstartpage=3, pdfstartview=FitV,%
% uncomment the following line if you want to have black links (e.g., for printing)
%colorlinks=false, linktocpage=false, pdfstartpage=3, pdfstartview=FitV, pdfborder={0 0 0},%
- breaklinks=true, pdfpagemode=UseNone, pageanchor=true, pdfpagemode=UseOutlines,%
+ breaklinks=true, pageanchor=true,%
+ pdfpagemode=UseNone, %
+ % pdfpagemode=UseOutlines,%
plainpages=false, bookmarksnumbered, bookmarksopen=true, bookmarksopenlevel=1,%
hypertexnames=true, pdfhighlight=/O,%nesting=true,%frenchlinks,%
- urlcolor=webbrown, linkcolor=RoyalBlue, citecolor=webgreen, %pagecolor=RoyalBlue,%
+ urlcolor=CTurl, linkcolor=CTlink, citecolor=CTcitation, %pagecolor=RoyalBlue,%
%urlcolor=Black, linkcolor=Black, citecolor=Black, %pagecolor=Black,%
pdftitle={\myTitle},%
pdfauthor={\textcopyright\ \myName, \myUni, \myFaculty},%
@@ -206,13 +191,13 @@
pdfproducer={LaTeX with hyperref and classicthesis}%
}
+
% ********************************************************************
-% Setup autoreferences
+% Setup autoreferences (hyperref and babel)
% ********************************************************************
% There are some issues regarding autorefnames
-% http://www.ureader.de/msg/136221647.aspx
% http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexwords
-% you have to redefine the makros for the
+% you have to redefine the macros for the
% language you use, e.g., american, ngerman
% (as chosen when loading babel/AtBeginDocument)
% ********************************************************************
@@ -244,9 +229,6 @@
\makeatother
-% ****************************************************************************************************
-% 7. Last calls before the bar closes
-% ****************************************************************************************************
% ********************************************************************
% Development Stuff
% ********************************************************************
@@ -256,15 +238,9 @@
%\PassOptionsToPackage{warning, all}{onlyamsmath}
% \usepackage{onlyamsmath}
-% ********************************************************************
-% Last, but not least...
-% ********************************************************************
-\usepackage{classicthesis}
-% ****************************************************************************************************
-
% ****************************************************************************************************
-% 8. Further adjustments (experimental)
+% 7. Further adjustments (experimental)
% ****************************************************************************************************
% ********************************************************************
% Changing the text area
@@ -277,7 +253,7 @@
% Using different fonts
% ********************************************************************
%\usepackage[oldstylenums]{kpfonts} % oldstyle notextcomp
-%\usepackage[osf]{libertine}
+% \usepackage[osf]{libertine}
%\usepackage[light,condensed,math]{iwona}
%\renewcommand{\sfdefault}{iwona}
%\usepackage{lmodern} % <-- no osf support :-(
@@ -285,11 +261,12 @@
%\usepackage[urw-garamond]{mathdesign} <-- no osf support :-(
%\usepackage[default,osfigures]{opensans} % scale=0.95
%\usepackage[sfdefault]{FiraSans}
+% \usepackage[opticals,mathlf]{MinionPro} % onlytext
% ********************************************************************
-% \usepackage[largesc,osf]{newpxtext}
+%\usepackage[largesc,osf]{newpxtext}
+%\linespread{1.05} % a bit more for Palatino
% Used to fix these:
% https://bitbucket.org/amiede/classicthesis/issues/139/italics-in-pallatino-capitals-chapter
% https://bitbucket.org/amiede/classicthesis/issues/45/problema-testatine-su-classicthesis-style
% ********************************************************************
-%\linespread{1.05} % a bit more for Palatino
% ****************************************************************************************************
Added: trunk/Master/texmf-dist/tex/latex/classicthesis/classicthesis-arsclassica.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/classicthesis/classicthesis-arsclassica.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/classicthesis/classicthesis-arsclassica.sty 2018-06-17 21:04:56 UTC (rev 48041)
@@ -0,0 +1,92 @@
+%************************************************************
+% classicthesis-arsclassica.sty
+% Integrated into classicthesis with permission and adapted
+% by André Miede and Ivo Pletikosić
+% 2018
+%************************************************************
+% Copyright (C) 2008--2017 Lorenzo Pantieri
+% http://www.lorenzopantieri.net/
+%************************************************************
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{classicthesis-arsclassica}[2018/05/20]
+
+\ifdefined\classicthesis\else\RequirePackage{classicthesis}\fi
+
+
+%************************************************************
+% Fonts
+%************************************************************
+\ifthenelse{\boolean{xetex}\OR\boolean{luatex}}
+ {\setsansfont[Ligatures=TeX,Numbers=OldStyle]{Iwona}}
+ {\renewcommand{\sfdefault}{iwona}}
+\renewcommand*{\ct at altfont}{\sffamily}
+
+\ifthenelse{\boolean{ct at eulerchapternumbers}}% font for the chapter numbers; scale in classicthesis is 7
+ {\DeclareFixedFont{\chapterNumber}{U}{eur}{b}{n}{50}}%
+ {\DeclareFixedFont{\chapterNumber}{T1}{pplj}{m}{n}{50}}%
+
+%************************************************************
+% Caption
+%************************************************************
+\captionsetup{font=small,labelfont={sf,bf},format=hang}
+\captionsetup[table]{skip=\medskipamount}
+
+%************************************************************
+% Itemize
+%************************************************************
+\renewcommand\labelitemi{\color{CTsemi}$\bullet$}
+
+%************************************************************
+% Headlines
+%************************************************************
+\renewcommand{\sectionmark}[1]{\markright{\textsc{\MakeTextLowercase{\thesection}} \spacedlowsmallcaps{#1}}}
+\lehead{\mbox{\llap{\small\thepage\kern1em\color{CTsemi}\vline}\color{CTsemi}\hspace{0.5em}\headmark\hfil}}
+\rohead{\mbox{\hfil{\color{CTsemi}\headmark\hspace{0.5em}}\rlap{\small{\color{CTsemi}\vline}\kern1em\thepage}}}
+\renewcommand{\headfont}{\normalfont\sffamily}
+\renewcommand{\pnumfont}{\small\sffamily}
+\clearscrplain
+\rofoot[\mbox{\makebox[0pt][l]{\kern1em\thepage}}]{}
+
+%************************************************************
+% Layout of the chapter-, section-, subsection-,
+% subsubsection-, paragraph and description-headings
+%************************************************************
+% chapters
+\newcommand\formatchapter[1]{%
+ \vbox to \ht\strutbox{%
+ \setbox0=\hbox{\chapterNumber\thechapter\hspace{10pt}\vline\ }%
+ \advance\hsize-\wd0 \advance\hsize-10pt\raggedright%
+ \spacedallcaps{#1}\vss}}
+\titleformat{\chapter}[block]%
+ {\normalfont\Large\sffamily}%
+ {\textcolor{CTsemi}{\chapterNumber\thechapter}%
+ \ \,\hspace{10pt}\vline\ }{10pt}%
+ {\formatchapter}
+% sections
+\titleformat{\section}%
+ {\normalfont\Large\sffamily}{\textsc%
+ {\MakeTextLowercase{\thesection}}}%
+ {1em}{\spacedlowsmallcaps}
+% subsections
+\titleformat{\subsection}%
+ {\normalfont\sffamily\bfseries}{\textsc{\MakeTextLowercase%
+ {\thesubsection}}}{1em}{\normalsize}
+% subsubsections
+\titleformat{\subsubsection}%
+ {\normalfont\sffamily\bfseries\itshape}{\textsc%
+ {\MakeTextLowercase{\thesubsubsection}}}%
+ {1em}{\normalsize\itshape}
+% paragraphs
+\titleformat{\paragraph}[runin]%
+ {\normalfont\normalsize\sffamily\bfseries}{\textsc%
+ {\MakeTextLowercase{\theparagraph}}}%
+ {0pt}{\spacedlowsmallcaps}
+% descriptionlabels
+\renewcommand{\descriptionlabel}[1]{\hspace*{\labelsep}\bfseries\spacedlowsmallcaps{#1}}
+
+\titlespacing*{\chapter}{0pt}{1\baselineskip}{2\baselineskip}
+\titlespacing*{\section}{0pt}{2\baselineskip}{.8\baselineskip}[\marginparsep]
+\titlespacing*{\subsection}{0pt}{1.5\baselineskip}{.8\baselineskip}[\marginparsep]
+\titlespacing*{\paragraph}{0pt}{1\baselineskip}{1\baselineskip}
+%************************************************************
Property changes on: trunk/Master/texmf-dist/tex/latex/classicthesis/classicthesis-arsclassica.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty 2018-06-17 21:04:37 UTC (rev 48040)
+++ trunk/Master/texmf-dist/tex/latex/classicthesis/classicthesis.sty 2018-06-17 21:04:56 UTC (rev 48041)
@@ -1,7 +1,7 @@
% ********************************************************************
% classicthesis.sty
%
-% Copyright (C) 2017 André Miede and Ivo Pletikosić
+% Copyright (C) 2018 André Miede and Ivo Pletikosić
%
% If you like the style then I would appreciate a postcard. My address
% can be found in the file ClassicThesis.pdf. A collection of the
@@ -31,10 +31,12 @@
% It works with LaTeX, PDFLaTeX, XeLaTeX and LuaLaTeX.
%
% ********************************************************************
-\NeedsTeXFormat{LaTeX2e}%[2015/01/01] % fixed via latexrelease package, see below
-\ProvidesPackage{classicthesis}[2017/10/13 v4.4 Typographic style for a classic-looking thesis]
-\PassOptionsToPackage{latest}{latexrelease} % replacement for fixltx2e,
- \RequirePackage{latexrelease} % emulate newer kernel version if older is detected
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{classicthesis}[2018/06/03 v4.6 Typographic style for a classic-looking thesis]
+\providecommand{\classicthesis}{classicthesis v4.6}
+% Removed due to hint by David Carlisle and Ulrike Fischer
+% \PassOptionsToPackage{latest}{latexrelease} % replacement for fixltx2e,
+% \RequirePackage{latexrelease} % emulate newer kernel version if older is detected
\RequirePackage{ifthen}
@@ -50,7 +52,7 @@
\DeclareBoolOption{dottedtoc} % page numbers in ToC flushed right
\DeclareBoolOption{listsseparated} % OBSOLETE; toggles the vertical space between lof/lot entries of different chapters
-\DeclareBoolOption{parts} % use part division
+\DeclareBoolOption[true]{parts} % OBSOLETE - automatic check; use part division
\DeclareBoolOption{nochapters} % OBSOLETE - automatic check; disable all chapter-specific commands
\DeclareBoolOption{eulerchapternumbers} % use AMS Euler for chapter font (otherwise Palatino)
@@ -58,43 +60,35 @@
\DeclareBoolOption{floatperchapter} % numbering per chapter for all floats (i.e., Figure 1.1)
\DeclareBoolOption{manychapters} % additional space in ToC after chapter number (if two digits are needed)
-\DeclareBoolOption{listings} % load listings package and setup LoL
-\DeclareBoolOption{subfig} % setup for preloaded @subfig package
+\DeclareBoolOption{listings} % OBSOLETE - automatic check; load listings package and setup LoL
+\DeclareBoolOption{subfig} % OBSOLETE - automatic check; setup for preloaded @subfig package
\DeclareBoolOption{eulermath} % use awesome Euler fonts for mathematical formulae; only with pdflatex
-\DeclareBoolOption{beramono} % toggle a nice monospaced font (w/ bold) + pre-installed
-\DeclareBoolOption{minionpro} % setup for minion pro font; use minion pro small caps as well; only with pdflatex
-
+\DeclareBoolOption[true]{beramono} % toggle a nice monospaced font (w/ bold) + pre-installed
+\DeclareBoolOption{minionpro} % OBSOLETE - removed; setup for minion pro font; use minion pro small caps as well
+\DeclareBoolOption[true]{palatino} % default is Palatino/Paladio/TeX Gyre Pagella font, use this switch to skip selection
+\DeclareStringOption[classicthesis]{style} % classicthesis or arsclassica
\DeclareBoolOption{minionprospacing} % OBSOLETE; use minion pro's textssc for letter spacing
\DeclareBoolOption{pdfspacing} % OBSOLETE; use pdftex for letterspacing (via microtype)
\DeclareBoolOption{a4paper}
\DeclareBoolOption{a5paper}
+\DeclareBoolOption{b5paper}
\DeclareBoolOption{letterpaper}
\DeclareStringOption[a4]{paper} % paper size defaults to A4
\ProcessKeyvalOptions{ct}
-
-
%%% seems that KOMA-Script gives preference to old-style paper options, thus first
\ifthenelse{\boolean{ct at letterpaper}}{\renewcommand*{\ct at paper}{letter}}{}
\ifthenelse{\boolean{ct at a5paper}}{\renewcommand*{\ct at paper}{a5}}{}
+\ifthenelse{\boolean{ct at b5paper}}{\renewcommand*{\ct at paper}{b5}}{}
\ifthenelse{\boolean{ct at a4paper}}{\renewcommand*{\ct at paper}{a4}}{}
-%%% then
-\ifthenelse{\equal{\ct at paper}{a4}}%
- {\setboolean{ct at a4paper}{true} \setboolean{ct at a5paper}{false} \setboolean{ct at letterpaper}{false}}%
- {}
-\ifthenelse{\equal{\ct at paper}{a5}}%
- {\setboolean{ct at a4paper}{false} \setboolean{ct at a5paper}{true} \setboolean{ct at letterpaper}{false}}%
- {}
-\ifthenelse{\equal{\ct at paper}{letter}}%
- {\setboolean{ct at a4paper}{false} \setboolean{ct at a5paper}{false} \setboolean{ct at letterpaper}{true}}%
- {}
+\ifthenelse{\equal{\ct at paper}{letter}\OR\equal{\ct at paper}{a5}\OR\equal{\ct at paper}{b5}\OR\equal{\ct at paper}{a4}}{\relax}%
+ {\PackageWarningNoLine{classicthesis}{Text area setup only provided for paper sizes: letter, a5, b5, a4. You are using paper=\ct at paper}}
-
% subfig-related stuff
\@ifpackageloaded{subfig}%
{\setboolean{ct at subfig}{true}%
@@ -105,27 +99,39 @@
}{\relax}%
% listings-related stuff
+\@ifpackageloaded{listings}%
+ {\setboolean{ct at listings}{true}%
+ }{\relax}
+
\ifthenelse{\boolean{ct at listings}}%
- {\@ifpackageloaded{listings}%
- {\relax}{\RequirePackage{listings}}%
- }{\relax}%
+ {\RequirePackage{listings}%
+ }{\relax}
% fine-tuning if we do not use chapters
-
\ifthenelse{\isundefined{\chapter}\OR\boolean{ct at nochapters}}
{
\PackageWarningNoLine{classicthesis}{Chapter sectioning command not present in this document class. %
- Deactivating options floatperchapter, linedheaders, manychapters, listsseparated, eulerchapternumbers and parts}%
- \setboolean{ct at linedheaders}{false}%
- \setboolean{ct at listsseparated}{false}%
- \setboolean{ct at eulerchapternumbers}{false}%
- \setboolean{ct at parts}{false}% %%%IVO: note that parts exist even when chapters are not defined!
- \setboolean{ct at manychapters}{false}%
- \setboolean{ct at floatperchapter}{false}%
+ Deactivating options floatperchapter, linedheaders, manychapters, listsseparated, eulerchapternumbers}%
+ \setboolean{ct at linedheaders}{false}
+ \setboolean{ct at listsseparated}{false}
+ \setboolean{ct at eulerchapternumbers}{false}
+ \setboolean{ct at parts}{false}
+ \setboolean{ct at manychapters}{false}
+ \setboolean{ct at floatperchapter}{false}
\setboolean{ct at nochapters}{true}
}{\relax}
+% no parts in document class
+\ifthenelse{\NOT\isundefined{\part}\AND\boolean{ct at parts}}
+ {\setboolean{ct at parts}{true}}{\setboolean{ct at parts}{false}}
+
+% use arsclassica style
+\provideboolean{ct at arsclassica}
+\ifthenelse{\equal{\ct at style}{arsclassica}}%
+ {%\setboolean{ct at eulerchapternumbers}{true}% for arsclassica only eulerchapternumbers
+ \setboolean{ct at arsclassica}{true}}{\setboolean{ct at arsclassica}{false}}
+
% ********************************************************************
% PDF and XeLaTeX Stuff
% ********************************************************************
@@ -132,25 +138,20 @@
\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
\RequirePackage{ifluatex}
-\ifthenelse{\boolean{pdf}\OR\boolean{luatex}\OR\boolean{xetex}}%
- {
- \RequirePackage{hyperref}
- \pdfstringdefDisableCommands{\let\thepart=\relax} % no part numbers (i, ii, iii) in PDF outline IVO
- %\pdfstringdefDisableCommands{\renewcommand{\thepart}{\Roman{part}}} %%%IVO bring back Part numbers in PDF outline
- }{}
-
% ********************************************************************
% Colors
% ********************************************************************
\PassOptionsToPackage{dvipsnames}{xcolor}
\RequirePackage{xcolor} % [dvipsnames]
+\definecolor{CTsemi}{gray}{0.55} % chapter numbers will be semi transparent .5 .55 .6 .0
+\definecolor{CTcitation}{rgb}{0,0.5,0} % WebGreen
+\definecolor{CTurl}{named}{Maroon} % Maroon
+\definecolor{CTtitle}{named}{Maroon} % Maroon {cmyk}{0, 0.87, 0.68, 0.32}
+\definecolor{CTlink}{named}{RoyalBlue} % RoyalBlue {cmyk}{1, 0.50, 0, 0}
\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}
-%\definecolor{Maroon}{cmyk}{0, 0.87, 0.68, 0.32}
-%\definecolor{RoyalBlue}{cmyk}{1, 0.50, 0, 0}
-%\definecolor{Black}{cmyk}{0, 0, 0, 0}
+\definecolor{webgreen}{rgb}{0,0.5,0}
+\definecolor{webbrown}{rgb}{0.6,0,0}
% ********************************************************************
% Font Stuff
@@ -158,35 +159,28 @@
\ifthenelse{\boolean{xetex}\OR\boolean{luatex}}
{ % use fontspec and OpenType fonts with utf8 engines
\RequirePackage{fontspec}
- \setmainfont[Ligatures=TeX,Numbers=OldStyle]{TeX Gyre Pagella} % Palatino clone
- \linespread{1.05} % a bit more for Palatino
+ \ifthenelse{\boolean{ct at palatino}}% default
+ {
+ \setmainfont[Ligatures=TeX,Numbers=OldStyle]{TeX Gyre Pagella} % Palatino clone
+ \linespread{1.05} % a bit more for Palatino
+ \RequirePackage{unicode-math}
+ \setmathfont{TeX Gyre Pagella Math}
+ }{\relax} % use class' default font
\ifthenelse{\boolean{ct at beramono}}%
{\setmonofont[Scale=0.85]{DejaVu Sans Mono}} % like Bera; Scale=MatchLowercase
{\setmonofont[Scale=1]{Latin Modern Mono}}
- \RequirePackage{unicode-math}
- \setmathfont{TeX Gyre Pagella Math}
% font for the chapter numbers will be defined in the old way below
% because there is no OpenType Euler font; this is how it should be done:
%\newfontface\chapterNumber[Scale=7,Color=000000]{TeX Gyre Pagella Bold}
}
{ % use Type 1 fonts with pdflatex
- \ifthenelse{\boolean{ct at minionpro}}% specialists: MinionPro
- {%
- % in order have Euler math fonts work with Minion, special option is needed
- \ifthenelse{\boolean{ct at eulermath}}%
- {%
- \PassOptionsToPackage{opticals,mathlf,onlytext}{MinionPro}%
- \RequirePackage{MinionPro} % opticals, fullfamily, osf
- }{%
- \PassOptionsToPackage{opticals,mathlf}{MinionPro}%
- \RequirePackage{MinionPro} % opticals, fullfamily, osf
- }
- }{
+ \ifthenelse{\boolean{ct at palatino}}% default
+ {
% default: Palatino
\PassOptionsToPackage{osf,sc}{mathpazo}%
\RequirePackage{mathpazo} % Palatino with real small caps and old style figures
\linespread{1.05} % a bit more for Palatino
- }
+ }{\relax}
\ifthenelse{\boolean{ct at beramono}}%
{\PassOptionsToPackage{scaled=0.85}{beramono}%
@@ -222,57 +216,38 @@
% ********************************************************************
% Textblock size
%*******************************************************
-\@ifpackageloaded{typearea}%
- {\relax}{%
- \PassOptionsToPackage{headinclude,footinclude}{typearea}
- \RequirePackage{typearea}%
- }
+\PassOptionsToPackage{headinclude,footinclude}{typearea} % for classes other than KOMA
+\RequirePackage{typearea}
-\ifthenelse{\boolean{ct at letterpaper}}%
- {% A4
- \ifthenelse{\boolean{ct at minionpro}}%
- {% Minion gets some extra sizes
- \PackageInfo{classicthesis}{letter paper, MinionPro}%
- \areaset[current]{332pt}{634pt}% guessing from A4 values
- \setlength{\marginparwidth}{7.5em}%
- \setlength{\marginparsep}{2em}%
- }{% Palatino or other
+\ifthenelse{\equal{\ct at paper}{letter}}%
+ {% Letter 216mm x 279mm
\PackageInfo{classicthesis}{letter paper, Palatino or other}
- \areaset[current]{356pt}{700pt} % guessing from A4 values
+ \areaset[current]{356pt}{700pt}% guessing from A4 values
\setlength{\marginparwidth}{7em}%
\setlength{\marginparsep}{2em}%
- }%
}{\relax}
-\ifthenelse{\boolean{ct at a5paper}}%
- {% A5
- \ifthenelse{\boolean{ct at minionpro}}%
- {% Minion gets some extra sizes
- \PackageInfo{classicthesis}{A5 paper, MinionPro}%
- \areaset[current]{278pt}{556pt}%
- \setlength{\marginparwidth}{5em}%
- \setlength{\marginparsep}{1.25em}%
- }{% Palatino or other
+\ifthenelse{\equal{\ct at paper}{b5}}%
+ {% B5 176mm x 250mm
+ % Thanks to Jos\'e M. Alcaide
+ \PackageInfo{classicthesis}{B5 paper, Palatino or other}%
+ \areaset[current]{311pt}{645pt}%
+ \setlength{\marginparwidth}{6em}%
+ \setlength{\marginparsep}{1.5em}%
+ }{\relax}
+\ifthenelse{\equal{\ct at paper}{a5}}%
+ {% A5 148mm x 210mm
\PackageInfo{classicthesis}{A5 paper, Palatino or other}%
\areaset[current]{288pt}{555pt}%
\setlength{\marginparwidth}{4em}%
\setlength{\marginparsep}{1.25em}%
- }%
}{\relax}
-\ifthenelse{\boolean{ct at a4paper}}%
- {% A4
- \ifthenelse{\boolean{ct at 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
+\ifthenelse{\equal{\ct at paper}{a4}}%
+ {% A4 210mm x 297mm
\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}%
- }%
}{\relax}
% Here are some suggestions for the text widths and heights:
@@ -282,13 +257,8 @@
% Minion 10pt: 264--288pt | 561--609pt
% Minion 11pt: 288--312pt | 609--657pt
% Minion 12pt: 336pt | 672pt
-% Libertine 10pt:
-% Libertine 11pt:
-% Libertine 12pt:
-% kpfonts 10pt:
-% kpfonts 11pt:
-% kpfonts 12pt:
+
% ********************************************************************
% Own Stuff
% ********************************************************************
@@ -311,12 +281,14 @@
% [\graffito at setup\raggedleft\hspace{0pt}{#1}]%
% {\graffito at setup\raggedright\hspace{0pt}{#1}}}
+\RequirePackage{mparhack} % get marginpar right
+
\let\oldmarginpar\marginpar
\renewcommand{\marginpar}[2][]{% always add optional parameter, make it empty by default
\if\relax\detokenize{#1}\relax% optional parameter empty, in all normal document calls
- \oldmarginpar[\graffito at setup\raggedleft\hspace{0pt}#2]{\graffito at setup\raggedright\hspace{0pt}#2}%
+ \oldmarginpar[\graffito at setup\raggedleft\hspace{0pt}{#2}]{\graffito at setup\raggedright\hspace{0pt}#2}%
\else%two parameters, let them use their styling
- \oldmarginpar[#1]{#2}%
+ \oldmarginpar[{#1}]{#2}%
\fi%
}
@@ -333,36 +305,28 @@
\RequirePackage{booktabs} % for better rules in tables
\RequirePackage{textcase} % for \MakeTextUppercase
+% Provide a hook for font customization, e.g., for arsclassica
+\newcommand{\ct at altfont}{}% \color{red}\sffamily
+\newcommand{\ct at caps}{\ct at altfont\scshape} % typesetting smallcaps
+
+%%% define spacedallcaps and spacedlowsmallcaps
%%% engine-dependent letterspacing: microtype for pdflatex, fontspec for xelatex and luatex
-\ifthenelse{\boolean{ct at minionpro}}{% MinionPro small caps
- \PackageInfo{classicthesis}{Using MinionPro's textssc for character spacing.}
- \DeclareRobustCommand{\spacedallcaps}[1]{\textssc{\MakeTextUppercase{#1}}}
- \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textssc{\MakeTextLowercase{#1}}}
- }{
- % engine-based spacedallcaps and spacedlowsmallcaps
- \ifthenelse{\boolean{pdf}\OR\boolean{luatex}}{ % pdf will soon test true for both pdflatex and luatex; \AND\NOT\boolean{luatex}
- \PackageInfo{classicthesis}{Using pdftex/microtype for character spacing.%
- Make sure your pdftex is version 1.40 or higher.}%
- \microtypesetup{expansion=false}
- \DeclareRobustCommand{\spacedallcaps}[1]{\textls[160]{\MakeTextUppercase{#1}}}
- \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textls[80]{\scshape\MakeTextLowercase{#1}}}
- }{\relax}
+ \ifthenelse{\boolean{pdf}\OR\boolean{luatex}}{ % pdf will soon test true for both pdflatex and luatex; \AND\NOT\boolean{luatex}
+ \PackageInfo{classicthesis}{Using microtype for character spacing.%
+ Make sure your pdflatex is version 1.40 or higher.}%
+ % \microtypesetup{expansion=false}
+ \microtypesetup{protrusion=true,expansion=true}
+ \DeclareRobustCommand{\spacedallcaps}[1]{\textls[160]{\ct at caps\MakeTextUppercase{#1}}}
+ \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textls[80]{\ct at caps\MakeTextLowercase{#1}}}
+ }{\relax}
- \ifthenelse{\boolean{xetex}}{ % use fontspec features; \OR\boolean{luatex} does not work well
- \DeclareRobustCommand{\spacedallcaps}[1]{{\addfontfeature{LetterSpace=18.0}\MakeTextUppercase{#1}}}% WordSpace=1.8
- \DeclareRobustCommand{\spacedlowsmallcaps}[1]{{\addfontfeatures{LetterSpace=14.0}\scshape\MakeTextLowercase{#1}}}% WordSpace=1.8
- }{\relax}
+ \ifthenelse{\boolean{xetex}}{ % use fontspec features; \OR\boolean{luatex} does not work well
+ \PackageInfo{classicthesis}{Using fontspec for character spacing.}%
+ \microtypesetup{expansion=false}
+ \DeclareRobustCommand{\spacedallcaps}[1]{{\addfontfeature{LetterSpace=18.0}\ct at caps\MakeTextUppercase{#1}}}% WordSpace=1.8
+ \DeclareRobustCommand{\spacedlowsmallcaps}[1]{{\addfontfeatures{LetterSpace=14.0}\ct at caps\MakeTextLowercase{#1}}}% WordSpace=1.8
+ }{\relax}
- \ifthenelse{\boolean{pdf}\OR\boolean{xetex}\OR\boolean{luatex}}% ever used? only dvi engines remain
- {\relax}{%
- \RequirePackage{soulutf8} % for letterspacing
- \sodef\allcapsspacing{\upshape}{0.15em}{0.65em}{0.6em}%
- \sodef\lowsmallcapsspacing{\scshape}{0.075em}{0.5em}{0.6em}%
- \DeclareRobustCommand{\spacedallcaps}[1]{\MakeTextUppercase{\allcapsspacing{#1}}}%
- \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\MakeTextLowercase{\lowsmallcapsspacing{#1}}}%\protect
- }%
- }
-
% ********************************************************************
% headlines
% ********************************************************************
@@ -370,15 +334,16 @@
\PassOptionsToPackage{automark}{scrlayer-scrpage}
%\RequirePackage{scrpage2} % provides headers and footers (KOMA Script)
\RequirePackage{scrlayer-scrpage} % provides headers and footers (KOMA Script)
- \clearpairofpagestyles
+ \clearpairofpagestyles
%\setheadsepline{0pt}
\let\MakeMarkcase\spacedlowsmallcaps
\ifthenelse{\boolean{ct at nochapters}}%
{\relax}%
{\renewcommand{\chaptermark}[1]{\markboth{\spacedlowsmallcaps{#1}}{\spacedlowsmallcaps{#1}}}}
- \renewcommand{\sectionmark}[1]{\markright{\thesection\enspace\spacedlowsmallcaps{#1}}}
+ \renewcommand{\sectionmark}[1]{\markright{\textsc{\thesection}\enspace\spacedlowsmallcaps{#1}}}
\lehead{\mbox{\llap{\small\pagemark\kern2em}\headmark\hfil}}
\rohead{\mbox{\hfil{\headmark}\rlap{\small\kern2em\pagemark}}}
+ \ofoot[\small\pagemark]{}% only for plain.scrheadings page style (first page of a chapter)
\renewcommand{\headfont}{\small}
% \DeclareRobustCommand{\fixBothHeadlines}[2]{} % <--- ToDo
% hack to get the content headlines right (thanks, Lorenzo!)
@@ -386,7 +351,7 @@
\ifthenelse{\boolean{ct at nochapters}}%
{\section*{\contentsname}}%nochapters
{\chapter*{\contentsname}}%chapters
- \@mkboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}}} %%%IVO what does this do?
+ \@mkboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}}} %%%IVO: what does this do?
% ********************************************************************
@@ -405,19 +370,19 @@
\def\ctparttext at keep{} % Thanks to Ivo
\def\ctparttext at print{\ctparttext at keep \gdef\ctparttext at keep{}}
\titleformat{\part}[display]
- {\normalfont\centering\large}%
+ {\normalfont\ct at altfont\centering\large}%
{\thispagestyle{empty}\partname~\MakeTextUppercase{\thepart}}{1em}%
- {\color{Maroon}\spacedallcaps}[\bigskip\normalfont\normalsize\color{Black}\begin{quote}\ctparttext at print\end{quote}]
+ {\color{CTtitle}\spacedallcaps}[\bigskip\normalfont\normalsize\color{Black}\begin{quote}\ctparttext at print\end{quote}]
}{\relax}
% chapters
\ifthenelse{\boolean{ct at linedheaders}}%
{% lines above and below, number right
\titleformat{\chapter}[display]%
- {\relax}{\raggedleft{\color{halfgray}\chapterNumber\thechapter} \\ }{0pt}%
+ {\relax}{\raggedleft{\color{CTsemi}\chapterNumber\thechapter} \\ }{0pt}%
{\titlerule\vspace*{.9\baselineskip}\raggedright\spacedallcaps}[\normalsize\vspace*{.8\baselineskip}\titlerule]%
}{% something like Bringhurst
\titleformat{\chapter}[display]%
- {\relax}{\mbox{}\oldmarginpar{\vspace*{-3\baselineskip}\color{halfgray}\chapterNumber\thechapter}}{0pt}%
+ {\relax}{\mbox{}\oldmarginpar{\vspace*{-3\baselineskip}\color{CTsemi}\chapterNumber\thechapter}}{0pt}%
{\raggedright\spacedallcaps}[\normalsize\vspace*{.8\baselineskip}\titlerule]%
}
% sections \FloatBarrier
@@ -478,7 +443,7 @@
\renewcommand{\cftpartaftersnum}{}%
\renewcommand{\cftpartaftersnumb}{\spacedlowsmallcaps}%
\setlength{\cftpartnumwidth}{\cftchapnumwidth}
- \renewcommand{\cftpartfont}{\color{Maroon}\normalfont}%
+ \renewcommand{\cftpartfont}{\color{CTtitle}\normalfont}%
\cftpagenumbersoff{part}
\renewcommand{\cftpartpagefont}{\normalfont}%
\ifthenelse{\boolean{ct at dottedtoc}}{\relax}%
@@ -598,10 +563,8 @@
{\AtBeginDocument{\addtocontents{toc}{\protect\vspace{-\cftbeforechapskip}}}}
}
-
\newcommand{\tocEntry}[1]{\protect\numberline {}{#1}}%
-
%% remove the vertical space between lof/lot entries of different chapters
\ifthenelse{\boolean{ct at listsseparated}}{%
\PackageWarningNoLine{classicthesis}{Option "listsseparated" deprecated as of version 2.9.}%
@@ -617,7 +580,6 @@
% }%
% }{%
-
\DeclareRobustCommand*{\deactivateaddvspace}{\let\addvspace\@gobble}%
\AtBeginDocument{%
\addtocontents{lof}{\deactivateaddvspace}%
@@ -630,7 +592,7 @@
% }
% ********************************************************************
-% footnotes setup
+% Footnotes setup
% ********************************************************************
\ifdefined\deffootnote
% KOMA-command, footnotemark not superscripted at the bottom
@@ -637,11 +599,11 @@
\deffootnote{0em}{0em}{\thefootnotemark\hspace*{.5em}}%
\message{Using KOMA-command "deffootnote" for footnote setup}%
\else
- \PassOptionsToPackage{flushmargin}{footmisc}%
+ \PassOptionsToPackage{marginal}{footmisc}% marginal flushmargin
\RequirePackage{footmisc}%
- \setlength{\footnotemargin}{-.5em}%
+ % \setlength{\footnotemargin}{-.5em}%
\PackageWarningNoLine{classicthesis}{Using package "footmisc" with option %
- "flushmargin" for footnote setup (not 100\% the same as with KOMA)}%
+ "marginal" for footnote setup (not 100\% the same as with KOMA)}%
\fi
% ********************************************************************
@@ -658,10 +620,21 @@
\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\ -- \myVersion\,]}
+}{\renewcommand{\finalVersionString}{\emph{Final Version} as of \today\ (\myVersion).}}
% ********************************************************************
+% Captions
+% ********************************************************************
+% \PassOptionsToPackage{font=small}{caption} % ,format=hang ,labelformat=smallcaps
+\RequirePackage{caption}
+\captionsetup{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}}}
+
+% ********************************************************************
% Caption numbering now w/o chapter number
% ********************************************************************
\ifthenelse{\boolean{ct at floatperchapter}}{%
@@ -689,6 +662,24 @@
}
% ********************************************************************
+% arsclassica integration (experimental, dirty hack currently)
+% ********************************************************************
+\ifct at arsclassica
+\RequirePackage{classicthesis-arsclassica}
+\fi
+
+
+% ********************************************************************
+% hyperreferences, pdf outline
+% ********************************************************************
+\PassOptionsToPackage{hyperfootnotes=false}{hyperref}
+\RequirePackage{hyperref}
+ \pdfstringdefDisableCommands{\let\thepart=\relax} % no part numbers (i, ii, iii) in PDF outline IVO
+ %\pdfstringdefDisableCommands{\renewcommand{\thepart}{\Roman{part}}} %%%IVO bring back Part numbers in PDF outline
+ \hypersetup{colorlinks=true,linktocpage=true,breaklinks=true,urlcolor=CTurl,linkcolor=CTlink,citecolor=CTcitation}
+
+
+% ********************************************************************
% Backward-compatibility
% ********************************************************************
\let\myChapter\chapter
More information about the tex-live-commits
mailing list