catechis (14jul18)

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

5 files changed, 66 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/catechis/CHANGES b/Master/texmf-dist/doc/latex/catechis/CHANGES
index ff56c2bc5dd..19e47442ace 100644
--- a/Master/texmf-dist/doc/latex/catechis/CHANGES
+++ b/Master/texmf-dist/doc/latex/catechis/CHANGES
@@ -1,3 +1,9 @@
+11 Jul 1202 (13 Jul 2018):  Added the catcitations
+environment, which inserts appropriate spacing before and
+after a citations section.  Also added \catcitationsbefskip
+and \catcitationsaftskip, to allow controlling how much
+space will be skipped.  Version 2.1.
+
 11 Jan 1202 (13 Jan 2018):  Complete rewrite of the package;
 much simpler and cleaner.  Added \catexplic command.
 \citetitle was replaced by \catcitetitle, to avoid
diff --git a/Master/texmf-dist/doc/latex/catechis/README b/Master/texmf-dist/doc/latex/catechis/README
index bea604b473f..c6e77e45738 100644
--- a/Master/texmf-dist/doc/latex/catechis/README
+++ b/Master/texmf-dist/doc/latex/catechis/README
@@ -1,15 +1,12 @@
 +AMDG
 
-This readme is for catechis v2.0, uploaded on 11 Jan 1202
-(13 Jan 2018).
-
-This document is copyright 11E4 (2008) by Donald P. Goodman,
+This document is copyright 1202 (2018) by Donald P. Goodman,
 and is released publicly under the LaTeX Project Public
 License.  The distribution and modification of this work is
 constrained by the conditions of that license.  See
 	http://www.latex-project.org/lppl.txt
 for the text of the license.  This document is released
-under version 1.3 of that license, and this work may be distributed
+under version 1.3c of that license, and this work may be distributed
 or modified under the terms of that license or, at your option, any
 later version.
 
diff --git a/Master/texmf-dist/doc/latex/catechis/catechis.pdf b/Master/texmf-dist/doc/latex/catechis/catechis.pdf
index c766e901154..f75d0b32314 100644
--- a/Master/texmf-dist/doc/latex/catechis/catechis.pdf
+++ b/Master/texmf-dist/doc/latex/catechis/catechis.pdf
diff --git a/Master/texmf-dist/source/latex/catechis/catechis.dtx b/Master/texmf-dist/source/latex/catechis/catechis.dtx
index 4eda60e7e6a..a752a15b4f2 100644
--- a/Master/texmf-dist/source/latex/catechis/catechis.dtx
+++ b/Master/texmf-dist/source/latex/catechis/catechis.dtx
@@ -25,7 +25,7 @@
 
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{catechis}[2018/01/13 v2.0 Support for writing catechism questions and answers]
+%<package>\ProvidesPackage{catechis}[2018/07/13 v2.1 Support for writing catechism questions and answers]
 %<*driver>
 \documentclass{ltxdoc}
 
@@ -57,7 +57,7 @@
 \end{document}
 %</driver> \fi
 %
-% \title{The |catechis| Package, v2.0} \author{Donald P.\
+% \title{The |catechis| Package, v2.1} \author{Donald P.\
 % Goodman III} \date{\today}
 %
 % \maketitle
@@ -301,6 +301,31 @@
 % canst not be false to any man.}{Polonius}
 % \exline
 %
+% Because this will often not result in proper spacing,
+% |catechis| provides an environment,
+% \DescribeMacro{catcitations}|catcitations|, which
+% will insert appropriate spacing before and after the
+% citations.  This environment will automatically run
+% |\catcitetitle| for you.
+%
+% \begin{verbatim}
+% \begin{catcitations}
+% \catcite{For the apparel oft proclaims the man.}{Polonius}
+% \catcite{And this above all: to thine own self be true; /
+% and it must follow, as the night the day, / that thou
+% canst not be false to any man.}{Polonius}
+% \end{catcitations}
+% \end{verbatim}
+%
+% \exline
+% \begin{catcitations}
+% \catcite{For the apparel oft proclaims the man.}{Polonius}
+% \catcite{And this above all: to thine own self be true; /
+% and it must follow, as the night the day, / that thou
+% canst not be false to any man.}{Polonius}
+% \end{catcitations}
+% \exline
+%
 % Lastly, |catechis| gives some provisions for more
 % customary catechetical enumerates.  It uses standard
 % features from the |paralist| package for this, and simply
