From b71dc5300da871cbc8529c8f06fbe3445dfc4d0f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 31 Oct 2017 21:23:29 +0000 Subject: arsclassica (31oct17) git-svn-id: svn://tug.org/texlive/trunk@45656 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/arsclassica/ArsClassica.pdf | Bin 328741 -> 328876 bytes .../doc/latex/arsclassica/Bibliography.bib | 4 +- Master/texmf-dist/doc/latex/arsclassica/Changes | 3 + .../doc/latex/arsclassica/Chapters/Code.tex | 10 ++- Master/texmf-dist/doc/latex/arsclassica/README | 2 +- .../tex/latex/arsclassica/arsclassica.sty | 84 ++++++++++----------- 6 files changed, 53 insertions(+), 50 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.pdf b/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.pdf index 5673eac7455..0da50c493e2 100644 Binary files a/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.pdf and b/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.pdf differ diff --git a/Master/texmf-dist/doc/latex/arsclassica/Bibliography.bib b/Master/texmf-dist/doc/latex/arsclassica/Bibliography.bib index 21860752141..5131f1b7810 100644 --- a/Master/texmf-dist/doc/latex/arsclassica/Bibliography.bib +++ b/Master/texmf-dist/doc/latex/arsclassica/Bibliography.bib @@ -24,7 +24,7 @@ @manual{pantieri:latexpedia, - author = {Pantieri, Lorenzo and Gordini, Tommaso}, + author = {Pantieri, Lorenzo}, title = {\LaTeX\-pedia}, year = {2017}, url = {http://www.lorenzopantieri.net/LaTeX_files/LaTeXpedia.pdf}, @@ -32,7 +32,7 @@ @manual{pantieri:impaziente, - author = {Pantieri, Lorenzo and Gordini, Tommaso}, + author = {Pantieri, Lorenzo}, title = {\LaTeX{} per l'impaziente}, year = {2017}, url = {http://www.lorenzopantieri.net/LaTeX_files/LaTeXimpaziente.pdf}, diff --git a/Master/texmf-dist/doc/latex/arsclassica/Changes b/Master/texmf-dist/doc/latex/arsclassica/Changes index 462193cc631..bc75a8314bf 100644 --- a/Master/texmf-dist/doc/latex/arsclassica/Changes +++ b/Master/texmf-dist/doc/latex/arsclassica/Changes @@ -1,3 +1,6 @@ +2017/10/31 +o Added compatibility with ClassicThesis 4.4 + March 2017 o Fixed some details in the documentation diff --git a/Master/texmf-dist/doc/latex/arsclassica/Chapters/Code.tex b/Master/texmf-dist/doc/latex/arsclassica/Chapters/Code.tex index 422a38bad80..72dc576f415 100644 --- a/Master/texmf-dist/doc/latex/arsclassica/Chapters/Code.tex +++ b/Master/texmf-dist/doc/latex/arsclassica/Chapters/Code.tex @@ -40,10 +40,12 @@ Use of Iwona as font sans serif. Customized chapter numbers. \begin{lstlisting} -\let\chapterNumber\undefined -\ifthenelse{\boolean{@eulerchapternumbers}} -{\newfont{\chapterNumber}{eurb10 scaled 5000}}% -{\newfont{\chapterNumber}{pplr9d scaled 5000}} +\let\chapterNumber\undefined +\ifct@eulerchapternumbers +\newfont{\chapterNumber}{eurb10 scaled 5000}% +\else +\newfont{\chapterNumber}{pplr9d scaled 5000}% +\fi \end{lstlisting} diff --git a/Master/texmf-dist/doc/latex/arsclassica/README b/Master/texmf-dist/doc/latex/arsclassica/README index 83977f8213a..576d5d00375 100644 --- a/Master/texmf-dist/doc/latex/arsclassica/README +++ b/Master/texmf-dist/doc/latex/arsclassica/README @@ -1,5 +1,5 @@ ArsClassica package -Version March 2017 +Version 2017/10/31 Copyright (c) 2008-2017 Lorenzo Pantieri http://www.lorenzopantieri.net/ diff --git a/Master/texmf-dist/tex/latex/arsclassica/arsclassica.sty b/Master/texmf-dist/tex/latex/arsclassica/arsclassica.sty index 8c47f12a82b..82945459bbd 100644 --- a/Master/texmf-dist/tex/latex/arsclassica/arsclassica.sty +++ b/Master/texmf-dist/tex/latex/arsclassica/arsclassica.sty @@ -6,7 +6,7 @@ % %************************************************************ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{arsclassica}[2017/02/01] +\ProvidesPackage{arsclassica}[2017/10/31] \RequirePackage{classicthesis} \RequirePackage{caption} @@ -26,43 +26,42 @@ %************************************************************ % Chapter numbers %************************************************************ -\let\chapterNumber\undefined -\ifthenelse{\boolean{@eulerchapternumbers}} -{\newfont{\chapterNumber}{eurb10 scaled 5000}}% -{\newfont{\chapterNumber}{pplr9d scaled 5000}} +\let\chapterNumber\undefined +\ifct@eulerchapternumbers +\newfont{\chapterNumber}{eurb10 scaled 5000}% +\else +\newfont{\chapterNumber}{pplr9d scaled 5000}% +\fi %************************************************************ % Fancy stuff %************************************************************ -\ifthenelse{\boolean{@minionprospacing}}% -{% - \DeclareRobustCommand{\spacedallcaps}[1]{\sffamily% - \textssc{\MakeTextUppercase{#1}}}% - \DeclareRobustCommand{\spacedlowsmallcaps}[1]% - {\sffamily\textssc{\MakeTextLowercase{#1}}}% -}{% - \ifthenelse{\boolean{@pdfspacing}}% - {% - \microtypesetup{expansion=false}% - \DeclareRobustCommand{\spacedallcaps}[1]% - {\sffamily\textls[160]{\MakeTextUppercase{#1}}}% +\ifct@minionprospacing + \DeclareRobustCommand{\spacedallcaps}[1]{\sffamily% + \textssc{\MakeTextUppercase{#1}}}% \DeclareRobustCommand{\spacedlowsmallcaps}[1]% - {\sffamily\textls[80]{\scshape\MakeTextLowercase{#1}}}% - }{% - \RequirePackage{soul} - \sodef\allcapsspacing{\sffamily\upshape}% - {0.15em}{0.65em}{0.6em}% - \sodef\lowsmallcapsspacing{\sffamily\scshape}% - {0.075em}{0.5em}{0.6em}% - \DeclareRobustCommand{\spacedallcaps}[1]% - {\MakeTextUppercase{\allcapsspacing{#1}}}% - \DeclareRobustCommand{\spacedlowsmallcaps}[1]% - {\MakeTextLowercase{\textsc% - {\lowsmallcapsspacing{#1}}}}% - }% -} -%************************************************************ + {\sffamily\textssc{\MakeTextLowercase{#1}}}% +\else + \ifct@pdfspacing + \microtypesetup{expansion=false}% + \DeclareRobustCommand{\spacedallcaps}[1]% + {\sffamily\textls[160]{\MakeTextUppercase{#1}}}% + \DeclareRobustCommand{\spacedlowsmallcaps}[1]% + {\sffamily\textls[80]{\scshape\MakeTextLowercase{#1}}}% + \else + \RequirePackage{soul} + \sodef\allcapsspacing{\sffamily\upshape}% + {0.15em}{0.65em}{0.6em}% + \sodef\lowsmallcapsspacing{\sffamily\scshape}% + {0.075em}{0.5em}{0.6em}% + \DeclareRobustCommand{\spacedallcaps}[1]% + {\MakeTextUppercase{\allcapsspacing{#1}}}% + \DeclareRobustCommand{\spacedlowsmallcaps}[1]% + {\MakeTextLowercase{\textsc% + {\lowsmallcapsspacing{#1}}}}% + \fi +\fi %************************************************************ @@ -85,29 +84,28 @@ % subsubsection-, paragraph and description-headings %************************************************************ \RequirePackage{titlesec} - % parts - \ifthenelse{\boolean{@parts}}% - {% - \titleformat{\part}[display] + % parts + \ifct@parts + \titleformat{\part}[display] {\normalfont\centering\large}% {\thispagestyle{empty}\partname~\MakeTextUppercase{\thepart}}{1em}% {\color{Maroon}\spacedallcaps} - }{\relax} + \fi % chapters - \ifthenelse{\boolean{@linedheaders}}% - {% - \titleformat{\chapter}[display]% + \ifct@linedheaders + \titleformat{\chapter}[display]% {\relax}{\raggedleft{\color{halfgray}% \chapterNumber\thechapter} \\ }{0pt}% {\titlerule\vspace*{.9\baselineskip}\raggedright% \spacedallcaps}% [\normalsize\vspace*{.8\baselineskip}\titlerule]% - }{% - \titleformat{\chapter}[block]% + \else + \titleformat{\chapter}[block]% {\normalfont\Large\sffamily}% {{\color{halfgray}\chapterNumber\thechapter% \hspace{10pt}\vline} }{10pt}% - {\spacedallcaps}} + {\spacedallcaps} + \fi % sections \titleformat{\section} {\normalfont\Large\sffamily}{\textsc% -- cgit v1.2.3