From 719bac09a356959104413594b1776bd0f8893e73 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 Sep 2020 21:13:02 +0000 Subject: toptesi (6sep20) git-svn-id: svn://tug.org/texlive/trunk@56276 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/toptesi/topcoman.sty | 2 +- Master/texmf-dist/tex/latex/toptesi/topfront.sty | 2 +- .../tex/latex/toptesi/toptesi-dottorale.sty | 2 +- .../tex/latex/toptesi/toptesi-magistrale.sty | 2 +- .../tex/latex/toptesi/toptesi-monografia.sty | 2 +- .../texmf-dist/tex/latex/toptesi/toptesi-scudo.sty | 5 +- .../texmf-dist/tex/latex/toptesi/toptesi-sss.sty | 2 +- Master/texmf-dist/tex/latex/toptesi/toptesi.cfg | 10 ++-- Master/texmf-dist/tex/latex/toptesi/toptesi.cls | 6 +-- Master/texmf-dist/tex/latex/toptesi/toptesi.sty | 57 ++++++++++++++-------- 10 files changed, 55 insertions(+), 35 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty index 245a8839e96..46d5bda1726 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty @@ -14,7 +14,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2018/01/01] \ProvidesPackage{topcoman}[% -2020-05-29 v.6.4.04 +2020-09-06 v.6.4.06 Additional commands for the TOPtesi bundle] diff --git a/Master/texmf-dist/tex/latex/toptesi/topfront.sty b/Master/texmf-dist/tex/latex/toptesi/topfront.sty index f7ee3d09fc5..a0259a82df8 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topfront.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topfront.sty @@ -14,7 +14,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2018/01/01] \ProvidesPackage{topfront}[% -2020-05-29 v.6.4.04 +2020-09-06 v.6.4.06 Title page for TOPtesi and other classes] diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi-dottorale.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi-dottorale.sty index 082774bc437..eb19b8c03dd 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi-dottorale.sty +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi-dottorale.sty @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesPackage{toptesi-dottorale}[% -2020-05-29 v.6.4.04 +2020-09-06 v.6.4.06 Ph.D. degree title page] diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi-magistrale.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi-magistrale.sty index 8e513176ce3..c02ec8f205d 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi-magistrale.sty +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi-magistrale.sty @@ -14,7 +14,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2018/01/01] \ProvidesPackage{toptesi-magistrale}[% -2020-05-29 v.6.4.04 +2020-09-06 v.6.4.06 Master degree title page] diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi-monografia.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi-monografia.sty index 3e4606aafac..1a2416163b2 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi-monografia.sty +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi-monografia.sty @@ -14,7 +14,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2018/01/01] \ProvidesPackage{toptesi-monografia}[% -2020-05-29 v.6.4.04 +2020-09-06 v.6.4.06 Bachelor degree title page] diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi-scudo.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi-scudo.sty index 35a3f1de1a1..aa142be8441 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi-scudo.sty +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi-scudo.sty @@ -14,7 +14,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2018/01/01] \ProvidesPackage{toptesi-scudo}[% -2020-05-29 v.6.4.04 +2020-09-06 v.6.4.06 Extension for ScuDo theses] @@ -162,6 +162,7 @@ security of personal data.} \expandafter\fillup@TCP@logobox\@logosede,!}} \newcommand\printloghi{\unless\ifvoid\TPT@logobox\usebox{\TPT@logobox}\fi} +\newcommand\fivestars{* * * * *} \newcommand\Disclaimer[1]{\gdef\@disclaimer{#1}} \newcommand\CClicence[1]{\gdef\@creativecommons{#1}} \providecommand\@signature{% @@ -188,7 +189,7 @@ Turin, \@examinationdate \@subtitle {\Large\bfseries \@author\par} \smallskip -\mbox{* * * * * *} +\mbox{\fivestars} \vspace{\stretch{1}} {\large\bfseries \ifcase\@supervisornumber diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi-sss.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi-sss.sty index 9a04a922f2d..cda07d34b80 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi-sss.sty +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi-sss.sty @@ -14,7 +14,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2018/01/01] \ProvidesPackage{toptesi-sss}[% -2020-05-29 v.6.4.04 +2020-09-06 v.6.4.06 High school title page] diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg b/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg index bd0fac0361d..38eea3ea284 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.cfg @@ -16,13 +16,13 @@ %% %%================================================================ -%% This file is the only file of the TOPtesi bundle that the user -%% can modify without restrictions in order to customise the -%% contents of this configuration file to his/her needs. The user -%% can add or remove lines, comment or uncomment lines, change the -%% arguments to macros, add definitions and so on. %% Use this file by copying the relevant section to another file %% to be named as the thesis main file and with extension .cfg. +%% This copied and renamed file is the only file of the TOPtesi +%% bundle that the user can modify without restrictions in order to +%% customise the contents of this configuration file to his/her needs. +%% The user can add or remove lines, comment or uncomment lines, +%% change the arguments to macros, add definitions and so on. %% This bundle will try to read "\jobname.cfg"; if this file does %% not exist, the bundle files don't do anything. This implies that %% the provided file toptesi.cfg is to be used as a model, not to diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls index e4fa5ba4d90..bcc3404abae 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls @@ -14,20 +14,20 @@ %% \NeedsTeXFormat{LaTeX2e}[2018/01/01] \ProvidesClass{toptesi}[% -2020-05-29 v.6.4.04 +2020-09-06 v.6.4.06 Class for typesetting university theses] \RequirePackage{fancyvrb} \usepackage{trace} -\RequirePackage{xkeyval} +\usepackage{xkeyval} \DeclareOptionX{formato}[a4paper]{\PassOptionsToClass{#1}{report}} \DeclareOptionX*{\PassOptionsToClass{\CurrentOption}{report}} \ExecuteOptionsX{formato} \ProcessOptionsX*\relax \LoadClass{report} -\RequirePackage{iftex} +\usepackage{iftex} \ifPDFTeX \usepackage[english,italian]{babel} \else diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty index 641bee97d18..479b3bf2a72 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty @@ -14,13 +14,14 @@ %% \NeedsTeXFormat{LaTeX2e}[2018/01/01] \ProvidesPackage{toptesi}[% -2020-05-29 v.6.4.04 +2020-09-06 v.6.4.06 Extension for toptesi.cls] \def\TRON{\tracingcommands \tw@ \tracingmacros \tw@} \def\TROFF{\tracingcommands\z@ \tracingmacros \z@} \let\TROF\TROFF + \newif\ifevenboxes \evenboxesfalse \newif\if@utoretitolo \@utoretitolofalse \newif\if@ldstyle \@ldstylefalse @@ -118,12 +119,12 @@ Extension for toptesi.cls] \RequirePackage{graphicx} \RequirePackage{etoolbox} -\RequirePackage{xspace} \newcommand*\ifempty[1]{\edef\@tempA{#1}% -\ifx\@tempA\@empty\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\ifx\@tempA\@empty\expandafter\@firstoftwo + \else\expandafter\@secondoftwo\fi} \newlength\interno \normalsize% necessary to have the correct value for \baselineskip -\textheight \paperwidth +\textheight=\paperwidth \setlength{\textheight}{% \dimexpr\textheight*\baselineskip/\baselineskip+\topskip} \iflibro @@ -147,6 +148,7 @@ Extension for toptesi.cls] \footskip=2\baselineskip \fi \fi + \iflibro \interno=\dimexpr\paperwidth-\textwidth\relax \oddsidemargin=0.414214\interno\relax @@ -197,8 +199,8 @@ Extension for toptesi.cls] } \if@twoside % two side - \def\ps@headings{% - \let\@mkboth\markboth\let\@oddhead\@empty\let\@evenhead\@empty + \def\ps@headings{\let\@mkboth\markboth% autoretitolo + \let\@oddhead\@empty\let\@evenhead\@empty \unless\ifTOPfolioinhead % folio in head \ifTOPnocenterfolio \def\@oddfoot{\makebox[\textwidth][r]{\scshape\lapagina}} @@ -316,6 +318,7 @@ Extension for toptesi.cls] \penalty\@highpenalty \endgroup \fi} + \newif\iffigurespage \newif\iftablespage \newif\ifnumeriromani @@ -358,40 +361,53 @@ Extension for toptesi.cls] \iffrontmatter\else\frontmattertrue\fi \chapter*{\summaryname}} \let\summary\sommario + \def\ringraziamenti{% \iffrontmatter\else\frontmattertrue\fi \chapter*{\acknowledgename}} \let\acknowledgements\ringraziamenti + \newenvironment{pdfxmetadata}{% \VerbatimOut{\jobname.xmpdata}}{\endVerbatimOut} + \newcount\TOPsecnumdepth -\RenewDocumentCommand{\chapter} - {s O{#4} O{#2} m O{plain}}{% +\newif\iftoc + +\RenewDocumentCommand{\chapter}{s O{#4} O{#2} m O{plain}}{% \if@openright\cleardoublepage \else\clearpage\fi \thispagestyle{#5}% \global\@topnum\z@ \@afterindentfalse - \TOPsecnumdepth=\c@secnumdepth \IfBooleanTF{#1}{% + \TOPsecnumdepth=\c@secnumdepth \c@secnumdepth=-3\relax - \let\iftoc\iffalse + \tocfalse }{% \iffrontmatter\mainmatter\fi - \let\iftoc\iftrue + \toctrue }% \ifnum \c@secnumdepth >\m@ne \if@mainmatter % where \if@mainmatter is defined % (e.g. book.cls, toptesi.cls) \refstepcounter{chapter}% \typeout{\@chapapp\space\thechapter.}% - \iftoc\addcontentsline{toc}{chapter}{% - \protect\numberline{\thechapter}#2}\fi + \iftoc + \addcontentsline{toc}{chapter}{% + \protect\numberline{\thechapter}#2}% \else % - \iftoc\addcontentsline{toc}{chapter}{#2}\fi + \addcontentsline{toc}{chapter}{#2}% \fi - \else % Were \mainmatter is not defined (e.g.report.cls) - \iftoc\addcontentsline{toc}{chapter}{#2}\fi + \else % When \mainmatter is not defined (e.g.report.cls) + \refstepcounter{chapter}% + \typeout{\@chapapp\space\thechapter.}% + \iftoc + \addcontentsline{toc}{chapter}{% + \protect\numberline{\thechapter}#2}% + \else % + \addcontentsline{toc}{chapter}{#2}% + \fi + \fi \fi \markboth{#3}{#3}% No \MakeUppercase \iftoc @@ -406,8 +422,9 @@ Extension for toptesi.cls] \@makechapterhead{#4}% \@afterheading \fi - \c@secnumdepth=\TOPsecnumdepth + \IfBooleanTF{#1}{\c@secnumdepth=\TOPsecnumdepth}{}% } + \RenewDocumentCommand\part{s O{#3} m}{\iffrontmatter\mainmatter\fi \if@openright \cleardoublepage \else \clearpage \fi \thispagestyle{plain}\if@twocolumn \onecolumn \@tempswatrue \else \@tempswafalse \fi \null \vfil \IfBooleanTF{#1}{\@spart{#3}}{\@part[#2]{#3}}} @@ -455,8 +472,9 @@ Extension for toptesi.cls] \clearpage \if@restonecol\twocolumn\fi } -\def\indici{% If headings are desired, the page style must be set in advance +\NewDocumentCommand\indici{O{plain}}{% \iffrontmatter\else\frontmattertrue\fi + \pagestyle{#1}% \tableofcontents \iftablespage {\addvspace{10pt} @@ -513,6 +531,7 @@ Extension for toptesi.cls] \AtBeginDocument{\@ifpackageloaded{caption}{}{% \providecommand\captionsetup{}\renewcommand\captionsetup[2][]{}% \providecommand\captionof[1]{\def\@captype{#1}\caption} + \let\originalcaption\caption \newdimen\captionwidth \newdimen\fullwidth @@ -563,7 +582,7 @@ Extension for toptesi.cls] \newcounter{NumberSD} \setcounter{NumberSD}{0} \providecommand*\theNumberSD{\value{NumberSD}} \newif\ifNumberFloat \NumberFloattrue -\NewDocumentCommand\captionSD{s O{} m}{% O: optional arg. with null default +\NewDocumentCommand\captionSD{s O{} m}{% \IfBooleanTF{#1}% {% \@makecaption{}{#3}% -- cgit v1.2.3