@@ -359,7 +384,7 @@
 % is defined as |\renewcommand{\thecatquesnum}{\arabic{catquesnum}.}|.
 % \vitem|\catquesnumwd| \DescribeMacro{\catquesnumwd}  The
 % width of the box in which |catechis| typesets the question
-% numbe.  By default, |2em|.
+% number.  By default, |2em|.
 %	\vitem|\catquesindent| \DescribeMacro{\catquesindent}
 %	The indentation of the first line of the question in
 %	|\catques|.  By default, |0em|.
@@ -403,6 +428,12 @@
 % \vitem|\catcitetitlesty| \DescribeMacro{\catcitetitlesty}
 % The style in which |\catcitetitle| will print its
 % contents.  By default, |\Large\scshape|.
+% \vitem|\catcitationbefskip| \DescribeMacro{\catcitationbefskip}
+% The distance to skip prior to beginning a |catcitations|
+% environment, before running |\catcitetitle|.
+% \vitem|\catcitationaftskip| \DescribeMacro{\catcitationaftskip}
+% The distance to skip after ending a |catcitations|
+% environment.
 %	\vitem|\catciteindent| \DescribeMacro{\catciteindent} The
 %	indentation of the first line of the citation itself
 %	(that is, the quotation) in a |\catcite|.  By default,
@@ -508,7 +539,7 @@
 }%
 %    \end{macrocode}
 % Define the commands to produce citation titles, and set
-% sensible defaults.
+% sensible defaults; also for the citation environment.
 %    \begin{macrocode}
 \def\catcitetitlesty{\Large\scshape}%
 \def\catcitetitleword{Citations}%
@@ -517,6 +548,17 @@
 		\catcitetitlesty\catcitetitleword%
 	\end{center}%
 }%
+\newlength\catcitationbefskip\catcitationbefskip=1em%
+\newlength\catcitationaftskip\catcitationaftskip=1em%
+\def\catcitations{%
+	\leavevmode%
+	\vskip\catcitationbefskip%
+	\catcitetitle%
+}%
+\def\endcatcitations{%
+	\leavevmode%
+	\vskip\catcitationaftskip%
+}%
 %    \end{macrocode}
 % Define actual citations macros and lengths.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/catechis/catechis.sty b/Master/texmf-dist/tex/latex/catechis/catechis.sty
index f957968e4d7..8d818df11ea 100644
--- a/Master/texmf-dist/tex/latex/catechis/catechis.sty
+++ b/Master/texmf-dist/tex/latex/catechis/catechis.sty
@@ -26,7 +26,7 @@
 %% derived files catechis.sty and catechis.pdf.
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{catechis}[2018/01/13 v2.0 Support for writing catechism questions and answers]
+\ProvidesPackage{catechis}[2018/07/13 v2.1 Support for writing catechism questions and answers]
 \RequirePackage{paralist}
 \setdefaultenum{(a)}{(1)}{(i)}{(A)}
 \setdefaultleftmargin{3.8em}{}{}{}{}{}
@@ -78,6 +78,17 @@
 \catcitetitlesty\catcitetitleword%
 \end{center}%
 }%
+\newlength\catcitationbefskip\catcitationbefskip=1em%
+\newlength\catcitationaftskip\catcitationaftskip=1em%
+\def\catcitations{%
+\leavevmode%
+\vskip\catcitationbefskip%
+\catcitetitle%
+}%
+\def\endcatcitations{%
+\leavevmode%
+\vskip\catcitationaftskip%
+}%
 \def\catcitesty{\itshape}%
 \def\catsrcsty{}%
 \newlength{\catciteindent}\setlength{\catciteindent}{0em}%