From c632275d3ae54aead904bce94035f7a780fc909a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 17 May 2010 15:48:23 +0000 Subject: toptesi 5.01 (15may10) git-svn-id: svn://tug.org/texlive/trunk@18303 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/toptesi/manifest.txt | 6 +-- .../texmf-dist/doc/latex/toptesi/toptesi-doc.pdf | Bin 424223 -> 595124 bytes .../doc/latex/toptesi/toptesi-example.tex | 2 +- Master/texmf-dist/doc/latex/toptesi/toptesi.pdf | Bin 272702 -> 404947 bytes Master/texmf-dist/source/latex/toptesi/toptesi.dtx | 45 ++++++++++++--------- Master/texmf-dist/tex/latex/toptesi/topfront.sty | 31 +++++++------- Master/tlpkg/libexec/ctan2tds | 4 +- 7 files changed, 47 insertions(+), 41 deletions(-) diff --git a/Master/texmf-dist/doc/latex/toptesi/manifest.txt b/Master/texmf-dist/doc/latex/toptesi/manifest.txt index 9ef04d92d3e..f3a9c99acee 100644 --- a/Master/texmf-dist/doc/latex/toptesi/manifest.txt +++ b/Master/texmf-dist/doc/latex/toptesi/manifest.txt @@ -1,5 +1,5 @@ -manifest.txt -Copyright 2008 Claudio Beccari +manifest.txt (version 5.01) +Copyright 2008-2010 Claudio Beccari This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or @@ -58,4 +58,4 @@ The file is an example of the usage of this work; it may be used as a template, but in itself it is not part of this Work -The file toptesi-example.xmpdata is an example of the contents and format of the metadata that must be included into the the same directatory as the thesis main file in order to be able to use pdflatex for typesetting a file that hopefully is PDF/A-1b compliant, that is in the "weak" archivable PDF format. +The file toptesi-example.xmpdata is an example of the contents and format of the metadata that must be included into the same directatory as the thesis main file in order to be able to use pdflatex for typesetting a file that hopefully is PDF/A-1b compliant, that is in the "weak" archivable PDF format. diff --git a/Master/texmf-dist/doc/latex/toptesi/toptesi-doc.pdf b/Master/texmf-dist/doc/latex/toptesi/toptesi-doc.pdf index 9c0470c6d60..82f18fa275c 100644 Binary files a/Master/texmf-dist/doc/latex/toptesi/toptesi-doc.pdf and b/Master/texmf-dist/doc/latex/toptesi/toptesi-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/toptesi/toptesi-example.tex b/Master/texmf-dist/doc/latex/toptesi/toptesi-example.tex index f45eef221af..a1bab7a27dc 100644 --- a/Master/texmf-dist/doc/latex/toptesi/toptesi-example.tex +++ b/Master/texmf-dist/doc/latex/toptesi/toptesi-example.tex @@ -44,7 +44,7 @@ %\direttore{prof. Albert Einstein}% per il dottorato %\coordinatore{prof. Albert Einstein}% per il dottorato \relatore{prof.\ Albert Einstein}% per la laurea eo il dottorato -%\secondorelatore{dipl.~ing.~Werner von Braun}% per la laurea magistrale +\secondorelatore{dipl.~ing.~Werner von Braun}% per la laurea magistrale %\terzorelatore{{\tabular{@{}l}dott.\ Neil Armstrong\\prof. Maria Rossi\endtabular}}% per la laurea magistrale %\tutore{ing.~Karl Von Braun}% per il dottorato \tutoreaziendale{dott.\ ing.\ Giovanni Giacosa} diff --git a/Master/texmf-dist/doc/latex/toptesi/toptesi.pdf b/Master/texmf-dist/doc/latex/toptesi/toptesi.pdf index ff3833e37e8..e686b686112 100644 Binary files a/Master/texmf-dist/doc/latex/toptesi/toptesi.pdf and b/Master/texmf-dist/doc/latex/toptesi/toptesi.pdf differ diff --git a/Master/texmf-dist/source/latex/toptesi/toptesi.dtx b/Master/texmf-dist/source/latex/toptesi/toptesi.dtx index 51194f9c3f0..af35263e2d9 100644 --- a/Master/texmf-dist/source/latex/toptesi/toptesi.dtx +++ b/Master/texmf-dist/source/latex/toptesi/toptesi.dtx @@ -27,7 +27,7 @@ % \iffalse %<*driver> \documentclass{ltxdoc} -\ProvidesFile{toptesi.dtx}[2008/12/14 v.5.00 Documented TeX file for +\ProvidesFile{toptesi.dtx}[2010/05/09 v.5.01 Documented TeX file for the TOPtesi bundle] \GetFileInfo{toptesi.dtx} \title{The TOPtesi bundle} @@ -42,7 +42,7 @@ the TOPtesi bundle] % % \fi % -% \CheckSum{2912} +% \CheckSum{2905} % %% \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 @@ -1224,7 +1224,7 @@ Skipping any redefinition\MessageBreak}% % \begin{macrocode} %<*topfrn> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{topfront}[2008/12/15 v.5.00 Title page for TOPtesi] +\ProvidesPackage{topfront}[2010/05/09 v.5.01 Title page for TOPtesi] % \end{macrocode} % % The title page information depends on the type of ``thesis' that is being typeset. @@ -1557,7 +1557,7 @@ Skipping any redefinition\MessageBreak}% \@ifundefined{@nomeat}{\def\@nomeat{}}{}% Nome proprio dell'ateneo \@ifundefined{@facolta}{\def\@facname{Ingegneria}}{} \@ifundefined{@facnumber}{\def\@facnumber{}}{} -\@ifundefined{@faculty}{\def\@faculty{Facolt\`a di}}{} +\@ifundefined{@faculty}{\def\@faculty{Facolt\`a di }}{} % \@ifundefined{PrimoTomo}{\def\PrimoTomo{Tomo primo}}{} \@ifundefined{SecondoTomo}{\def\SecondoTomo{Tomo secondo}}{} @@ -1643,7 +1643,7 @@ Skipping any redefinition\MessageBreak}% % \begin{macrocode} \ifx\@nomeat\empty \else {\vspace*{-3\topskip}\centering - \expandafter{\Large \@nomeat}\par}\vfill + {\Large \@nomeat}\par}\vfill \fi % \end{macrocode} % Then the faculty name comes next; but fot the doctoral school it uses the doctoral @@ -1657,9 +1657,9 @@ Skipping any redefinition\MessageBreak}% \large \@phdschool \else \LARGE\ifx\@facnumber\empty\else\@facnumber\space\fi - \@faculty\space\expandafter{\@facname}% + \@faculty\@facname% \fi - \par}% + \par\medskip}% % \end{macrocode} % Further specification: it inserts the field of the PhD research or the degree course name; for example % it inserts the line ``Philosophy Degree in Applied Tetratricotomy~--~XVI~cycle'' or @@ -1667,9 +1667,9 @@ Skipping any redefinition\MessageBreak}% % \begin{macrocode} \ifx\@corso\empty \else{\large \ifdottorato - {\@PhDname\@corso\ifx\@ciclo\empty\else~--~\@ciclo\fi}% + \@PhDname\@corso\ifx\@ciclo\empty\else~--~\@ciclo\fi \else - {\@laureaname\@corso}% + \@laureaname\@corso \fi \par} \fi @@ -1700,12 +1700,12 @@ Skipping any redefinition\MessageBreak}% \vfill \begin{center} {\huge\bfseries \baselineskip=0.95em plus 1pt - \expandafter{\@title \par}} + \@title \par} \end{center} % con l'eventuale sottotitolo \ifx\@subtitle\empty \else \begin{center}% - \large\textrm{\expandafter{\@subtitle}}\par + \large\textrm{\@subtitle}\par \end{center}% \fi % \end{macrocode} @@ -1718,7 +1718,6 @@ Skipping any redefinition\MessageBreak}% \expandafter \ifx\csname StileTrieste\endcsname\relax \else - \expandafter \ifnum\value{tomo}>\z@ \par\bigskip \noindent\makebox[\textwidth]{% @@ -1841,17 +1840,16 @@ Skipping any redefinition\MessageBreak}% % \begin{macrocode} \def\BoxCandidati{% \begin{tabular}[t]{l}% - \hbox{{\expandafter - \@ifundefined{StileTrieste}{\large}{}% - \textbf{\protect\@nomecandidato}}}\\[.6ex] - \hbox{{\large\textrm{\protect\@author}}}% + \hbox{\@ifundefined{StileTrieste}{\large}{}% + \textbf{\protect\@nomecandidato}}\\[.6ex] + \hbox{\large\textrm{\protect\@author}}% \ifx\@secondauthor\empty \else - \\\hbox{{\large\textrm{\protect\@secondauthor}}}% + \\\hbox{\large\textrm{\protect\@secondauthor}}% \fi \ifx\@thirdauthor\empty \else - \\\hbox{{\large\textrm{\protect\@thirdauthor}}}% + \\\hbox{\large\textrm{\protect\@thirdauthor}}% \fi \end{tabular}% }% @@ -1893,7 +1891,6 @@ Skipping any redefinition\MessageBreak}% % so that to the right or, respectively, to the left of every name there is enough space for the signatures. % With the \texttt{classica} option in force the two boxes are simply aligned. % \begin{macrocode} - \expandafter \@ifundefined{StileTrieste}{% \begin{flushleft}% \BoxRelatori @@ -2506,3 +2503,13 @@ Skipping any redefinition\MessageBreak}% % \end{macrocode} % \Finale % \endinput +% +%@OldClaudio: se ci leggi, ricordati di correggere nel file toptesi.cfg fornito di default la riga +%Codice: +%\FacoltaDi{Facolt\`a di }% fatto 2010/05/09 +% +%che è sbagliata: con l'impostazione data, tra "Facoltà di" e il nome della facoltà ci sono due spazi. Probabilmente è meglio che quelle righe siano commentate. La riga 222 di topfront.sty dovrebbe essere +%Codice: +%\@faculty\space\@facname +% +%Ci sono altri \expandafter inutili alle righe 214, 253, 257, 263, 346 e 384. diff --git a/Master/texmf-dist/tex/latex/toptesi/topfront.sty b/Master/texmf-dist/tex/latex/toptesi/topfront.sty index c46159c8993..7eed7d981f0 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topfront.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topfront.sty @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{topfront}[2008/12/15 v.5.00 Title page for TOPtesi] +\ProvidesPackage{topfront}[2010/05/09 v.5.01 Title page for TOPtesi] \newif\iffemminile \newif\ifdottorato \dottoratofalse \newif\iflaureatriennale \laureatriennalefalse @@ -162,7 +162,7 @@ \@ifundefined{@nomeat}{\def\@nomeat{}}{}% Nome proprio dell'ateneo \@ifundefined{@facolta}{\def\@facname{Ingegneria}}{} \@ifundefined{@facnumber}{\def\@facnumber{}}{} -\@ifundefined{@faculty}{\def\@faculty{Facolt\`a di}}{} +\@ifundefined{@faculty}{\def\@faculty{Facolt\`a di }}{} \@ifundefined{PrimoTomo}{\def\PrimoTomo{Tomo primo}}{} \@ifundefined{SecondoTomo}{\def\SecondoTomo{Tomo secondo}}{} \@ifundefined{TerzoTomo}{\def\TerzoTomo{Tomo terzo}}{} @@ -211,7 +211,7 @@ \normalfont \ifx\@nomeat\empty \else {\vspace*{-3\topskip}\centering - \expandafter{\Large \@nomeat}\par}\vfill + {\Large \@nomeat}\par}\vfill \fi \begin{center} {\rmfamily\mdseries @@ -219,14 +219,14 @@ \large \@phdschool \else \LARGE\ifx\@facnumber\empty\else\@facnumber\space\fi - \@faculty\space\expandafter{\@facname}% + \@faculty\@facname% \fi - \par}% + \par\medskip}% \ifx\@corso\empty \else{\large \ifdottorato - {\@PhDname\@corso\ifx\@ciclo\empty\else~--~\@ciclo\fi}% + \@PhDname\@corso\ifx\@ciclo\empty\else~--~\@ciclo\fi \else - {\@laureaname\@corso}% + \@laureaname\@corso \fi \par} \fi @@ -250,17 +250,16 @@ \vfill \begin{center} {\huge\bfseries \baselineskip=0.95em plus 1pt - \expandafter{\@title \par}} + \@title \par} \end{center} \ifx\@subtitle\empty \else \begin{center}% - \large\textrm{\expandafter{\@subtitle}}\par + \large\textrm{\@subtitle}\par \end{center}% \fi \expandafter \ifx\csname StileTrieste\endcsname\relax \else - \expandafter \ifnum\value{tomo}>\z@ \par\bigskip \noindent\makebox[\textwidth]{% @@ -343,17 +342,16 @@ }% \def\BoxCandidati{% \begin{tabular}[t]{l}% - \hbox{{\expandafter - \@ifundefined{StileTrieste}{\large}{}% - \textbf{\protect\@nomecandidato}}}\\[.6ex] - \hbox{{\large\textrm{\protect\@author}}}% + \hbox{\@ifundefined{StileTrieste}{\large}{}% + \textbf{\protect\@nomecandidato}}\\[.6ex] + \hbox{\large\textrm{\protect\@author}}% \ifx\@secondauthor\empty \else - \\\hbox{{\large\textrm{\protect\@secondauthor}}}% + \\\hbox{\large\textrm{\protect\@secondauthor}}% \fi \ifx\@thirdauthor\empty \else - \\\hbox{{\large\textrm{\protect\@thirdauthor}}}% + \\\hbox{\large\textrm{\protect\@thirdauthor}}% \fi \end{tabular}% }% @@ -381,7 +379,6 @@ }% \end{center} \else - \expandafter \@ifundefined{StileTrieste}{% \begin{flushleft}% \BoxRelatori diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 7fa29e7b8a1..4bd86995342 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -56,6 +56,7 @@ $Master = "$mydir/../.."; 'IEEEtran', "&MAKEIEEEtran", 'LingTrees', "die 'skipping, requires python'", 'SIstyle', '&MAKEflatten', + 'TOPtesi', "die 'skipping, use toptesi'", 'a4', "die 'skipping, just a pointer to ntgclass'", 'aastex', "&MAKEflatten", 'accenti', "die 'skipping, use bosisio instead'", @@ -1410,6 +1411,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'svn-multi' => 'latex', # interaction for .pl 'thumb' => 'latex -translate-file=empty.tcx', # no 8-bit 'todonotes' => 'latex', # requires interaction + 'toptesi' => 'latex', # requires interaction 'xecjk' => 'xecjk-xelatex', ); $standardinsrunner="latex -interaction=nonstopmode"; @@ -1991,7 +1993,7 @@ sub runins print "\t RUNINS $thispatt\n"; for (grep (/$thispatt/, @filenames)) { # do not infinite loop on docstrip "output directory", e.g., fltpoint. - &runjob ("yes | sed 5q | $insrunner $_"); + &runjob ("yes | sed 10q | $insrunner $_"); } &killfiles ($specialclean{$package} || $standardclean); -- cgit v1.2.3