summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-03 21:59:31 +0000
committerKarl Berry <karl@freefriends.org>2018-01-03 21:59:31 +0000
commit12d2845667c17d6342824c8c65ab896e9f543e23 (patch)
tree81d37d0622f73eb7153eb6603104a8c5e62e6779
parent2971839f7d790de0480bc759e75c5ceeb87eff08 (diff)
ycbook (3jan18)
git-svn-id: svn://tug.org/texlive/trunk@46201 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/ycbook/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/ycbook/ycbook-doc.pdfbin126345 -> 126255 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ycbook/ycbook-doc.tex5
-rw-r--r--Master/texmf-dist/tex/latex/ycbook/ycbook.cls341
4 files changed, 47 insertions, 301 deletions
diff --git a/Master/texmf-dist/doc/latex/ycbook/README.md b/Master/texmf-dist/doc/latex/ycbook/README.md
index 29b45c8bd00..010c679cdbe 100644
--- a/Master/texmf-dist/doc/latex/ycbook/README.md
+++ b/Master/texmf-dist/doc/latex/ycbook/README.md
@@ -4,7 +4,7 @@ ycbook Latex class
======= ycbook -- A Latex Class for Books and Reports ==========
-Copyright (c) Youssef Cherem <ycherem(at)gmail.com>, 2017
+Copyright (c) Youssef Cherem <ycherem(at)gmail.com>, 2018
This file is part of the ycbook LaTeX2e class.
This work may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.pdf b/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.pdf
index 065cbd441d4..32aa8abf966 100644
--- a/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.pdf
+++ b/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.tex b/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.tex
index 4adce9aaf6c..bd3c3f2f0dc 100644
--- a/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.tex
+++ b/Master/texmf-dist/doc/latex/ycbook/ycbook-doc.tex
@@ -1,6 +1,6 @@
% ======================================================================
% ycbook-doc.tex
-% Copyright (c) Youssef Cherem <ycherem(at)gmail.com>, 2017
+% Copyright (c) Youssef Cherem <ycherem(at)gmail.com>, 2018
%
% This file is part of the ycbook LaTeX2e class.
@@ -127,7 +127,7 @@
\usepackage{tcolorbox}
\tcbuselibrary{skins}
\newtcolorbox{caixa}{enhanced,
- interior style={left color=SpringGreen,right color=Dandelion},frame hidden,width=0.8\textwidth,center,drop shadow}
+ interior style={left color=SpringGreen,right color=Dandelion,shading angle=45},frame hidden,width=0.8\textwidth,center,drop shadow}
@@ -291,6 +291,7 @@ If you have ever imagined how to change the color of the header line or the foot
\pagestyle{uheadings}
\end{verbatim}
+Be sure to issue the commands in the exact order as above.
\section{Other options}
diff --git a/Master/texmf-dist/tex/latex/ycbook/ycbook.cls b/Master/texmf-dist/tex/latex/ycbook/ycbook.cls
index ee5bcbd51ff..ca4cdb34ab8 100644
--- a/Master/texmf-dist/tex/latex/ycbook/ycbook.cls
+++ b/Master/texmf-dist/tex/latex/ycbook/ycbook.cls
@@ -1,5 +1,5 @@
%% yc-book.cls
- %% Copyright (c) Youssef Cherem <ycherem(at)gmail.com>, 2017
+ %% Copyright (c) Youssef Cherem <ycherem(at)gmail.com>, 2018
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -18,52 +18,11 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{ycbook}[2017/10/31 ycbook class]
+\ProvidesClass{ycbook}[2018/01/03 ycbook class]
\LoadClassWithOptions{mwbk}
-%\SetSectionFormatting{section}
-%{24pt plus5pt minus2pt}
-%{\large\textbf{\ifHeadingNumbered
-% \HeadingNumber\enspace\fi %retirei o ponto
-% \HeadingText}}
-%{10pt plus3pt}
-
-%default section definitions, keep for future work
-%\DeclareSectioningCommand{section}{1}
-%{24\p@\@plus5\p@\@minus2\p@}
-%{\FormatHangHeading{\large}}
-%{10\p@\@plus3\p@}
-%\DeclareSectioningCommand{subsection}{2}
-%{16\p@\@plus4\p@\@minus1\p@}
-%{\FormatHangHeading{}}
-%{6\p@\@plus2\p@}
-%\DeclareSectioningCommand{subsubsection}{3}
-%{10\p@\@plus2\p@\@minus1\p@}
-%{\FormatHangHeading{}}
-%{4\p@\@plus1\p@}
-%\DeclareSectioningCommand[runin]{paragraph}{4}
-%{\bigskipamount}
-%{\FormatRunInHeading{}}
-%{.5em}
-
-%original declaration and spaces
-
-%\DeclareSectioningCommand[breakbefore,wholewidth]{chapter}{0}
-%{56pt}
-%{\FormatChapterHeading{12pt}{\large\@chapapp\space}{\LARGE}}
-%{24pt}
-%%%%%%
-
-
-%\DeclareSectioningCommand[breakbefore,breakafter,wholewidth]{part}{-1}
-%{0\p@ plus1fil}
-%{\FormatChapterHeading{20\p@}%
-% {\centering\large\partname\space}%
-% {\centering\LARGE}}
-%{0\p@ plus1fil}
-
%%%% OPTIONS %%%%%
@@ -96,35 +55,6 @@
}
-%\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}
@@ -133,16 +63,13 @@
{\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~\thechapter}\fi
+ \addcontentsline{toc}{chapter}{%
+ \ifHeadingNumbered
+ \mw@seccntformat{\@chapapp~\thechapter}%
+ \fi
+ \HeadingTOCText}}%
}
@@ -153,16 +80,13 @@
{\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~\thechapter}\fi
+ \addcontentsline{toc}{chapter}{%
+ \ifHeadingNumbered
+ \mw@seccntformat{\@chapapp~\thechapter}%
+ \fi
+ \HeadingTOCText}}%
}
@@ -172,96 +96,64 @@
{\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~\thechapter}\fi
+ \addcontentsline{toc}{chapter}{%
+ \ifHeadingNumbered
+ \mw@seccntformat{\@chapapp~\thechapter}%
+ \fi
+ \HeadingTOCText}}%
}
-%%%%%%%%
-
-%%% for nochapterX
-%\DeclareSectioningCommand[breakbefore,wholewidth]{chapter}{0}
-%{56\p@}
-%{\FormatBlockHeading{\LARGE}}
-%{24\p@}
-
-%{\FormatBlockHeading{\centering\bfseries\LARGE}}
+%%%%%%%%nochapter name%%%%%%
-%%%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}
{\FormatBlockHeading{\centering\bfseries\LARGE}}
{24pt plus9pt}
\renewcommand*\chapter@toc{%
- \ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}\fi
+ \ifHeadingNumbered\typeout{\thechapter}\fi
\addcontentsline{toc}{chapter}{%
\ifHeadingNumbered
- \protect\numberline{\mw@seccntformat{\HeadingNumber}}%
+ \mw@seccntformat{\thechapter}%
\fi
- \HeadingTOCText}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
-}
+ \HeadingTOCText}}%
}
+
\DeclareOption{nochapterleft}{\SetSectionFormatting[breakbefore,wholewidth]{chapter}
{12pt}
{\FormatBlockHeading{\bfseries\LARGE}}
{24pt plus9pt}
-
\renewcommand*\chapter@toc{%
- \ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}\fi
+ \ifHeadingNumbered\typeout{\thechapter}\fi
\addcontentsline{toc}{chapter}{%
\ifHeadingNumbered
- \protect\numberline{\mw@seccntformat{\HeadingNumber}}%
+ \mw@seccntformat{\thechapter}%
\fi
- \HeadingTOCText}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \HeadingTOCText}}%
}
-}
-
\DeclareOption{nochapterright}{\SetSectionFormatting[breakbefore,wholewidth]{chapter}
{12pt}
{\FormatBlockHeading{\flushright\bfseries\LARGE}}
{24pt plus9pt}
-
\renewcommand*\chapter@toc{%
- \ifHeadingNumbered\typeout{\@chapapp\space\thechapter.}\fi
+ \ifHeadingNumbered\typeout{\thechapter}\fi
\addcontentsline{toc}{chapter}{%
\ifHeadingNumbered
- \protect\numberline{\mw@seccntformat{\HeadingNumber}}%
+ \mw@seccntformat{\thechapter}%
\fi
- \HeadingTOCText}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
-}
+ \HeadingTOCText}}%%
}
+
%%%%%%%%%%
@@ -290,9 +182,6 @@
}
-%The macro \@chapapp is initially defined to expand to \chaptername, but \appendix redefines it to be \appendixname.
-
-
%%for headings:%%%%
\if@twoside
@@ -550,29 +439,6 @@
\fi
##1}}}
\fi
-%\def\ps@myuheadingsnodot{%
-% \let\ps@normal\hf@uheadings
-% \let\ps@opening\hf@plain
-% \let\ps@closing\hf@uheadings
-% \let\ps@blank\hf@empty
-% \ps@normal
-% \let\@mkboth\@gobbletwo
-% \let\chaptermark\@gobble
-% \let\sectionmark\@gobble
-
-%%% to add color to sepline
-%\renewcommand*\hf@uheadings{%
-% \def\@oddhead{\vtop{%
-% \hb@xt@\textwidth{%
-% \reset@font{\heading@font\rightmark}\hfil\thepage\strut}%
-% \vskip2pt{\color{JungleGreen}\hrule}\vskip-2.4pt}}%
-% \let\@oddfoot\@empty
-% \def\@evenhead{\vtop{%
-% \hb@xt@\textwidth{%
-% \reset@font\strut\thepage\hfil\heading@font\leftmark}%
-% \vskip2pt{\color{JungleGreen}\hrule}\vskip-2.4pt}}%
-% \let\@evenfoot\@empty
-%}
@@ -620,40 +486,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% footnotes/thanks in titles
-
-%\renewcommand*\maketitle{\par
-% \begingroup
-% \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
-% % \long\def\@makefntext##1{
-% % \parindent\@parindent
-% % \@textsuperscript{\normalfont\@thefnmark}\enspace##1}%
-% \if@twocolumn
-% \ifnum \col@number=\@ne
-% \@maketitle
-% \else
-% \twocolumn[\@maketitle]%
-% \fi
-% \else
-% \newpage
-% \global\@topnum\z@ % Prevents figures from going at top of page.
-% \@maketitle
-% \fi
-% \thispagestyle{opening}\@thanks
-% \endgroup
-% \setcounter{footnote}{0}%
-% \global\let\thanks\relax
-% \global\let\maketitle\relax
-% \global\let\@maketitle\relax
-% \global\let\@thanks\@empty
-% \global\let\@author\@empty
-% \global\let\@date\@empty
-% \global\let\@title\@empty
-% \global\let\title\relax
-% \global\let\author\relax
-% \global\let\date\relax
-% \global\let\and\relax
-%}
%%%%%%%%%%%
@@ -665,83 +497,23 @@
\RequirePackage{titletoc}
-
-%\titlecontents{chapter}[1em]{\addvspace{1pc}\bfseries}{\contentslabel{1em}}{}
-%{\titlerule*[0.3pc]{.}\contentspage}
-
-%\titlecontents{chapter}
-%[0pt]
-%{\addvspace{1pc}%
-% \itshape}%
-%{\contentsmargin{0pt}%
-% \bfseries
-% \makebox[0pt][r]{\huge\thecontentslabel\enspace}%
-% \large}
-%{\contentsmargin{0pt}%
-% \large}
-%{\quad\thepage}
-%[\addvspace{.5pc}]
-
%%%%% FANCY TOC %%%%%%%%%
-%double all #1 like ##1 if it's inside another definition
-
-%%%%original changed:
-
-%\renewcommand*\l@part[2]{%
-% \ifnum \c@tocdepth >-2\relax
-% \mw@tocskip{-1}{.6\baselineskip}%
-% \begingroup
-% \parindent \z@ \rightskip \@pnumwidth
-% \parfillskip -\@pnumwidth
-% {\leavevmode%\normalsize\normalfont
-% \bfseries
-% \let\numberline\partnumberline % <--- added
-% \centering \Large #1\par
-% }
-% \nobreak
-% \global\@nobreaktrue
-% \everypar{\global\@nobreakfalse\everypar{}}%
-% \endgroup
-% \addvspace{.4\baselineskip}%
-% \fi}
-%\def\partnumberline#1{\@partnumberline#1\@nil}
-%\def\@partnumberline#1.#2\@nil{\partname\ #1\\\large\itshape}%
\newcommand{\fancytoc}{%
-% \renewcommand*\l@part[2]{%
-% \ifnum \c@tocdepth >-2\relax
-% \mw@tocskip{-1}{.6\baselineskip}%
-% \begingroup
-% \parindent \z@ \rightskip \@pnumwidth
-% \parfillskip -\@pnumwidth
-% {\leavevmode%\normalsize\normalfont
-% \bfseries
-% \let\numberline\partnumberline % <--- added
-% \centering \Large ##1\par
-% }
-% \nobreak
-% \global\@nobreaktrue
-% \everypar{\global\@nobreakfalse\everypar{}}%
-% \endgroup
-% \addvspace{.4\baselineskip}%
-% \fi}
-% \def\partnumberline##1{\@partnumberline##1\@nil}
-% \def\@partnumberline##1.##2\@nil{\partname\ ##1\\\large\itshape}%
-
+
\titlecontents{part}
[0pt]
{\addvspace{2pc}%
\bfseries\centering}%
{\contentsmargin{0pt}%
- \bfseries
- \huge Parte~\thecontentslabel
- \\[12pt]%
- \Large\itshape}
+ \Large Parte~\thecontentslabel
+ \\[10pt]%
+ \normalfont\Large\itshape}
{\contentsmargin{0pt}%
\huge}
- {\quad\contentspage}
+ {}%\quad\contentspage
[\addvspace{.5pc}]
\titlecontents{chapter}
@@ -805,6 +577,8 @@
%%%%%%% end part in toc %%%%%%%%
}
+%double all #1 like ##1 if it's inside another definition
+
%For the parameters of a definition inside a definition you need to double the hash char:
%
%\renewcommand\appendix{\par
@@ -814,7 +588,6 @@
% ...
%}
-
%from http://tex.stackexchange.com/questions/62438/how-to-add-leaders-to-table-of-contents-without-tocloft/62441#62441
\newcommand{\traditionaltoc}{
@@ -875,10 +648,6 @@
\let\noindent\empty % this causes the warning for \indent
}
-%\RequirePackage{picinpar}
-
-%\RequirePackage[justification=raggedright,font={sf},labelfont=bf]{caption}
-\RequirePackage[space,extendedchars]{grffile} % para inserir figuras com espaços no nome
\RequirePackage{graphicx}
\RequirePackage{booktabs}
@@ -886,30 +655,6 @@
-
-
-
-
-% remove toc, list of figures and list of tables from table of contents
-% NEED TO TAKE CHAPTER NAME FROM TOC IN nochapterleft etc. options%%%
-%\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@}}%
-%}
-
-%to remove chaptername from toc with options nochapterX
-
-
-
-%\RequirePackage[side,ragged,flushmargin]{footmisc} %marginal coloca os números da nota de rodapé para fora da margem, à la Bringhurst, flushmargin: fundamental para notas na margem.
-
-
%%% para notas sempre à direita.
%%%http://tex.stackexchange.com/questions/69595/marginnote-always-on-right-side-of-the-page
%\RequirePackage{etoolbox}