diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/frontespizio/README | 72 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/frontespizio/exampled.tex | 7 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/frontespizio/examplee.tex | 45 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/frontespizio/frontespizio.pdf | bin | 642382 -> 0 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/frontespizio/makedoc.sh | 17 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/frontespizio/frontespizio.dtx | 431 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/frontespizio/frontespizio.ins | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/frontespizio/frontespizio.sty | 155 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 2 |
9 files changed, 641 insertions, 92 deletions
diff --git a/Master/texmf-dist/doc/latex/frontespizio/README b/Master/texmf-dist/doc/latex/frontespizio/README index 7375f5df070..e69785064c0 100644 --- a/Master/texmf-dist/doc/latex/frontespizio/README +++ b/Master/texmf-dist/doc/latex/frontespizio/README @@ -2,7 +2,13 @@ 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.3 of the package. +This is version 1.4 of the package. + +Changes from version 1.3a (unreleased): +o Added a new frontispiece shape for the "suftesi" class + +Changes from version 1.3: +o Added an informative message in the "frn" file Changes from version 1.2: o Compatibility with memoir @@ -22,43 +28,45 @@ o Added the option `swapnames', to exchange the position of candidate and advisor names o Correction of a bug with option `onlyinclude' - Copyright 2008-2011 Enrico Gregorio +Copyright 2008-2011 Enrico Gregorio - 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 (at your option) any later version. - The latest version of this license is in - http://www.latex-project.org/lppl.txt - and version 1.3 or later is part of all distributions of LaTeX - version 2005/12/01 or later. +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 (at your option) any later version. +The latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of LaTeX +version 2005/12/01 or later. - Author: Enrico Gregorio - Enrico dot Gregorio at univr dot it +Author: Enrico Gregorio + Enrico dot Gregorio at univr dot it - This work has the LPPL maintenance status "author-maintained". +This work has the LPPL maintenance status "author-maintained". - This work consists of the following files: +This work consists of the following files: -README (this file) -frontespizio.dtx -frontespizio.ins -frontespizio.pdf + README (this file) + frontespizio.dtx + frontespizio.ins + frontespizio.pdf - and of the derived files +and of the derived files -frontespizio.sty -examplea.tex -exampleb.tex -examplec.tex -exampled.tex -makedoc.sh + frontespizio.sty + examplea.tex + exampleb.tex + examplec.tex + exampled.tex + examplee.tex + fakelogo.mp + makedoc.sh To install the distribution: o run "latex frontespizio.ins" -o run "{|pdf|xe}latex example{a,b,c,d}.tex" for a test -o run "{|pdf|xe}latex example{a,b,c,d}-frn.tex" for a test -o run "{|pdf|xe}latex example{a,b,c,d}.tex" for a test +o run "{|pdf|xe}latex example{a,b,c,d,e}.tex" for a test +o run "{|pdf|xe}latex example{a,b,c,d,e}-frn.tex" for a test +o run "{|pdf|xe}latex example{a,b,c,d,e}.tex" for a test o after the tests, you should have correct dvi or pdf example files (choose either latex, pdflatex or xelatex and compile each of the three examples) @@ -75,9 +83,13 @@ $ pdflatex exampleb-frn.tex $ pdflatex examplec.tex $ pdflatex exampled-frn.tex $ pdflatex exampled.tex -$ pdflatex examplec-frn.tex +$ pdflatex exampled-frn.tex +$ mpost fakelogo.mp +$ epstopdf --hires fakelogo.mps +$ pdflatex examplee.tex +$ pdflatex examplee-frn.tex $ pdflatex frontespizio.dtx -$ pdflatex frontespizio-frn.dtx +$ pdflatex frontespizio-frn.tex $ makeindex -s gind frontespizio $ makeindex -s gglo -o frontespizio.gls frontespizio.glo $ pdflatex frontespizio.dtx @@ -90,5 +102,5 @@ the automated script makedoc.sh by sh makedoc.sh -2011/03/08 +2011/07/18 Enrico Gregorio diff --git a/Master/texmf-dist/doc/latex/frontespizio/exampled.tex b/Master/texmf-dist/doc/latex/frontespizio/exampled.tex index ca9ae2540e9..2efafafad92 100644 --- a/Master/texmf-dist/doc/latex/frontespizio/exampled.tex +++ b/Master/texmf-dist/doc/latex/frontespizio/exampled.tex @@ -24,7 +24,7 @@ \begin{document} \begin{frontespizio} \Istituzione{University of St.\ Anford} -\Divisione{Department of typography} +\Divisione{Department of Typography} \Scuola{Ph.D. degree in \TeX{} and \LaTeX{}} \Titolo{How to prepare a\\ formal frontispiece} @@ -33,8 +33,9 @@ \Candidato{Enrico Gregorio} \NRelatore{Thesis advisor}{} \Relatore{Prof. R. J. Drofnats} -\NCorrelatore{Research supervisor}{} -\Correlatore{X. Treemunch} +\NCorrelatore{Research supervisor}{Research supervisors} +\Correlatore{J. H. Quick} +\Correlatore{B. L. User} \Piede{Thesis submitted in 2010} \end{frontespizio} \end{document} diff --git a/Master/texmf-dist/doc/latex/frontespizio/examplee.tex b/Master/texmf-dist/doc/latex/frontespizio/examplee.tex new file mode 100644 index 00000000000..b4565018f45 --- /dev/null +++ b/Master/texmf-dist/doc/latex/frontespizio/examplee.tex @@ -0,0 +1,45 @@ +%% +%% This is file `examplee.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% frontespizio.dtx (with options: `examplee') +%% +%% Copyright 2008-2011 Enrico Gregorio +%% +%% This program is provided under the terms of the +%% LaTeX Project Public License distributed from CTAN +%% archives in directory macros/latex/base/lppl.txt. +%% +%% Author: Enrico Gregorio +%% Enrico dot Gregorio at univr dot it +%% +%% This work has the LPPL maintenance status "author-maintained". +%% + +\documentclass[a4paper,titlepage]{book} +\usepackage[suftesi]{frontespizio} + +\begin{document} +\begin{frontespizio} +\Logo{fakelogo} +\Istituzione{University of St.\ Anford} +\Divisione{Department of Typography} +\Scuola{Ph.D. degree in \TeX{} and \LaTeX{}} +\Titolo{How to prepare a\\ + formal frontispiece} +\Sottotitolo{Theory and practice} +\NCandidato{Candidate} +\Candidato{Enrico Gregorio} +\NRelatore{Thesis advisor}{} +\Relatore{Prof. R. J. Drofnats} +\NCorrelatore{Research supervisor}{Research supervisors} +\Correlatore{J. H. Quick} +\Correlatore{B. L. User} +\Piede{Thesis submitted in 2010} +\end{frontespizio} +\end{document} +\endinput +%% +%% End of file `examplee.tex'. diff --git a/Master/texmf-dist/doc/latex/frontespizio/frontespizio.pdf b/Master/texmf-dist/doc/latex/frontespizio/frontespizio.pdf Binary files differdeleted file mode 100644 index 668d29e4f2c..00000000000 --- a/Master/texmf-dist/doc/latex/frontespizio/frontespizio.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/frontespizio/makedoc.sh b/Master/texmf-dist/doc/latex/frontespizio/makedoc.sh deleted file mode 100644 index 6a4a613435c..00000000000 --- a/Master/texmf-dist/doc/latex/frontespizio/makedoc.sh +++ /dev/null @@ -1,17 +0,0 @@ - -#!/bin/sh -pdflatex examplea.tex -pdflatex examplea-frn.tex -pdflatex exampleb.tex -pdflatex exampleb-frn.tex -pdflatex examplec.tex -pdflatex examplec-frn.tex -pdflatex exampled.tex -pdflatex exampled-frn.tex -pdflatex frontespizio.dtx -pdflatex frontespizio-frn.tex -makeindex -s gind frontespizio -makeindex -s gglo -o frontespizio.gls frontespizio.glo -pdflatex frontespizio.dtx -pdflatex frontespizio.dtx -exit diff --git a/Master/texmf-dist/source/latex/frontespizio/frontespizio.dtx b/Master/texmf-dist/source/latex/frontespizio/frontespizio.dtx index ee1aa8a8a81..44d4d8e93cb 100644 --- a/Master/texmf-dist/source/latex/frontespizio/frontespizio.dtx +++ b/Master/texmf-dist/source/latex/frontespizio/frontespizio.dtx @@ -23,7 +23,7 @@ %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01] %<package>\ProvidesPackage{frontespizio} %<*package> - [2011/03/08 1.3 (Enrico Gregorio)] + [2011/07/18 1.4 (Enrico Gregorio)] %</package> %<*driver> \PassOptionsToClass{a4paper}{article} % we need a4paper @@ -72,7 +72,7 @@ %</driver> % \fi % -% \CheckSum{1071} +% \CheckSum{1331} % % \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 @@ -94,17 +94,19 @@ % \changes{v1.2}{2010/06/25}{Added `noinputenc' and `nouppercase' % options; added `Preambolo*' environment; various implementation changes} % \changes{v1.3}{2011/03/08}{Added support for memoir} +% \changes{v1.3a}{2011/03/08}{Added info message in the \file{frn} file} +% \changes{v1.4}{2011/07/18}{Added option `suftesi'; updated the documentation} % \GetFileInfo{frontespizio.dtx} % -% \DoNotIndex{\newcommand,\newenvironment,\def,\begin,\vskip} +% \DoNotIndex{\newcommand,\newenvironment,\def,\begin,\vskip,\ } % \DoNotIndex{\DeclareOption,\ExecuteOptions,\RequirePackage} % \DoNotIndex{\@@end,\@empty,\@ifclassloaded,\@nameuse,\@nil} % \DoNotIndex{\@undefined,\\,\`,\addtocounter,\advance,\bfseries} % \DoNotIndex{\centering,\closeout,\define@key,\documentclass} % \DoNotIndex{\edef,\else,\end,\endinput,\endtitlepage,\expandafter} -% \DoNotIndex{\extracolsep,\fi,\fill,\fontsize,\g@addto@macro} +% \DoNotIndex{\extracolsep,\fi,\fill,\fontsize,\g@addto@macro,\toks} % \DoNotIndex{\hrule,\hspace,\if,\if@twoside,\ifcase,\ifdefined} -% \DoNotIndex{\iffalse,\IfFileExists,\ifnum,\ifx,\immediate} +% \DoNotIndex{\iffalse,\IfFileExists,\ifnum,\ifx,\immediate,\setcounter} % \DoNotIndex{\jobname,\let,\long,\MakeUppercase,\MessageBreak} % \DoNotIndex{\newcount,\newif,\newpage,\newtoks,\newwrite,\next} % \DoNotIndex{\noexpand,\nofiles,\normalfont,\normalsize,\null} @@ -117,7 +119,8 @@ % \DoNotIndex{\CurrentOption,\AtEndDocument,\@ne,\c@page,\m@ne} % \DoNotIndex{\@firstofone,\@gobble,\@makeother,\begingroup,\endgroup} % \DoNotIndex{\eTeXversion,\hbox,\hsize,\includegraphics,\newlinechar} -% \DoNotIndex{\titlepage,\vss,\vtop,\xdef} +% \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr} +% \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand} % % \begin{frontespizio} % \Universita{Pietrascambio} @@ -253,7 +256,7 @@ % come argomenti di comandi \cs{Relatore} o % \cs{Correlatore}.\footnote{Aggiungere i titoli onorifici o % professionali, mi raccomando! Altrimenti i chiarissimi professori -% potrebbero offendersi.~\texttt{:-)}} Il correlatore \`e colui che +% potrebbero offendersi.~\texttt{;-)}} Il correlatore \`e colui che % collabora alla direzione del lavoro di tesi, non quello che fa le % pulci alla tesi stessa prima dell'esame finale, propriamente % \emph{controrelatore}, il cui nome \emph{non} va nel frontespizio. @@ -316,13 +319,6 @@ % di relatori e candidato; la posizione normale \`e con il nome del % candidato a sinistra e quello del relatore a destra. % -% Novit\`a della versione 1.2 sono le opzioni \opt{nouppercase} e -% \opt{noinputenc}; la prima serve per non trasformare in maiuscolo il -% nome della facolt\`a, la seconda per uno scopo un po' recondito che -% vedremo pi\`u avanti, legato al fatto che ora il pacchetto rispetta -% la codifica di input del documento principale anche nel -% documento~\file{frn}. -% % % \section{Le opzioni} % @@ -335,6 +331,11 @@ % documento~\file{frn}: quando sappiamo che \`e definitivo non vale la % pena riscrivere il file ogni volta. % +% \frontoption{standard${}\mid{}$suftesi} +% Mutuamente esclusive. Con la seconda si usa la forma del +% frontespizio adatta alla classe \pack{suftesi}, si veda la +% sezione~\ref{suftesi}. +% % \frontoption{signatures}% % Nel campo dedicato a relatori e correlatori vengono lasciati gli spazi % per le firme. @@ -695,6 +696,11 @@ % \cs{frontfootfont} & % Neretto, 12/14 & % Per scrivere l'anno accademico\\ +% \midrule +% \cs{fronttitlecolor} & +% Maroon & +% Il colore del titolo con l'opzione\\ +% && \texttt{suftesi}\\ % \bottomrule % \end{tabular} % \end{table} @@ -735,6 +741,37 @@ %\Preambolo{\renewcommand{\frontcandidatesep}{1cm}} %\end{verbatim} % +% \section{L'opzione \texttt{suftesi}}\label{suftesi} +% +% Ivan Valbusa ha creato la classe \pack{suftesi} e ha impostato una +% forma di frontespizio che usa questo pacchetto. Per migliorare la +% compatibilità, si è deciso di inserire nel pacchetto il codice della +% classe \pack{suftesi} relativo al frontespizio. Questa forma può +% essere usata indipendentemente dalla classe; non occorre altro che +% specificare l'opzione alla chiamata del pacchetto. +% +% Va però notato che questa forma di frontespizio è più rigida di +% quella standard, nel senso che non permette cambiamenti ai font +% usati, riguardo a grandezza e forma: prendere o lasciare. Il resto +% funziona (quasi) allo stesso modo. Si veda l'ultimo degli esempi. +% +% Per questa forma di frontespizio è consigliata la presenza del logo, +% che però non è obbligatoria. Si noti che non ha alcuna rilevanza +% l'argomento opzionale dato a |\Logo|, che verrà sempre stampato con +% una dimensione fissa. Non si usi il comando |\Filigrana|, sebbene +% non sia vietato e si eviti l'uso di |\Margini|. Con questa forma di +% frontespizio è possibile modificare il colore del titolo, che è +% usualmente un marroncino, agendo sul comando |\fronttitlecolor| +% esattamente come si farebbe per i font. Sono disponibili tutti i +% colori predefiniti con l'opzione \texttt{svgnames} di \pack{xcolor}, +% meglio però non essere troppo fantasiosi: l'unica vera alternativa è +% scrivere +%\begin{verbatim} +%\Preambolo{\renewcommand{\fronttitlecolor}{black}} +%\end{verbatim} +% +% +% % \section{\Xe\LaTeX} % % \`E possibile usare \Xe\TeX{}, ovviamente nella forma \Xe\LaTeX, per @@ -758,11 +795,59 @@ % nelle codifiche \textsc{utf}-8 (oppure \textsc{utf}-16). Quindi se % il documento principale \`e da compilare con \textsc{pdf}\LaTeX{} si % dovr\`a caricare \pack{inputenc} con l'opzione \opt{utf8}, e questo -% \`e proprio il caso in cui al pacchetto \pack{frontespizio} deve -% essere passata l'opzione \pack{noinputenc}. -% +% \`e proprio un caso in cui potrebbe essere necessario passare al +% pacchetto \pack{frontespizio} l'opzione \pack{noinputenc}. % % +% \section{\LaTeX{}mk} +% +% È possibile automatizzare la creazione del frontespizio mediante lo +% \emph{script} \texttt{latexmk} (si ringrazia l'autore John Collins +% per i preziosi suggerimenti); si rimanda alla documentazione per +% capire come funziona lo script, qui si presuppone che lo si conosca +% già. Vediamo i vari casi: (1)~il~frontespizio è composto con +% \texttt{pdflatex}; (2)~il~frontespizio è composto con \texttt{latex} +% per ottenere in seguito un \textsc{eps}; (3)~il~frontespizio è +% composto con \texttt{xelatex}. In tutti i casi la compilazione va +% lanciata con +%\begin{flushleft} +%\texttt{latexmk} \meta{opzioni} \texttt{tesi} +%\end{flushleft} +% dove \meta{opzioni} sono le usuali che vengono date a +% \texttt{latexmk} e \file{tesi.tex} sta per il nome del nostro +% documento. +% +% \subsection{\texttt{pdflatex}} +% Si crei il file \file{latexmkrc} che contenga il seguente codice: +%\begin{verbatim} +%add_cus_dep( "tex", "pdf", 0, "frn2pdf" ); +% sub frn2pdf { return system( "latexmk -pdf $_[0]" ); } +%\end{verbatim} +% Se già si usa un \file{latexmkrc} si aggiungano quelle due righe +% alla fine. +% +% \subsection{\texttt{latex} e \texttt{dvips}} +% Si crei il file \file{latexmkrc} che contenga il seguente codice: +%\begin{verbatim} +%add_cus_dep( "tex", "eps", 0, "frn2eps" ); +% sub frn2eps { +% system( "latexmk -dvi -ps- -pdf- $_[0]" ); +% return system( "dvips -o $_[0].eps $_[0].dvi" ); +% } +%\end{verbatim} +% Se già si usa un \file{latexmkrc} si aggiungano quelle due righe +% alla fine. +% +% \subsection{\texttt{xelatex}} +% Si crei il file \file{latexmkrc} che contenga il seguente codice: +%\begin{verbatim} +%add_cus_dep( "tex", "pdf", 0, "frn2pdf" ); +% sub frn2pdf { return system( "xelatex $_[0]" ); } +%\end{verbatim} +% Se già si usa un \file{latexmkrc} si aggiungano quelle due righe +% alla fine. +% +% % \section{Limitazioni e incompatibilit\`a} % % Gli altri pacchetti caricati sono \pack{ifpdf}, \pack{graphicx}, @@ -779,6 +864,9 @@ % della propria distribuzione per sapere come produrre il file eps in % modo corretto. % +% Il documento \file{frn} usa il pacchetto \pack{xcolor} con l'opzione +% \texttt{svgnames}. Non si carichi anche \pack{color} con |\Preambolo|. +% % Si noti che il pacchetto non \`e compatibile con \pack{vmargin}; se % si desidera modificare l'impostazione tipografica del documento, si % usi \pack{geometry}, pi\`u potente e facile. @@ -789,6 +877,34 @@ % \pack{memoir}. Funziona anche con \pack{scrbook} e \pack{scrreprt}. % % +% \section{Novità nelle versioni successive alla prima} +% +% \paragraph{Versione 1.1} +% È stata introdotta l'opzione \opt{swapnames} per invertire l'ordine +% di relatori e candidato. +% +% \paragraph{Versione 1.2} +% Nella versione 1.2 sono state aggiunte le opzioni \opt{nouppercase} +% e \opt{noinputenc}; la prima serve per non trasformare in maiuscolo +% il nome della facolt\`a, la seconda per uno scopo un po' recondito +% che vedremo pi\`u avanti, legato al fatto che ora il pacchetto +% rispetta la codifica di input del documento principale anche nel +% documento~\file{frn}. È stato aggiunto anche l'ambiente +% \texttt{Preambolo*} per rendere più comoda la scrittura di comandi +% nel preambolo del documento~\file{frn}. +% +% \paragraph{Versione 1.3} +% Le sole modifiche sono la compatibilità con la classe \pack{memoir} +% e la scrittura di un messaggio informativo che rende possibile la +% cooperazione con \pack{latexmk}. +% +% \paragraph{Versione 1.4} +% Viene introdotta la nozione di \emph{forma} del frontespizio, con la +% possibilità di scegliere tra le opzioni \opt{standard} e +% \opt{suftesi}. Questo apre la possibilità di altri stili che +% potranno essere disponibili in versioni successive. +% +% % \section{Soluzione del giochino} % % L'etimologia di `Stanford' \`e `stan$+$ford'; l'antico inglese @@ -921,7 +1037,7 @@ e applicazioni} \begin{document} \begin{frontespizio} \Istituzione{University of St.\ Anford} -\Divisione{Department of typography} +\Divisione{Department of Typography} \Scuola{Ph.D. degree in \TeX{} and \LaTeX{}} \Titolo{How to prepare a\\ formal frontispiece} @@ -930,8 +1046,9 @@ e applicazioni} \Candidato{Enrico Gregorio} \NRelatore{Thesis advisor}{} \Relatore{Prof. R. J. Drofnats} -\NCorrelatore{Research supervisor}{} -\Correlatore{X. Treemunch} +\NCorrelatore{Research supervisor}{Research supervisors} +\Correlatore{J. H. Quick} +\Correlatore{B. L. User} \Piede{Thesis submitted in 2010} \end{frontespizio} \end{document} @@ -944,7 +1061,59 @@ e applicazioni} % % \includeex{exampled-frn} % \newpage +% +% \iffalse +%<*fakelogo> +prologues:=3; +outputtemplate:="%j.mps"; +input boxes; +beginfig(1); +draw fullcircle scaled (2.5cm + 1pt) withcolor white; +draw fullcircle scaled 2.5cm; +draw fullcircle scaled 2.3cm; +draw thelabel(btex \vbox{\sevenrm\halign{\hfil#\hfil\cr University of\cr + St. Anford\cr Seal\cr}} etex, origin); +endfig; +end +%</fakelogo> +% \fi +% +% \iffalse +%<*examplee> +% \fi +% \begin{verbatim} +\documentclass[a4paper,titlepage]{book} +\usepackage[suftesi]{frontespizio} + +\begin{document} +\begin{frontespizio} +\Logo{fakelogo} +\Istituzione{University of St.\ Anford} +\Divisione{Department of Typography} +\Scuola{Ph.D. degree in \TeX{} and \LaTeX{}} +\Titolo{How to prepare a\\ + formal frontispiece} +\Sottotitolo{Theory and practice} +\NCandidato{Candidate} +\Candidato{Enrico Gregorio} +\NRelatore{Thesis advisor}{} +\Relatore{Prof. R. J. Drofnats} +\NCorrelatore{Research supervisor}{Research supervisors} +\Correlatore{J. H. Quick} +\Correlatore{B. L. User} +\Piede{Thesis submitted in 2010} +\end{frontespizio} +\end{document} +% \end{verbatim} +% \iffalse +%</examplee> +% \fi % +% \vspace{4ex} +% +% \includeex{examplee-frn} +% \newpage +% % \section{A shell script to compile the documentation} % Running \texttt{latex} on \file{frontespizio.ins} produces also % \file{makedoc.sh} which can be run, on Unix systems, by one of the @@ -967,6 +1136,10 @@ pdflatex examplec.tex pdflatex examplec-frn.tex pdflatex exampled.tex pdflatex exampled-frn.tex +mpost fakelogo.mp +epstopdf --hires fakelogo.mps +pdflatex examplee.tex +pdflatex examplee-frn.tex pdflatex frontespizio.dtx pdflatex frontespizio-frn.tex makeindex -s gind frontespizio @@ -1073,6 +1246,9 @@ exit % order to include an external file (similarly to pdfpages). % \end{macro} % \begin{macro}{\front@otheroptions} +% \changes{v1.4}{2011/07/18}{Added options \texttt{standard} and +% \texttt{suftesi}} +% \changes{v1.4}{2011/07/18}{Added command \cs{fronttitlecolor} for suftesi} % \changes{v1.2}{2010/06/25}{Added macro \cs{front@otheroptions}} % \changes{v1.2}{2010/06/25}{Deleted macro \cs{front@grfdriver}} % In \cs{front@otheroptions} we load the all other options, to be @@ -1091,6 +1267,9 @@ exit \DeclareOption{norules}{\let\front@norules=T} \DeclareOption{nouppercase}{\let\front@nouppercase=T} \DeclareOption{noinputenc}{\let\front@noinputenc=T} +\DeclareOption{standard}{\def\front@shape{standard}} +\DeclareOption{suftesi}{\def\front@shape{suftesi}\def\fronttitlecolor{Maroon}} +% \newif\iffront@include \DeclareOption{onlyinclude}{\front@includetrue\ExecuteOptions{nowrite}} \let\front@otheroptions\@empty @@ -1100,7 +1279,7 @@ exit % Now we choose the default options; we want to write the \file{frn} file % and roman fonts. % \begin{macrocode} -\ExecuteOptions{write,normal} +\ExecuteOptions{write,normal,standard} \ProcessOptions\relax % \end{macrocode} % \subsection{Required packages and service macros} @@ -1188,21 +1367,39 @@ exit % \subsection{Initialization of the \file{frn} file} % Now we initialize the \file{frn} file by setting the class and the % margins. If a driver option has been given we want to load -% \pack{graphicx} in the frn file with the right driver; we have to do +% \pack{graphicx} in the \file{frn} file with the right driver; we have to do % this before loading the present package, which always requires % \pack{graphicx}. Meanwhile, we load also the \pack{inputenc} % package with the same options given in the main document; this can % be overrided with the \opt{noinputenc} package option. Nothing is % done if \pack{inputenc} is not loaded in the document. +% \changes{v1.3a}{2011/03/08}{Added info message in the \file{frn} file} % \begin{macrocode} +\front@expwrite{\@percentchar\@percentchar\space This file has been + automatically generated by `frontespizio'.} +\front@expwrite{\@percentchar\@percentchar\space Don't use it as a model for a + new frontispiece, use the} +\front@expwrite{\@percentchar\@percentchar\space `frontespizio' + environment in you document instead.} \front@write{\documentclass[titlepage]{article}} \ifdefined\front@noinputenc\else \ifdefined\inputencodingname \front@expwrite{\string\usepackage[\inputencodingname]{inputenc}} \fi \fi -\front@write{\usepackage[a4paper,% - left=1cm,bottom=1.5cm,right=1cm,top=1cm]{geometry}} +% \end{macrocode} +% Now we define the standard margins for the two shapes; in case we +% add other shapes, something should be done here. +% \changes{v1.4}{2011/07/18}{Adapted the writing of parameters for +% geometry for the new shape options} +% \begin{macrocode} +\def\front@geometry@standard{% + \front@write{\usepackage[a4paper,left=1cm,bottom=1.5cm,% + right=1cm,top=1cm]{geometry}}} +\def\front@geometry@suftesi{% + \front@write{\usepackage[a4paper,textwidth=312pt,includehead,% + textheight=624pt,right=90pt,vmarginratio=1:2]{geometry}}} +\@nameuse{front@geometry@\front@shape} % \end{macrocode} % \begin{macro}{\front@processkeys} % If the user has specified an unusual driver for \pack{graphicx}, we @@ -1213,13 +1410,15 @@ exit % \begin{macrocode} \ifx\front@otheroptions\@empty \front@write{\usepackage{graphicx}} + \front@write{\usepackage[svgnames]{xcolor}} \else \begingroup \def\KV@errx#1{% \PackageError{frontespizio}{Key #1} {The only allowed key is `driver'; the given key will be ignored.% \MessageBreak Type \space<return> \space to proceed.}} - \define@key{front}{driver}{\front@write{\usepackage[#1]{graphicx}}} + \define@key{front}{driver}{\front@write{\usepackage[#1]{graphicx}}% + \front@write{\usepackage[#1,svgnames]{xcolor}}} \edef\front@processkeys{\noexpand\setkeys{front}{\front@otheroptions}} \front@processkeys \endgroup @@ -1229,8 +1428,9 @@ exit % Set the options in the \file{frn} file: there we don't want to be % writing the \file{frn} file, of course, nor we need aux files, but % we add the private option. +% \changes{v1.4}{2011/07/18}{We write also the shape option to the \file{frn} file} % \begin{macrocode} -\def\front@theoptions{nowrite,infront} +\edef\front@theoptions{nowrite,infront,\front@shape} \ifdefined\front@signatures \g@addto@macro\front@theoptions{,signatures} \fi @@ -1370,7 +1570,7 @@ exit % \end{macrocode} % If we are typesetting the front page, then we give the commands % their real meaning, i.e., we define macros which will be used in -% \cs{preparefrontpage}. +% \cs{preparefrontpage...}. % \begin{macrocode} \newcommand{\Rientro}[1]{\def\front@push{\hspace{#1}}} \newcommand{\Margini}[4]{\geometry{left=#1,bottom=#2,right=#3,top=#4}} @@ -1509,10 +1709,13 @@ exit % \end{macro} % % \subsection{The typesetting} -% \begin{macro}{\preparefrontpage} +% \changes{v1.4}{2011/07/18}{The command written in the \file{frn} file +% depends now on the shape option} +% \begin{macro}{\preparefrontpagestandard} +% \changes{v1.4}{2011/07/18}{Added `standard' shape} % Here is where the typesetting is defined. % \begin{macrocode} -\def\preparefrontpage{% +\def\preparefrontpagestandard{% \titlepage\front@font \centering \par @@ -1658,6 +1861,168 @@ exit \par} \endtitlepage} % \end{macrocode} +% \begin{macro}{\preparefrontpagesuftesi} +% \changes{v1.4}{2011/07/18}{Added suftesi shape} +% This shape is due to Ivan Valbusa, who created it for his class +% \pack{suftesi}. First of all we do some initialization, this +% shape is more rigid than the standard one. +% \begin{macrocode} +\def\preparefrontpagesuftesi{% + \titlepage\front@font + \renewcommand{\frontinstitutionfont}{\normalfont} + \renewcommand{\frontdivisionfont}{\large} + \renewcommand{\frontpretitlefont}{\normalsize\sffamily} + \renewcommand{\fronttitlefont}{\huge\sffamily} + \renewcommand{\frontsubtitlefont}{\normalsize\sffamily} + \renewcommand{\frontnamesfont}{\normalfont} + \renewcommand{\frontfixednamesfont}{\normalsize\sffamily} + \renewcommand{\frontfootfont}{\normalfont} +% \end{macrocode} +% The paragraph indentation is zero. +% \begin{macrocode} + \parindent\z@ +% \end{macrocode} +% First block: logo and institutions +% \begin{macrocode} + \makebox[\textwidth][r]{% + \begin{minipage}{6pc} + \if\@front@{logo} + {\includegraphics[height=\textwidth]{\front@logo}} + \else + \hspace*{\textwidth} + \fi + \end{minipage}% + \hspace{2.5pc}% + \begin{minipage}{\dimexpr\textwidth-4pc\relax} + \frontinstitutionfont + \if\@front@{inst} + \front@instit + \else + Universit\`a degli Studi di \front@univ + \fi\par + \frontdivisionfont + \if\@front@{multiple} + \front@multiple + \else + \if\@front@{division} + \front@division + \else + \front@thefacoldip\ di \front@facoldip + \fi + \fi\par + \frontinstitutionfont + \vskip1ex\hrule\vskip1.2ex + \if\@front@{school} + \front@school + \else + Corso di \front@cl + \fi\par + \end{minipage}\hspace*{4pc}}\par + \vspace{\stretch{5}} +% \end{macrocode} +% Second block: the specification of the thesis' kind. +% \begin{macrocode} + \if\@front@{titoletto} + {\frontpretitlefont\front@titoletto\par} + \fi + \vspace{\stretch{2}} +% \end{macrocode} +% Third block: the title and subtitle. +% \begin{macrocode} + {\fronttitlefont\color{\fronttitlecolor}\front@title\par} + \if\@front@{sottotit} + \vspace{4ex} + {\frontsubtitlefont\front@subtitle\par} + \fi + \vspace{\stretch{3}} +% \end{macrocode} +% We set up the block for the candidate's name (or candidates' names). +% \begin{macrocode} + \def\front@makecandidates{% + \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} + } +% \end{macrocode} +% We set up the block for advisors and coadvisors. +% \begin{macrocode} + \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} + \vspace{\stretch{1}} +% \end{macrocode} +% Third block: candidate and advisors. +% \begin{macrocode} + \frontnamesfont + \ifdefined\front@swapnames% relatori candidati + \front@makeadvisors\par + \vspace{3ex} + \front@makecandidates\par + \else% candidati relatori + \front@makecandidates\par + \vspace{3ex} + \front@makeadvisors\par + \fi + \vfill + \ifdefined\front@signatures\vskip\frontadjustforsignatures\fi + \unless\ifdefined\front@norules\fi + \vspace{\stretch{5}} +% \end{macrocode} +% Fourth block: academic year +% \begin{macrocode} + \frontfootfont + \if\@front@{foot} + \front@foot + \else + Anno Accademico \front@anno + \fi + \par +% \end{macrocode} +% Now we close the title page. +% \begin{macrocode} +\endtitlepage} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\preparefrontpage} +% \changes{v1.4}{2011/07/18}{Old macro \cs{preparefrontpage} is kept +% for compatibility} +% For compatibility with old \file{frn} files, we define also the old macro +% \begin{macrocode} +\let\preparefrontpage\preparefrontpagestandard +% \end{macrocode} +% \end{macro} +% % The following \cs{else} matches the |\ifdefined\front@infront| % several lines ahead % \begin{macrocode} @@ -1666,7 +2031,9 @@ exit % If we get here, we are neither compiling the frontispiece, nor % writing to the \file{frn} file, so we provide dummy definitions for % all the user level commands. +% \changes{v1.4}{2011/07/18}{Added missing definition for \texttt{Preambolo*}} % \begin{macrocode} +\newenvironment{Preambolo*}{\Collect@Body\@gobble}{} \newcommand{\Preambolo}[1]{} \newcommand{\Rientro}[1]{} \newcommand{\Margini}[4]{} @@ -1772,14 +2139,16 @@ exit \IfFileExists{\jobname-frn.\front@ext} {\AtBeginShipoutNext{\AtBeginShipoutUpperLeft{% \vbox to\z@{\hbox{\includegraphics{\jobname-frn}}\vss}}}} - {\@front@messagetrue}% + {\PackageWarningNoLine{frontespizio} + {Missing file \jobname-frn.\front@ext}% + \@front@messagetrue}% \afterpage{\thispagestyle{empty}}% \endtitlepage \if@twoside\front@cp\fi } \def\endfrontespizio{% \front@write{\begin{document}} - \front@write{\preparefrontpage} + \front@expwrite{\string\preparefrontpage\front@shape} \front@write{\end{document}} \iffront@write\immediate\closeout\front@out\fi \ifdefined\front@mdfiveold diff --git a/Master/texmf-dist/source/latex/frontespizio/frontespizio.ins b/Master/texmf-dist/source/latex/frontespizio/frontespizio.ins index 483ca91ea97..fc5dc92baae 100644 --- a/Master/texmf-dist/source/latex/frontespizio/frontespizio.ins +++ b/Master/texmf-dist/source/latex/frontespizio/frontespizio.ins @@ -47,7 +47,9 @@ \file{exampleb.tex}{\from{frontespizio.dtx}{exampleb}}% \file{examplec.tex}{\from{frontespizio.dtx}{examplec}}% \file{exampled.tex}{\from{frontespizio.dtx}{exampled}}% - \nopreamble\nopostamble + \file{fakelogo.mp}{\from{frontespizio.dtx}{fakelogo}}% + \file{examplee.tex}{\from{frontespizio.dtx}{examplee}}% + \nopreamble\nopostamble \file{makedoc.sh}{\from{frontespizio.dtx}{thedoc}}% } diff --git a/Master/texmf-dist/tex/latex/frontespizio/frontespizio.sty b/Master/texmf-dist/tex/latex/frontespizio/frontespizio.sty index 14ce8b1a6ea..a492140b0b8 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}[2005/12/01] \ProvidesPackage{frontespizio} - [2011/03/08 1.3 (Enrico Gregorio)] + [2011/07/18 1.4 (Enrico Gregorio)] \def\@not@eTeX{% \PackageError{frontespizio} @@ -47,12 +47,14 @@ \DeclareOption{norules}{\let\front@norules=T} \DeclareOption{nouppercase}{\let\front@nouppercase=T} \DeclareOption{noinputenc}{\let\front@noinputenc=T} +\DeclareOption{standard}{\def\front@shape{standard}} +\DeclareOption{suftesi}{\def\front@shape{suftesi}\def\fronttitlecolor{Maroon}} \newif\iffront@include \DeclareOption{onlyinclude}{\front@includetrue\ExecuteOptions{nowrite}} \let\front@otheroptions\@empty \DeclareOption*{\expandafter\g@addto@macro\expandafter\front@otheroptions \expandafter{\CurrentOption,}} -\ExecuteOptions{write,normal} +\ExecuteOptions{write,normal,standard} \ProcessOptions\relax \RequirePackage{afterpage} \RequirePackage{graphicx} @@ -94,28 +96,41 @@ \long\def\front@write#1{} \let\front@expwrite\front@write \fi +\front@expwrite{\@percentchar\@percentchar\space This file has been + automatically generated by `frontespizio'.} +\front@expwrite{\@percentchar\@percentchar\space Don't use it as a model for a + new frontispiece, use the} +\front@expwrite{\@percentchar\@percentchar\space `frontespizio' + environment in you document instead.} \front@write{\documentclass[titlepage]{article}} \ifdefined\front@noinputenc\else \ifdefined\inputencodingname \front@expwrite{\string\usepackage[\inputencodingname]{inputenc}} \fi \fi -\front@write{\usepackage[a4paper,% - left=1cm,bottom=1.5cm,right=1cm,top=1cm]{geometry}} +\def\front@geometry@standard{% + \front@write{\usepackage[a4paper,left=1cm,bottom=1.5cm,% + right=1cm,top=1cm]{geometry}}} +\def\front@geometry@suftesi{% + \front@write{\usepackage[a4paper,textwidth=312pt,includehead,% + textheight=624pt,right=90pt,vmarginratio=1:2]{geometry}}} +\@nameuse{front@geometry@\front@shape} \ifx\front@otheroptions\@empty \front@write{\usepackage{graphicx}} + \front@write{\usepackage[svgnames]{xcolor}} \else \begingroup \def\KV@errx#1{% \PackageError{frontespizio}{Key #1} {The only allowed key is `driver'; the given key will be ignored.% \MessageBreak Type \space<return> \space to proceed.}} - \define@key{front}{driver}{\front@write{\usepackage[#1]{graphicx}}} + \define@key{front}{driver}{\front@write{\usepackage[#1]{graphicx}}% + \front@write{\usepackage[#1,svgnames]{xcolor}}} \edef\front@processkeys{\noexpand\setkeys{front}{\front@otheroptions}} \front@processkeys \endgroup \fi -\def\front@theoptions{nowrite,infront} +\edef\front@theoptions{nowrite,infront,\front@shape} \ifdefined\front@signatures \g@addto@macro\front@theoptions{,signatures} \fi @@ -293,7 +308,7 @@ \else \let\front@MakeUppercase\MakeUppercase \fi -\def\preparefrontpage{% +\def\preparefrontpagestandard{% \titlepage\front@font \centering \par @@ -403,7 +418,127 @@ \fi \par} \endtitlepage} +\def\preparefrontpagesuftesi{% + \titlepage\front@font + \renewcommand{\frontinstitutionfont}{\normalfont} + \renewcommand{\frontdivisionfont}{\large} + \renewcommand{\frontpretitlefont}{\normalsize\sffamily} + \renewcommand{\fronttitlefont}{\huge\sffamily} + \renewcommand{\frontsubtitlefont}{\normalsize\sffamily} + \renewcommand{\frontnamesfont}{\normalfont} + \renewcommand{\frontfixednamesfont}{\normalsize\sffamily} + \renewcommand{\frontfootfont}{\normalfont} + \parindent\z@ + \makebox[\textwidth][r]{% + \begin{minipage}{6pc} + \if\@front@{logo} + {\includegraphics[height=\textwidth]{\front@logo}} + \else + \hspace*{\textwidth} + \fi + \end{minipage}% + \hspace{2.5pc}% + \begin{minipage}{\dimexpr\textwidth-4pc\relax} + \frontinstitutionfont + \if\@front@{inst} + \front@instit + \else + Universit\`a degli Studi di \front@univ + \fi\par + \frontdivisionfont + \if\@front@{multiple} + \front@multiple + \else + \if\@front@{division} + \front@division + \else + \front@thefacoldip\ di \front@facoldip + \fi + \fi\par + \frontinstitutionfont + \vskip1ex\hrule\vskip1.2ex + \if\@front@{school} + \front@school + \else + Corso di \front@cl + \fi\par + \end{minipage}\hspace*{4pc}}\par + \vspace{\stretch{5}} + \if\@front@{titoletto} + {\frontpretitlefont\front@titoletto\par} + \fi + \vspace{\stretch{2}} + {\fronttitlefont\color{\fronttitlecolor}\front@title\par} + \if\@front@{sottotit} + \vspace{4ex} + {\frontsubtitlefont\front@subtitle\par} + \fi + \vspace{\stretch{3}} + \def\front@makecandidates{% + \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} + } + \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} + \vspace{\stretch{1}} + \frontnamesfont + \ifdefined\front@swapnames% relatori candidati + \front@makeadvisors\par + \vspace{3ex} + \front@makecandidates\par + \else% candidati relatori + \front@makecandidates\par + \vspace{3ex} + \front@makeadvisors\par + \fi + \vfill + \ifdefined\front@signatures\vskip\frontadjustforsignatures\fi + \unless\ifdefined\front@norules\fi + \vspace{\stretch{5}} + \frontfootfont + \if\@front@{foot} + \front@foot + \else + Anno Accademico \front@anno + \fi + \par +\endtitlepage} +\let\preparefrontpage\preparefrontpagestandard \else +\newenvironment{Preambolo*}{\Collect@Body\@gobble}{} \newcommand{\Preambolo}[1]{} \newcommand{\Rientro}[1]{} \newcommand{\Margini}[4]{} @@ -471,14 +606,16 @@ \IfFileExists{\jobname-frn.\front@ext} {\AtBeginShipoutNext{\AtBeginShipoutUpperLeft{% \vbox to\z@{\hbox{\includegraphics{\jobname-frn}}\vss}}}} - {\@front@messagetrue}% + {\PackageWarningNoLine{frontespizio} + {Missing file \jobname-frn.\front@ext}% + \@front@messagetrue}% \afterpage{\thispagestyle{empty}}% \endtitlepage \if@twoside\front@cp\fi } \def\endfrontespizio{% \front@write{\begin{document}} - \front@write{\preparefrontpage} + \front@expwrite{\string\preparefrontpage\front@shape} \front@write{\end{document}} \iffront@write\immediate\closeout\front@out\fi \ifdefined\front@mdfiveold diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 40003d53bb6..851eed98893 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -543,7 +543,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'msu-thesis', "die 'skipping, use msuthesis'", 'msuthesis', "&MAKEflatten", 'mtp2lite', "die 'skipping, nonfree'", - 'mtx', "die 'skipping, problematic musixtex binaries'", + 'mtx', "die 'skipping, pascal musixtex binaries'", 'multibox', "die 'skipping, noinfo license, author deceased'", 'multido', "&MAKEpst", 'multirow', "&MAKEflatten", |