diff options
author | Karl Berry <karl@freefriends.org> | 2014-12-13 23:38:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-12-13 23:38:15 +0000 |
commit | eb9b398b309be6def2fcf03d84da4865fdba6a04 (patch) | |
tree | 0ae59d5c893775b65eaa2a49979aa8a141a6c79e /Master/texmf-dist/tex/latex/toptesi | |
parent | 6e60746f3bb4513d40f0802d177e7f11587680a2 (diff) |
toptesi (13dec14)
git-svn-id: svn://tug.org/texlive/trunk@35817 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/toptesi')
-rw-r--r-- | Master/texmf-dist/tex/latex/toptesi/topcoman.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/toptesi/topfront.sty | 76 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/toptesi/toptesi.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/toptesi/toptesi.sty | 75 |
4 files changed, 76 insertions, 81 deletions
diff --git a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty index 91b449c47bb..c30dd383dde 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topcoman.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topcoman.sty @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} % lavora solo con LaTeX 2e \ProvidesPackage{topcoman}% - [2014/11/07 v.5.84 Additional commands for the TOPtesi bundle] + [2014/11/13 v.5.85b Additional commands for the TOPtesi bundle] \RequirePackage{ifxetex} \ifxetex\else \newcommand*\DeclareSlantedCapitalGreekLetters{% @@ -84,7 +84,7 @@ \wd0=\dimen0 \box0 \startbox}} {\catcode`\^^L=\active \global\let^^L\newpage} \DeclareRobustCommand*{\simulatedSC}[1]{% -{\check@mathfonts\fontsize{\sf@size}{\f@baselineskip}\selectfont#1}}% +{\mbox{$\relax$}\fontsize{\sf@size}{\f@baselineskip}\selectfont#1}}% \def\ft@figure{\iflanguage{italian}{\MakeLowercase{\figurename}}% {\figurename}~} \def\ft@table{\iflanguage{italian}{\MakeLowercase{\tablename}}% diff --git a/Master/texmf-dist/tex/latex/toptesi/topfront.sty b/Master/texmf-dist/tex/latex/toptesi/topfront.sty index beb924083e0..e85fe335068 100644 --- a/Master/texmf-dist/tex/latex/toptesi/topfront.sty +++ b/Master/texmf-dist/tex/latex/toptesi/topfront.sty @@ -28,7 +28,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{topfront}[2014/11/07 v.5.84 Title page for TOPtesi] +\ProvidesPackage{topfront}[2014/11/13 v.5.85b Title page for TOPtesi and other classes] \@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}} \ifcsundef{ifclassica}{% \newif\ifclassica @@ -40,11 +40,13 @@ \hbox to\hsize{\hfil{\Large{\@submitdate}}\hfil}}}% \let\@evenfoot\@oddfoot \def\@oddhead{ - \vbox to\headheight{\vss + \vbox to\headheight{\vss\iftopTPTlogos \hbox to\textwidth{% \headstrut\hfil \raisebox{3\baselineskip}{\usebox\TPT@logobox}\hfil\null% - }% + }\fi + \ifcsvoid{@ateneo}{}{\vskip\smallskipamount + \hbox to\textwidth{\hss\LARGE\@ateneo\hss}} \vss }% }% @@ -74,14 +76,21 @@ \newif\iflaureatriennale \laureatriennalefalse \def\monografia#1{\global\laureatriennaletrue \global\dottoratofalse - \global\def\titolo##1{\PackageWarning{toptesi}% + \global\def\titolo##1{\PackageWarning{topfront}% {Il titolo e' gia' stato impostato con il comando \string\monografia}}% - \gdef\@title{#1}} + \gdef\@titolo{#1}} \let\@stitle\empty -\newcommand*{\titolo}[2][]{{\def\@tempA{#1}% - \ifx\@tempA\empty\gdef\@stitle{#2}\else\gdef\@stitle{#1}\fi - \gdef\@title{#2}}} +\newcommand*{\titolo}[2][]{% +\ifbool{laureatriennale}{% +\PackageWarning{topfront}{Il titolo deve essere impostato con + il comando \string\monografia} +} +{\def\@tempA{#1}\ifdefempty{\@tempA}% + {\gdef\@stitle{#2}} + {\gdef\@stitle{#1}}% + \gdef\@titolo{#2}% +}} \def\sottotitolo#1{\gdef\@subtitle{#1}} \let\@materia\empty \def\Materia#1{\def\@materia{#1}}\let\materia\Materia @@ -89,7 +98,7 @@ \def\tutore#1{\gdef\@tutore{#1}} \def\direttore{\Direttoretrue\relatore}% \def\coordinatore{\Direttorefalse\relatore}% -\def\QualificaDirettore#1{\gdef{#1}} +\def\QualificaDirettore#1{\gdef\@PhDdirector{#1}}% \def\relatore#1{\gdef\@principaladviser{#1}} \def\secondorelatore#1{\gdef\@secondadviser{#1}} \def\terzorelatore#1{\gdef\@thirdadviser{#1}} @@ -108,11 +117,11 @@ \unless\ifclassica \def\@submitdate{#1 #2}% \else - \s@dutaTrieste#1 #2!% + \s@dutaclassica#1 #2!% \fi \fi }% -\def\s@dutaTrieste#1 #2!{% +\def\s@dutaclassica#1 #2!{% \if@ldstyle \s@paranumeri#2-!% \ifx\2\empty @@ -163,7 +172,6 @@ \newcommand\printloghi{\unless\ifvoid\TPT@logobox\usebox{\TPT@logobox}\fi} - \def\tutoreaziendale#1{\gdef\@tutoreaziendale{#1}} \newcommand\retrofrontespizio[1]{\long\gdef\@retrofrontespizio{#1}} \newcommand\FacoltaDi[1]{\gdef\@faculty{#1}} @@ -188,7 +196,7 @@ \IfFileExists{\jobname.cfg}{\input{\jobname.cfg}}% {\IfFileExists{toptesi.cfg}{\input{toptesi.cfg}}{}} \@ifundefined{@cyclename}{\def\@cyclename{ciclo}}{} -\@ifundefined{@title}{\def\@title{}}{} +\@ifundefined{@titolo}{\def\@titolo{}}{} \@ifundefined{@author}{\def\@author{}}{} \@ifundefined{@principaladviser}{\def\@principaladviser{}}{} \@ifundefined{@secondadviser}{\def\@secondadviser{}}{} @@ -237,36 +245,40 @@ \@ifundefined{@dissertazione}{\def\@dissertazione{Tesi di Dottorato}}{} \@ifundefined{@monografia}{\def\@monografia{Monografia di Laurea}}{} \@ifundefined{@InName}{\def\@InName{in}}{} -\newif\iftopTPTlogos -\newcommand\TPTcheckstar[1]{\def\TPTmaybestar{#1}\fr@ntespizio} -\def\frontespizio{% -\ifbool{classica}{\boolfalse{topTPTlogos}\fr@ntespizio}{\TPTcheckstar} -} +\newbool{topTPTlogos} \booltrue{topTPTlogos} +\newenvironment{frontespizio*}{\boolfalse{topTPTlogos}}{\fr@ntespizio} + +\newenvironment{frontespizio}{% + \ifdefstring{\@currenvir}{frontespizio} + {\booltrue{topTPTlogos}}{\fr@ntespizio} + }{% + \fr@ntespizio + } + +\newbool{AteneoInHead}\boolfalse{AteneoInHead} \def\fr@ntespizio{% \begingroup \ifclassica + \boolfalse{topTPTlogos} \thispagestyle{classica} + \ifcsvoid{@ateneo}{\def\@ateneo{Manca il nome dell'ateneo} + }{} \else -\ifdefstring{\TPTmaybestar}{*}{\@firstoftwo}{\@secondoftwo}% - {\boolfalse{topTPTlogos}\thispagestyle{classica}\TPTmaybestar}% - {\booltrue{topTPTlogos}\thispagestyle{titlepage}} + \thispagestyle{titlepage} \fi +\ifcsvoid{@ateneo}{}{\booltrue{AteneoInHead}} \oddsidemargin=\dimexpr(\oddsidemargin+\evensidemargin)/2\relax \evensidemargin \oddsidemargin \null\setcounter{page}{1}% \normalfont -\iftopTPTlogos - \ifcsvoid{@ateneo}{}{% - {\centering\LARGE \@ateneo\par}\bigskip + \ifbool{AteneoInHead}{}{% + {{\centering\LARGE \@ateneo\par}} } -\fi + \ifcsvoid{@nomeat}{} + {\ifbool{topTPTlogos}{\vspace*{3.5ex}}{\vspace*{-3ex}}% + {\centering\Large \@nomeat\par}\vfill} - \ifx\@nomeat\empty \else - {% - \centering - {\Large \@nomeat}\par}\vfill - \fi \begin{center} {\rmfamily\mdseries \ifdottorato @@ -305,7 +317,7 @@ \vspace{\stretch{0.2}} \begin{center} {\huge\bfseries \baselineskip=0.95em plus 1pt - \@title \par} + \@titolo \par} \end{center} \unless\ifx\@subtitle\empty \begin{center}% @@ -442,7 +454,7 @@ \@tutoreaziendale\par}} \par\clearpage \ifcsvoid{@retrofrontespizio}{}% - {\null\vfill\pagestyle{empty}\@retrofrontespizio\par\clearpage}% + {\null\vfill\thispagestyle{empty}\@retrofrontespizio\par\clearpage}% \endgroup} %% %% Copyright 2005-2014 Claudio Beccari diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls index 4e7d151a258..920bcdba6d6 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.cls +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.cls @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{toptesi}% -[2014/11/07 v.5.84 Class for typesetting university theses] +[2014/11/13 v.5.85b Class for typesetting university theses] \DeclareOption{a4paper}{\PassOptionsToClass{\CurrentOption}{report}} \DeclareOption{titlepage}{\PassOptionsToClass{\CurrentOption}{report}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}} diff --git a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty index 26bbdcbdf88..209ca0a4601 100644 --- a/Master/texmf-dist/tex/latex/toptesi/toptesi.sty +++ b/Master/texmf-dist/tex/latex/toptesi/toptesi.sty @@ -29,7 +29,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{toptesi}% -[2014/11/07 v.5.84 Extension for toptesi.cls]% +[2014/11/13 v.5.85b Extension for toptesi.cls]% \def\TRON{\tracingcommands \tw@ \tracingmacros \tw@} \def\TROFF{\tracingcommands\z@ \tracingmacros \z@} \let\TROF\TROFF @@ -60,9 +60,7 @@ \if@xivpt\input{size14.clo}\fi \newlength\interno \textheight 0.7\paperheight -\divide\textheight by \baselineskip -\multiply\textheight by \baselineskip -\advance\textheight by \topskip +\setlength{\textheight}{\dimexpr\textheight*\baselineskip/\baselineskip+\topskip} \ifx\f@size\@xivpt \setlength\interno{\dimexpr\paperwidth/6} \footskip=1,5\baselineskip @@ -70,10 +68,10 @@ \setlength\interno{\dimexpr\paperwidth/7} \footskip=2\baselineskip \fi +\textwidth=\dimexpr\paperwidth-2\interno\relax \oddsidemargin=\dimexpr\interno-1in\relax \evensidemargin=\oddsidemargin -\marginparwidth\interno -\advance\marginparwidth-2.5\marginparsep +\marginparwidth=\dimexpr\interno-2.5\marginparsep \AtBeginDocument{% \if@binding \PackageInfo{TOPtesi}{Margin width recalculation} @@ -87,7 +85,6 @@ oddsidemargin\space\space \the\oddsidemargin\MessageBreak evensidemargin\space \the\evensidemargin} \fi} -\textwidth=\dimexpr\paperwidth-2\interno\relax \def\lapagina{\thepage} \mark{{}{}} @@ -110,7 +107,8 @@ \ifdim\wd\@intesta>\textwidth \headWarn{\section}\fi% \underline{\makebox[\textwidth]{\footnotesize\slshape \strut\rightmark}}}% - \def\chaptermark##1{\markboth{\thechapter\ -- ##1}{}} + \def\chaptermark##1{% + \markboth{\thechapter\ -- ##1}{\thechapter\ -- ##1}} \def\sectionmark##1{\markright{\ifnum\c@secnumdepth>\z@ \thesection\ -- \fi ##1}}} \else @@ -159,7 +157,8 @@ \figurespagefalse \tablespagefalse \let\ps@blank\ps@plain -\newcommand*\blankpagestyle[1]{\expandafter\let\expandafter\blank@ps\csname ps@#1\endcsname} +\newcommand*\blankpagestyle[1]{% + \expandafter\let\expandafter\ps@blank\csname ps@#1\endcsname} \renewcommand\cleardoublepage[1][blank]{\clearpage\ifodd\value{page}\else \if@twoside\if@openright \clearpage\null\thispagestyle{#1}\clearpage\fi\fi\fi} @@ -171,7 +170,6 @@ \def\ringraziamenti{% \iffrontmatter\else\frontmattertrue\fi \chapter*{\acknowledgename}% - \addcontentsline{toc}{chapter}{\acknowledgename}% } \def\@chapter[#1]#2{\iffrontmatter\mainmatter\fi \ifnum \c@secnumdepth >\m@ne @@ -210,32 +208,23 @@ \Huge \bfseries #2\par}% \@endpart} \renewcommand\tableofcontents{% - \if@twocolumn\@restonecoltrue\onecolumn\else\@restonecolfalse\fi - \if@openright\cleardoublepage\else\clearpage\fi - \global\@topnum\z@ - \@afterindentfalse - \@schapter{\contentsname}% + \chapter*{\contentsname}% + \@mkboth{\contentsname}{\contentsname}% \@starttoc{toc}% \clearpage \if@restonecol\twocolumn\fi } \renewcommand\listoffigures{% - \if@twocolumn\@restonecoltrue\onecolumn\else\@restonecolfalse\fi - \if@openright\cleardoublepage\else\clearpage\fi - \global\@topnum\z@ - \@afterindentfalse - \@schapter{\listfigurename} + \chapter*{\listfigurename} \@mkboth{\listfigurename}{\listfigurename}% + \addcontentsline{toc}{chapter}{\listfigurename} \@starttoc{lof}% \clearpage \if@restonecol\twocolumn\fi } \renewcommand\listoftables{% - \if@twocolumn\@restonecoltrue\onecolumn\else\@restonecolfalse\fi - \if@openright\cleardoublepage\else\clearpage\fi - \global\@topnum\z@ - \@afterindentfalse - \@schapter{\listtablename}% + \chapter*{\listtablename}% + \addcontentsline{toc}{chapter}{\listtablename} \@mkboth{\listtablename}{\listtablename}% \@starttoc{lot}% \clearpage @@ -258,7 +247,7 @@ \listoffigures \let\addvspace=\saveaddvspace} \fi -} +\ifbool{@twoside}{\clearpage\thispagestyle{empty}\null\clearpage}{}} \onecolumn \if@twoside \flushbottom @@ -272,7 +261,7 @@ \brokenpenalty=10000 \def\interlinea#1{\linespread{#1}\selectfont} \def\endinterlinea{\par} -\def \@floatboxreset {% +\def\@floatboxreset {% \reset@font \linespread{1}% \normalsize @@ -283,7 +272,7 @@ \def\topfraction{1} \setcounter{bottomnumber}{1} \def\bottomfraction{.5} -\setcounter{totalnumber}{3} +\setcounter{totalnumber}{2} \def\textfraction{0} \def\floatpagefraction{0} \setcounter{dbltopnumber}{2} @@ -366,8 +355,8 @@ \@break@tfor\fi}\@tempB} \catcode`\^^Z=10 \topmargin 0pt -\let\summaryname\empty -\let\acknowledgename\empty +\providecommand*\summaryname{} +\providecommand*\acknowledgename{} \newcommand*\ExtendCaptions[3]{{% \@ifundefined{captions#1}{% \PackageWarning{toptesi}{Language option #1 not specified\MessageBreak @@ -388,19 +377,12 @@ Skipping any redefinition\MessageBreak}% \italiano \renewcommand\@chapapp{\chaptername}% } -\ifxetex - \AtBeginDocument{% - \unless\ifT@Pfrontespizio - \RequirePackage{topfront} - \fi - \RequirePackage{topcoman}% - } -\else +\AtBeginDocument{% \unless\ifT@Pfrontespizio - \RequirePackage{topfront} -\fi + \RequirePackage{topfront} + \fi \RequirePackage{topcoman}% -\fi +} \ifxetex\else \renewcommand*\not{\mathrel{\mathchoice% {\rlap{$\displaystyle\mkern2.5mu\mathnormal{/}$}}% @@ -437,7 +419,8 @@ Skipping any redefinition\MessageBreak}% \def\Candidate{Laureande} \fi\fi \newcounter{tomo} -\newcommand*{\tomo}{\clearpage\stepcounter{tomo}\frontespizio} +\newcommand*{\tomo}{\clearpage\stepcounter{tomo}\boolfalse{topTPTlogos}% + \fr@ntespizio} \renewcommand*{\lapagina}{% \ifnumeriromani \thepage @@ -448,7 +431,7 @@ Skipping any redefinition\MessageBreak}% \thepage \fi \fi - } +} \if@utoretitolo \if@twoside \renewcommand*{\ps@headings}{\let\@mkboth\markboth% @@ -466,7 +449,7 @@ Skipping any redefinition\MessageBreak}% \footnotesize\strut\textsl{\rightmark}}% \ifdim\wd\@intesta>\textwidth \headWarn{\section}\fi% \underline{\makebox[\textwidth]{\box\@intesta}}}% - \def\chaptermark##1{\markright{\thechapter\ -- ##1}{}}% + \def\chaptermark##1{\markright{\thechapter\ -- ##1}}% \def\sectionmark##1{}}% \else \renewcommand*{\ps@headings}{\let\@mkboth\markboth @@ -476,7 +459,7 @@ Skipping any redefinition\MessageBreak}% \textsc{% \@author\ifx\@secondauthor\empty\else\ et al.\fi: \@stitle}}% \setbox\tw@\hbox{\unless\ifxetex\latintext\fi\footnotesize\textsl{\rightmark}}% - \dimen@=2em\advance\dimen@\wd\z@\advance\dimen@\wd\tw@ + \dimen@=\dimexpr2em + \wd\z@ + \wd\tw@\relax \ifdim\dimen@<\textwidth \relax \else \setbox\z@\vbox{\hsize.48\textwidth\parindent\z@\raggedright @@ -504,7 +487,7 @@ Skipping any redefinition\MessageBreak}% \fi} \def\s@tanno#1-#2!{\oldstylenums{#1\EnDash#2}} -\def\EnDash{{\settowidth{\dimen@}{\large\sc I}% +\def\EnDash{{\settowidth{\dimen@}{\large\scshape I}% \setbox\tw@\hbox{2}\dimen\tw@.5\ht\tw@\advance\dimen\tw@-.5\dp\tw@ \dimen4\dimen\tw@\advance\dimen4by.0385ex\relax \advance\dimen\tw@-.0385ex\relax |