From 96aea860b860d3c8e29399d29564f973f131df0b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 24 Mar 2016 22:28:32 +0000 Subject: suftesi (22mar16) git-svn-id: svn://tug.org/texlive/trunk@40128 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/suftesi/suftesi.cls | 442 ++++++++---------------- 1 file changed, 146 insertions(+), 296 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls index 01d9cb1d1dd..e737293a29b 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-2015 by Ivan Valbusa +%% Copyright 2009-2016 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN @@ -19,10 +19,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesClass{suftesi} - [2016/03/13 v2.6 A class for typesetting theses, books and articles] -%% -%% \section*{Feedback} - % \begin{table}[h] + [2016/03/22 v2.7.1 A class for typesetting theses, books and articles] \ClassWarningNoLine{suftesi}{% ******************************************\MessageBreak @@ -32,7 +29,7 @@ * SEE DOCUMENTATION FOR DETAILS.\MessageBreak * ANYWAY, DON'T WORRY!\MessageBreak * THIS IS A HARMLESS MESSAGE :-)\MessageBreak - ******************************************}{}% + ******************************************} \RequirePackage{xkeyval} \newif\ifsuftesi@compatibility \newif\ifsuftesi@nofont @@ -45,6 +42,8 @@ \newif\ifsuftesi@artemisia \newif\ifsuftesi@bodoni \newif\ifsuftesi@cbgreek +\newif\ifsuftesi@mathminimal +\newif\ifsuftesi@mathextended \newif\ifsuftesi@centerheader \newif\ifsuftesi@sufplain \newif\ifsuftesi@article @@ -55,8 +54,9 @@ \newif\ifsuftesi@compactaureo \newif\ifsuftesi@supercompact \newif\ifsuftesi@supercompactaureo -\newif\ifsuftesi@sufelements \newif\ifsuftesi@nocrop +\newif\ifsuftesi@screen +\newif\ifsuftesi@screencentered \newif\ifsuftesi@dottedtoc \newif\ifsuftesi@raggedtoc \newif\ifsuftesi@numparpart @@ -67,33 +67,28 @@ \newif\ifsuftesi@smallcapspart \newif\ifsuftesi@smallcapschap \newif\ifsuftesi@smallcapssec -\newif\ifsuftesi@elementschap -\newif\ifsuftesi@elementsheader -\newif\ifsuftesi@elementsstructure -\newif\ifsuftesi@elementspagelayout \newif\ifsuftesi@draftdate \newif\ifsuftesi@fewfootnotes \newif\ifsuftesi@partpage \newif\ifsuftesi@FSPL -\newif\ifsuftesi@screen \newif\ifsuftesi@pagelefttoc \newif\ifsuftesi@twocolumntoc \newif\ifsuftesi@twocolumnlof \newif\ifsuftesi@twocolumnlot \newif\ifsuftesi@reverseauthortitle \newif\ifsuftesi@collection -\newif\ifsuftesi@mathminimal -\newif\ifsuftesi@mathextended +\DeclareOption{a4paper}{% + \ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}} \DeclareOption{a5paper}{% - \ClassError{suftesi}{Option 'a5paper' not available}} + \ClassWarningNoLine{suftesi}{Option 'a5paper' not available}{}} \DeclareOption{b5paper}{% - \ClassError{suftesi}{Option 'b5paper' not available}} + \ClassWarningNoLine{suftesi}{Option 'b5paper' not available}{}} \DeclareOption{legalpaper}{% - \ClassError{suftesi}{Option 'legalpaper' not available}} + \ClassWarningNoLine{suftesi}{Option 'legalpaper' not available}{}} \DeclareOption{executivepaper}{% - \ClassError{suftesi}{Option 'executivepaper' not available}} + \ClassWarningNoLine{suftesi}{Option 'executivepaper' not available}{}} \DeclareOption{landscape}{% - \ClassError{suftesi}{Option 'landscape' not available}} + \ClassWarningNoLine{suftesi}{Option 'landscape' not available}{}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} \ProcessOptions \relax @@ -111,6 +106,9 @@ \fi} \define@choicekey{}{documentstructure}[\val\nr] {book,article,collection}[book]{% +\ClassWarningNoLine{suftesi}{% + 'documentstructure' option is deprecated.\MessageBreak + Use 'structure' option instead} \ifcase\nr\relax \disable@keys{}{secnumstyle} \or @@ -123,7 +121,7 @@ \RequirePackage{geometry} \define@choicekey{}{pagelayout}[\val\nr] {standard,standardaureo,periodical,compact,compactaureo,supercompact, - supercompactaureo,elements,periodicalaureo}[standard]{% + supercompactaureo,periodicalaureo}[standard]{% \ifcase\nr\relax \DeclareRobustCommand{\SUF@chaptersize}{\Large} \DeclareRobustCommand{\SUF@sectionsize}{\large} @@ -135,7 +133,7 @@ includeheadfoot=true, textwidth= 110mm, textheight= 220mm, - marginratio= 1:2, + marginratio= 2:3, marginparwidth= 30mm, marginparsep= 12pt} \or @@ -231,19 +229,7 @@ paperheight= 210mm, marginratio= 1:1, marginparwidth= 11mm, - marginparsep= 7pt}\or -\suftesi@elementspagelayouttrue - \geometry{% - heightrounded, - includeheadfoot=false, - textwidth= 251pt, - textheight= 502pt, - paperwidth= 374pt, - paperheight= 648pt, - vmarginratio= 1:2, - marginparwidth= 60pt, - marginparsep= 18pt, - outer= 90pt} + marginparsep= 7pt} \or \suftesi@periodicalaureotrue \DeclareRobustCommand{\SUF@chaptersize}{\large} @@ -281,7 +267,7 @@ \suftesi@numparparttrue \fi} \define@choicekey{}{chapstyle}[\val\nr]{% - left,center,right,parleft,parcenter,parright,elements}[left]{% + left,center,right,parleft,parcenter,parright}[left]{% \ifcase\nr\relax \def\SUF@lr@CHAPSwitch{\filright} \or @@ -297,8 +283,6 @@ \or \def\SUF@lr@CHAPSwitch{\filleft} \suftesi@numparchaptrue -\or - \suftesi@elementschaptrue \fi} \define@choicekey{}{secstyle}[\val\nr]{% left,center,right,parleft,parcenter,parright}[left]{% @@ -496,7 +480,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% \fi} \define@choicekey{}{headerstyle}[\val\nr] {inner,center,plain,authortitleinner, - authortitlecenter,elements}[inner]{% + authortitlecenter}[inner]{% \ifcase\nr\relax \def\SUF@rightmark{\SUF@Rheadstyle{\rightmark}} \def\SUF@leftmark{\SUF@Lheadstyle{\SUF@leftrightmark}} @@ -515,8 +499,6 @@ dotarabic,dotroman,dotRoman}[arabic]{% \def\SUF@rightmark{\let\thanks\@gobble\SUF@Rheadstyle{\@headtitle}} \def\SUF@leftmark{\let\thanks\@gobble\SUF@Lheadstyle{\@author}} \suftesi@centerheadertrue -\or - \suftesi@elementsheadertrue \fi} \define@choicekey{}{headerfont}[\val\nr] {roman,italic,smallcaps}[roman]{% @@ -600,7 +582,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% \fi} \RequirePackage{caption} \define@choicekey{}{captionstyle}[\val\nr] - {standard,sanserif,italic,smallcaps,elements}[standard]{% + {standard,sanserif,italic,smallcaps}[standard]{% \ifcase\nr\relax \captionsetup{labelsep=period,font=small} \or @@ -611,9 +593,6 @@ dotarabic,dotroman,dotRoman}[arabic]{% \captionsetup{font+=it} \or \captionsetup{labelsep=period,font=small,labelfont=sc} -\or - \captionsetup{labelsep=period,font=small} - \captionsetup{font+=sf} \fi } \define@choicekey{}{marginpar}[\val\nr] @@ -726,21 +705,29 @@ dotarabic,dotroman,dotRoman}[arabic]{% \or \fi} \define@choicekey{}{version}[\val\nr] - {screen,draft,final}[draft]{% + {screen,cscreen,draft,final}[draft]{% \ifcase\nr\relax + \suftesi@screentrue + \suftesi@nocroptrue +\or + \suftesi@screentrue + \suftesi@screencenteredtrue \suftesi@nocroptrue - \newcommand*\crop[1][]{} - \geometry{hmarginratio=1:1} \or \or \AtBeginDocument{\crop[off]} \fi} \define@choicekey{}{crop}[\val\nr] {true,false}[true]{% +\ClassWarningNoLine{suftesi}{% + 'crop' option is deprecated.\MessageBreak + Use 'version' option instead} \ifcase\nr\relax + \suftesi@screenfalse \or \suftesi@nocroptrue - \newcommand*\crop[1][]{} + \suftesi@screentrue + \suftesi@screencenteredfalse \fi} \define@choicekey{}{titlepage}[\val\nr] {true,false}[true]{% @@ -755,7 +742,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% italic7,italic8,italic9,italic10,italic11,italic12, smallcaps1,smallcaps2,smallcaps3,smallcaps4,smallcaps5,smallcaps6, smallcaps7,smallcaps8,smallcaps9,smallcaps10,smallcaps11,smallcaps12, - elements,sufelements,FSPLa,FSPLb,FSPLc} + FSPLa,FSPLb,FSPLc} [roman1]{% \ifcase\nr\relax \setkeys{}{chapstyle=left} @@ -771,60 +758,60 @@ dotarabic,dotroman,dotRoman}[arabic]{% \setkeys{}{chapstyle=parright} \or \setkeys{}{ - chapstyle=left, - chapfont=italic, - tocchapfont=italic, - headerfont=italic} + chapstyle=left, + chapfont=italic, + tocchapfont=italic, + headerfont=italic} \or \setkeys{}{ - chapstyle=center, - chapfont=italic, - tocchapfont=italic, - headerfont=italic} + chapstyle=center, + chapfont=italic, + tocchapfont=italic, + headerfont=italic} \or \setkeys{}{ - chapstyle=right, - chapfont=italic, - tocchapfont=italic, - headerfont=italic} + chapstyle=right, + chapfont=italic, + tocchapfont=italic, + headerfont=italic} \or \setkeys{}{ - chapstyle=parleft, - chapfont=italic, - tocchapfont=italic, - headerfont=italic} + chapstyle=parleft, + chapfont=italic, + tocchapfont=italic, + headerfont=italic} \or \setkeys{}{ - chapstyle=parcenter, - chapfont=italic, - headerfont=italic} + chapstyle=parcenter, + chapfont=italic, + headerfont=italic} \or \setkeys{}{ - chapstyle=parright, - chapfont=italic, - tocchapfont=italic, - headerfont=italic} + chapstyle=parright, + chapfont=italic, + tocchapfont=italic, + headerfont=italic} \or \setkeys{}{ - chapstyle=left, - chapfont=italic, - tocchapfont=italic, - secfont=smallcaps, - headerfont=italic} + chapstyle=left, + chapfont=italic, + tocchapfont=italic, + secfont=smallcaps, + headerfont=italic} \or \setkeys{}{ - chapstyle=center, - chapfont=italic, - tocchapfont=italic, - secfont=smallcaps, - headerfont=italic} + chapstyle=center, + chapfont=italic, + tocchapfont=italic, + secfont=smallcaps, + headerfont=italic} \or \setkeys{}{ - chapstyle=right, - chapfont=italic, - tocchapfont=italic, - secfont=smallcaps, - headerfont=italic} + chapstyle=right, + chapfont=italic, + tocchapfont=italic, + secfont=smallcaps, + headerfont=italic} \or \setkeys{}{ chapstyle=parleft, @@ -834,18 +821,18 @@ dotarabic,dotroman,dotRoman}[arabic]{% headerfont=italic} \or \setkeys{}{ - chapstyle=parcenter, - chapfont=italic, - tocchapfont=italic, - secfont=smallcaps, - headerfont=italic} + chapstyle=parcenter, + chapfont=italic, + tocchapfont=italic, + secfont=smallcaps, + headerfont=italic} \or \setkeys{}{ - chapstyle=parright, - chapfont=italic, - tocchapfont=italic, - secfont=smallcaps, - headerfont=italic} + chapstyle=parright, + chapfont=italic, + tocchapfont=italic, + secfont=smallcaps, + headerfont=italic} \or \setkeys{}{ chapstyle=left, @@ -924,24 +911,6 @@ dotarabic,dotroman,dotRoman}[arabic]{% tocchapfont=smallcaps, secfont=smallcaps, headerfont=smallcaps} -\or - \setkeys{}{ - pagelayout=elements, - headerstyle=elements, - chapstyle=elements, - secfont=smallcaps, - subsecfont=italic, - captionstyle=elements} -\disable@keys{} - {pagelayout,headerstyle,chapstyle,secfont,subsecfont,captionstyle} -\or - \setkeys{}{ - chapstyle=elements, - headerfont=smallcaps, - secfont=smallcaps, - subsecfont=italic} -\disable@keys{} - {headerstyle,chapstyle,secfont,subsecfont} \or \suftesi@periodicalaureotrue \suftesi@FSPLtrue @@ -954,7 +923,7 @@ dotarabic,dotroman,dotRoman}[arabic]{% liststyle=indented, tocstyle=leftpage} \disable@keys{} -{structure,pagelayout,partfont,chapfont,secfont,% +{structure,documentstructure,pagelayout,partfont,chapfont,secfont,% subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,% subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,% secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,% @@ -972,7 +941,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} liststyle=indented, tocstyle=leftpage} \disable@keys{} -{structure,pagelayout,partfont,chapfont,secfont,% +{structure,documentstructure,pagelayout,partfont,chapfont,secfont,% subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,% subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,% secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,% @@ -991,7 +960,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} liststyle=indented, tocstyle=leftpage} \disable@keys{} -{structure,pagelayout,partfont,chapfont,secfont,% +{structure,documentstructure,pagelayout,partfont,chapfont,secfont,% subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,% subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,% secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,% @@ -1085,12 +1054,10 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \definecolor{sufgray}{rgb}{0.5,0.5,0.5} \RequirePackage{multicol} \RequirePackage{emptypage} -\RequirePackage{ifxetex} -\RequirePackage{ifluatex} -\RequirePackage{ifthen} +\RequirePackage{iftex} \RequirePackage{microtype} \RequirePackage{textcase} - \AtBeginDocument{ +\AtBeginDocument{ \@ifpackageloaded{hyperref}{% \def\@uclcnotmath#1#2#3#4{\begingroup #1% \def \({$}\let \)\(\def \NoCaseChange ##1{% @@ -1115,8 +1082,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \RequirePackage{cclicenses} \else \fi -\ifthenelse{\boolean{xetex}\or\boolean{luatex}} -{% if xetex or luatex +\unless\ifPDFTeX%if xelatex or lualatex \AtBeginDocument{% \@ifpackageloaded{fontspec} {\relax} @@ -1134,15 +1100,14 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} * load 'fontspec' \MessageBreak ************************************}} } - } -{% if pdftex +\else% if pdftex \RequirePackage[LGR,T1]{fontenc} \RequirePackage{substitutefont} \AtBeginDocument{\fontencoding{T1}\selectfont} \ifsuftesi@nofont \ifsuftesi@greekfont \ClassWarningNoLine{suftesi}{% - Unused 'greekfont' option}{}% + Unused 'greekfont' option}% \suftesi@greekfontfalse \else\suftesi@greekfontfalse\fi \else @@ -1150,7 +1115,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \RequirePackage{lmodern} \ifsuftesi@greekfont \ClassWarningNoLine{suftesi}{% - Unused 'greekfont' option}{}% + Unused 'greekfont' option}% \suftesi@greekfontfalse \else\suftesi@greekfontfalse\fi \else @@ -1176,12 +1141,9 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \fi \fi \else - \ClassError{suftesi}{\MessageBreak - Set one of the following options\MessageBreak - greekfont=artemisia,\MessageBreak - greekfont=porson,\MessageBreak - greekfont=cbgreek}{\MessageBreak - Set one of the following options\MessageBreak + \ClassWarningNoLine{suftesi}{\MessageBreak + If you need the Greek font remember\MessageBreak + to set one of the following options:\MessageBreak greekfont=artemisia,\MessageBreak greekfont=porson,\MessageBreak greekfont=cbgreek} @@ -1189,21 +1151,22 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \else \ifsuftesi@palatino \RequirePackage[full]{textcomp} - \RequirePackage[osf]{newpxtext} + \RequirePackage{newpxtext} \RequirePackage[scaled=1.06]{biolinum} \RequirePackage[varqu,varl]{inconsolata} \ifsuftesi@mathextended - \RequirePackage{amsmath} \RequirePackage{amsthm} \RequirePackage[bigdelims,vvarbb]{newpxmath} \RequirePackage[cal=boondoxo]{mathalfa} \else \ifsuftesi@mathminimal \RequirePackage[bigdelims,vvarbb]{newpxmath} - \RequirePackage[cal=boondoxo]{mathalfa} \else \fi \fi + \useosf + \useproportional + \ifsuftesi@greekfont \ifsuftesi@bodoni \gdef\SUFfntscale{0.96} \else @@ -1220,20 +1183,26 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \fi \fi \fi + \else + \ClassWarningNoLine{suftesi}{\MessageBreak + If you need the Greek font remember\MessageBreak + to set one of the following options:\MessageBreak + greekfont=artemisia,\MessageBreak + greekfont=porson,\MessageBreak + greekfont=cbgreek} + \fi \else \ifsuftesi@libertine \RequirePackage{textcomp} \RequirePackage[sb]{libertine} \RequirePackage[varqu,varl,scaled=0.94]{inconsolata} \ifsuftesi@mathextended - \RequirePackage{amsmath} \RequirePackage{amsthm} \RequirePackage[libertine,bigdelims,vvarbb]{newtxmath} \RequirePackage[cal=boondoxo]{mathalfa} \else \ifsuftesi@mathminimal \RequirePackage[libertine,bigdelims,vvarbb]{newtxmath} - \RequirePackage[cal=boondoxo]{mathalfa} \else \fi \fi @@ -1257,14 +1226,12 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \RequirePackage[varqu,varl,var0]{inconsolata} \RequirePackage{biolinum} \ifsuftesi@mathextended - \RequirePackage{amsmath} \RequirePackage{amsthm} \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath} \RequirePackage[cal=boondoxo]{mathalfa} \else \ifsuftesi@mathminimal \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath} - \RequirePackage[cal=boondoxo]{mathalfa} \else \fi \fi @@ -1289,8 +1256,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \fi \fi \fi -} -\ifxetex\else\ifluatex\else +\fi +\unless\ifPDFTeX\else \ifsuftesi@greekfont \ifsuftesi@artemisia \def\SUF@greekfamily{artemisia} @@ -1360,6 +1327,14 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \else \fi \fi +\ifsuftesi@screen + \newcommand*\crop[1][]{} + \ifsuftesi@screencentered + \geometry{hmarginratio=1:1} + \else + \fi +\else + \RequirePackage[a4,cam,center]{crop} \fi \ifsuftesi@nocrop \relax @@ -1369,64 +1344,17 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \RequirePackage{titlesec} \newlength{\sectionsep} \setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt} -\ifthenelse{\boolean{xetex}\or\boolean{luatex}} - {% if xetex or luatex +\unless\ifPDFTeX% if xetex or luatex \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{% \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}} \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{% \addfontfeature{LetterSpace=6}\scshape\suftesi@MakeTextLowercase{#1}} - \newcommand{\chapnumfont}[1]{% - \def\SUF@chapnumfont{#1}} - \chapnumfont{\relax}% - } - {% if pdftex +\else% if pdftex \DeclareRobustCommand{\SUF@titlesmallcaps}[1]{% \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}% \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{% \scshape\suftesi@MakeTextLowercase{\lsstyle #1}}% - \newcommand{\chapnumfont}[1]{% - \def\SUF@chapnumfont{\fontfamily{#1}}} - \chapnumfont{pplj} - } -\define@key[SUF]{elements}{chapsize}[90]{% - \def\cmdSUF@elements@chapsize{\fontsize{#1}{#1}\selectfont}} -\define@key[SUF]{elements}{chapposition}[-83]{% - \def\cmdSUF@elements@chapposition{#1}} -\def\SUF@elements@CHAPTER{% - \titleformat{\chapter}[block] - {\Large}% - {\begin{picture}(0,0) - \setlength{\unitlength}{1pt} - \SUF@chapnumfont% - \cmdSUF@elements@chapsize - \put(0,\cmdSUF@elements@chapposition){% - \hskip\dimexpr(\textwidth+0.9\marginparsep)% - \textcolor{sufgray}{\SUF@thechapter}}% - \end{picture}}% - {0pt} - {\SUF@titlesmallcaps} - [\vspace*{-6pt}\rule{\textwidth}{.1pt}] - } -\def\SUF@elements@SECTIONS{ -\titleformat{\section}[block] - {\extramarks{}{}\filright} - {\textnormal\thesection} - {1em} - {\SUF@titlesmallcaps} -\titlespacing*{\section}{0em}{1em}{1em}[0em] -\titleformat{\subsection}[block] - {\filright\normalsize\itshape} - {\textnormal\thesubsection} - {1em} - {} - \titlespacing*{\subsection}{0em}{\baselineskip}{\baselineskip}[0em] -\titleformat{\subsubsection}[block] - {\filright\normalsize} - {\textnormal\thesubsubsection} - {1em} - {} - \titlespacing*{\subsubsection}{0em}{\baselineskip}{\baselineskip}[0em] -} +\fi \newlength\SUF@ADJnumparchap \def\SUF@default@CHAPTER{ \ifsuftesi@numparchap @@ -1496,50 +1424,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex] \fi } -\ifsuftesi@elementschap -\RequirePackage{extramarks} - \SUF@elements@CHAPTER - \SUF@elements@SECTIONS -\ifsuftesi@periodical - \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt] - \setkeys[SUF]{elements}{chapsize=80,chapposition=-83} -\else -\ifsuftesi@periodicalaureo - \titlespacing*{\chapter}{0em}{-\baselineskip}{10pt}[0pt] - \setkeys[SUF]{elements}{chapsize=80,chapposition=-83} -\else -\ifsuftesi@compact - \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 - \fi -\fi -\else - \SUF@default@CHAPTER - \SUF@default@SECTIONS +\SUF@default@CHAPTER +\SUF@default@SECTIONS \ifsuftesi@periodicalaureo \titlespacing*{\chapter}{0em}{0\SUF@ADJnumparchap}{18ex} \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex} @@ -1559,9 +1445,8 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \titlespacing*{\chapter}{0em}{% \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex} \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex} - \fi - \fi - \fi + \fi + \fi \fi \fi \ifsuftesi@article @@ -1762,7 +1647,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} ***********************************\MessageBreak * To use the \noexpand\makecover command\MessageBreak * load the 'tikz' package.\MessageBreak - ************************************}{}}} + ************************************}{\MessageBreak% + ***********************************\MessageBreak + * To use the \noexpand\makecover command\MessageBreak + * load the 'tikz' package.\MessageBreak + ************************************}}} } \def\isbn#1{\gdef\@isbn{#1}} \def\@issn{\@latex@warning@no@line{% @@ -2227,33 +2116,17 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} {} [\addvspace{1ex}] } -\ifsuftesi@sufelements -\renewcommand\appendix{\par +\ifsuftesi@article + \renewcommand\appendix{\par + \setcounter{section}{0}% + \setcounter{subsection}{0}% + \gdef\SUF@thesection{\@Alph\c@section}} +\else + \renewcommand\appendix{\par \setcounter{chapter}{0}% \setcounter{section}{0}% \gdef\@chapapp{\appendixname}% - \gdef\thechapter{\@Alph\c@chapter} - \titleformat{\chapter}[block] - {\vskip-22pt}% - {\small% - \SUF@titlesmallcaps{\appendixname}~\Alph{chapter}:\hskip.5em} - {0pt} - {\small\SUF@titlesmallcaps} - [\rule{\textwidth}{.4pt}] - \titlespacing*{\chapter}{0em}{-16pt}{10pt}[0em]} - \else - \ifsuftesi@article - \renewcommand\appendix{\par - \setcounter{section}{0}% - \setcounter{subsection}{0}% - \gdef\SUF@thesection{\@Alph\c@section}} - \else - \renewcommand\appendix{\par - \setcounter{chapter}{0}% - \setcounter{section}{0}% - \gdef\@chapapp{\appendixname}% - \gdef\SUF@thechapter{\@Alph\c@chapter}} - \fi + \gdef\SUF@thechapter{\@Alph\c@chapter}} \fi \RequirePackage{fancyhdr} \newcommand{\versionstring}[1]{\def\version@string{#1}} @@ -2263,35 +2136,13 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \renewcommand{\headrulewidth}{0pt} \renewcommand{\footnoterule}{} \def\SUF@versionstring{\texttt{\version@string{} \today}} -\ifsuftesi@elementsheader% - \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}} - \renewcommand{\sectionmark}[1]{\markright{#1}} - \fancypagestyle{elements}{% - \setlength{\unitlength}{1pt} - \fancyhf{} - \fancyfoot[LE,RO]{\thepage} - \fancyhead[RO]{% - \begin{picture}(0,0) - \put(0,-104){% - \hskip\marginparsep - \parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}% - \end{picture}} - \fancyhead[LE]{% - \begin{picture}(0,0) - \put(0,-104){% - \hskip-\dimexpr(\marginparwidth+\marginparsep) - \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}% - \end{picture}}% - }% -\else \renewcommand{\chaptermark}[1]{% - \markboth{\chaptertitlename\ \SUF@thechapter}{#1}} + \markboth{\chaptertitlename\ \SUF@thechapter}{#1}} \ifsuftesi@article \renewcommand{\sectionmark}[1]{\markright{\SUF@thesection.\ #1}} \else \renewcommand{\sectionmark}[1]{} \fi -\fi \fancypagestyle{plain}{\fancyhf{}} \fancypagestyle{sufplain}{% \fancyhf{}% @@ -2329,9 +2180,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \if@mainmatter\leftmark\else\rightmark\fi} \pagestyle{sufdefault} \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi - \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi - \ifsuftesi@elementsheader\pagestyle{elements}\else\fi -} + \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi} \renewenvironment{quotation} {\list{}{\listparindent\parindent% \itemindent \listparindent @@ -2373,8 +2222,7 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent} \xdef\@thefnmark{#1}% \@footnotemark\@footnotetext} \def\SUF@mpsetup{% - \ifsuftesi@elementsheader\relax - \else\itshape\fi + \itshape \footnotesize% \parindent=0pt \lineskip=0pt \lineskiplimit=0pt % \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300% @@ -2999,9 +2847,11 @@ Janusz M. Nowacki. \@ifpackageloaded{polyglossia} {\AtBeginDocument{\RequirePackage{fixltxhyph}}}{} \let\hemph\emph -\ifthenelse{\boolean{xetex}\or\boolean{luatex}} - {\let\@afterindenttrue\@afterindentfalse} - {\relax} +\unless\ifPDFTeX% if xetex or luatex + \let\@afterindenttrue\@afterindentfalse + \else + \relax +\fi \frenchspacing \endinput %% -- cgit v1.2.3