From 3930d60080fdc89cfaf643df3e3f9827aec5cf94 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Dec 2012 22:42:48 +0000 Subject: toptesi 5.62 (28dec12) git-svn-id: svn://tug.org/texlive/trunk@28645 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/toptesi/topcoman.sty | 2 +- Master/texmf-dist/tex/latex/toptesi/topfront.sty | 34 ++++++++++++++++++------ Master/texmf-dist/tex/latex/toptesi/toptesi.cls | 2 +- Master/texmf-dist/tex/latex/toptesi/toptesi.sty | 2 +- 4 files changed, 29 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/latex/toptesi') diff --git a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty index fdfcedf0646..4554298fa04 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} % lavora solo con LaTeX 2e \ProvidesPackage{topcoman}% - [2012/11/09 v.5.61d Additional commands for the TOPtesi bundle] + [2012/12/26 v.5.62 Additional commands for the TOPtesi bundle] \RequirePackage{ifxetex} \ifxetex\else \newcommand*\DeclareSlantedCapitalGreekLetters{% diff --git a/Master/texmf-dist/tex/latex/toptesi/topfront.sty b/Master/texmf-dist/tex/latex/toptesi/topfront.sty index cfc6dca8350..006a3fc8fb6 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topfront.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topfront.sty @@ -28,7 +28,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{topfront}[2012/11/09 v.5.61d Title page for TOPtesi] +\ProvidesPackage{topfront}[2012/12/26 v.5.62 Title page for TOPtesi] \newif\iffemminile \newif\ifdottorato \dottoratofalse \newif\iflaureatriennale \laureatriennalefalse @@ -99,7 +99,28 @@ \def\ateneo#1{\gdef\@ateneo{\expandafter\uppercase{\expandafter #1}}} \def\nomeateneo#1{\gdef\@nomeat{\expandafter\uppercase{\expandafter #1}}} \newcommand\facolta[2][]{\gdef\@facname{#2}\gdef\@facnumber{#1}} -\def\logosede#1{\edef\@logosede{\noexpand\includegraphics[width=3cm]{#1}}} + +\newlength{\TPT@logospace}\TPT@logospace=3em\relax +\newsavebox{\TPT@logobox} +\newdimen\TPT@logoheight +\newcommand*\setlogodistance[1]{\TPT@logospace=#1} +\providecommand*{\@logosede}{} + +\newcommand\logosede[2][3cm]{\def\@logosede{#2}\TPT@logoheight=#1} + +\newcommand\printloghi{\ifdefvoid{\@logosede}{}{% +\begin{lrbox}{\TPT@logobox}\hskip\TPT@logospace + \expandafter\@printloghi\@logosede,!}} + +\def\@printloghi#1,#2!{% +\ifblank{#1}{\hskip\TPT@logospace\end{lrbox}\vspace*{\bigskipamount}% +\leavevmode +\ifdim\wd\TPT@logobox<\textwidth \box\TPT@logobox +\else\resizebox{\textwidth}{!}{\box\TPT@logobox}% +\fi}{\def\@logosede{#2}% +\includegraphics[height=\TPT@logoheight]{#1}\hskip\TPT@logospace + \expandafter\@printloghi\@logosede,!}} + \def\tutoreaziendale#1{\gdef\@tutoreaziendale{#1}} \newcommand\retrofrontespizio[1]{\long\gdef\@retrofrontespizio{#1}} \RequirePackage{etoolbox} @@ -165,7 +186,6 @@ Gennaio\or Febbraio\or Marzo\or Aprile\or Maggio\or Giugno\or Luglio\or Agosto\or Settembre\or Ottobre\or Novembre\or Dicembre\fi \space \the\year}}{} -\@ifundefined{@logosede}{\let\@logosede\relax}{} \@ifundefined{@TesiDiLaurea}{\def\@TesiDiLaurea{Tesi di Laurea}}{} \@ifundefined{@phdschool}{\def\@phdschool{SCUOLA DI DOTTORATO}}{} \@ifundefined{@PhDname}{\def\@PhDname{Dottorato in }}{} @@ -180,7 +200,7 @@ \hbox to \hsize{\hfill {\LARGE \@ateneo}\hfill}% \ifclassica \hbox to \hsize{\hfil\vrule\@width\z@ - \@height3.5ex\vrule\@height1.4\p@\@depth-\p@\@width50mm\hfil}% + \@height2ex\vrule\@height1.4\p@\@depth-\p@\@width50mm\hfil}% \fi }}% \def\@oddfoot{\vbox to 15mm{\vss @@ -200,7 +220,7 @@ \null\setcounter{page}{1}% \normalfont \ifx\@nomeat\empty \else - {\vspace*{-2.5\topskip}\centering + {\vspace*{-1.5\baselineskip}\centering {\Large \@nomeat}\par}\vfill \fi \begin{center} @@ -266,9 +286,7 @@ \fi \fi \par - \ifx\@logosede\@empty\else - \vspace*{\bigskipamount} - {\centering \@logosede\par}\fi + {\centering \printloghi\par} \vfill \iflaureatriennale \let\@nomerelatore\empty diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls index f5899288c96..e5b4cdee6b3 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{toptesi}% -[2012/11/09 v.5.61d Class for typesetting university theses] +[2012/12/26 v.5.62 Class for typesetting university theses] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}} \ProcessOptions\relax \LoadClass[a4paper]{report} diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty index d945375f85c..69f63edf66f 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{toptesi}% -[2012/11/09 v.5.61d Extension for toptesi.cls]% +[2012/12/26 v.5.62 Extension for toptesi.cls]% \def\TRON{\tracingcommands \tw@ \tracingmacros \tw@} \def\TROFF{\tracingcommands\z@ \tracingmacros \z@} \let\TROF\TROFF -- cgit v1.2.3