ycbook (24may16)

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

1 files changed, 109 insertions, 67 deletions

diff --git a/Master/texmf-dist/tex/latex/ycbook/ycbook.cls b/Master/texmf-dist/tex/latex/ycbook/ycbook.cls
index 9fa043429aa..83dffdfab6e 100644
--- a/Master/texmf-dist/tex/latex/ycbook/ycbook.cls
+++ b/Master/texmf-dist/tex/latex/ycbook/ycbook.cls
@@ -19,7 +19,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{ycbook}[2016/04/06 ycbook class]
+\ProvidesClass{ycbook}[2016/05/23 ycbook class]
  
 \LoadClassWithOptions{mwbk}	
 
@@ -84,125 +84,167 @@
 %\FormatRigidChapterHeading{hwysi}{hodstępi}{hdekl numi}{hdekl tyti}
 
 
+%%% Original chapter@toc
+%\newcommand*\chapter@toc{%
+%  \ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}\fi
+%  \addcontentsline{toc}{chapter}{%
+%        \ifHeadingNumbered
+% \mw@seccntformat{\@chapapp\ \HeadingNumber}%
+%        \fi
+%        \HeadingTOCText}%
+%  \addtocontents{lof}{\protect\addvspace{10\p@}}%
+%  \addtocontents{lot}{\protect\addvspace{10\p@}}%
+%  }
+%%%%
+
+%%%original toc entries for mwrep.cls
+%\newcommand*\chapter@toc{%
+%	\ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}\fi
+%	\addcontentsline{toc}{chapter}{%
+%		\ifHeadingNumbered
+%		\protect\numberline{\mw@seccntformat{\HeadingNumber}}%
+%		\fi
+%		\HeadingTOCText}%
+%	\addtocontents{lof}{\protect\addvspace{10\p@}}%
+%	\addtocontents{lot}{\protect\addvspace{10\p@}}%
+%}
+
+
+  
 \DeclareOption{chaptercentered}{%
 \SetSectionFormatting[breakbefore,wholewidth]{chapter}
 {12pt}
-{\FormatChapterHeading{0pt}%additional space between label and chapter title
+{\FormatChapterHeading{12pt}%additional space between label and chapter title
 	{\centering\LARGE \@chapapp \space}{\Huge\centering}}
 {24pt plus6pt}
 
-\renewcommand*\chapter@toc{%
-	\ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}%\fi
-	\addcontentsline{toc}{chapter}{%
-		%\ifHeadingNumbered
-		\mw@seccntformat{\@chapapp\ \HeadingNumber}\HeadingTOCText%
-		%\fi
-	}\fi %added \fi here
-	%\addtocontents{lof}{\protect\addvspace{10\p@}}%
-	%\addtocontents{lot}{\protect\addvspace{10\p@}}%
-}
+%\renewcommand*\chapter@toc{%
+%	\ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}%\fi
+%	\addcontentsline{toc}{chapter}{%
+%		%\ifHeadingNumbered
+%		\mw@seccntformat{\@chapapp\ \HeadingNumber}\HeadingTOCText%
+%		%\fi
+%	}\fi %added \fi here
+%	%\addtocontents{lof}{\protect\addvspace{10\p@}}%
+%	%\addtocontents{lot}{\protect\addvspace{10\p@}}%
+%}
 
 }
 
 \DeclareOption{chapterleft}{%
 	\SetSectionFormatting[breakbefore,wholewidth]{chapter}
 	{12pt}
-	{\FormatChapterHeading{0pt}%
+	{\FormatChapterHeading{12pt}%
 		{\LARGE \@chapapp \space}{\Huge}}
 	{24pt plus6pt}
 
-\renewcommand*\chapter@toc{%
-	\ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}%\fi
-	\addcontentsline{toc}{chapter}{%
-		%\ifHeadingNumbered
-		\mw@seccntformat{\@chapapp\ \HeadingNumber}\HeadingTOCText%
-		%\fi
-	}\fi %added \fi here
-	%\addtocontents{lof}{\protect\addvspace{10\p@}}%
-	%\addtocontents{lot}{\protect\addvspace{10\p@}}%
-}
+%\renewcommand*\chapter@toc{%
+%	\ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}%\fi
+%	\addcontentsline{toc}{chapter}{%
+%		%\ifHeadingNumbered
+%		\mw@seccntformat{\@chapapp\ \HeadingNumber}\HeadingTOCText%
+%		%\fi
+%	}\fi %added \fi here
+%	%\addtocontents{lof}{\protect\addvspace{10\p@}}%
+%	%\addtocontents{lot}{\protect\addvspace{10\p@}}%
+%}
 
 }
 
 \DeclareOption{chapterright}{%
 	\SetSectionFormatting[breakbefore,wholewidth]{chapter}
 	{12pt}
-	{\FormatChapterHeading{0pt}%
+	{\FormatChapterHeading{12pt}%
 		{\flushright\LARGE \@chapapp \space}{\flushright\Huge}}
 	{24pt plus6pt}
 
-\renewcommand*\chapter@toc{%
-	\ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}%\fi
-	\addcontentsline{toc}{chapter}{%
-		%\ifHeadingNumbered
-		\mw@seccntformat{\@chapapp\ \HeadingNumber}\HeadingTOCText%
-		%\fi
-	}\fi %added \fi here
-	%\addtocontents{lof}{\protect\addvspace{10\p@}}%
-	%\addtocontents{lot}{\protect\addvspace{10\p@}}%
-}
+%\renewcommand*\chapter@toc{%
+%	\ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}%\fi
+%	\addcontentsline{toc}{chapter}{%
+%		%\ifHeadingNumbered
+%		\mw@seccntformat{\@chapapp\ \HeadingNumber}\HeadingTOCText%
+%		%\fi
+%	}\fi %added \fi here
+%	%\addtocontents{lof}{\protect\addvspace{10\p@}}%
+%	%\addtocontents{lot}{\protect\addvspace{10\p@}}%
+%}
 
 }
 
 %%%%%%%%
 
