toptesi (5nov13)

git-svn-id: svn://tug.org/texlive/trunk@32081 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 119 insertions, 94 deletions

diff --git a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty
index 8d73dd1e112..942ddb99ec9 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}%
-    [2013/09/01 v.5.73 Additional commands for the TOPtesi bundle]
+    [2013/09/11 v.5.75 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 9c19779f828..3955f93fc99 100644
--- a/Master/texmf-dist/tex/latex/toptesi/topfront.sty
+++ b/Master/texmf-dist/tex/latex/toptesi/topfront.sty
@@ -28,12 +28,48 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{topfront}[2013/09/01 v.5.73 Title page for TOPtesi]
+\ProvidesPackage{topfront}[2013/09/11 v.5.75 Title page for TOPtesi]
 \@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}}
 \ifcsundef{ifclassica}{%
     \newif\ifclassica
     \classicafalse
 }{}
+\def\headstrut{\vrule \@depth4\p@ \@height\z@ \@width\z@}
+\def\ps@titlepage{\let\@mkboth\@gobbletwo
+   \def\@oddfoot{\vbox to 0.05\paperheight{\vss
+      \hbox to\hsize{\hfil{\Large{\@submitdate}}\hfil}}}%
+   \let\@evenfoot\@oddfoot
+   \def\@oddhead{
+      \vbox to\headheight{\vss
+         \hbox to\textwidth{%
+           \headstrut\hfil
+           \raisebox{3\baselineskip}{\usebox\TPT@logobox}\hfil\null%
+         }%
+         \vss
+      }%
+   }%
+   \let\@evenhead\@oddhead
+   \def\chaptermark##1{}\def\sectionmark##1{}%
+}
+      \def\ps@classica{\let\@mkboth\markboth
+      \def\@oddhead{\vbox{%
+      \hbox to \hsize{\hfill {\LARGE \@ateneo}\hfill}%
+      \ifclassica
+            \hbox to \hsize{\hfil\vrule\@width\z@
+        \@height2ex\vrule\@height1.4\p@\@depth-\p@\@width50mm\hfil}%
+      \fi
+      }}%
+      \def\@oddfoot{\vbox to \dimexpr\paperheight/20\relax{\vss
+     \ifclassica
+        \hbox to \hsize{\hfil\raisebox{-.3ex}[\z@][\z@]{%
+        \vrule\@height-2.6\p@\@depth3\p@\@width\dimexpr\textwidth/3}\hfil}%
+      \fi
+      \hbox to\hsize{\hfill{\Large{\@submitdate}}\hfill}}%
+      }%
+      \let\@evenhead\@oddhead
+      \let\@evenfoot\@oddfoot
+      }%
+
 \newif\iffemminile
 \newif\ifdottorato \dottoratofalse
 \newif\iflaureatriennale \laureatriennalefalse
@@ -115,20 +151,19 @@
 \ifcsundef{interno}{%\
     \newlength\interno
     \setlength\interno{\dimexpr\paperwidth/7}}{}
