ycbook (24may16)

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

3 files changed, 166 insertions, 92 deletions

diff --git a/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.pdf b/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.pdf
index c39aa618beb..c676bcc8fce 100644
--- a/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.pdf
+++ b/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.tex b/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.tex
index 76c17b760c7..b21280fa69a 100644
--- a/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.tex
+++ b/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.tex
@@ -14,14 +14,16 @@
 % This work has the LPPL maintenance status "author-maintained".
 % ======================================================================
 
-\documentclass[withmarginpar,titleauthor,11pt,sfheadings]{mwart}
+\documentclass[withmarginpar,titleauthor,11pt]{mwart}
 %\renewcommand{\sectsettings}{\sffamily\bfseries}
 \usepackage[english]{babel}
 \usepackage[dvipsnames,svgnames]{xcolor}
 \usepackage{fontspec}
 \setmainfont{Minion Pro}[Numbers=OldStyle]
-\setsansfont{Myriad Pro} \setmonofont{Myriad Pro}[Scale=.9]%{Inconsolata}%[Scale=0.9]
-%\setsansfont[Scale=.9]{Fira Sans Book} \setmonofont[Scale=0.8,Color=Teal]{Fira Mono}
+\setmonofont{Fira Mono}[Scale=MatchLowercase]
+\setsansfont{Myriad Pro Light}
+%\setsansfont{Fira Sans Book}[BoldFont={FiraSans-Bold},BoldItalicFont={FiraSans-BoldItalic},Scale=.9] 
+%\setmonofont[Scale=0.8,Color=Teal]{Fira Mono}
 \usepackage{tikz}
 \usetikzlibrary{shapes,snakes,shadings,shadows,shapes.geometric,decorations,positioning,arrows,decorations.pathmorphing}
 \usepackage[framemethod=tikz]{mdframed}
@@ -31,27 +33,35 @@
 %OrangeRed
 \usepackage{hyperref}
 \usepackage{fancyvrb}
+\usepackage{multicol}
 \frenchspacing 
 
-%\SetSectionFormatting{section}
-%{24pt plus5pt minus2pt} %space before
-%{\normalfont\centering\scshape\large\ifHeadingNumbered
-%		\HeadingNumber.\enspace\fi
-%		\HeadingText}
-%{10pt plus3pt}%space after
-%
-%\SetSectionFormatting{subsection}
-%{16pt plus4pt minus2pt}
-%{\FormatHangHeading{\normalfont\itshape}}
-%{6pt plus2pt}
+\hyphenation{Bring-hurst}
+
+\newcommand{\flor}{\fontspec{Minion Pro}}
+\newcommand{\folhadireita}{\fontspec{Minion Pro}}
+\newcommand{\duasondas}{\fontspec{Minion Pro}   }
+
+
+\SetSectionFormatting{section}
+{24pt plus5pt minus2pt} %space before
+{\normalfont\centering\scshape\large\ifHeadingNumbered
+		\HeadingNumber.\enspace\fi
+		\HeadingText}
+{10pt plus3pt}%space after
+
+\SetSectionFormatting{subsection}
+{16pt plus4pt minus2pt}
+{\FormatHangHeading{\normalfont\itshape}}
+{6pt plus2pt}
 
 
 \usepackage[style=authoryear-icomp]{biblatex}
 \addbibresource{ycbook-bibliografia.bib}
