X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/book_gpu.git/blobdiff_plain/04b31df6519ed76ed92facfecdde6771593395fd..cdcc8368664a64aed4169db27a06df9d0c9d6527:/BookGPU/sunil.cls?ds=inline

diff --git a/BookGPU/sunil.cls b/BookGPU/sunil.cls
index 44e5e66..6c26076 100755
--- a/BookGPU/sunil.cls
+++ b/BookGPU/sunil.cls
@@ -505,6 +505,9 @@
   \def\@xviiipt{18}
  \def\@xxivpt{24}
 
+\newcommand\ContributorAffiliationFont{\reset@font\fontsize{10}{12}\raggedright\selectfont}
+\newcommand\ContributorNameFont{\reset@font\fontsize{10}{12}\bfseries\raggedright\selectfont}
+
 \newcommand\SectionHeadFont{\fontsize{12}{14}\bfseries\selectfont}
 \newcommand\SubsectionHeadFont{\fontsize{11}{13}\bfseries\selectfont}
 \newcommand\SubsubsectionHeadFont{\fontsize{10}{12}\bfseries\selectfont}
@@ -617,7 +620,7 @@
 
 \if@ChapterTOCs
   \newwrite\@chaptoc
-  \def\secnumwidth{21pt}\def\subsecnumwidth{30pt}\def\ssubsecnumwidth{36pt}\fi
+  \def\secnumwidth{21pt}\def\subsecnumwidth{30pt}\def\ssubsecnumwidth{36pt}\def\subsubsecnumwidth{66pt}\fi
 \long\def\@trplarg#1{\@ifnextchar[{\@xtrplarg{#1}}{\@ztrplarg{#1}}}
 \long\def\@xtrplarg#1[#2]{\@ifnextchar[{#1[#2]}{\@ytrplarg{#1}[{#2}]}}
 \long\def\@ytrplarg#1[#2]#3{#1[{#2}][{#2}]{#3}}
