summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-02-11 23:42:29 +0000
committerKarl Berry <karl@freefriends.org>2014-02-11 23:42:29 +0000
commit962b48c82ba3eb966bc79f4cc8abdfec8e57c5e5 (patch)
tree6600fe2af4a440b39660c8611a56190dc88c193f /Master/texmf-dist/tex
parent02ddc1ee00f9b04862a0515cd84481cbeb251d3f (diff)
suftesi (11feb14)
git-svn-id: svn://tug.org/texlive/trunk@32941 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/suftesi/suftesi.cls110
1 files changed, 72 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index 25d6acb05f2..6f5f1fab6e9 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -6,7 +6,7 @@
%%
%% suftesi.dtx (with options: `class')
%%
-%% Copyright 2009-2012 by Ivan Valbusa
+%% Copyright 2009-2014 by Ivan Valbusa
%%
%% This program is provided under the terms of the
%% LaTeX Project Public License distributed from CTAN
@@ -19,8 +19,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{suftesi}
- [2013/09/21 v1.9 A class for typesetting theses, books and articles]
-
+ [2014/02/11 v1.9a A class for typesetting theses, books and articles]
\ClassWarningNoLine{suftesi}{%
@@ -40,8 +39,11 @@
\newif\ifsuftesi@article
\newif\ifsuftesi@authortitle
\newif\ifsuftesi@periodical
+\newif\ifsuftesi@periodicalaureo
\newif\ifsuftesi@compact
+\newif\ifsuftesi@compactaureo
\newif\ifsuftesi@supercompact
+\newif\ifsuftesi@supercompactaureo
\newif\ifsuftesi@sufelements
\newif\ifsuftesi@nocrop
\newif\ifsuftesi@dottedtoc
@@ -62,7 +64,6 @@
\newif\ifsuftesi@fewfootnotes
\newif\ifsuftesi@partpage
\newif\ifsuftesi@FSPL
-\newif\ifsuftesi@periodicalaureo
\newif\ifsuftesi@screen
\newif\ifsuftesi@pagelefttoc
\newif\ifsuftesi@twocolumntoc
@@ -97,25 +98,25 @@
\fi}
\RequirePackage{geometry}
\define@choicekey{}{pagelayout}[\val\nr]
- {standard,periodical,compact,supercompact,supercompactaureo,elements,
- periodicalaureo}[standard]{%
+ {standard,periodical,compact,compactaureo,supercompact,
+ supercompactaureo,elements,periodicalaureo}[standard]{%
\ifcase\nr\relax
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
-\geometry{%
- heightrounded,
- a4paper,
- includeheadfoot=true,
- textwidth= 110mm,
- textheight= 220mm,
- marginratio= 1:2,
- marginparwidth= 30mm,
- marginparsep= 12pt}
+ \geometry{%
+ heightrounded,
+ a4paper,
+ includeheadfoot=true,
+ textwidth= 110mm,
+ textheight= 220mm,
+ marginratio= 1:2,
+ marginparwidth= 30mm,
+ marginparsep= 12pt}
\or
\suftesi@periodicaltrue
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\geometry{
- heightrounded,
- includeheadfoot=false,
+ heightrounded,
+ includeheadfoot=false,
textheight= 165mm,
textwidth= 110mm,
paperwidth= 170mm,
@@ -127,8 +128,8 @@
\suftesi@compacttrue
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\geometry{
- heightrounded,
- includeheadfoot=false,
+ heightrounded,
+ includeheadfoot=false,
textheight= 165mm,
textwidth= 110mm,
paperwidth= 160mm,
@@ -137,11 +138,24 @@
marginparwidth= 22mm,
marginparsep= 9pt}
\or
+\suftesi@compactaureotrue
+ \DeclareRobustCommand{\SUF@chaptersize}{\large}
+ \geometry{
+ heightrounded,
+ includeheadfoot=false,
+ textheight= 191mm,
+ textwidth= 118mm,
+ paperwidth= 160mm,
+ paperheight= 240mm,
+ marginratio= 2:3,
+ marginparwidth= 19mm,
+ marginparsep= 9pt}
+\or
\suftesi@supercompacttrue
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\geometry{
- heightrounded,
- includeheadfoot=false,
+ heightrounded,
+ includeheadfoot=false,
textheight= 150mm,
textwidth= 100mm,
paperwidth= 140mm,
@@ -150,11 +164,11 @@
marginparwidth= 18mm,
marginparsep= 8pt}
\or
-\suftesi@supercompacttrue
+\suftesi@supercompactaureotrue
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\geometry{
- heightrounded,
- includeheadfoot=false,
+ heightrounded,
+ includeheadfoot=false,
textheight= 175mm,
textwidth= 108mm,
paperwidth= 140mm,
@@ -164,7 +178,7 @@
marginparsep= 7pt}\or
\suftesi@elementspagelayouttrue
\geometry{%
- heightrounded,
+ heightrounded,
includeheadfoot=false,
textwidth= 251pt,
textheight= 502pt,
@@ -178,7 +192,7 @@
\suftesi@periodicalaureotrue
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\geometry{%
- heightrounded,
+ heightrounded,
includeheadfoot=true,
textwidth= 120mm,
textheight= 194mm,
@@ -959,6 +973,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
}
\else
\RequirePackage[LGR,T1]{fontenc}
+\RequirePackage{substitutefont}
\AtBeginDocument{\fontencoding{T1}\selectfont}
\ifsuftesi@standardfont
\RequirePackage{lmodern}
@@ -968,9 +983,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\RequirePackage[scaled=0.8]{beramono}
\renewcommand{\sfdefault}{iwona}
\AtBeginDocument{
+\substitutefont{LGR}{\rmdefault}{\SUF@greekfamily}
\DeclareRobustCommand{\greektext}{%
- \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}}%
- \DeclareTextFontCommand{\textgreek}{\greektext}
+ \usefont{LGR}{\SUF@greekfamily}{\f@series}{\f@shape}
+ \def\encodingdefault{LGR}}
+ \DeclareTextFontCommand{\textgreek}{\greektext}
}
\fi
\ifsuftesi@porson
@@ -1138,11 +1155,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\RequirePackage{extramarks}
\SUF@elements@CHAPTER
\SUF@elements@SECTIONS
-\ifsuftesi@periodicalaureo
+\ifsuftesi@periodical
\titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
\setkeys[SUF]{elements}{chapsize=80,chapposition=-83}
\else
-\ifsuftesi@periodical
+\ifsuftesi@periodicalaureo
\titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
\setkeys[SUF]{elements}{chapsize=80,chapposition=-83}
\else
@@ -1150,16 +1167,26 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
\setkeys[SUF]{elements}{chapsize=75,chapposition=-83}
\else
+\ifsuftesi@compactaureo
+ \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
+ \setkeys[SUF]{elements}{chapsize=75,chapposition=-83}
+\else
\ifsuftesi@supercompact
\titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
\setkeys[SUF]{elements}{chapsize=70,chapposition=-73}
\else
+\ifsuftesi@supercompactaureo
+ \titlespacing*{\chapter}{0em}{-1\baselineskip}{10pt}[0pt]
+ \setkeys[SUF]{elements}{chapsize=70,chapposition=-73}
+\else
\ifsuftesi@elementspagelayout
\titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
\setkeys[SUF]{elements}{chapsize=60,chapposition=-73}
\else
\titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt]
\setkeys[SUF]{elements}{chapsize=90,chapposition=-83}
+ \fi
+ \fi
\fi
\fi
\fi
@@ -1622,12 +1649,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
{\ifsuftesi@reverseauthortitle
\SUF@titlefont@Switch{\@title}%
\else\SUF@authorfont@Switch{\@author}\fi}%
- \label{begin:\thetitle}%
- \begingroup
+ \begingroup%
\let\thanks\@gobble
\addcontentsline{toc}{title}{\normalfont{\@author}\newline%
\itshape\@headtitle}
- \endgroup
+ \endgroup%
\vspace{2ex}\par
{\ifsuftesi@reverseauthortitle
\SUF@authorfont@Switch{\@author}%
@@ -1637,10 +1663,12 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\vskip2.5cm}
\newcommand{\includeart}[1]{%
\begingroup
- \setcounter{section}{0}
- \input{#1}\label{end:\thetitle}
- \clearpage
+ \cleardoublepage
+ \setcounter{section}{0}
+ \input{#1}%\label{end:\thetitle}
\global\let\@thanks\@empty
+ \global\let\@author\@empty
+ \global\let\@headtitle\@empty
\endgroup}
\newcommand{\frontispiece}{%
\thispagestyle{empty}%
@@ -1891,7 +1919,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\SUF@quotation@size}
{\endlist}
\ifsuftesi@fewfootnotes
-\AtBeginDocument{
+\AtBeginDocument{%
\def\@fnsymbol#1{\ensuremath{\ifcase#1\or*\or{*}{*}\or{*}{*}{*}\or%
\ClassError{suftesi}%
{Too many footnotes\MessageBreak
@@ -1916,7 +1944,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\renewcommand{\marginpar}[1]{\oldmarginpar%
[\SUF@mpsetup\raggedleft\hspace{0pt}{#1}]%
{\SUF@mpsetup\raggedright\hspace{0pt}{#1}}}
-\AtBeginDocument{
+\AtBeginDocument{%
\@ifpackageloaded{todonotes}{%
\renewcommand{\@todonotes@drawMarginNoteWithLine}{%
\begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
@@ -2372,6 +2400,8 @@ Janusz M. Nowacki.
}
\else
\renewcommand\tableofcontents{%
+ \author{\contentsname}%
+ \title{\contentsname}%
\if@twocolumn
\@restonecoltrue\onecolumn
\else
@@ -2392,6 +2422,8 @@ Janusz M. Nowacki.
\if@restonecol\twocolumn\fi
}
\renewcommand\listoffigures{%
+ \author{\listfigurename}%
+ \title{\listfigurename}%
\if@twocolumn
\@restonecoltrue\onecolumn
\else
@@ -2411,6 +2443,8 @@ Janusz M. Nowacki.
\if@restonecol\twocolumn\fi
}
\renewcommand\listoftables{%
+ \author{\listtablename}%
+ \title{\listtablename}%
\if@twocolumn
\@restonecoltrue\onecolumn
\else