-
+\DeclareFieldFormat{url}{\url{#1}}
 
 %\usepackage[justification=raggedright,font={sf},labelfont=bf]{caption}
-\usepackage{picinpar}
+%\usepackage{picinpar}
 
 \setlength{\marginparwidth}{1.3in}
 
@@ -61,13 +71,15 @@
 %\newcommand{\opt}[1]{\texttt{#1}}
 
 
-\title{\estrela{ycbook}\\
+\title{\estrela{\textit{ycbook}}\\
 		\tikz \node[left color=PineGreen,rectangle,remember picture, overlay,rounded corners=3pt] at (0,0) {A versatile and simple book class};\\
-		\tikz \draw[teal,remember picture, overlay,thick] (-4.3,0.2) -- (4,0.2);
+		\tikz \draw[teal,remember picture, overlay,thick] (-4.2,0.2) -- (4,0.2);%
+%\tikz \node[remember picture,overlay] at (7,5) {\florgrande};% 
+%
+}
+\author{\addfontfeatures{Style=Swash}\textit{Youssef Cherem}\\ \href{mailto:ycherem@gmail.com}{ycherem@gmail.com}}
+\date{MMXVI\\ \folhadireita% %
 }
-\author{{\rmfamily \addfontfeatures{Style=Swash}Youssef Cherem}\\%\normalfont 
-\href{mailto:ycherem@gmail.com}{ycherem@gmail.com}}
-\date{\rmfamily MMXVI\\ }
 
 
 \usepackage%[headsepline]
@@ -78,20 +90,38 @@
 %\chead{}
 %\cehead{}
 \newcommand{\bola}{\tikz \node [top color=SpringGreen, shading angle=45,circle,drop shadow] at (0,0) {\thepage};}
-\cfoot*{\upshape\bfseries\large\sffamily\addfontfeatures{Numbers=Lining}\bola}
+\cfoot*{\upshape\bfseries\large\addfontfeatures{Numbers=Lining}\bola}
 
 \newcommand{\estrela}[1]{\tikz \node [top color=SpringGreen,star,star points=7] at (0,0) {#1};}%,star point ratio=0.8 % shading angle=45,
 
+\newcommand\fadingtext[3][]{%
+	\begin{tikzfadingfrompicture}[name=fading letter]
+		\node[text=transparent!0,inner xsep=0pt,outer xsep=0pt,#1] {#3};
+	\end{tikzfadingfrompicture}%
+	\begin{tikzpicture}[baseline=(textnode.base)]
+	\node[inner sep=0pt,outer sep=0pt,#1](textnode){\phantom{#3}}; 
+	\shade[path fading=fading letter,#2,fit fading=false]
+	(textnode.south west) rectangle (textnode.north east);% 
+	\end{tikzpicture}% 
+}
+
+\newcommand{\florgrande}{%
+	\fadingtext[scale=6]{top color=Dandelion,bottom color=PineGreen,shading angle=45}{\flor}
+	}
+
+
 \begin{document}
 	
 	\maketitle
 \thispagestyle{scrheadings}
+
+
 \begin{abstract}
-This class is intended to be an interpretation of the \textit{mwbk} class from Mar\-cin Woli\'{n}ski's \textit{mwcls} classes. The \textit{mwcls} classes are simple, yet powerful and customizable classes that allow the end-user to customize the layout of headers, headings etc. They also have the benefit of being more economic in space than the most common \LaTeX\ classes, while keeping a clear appearance and a smooth flow. 
+This class is intended to be an interpretation of the \textit{mwbk} class from Mar\-cin Wo\-li\'{n}s\-ki's \textit{mwcls} classes. The \textit{mwcls} classes are simple, yet powerful and customizable classes that allow the end-user to customize the layout of headers, headings etc. They also have the benefit of being more economic in space than the most common \LaTeX\ classes, while keeping a clear appearance and a smooth flow. 
 \end{abstract}
 
 \section*{The reasons for this class}
-Although many usual \LaTeX\ packages offer a wide array of solutions for text block and margin specifications, and although some of them, notably Koma-Script \parencite{koma-script} allow and facilitate the application of ``classical" canons of page construction \parencite{tschichold_form_1991,bringhurst_elements_2013}, one may have several reasons to avoid this aesthetical solution. One reason is that these page construction methods were intended, obviously, for handwritten or printed material. Even assuming the material is to be printed, one reason to find an alternative is economic and environmental: the more paper you print, the more it will cost---both in terms of money and environmental impact. But the user also wishes to avoid a sloppy solution, squeezing as much content as possible onto the page just to save space. The compromise solution would be somewhat closer to what most commercial books look like---without jeopardizing legibility. In fact, it is rare to find a book that looks like it has been laid out according to the ``canons". That is one motive why I find the \textit{mwcls} classes \parencite{mwcls} useful. Besides,  \textit{mwcls} alternatives for basic classes (\textit{mwart} for articles,  \textit{mwrep} for reports and \textit{mwbk} for books) allow the user to easily modify headings, being somewhat more flexible and providing a simpler interface than some alternative classes. All I did was to provide a more user-friendly syntax for some common tweaks and more alternatives to some rather unusual page (numbering) styles available by default in \textit{mwbk} and \textit{mwrep}. As for the \textit{mwart} class, I did not find anything to be changed---although the user might adapt some of the options presented in the \textit{ycbook} class.
+Although many usual \LaTeX\ packages offer a wide array of solutions for text block and margin specifications, and although some of them, notably Koma-Script \parencite{koma-script} allow and facilitate the application of ``classical" canons of page construction \parencite{tschichold_form_1991,bringhurst_elements_2013}, one may have several reasons to avoid this aesthetic solution. One reason is that these page construction methods were intended, obviously, for handwritten or printed material. Even assuming the material is to be printed, one reason to find an alternative is economic and environmental: the more paper you print, the more it will cost---both in terms of money and environmental impact. But the user also wishes to avoid a sloppy solution, squeezing as much content as possible onto the page just to save space. The compromise solution would be somewhat closer to what most commercial books look like---without jeopardizing legibility. In fact, it is rare to find a book that looks like it has been laid out according to the ``canons". That is one motive why I find the \textit{mwcls} classes \parencite{mwcls} useful. Besides,  \textit{mwcls} alternatives for basic classes (\textit{mwart} for articles,  \textit{mwrep} for reports and \textit{mwbk} for books) allow the user to easily modify headings, being somewhat more flexible and providing a simpler interface than some alternative classes. All I did was to provide a more user-friendly syntax for some common tweaks and more alternatives to some rather unusual page (numbering) styles available by default in \textit{mwbk} and \textit{mwrep}. As for the \textit{mwart} class, I did not find anything to be changed---although the user might adapt some of the options presented in the \textit{ycbook} class.
 
 
 
@@ -182,6 +212,8 @@ Marginpars were redefined, so that they only appear on the right side of the pag
 \section{Other options}
 All other options from the \textit{mwcls} classes are available, e.g.:
 
+\begin{multicols}{2}
+
 \begin{itemize}
 \item \texttt{floatssmall}; 
 \item \texttt{floatsnormalsize}; 
@@ -194,6 +226,7 @@ All other options from the \textit{mwcls} classes are available, e.g.:
 \item \verb|wide|, for shorter margins, and
 \item font size and paper specifications (\texttt{12pt}, \texttt{a5paper}, etc.). 
 \end{itemize}
+\end{multicols}
 
 \section{Figures spreading over two pages}
 
@@ -216,7 +249,6 @@ It works thus: \verb|\twopagepicture{image place regarding the caption}|\\ \verb
 
 %\marginpar{\textit{\small This document was typeset with XXX}}
 
-\clearpage
 \printbibliography
 
 \end{document}
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@}}%
 }
 }
 %%%%%%%%%%