From 7011e31571eda36fd63231056e58de916886ff00 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 5 Apr 2014 22:21:58 +0000 Subject: suftesi (5apr14) git-svn-id: svn://tug.org/texlive/trunk@33382 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/suftesi/suftesi.pdf | Bin 917821 -> 919572 bytes Master/texmf-dist/doc/latex/suftesi/templates.zip | Bin 209535 -> 209619 bytes Master/texmf-dist/source/latex/suftesi/suftesi.dtx | 139 ++++++++++++++++----- Master/texmf-dist/tex/latex/suftesi/suftesi.cls | 73 ++++++++--- 4 files changed, 160 insertions(+), 52 deletions(-) diff --git a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf index 73abcd637f1..22d010afd21 100644 Binary files a/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf and b/Master/texmf-dist/doc/latex/suftesi/suftesi.pdf differ diff --git a/Master/texmf-dist/doc/latex/suftesi/templates.zip b/Master/texmf-dist/doc/latex/suftesi/templates.zip index 7aea8bfc82c..2ff096f890d 100644 Binary files a/Master/texmf-dist/doc/latex/suftesi/templates.zip and b/Master/texmf-dist/doc/latex/suftesi/templates.zip differ diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx index 53549526a9b..e187de6f273 100644 --- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx +++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx @@ -102,7 +102,7 @@ %\NeedsTeXFormat{LaTeX2e}[2005/12/01] %\ProvidesClass{suftesi} %<*class> - [2014/02/16 v1.9b A class for typesetting theses, books and articles] + [2014/04/05 v1.9c A class for typesetting theses, books and articles] % %<*driver> \documentclass{ltxdoc} @@ -250,7 +250,7 @@ % % \fi % -% \CheckSum{4012} +% \CheckSum{4095} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -268,6 +268,7 @@ % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % +% \changes{v1.9c}{2014/04/05}{The \opt{cbgreek} value for the \opt{greekfont} option allows now to use the full set of the CB Greek font together with the default font (Palatino).} % \changes{v1.9b}{2014/02/16}{Corrected a bug in ``toc'', ``lof'' and ``lot'' commands.} % \changes{v1.9a}{2014/02/11}{Maintenance release. Updated greek support. Updated documentation.} % \changes{v1.9}{2013/09/21}{Added \opt{italic}, \opt{smallcaps} and \opt{sanserif} values for \opt{captionstyle} option. New \opt{twocolcontents} option. New \opt{supercompactaureo} page layout. Changed \cmd{toclabelspace} command and renamed to \cmd{toclabelwidth}. New \opt{collection} document structure} @@ -373,7 +374,7 @@ % %Copyright \copyright\ 2009-\the\year{} Ivan Valbusa. This package is author-maintained. %Permission is granted to copy, distribute and/or modify this software under the -%terms of the LaTeX Project Public License, version 1.3c.\footnote{\url{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.}} This software is provided ''as is'', without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. +%terms of the LaTeX Project Public License, version 1.3c ora later (\url{http://latex-project.org/lppl}). This software is provided ''as is'', without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. % %\begin{mdframed}[rightline=false,topline=false,bottomline=false,linecolor=red] %In addition to the terms of this license @@ -981,7 +982,7 @@ %\begin{latexcode} %\begin{verbatim} %\author{Name Surname -% \thanks{This work has been typeset with \cmd{LaTeX}, +% \thanks{This work has been typeset with \LaTeX, % using the \textsf{suftesi} class by Ivan Valbusa}.} %\end{verbatim} %\end{latexcode} @@ -1046,9 +1047,22 @@ % % A manual break which is active for the table of contents but not in the text or in the headers. % +% \begin{latexcode} +% \begin{verbatim} +% \section{This title will be break here \headbreak{} +% inside the table of contents} +%\end{verbatim} +% \end{latexcode} % \cmditem{xheadbreak} % -% A manual break which is active in the text and in the headers but not in the table of contents. +% A manual break which is active in the text but not in the headers and in the table of contents. +% +% \begin{latexcode} +% \begin{verbatim} +% \section{This title will be break here \xheadbreak{} +% inside the text} +%\end{verbatim} +% \end{latexcode} % % \end{ltxsyntax} % @@ -1097,9 +1111,13 @@ % % Changes in \meta{name} the title printed by the \cmd{chapterintro} command. % +% \cmditem{appendixpage} +% +% Prints a page with the argument of \cmd{appendicesname} (default=\texttt{Appendici}) at the center. Particularly useful if you have two or more appendices. +% % \cmditem{appendicesname}{name}\hfill(default=\texttt{Appendici}) % -% Changes in \meta{name} the title printed by the \cmd{appendix} command. +% Changes in \meta{name} the title printed by the \cmd{appendixpage} command. % % % \cmditem{chapnumfont}{name} @@ -1160,13 +1178,18 @@ % In addition to the following options you can use the other options of the class too. In particular, with the \opt{chapstyle} and \opt{chapfont} options you can customize all the section titles which are treated as a normal unnumbered chapters in the \opt{book} document structure, such as ``Table of Contents'', ``Index'', ``Bibliography'', etc. % % \begin{optionlist} -% \setlength{\labelwidth}{2.1cm}% +% \setlength{\labelwidth}{2cm}% % \optitem[left]{papertitlestyle}{\opt{left}, \opt{center}, \opt{right}} % \begin{valuelist} % \item[left] Aligns the author-title block on the left. % \item[center] Centers the author-title block. % \item[right] Aligns the author-title block on the right. % \end{valuelist} +% \optitem[false]{revauthortitle}{\opt{true}, \opt{false}} +% \begin{valuelist} +% \item[true] Prints the author’s name below the title. +% \item[false] Prints the author’s name above the title. +% \end{valuelist} % \optitem[italic]{titlefont}{\opt{roman}, \opt{italic}, \opt{smallcaps}} % \begin{valuelist} % \item[roman] Prints the title of the articles in roman. @@ -1178,9 +1201,16 @@ % \begin{valuelist} % \item[roman] Prints the author's name in roman. % \item[italic] Prints the author's name in \emph{italic}. -% \item[smallcaps] Prints the \author's name -% in \textsc{small caps}. -% \end{valuelist} +% \item[smallcaps] Prints the author's name in \textsc{small caps}. +% +% \redtriangle{} Note that if you use this last option you need +% to protect the \cmd{thanks} command: +% \begin{latexcode} +% \begin{verbatim} +%\author{The Author\protect\thanks{...}} +%\end{verbatim} +% \end{latexcode} +%\end{valuelist} % \end{optionlist} % % \subsection{Commands} @@ -1797,12 +1827,12 @@ dotarabic,dotroman,dotRoman}[arabic]{% \suftesi@sufplaintrue \or \suftesi@authortitletrue - \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}} - \def\SUF@leftmark{\SUF@Lheadstyle{\@author}} + \def\SUF@rightmark{\let\thanks\@gobble\SUF@Rheadstyle{\@headtitle}} + \def\SUF@leftmark{\let\thanks\@gobble\SUF@Lheadstyle{\@author}} \or \suftesi@authortitletrue - \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}} - \def\SUF@leftmark{\SUF@Lheadstyle{\@author}} + \def\SUF@rightmark{\let\thanks\@gobble\SUF@Rheadstyle{\@headtitle}} + \def\SUF@leftmark{\let\thanks\@gobble\SUF@Lheadstyle{\@author}} \suftesi@centerheadertrue \or \suftesi@elementsheadertrue @@ -2474,6 +2504,31 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \def\encodingdefault{LGR}} \DeclareTextFontCommand{\textgreek}{\greektext} } +% \end{macrocode} +% Thanks to Claudio Beccari for these macros. +% \begin{macrocode} + \DeclareFontFamily{LGR}{pplj}{} + \DeclareFontShape{LGR}{pplj}{m}{n}{<->ssub * lmr/m/n}{} + \DeclareFontShape{LGR}{pplj}{m}{it}{<->ssub * lmr/m/it}{} + \DeclareFontShape{LGR}{pplj}{m}{sl}{<->ssub * lmr/m/sl}{} + \DeclareFontShape{LGR}{pplj}{m}{sc}{<->ssub * lmr/m/sc}{} + \DeclareFontShape{LGR}{pplj}{b}{n}{<->ssub * lmr/bx/n}{} + \DeclareFontShape{LGR}{pplj}{b}{it}{<->ssub * lmr/bx/it}{} + \DeclareFontShape{LGR}{pplj}{b}{sl}{<->ssub * lmr/bx/sl}{} + \DeclareFontShape{LGR}{pplj}{b}{sc}{<->ssub * lmr/bx/sc}{} + \DeclareFontShape{LGR}{pplj}{bx}{n}{<->ssub * lmr/bx/n}{} + \DeclareFontShape{LGR}{pplj}{bx}{it}{<->ssub * lmr/bx/it}{} + \DeclareFontShape{LGR}{pplj}{bx}{sl}{<->ssub * lmr/bx/sl}{} + \DeclareFontShape{LGR}{pplj}{bx}{sc}{<->ssub * lmr/bx/sc}{} + \DeclareFontShape{LGR}{pplj}{m}{li}{<->ssub * lmr/m/li}{} + \DeclareFontShape{LGR}{pplj}{b}{li}{<->ssub * lmr/b/li}{} + \DeclareFontShape{LGR}{pplj}{bx}{li}{<->ssub * lmr/bx/li}{} + \DeclareFontShape{LGR}{pplj}{m}{ui}{<->ssub * lmr/m/ui}{} + \DeclareFontShape{LGR}{pplj}{b}{ui}{<->ssub * lmr/m/ui}{} + \DeclareFontShape{LGR}{pplj}{bx}{ui}{<->ssub * lmr/bx/ui}{} + \DeclareFontShape{LGR}{pplj}{m}{rs}{<->ssub * lmr/m/rs}{} + \DeclareFontShape{LGR}{pplj}{b}{rs}{<->ssub * lmr/m/rs}{} + \DeclareFontShape{LGR}{pplj}{bx}{rs}{<->ssub * lmr/bx/rs}{} \fi % \end{macrocode} % Scale the Porson font: @@ -3115,6 +3170,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \newcounter{issue} \newcounter{title} \setcounter{title}{1} +\newcounter{article} +\setcounter{article}{0} \setcounter{journalnumber}{0} \setcounter{tocdepth}{0} \def\journalname#1{\gdef\@journalname{#1}} @@ -3205,16 +3262,26 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \fi \else \newpage - \global\@topnum\z@ + \global\@topnum\z@ % Prevents figures from going at top of page. \@maketitle \fi - \thispagestyle{plain}\@thanks + \thispagestyle{plain}\@thanks% \endgroup \setcounter{footnote}{0}% - \global\let\@thanks\@empty - \let\thanks\@gobble} -\def\@maketitle{% - \cleardoublepage + \setcounter{section}{0}% +% \global\let\thanks\relax +% \global\let\maketitle\relax +% \global\let\@maketitle\relax +% \global\let\@thanks\@empty +% \global\let\@author\@empty +% \global\let\@date\@empty +% \global\let\@title\@empty +% \global\let\title\relax +% \global\let\author\relax +% \global\let\date\relax + \global\let\and\relax + \let\thanks\@gobble} +\AtBeginDocument{\def\@maketitle{% \SUF@chaptersize \SUF@lr@coll@titleSwitch \let\footnote\thanks @@ -3235,17 +3302,23 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \else \SUF@titlefont@Switch{\@title}% \fi\\} - \vskip2.5cm} + \vskip1.5cm}} % \end{macrocode} % \DescribeMacro{\includeart} The command to include a paper in the collection. % \begin{macrocode} +\newenvironment{article} + {\begingroup + \global\let\@thanks\@empty + \setcounter{footnote}{0} + \refstepcounter{article} + \label{begin:\thearticle} +} + {\label{end:\thearticle}\endgroup + } \newcommand{\includeart}[1]{% - \begingroup \clearpage - \setcounter{section}{0} - \input{#1}%\label{end:\thetitle} - \global\let\@thanks\@empty - \endgroup} + \input{#1} +} % \end{macrocode} % \DescribeMacro{\frontispiece} The command to typeset % the frontispiece of the collection. @@ -3643,7 +3716,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \end{center}% \quotation \fi} - {\if@twocolumn\else\endquotation\fi} + {\if@twocolumn\else\endquotation\fi\vspace{6ex}} \else \if@titlepage \newenvironment{abstract}{% @@ -3779,8 +3852,11 @@ Janusz M. Nowacki. % adjust the label width in the table of contents: % \begin{macrocode} \newcommand*{\toclabelwidth}[2]{% - \addtolength{\csname SUF@label@#1\endcsname}{#2}% - \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}}% + \AtBeginDocument{ + \addtolength{\csname SUF@label@#1\endcsname}{#2}% + \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}% + } +} \newcommand{\toclabelspace}{% \ClassError{suftesi} {\MessageBreak @@ -4405,14 +4481,13 @@ Janusz M. Nowacki. Author = {Philipp Lehman}, Note = {Versione 0.9a}, Title = {The \textsf{biblatex} package}, - Url = {http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex/}, + Url = {http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf}, Year = {2010}} @online{Miede:2011, Author = {André Miede}, Title = {A Classic Thesis style}, - Url = {http://www.ctan.org/tex- archive/macros/ - latex/contrib/classicthesis/ClassicThesis. pdf}, + Url = {http://mirrors.ctan.org/macros/latex/contrib/classicthesis/ClassicThesis.pdf}, Date = {2011}} @book{Pantieri:2011, diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls index 6338af35626..c4fad11c000 100644 --- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls +++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls @@ -19,7 +19,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesClass{suftesi} - [2014/02/16 v1.9b A class for typesetting theses, books and articles] + [2014/04/05 v1.9c A class for typesetting theses, books and articles] \ClassWarningNoLine{suftesi}{% ******************************************\MessageBreak * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak @@ -415,12 +415,12 @@ dotarabic,dotroman,dotRoman}[arabic]{% \suftesi@sufplaintrue \or \suftesi@authortitletrue - \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}} - \def\SUF@leftmark{\SUF@Lheadstyle{\@author}} + \def\SUF@rightmark{\let\thanks\@gobble\SUF@Rheadstyle{\@headtitle}} + \def\SUF@leftmark{\let\thanks\@gobble\SUF@Lheadstyle{\@author}} \or \suftesi@authortitletrue - \def\SUF@rightmark{\SUF@Rheadstyle{\@headtitle}} - \def\SUF@leftmark{\SUF@Lheadstyle{\@author}} + \def\SUF@rightmark{\let\thanks\@gobble\SUF@Rheadstyle{\@headtitle}} + \def\SUF@leftmark{\let\thanks\@gobble\SUF@Lheadstyle{\@author}} \suftesi@centerheadertrue \or \suftesi@elementsheadertrue @@ -987,6 +987,28 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \def\encodingdefault{LGR}} \DeclareTextFontCommand{\textgreek}{\greektext} } + \DeclareFontFamily{LGR}{pplj}{} + \DeclareFontShape{LGR}{pplj}{m}{n}{<->ssub * lmr/m/n}{} + \DeclareFontShape{LGR}{pplj}{m}{it}{<->ssub * lmr/m/it}{} + \DeclareFontShape{LGR}{pplj}{m}{sl}{<->ssub * lmr/m/sl}{} + \DeclareFontShape{LGR}{pplj}{m}{sc}{<->ssub * lmr/m/sc}{} + \DeclareFontShape{LGR}{pplj}{b}{n}{<->ssub * lmr/bx/n}{} + \DeclareFontShape{LGR}{pplj}{b}{it}{<->ssub * lmr/bx/it}{} + \DeclareFontShape{LGR}{pplj}{b}{sl}{<->ssub * lmr/bx/sl}{} + \DeclareFontShape{LGR}{pplj}{b}{sc}{<->ssub * lmr/bx/sc}{} + \DeclareFontShape{LGR}{pplj}{bx}{n}{<->ssub * lmr/bx/n}{} + \DeclareFontShape{LGR}{pplj}{bx}{it}{<->ssub * lmr/bx/it}{} + \DeclareFontShape{LGR}{pplj}{bx}{sl}{<->ssub * lmr/bx/sl}{} + \DeclareFontShape{LGR}{pplj}{bx}{sc}{<->ssub * lmr/bx/sc}{} + \DeclareFontShape{LGR}{pplj}{m}{li}{<->ssub * lmr/m/li}{} + \DeclareFontShape{LGR}{pplj}{b}{li}{<->ssub * lmr/b/li}{} + \DeclareFontShape{LGR}{pplj}{bx}{li}{<->ssub * lmr/bx/li}{} + \DeclareFontShape{LGR}{pplj}{m}{ui}{<->ssub * lmr/m/ui}{} + \DeclareFontShape{LGR}{pplj}{b}{ui}{<->ssub * lmr/m/ui}{} + \DeclareFontShape{LGR}{pplj}{bx}{ui}{<->ssub * lmr/bx/ui}{} + \DeclareFontShape{LGR}{pplj}{m}{rs}{<->ssub * lmr/m/rs}{} + \DeclareFontShape{LGR}{pplj}{b}{rs}{<->ssub * lmr/m/rs}{} + \DeclareFontShape{LGR}{pplj}{bx}{rs}{<->ssub * lmr/bx/rs}{} \fi \ifsuftesi@porson \sbox\z@{\fontsize{10}{10}\normalfont A} @@ -1546,6 +1568,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \newcounter{issue} \newcounter{title} \setcounter{title}{1} +\newcounter{article} +\setcounter{article}{0} \setcounter{journalnumber}{0} \setcounter{tocdepth}{0} \def\journalname#1{\gdef\@journalname{#1}} @@ -1629,16 +1653,16 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \fi \else \newpage - \global\@topnum\z@ + \global\@topnum\z@ % Prevents figures from going at top of page. \@maketitle \fi - \thispagestyle{plain}\@thanks + \thispagestyle{plain}\@thanks% \endgroup \setcounter{footnote}{0}% - \global\let\@thanks\@empty - \let\thanks\@gobble} -\def\@maketitle{% - \cleardoublepage + \setcounter{section}{0}% + \global\let\and\relax + \let\thanks\@gobble} +\AtBeginDocument{\def\@maketitle{% \SUF@chaptersize \SUF@lr@coll@titleSwitch \let\footnote\thanks @@ -1658,14 +1682,20 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \else \SUF@titlefont@Switch{\@title}% \fi\\} - \vskip2.5cm} + \vskip1.5cm}} +\newenvironment{article} + {\begingroup + \global\let\@thanks\@empty + \setcounter{footnote}{0} + \refstepcounter{article} + \label{begin:\thearticle} +} + {\label{end:\thearticle}\endgroup + } \newcommand{\includeart}[1]{% - \begingroup \clearpage - \setcounter{section}{0} - \input{#1}%\label{end:\thetitle} - \global\let\@thanks\@empty - \endgroup} + \input{#1} +} \newcommand{\frontispiece}{% \thispagestyle{empty}% \begingroup @@ -1965,7 +1995,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \end{center}% \quotation \fi} - {\if@twocolumn\else\endquotation\fi} + {\if@twocolumn\else\endquotation\fi\vspace{6ex}} \else \if@titlepage \newenvironment{abstract}{% @@ -2071,8 +2101,11 @@ Janusz M. Nowacki. \newlength\SUF@label@chap \setlength\SUF@label@chap{.5em} \newcommand*{\toclabelwidth}[2]{% - \addtolength{\csname SUF@label@#1\endcsname}{#2}% - \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}}% + \AtBeginDocument{ + \addtolength{\csname SUF@label@#1\endcsname}{#2}% + \addtolength{\csname SUF@tocindent@#1\endcsname}{#2}% + } +} \newcommand{\toclabelspace}{% \ClassError{suftesi} {\MessageBreak -- cgit v1.2.3