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 --- Master/texmf-dist/doc/latex/frontespizio/README | 9 +- .../texmf-dist/doc/latex/frontespizio/examplec.tex | 4 +- .../doc/latex/frontespizio/frontespizio.pdf | Bin 270580 -> 272944 bytes .../source/latex/frontespizio/frontespizio.dtx | 127 +++++++++++++-------- .../tex/latex/frontespizio/frontespizio.sty | 92 +++++++++------ 5 files changed, 144 insertions(+), 88 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/frontespizio/README b/Master/texmf-dist/doc/latex/frontespizio/README index f374b743f3a..d3120e65029 100644 --- a/Master/texmf-dist/doc/latex/frontespizio/README +++ b/Master/texmf-dist/doc/latex/frontespizio/README @@ -2,9 +2,12 @@ The frontespizio package lets you typeset a frontispiece (suitable for Italian university style) independently of the page layout of the main document. -This is version 1.0 of the package +This is version 1.1 of the package; the only change from version 1.0 is +the addition of the option `swapnames', to exchange the position of +candidate and advisor names. A bug with option `onlyinclude' has been +corrected. - Copyright 2008 Enrico Gregorio + Copyright 2008, 2009 Enrico Gregorio This program is provided under the terms of the LaTeX Project Public License distributed from CTAN @@ -65,5 +68,5 @@ the automated script makedoc.sh by sh makedoc.sh -2008/03/04 +2009/04/03 Enrico Gregorio diff --git a/Master/texmf-dist/doc/latex/frontespizio/examplec.tex b/Master/texmf-dist/doc/latex/frontespizio/examplec.tex index f4443a89314..81bdb5b4a1e 100644 --- a/Master/texmf-dist/doc/latex/frontespizio/examplec.tex +++ b/Master/texmf-dist/doc/latex/frontespizio/examplec.tex @@ -18,11 +18,11 @@ %% This work has the LPPL maintenance status "author-maintained". %% \documentclass[a4paper,titlepage]{book} -\usepackage{frontespizio} +\usepackage[swapnames]{frontespizio} \begin{document} \begin{frontespizio} -\Package{\usepackage{fourier}} +\Preambolo{\usepackage{fourier}} \Universita{Bologna} \Dipartimento{Matematica} \Corso[Dottorato di Ricerca]{Matematica} diff --git a/Master/texmf-dist/doc/latex/frontespizio/frontespizio.pdf b/Master/texmf-dist/doc/latex/frontespizio/frontespizio.pdf index 0c5b2bd2e47..b4d977e4a38 100644 Binary files a/Master/texmf-dist/doc/latex/frontespizio/frontespizio.pdf and b/Master/texmf-dist/doc/latex/frontespizio/frontespizio.pdf differ diff --git a/Master/texmf-dist/source/latex/frontespizio/frontespizio.dtx b/Master/texmf-dist/source/latex/frontespizio/frontespizio.dtx index 5e75faa1e8f..617f19c097a 100644 --- a/Master/texmf-dist/source/latex/frontespizio/frontespizio.dtx +++ b/Master/texmf-dist/source/latex/frontespizio/frontespizio.dtx @@ -23,7 +23,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{frontespizio} %<*package> - [2008/03/04 1.0 (Enrico Gregorio)] + [2009/04/03 1.1 (Enrico Gregorio)] % %<*driver> \PassOptionsToClass{a4paper}{article} % we need a4paper @@ -68,7 +68,7 @@ % % \fi % -% \CheckSum{937} +% \CheckSum{972} % % \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 @@ -305,6 +305,11 @@ latex tesi % Con l'opzione \opt{norules} si eliminano i filetti dal frontespizio % che normalmente vengono disegnati fra il nome dell'ateneo e quello % della facolt\`a e sopra l'indicazione dell'anno accademico. +% +% Ultima opzione, in ordine di tempo (novit\`a della versione 1.1), \`e +% \opt{swapnames} con la quale viene scambiata la posizione dei nomi +% di relatori e candidato; la posizione normale è con il nome del +% candidato a sinistra e quello del relatore a destra. % % % \section{Le opzioni} @@ -323,6 +328,11 @@ latex tesi % % \frontoption{noadvisor}% % Non viene stampato il campo dedicato a relatori e correlatori. +% +% \frontoption{swapnames}% +% Dando questa opzione il campo dedicato a relatori e correlatori +% sar\`a stampato a sinistra e quello dedicato ai candidati a destra, +% contrariamente al comportamento usuale. % % \frontoption{normal${}\mid{}$sans}% % Mutuamente esclusive. Con la seconda si sceglie per il frontespizio @@ -791,7 +801,7 @@ FACOLT\`A DI SCIENZE FUMETTISTICHE %<*verb> % \fi \begin{verbatim} -\Preambolo{\renewcommand{\frontadjustforsignatures}{4pt}} +\Preambolo{\renewcommand{\frontlogosep}{4pt}} \end{verbatim} % \iffalse % @@ -950,11 +960,11 @@ e applicazioni} % \fi % \begin{verbatim} \documentclass[a4paper,titlepage]{book} -\usepackage{frontespizio} +\usepackage[swapnames]{frontespizio} \begin{document} \begin{frontespizio} -\Package{\usepackage{fourier}} +\Preambolo{\usepackage{fourier}} \Universita{Bologna} \Dipartimento{Matematica} \Corso[Dottorato di Ricerca]{Matematica} @@ -1012,6 +1022,7 @@ exit % \fi % % \StopEventually{\PrintChanges\PrintIndex} +% \changes{v1.1}{2009/04/03}{Added swapnames option} % % \selectlanguage{english} % \section{The implementation} @@ -1065,6 +1076,12 @@ exit % \verb|\front@noadvisor| is defined if we don't want an advisor's % name. % \end{macro} +% \begin{macro}{\front@swapnames} +% \changes{v1.1}{2009/04/03}{Added macro \cs{front@swapnames} and +% option \texttt{swapnames}} +% \verb|\front@swapnames| is defined if we want to swap the advisor's +% and candidate's fields. +% \end{macro} % \begin{macro}{\front@thefont} % \begin{macro}{\fontoptionnormal} % \begin{macro}{\fontoptionsans} @@ -1092,6 +1109,7 @@ exit \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} @@ -1157,9 +1175,14 @@ exit % it; so if the package \pack{ifxetex} is not in the system we assume % that \Xe\LaTeX{} is not used; we have to bury a \verb|\let| inside a % macro, which can be safely undefined later; all \verb|\ifxetex| -% conditionals will be treated as false, of course. +% conditionals will be treated as false, of course. Since we are in a +% conditional, the definition of \cs{front@ifxetex} must be done in an +% indirect way.\changes{v1.1}{2009/04/03}{Recoded \cs{front@ifxetex}} % \begin{macrocode} -\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 @@ -1211,6 +1234,9 @@ exit \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 @@ -1263,8 +1289,7 @@ exit % only when making the front page; the \verb|\if| conditional will % always expand to nothing or be skipped altogether up to the matching % \verb|\fi| when writing the \file{frn} file; if expanded, however, -% it will put in the correct conditional when making the front page -% (the trick is due to S. von Bechtolsheim. +% it will put in the correct conditional when making the front page. % \begin{macrocode} \def\@front@#1{TT\fi\@nameuse{iffront@#1}} % \end{macrocode} @@ -1537,49 +1562,61 @@ exit % \texttt{tabular*} spanning all the text width has two columns; on % the left we put the candidate's name, on the right the advisor's % name (possibly more than one) and, if present, the coadvisor's name. +% It the option `swapnames' has been given, the two columns are exchanged. % \begin{macrocode} -\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 +% \changes{v1.1}{2009/04/03}{Added \cs{front@makecandidates}} +% \changes{v1.1}{2009/04/03}{Added \cs{front@@makeadvisors}} +\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} % \end{macrocode} 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