suftesi (22oct11)

git-svn-id: svn://tug.org/texlive/trunk@24360 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 84 insertions, 56 deletions

diff --git a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
index be1991c5da9..c2fe4bfa612 100644
--- a/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
+++ b/Master/texmf-dist/tex/latex/suftesi/suftesi.cls
@@ -14,7 +14,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{suftesi}
-		[2011/07/25 v. 0.5
+		[2011/10/21 v. 0.6
 		A class for typesetting theses, books and articles]
 %****************************************
 %  declare options
@@ -25,10 +25,11 @@
 \newif\ifsuftesi@porson 
 \newif\ifsuftesi@defaultfont 
 \newif\ifsuftesi@defaultgreek
-\newif\ifsuftesi@plain
-\newif\ifsuftesi@fullplain
+\newif\ifsuftesi@centerheadings
+\newif\ifsuftesi@sufplain
 \newif\ifsuftesi@bozza
 \newif\ifsuftesi@article
+\newif\ifsuftesi@authortitle
 \newif\ifsuftesi@nofront
 \newif\ifsuftesi@compact
 \newif\ifsuftesi@supercompact
@@ -45,8 +46,8 @@
 	\suftesi@defaultgreekfalse} 
 \DeclareOption{defaultgreek}{\suftesi@defaultgreektrue
 	\suftesi@artemisiafalse\suftesi@porsonfalse} 
-\DeclareOption{plain}{\suftesi@plaintrue} 
-\DeclareOption{fullplain}{\suftesi@fullplaintrue} 
+\DeclareOption{centerheadings}{\suftesi@centerheadingstrue} 
+\DeclareOption{sufplain}{\suftesi@sufplaintrue} 
 \DeclareOption{bozza}{\suftesi@bozzatrue} 
 \DeclareOption{compact}{\suftesi@compacttrue} 
 \DeclareOption{supercompact}{\suftesi@supercompacttrue} 
@@ -55,6 +56,7 @@
 \DeclareOption{nocrop}{\suftesi@nocroptrue} 
 \DeclareOption{nomarginpar}{\suftesi@nomarginpartrue} 
 \DeclareOption{article}{\suftesi@articletrue}