@@ -686,6 +689,8 @@
                    \@topnewpage[\@makeschapterhead{#1}]%
                  \else
                    \@makeschapterhead{#1}%
+                   \addcontentsline{toc}{fm}{#1}
+                   \markboth{#1}{#1}
                    \@afterheading
                  \fi}
                  
@@ -763,18 +768,33 @@
   \fi
   \@xsect{#5}}
 
+%%Change mydotted also
+\newdimen\secwd
+\newdimen\subsecwd
+\newdimen\subsubsecwd
+
+\def\secwd{31pt}
+\def\subsecwd{36pt}
+\def\subsubsecwd{56pt}
+
+
+\def\ssubnumberline#1{\@hangfrom{\hbox to \secwd{#1\hfill}}}
+\def\subnumberline#1{\@hangfrom{\hskip\subsecnumwidth\hbox to \subsecwd{#1\hfill}}}
+\def\subsubnumberline#1{\@hangfrom{\hskip\subsubsecnumwidth\hbox to \subsubsecwd{#1\hfill}}}
+
+
 \newcommand\section{%
   \gdef\chapterauthor{\@caplusone}%
   \gdef\endchapterauthors{\end@casplusone}%
   \@ifstar{\@ssection}{\@trplarg{\@section}}}
 \def\@ssection#1{%
   \if@ChapterTOCs
-    \myaddcontentsline{\@chaptoc}{chapsection}{\string\makebox[\secnumwidth][l]{}#1}\fi
+    \myaddcontentsline{\@chaptoc}{chapsection}{\protect\ssubnumberline{\thesection}#1}\fi
   \@startsection{section}{1}{\z@}{30\p@}{6\p@}{\sec@rule\nopagebreak\vskip13.5\p@\nopagebreak\SectionHeadFont}*{#1}}
 \def\@section[#1][#2]#3{%
   \if@ChapterTOCs
     \addtocounter{section}{1}%
-    \myaddcontentsline{\@chaptoc}{chapsection}{\string\makebox[\secnumwidth][l]{\thesection}#1}%
+    \myaddcontentsline{\@chaptoc}{chapsection}{\protect\ssubnumberline{\thesection}#1}%
     \addtocounter{section}{-1}\fi
   \@startsection{section}{1}{\z@}{30\p@}{6\p@}{\sec@rule\nopagebreak\vskip13.5\p@\nopagebreak\SectionHeadFont}[#2]{#3}}
 \def\sectionauthor#1{\hfill{\ChapTOCAuthorFont #1}}
@@ -788,7 +808,7 @@
 \def\@subsection[#1][#2]#3{%
   \if@ChapterTOCs
     \addtocounter{subsection}{1}%
-    \myaddcontentsline{\@chaptoc}{chapsubsection}{\string\makebox[\subsecnumwidth][l]{\thesubsection}#1}%
+    \myaddcontentsline{\@chaptoc}{chapsubsection}{\protect\subnumberline{\thesubsection}#1}%
     \addtocounter{subsection}{-1}\fi
   \@startsection{subsection}{2}{\z@}{18\p@}{6\p@}{%
     \SubsectionHeadFont}[#2]{#3}}
@@ -802,7 +822,7 @@
 \def\@subsubsection[#1][#2]#3{%
   \if@ChapterTOCs
     \addtocounter{subsubsection}{1}%
-    \myaddcontentsline{\@chaptoc}{chapsubsubsection}{\hskip21pt\string\makebox[\ssubsecnumwidth][l]{\thesubsubsection}#1}%
+        \myaddcontentsline{\@chaptoc}{chapsubsubsection}{\protect\subsubnumberline{\thesubsubsection}#1}%
     \addtocounter{subsubsection}{-1}\fi
   \@startsection{subsubsection}{3}{\z@}{12\p@}{6\p@}{%
     \SubsubsectionHeadFont}[#2]{#3}}
@@ -951,9 +971,9 @@
 \setlength\belowcaptionskip{0\p@}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \sbox\@tempboxa{#1: #2}%
+  \sbox\@tempboxa{{\FigCapFont #1} #2}%
   \ifdim \wd\@tempboxa >\hsize
-    {\FigCapFont #1}: #2\par
+    {\FigCapFont #1} #2\par
   \else
     \global \@minipagefalse
     \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
@@ -977,15 +997,26 @@
 \newcounter{numauthors}
 \newif\if@break
 \newif\if@firstauthor
-\newcommand\tableofcontents{%
+\newcommand\tableofcontents{\cleardoublepage\thispagestyle{folio}%
+  \gdef\chapterauthor{\@caplusone}%
+  \gdef\endchapterauthors{\end@casplusone}%
+  \make@cornermarks
     \if@twocolumn
       \@restonecoltrue\onecolumn
     \else
       \@restonecolfalse
     \fi
-    \chapter*{\contentsname
-        \@mkboth{%
-           \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+      {\parindent \z@ \raggedright \baselineskip 6\p@ \lineskip \z@ \parskip \z@
+    \vbox{
+    \vskip 22\p@
+    \chap@rule
+    \vskip -1\p@
+    \FMHeadFont \contentsname
+    \vskip 59\p@}}%
+%%%    \chapter*{\contentsname
+%%%        \@mkboth{%
+%%%           \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+\markboth{Contents}{Contents}
              {\let\break\space
     \let\author\toc@author
     \reset@authors
@@ -1021,6 +1052,29 @@
 \toc@draw
  \gdef\toc@draw{\draw@part{\large #1}{\large #2}}}
 
+  \def\l@fm#1#2{%
+  \toc@draw
+  \gdef\toc@draw{\draw@fm{#1}{#2}}}
+\def\@pnumwidth{1.8em}
+\def\draw@fm#1#2{%
+  \addpenalty{-\@highpenalty}%
+  \vskip1em plus\p@
+  \@tempdima1.5em
+  \begingroup
+    \parindent\z@\rightskip\@pnumwidth
+    \parfillskip-\rightskip
+    \bfseries
+    \leavevmode
+    \advance\leftskip\@tempdima
+    \hskip-\leftskip
+    {#1\hfil}\nobreak
+      \if@pdf
+      \else
+        \hfil\nobreak\hb@xt@\@pnumwidth{\hss #2}%
+\fi
+    \par
+    \penalty\@highpenalty\endgroup}
+    
 
   \def\l@chapter#1#2{%
   \toc@draw
@@ -1060,7 +1114,8 @@
 }
 \def\draw@authors{%
   \let\@t\@authors
-  \ifx\@t\@empty
+        \hskip\leftskip
+  \noindent\vbox{\hsize26pc\raggedright\addvspace{4pt}\ifx\@t\@empty
     \let\@t\last@author\fi
   \ifx\@t\@empty\else
     \hskip\leftskip
@@ -1071,7 +1126,7 @@
       \if@break\break\fi
       \ and \fi
     \last@author\break\fi
-  \reset@authors}
+  \reset@authors}}
 \def\reset@authors{%
   \gdef\@authors{}%
   \gdef\last@author{}%
@@ -1193,11 +1248,104 @@
                                                                     \chapter@authorfour\vskip6\p@
         {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfour}
                                                                         \fi
+                                                    \ifnum\c@numauthors=5
+                                                        \chapter@authorone\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationone}\vskip12\p@
+                                                            \chapter@authortwo\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationtwo}\vskip12\p@
+                                                                \chapter@authorthree\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationthree}\vskip12\p@
+                                                                    \chapter@authorfour\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfour}\vskip12\p@
+                                                                            \chapter@authorfive\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfive}
+                                                                        \fi                                                                        
+                                                    \ifnum\c@numauthors=6
+                                                        \chapter@authorone\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationone}\vskip12\p@
+                                                            \chapter@authortwo\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationtwo}\vskip12\p@
+                                                                \chapter@authorthree\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationthree}\vskip12\p@
+                                                                    \chapter@authorfour\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfour}\vskip12\p@
+                                                                            \chapter@authorfive\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfive}\vskip12\p@
+                                                                                    \chapter@authorsix\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationsix}
+                                                                        \fi                                                                                                                                                
+                                                    \ifnum\c@numauthors=7
+                                                        \chapter@authorone\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationone}\vskip12\p@
+                                                            \chapter@authortwo\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationtwo}\vskip12\p@
+                                                                \chapter@authorthree\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationthree}\vskip12\p@
+                                                                    \chapter@authorfour\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfour}\vskip12\p@
+                                                                      \chapter@authorfive\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfive}\vskip12\p@
+                                                                       \chapter@authorsix\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationsix}\vskip12\p@
+                                                                               \chapter@authorseven\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationseven}
+                                                                        \fi                                                                                                                                                
+                                                    \ifnum\c@numauthors=8
+                                                        \chapter@authorone\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationone}\vskip12\p@
+                                                            \chapter@authortwo\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationtwo}\vskip12\p@
+                                                                \chapter@authorthree\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationthree}\vskip12\p@
+                                                                    \chapter@authorfour\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfour}\vskip12\p@
+                                                                      \chapter@authorfive\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfive}\vskip12\p@
+                                                                       \chapter@authorsix\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationsix}\vskip12\p@
+                                                                       \chapter@authorseven\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationseven}\vskip12\p@
+                                                                        \chapter@authoreight\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationeight}
+                                                                        \fi                                                                                                                                                
+                                                    \ifnum\c@numauthors=9
+                                                        \chapter@authorone\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationone}\vskip12\p@
+                                                            \chapter@authortwo\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationtwo}\vskip12\p@
+                                                                \chapter@authorthree\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationthree}\vskip12\p@
+                                                                    \chapter@authorfour\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfour}\vskip12\p@
+                                                                      \chapter@authorfive\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationfive}\vskip12\p@
+                                                                       \chapter@authorsix\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationsix}\vskip12\p@
+                                                                       \chapter@authorseven\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationseven}\vskip12\p@
+                                                                        \chapter@authoreight\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationeight}\vskip12\p@
+                                                                        \chapter@authornine\vskip6\p@
+        {\it\fontsize{10\p@}{10\p@}\selectfont\chapter@affiliationnine}
+                                                                        \fi                                                                                                                                                
+                                                                       
 }
  \gdef\chapter@authorone{}\gdef\chapter@affiliationone{}%
  \gdef\chapter@authortwo{}\gdef\chapter@affiliationtwo{}%
  \gdef\chapter@authorthree{}\gdef\chapter@affiliationthree{}%
  \gdef\chapter@authorfour{}\gdef\chapter@affiliationfour{}%
+  \gdef\chapter@authorfive{}\gdef\chapter@affiliationfive{}%
+   \gdef\chapter@authorsix{}\gdef\chapter@affiliationsix{}%
+    \gdef\chapter@authorseven{}\gdef\chapter@affiliationseven{}%
+     \gdef\chapter@authoreight{}\gdef\chapter@affiliationeight{}%
+      \gdef\chapter@authornine{}\gdef\chapter@affiliationnine{}%
+       \gdef\chapter@authorten{}\gdef\chapter@affiliationten{}%
+   \gdef\chapter@authoreleven{}\gdef\chapter@affiliationeleven{}%
+    \gdef\chapter@authortwelve{}\gdef\chapter@affiliationtwelve{}%
+     \gdef\chapter@authorthirteen{}\gdef\chapter@affiliationthirteen{}%
+      \gdef\chapter@authorfourteen{}\gdef\chapter@affiliationfourteen{}%
+       \gdef\chapter@authorfifteen{}\gdef\chapter@affiliationfifteen{}%       
+
   \vskip 14.6\p@
 {\leftskip\secnumwidth\def\author##1##2{}\@input{\thechapter.toc}\par}%
   }
@@ -1214,12 +1362,56 @@
 %
 \newif\iffinishedfromfour
 \global\finishedfromfourfalse
+%
+\newif\iffinishedfromfive
+\global\finishedfromfivefalse
+%
+\newif\iffinishedfromsix
+\global\finishedfromsixfalse
+%
+\newif\iffinishedfromseven
+\global\finishedfromsevenfalse
+%
+\newif\iffinishedfromeight
+\global\finishedfromeightfalse
+%
+\newif\iffinishedfromnine
+\global\finishedfromninefalse
+%
+\newif\iffinishedfromten
+\global\finishedfromtenfalse
+%
+\newif\iffinishedfromeleven
+\global\finishedfromelevenfalse
+%
+\newif\iffinishedfromtwelve
+\global\finishedfromtwelvefalse
+%
+\newif\iffinishedfromthirteen
+\global\finishedfromthirteenfalse
+%
+\newif\iffinishedfromfourteen
+\global\finishedfromfourteenfalse
+%
+\newif\iffinishedfromfifteen
+\global\finishedfromfifteenfalse
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-\newcommand\singleauthorchapter{\finishedfromonetrue}
-\newcommand\twoauthorchapter{\finishedfromtwotrue}
-\newcommand\threeauthorchapter{\finishedfromthreetrue}
-\newcommand\fourauthorchapter{\finishedfromfourtrue}
+\def\singleauthorchapter{\finishedfromonetrue}
+\def\twoauthorchapter{\finishedfromtwotrue}
+\def\threeauthorchapter{\finishedfromthreetrue}
+\def\fourauthorchapter{\finishedfromfourtrue}
+\def\fiveauthorchapter{\finishedfromfivetrue}
+\def\sixauthorchapter{\finishedfromsixtrue}
+\def\sevenauthorchapter{\finishedfromseventrue}
+\def\eightauthorchapter{\finishedfromeighttrue}
+\def\nineauthorchapter{\finishedfromninetrue}
+\def\tenauthorchapter{\finishedfromtentrue}
+\def\elevenauthorchapter{\finishedfromeleventrue}
+\def\twelveauthorchapter{\finishedfromtwelvetrue}
+\def\thirteenauthorchapter{\finishedfromthirteentrue}
+\def\fourteenauthorchapter{\finishedfromfourteentrue}
+\def\fifteenauthorchapter{\finishedfromfifteentrue}
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \newif\iffinish
@@ -1229,16 +1421,51 @@
 \newsavebox\@AUtwobox
 \newsavebox\@AUthreebox
 \newsavebox\@AUfourbox
+\newsavebox\@AUfivebox
+\newsavebox\@AUsixbox
+\newsavebox\@AUsevenbox
+\newsavebox\@AUeightbox
+\newsavebox\@AUninebox
+\newsavebox\@AUtenbox
+\newsavebox\@AUelevenbox
+\newsavebox\@AUtwelvebox
+\newsavebox\@AUthirteenbox
+\newsavebox\@AUfourteenbox
+\newsavebox\@AUfifteenbox
+
 %
 \newsavebox\@AUaffonebox
 \newsavebox\@AUafftwobox
 \newsavebox\@AUaffthreebox
 \newsavebox\@AUafffourbox
+\newsavebox\@AUafffivebox
+\newsavebox\@AUaffsixbox
+\newsavebox\@AUaffsevenbox
+\newsavebox\@AUaffeightbox
+\newsavebox\@AUaffninebox
+\newsavebox\@AUafftenbox
+\newsavebox\@AUaffelevenbox
+\newsavebox\@AUafftwelvebox
+\newsavebox\@AUaffthirteenbox
+\newsavebox\@AUafffourteenbox
+\newsavebox\@AUafffifteenbox
+
 %
 \newsavebox\@finalAUboxfromone
 \newsavebox\@finalAUboxfromtwo
 \newsavebox\@finalAUboxfromthree
 \newsavebox\@finalAUboxfromfour
+\newsavebox\@finalAUboxfromfive
+\newsavebox\@finalAUboxfromsix
+\newsavebox\@finalAUboxfromseven
+\newsavebox\@finalAUboxfromeight
+\newsavebox\@finalAUboxfromnine
+\newsavebox\@finalAUboxfromten
+\newsavebox\@finalAUboxfromeleven
+\newsavebox\@finalAUboxfromtwelve
+\newsavebox\@finalAUboxfromthirteen
+\newsavebox\@finalAUboxfromfourteen
+\newsavebox\@finalAUboxfromfifteen
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \def\@ca#1#2{%
@@ -1251,35 +1478,65 @@
   \fi
 %%%%%%%%%%%%%%%
 
-\ifnum\c@numauthors>4
+\ifnum\c@numauthors>8
     \resetcounter{numauthors}
 \fi 
 \stepcounter{numauthors}
 %%\the\c@numauthors
 \ifnum\c@numauthors=1 % 
-    \sbox\@AUonebox{\CAPlusOneFont#1}
+    \sbox\@AUonebox{\vbox{\hsize\textwidth\CAPlusOneFont\raggedright\noindent \CAPlusOneFont#1}}
     \sbox\@AUaffonebox{\vbox{\hsize\textwidth\CAAPlusOneFont\noindent #2\par}}
     \sbox\@finalAUboxfromone{\copy\@AUonebox}
     \def\chapter@authorone{\copy\@finalAUboxfromone}
     \def\chapter@affiliationone{\copy\@AUaffonebox}
 \fi \ifnum\c@numauthors=2
-    \sbox\@AUtwobox{\CAPlusOneFont#1}
+    \sbox\@AUtwobox{\vbox{\hsize\textwidth\CAPlusOneFont\raggedright\noindent \CAPlusOneFont#1}}
     \sbox\@AUafftwobox{\vbox{\hsize\textwidth\CAAPlusOneFont\noindent #2\par}}
     \sbox\@finalAUboxfromtwo{\copy\@AUtwobox}
     \def\chapter@authortwo{\copy\@finalAUboxfromtwo}
     \def\chapter@affiliationtwo{\copy\@AUafftwobox}
 \fi \ifnum\c@numauthors=3
-    \sbox\@AUthreebox{\CAPlusOneFont#1}
+    \sbox\@AUthreebox{\vbox{\hsize\textwidth\CAPlusOneFont\raggedright\noindent \CAPlusOneFont#1}}
     \sbox\@AUaffthreebox{\vbox{\hsize\textwidth\CAAPlusOneFont\noindent #2\par}}
     \sbox\@finalAUboxfromthree{\copy\@AUthreebox}
     \def\chapter@authorthree{\copy\@finalAUboxfromthree}
     \def\chapter@affiliationthree{\copy\@AUaffthreebox}
 \fi \ifnum\c@numauthors=4
-    \sbox\@AUfourbox{\CAPlusOneFont#1}
+    \sbox\@AUfourbox{\vbox{\hsize\textwidth\CAPlusOneFont\raggedright\noindent \CAPlusOneFont#1}}
     \sbox\@AUafffourbox{\vbox{\hsize\textwidth\CAAPlusOneFont\noindent #2\par}}
     \sbox\@finalAUboxfromfour{\copy\@AUfourbox}
     \def\chapter@authorfour{\copy\@finalAUboxfromfour}
     \def\chapter@affiliationfour{\copy\@AUafffourbox}
+\fi \ifnum\c@numauthors=5
+    \sbox\@AUfivebox{\vbox{\hsize\textwidth\CAPlusOneFont\raggedright\noindent \CAPlusOneFont#1}}
+    \sbox\@AUafffivebox{\vbox{\hsize\textwidth\CAAPlusOneFont\noindent #2\par}}
+    \sbox\@finalAUboxfromfive{\copy\@AUfivebox}
+    \def\chapter@authorfive{\copy\@finalAUboxfromfive}
+    \def\chapter@affiliationfive{\copy\@AUafffivebox}
+\fi \ifnum\c@numauthors=6
+    \sbox\@AUsixbox{\vbox{\hsize\textwidth\CAPlusOneFont\raggedright\noindent \CAPlusOneFont#1}}
+    \sbox\@AUaffsixbox{\vbox{\hsize\textwidth\CAAPlusOneFont\noindent #2\par}}
+    \sbox\@finalAUboxfromsix{\copy\@AUsixbox}
+    \def\chapter@authorsix{\copy\@finalAUboxfromsix}
+    \def\chapter@affiliationsix{\copy\@AUaffsixbox}
+\fi \ifnum\c@numauthors=7
+    \sbox\@AUsevenbox{\vbox{\hsize\textwidth\CAPlusOneFont\raggedright\noindent \CAPlusOneFont#1}}
+    \sbox\@AUaffsevenbox{\vbox{\hsize\textwidth\CAAPlusOneFont\noindent #2\par}}
+    \sbox\@finalAUboxfromseven{\copy\@AUsevenbox}
+    \def\chapter@authorseven{\copy\@finalAUboxfromseven}
+    \def\chapter@affiliationseven{\copy\@AUaffsevenbox}
+\fi \ifnum\c@numauthors=8
+    \sbox\@AUeightbox{\vbox{\hsize\textwidth\CAPlusOneFont\raggedright\noindent \CAPlusOneFont#1}}
+    \sbox\@AUaffeightbox{\vbox{\hsize\textwidth\CAAPlusOneFont\noindent #2\par}}
+    \sbox\@finalAUboxfromeight{\copy\@AUeightbox}
+    \def\chapter@authoreight{\copy\@finalAUboxfromeight}
+    \def\chapter@affiliationeight{\copy\@AUaffeightbox}
+\fi \ifnum\c@numauthors=9
+    \sbox\@AUninebox{\vbox{\hsize\textwidth\CAPlusOneFont\raggedright\noindent \CAPlusOneFont#1}}
+    \sbox\@AUaffninebox{\vbox{\hsize\textwidth\CAAPlusOneFont\noindent #2\par}}
+    \sbox\@finalAUboxfromnine{\copy\@AUninebox}
+    \def\chapter@authornine{\copy\@finalAUboxfromnine}
+    \def\chapter@affiliationnine{\copy\@AUaffninebox}
 \fi}
 
 
@@ -1293,7 +1550,7 @@
 }
 
 \def\chapterauthoronly#1#2{\@ca{#1}{}\@scaplusone{#1}{#2}}
-\def\myaddcontentsline#1#2#3{%
+\def\myaddcontentsline#1#2#3{\pagebreak[3]%
   \if@filesw
     \begingroup
     \let\label\@gobble\let\index\@gobble\let\glossary\@gobble
@@ -1325,19 +1582,58 @@
 \def\@mydottedtocline#1#2#3#4#5{%
   \ifnum #1>\c@chaptocdepth
   \else
-    \vskip 2pt plus.2\p@
-{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -21pt %-\rightskip
-%      \parindent #2\relax\@afterindenttrue
+\fontsize{10}{12}\selectfont
+{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
+     % \parindent #2\relax\@afterindenttrue
       \interlinepenalty\@M
       \leavevmode
       \def\@dotsep{1.2}%
       \@tempdima #3\relax
       \rightskip\z@
-      \advance\hsize-\secnumwidth
-      {\fontsize{9.5\p@}{\baselineskip}\selectfont #4
-         \nobreak\leaders\hbox{$\m@th\mkern\@dotsep mu.\mkern\@dotsep mu$}
-\hfill\hbox to 1.5pc{\hfill#5}}
-      \par}\fi}
+%      \advance\hsize-\secnumwidth
+%      \hskip-\secnumwidth
+\if@sevenbyten
+\hangindent\secnumwidth\hsize372pt\else\hangindent\secnumwidth\hsize312pt\fi 
+#4
+        \if@pdf
+          \hfill
+        \else
+          \nobreak\leaders\hbox{$\m@th\mkern\@dotsep mu.\mkern\@dotsep mu$}\hfill\nobreak
+          \hbox to24\p@{\hfil #5}\fi
+      \par}\fi}      
+
+\newcommand\halftitle{\clearpage\thispagestyle{empty}%
+      {\parindent \z@ \raggedright \baselineskip 6\p@ \lineskip \z@ \parskip \z@
+    \vbox{
+    \vskip 22\p@
+    \chap@rule
+    \vskip -1\p@
+    \FMHeadFont Half Title Page
+    \vskip 59\p@}}%
+    }
+    
+    \newcommand\booktitle{\cleardoublepage\thispagestyle{empty}%
+      {\parindent \z@ \raggedright \baselineskip 6\p@ \lineskip \z@ \parskip \z@
+    \vbox{
+    \vskip 22\p@
+    \chap@rule
+    \vskip -1\p@
+    \FMHeadFont Title Page
+    \vskip 59\p@}}%
+    }
+    
+\newcommand\dedication[1]{\clearpage\thispagestyle{empty}
+\vbox{\centering\addvspace{1in}\large #1}}
+
+\newcommand\locpage{\clearpage\thispagestyle{empty}%
+  {\parindent \z@ \raggedright \baselineskip 6\p@ \lineskip \z@ \parskip \z@
+    \vbox{
+    \vskip 22\p@
+    \chap@rule
+    \vskip -1\p@
+    \FMHeadFont LOC Page
+    \vskip 59\p@}}%
+    }
 
 \newcommand\listoffigures{%
     \if@twocolumn
@@ -1351,7 +1647,7 @@
     \@starttoc{lof}%
     \if@restonecol\twocolumn\fi
     }
-\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
+\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.9em}}
 \newcommand\listoftables{%
     \if@twocolumn
       \@restonecoltrue\onecolumn
@@ -1371,7 +1667,7 @@
 \newenvironment{thebibliography}[1]
      {\chapter*{\bibname}%
       \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}%
-       \addcontentsline{toc}{section}{\bibname}
+%%%       \addcontentsline{toc}{chapter}{\bibname}
       \list{\@biblabel{\@arabic\c@enumiv}}%
            {\settowidth\labelwidth{\@biblabel{#1}}%
             \leftmargin\labelwidth
@@ -1399,9 +1695,10 @@
                 \twocolumn[\@makeschapterhead{\indexname}]%
                 \@mkboth{\MakeUppercase\indexname}%
                         {\MakeUppercase\indexname}%
+                        \markboth{Index}{Index}
                         \pagestyle{headings}
                         \addcontentsline{toc}{chapter}{\indexname}
-                \thispagestyle{folio}\parindent\z@
+                \thispagestyle{folio}\parindent\z@\raggedright
                 \parskip\z@ \@plus .3\p@\relax
                 \columnseprule \z@
                 \columnsep 35\p@
@@ -1719,6 +2016,25 @@
   \vskip 0pt plus 12pt
   \gdef\@Tabletitle{}}
 
+\def\tch#1{\TableColHeadFont #1\llstrut\hfill}
+\def\tsh#1{\TableSubheadFont #1\hfill}
+\newcommand\llstrut{\rule[-6pt]{0pt}{14pt}}
+\newcommand\flstrut{\rule{0pt}{10pt}}
+\newcommand\tabletitlestrut{\rule{0pt}{20pt}}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newdimen\concolwidth
+\newbox\stempbox
+\def\contributor#1#2#3{\addvspace{10pt}{%
+\setbox\stempbox\hbox{\ContributorAffiliationFont #2}
+\concolwidth\wd\stempbox
+  \noindent{\ContributorNameFont #1}\par
+  \ifdim\concolwidth>\columnwidth \vspace*{3pt} \else \fi
+  \noindent{\vbox{\hangindent12pt\ContributorAffiliationFont #2}}\vskip-1\p@
+  \noindent{\vbox{\hangindent12pt\ContributorAffiliationFont #3}}}}
+
+
 \def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page\else
     \hbox{}\thispagestyle{empty}\newpage\if@twocolumn\hbox{}\newpage\fi\fi\fi}
     
@@ -1726,11 +2042,7 @@
 \tolerance=5000    
 \raggedbottom
 
-\def\tch#1{\TableColHeadFont #1\llstrut\hfill}
-\def\tsh#1{\TableSubheadFont #1\hfill}
-\newcommand\llstrut{\rule[-6pt]{0pt}{14pt}}
-\newcommand\flstrut{\rule{0pt}{10pt}}
-\newcommand\tabletitlestrut{\rule{0pt}{20pt}}
+
 \@centertabletitlefalse
 \HeadingsBookChapter
 %\HeadingsChapterSection