diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/toptesi/toptesi.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/toptesi/toptesi.sty | 75 |
1 files changed, 29 insertions, 46 deletions
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 |