From d796117a8cface8ab25eda5ebc564c94e145c8a8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 1 Sep 2013 22:41:48 +0000 Subject: toptesi (1sep13) git-svn-id: svn://tug.org/texlive/trunk@31558 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/toptesi/topcoman.sty | 6 ++--- Master/texmf-dist/tex/latex/toptesi/topfront.sty | 31 +++++++++++++++--------- Master/texmf-dist/tex/latex/toptesi/toptesi.cfg | 4 +-- Master/texmf-dist/tex/latex/toptesi/toptesi.cls | 6 ++--- Master/texmf-dist/tex/latex/toptesi/toptesi.sty | 21 ++++++++-------- 5 files changed, 38 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty index 145ed2667b0..8d73dd1e112 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty @@ -7,7 +7,7 @@ %% toptesi.dtx (with options: `topcmn') %% ______________________________________________________ %% The TOPtesi package -%% Copyright (C) 2012 Claudio Beccari +%% Copyright (C) 2013 Claudio Beccari %% All rights reserved %% %% License information appended @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} % lavora solo con LaTeX 2e \ProvidesPackage{topcoman}% - [2013/03/27 v.5.71 Additional commands for the TOPtesi bundle] + [2013/09/01 v.5.73 Additional commands for the TOPtesi bundle] \RequirePackage{ifxetex} \ifxetex\else \newcommand*\DeclareSlantedCapitalGreekLetters{% @@ -95,7 +95,7 @@ \let\p@figure\empty\let\p@table\empty} \DisableFigTabNames %% -%% Copyright 2005-2012 Claudio Beccari +%% Copyright 2005-2013 Claudio Beccari %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/latex/toptesi/topfront.sty b/Master/texmf-dist/tex/latex/toptesi/topfront.sty index 117e3ece0d1..9c19779f828 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topfront.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topfront.sty @@ -7,7 +7,7 @@ %% toptesi.dtx (with options: `topfrn') %% ______________________________________________________ %% The TOPtesi package -%% Copyright (C) 2012 Claudio Beccari +%% Copyright (C) 2013 Claudio Beccari %% All rights reserved %% %% License information appended @@ -28,7 +28,12 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{topfront}[2013/03/27 v.5.71 Title page for TOPtesi] +\ProvidesPackage{topfront}[2013/09/01 v.5.73 Title page for TOPtesi] +\@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}} +\ifcsundef{ifclassica}{% + \newif\ifclassica + \classicafalse +}{} \newif\iffemminile \newif\ifdottorato \dottoratofalse \newif\iflaureatriennale \laureatriennalefalse @@ -49,7 +54,7 @@ \def\tutore#1{\gdef\@tutore{#1}} \def\direttore{\Direttoretrue\relatore}% \def\coordinatore{\Direttorefalse\relatore}% -\def\QualificaDirettore#1{\gdef\@PhDdirector{#1}} +\def\QualificaDirettore#1{\gdef{#1}} \def\relatore#1{\gdef\@principaladviser{#1}} \def\secondorelatore#1{\gdef\@secondadviser{#1}} \def\terzorelatore#1{\gdef\@thirdadviser{#1}} @@ -107,6 +112,9 @@ \newcommand*\setlogodistance[1]{\TPT@logospace=#1} \providecommand*{\@logosede}{} +\ifcsundef{interno}{%\ + \newlength\interno + \setlength\interno{\dimexpr\paperwidth/7}}{} \newcommand\logosede[2][\interno]{\def\@logosede{#2}\TPT@logoheight=#1} \newcommand\printloghi{\ifdefvoid{\@logosede}{}{% @@ -124,7 +132,6 @@ \def\tutoreaziendale#1{\gdef\@tutoreaziendale{#1}} \newcommand\retrofrontespizio[1]{\long\gdef\@retrofrontespizio{#1}} -\RequirePackage{etoolbox} \newcommand\FacoltaDi[1]{\gdef\@faculty{#1}} \let\StrutturaDidattica\FacoltaDi \newcommand\DottoratoIn[1]{\gdef\@PhDname{#1}} @@ -151,9 +158,9 @@ \@ifundefined{@principaladviser}{\def\@principaladviser{}}{} \@ifundefined{@secondadviser}{\def\@secondadviser{}}{} \@ifundefined{@thirdadviser}{\def\@thirdadviser{}}{} -\@ifundefined{@PhDdirector}{% - \edef\@PhDdirector{\ifDirettore Direttore \else Coordinatore \fi - del corso di dottorato}}{} +\ifcsundef{@PhDdirector}{% + \ifDirettore\def\@PhDdirector{Direttore del corso di dottorato}\else + \def\@PhDdirector{Coordinatore del corso di dottorato}\fi}{} \@ifundefined{@tutore}{\def\@tutore{}}{} \@ifundefined{@secondauthor}{\def\@secondauthor{}}{} \@ifundefined{@thirdauthor}{\def\@thirdauthor{}}{} @@ -195,7 +202,7 @@ \@ifundefined{@dissertazione}{\def\@dissertazione{Tesi di Dottorato}}{} \@ifundefined{@monografia}{\def\@monografia{Monografia di Laurea}}{} \@ifundefined{@InName}{\def\@InName{in}}{} -\def\frontespizio{% +\gdef\frontespizio{% \begingroup \def\ps@myheadings{\let\@mkboth\markboth \def\@oddhead{\vbox{% @@ -408,12 +415,12 @@ {\centering \textbf{\@tutoreaziendalename}\\[.6ex] \@tutoreaziendale\par} \fi - \par\vfill\null - \ifdefempty{\@retrofrontespizio}{\cleardoublepage}% - {\clearpage\null\vfill\@retrofrontespizio\par\clearpage}% + \par\clearpage + \ifdefempty{\@retrofrontespizio}{}% + {\null\vfill\pagestyle{empty}\@retrofrontespizio\par\clearpage}% \endgroup} %% -%% Copyright 2005-2012 Claudio Beccari +%% Copyright 2005-2013 Claudio Beccari %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg b/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg index 6b1365f372a..4386f0b4440 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg @@ -7,7 +7,7 @@ %% toptesi.dtx (with options: `topcfg') %% ______________________________________________________ %% The TOPtesi package -%% Copyright (C) 2012 Claudio Beccari +%% Copyright (C) 2013 Claudio Beccari %% All rights reserved %% %% License information appended @@ -56,7 +56,7 @@ %%\CycleName{ciclo} %%\retrofrontespizio{Questo testo รจ soggetto alla Creative Commons Licence} %% -%% Copyright 2005-2012 Claudio Beccari +%% Copyright 2005-2013 Claudio Beccari %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls index 4a81b58dbc5..ba08da58e9d 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls @@ -7,7 +7,7 @@ %% toptesi.dtx (with options: `class') %% ______________________________________________________ %% The TOPtesi package -%% Copyright (C) 2012 Claudio Beccari +%% Copyright (C) 2013 Claudio Beccari %% All rights reserved %% %% License information appended @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{toptesi}% -[2013/03/27 v.5.71 Class for typesetting university theses] +[2013/09/01 v.5.73 Class for typesetting university theses] \DeclareOption{a4paper}{\PassOptionsToClass{\CurrentOption}{report}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}} \ExecuteOptions{a4paper} @@ -48,7 +48,7 @@ \fi \RequirePackage{toptesi} %% -%% Copyright 2005-2012 Claudio Beccari +%% Copyright 2005-2013 Claudio Beccari %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty index a0bc052ea61..bf22b228160 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty @@ -7,7 +7,7 @@ %% toptesi.dtx (with options: `topsty') %% ______________________________________________________ %% The TOPtesi package -%% Copyright (C) 2012 Claudio Beccari +%% Copyright (C) 2013 Claudio Beccari %% All rights reserved %% %% License information appended @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{toptesi}% -[2013/03/27 v.5.71 Extension for toptesi.cls]% +[2013/09/01 v.5.73 Extension for toptesi.cls]% \def\TRON{\tracingcommands \tw@ \tracingmacros \tw@} \def\TROFF{\tracingcommands\z@ \tracingmacros \z@} \let\TROF\TROFF @@ -52,6 +52,7 @@ \DeclareOption{pdfa}{\T@Ppdfatrue} \ProcessOptions\relax \RequirePackage{graphicx} +\RequirePackage{etoolbox} \if@xivpt\input{size14.clo}\fi \newlength\interno \textheight 0.7\paperheight @@ -365,15 +366,15 @@ Skipping any redefinition\MessageBreak}% \AtBeginDocument{% \italiano \renewcommand\@chapapp{\chaptername}% - } +} \ifxetex -\AtBeginDocument{\RequirePackage{topfront} -\RequirePackage{topcoman}} -\else -\RequirePackage{topfront} -\RequirePackage{topcoman} +\AtBeginDocument{% +\RequirePackage{topfront}% +\RequirePackage{topcoman}% +}\else +\RequirePackage{topfront}% +\RequirePackage{topcoman}% \fi -\def\sf@size{7} \ifxetex\else \renewcommand*\not{\mathrel{\mathchoice% {\rlap{$\displaystyle\mkern2.5mu\mathnormal{/}$}}% @@ -515,7 +516,7 @@ Skipping any redefinition\MessageBreak}% \endlist\clearpage } %% -%% Copyright 2005-2012 Claudio Beccari +%% Copyright 2005-2013 Claudio Beccari %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of -- cgit v1.2.3