summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/suftesi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-17 23:16:24 +0000
committerKarl Berry <karl@freefriends.org>2013-04-17 23:16:24 +0000
commitde97f190228777ff166289a77d7cdcbf5f922d8f (patch)
treeb9a7973220c9acb6fa5e0f05875b6717dc7ca3de /Master/texmf-dist/source/latex/suftesi
parent7812e24da2d1464452478e207a0494d04ef01859 (diff)
suftesi (17apr13)
git-svn-id: svn://tug.org/texlive/trunk@30000 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/suftesi')
-rw-r--r--Master/texmf-dist/source/latex/suftesi/suftesi.dtx131
1 files changed, 71 insertions, 60 deletions
diff --git a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
index 4daf6952e81..e141f126350 100644
--- a/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
+++ b/Master/texmf-dist/source/latex/suftesi/suftesi.dtx
@@ -23,7 +23,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [2013/03/22 v1.5 A class for typesetting theses, books and articles]
+ [2013/04/17 v1.6 A class for typesetting theses, books and articles]
%</class>
%<*driver>
\documentclass{ltxdoc}
@@ -133,7 +133,7 @@
%</driver>
% \fi
%
-% \CheckSum{3346}
+% \CheckSum{3356}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -150,7 +150,9 @@
% Right bracket \] Circumflex \^ Underscore \_
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
-% \changes{v1.5}{}{\sty{microtype} loaded for all engines. Improved compatibility with \sty{todonotes} package and with \sty{mdframed} and \sty{bookmark} packages when using \sty{style} class option}
+%
+% \changes{v1.6}{2013/04/17}{New option \opt{viewmode}. Corrected bugs in definition of \cmd{listoffigures}, \cmd{listoftables} and \cmd{tableofcontens} commands. Updated documentation.}
+% \changes{v1.5}{2013/03/22}{The \sty{microtype} package is loaded for all engines. Improved compatibility with \sty{todonotes} package and with \sty{mdframed} and \sty{bookmark} packages when using \sty{style} class option. New option \opt{viewmode}}
% \changes{v1.4}{2013/03/15}{New value \opt{periodicalaureo} for option \opt{pagelayout}. Changed code for \cmd{xfootnote} command.}
% \changes{v1.3}{2013/03/05}{Updated documentation. Added \opt{FSPLa},
% \opt{FSPLb} and \opt{FSPLc} styles.}
@@ -240,7 +242,7 @@
%
% \newgeometry{margin=3cm}
%
-% \noindent Copyright \copyright\ 2009-2012 Ivan Valbusa.\\[2ex]
+% \noindent Copyright \copyright\ 2009-2013 Ivan Valbusa.\\[2ex]
%
% \noindent This package is
% author-maintained. Permission is granted to copy, distribute and/or
@@ -276,7 +278,7 @@
% \tableofcontents
% \end{multicols}
%
-% \newgeometry{margin=3cm,bottom=1.5cm,top=1cm}
+% \newgeometry{margin=2.8cm,bottom=1.5cm,top=1cm}
%
% \section{Class features}
%
@@ -296,31 +298,21 @@
%
% The class provides five page layouts. The \opt{standard} layout (set by default) is aimed to typeset standard A4 documents, while the other four layouts are particularly suitable to typeset books and article. See table \ref{tab:layouts} for details.
% \begin{table*}[h!]
-% \footnotesize\centering
+% \small\centering
+%\makebox[\textwidth][c]{\begin{tabular}{lcccccccc}
+%\toprule
+%&\multicolumn{4}{c}{Dimensions (mm)}&\multicolumn{4}{c}{Proportions}\\\cmidrule(l){2-5}\cmidrule(l){6-9}
+%&\multicolumn{2}{c}{Text}&\multicolumn{2}{c}{Page}& \multicolumn{2}{c}{Margins}&&\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}
+%Options: &width & height& width& height&t/b&i/o&Text block& Page\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(lr){8-9}\cmidrule(r){1-1}
+%\opt{standard} & 110& 220& 210& 297&$1:2$&$1:2$&$1:2$&$1:\sqrt{2}$\\
+%\opt{compact}& 110& 165& 160& 240&$2:3$&$2:3$&$2:3$&$2:3$\\
+%\opt{supercompact}& 100 &150& 140& 210&$2:3$&$2:3$&$2:3$&$2:3$\\
+%\opt{periodical} &110& 165& 170& 240&$2:3$&$2:3$&$2:3$&$1:\sqrt{2}$\\
+%\opt{periodicalaureo}& 120& 194& 170& 240&$2:3$&$2:3$&$2:3$&$1:\sqrt{2}$\\
+%
+%\opt{elements} (pt)& 251& 502& 374& 648&$1:2$&$2:5$&$1:2$&$1:\sqrt{3}$\\\bottomrule
+%\end{tabular}}
% \caption{The layouts of \sty{suftesi}}\label{tab:layouts}
-% \begin{tabular}{p{3cm}ccccc}
-% \toprule
-% & \multicolumn{5}{c}{Options}\\\cmidrule{2-6}
-% & (mm) \opt{standard} & \opt{periodical} & \opt{compact} & \opt{supercompact} & (pt) \opt{elements} \\
-% \cmidrule(lr){1-1}\cmidrule(lr){2-6}
-% Text width & $110$ & $110$ & $110$ & $100$ & $251$\\
-% Text height & $220$ & $165$ & $165$ & $150$ & $502$\\
-% Page width & $210$ & $170$ & $160$ & $140$ & $374$\\
-% Page height & $297$ & $240$ & $240$ & $210$ & $648$\\[2ex]
-% &\multicolumn{5}{c}{Proportions}\\\cmidrule(lr){1-1}\cmidrule{2-6}
-% \multirow{2}*{%
-% \parbox{1.2cm}{Margins}
-% \parbox{1.9cm}{
-% top/bottom\\
-% inner/outer}}
-% & $1/2$ & $2/3$ & $2/3$& $2/3$& $1/2$ \\
-% & $1/2$ & $2/3$ & $2/3$ & $2/3$& $2/5$\\\cmidrule(lr){1-1}
-% Text block & $1/2$ & $2/3$ & $2/3$ & $2/3$& $1/2$\\
-% Page & $1/\sqrt{2}$& $2/3$ & $2/3$ & $2/3$& $1/\sqrt{3}$\\
-% \bottomrule
-% \end{tabular}
-% \label{tab:gabbia}
-
% \end{table*}
%
% \subsection{Font}
@@ -444,12 +436,6 @@
% (see table \ref{tab:gabbia} for details). To reproduce the whole
% style of \textcite{Bringhurst:1996} use \opt{style=elements} option.
%\end{valuelist}
-%\boolitem[true]{crop}
-% \begin{valuelist}
-% \item[true] Prints the output on a A4 paper, showing the crop marks.
-% \item[false] Prints a \textsc{pdf} with page dimensions
-% according to the \opt{pagelayout} option.
-% \end{valuelist}
%\end{optionlist}
%
% \subsection{Titles}
@@ -642,6 +628,22 @@
%
%\begin{optionlist}
% \settowidth{\labelwidth}{marginpar}
+% \optitem[print]{viewmode}{\opt{screen},\opt{print}}
+% \begin{valuelist}
+% \item[screen]
+% This option is provided to have a better view when you are
+% typesetting and reading the \textsc{pdf} on the screen.
+% It simply executes the \opt{oneside} and \opt{nocrop=false}
+% option and redefines the \cmd{crop} command so you do not need to comment it if it is used in the document.
+% \item[print]
+% Prints the output on a A4 paper, showing the crop marks. It is the same of \opt{crop=true}.
+% \end{valuelist}
+%\boolitem[true]{crop}
+% \begin{valuelist}
+% \item[true] Prints the output on a A4 paper, showing the crop marks. It is the same of \opt{viewmode=print}.
+% \item[false] Prints a \textsc{pdf} with page dimensions
+% according to the \opt{pagelayout} option. It is similar to \opt{viewmode=screen} but it does not execute \opt{oneside} option and it does not redefine the \cmd{crop} command.
+% \end{valuelist}
% \optitem[compact]{parindent}{\opt{compact}, \opt{wide}}
% \changes{v0.9b}{2012/09/23}{New option \opt{parindent}}
% \begin{valuelist}
@@ -1061,6 +1063,7 @@
\newif\ifsuftesi@partpage
\newif\ifsuftesi@FSPL
\newif\ifsuftesi@periodicalaureo
+\newif\ifsuftesi@screen
\DeclareOption{a5paper}{%
\ClassError{suftesi}{Option 'a5paper' not available}}
\DeclareOption{b5paper}{%
@@ -1094,7 +1097,8 @@
\RequirePackage{geometry}
\geometry{heightrounded}
\define@choicekey{}{pagelayout}[\val\nr]
- {standard,periodical,compact,supercompact,elements,periodicalaureo}[standard]{%
+ {standard,periodical,compact,supercompact,elements,
+ periodicalaureo}[standard]{%
\ifcase\nr\relax
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
\geometry{%
@@ -1162,9 +1166,10 @@
textheight= 194mm,
paperwidth= 17cm,
paperheight= 24cm,
- marginratio= 1:2,
+ marginratio= 2:3,
marginparwidth= 62pt,
marginparsep= 10pt}
+\or
\fi}
% \end{macrocode}
% \subsection{Sections style}
@@ -1499,9 +1504,9 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\define@choicekey{}{captionstyle}[\val\nr]
{standard,elements}[standard]{%
\ifcase\nr\relax
- \captionsetup{labelsep=period,font=small,singlelinecheck=false}
+ \captionsetup{labelsep=period,font=small}
\or
- \captionsetup{labelsep=period,font=small,singlelinecheck=false}
+ \captionsetup{labelsep=period,font=small}
\captionsetup{font+=sf}
\fi
}
@@ -1598,6 +1603,17 @@ dotarabic,dotroman,dotRoman}[arabic]{%
\or
\fi}
% \end{macrocode}
+% \subsubsection{View mode}
+% \begin{macrocode}
+\define@choicekey{}{viewmode}[\val\nr]
+ {screen,print}[print]{%
+\ifcase\nr\relax
+ \suftesi@nocroptrue
+ \@twosidefalse
+ \newcommand*\crop[1][]{}
+\or
+\fi}
+% \end{macrocode}
% \subsubsection{Titlepage}
% \begin{macrocode}
\define@choicekey{}{titlepage}[\val\nr]
@@ -1821,16 +1837,11 @@ quotesize,footnotestyle,liststyle,captionstyle,parindent}
\XKV@useoption{legalpaper}\XKV@useoption{executivepaper}
\XKV@useoption{landscape}
% \end{macrocode}
-% A LaTeX3 trick to delete the class options from \@classoptionslist,
-% in order to avoid incompatibility with packages defining options
-% defined by suftesi. Thanks to Enrico Gregorio!
+% A trick to delete the class options from \cmd{XKV@classoptionslist},
+% in order to avoid incompatibility with packages using options
+% defined by \sty{suftesi} too. Thanks to Enrico Gregorio!
% \begin{macrocode}
-\RequirePackage{expl3,l3regex}
-\ExplSyntaxOn
-\AtEndOfClass{
-\regex_replace_all:nnN { style \s* = [^,]*? , } { , } \XKV@classoptionslist
-}
-\ExplSyntaxOff
+\def\XKV@classoptionslist{}
% \end{macrocode}
% \subsection{Basic packages}
% \begin{macrocode}
@@ -3261,22 +3272,22 @@ Non si pu\`o alterare o trasformare quest'opera, n\'e usarla per crearne un'altr
\ifsuftesi@article
\renewcommand\tableofcontents{%
\vspace{2ex}%
- \section*{\contentsname%
- \@mkboth{\contentsname}{\contentsname}}%
+ \section*{\contentsname}%
+ \@mkboth{\contentsname}{\contentsname}%
\thispagestyle{empty}
\@starttoc{toc}%
\vspace{2ex}%
}
\renewcommand\listoffigures{%
- \section*{\listfigurename%
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \section*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\thispagestyle{empty}
\@starttoc{lof}%
\vspace{2ex}%
}
\renewcommand\listoftables{%
- \section*{\listtablename%
- \@mkboth{\listtablename}{\listtablename}}%
+ \section*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\thispagestyle{empty}
\@starttoc{lot}%
\vspace{2ex}%
@@ -3291,10 +3302,10 @@ Non si pu\`o alterare o trasformare quest'opera, n\'e usarla per crearne un'altr
\else
\@restonecolfalse
\fi
- \chapter*{\contentsname%
+ \chapter*{\contentsname}%
\@mkboth{%
\contentsname}
- {\contentsname}}%
+ {\contentsname}%
\thispagestyle{empty}
\@starttoc{toc}%
\if@restonecol\twocolumn\fi
@@ -3305,9 +3316,9 @@ Non si pu\`o alterare o trasformare quest'opera, n\'e usarla per crearne un'altr
\else
\@restonecolfalse
\fi
- \chapter*{\listfigurename%
+ \chapter*{\listfigurename}%
\@mkboth{\listfigurename}%
- {\listfigurename}}%
+ {\listfigurename}%
\thispagestyle{empty}
\@starttoc{lof}%
\if@restonecol\twocolumn\fi
@@ -3318,10 +3329,10 @@ Non si pu\`o alterare o trasformare quest'opera, n\'e usarla per crearne un'altr
\else
\@restonecolfalse
\fi
- \chapter*{\listtablename%
+ \chapter*{\listtablename}%
\@mkboth{%
\listtablename}%
- {\listtablename}}%
+ {\listtablename}%
\thispagestyle{empty}
\@starttoc{lot}%
\if@restonecol\twocolumn\fi