From 1e7666909a1643946b0353718f7e49bc93d5bba6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 4 Apr 2009 23:36:39 +0000 Subject: frontespizio 1.1 (3apr09) git-svn-id: svn://tug.org/texlive/trunk@12623 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/frontespizio/frontespizio.sty | 92 +++++++++++++--------- 1 file changed, 54 insertions(+), 38 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/frontespizio/frontespizio.sty b/Master/texmf-dist/tex/latex/frontespizio/frontespizio.sty index 192651581cf..bb81afd9411 100644 --- a/Master/texmf-dist/tex/latex/frontespizio/frontespizio.sty +++ b/Master/texmf-dist/tex/latex/frontespizio/frontespizio.sty @@ -19,7 +19,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{frontespizio} - [2008/03/04 1.0 (Enrico Gregorio)] + [2009/04/03 1.1 (Enrico Gregorio)] \def\@not@eTeX{% \PackageError{frontespizio} {This package requires e-TeX, I'll stop right now} @@ -40,6 +40,7 @@ \DeclareOption{infront}{\let\front@infront=T} \DeclareOption{signatures}{\let\front@signatures=T} \DeclareOption{noadvisor}{\let\front@noadvisor=T} +\DeclareOption{swapnames}{\let\front@swapnames=T} \DeclareOption{normal}{\def\front@thefont{\fontoptionnormal}} \DeclareOption{sans}{\def\front@thefont{\fontoptionsans}} \DeclareOption{norules}{\let\front@norules=T} @@ -76,7 +77,10 @@ \expandafter\endinput \else \RequirePackage{ifpdf} -\def\front@ifxetex{\let\ifxetex\iffalse} +\def\front@ifxetex{% + \expandafter\let + \csname ifxetex\expandafter\endcsname + \csname iffalse\endcsname} \IfFileExists{ifxetex.sty}{\RequirePackage{ifxetex}}{\front@ifxetex} \let\front@ifxetex\@undefined \fi @@ -104,6 +108,9 @@ \ifdefined\front@noadvisor \g@addto@macro\front@theoptions{,noadvisor} \fi +\ifdefined\front@swapnames + \g@addto@macro\front@theoptions{,swapnames} +\fi \ifdefined\front@norules \g@addto@macro\front@theoptions{,norules} \fi @@ -310,48 +317,57 @@ \fi \vspace{\fill} -\vbox to .3\textheight{\parindent\z@ -\frontnamesfont -\begin{tabular*}{\textwidth} - {@{\front@push}l@{\extracolsep{\fill}}l@{\front@push}} -\begin{tabular}[t]{@{}l@{}} -\relax\ifnum\front@candcount<1 - \PackageWarningNoLine{frontespizio}{Missing candidate name}% -\else - \frontfixednamesfont - \ifnum\front@candcount=1 - \front@thecandidate - \else - \front@thecandidates - \fi - \front@punct\\ - \the\front@candtoks -\fi -\end{tabular} -& -\unless\ifdefined\front@noadvisor +\def\front@makecandidates{% \begin{tabular}[t]{@{}l@{}} - \relax - \ifcase\front@relcount - \PackageWarningNoLine{frontespizio}{Missing advisor name}% - \or - \frontfixednamesfont\front@theadvisor\front@punct + \relax\ifnum\front@candcount<1 + \PackageWarningNoLine{frontespizio}{Missing candidate name}% \else - \frontfixednamesfont\front@theadvisors\front@punct - \fi - \the\front@reltoks - \if\@front@{correl} - \\[\frontrelcorrelsep] - \ifcase\front@correlcount\or - \frontfixednamesfont\front@thecoadvisor\front@punct + \frontfixednamesfont + \ifnum\front@candcount=1 + \front@thecandidate \else - \frontfixednamesfont\front@thecoadvisors\front@punct + \front@thecandidates \fi - \the\front@correltoks + \front@punct\\ + \the\front@candtoks \fi - \end{tabular} + \end{tabular}} +\def\front@makeadvisors{% + \unless\ifdefined\front@noadvisor + \begin{tabular}[t]{@{}l@{}} + \relax + \ifcase\front@relcount + \PackageWarningNoLine{frontespizio}{Missing advisor name}% + \or + \frontfixednamesfont\front@theadvisor\front@punct + \else + \frontfixednamesfont\front@theadvisors\front@punct + \fi + \the\front@reltoks + \if\@front@{correl} + \\[\frontrelcorrelsep] + \ifcase\front@correlcount\or + \frontfixednamesfont\front@thecoadvisor\front@punct + \else + \frontfixednamesfont\front@thecoadvisors\front@punct + \fi + \the\front@correltoks + \fi + \end{tabular} + \fi} +\vbox to .3\textheight{\parindent\z@ +\frontnamesfont +\ifdefined\front@swapnames + \begin{tabular*}{\textwidth} + {@{\front@push}l@{\extracolsep{\fill}}l@{\front@push}} + \front@makeadvisors&\front@makecandidates + \end{tabular*} +\else + \begin{tabular*}{\textwidth} + {@{\front@push}l@{\extracolsep{\fill}}l@{\front@push}} + \front@makecandidates&\front@makeadvisors + \end{tabular*} \fi -\end{tabular*} \par \vfill} \ifdefined\front@signatures\vskip\frontadjustforsignatures\fi -- cgit v1.2.3