+\DeclareOption{authortitle}{\suftesi@authortitletrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
 \ExecuteOptions{artemisia} 
 \ProcessOptions
@@ -539,20 +541,18 @@
 \else
 	\renewcommand{\chaptermark}[1]{\markboth{\chaptertitlename~\thechapter}{#1}}
 \fi
-\ifsuftesi@article\relax
-  \else
+\ifsuftesi@article
+    	  \renewcommand{\sectionmark}[1]{\markright{#1}}
+  \else\fi
     \ifsuftesi@elements
       \renewcommand{\sectionmark}[1]{\markright{#1}}
-	\else
-    	  \renewcommand{\sectionmark}[1]{}
-    \fi
- \fi
-
-\def\scart@hookmark{\ifsuftesi@sctitles\sufsc{\rightmark}% article mode
-	\else\nouppercase\rightmark\fi}
-\def\scbook@hookmark{\ifsuftesi@sctitles\sufsc{\ivanleftmark}% book mode
-	\else\nouppercase\ivanleftmark\fi}
-\def\sc@thepagehook{\ifsuftesi@sctitles\sufsc{\thepage}\else\thepage\fi}
+	\else\fi 
+	
+\def\sufrightmark{\ifsuftesi@sctitles\sufsc{\ifsuftesi@authortitle\@title\else\rightmark\fi}% article mode
+	\else\ifsuftesi@authortitle\nouppercase\@title\else\nouppercase\rightmark\fi\fi}
+\def\sufleftmark{\ifsuftesi@sctitles\sufsc{\ifsuftesi@authortitle\@author\else\ivanleftmark\fi}% book mode
+	\else\ifsuftesi@authortitle\nouppercase\@author\else\nouppercase\ivanleftmark\fi\fi}
+\def\sufthepage{\ifsuftesi@sctitles\sufsc{\thepage}\else\thepage\fi}
 \def\ivanleftmark{\if@mainmatter\leftmark\else\rightmark\fi} 
     
 \fancypagestyle{plain}{%
@@ -560,51 +560,61 @@
 	\fancyfoot[C]{}
 	\renewcommand{\headrulewidth}{0pt}
 	\renewcommand{\footrulewidth}{0pt}}	
-\fancypagestyle{suffullplain}{%
+\fancypagestyle{sufplain}{%
 	\fancyhf{}%
 	\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Versione del \today\else\fi}
-	\fancyfoot[C]{\footnotesize\sc@thepagehook}}
-\fancypagestyle{sufplain}{%
+	\fancyfoot[C]{\footnotesize\sufthepage}}
+\fancypagestyle{centerheadings}{%
 		\fancyhf{}%
 		\fancyhead[CO]{\footnotesize%
-		\xheadbreakfalse\scart@hookmark} 
+		\xheadbreakfalse\sufrightmark} 
 		\fancyhead[CE]{\footnotesize%
-		\xheadbreakfalse\ifsuftesi@article\scart@hookmark\else\scbook@hookmark\fi} 
+		\xheadbreakfalse\ifsuftesi@article\ifsuftesi@authortitle\sufleftmark\else\sufrightmark\fi\else\sufleftmark\fi} 
 		\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Versione del \today\else\fi}
-		\fancyfoot[C]{\footnotesize\sc@thepagehook}%
+		\fancyfoot[C]{\footnotesize\sufthepage}%
 		}
 \fancypagestyle{sufdefault}{%
 		\fancyhf{}%
 		\fancyfoot[RE,LO]{\ifsuftesi@bozza \footnotesize Versione del \today\else\fi}
-		\fancyhead[LE,RO]{\footnotesize\sc@thepagehook} 
-		\fancyhead[LO]{\footnotesize\xheadbreakfalse\scart@hookmark}
-		\fancyhead[RE]{\footnotesize\ifsuftesi@article\scart@hookmark
-			\else\scbook@hookmark\fi}%
+		\fancyhead[LE,RO]{\footnotesize\sufthepage} 
+		\fancyhead[LO]{\footnotesize\xheadbreakfalse\sufrightmark}
+		\fancyhead[RE]{\footnotesize\ifsuftesi@article\ifsuftesi@authortitle\sufleftmark\else\sufrightmark\fi\else\sufleftmark\fi}%
 			}
-
 \fancypagestyle{elements}{% elements
-\fancyhf{}
-\fancyfoot[LE,RO]{\thepage} 
-\fancyhead[RO]{%pari
-	\begin{picture}(0,0)
-	   \setlength{\unitlength}{1pt}
-	      \put(0,-104){%
-	\hskip\marginparsep
-	\parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}%
-	\end{picture}} 
-\fancyhead[LE]{%
-	\begin{picture}(0,0)
-	   \setlength{\unitlength}{1pt}
-	      \put(0,-104){%
-	\hskip-\marginparwidth
-	\hskip-\marginparsep
-	      \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
-	\end{picture}}	
-	}		
+	\fancyhf{}
+	\fancyfoot[LE,RO]{\thepage} 
+	\fancyhead[RO]{%pari
+		\begin{picture}(0,0)
+		   \setlength{\unitlength}{1pt}
+		      \put(0,-104){%
+		\hskip\marginparsep
+		\parbox[t]{\marginparwidth}{\itshape\raggedright\leftmark}}%
+		\end{picture}} 
+	\fancyhead[LE]{%
+		\begin{picture}(0,0)
+		   \setlength{\unitlength}{1pt}
+		      \put(0,-104){%
+		\hskip-\marginparwidth
+		\hskip-\marginparsep
+		      \parbox[t]{\marginparwidth}{\itshape\raggedleft\rightmark}}%
+		\end{picture}}	
+		}		
+
+%\renewcommand{\author}[1]{\gdef\@sufauthor{#1}}
+%\def\@sufauthor{--missing author--% 
+%  \ClassWarningNoLine{suftesi} 
+%    {Missing \protect\author}% 
+%    \gdef\univrart@author{--missing author--}}
+%
+%\renewcommand{\title}[1]{\gdef\@suftitle{#1}}
+%\def\@suftitle{--missing title--% 
+%  \ClassWarningNoLine{suftesi} 
+%    {Missing \protect\title}% 
+%    \gdef\univrart@author{--missing title--}}
 
 \pagestyle{sufdefault}
-\ifsuftesi@plain\pagestyle{sufplain}\else\fi
-\ifsuftesi@fullplain\pagestyle{suffullplain}\else\fi
+\ifsuftesi@centerheadings\pagestyle{centerheadings}\else\fi
+\ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
 \ifsuftesi@elements\pagestyle{elements}\else\fi
 %****************************************
 %	TITLE PAGE FOR "ARTICLE"
@@ -638,11 +648,11 @@
 	  \global\let\maketitle\relax
 	  \global\let\@maketitle\relax
 	  \global\let\@thanks\@empty
-	  \global\let\@author\@empty
+%	  \global\let\@author\@empty
 	  \global\let\@date\@empty
-	  \global\let\@title\@empty
-	  \global\let\title\relax
-	  \global\let\author\relax
+%	  \global\let\@title\@empty
+%	  \global\let\title\relax
+%	  \global\let\author\relax
 	  \global\let\date\relax
 	  \global\let\and\relax
 	}
@@ -688,11 +698,11 @@
   \global\let\thanks\relax
   \global\let\maketitle\relax
   \global\let\@thanks\@empty
-  \global\let\@author\@empty
+%  \global\let\@author\@empty
   \global\let\@date\@empty
-  \global\let\@title\@empty
-  \global\let\title\relax
-  \global\let\author\relax
+%  \global\let\@title\@empty
+ % \global\let\title\relax
+%  \global\let\author\relax
   \global\let\date\relax
   \global\let\and\relax
 }
@@ -748,6 +758,24 @@
 	    \fi usando la classe \textsf{suftesi} di 
 	    Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
 	    \cleardoublepage}
+
+\newcommand{\bookcolophon}[2]{%
+	\thispagestyle{empty}
+	\null
+	  \vfill
+	          \noindent #1
+	\vfill	
+    \section*{Colophon}
+	{\small #2\par}
+	    \cleardoublepage}
+
+\newcommand{\artcolophon}[1]{%
+\thispagestyle{empty}
+	\null
+	  \vfill
+	{\small #1\par}}
+
+
 %****************************************
 %		INDEX
 %****************************************