-\newcommand\logosede[2][\interno]{\def\@logosede{#2}\TPT@logoheight=#1}
 
-\newcommand\printloghi{\ifdefvoid{\@logosede}{}{%
-\begin{lrbox}{\TPT@logobox}\hskip\TPT@logospace
-   \expandafter\@printloghi\@logosede,!}}
+\newcommand\logosede[2][\interno]{\def\@logosede{#2}\TPT@logoheight=#1\relax
+\ifcsvoid{@logosede}{\sbox{\TPT@logobox}{}}{\begin{lrbox}{\TPT@logobox}\expandafter\fillup@TCP@logobox\@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}%
+\def\fillup@TCP@logobox#1,#2!{%
+\ifblank{#1}{\end{lrbox}\ifdim\wd\TPT@logobox>\textwidth
+\sbox\TPT@logobox{\resizebox{\textwidth}{!}{\box\TPT@logobox}}\fi}%
+{\def\@logosede{#2}%
 \includegraphics[height=\TPT@logoheight]{#1}\hskip\TPT@logospace
-   \expandafter\@printloghi\@logosede,!}}
+   \expandafter\fillup@TCP@logobox\@logosede,!}}
+
+\newcommand\printloghi{\unless\ifvoid\TPT@logobox\usebox{\TPT@logobox}\fi}
+
 
 \def\tutoreaziendale#1{\gdef\@tutoreaziendale{#1}}
 \newcommand\retrofrontespizio[1]{\long\gdef\@retrofrontespizio{#1}}
@@ -150,6 +185,7 @@
 \newcommand\NomeSecondoTomo[1]{\gdef\SecondoTomo{#1}}
 \newcommand\NomeTerzoTomo[1]{\gdef\TerzoTomo{#1}}
 \newcommand\NomeQuartoTomo[1]{\gdef\QuartoTomo{#1}}
+\newcommand\IDN{\\\quad matricola:\space}
 \IfFileExists{\jobname.cfg}{\input{\jobname.cfg}}%
     {\IfFileExists{toptesi.cfg}{\input{toptesi.cfg}}{}}
 \@ifundefined{@cyclename}{\def\@cyclename{ciclo}}{}
@@ -202,34 +238,32 @@
 \@ifundefined{@dissertazione}{\def\@dissertazione{Tesi di Dottorato}}{}
 \@ifundefined{@monografia}{\def\@monografia{Monografia di Laurea}}{}
 \@ifundefined{@InName}{\def\@InName{in}}{}
-\gdef\frontespizio{%
+\newif\iftopTPTlogos
+\def\frontespizio{%
+    \ifbool{classica}{\topTPTlogosfalse\fr@ntespizio}% else
+    {\@ifstar{\topTPTlogosfalse\fr@ntespizio}%
+    {\topTPTlogostrue\fr@ntespizio}}}
+
+\def\fr@ntespizio{%
 \begingroup
-      \def\ps@myheadings{\let\@mkboth\markboth
-      \def\@oddhead{\vbox{%
-      \hbox to \hsize{\hfill {\LARGE \@ateneo}\hfill}%
-      \ifclassica
-            \hbox to \hsize{\hfil\vrule\@width\z@
-        \@height2ex\vrule\@height1.4\p@\@depth-\p@\@width50mm\hfil}%
-      \fi
-      }}%
-      \def\@oddfoot{\vbox to \dimexpr\paperheight/20\relax{\vss
-     \ifclassica
-        \hbox to \hsize{\hfil\raisebox{-.3ex}[\z@][\z@]{%
-        \vrule\@height-2.6\p@\@depth3\p@\@width\dimexpr\textwidth/3}\hfil}%
-      \fi
-      \hbox to\hsize{\hfill{\Large{\@submitdate}}\hfill}}%
-      }%
-      \let\@evenhead\@oddhead
-      \let\@evenfoot\@oddfoot
-      }%
-      \advance\oddsidemargin \evensidemargin
-      \divide\oddsidemargin \tw@
+   \iftopTPTlogos
+      \thispagestyle{titlepage}
+   \else
+      \thispagestyle{classica}
+   \fi
+      \oddsidemargin=\dimexpr(\oddsidemargin+\evensidemargin)/2\relax
       \evensidemargin \oddsidemargin
-      \thispagestyle{myheadings}%
       \null\setcounter{page}{1}%
       \normalfont
+\iftopTPTlogos
+   \ifcsvoid{@ateneo}{}{%
+      {\centering\LARGE \@ateneo\par}\bigskip
+   }
+\fi
+
       \ifx\@nomeat\empty \else
-            {\vspace*{-1.5\baselineskip}\centering
+            {%
+            \centering
                 {\Large \@nomeat}\par}\vfill
       \fi
       \begin{center}
@@ -237,22 +271,21 @@
       \ifdottorato
             \large \@phdschool\par\medskip
       \else
-            \unless\ifx\@faculty\empty
+            \ifcsvoid{@faculty}{}{%
              \LARGE\ifx\@facnumber\empty\else\@facnumber\space\fi
              \@faculty\@facname\par\medskip
-            \fi%
+            }
       \fi
       }%
-      \ifx\@corso\empty \else{\large
+      \ifcsvoid{@corso}{}{{\large
             \ifdottorato
                   \@PhDname\@corso\ifx\@ciclo\empty\else~--~\@ciclo\fi
             \else
                   \@laureaname\@corso
             \fi
-            \par}
-      \fi
+            \par}}
       \end{center}
-      \vfill
+      \vspace{\stretch{0.2}}
       \begin{center}
         \LARGE
         \ifdottorato
@@ -268,7 +301,7 @@
             \\\@InName\\\@materia
         \fi
       \end{center}
-      \vfill
+      \vspace{\stretch{0.2}}
       \begin{center}
         {\huge\bfseries \baselineskip=0.95em plus 1pt
                 \@title \par}
@@ -291,13 +324,15 @@
                         \else
                             \PackageWarning{toptesi}{%
                             Counter tomo equals \the\c@tomo\MessageBreak
-                            It was not considered a thesis might get
+                            We never considered a thesis might get
                             divided in more than four volumes}%
                         \fi}}%
             \fi
+            \vspace{1em}
       \fi
       \par
-      {\centering \printloghi\par}
+     \unless\iftopTPTlogos
+      {\centering \printloghi\par}\fi
       \vfill
       \iflaureatriennale
             \let\@nomerelatore\empty
@@ -305,37 +340,36 @@
             \ifdottorato
                   \edef\@nomerelatore{\@PhDdirector}%
             \else
-                  \ifx\@principaladviser\empty\else
-                        \def\@nomerelatore{\Relatore:}%
-                  \fi
+                  \ifcsvoid{@principaladviser}{}{%
+                        \def\@nomerelatore{\Relatore}}
                   \unless\ifclassica
-                        \ifx\@secondadviser\empty \else
-                              \def\@nomerelatore{\Relatori:}%
-                        \fi
+                        \ifcsvoid{@secondadviser}{}{%
+                              \def\@nomerelatore{\Relatori}}%
                   \fi
             \fi
       \fi
       \ifdottorato
             \let\@nomecandidato\empty
       \else
-    \iflanguage{italian}{%
+        \iflanguage{italian}{%
             \iffemminile
-                  \def\@nomecandidato{\Candidata:}%
+                  \def\@nomecandidato{\Candidata}%
             \else
-                  \def\@nomecandidato{\Candidato:}%
+                  \def\@nomecandidato{\Candidato}%
             \fi
-            \ifx\@secondauthor\empty \else
+            \ifcsvoid{@secondauthor}{}{%
                   \iffemminile
-                        \def\@nomecandidato{\Candidate:}%
+                        \def\@nomecandidato{\Candidate}%
                   \else
-                        \def\@nomecandidato{\Candidati:}%
-                  \fi
-            \fi}{}
-      \fi
+                        \def\@nomecandidato{\Candidati}%
+                  \fi}
+         }{}%
+     \fi
       \iflaureatriennale
             \begin{center}%
                   \large\mdseries\textsc{\@author}
             \end{center}%
+
       \else
          \def\BoxRelatori{%
             \begin{tabular}[t]{l}%
@@ -359,42 +393,32 @@
             \fi
             \end{tabular}%
          }%
+      \def\print@secondocandidato{\\\relax
+                  \hbox{\large\tabular{@{}l@{}}\@secondauthor\endtabular}}
+      \def\print@terzocandidato{\\\relax
+                  \hbox{\large\tabular{@{}l@{}}\@thirdauthor\endtabular}}
       \def\BoxCandidati{%
          \begin{tabular}[t]{l}%
             \hbox{\unless\ifclassica\large\fi
                \textbf{\protect\@nomecandidato}}\\[.6ex]
-               \hbox{\large\textrm{\protect\@author}}%
-               \ifx\@secondauthor\empty
-               \else
-                  \\\hbox{\large\textrm{\protect\@secondauthor}}%
-               \fi
-               \ifx\@thirdauthor\empty
-               \else
-                  \\\hbox{\large\textrm{\protect\@thirdauthor}}%
-               \fi
+               \hbox{\large\tabular{@{}l@{}}\@author\endtabular}%
+               \ifcsvoid{@secondauthor}{}{\print@secondocandidato}%
+               \ifcsvoid{@thirdauthor}{}{\print@terzocandidato}%
          \end{tabular}%
       }%
          \ifdottorato
             \begin{center}\large
                \textbf{\@author}\\[3em]
                {\normalsize
-               \begin {tabular*}{\hsize}{@{\extracolsep{\fill}}ccc}
-               \ifx\@tutore\empty\else
-                   \textbf{\Tutore}
-               \fi
-               &\relax&
-               \ifx\@principaladviser\empty\else
-                     \textbf{\@nomerelatore}
-               \fi
-               \\
-               \ifx\@tutore\empty\else
-                     \@tutore
-               \fi
-               &\relax&
-               \ifx\@principaladviser\empty\else
-                     \@principaladviser
-               \fi
-               \end{tabular*}
+                 \begin {tabular*}{\hsize}{@{\extracolsep{\fill}}ccc}
+                     \ifcsvoid{@tutore}{}{\textbf{\Tutore}}
+                 &\relax&
+                     \ifcsvoid{@principaladviser}{}{\textbf{\@nomerelatore}}
+                 \\
+                     \ifcsvoid{@tutore}{}{\@tutore}
+                 &\relax&
+                     \ifcsvoid{@principaladviser}{}{\@principaladviser}
+                 \end{tabular*}
                }%
             \end{center}
          \else
@@ -404,19 +428,19 @@
                \end{flushleft}\par\vspace*{-1.5\baselineskip}
                \begin{flushright}%
                      \BoxCandidati
-               \end{flushright}\else
+               \end{flushright}%
+             \else
                \noindent
                \makebox[\textwidth]{\BoxRelatori\hfill\BoxCandidati}\par
              \fi
           \fi
       \fi
-\ifx\@tutoreaziendale\@empty\else
+\ifcsvoid{@tutoreaziendale}{}{%
     \vfill\vfill
     {\centering \textbf{\@tutoreaziendalename}\\[.6ex]
-    \@tutoreaziendale\par}
-\fi
+    \@tutoreaziendale\par}}
       \par\clearpage
-      \ifdefempty{\@retrofrontespizio}{}%
+      \ifcsvoid{@retrofrontespizio}{}%
       {\null\vfill\pagestyle{empty}\@retrofrontespizio\par\clearpage}%
 \endgroup}
 %% 
diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls
index ba08da58e9d..16e5d7f181a 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}%
-[2013/09/01 v.5.73 Class for typesetting university theses]
+[2013/09/11 v.5.75 Class for typesetting university theses]
 \DeclareOption{a4paper}{\PassOptionsToClass{\CurrentOption}{report}}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
 \ExecuteOptions{a4paper}
diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty
index bf22b228160..d394d8ff1ca 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}%
-[2013/09/01 v.5.73 Extension for toptesi.cls]%
+[2013/09/11 v.5.75 Extension for toptesi.cls]%
 \def\TRON{\tracingcommands \tw@ \tracingmacros \tw@}
 \def\TROFF{\tracingcommands\z@ \tracingmacros \z@}
 \let\TROF\TROFF
@@ -410,7 +410,8 @@ Skipping any redefinition\MessageBreak}%
 \def\Candidate{Laureande}
 \fi
 \newcounter{tomo}
-\newcommand*{\tomo}{\clearpage\stepcounter{tomo}\frontespizio}
+\newcommand*{\tomo}{\clearpage\stepcounter{tomo}%
+    \ifbool{classica}{\frontespizio*}{\frontespizio}}
 \renewcommand*{\lapagina}{%
     \ifnumeriromani
         \thepage