diff options
author | Karl Berry <karl@freefriends.org> | 2013-09-01 22:41:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-09-01 22:41:48 +0000 |
commit | d796117a8cface8ab25eda5ebc564c94e145c8a8 (patch) | |
tree | a8642b656094b4475741ec1ff9ddf982c579ce5e /Master | |
parent | e757e4bfb6f6d3fd6faf03ebe3a334838c29c9f6 (diff) |
toptesi (1sep13)
git-svn-id: svn://tug.org/texlive/trunk@31558 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
16 files changed, 259 insertions, 113 deletions
diff --git a/Master/texmf-dist/doc/latex/toptesi/README b/Master/texmf-dist/doc/latex/toptesi/README index eaa348f6940..4fb39bf56c7 100644 --- a/Master/texmf-dist/doc/latex/toptesi/README +++ b/Master/texmf-dist/doc/latex/toptesi/README @@ -1,4 +1,4 @@ -TOPtesi bundle version 5.71 of 2013/03/28 +TOPtesi bundle version 5.73 of 2013/09/01 Copyright 2013 Claudio Beccari LaTeX Project Public Licence LPPL v.1.3 (or later) @@ -8,18 +8,20 @@ supported by LaTeX: the bundle is constructed to support multilanguage use). The infix strings may be selected and specified at will by means -of a configuration file, so as to customize the layout of the +of a configuration file, so as to customize the information of the front page to the requirements of a specific university and a specific language. Thanks to its language management, the bundle is suited for multilanguage theses that are more and more frequent thanks -to the double degree programs of the European Union Erasmus programs. +to the double degree programs of the European Union Erasmus programs +or Life Long Learning programs. This important upgrade is intended to be compliant with XeLaTeX and the documentation explains how to obtain PDF/A-1b archivable files from both pdfLaTeX and XeLaTeX. -The version number 5.70 is a stable version. +Since version number 5.70 this is a stable bundle, although sume +corrections are introduced from time to time. For installation, if the package is not already installed in your TeX system distribution, either read the Italian documentation in @@ -38,20 +40,21 @@ Move the .txt, .pdf, files and this README file to If the cited folders do not exist, create them. -The .../texmf folder is your personal texmf folder rooted in your -home directory: ~ on Linux; ~/Library on Mac OS X; on different -paths on Windows systems, all of them containing in one form or -another your login name. -. -If the package is already installed the texmf folder should be the -<prefix>/texmf-dist system one. But in this case you don't need to -decompress anything and move files around. Possibly check if in the -CTAN repository there is a newer version and, in case, use your package -manager to upgrade your installation, but don't ever move or change -anything in the TeX system directories. +For a personal installation, the /texmf folder is your personal +texmf folder rooted in your home directory: ~ on Linux; ~/Library +on Mac OS X; on a path with different names on different Windows +systems, all of them containing in one form or another your login name. If you are running a Windows platform change the slashes into backslashes and prefix all paths with the drive letter and any other specific prefix -that is present in your texmf tree. +that is present in your texmf tree.In any case remember to refresh the +filename database! + +If the package is already installed (it is with a complete TeXLive or +Complete MiKTeX TeX system distribution), the texmf folder should be the +<prefix>/texmf-dist system one. But in this case you don't need to +decompress anything and move files around. Possibly check if the +CTAN repository contains a newer version and, in case, use your package +manager to upgrade your installation, but don't ever move or change +anything in the TeX system directories. -In any case remember to refresh the filename database!
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/toptesi/manifest.txt b/Master/texmf-dist/doc/latex/toptesi/manifest.txt index 61082ca99f8..7c224936930 100644 --- a/Master/texmf-dist/doc/latex/toptesi/manifest.txt +++ b/Master/texmf-dist/doc/latex/toptesi/manifest.txt @@ -1,4 +1,4 @@ -manifest.txt (version 5.71) +manifest.txt (version 5.73) Copyright 2008-2013 Claudio Beccari This work may be distributed and/or modified under the conditions of @@ -21,6 +21,7 @@ This work consists of the following files toptesi-doc-xetex.tex toptesi-example.tex toptesi-example-xetex.tex + topfront-example README toptesi-exmple.xmpdata toptesi-doc-xetex-def.ps @@ -36,28 +37,31 @@ The files derived from the work are the following: toptesi-doc-xetex-a.pdf toptesi-example.pdf toptesi-example-xetex.pdf + topfront-example.pdf The toptesi.dtx file is self extracting and self documenting; if you run pdflatex on it you get at the same time the class, the style and the configuration files, together with the English documented file. -The Italian documentation is obtained by running xelatex on +The Italian documentation is obtained by running XeLaTeX on toptesi-doc-xetex.tex The two documentations pdf files, toptesi.pdf and toptesi-doc-xetex.pdf, are complementary to one another. The third documentation file -toptesi-doc-xetex-a.pdf is just the PDF/A-b version of +toptesi-doc-xetex-a.pdf is just the PDF/A-1b version of toptesi-doc-xetex.pdf. -The files +The three files - toptesi-example.tex and toptesi-example-xetex.tex +toptesi-example.tex and toptesi-example-xetex.tex and topfront-example.tex -are examples of the usage of this work, the former to be run with pdfLaTeX, -the latter with XeLaTeX; they may be used as templates, but in themselves, -although part of this Work, they may be used by the end user the way s/he likes -best, in order to use ithem as templates, but the files should not be modified -unless their names are changed. +are examples of the usage of this work, the first and third to be run with +pdfLaTeX, the second with XeLaTeX; they may be used as templates, but in +themselves,although part of this Work, they may be used by the end user +the way s/he likes best, in order to use them as templates, but the files +should not be modified unless their names are changed. + +The above warning holds true also for the configuration file toptesi.cfg. The files toptesi-example.xmpdata and toptesi-doc-xetex-def.ps are examples of the contents and format of the metadata that must be @@ -65,4 +69,14 @@ included into the same directatory as the thesis main file in order to be able to use pdflatex or ghostscript for producing a file that hopefully is PDF/A-1b compliant (PDF/A-1b is the "weak" archivable PDF format). +Warning: The PDF examples attached to this bundle contain some university +logos; such logos are not distributed with this bundle since they are a +property of the specific universities. You can download them directly form +the university sites, or you may change the logo file names with those of +other institutions, in particular that of your own university; or you may +substitute them with picture file names of your choice, since they are just +examples of usage and they have no particular meaning in the sample files. +Remember: you can edit the sample/template files the way you want, provided +you change their names. + Maintainer: Claudio Beccari: claudio dot beccari at gmail dot com diff --git a/Master/texmf-dist/doc/latex/toptesi/topfront-example.pdf b/Master/texmf-dist/doc/latex/toptesi/topfront-example.pdf Binary files differnew file mode 100644 index 00000000000..828980bf742 --- /dev/null +++ b/Master/texmf-dist/doc/latex/toptesi/topfront-example.pdf diff --git a/Master/texmf-dist/doc/latex/toptesi/topfront-example.tex b/Master/texmf-dist/doc/latex/toptesi/topfront-example.tex new file mode 100644 index 00000000000..cfef6131ab6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/toptesi/topfront-example.tex @@ -0,0 +1,74 @@ +% Stand-alone sample usage of topfront + +% with XeLaTeX the document should be created with the UTF-8 encoding +% Use the following Magic comment line only if you typeset the document with pdfLaTeX +% !TEX encoding = IsoLatin + +\documentclass[a4paper,11pt,twoside]{report}% it works also with book and article + +\usepackage{ifxetex} + +\ifxetex + \usepackage{fontspec}% Ddefault fonts are the Latin Modern OpenType ones + \usepackage{polyglossia} + \setmainlanguage{italian} + \setotherlanguage{english} +\else + \usepackage[english,italian]{babel} + \usepackage[T1]{fontenc}\usepackage{lmodern} + \usepackage[latin1]{inputenc} +\fi +\usepackage{graphicx} + +\usepackage{topfront} + +\begin{document}\errorcontextlines=9 +% These data must be here after \begin{document} and before \frontespizio if XeLaTeX +% is being used. +% When using pdfLaTeX these data may be anywhere before \frontespizio, even in the preamble. +% See the toptesi-doc-xetex.pdf documentation for more details. +% +% Uncomment the following line if you want a title page with English infix phrases +\selectlanguage{english}% the default language is changed from Italian to English +% + + +\ateneo{Universit\`a di Torino} +\corsodilaurea{Astronomia applicata} +\titolo{La pressione barometrica di~Giove} +\sottotitolo{Metodo dei satelliti medicei} +\candidato{\tabular{@{}l@{}}Galileo \textsc{Galilei}\\ +\quad matricola 123456\endtabular} +\secondocandidato{\tabular{@{}l@{}}Evangelista \textsc{Torricelli}\\ +\quad matricola 123457\endtabular} +\relatore{prof.\ Margherita Hack} +\NomeTutoreAziendale{Supervisore aziendale\\Osservatorio Astronomico di Pino Torinese} +\tutoreaziendale{dott.\ Roberto Ferrero} +\sedutadilaurea{Agosto 1615} +\logosede{logounito} + + +% Since this sample file may be typeset either in Italian or in English we need a test: +\iflanguage{english}{% + \retrofrontespizio{This work is subject to the Creative Commons Licence} + \DottoratoIn{PhD Course in\space} + \CorsoDiLaureaIn{Master degree course in\space} + \NomeMonografia{Bachelor Degree Thesis} + \TesiDiLaurea{Master Degree Thesis} + \NomeDissertazione{PhD Dissertation} + \InName{in} + \CandidateName{Candidates}% or Candidate + \AdvisorName{Supervisor}% or Supervisors + \TutorName{Tutor} + \NomeTutoreAziendale{Internship Tutor} + \CycleName{cycle} + \NomePrimoTomo{First volume} + \NomeSecondoTomo{Second Volume} + \NomeTerzoTomo{Third Volume} + \NomeQuartoTomo{Fourth Volume} + \logosede{logotrieste,logopolito}% or comma separated list of logos +}{} + + +\frontespizio +\end{document} diff --git a/Master/texmf-dist/doc/latex/toptesi/toptesi-doc-xetex-a.pdf b/Master/texmf-dist/doc/latex/toptesi/toptesi-doc-xetex-a.pdf Binary files differindex 21513c4b756..6390bb48f18 100644 --- a/Master/texmf-dist/doc/latex/toptesi/toptesi-doc-xetex-a.pdf +++ b/Master/texmf-dist/doc/latex/toptesi/toptesi-doc-xetex-a.pdf diff --git a/Master/texmf-dist/doc/latex/toptesi/toptesi-doc-xetex.pdf b/Master/texmf-dist/doc/latex/toptesi/toptesi-doc-xetex.pdf Binary files differindex 006ac852b88..92b016d32de 100644 --- a/Master/texmf-dist/doc/latex/toptesi/toptesi-doc-xetex.pdf +++ b/Master/texmf-dist/doc/latex/toptesi/toptesi-doc-xetex.pdf diff --git a/Master/texmf-dist/doc/latex/toptesi/toptesi-example-xetex.tex b/Master/texmf-dist/doc/latex/toptesi/toptesi-example-xetex.tex index 51608dc230d..1dd85916faf 100644 --- a/Master/texmf-dist/doc/latex/toptesi/toptesi-example-xetex.tex +++ b/Master/texmf-dist/doc/latex/toptesi/toptesi-example-xetex.tex @@ -40,7 +40,7 @@ % Commentare le righe seguenti se NON si non si vogliono i link ipertestuali; in questo % caso non usare nemmeno l'opzione pdfa. Se si specifica pdfa e si vogliono i % collegamenti ipertestuali, allora conservare solo le righe del comando \hypersetup. -\usepackage{hyperref} +\csname ifT@Ppdfa\endcsname\else\usepackage{hyperref}\fi \hypersetup{% pdfpagemode={UseOutlines}, bookmarksopen, diff --git a/Master/texmf-dist/doc/latex/toptesi/toptesi-example.pdf b/Master/texmf-dist/doc/latex/toptesi/toptesi-example.pdf Binary files differindex 3df58f959e2..1de5d9ff839 100644 --- a/Master/texmf-dist/doc/latex/toptesi/toptesi-example.pdf +++ b/Master/texmf-dist/doc/latex/toptesi/toptesi-example.pdf diff --git a/Master/texmf-dist/doc/latex/toptesi/toptesi-example.tex b/Master/texmf-dist/doc/latex/toptesi/toptesi-example.tex index abbbbc1ad53..5bbb04508b1 100644 --- a/Master/texmf-dist/doc/latex/toptesi/toptesi-example.tex +++ b/Master/texmf-dist/doc/latex/toptesi/toptesi-example.tex @@ -3,7 +3,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 1.o Esempio con la classe toptesi -\documentclass[a5paper,10pt,twoside,cucitura]{toptesi} +\documentclass[b5paper,10pt,twoside,cucitura]{toptesi} \usepackage{lipsum} %\documentclass[twoside,cucitura,pdfa]{toptesi} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 2.o Esempio con la classe toptesi @@ -12,6 +12,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Commentare la riga seguente se si è specificata l'opzione "pdfa" \usepackage{hyperref} + \hypersetup{% pdfpagemode={UseOutlines}, bookmarksopen, @@ -38,8 +39,7 @@ % solo caratteri a 7 bit (ASCII) nei file d'entrata. La codifica utf8 sarebbe % quella maggiormente desiderabile; richiede però un editor che sappia gestirla. % -%\usepackage[ansinew]{inputenc}% per macchine Windows -\usepackage[latin1]{inputenc}% per macchine Linux/Mac/UNIX +\usepackage[latin1]{inputenc}% per macchine Linux/Mac/UNIX/Windows; meglio utf8 \usepackage[T1]{fontenc}\usepackage{lmodern} % \ateneo{Universit{\`a} degli Studi di Trieste} @@ -86,8 +86,8 @@ %\annoaccademico{1615-1616}% solo con l'opzione classica %\annoaccademico{2006-2007}% idem \ciclodidottorato{XV}% per il dottorato -\logosede{logopolito}% questo e' ovviamente facoltativo, ma e' richiesto per -% il dottorato al PoliTO +\logosede{logotrieste}% questo e' ovviamente facoltativo, ma e' richiesto per +% il dottorato al PoliTO; in questo calso si usa il "logopolito" % %\chapterbib %solo per vedere che cosa succede; e' preferibile comporre una sola bibliografia %\AdvisorName{Supervisors} @@ -95,9 +95,35 @@ %\setbindingcorrection{3mm} -\begin{document}%\errorcontextlines=9% debugging - -%\english: di default vale \italiano +\begin{document}\errorcontextlines=9% debugging + +%\english% di default vale \italiano + +% Comment the following lines if you don't care about the title page in English +% Change the strings if you want a title page and a copyright page in another language +% Comment just the \iflanguage statement and the closing line of the language test +% if you want to make a global change instead of a conditional one. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \iflanguage{english}{% + \retrofrontespizio{This work is subject to the Creative Commons Licence} + \DottoratoIn{PhD Course in\space} + \CorsoDiLaureaIn{Master degree course in\space} + \NomeMonografia{Bachelor Degree Thesis} + \TesiDiLaurea{Master Degree Thesis} + \NomeDissertazione{PhD Dissertation} + \InName{in} + \CandidateName{Candidates}% or Candidate + \AdvisorName{Supervisors}% or Supervisor + \TutorName{Tutor} + \NomeTutoreAziendale{Internship Tutor} + \CycleName{cycle} + \NomePrimoTomo{First volume} + \NomeSecondoTomo{Second Volume} + \NomeTerzoTomo{Third Volume} + \NomeQuartoTomo{Fourth Volume} + \logosede{logotrieste,logopolito}% or comma separated list of logos + }{} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \expandafter\ifx\csname StileTrieste\endcsname\relax \frontespizio diff --git a/Master/texmf-dist/doc/latex/toptesi/toptesi.pdf b/Master/texmf-dist/doc/latex/toptesi/toptesi.pdf Binary files differnew file mode 100644 index 00000000000..9ad9911227a --- /dev/null +++ b/Master/texmf-dist/doc/latex/toptesi/toptesi.pdf diff --git a/Master/texmf-dist/source/latex/toptesi/toptesi.dtx b/Master/texmf-dist/source/latex/toptesi/toptesi.dtx index 3d93b393bea..2da82ca05cc 100644 --- a/Master/texmf-dist/source/latex/toptesi/toptesi.dtx +++ b/Master/texmf-dist/source/latex/toptesi/toptesi.dtx @@ -6,7 +6,7 @@ \preamble ______________________________________________________ The TOPtesi package - Copyright (C) 2012 Claudio Beccari + Copyright (C) 2013 Claudio Beccari All rights reserved License information appended @@ -14,7 +14,7 @@ \endpreamble \postamble -Copyright 2005-2012 Claudio Beccari +Copyright 2005-2013 Claudio Beccari Distributable under the LaTeX Project Public License, version 1.3c or higher (your choice). The latest version of @@ -47,6 +47,7 @@ sty and cfg files and the English documentation file in The documentation file toptesi-doc-xetex.pdf is in Italian; its source file is another example of how to use toptesi. \endpostamble + \askforoverwritefalse \generateFile{toptesi.cls}{t}{\from{toptesi.dtx}{class}} @@ -60,7 +61,7 @@ its source file is another example of how to use toptesi. \endgroup %</internal> % -% Copyright 1989--2006 Claudio Beccari +% Copyright 1989--2013 Claudio Beccari % % This file is part of the TOPtesi bundle % ------------------------------------------- @@ -87,7 +88,7 @@ its source file is another example of how to use toptesi. % \iffalse %<*driver> \documentclass{ltxdoc} -\ProvidesFile{toptesi.dtx}[2013/03/27 v.5.71 Documented TeX file for +\ProvidesFile{toptesi.dtx}[2013/09/01 v.5.73 Documented TeX file for the TOPtesi bundle] \GetFileInfo{toptesi.dtx} \title{The TOPtesi bundle} @@ -105,7 +106,7 @@ the TOPtesi bundle] %</driver> % \fi % -% \CheckSum{2694} +% \CheckSum{2705} % %% \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 @@ -708,7 +709,7 @@ the TOPtesi bundle] % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{toptesi}% -[2013/03/27 v.5.71 Class for typesetting university theses] +[2013/09/01 v.5.73 Class for typesetting university theses] % \end{macrocode} % % The class itself is very simple since it requires just the \texttt{report} document @@ -764,7 +765,7 @@ the TOPtesi bundle] % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{toptesi}% -[2013/03/27 v.5.71 Extension for toptesi.cls]% +[2013/09/01 v.5.73 Extension for toptesi.cls]% % \end{macrocode} % % We start with defining the debugging macros; these trace commands and macros @@ -826,6 +827,7 @@ the TOPtesi bundle] % and again. % \begin{macrocode} \RequirePackage{graphicx} +\RequirePackage{etoolbox} \if@xivpt\input{size14.clo}\fi % \end{macrocode} % @@ -839,7 +841,7 @@ the TOPtesi bundle] \advance\textheight by \topskip % \end{macrocode} % The inner margin is parametrized to the paper width, but a small correction -% is made if the extra size of 14pt is chosen.Also the footskip is parametrized +% is made if the extra size of 14pt is chosen. Also footskip is parametrized % to the paper height in a slightly different way when the large |14pt| size is chosen. % \begin{macrocode} \ifx\f@size\@xivpt @@ -1443,7 +1445,7 @@ Skipping any redefinition\MessageBreak}% \AtBeginDocument{% \italiano \renewcommand\@chapapp{\chaptername}% - } +} % \end{macrocode} % % At last the subsidiary and independent packages \texttt{topcoman} and @@ -1451,17 +1453,17 @@ Skipping any redefinition\MessageBreak}% % typesetting engine it's necessary to load such packages at the ``begin % document'' step, so that all a the other settings, especially fonts % are already established. May be it should be better done also when -% using pdf\/\LaTeX\ as the typesetting engine, but the past experience +% using pdf\/\LaTeX\ as the typesetting engine, even if the past experience % has not shown any inconvenience. % \begin{macrocode} \ifxetex - \AtBeginDocument{\RequirePackage{topfront} - \RequirePackage{topcoman}} -\else - \RequirePackage{topfront} - \RequirePackage{topcoman} +\AtBeginDocument{% + \RequirePackage{topfront}% + \RequirePackage{topcoman}% +}\else + \RequirePackage{topfront}% + \RequirePackage{topcoman}% \fi -\def\sf@size{7} % \end{macrocode} % % Last but not least, here come the specifications for the PDF/A-1b format. First of @@ -1795,7 +1797,19 @@ Skipping any redefinition\MessageBreak}% % \fi % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{topfront}[2013/03/27 v.5.71 Title page for TOPtesi] +\ProvidesPackage{topfront}[2013/09/01 v.5.73 Title page for TOPtesi] +% \end{macrocode} +% Per l'uso di topfront come pacchetto autonomo bisogna verificare che l'opzione |classica| +% corrisponda ad una impostazione corretta di |\ifclassica|; siccome questo |\if| è definito +% in |toptesi.sty|, qui bisogna verificarne l'esistenza, e se del caso impostare il valore +% |false|. Per la verifica +% In oder to use |topfront| as a stand-alone extension package it is necessary to verify if the |classica| option corresponds to a valid setting of |\ifclassica|; since this test is defined in the main |toptesi| package, here we need to verify its existance, and in case to set its value to |false|. This implies two points: we need a powerful macro package to test a ``switch'', and when this |topfront| package is used as a stand-alone one, the settings of the |classica| options are not available. +% \begin{macrocode} +\@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}} +\ifcsundef{ifclassica}{% + \newif\ifclassica + \classicafalse +}{} % \end{macrocode} % % The title page information depends on the type of ``thesis' that is being typeset. @@ -1819,6 +1833,7 @@ Skipping any redefinition\MessageBreak}% \newif\iflaureatriennale \laureatriennalefalse % \end{macrocode} % +% % The thesis title is specified by means of the following commands; |\monografia|, % the name of the bachelors degree final report, sets also the corresponding % boolean variables and redefines the command |\titolo| so as to avoid @@ -1883,7 +1898,7 @@ Skipping any redefinition\MessageBreak}% \def\tutore#1{\gdef\@tutore{#1}} \def\direttore{\Direttoretrue\relatore}% \def\coordinatore{\Direttorefalse\relatore}% -\def\QualificaDirettore#1{\gdef\@PhDdirector{#1}} +\def\QualificaDirettore#1{\gdef{#1}} % \end{macrocode} % % For ``normal'' theses we may have from one to three supervisors and from @@ -2004,12 +2019,12 @@ Skipping any redefinition\MessageBreak}% % commands to |\FacoltaDi| and |\facolta| respectively. % % Finally |\logosede| gets the name of the graphic file that contains the information -% relative to the university logo; it may receive also a list of logo file names, as it -% might be necessary when a thesis is developed in a multiple university environment. If -% such logo file is not available, the user does not specify this command; if the -% thesis is typeset on smaller paper size than A4 or letter, it would be much +% relative to the university logo; it may receive also a comma separated list of logo file +% names, as it might be necessary when a thesis is developed in a multiple university +% environment. If such logo file is not available, the user does not specify this command; +% if the thesis is typeset on smaller paper size than A4 or letter, it would be much % better to avoid inserting one or more logos in the title page; this is -% particularly necessary when using A5 paper size. Nevertheless this decision is +% particularly important when using A5 paper size. Nevertheless this decision is % left to the user and this package neither controls this fact nor outputs any warning. % If the user uses this command to insert one or more university logo files % but some file is not available, the usual \texttt{graphicx} package warning is issued @@ -2021,15 +2036,19 @@ Skipping any redefinition\MessageBreak}% % logos in the typeset page; the third is the height of the logos. The default spacing % may be set with the help of the macro |\setlogodistance| -- notice that the default % value is |3em|, and if a different distance is desired, it should not be much larger -% or mach smaller than the default one; the default logo height is specified as an -% optional command to the |\logosede| command; the save box name is just for internal -% workings and does not require any customization. The analysis and processing to the -% possible list of logo file names id=s done through the usual means of the delimited -% argument extraction of the single names from the list; the ``string'' of logic is then -% composed in a save box; as the list has been completely processed, the box is measured; -% if its width is shorter than the |\textwidth| it is typeset without further processing; -% if it's larger, on the opposite, the box gets scaled down so that its width equals the -% |\textwidth|. +% or much smaller than the default one; the default logo height is specified as an +% optional command to the |\logosede| command, while the default size is given by the +% |\interno| length; This length is specified in the main |toptesi| package in order to +% compute the typesetting grid, so that id the |topfront| package is used by itself with +% other classes, thee xistence of the |\inteno| control sequence is tested and if it is +% undefined, then and only then id defined in this package and assigned a default value. +% The save box name is just for internal workings and does not require any customization. +% The analysis and processing to the possible list of logo file names is done through the +% usual means of the delimited argument extraction of the single names from the list; the +% ``string'' of logos is then composed in a save box; as the list has been completely +% processed, the box is measured; if its width is shorter than the |\textwidth| it is +% typeset without further processing; if it's larger, on the opposite, the box gets scaled +% down so that its width equals the |\textwidth|. % % The |\tutoreaziendale| macro is the last title page addition; several students, who work % on their thesis or final project in a company, want to have the company supervisor name @@ -2045,8 +2064,8 @@ Skipping any redefinition\MessageBreak}% % can specify any pertinent space at the bottom of his/her argument, so as to set the % text in the position s/he likes best. % In order to handle the copyright page in the proper way we need to test if its -% definition is empty or blank so we require the package |etoolbox| in order to use its -% advanced macros. +% definition is empty or blank so we need the powerful advanced macros of the package +% |etoolbox| that has already been loaded by this package or by the main |toptesi| one. % \begin{macrocode} \def\ciclodidottorato#1{\gdef\@ciclo{#1 \@cyclename}}% \def\corsodilaurea#1{\global\dottoratofalse\gdef\@corso{#1}} @@ -2065,6 +2084,9 @@ Skipping any redefinition\MessageBreak}% \newcommand*\setlogodistance[1]{\TPT@logospace=#1} \providecommand*{\@logosede}{} +\ifcsundef{interno}{%\ + \newlength\interno + \setlength\interno{\dimexpr\paperwidth/7}}{} \newcommand\logosede[2][\interno]{\def\@logosede{#2}\TPT@logoheight=#1} \newcommand\printloghi{\ifdefvoid{\@logosede}{}{% @@ -2083,7 +2105,6 @@ Skipping any redefinition\MessageBreak}% \def\tutoreaziendale#1{\gdef\@tutoreaziendale{#1}} \newcommand\retrofrontespizio[1]{\long\gdef\@retrofrontespizio{#1}} -\RequirePackage{etoolbox} % \end{macrocode} % % The following commands are user commands that modify the infix strings @@ -2116,8 +2137,8 @@ Skipping any redefinition\MessageBreak}% % \item[NomeQuartoTomo] ``Tomo quarto'' in, say, ``Fourth volume'' % \end{description} % In the above description the first string is generally the default one, while the second -% string is just an example of the corresponding string to be set in another language or to be -% changed in Italian. The last four commands clearly show the difficulty of localizing +% string is just an example of the corresponding string to be set in another language or +% to be changed in Italian. The last four commands clearly show the difficulty of localizing % language strings: it is necessary to localize the whole phrase, because of the position of % the adjectives. % \begin{macrocode} @@ -2145,9 +2166,9 @@ Skipping any redefinition\MessageBreak}% % defined or redefined in the configuration file must not be redefined in the following % Lines and this is why everything is subject to the test |\@ifundefined|. Most default % definitions are simply ``blank''; the others are in Italian. All of them, except the -% supervisor and candidate strings may be individually be redefined in the configuration +% supervisor and candidate strings may be individually redefined in the configuration % file or in the preamble. Those that cannot be redefined such as the four ``candidate'' -% strings may be actually redefined through the only |\CandidateName| that should be used +% strings may be actually redefined through the single |\CandidateName| that should be used % in a language depended way and with the correct number and gender once for all. % The four endings in the Italian strings allow to exercise the correct selection only % for Italian; a specific test is made inside the |\frontespizio| command; because of @@ -2165,9 +2186,9 @@ Skipping any redefinition\MessageBreak}% \@ifundefined{@principaladviser}{\def\@principaladviser{}}{} \@ifundefined{@secondadviser}{\def\@secondadviser{}}{} \@ifundefined{@thirdadviser}{\def\@thirdadviser{}}{} -\@ifundefined{@PhDdirector}{% - \edef\@PhDdirector{\ifDirettore Direttore \else Coordinatore \fi - del corso di dottorato}}{} +\ifcsundef{@PhDdirector}{% + \ifDirettore\def\@PhDdirector{Direttore del corso di dottorato}\else + \def\@PhDdirector{Coordinatore del corso di dottorato}\fi}{} \@ifundefined{@tutore}{\def\@tutore{}}{} \@ifundefined{@secondauthor}{\def\@secondauthor{}}{} \@ifundefined{@thirdauthor}{\def\@thirdauthor{}}{} @@ -2230,7 +2251,7 @@ Skipping any redefinition\MessageBreak}% % % Everything is closed within a group so all definitions remain local. % \begin{macrocode} -\def\frontespizio{% +\gdef\frontespizio{% \begingroup \def\ps@myheadings{\let\@mkboth\markboth \def\@oddhead{\vbox{% @@ -2557,9 +2578,9 @@ Skipping any redefinition\MessageBreak}% % text is not empty, after the shipping out of the title page, we set the copyright page % text flush bottom with the text block, and then we ship out also this copyright page. % \begin{macrocode} - \par\vfill\null - \ifdefempty{\@retrofrontespizio}{\cleardoublepage}% - {\clearpage\null\vfill\@retrofrontespizio\par\clearpage}% + \par\clearpage + \ifdefempty{\@retrofrontespizio}{}% + {\null\vfill\pagestyle{empty}\@retrofrontespizio\par\clearpage}% \endgroup} % \end{macrocode} % \iffalse @@ -2616,7 +2637,7 @@ Skipping any redefinition\MessageBreak}% % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} % lavora solo con LaTeX 2e \ProvidesPackage{topcoman}% - [2013/03/27 v.5.71 Additional commands for the TOPtesi bundle] + [2013/09/01 v.5.73 Additional commands for the TOPtesi bundle] % \end{macrocode} % The new command |\DeclareSlantedCapitalGreekLetters| optionally sets the capital % Greek letters in math mode with the glyphs taken from the math italic fonts, not from diff --git a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty index 145ed2667b0..8d73dd1e112 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty @@ -7,7 +7,7 @@ %% toptesi.dtx (with options: `topcmn') %% ______________________________________________________ %% The TOPtesi package -%% Copyright (C) 2012 Claudio Beccari +%% Copyright (C) 2013 Claudio Beccari %% All rights reserved %% %% License information appended @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} % lavora solo con LaTeX 2e \ProvidesPackage{topcoman}% - [2013/03/27 v.5.71 Additional commands for the TOPtesi bundle] + [2013/09/01 v.5.73 Additional commands for the TOPtesi bundle] \RequirePackage{ifxetex} \ifxetex\else \newcommand*\DeclareSlantedCapitalGreekLetters{% @@ -95,7 +95,7 @@ \let\p@figure\empty\let\p@table\empty} \DisableFigTabNames %% -%% Copyright 2005-2012 Claudio Beccari +%% Copyright 2005-2013 Claudio Beccari %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/latex/toptesi/topfront.sty b/Master/texmf-dist/tex/latex/toptesi/topfront.sty index 117e3ece0d1..9c19779f828 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topfront.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topfront.sty @@ -7,7 +7,7 @@ %% toptesi.dtx (with options: `topfrn') %% ______________________________________________________ %% The TOPtesi package -%% Copyright (C) 2012 Claudio Beccari +%% Copyright (C) 2013 Claudio Beccari %% All rights reserved %% %% License information appended @@ -28,7 +28,12 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{topfront}[2013/03/27 v.5.71 Title page for TOPtesi] +\ProvidesPackage{topfront}[2013/09/01 v.5.73 Title page for TOPtesi] +\@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}} +\ifcsundef{ifclassica}{% + \newif\ifclassica + \classicafalse +}{} \newif\iffemminile \newif\ifdottorato \dottoratofalse \newif\iflaureatriennale \laureatriennalefalse @@ -49,7 +54,7 @@ \def\tutore#1{\gdef\@tutore{#1}} \def\direttore{\Direttoretrue\relatore}% \def\coordinatore{\Direttorefalse\relatore}% -\def\QualificaDirettore#1{\gdef\@PhDdirector{#1}} +\def\QualificaDirettore#1{\gdef{#1}} \def\relatore#1{\gdef\@principaladviser{#1}} \def\secondorelatore#1{\gdef\@secondadviser{#1}} \def\terzorelatore#1{\gdef\@thirdadviser{#1}} @@ -107,6 +112,9 @@ \newcommand*\setlogodistance[1]{\TPT@logospace=#1} \providecommand*{\@logosede}{} +\ifcsundef{interno}{%\ + \newlength\interno + \setlength\interno{\dimexpr\paperwidth/7}}{} \newcommand\logosede[2][\interno]{\def\@logosede{#2}\TPT@logoheight=#1} \newcommand\printloghi{\ifdefvoid{\@logosede}{}{% @@ -124,7 +132,6 @@ \def\tutoreaziendale#1{\gdef\@tutoreaziendale{#1}} \newcommand\retrofrontespizio[1]{\long\gdef\@retrofrontespizio{#1}} -\RequirePackage{etoolbox} \newcommand\FacoltaDi[1]{\gdef\@faculty{#1}} \let\StrutturaDidattica\FacoltaDi \newcommand\DottoratoIn[1]{\gdef\@PhDname{#1}} @@ -151,9 +158,9 @@ \@ifundefined{@principaladviser}{\def\@principaladviser{}}{} \@ifundefined{@secondadviser}{\def\@secondadviser{}}{} \@ifundefined{@thirdadviser}{\def\@thirdadviser{}}{} -\@ifundefined{@PhDdirector}{% - \edef\@PhDdirector{\ifDirettore Direttore \else Coordinatore \fi - del corso di dottorato}}{} +\ifcsundef{@PhDdirector}{% + \ifDirettore\def\@PhDdirector{Direttore del corso di dottorato}\else + \def\@PhDdirector{Coordinatore del corso di dottorato}\fi}{} \@ifundefined{@tutore}{\def\@tutore{}}{} \@ifundefined{@secondauthor}{\def\@secondauthor{}}{} \@ifundefined{@thirdauthor}{\def\@thirdauthor{}}{} @@ -195,7 +202,7 @@ \@ifundefined{@dissertazione}{\def\@dissertazione{Tesi di Dottorato}}{} \@ifundefined{@monografia}{\def\@monografia{Monografia di Laurea}}{} \@ifundefined{@InName}{\def\@InName{in}}{} -\def\frontespizio{% +\gdef\frontespizio{% \begingroup \def\ps@myheadings{\let\@mkboth\markboth \def\@oddhead{\vbox{% @@ -408,12 +415,12 @@ {\centering \textbf{\@tutoreaziendalename}\\[.6ex] \@tutoreaziendale\par} \fi - \par\vfill\null - \ifdefempty{\@retrofrontespizio}{\cleardoublepage}% - {\clearpage\null\vfill\@retrofrontespizio\par\clearpage}% + \par\clearpage + \ifdefempty{\@retrofrontespizio}{}% + {\null\vfill\pagestyle{empty}\@retrofrontespizio\par\clearpage}% \endgroup} %% -%% Copyright 2005-2012 Claudio Beccari +%% Copyright 2005-2013 Claudio Beccari %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg b/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg index 6b1365f372a..4386f0b4440 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg @@ -7,7 +7,7 @@ %% toptesi.dtx (with options: `topcfg') %% ______________________________________________________ %% The TOPtesi package -%% Copyright (C) 2012 Claudio Beccari +%% Copyright (C) 2013 Claudio Beccari %% All rights reserved %% %% License information appended @@ -56,7 +56,7 @@ %%\CycleName{ciclo} %%\retrofrontespizio{Questo testo è soggetto alla Creative Commons Licence} %% -%% Copyright 2005-2012 Claudio Beccari +%% Copyright 2005-2013 Claudio Beccari %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls index 4a81b58dbc5..ba08da58e9d 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls @@ -7,7 +7,7 @@ %% toptesi.dtx (with options: `class') %% ______________________________________________________ %% The TOPtesi package -%% Copyright (C) 2012 Claudio Beccari +%% Copyright (C) 2013 Claudio Beccari %% All rights reserved %% %% License information appended @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{toptesi}% -[2013/03/27 v.5.71 Class for typesetting university theses] +[2013/09/01 v.5.73 Class for typesetting university theses] \DeclareOption{a4paper}{\PassOptionsToClass{\CurrentOption}{report}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}} \ExecuteOptions{a4paper} @@ -48,7 +48,7 @@ \fi \RequirePackage{toptesi} %% -%% Copyright 2005-2012 Claudio Beccari +%% Copyright 2005-2013 Claudio Beccari %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty index a0bc052ea61..bf22b228160 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty @@ -7,7 +7,7 @@ %% toptesi.dtx (with options: `topsty') %% ______________________________________________________ %% The TOPtesi package -%% Copyright (C) 2012 Claudio Beccari +%% Copyright (C) 2013 Claudio Beccari %% All rights reserved %% %% License information appended @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{toptesi}% -[2013/03/27 v.5.71 Extension for toptesi.cls]% +[2013/09/01 v.5.73 Extension for toptesi.cls]% \def\TRON{\tracingcommands \tw@ \tracingmacros \tw@} \def\TROFF{\tracingcommands\z@ \tracingmacros \z@} \let\TROF\TROFF @@ -52,6 +52,7 @@ \DeclareOption{pdfa}{\T@Ppdfatrue} \ProcessOptions\relax \RequirePackage{graphicx} +\RequirePackage{etoolbox} \if@xivpt\input{size14.clo}\fi \newlength\interno \textheight 0.7\paperheight @@ -365,15 +366,15 @@ Skipping any redefinition\MessageBreak}% \AtBeginDocument{% \italiano \renewcommand\@chapapp{\chaptername}% - } +} \ifxetex -\AtBeginDocument{\RequirePackage{topfront} -\RequirePackage{topcoman}} -\else -\RequirePackage{topfront} -\RequirePackage{topcoman} +\AtBeginDocument{% +\RequirePackage{topfront}% +\RequirePackage{topcoman}% +}\else +\RequirePackage{topfront}% +\RequirePackage{topcoman}% \fi -\def\sf@size{7} \ifxetex\else \renewcommand*\not{\mathrel{\mathchoice% {\rlap{$\displaystyle\mkern2.5mu\mathnormal{/}$}}% @@ -515,7 +516,7 @@ Skipping any redefinition\MessageBreak}% \endlist\clearpage } %% -%% Copyright 2005-2012 Claudio Beccari +%% Copyright 2005-2013 Claudio Beccari %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of |