+%%% for nochapterX
+%\DeclareSectioningCommand[breakbefore,wholewidth]{chapter}{0}
+%{56\p@}
+%{\FormatBlockHeading{\LARGE}}
+%{24\p@}
+
+%{\FormatBlockHeading{\centering\bfseries\LARGE}}
+
+%%%before
+%\DeclareOption{nochaptercentered}{\SetSectionFormatting[breakbefore,wholewidth]{chapter}
+%	{12pt}
+%	{\centering\LARGE\textbf{\ifHeadingNumbered
+%			\HeadingNumber.\enspace\fi % tirei o ponto daqui^: \HeadingNumber.\enspace\fi para não ficar com ponto depois do número da seção
+%			\HeadingText}%\\\rule[12pt]{\hsize}{0.4pt}%\thispagestyle{plain}
+%	} %\hsize=horizontal size of the text...
+%	{24pt plus9pt}
+
+
+
+%%%after
 \DeclareOption{nochaptercentered}{\SetSectionFormatting[breakbefore,wholewidth]{chapter}
 	{12pt}
-	{\centering\LARGE\textbf{\ifHeadingNumbered
-			\HeadingNumber.\enspace\fi % tirei o ponto daqui^: \HeadingNumber.\enspace\fi para não ficar com ponto depois do número da seção
-			\HeadingText}%\\\rule[12pt]{\hsize}{0.4pt}%\thispagestyle{plain}
-	} %\hsize=horizontal size of the text...
+{\FormatBlockHeading{\centering\bfseries\LARGE}}
 	{24pt plus9pt}
 
 \renewcommand*\chapter@toc{%
-	\ifHeadingNumbered\typeout{\thechapter.}%\fi
+	\ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}\fi
 	\addcontentsline{toc}{chapter}{%
-		%\ifHeadingNumbered
-		\mw@seccntformat{\HeadingNumber}\HeadingTOCText%
-		%\fi
-	}\fi %added \fi here
-	%\addtocontents{lof}{\protect\addvspace{10\p@}}%
-	%\addtocontents{lot}{\protect\addvspace{10\p@}}%
+		\ifHeadingNumbered
+		\protect\numberline{\mw@seccntformat{\HeadingNumber}}%
+		\fi
+		\HeadingTOCText}%
+	\addtocontents{lof}{\protect\addvspace{10\p@}}%
+	\addtocontents{lot}{\protect\addvspace{10\p@}}%
 }
 }
 
 \DeclareOption{nochapterleft}{\SetSectionFormatting[breakbefore,wholewidth]{chapter}
 	{12pt}
-	{\LARGE\textbf{\ifHeadingNumbered
-			\HeadingNumber.\enspace\fi % tirei o ponto daqui^: \HeadingNumber.\enspace\fi para não ficar com ponto depois do número da seção
-			\HeadingText}%\\\rule[12pt]{\hsize}{0.4pt}%\thispagestyle{plain}
-	} %\hsize=horizontal size of the text...
+{\FormatBlockHeading{\bfseries\LARGE}}
 	{24pt plus9pt}
 
+
 \renewcommand*\chapter@toc{%
-	\ifHeadingNumbered\typeout{\thechapter.}%\fi
+	\ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}\fi
 	\addcontentsline{toc}{chapter}{%
-		%\ifHeadingNumbered
-		\mw@seccntformat{\HeadingNumber}\HeadingTOCText%
-		%\fi
-	}\fi %added \fi here
-	%\addtocontents{lof}{\protect\addvspace{10\p@}}%
-	%\addtocontents{lot}{\protect\addvspace{10\p@}}%
+		\ifHeadingNumbered
+		\protect\numberline{\mw@seccntformat{\HeadingNumber}}%
+		\fi
+		\HeadingTOCText}%
+	\addtocontents{lof}{\protect\addvspace{10\p@}}%
+	\addtocontents{lot}{\protect\addvspace{10\p@}}%
 }
+
+
 }
 
 \DeclareOption{nochapterright}{\SetSectionFormatting[breakbefore,wholewidth]{chapter}
 		{12pt}
-	{\flushright \LARGE\textbf{\ifHeadingNumbered
-			\HeadingNumber.\enspace\fi % tirei o ponto daqui^: \HeadingNumber.\enspace\fi para não ficar com ponto depois do número da seção
-			\HeadingText}%\\\rule[12pt]{\hsize}{0.4pt}%\thispagestyle{plain}
-	} %\hsize=horizontal size of the text...
+{\FormatBlockHeading{\flushright\bfseries\LARGE}}
 	{24pt plus9pt}
 
+
 \renewcommand*\chapter@toc{%
-	\ifHeadingNumbered\typeout{\thechapter.}%\fi
+	\ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}\fi
 	\addcontentsline{toc}{chapter}{%
-		%\ifHeadingNumbered
-		\mw@seccntformat{\HeadingNumber}\HeadingTOCText%
-		%\fi
-	}\fi %added \fi here
-	%\addtocontents{lof}{\protect\addvspace{10\p@}}%
-	%\addtocontents{lot}{\protect\addvspace{10\p@}}%
+		\ifHeadingNumbered
+		\protect\numberline{\mw@seccntformat{\HeadingNumber}}%
+		\fi
+		\HeadingTOCText}%
+	\addtocontents{lof}{\protect\addvspace{10\p@}}%
+	\addtocontents{lot}{\protect\addvspace{10\p@}}%
 }
 }
 %%%%%%%%%%