catechis (14jan18)

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

8 files changed, 1130 insertions, 759 deletions

diff --git a/Master/texmf-dist/doc/latex/catechis/CHANGES b/Master/texmf-dist/doc/latex/catechis/CHANGES
new file mode 100644
index 00000000000..ff56c2bc5dd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/catechis/CHANGES
@@ -0,0 +1,6 @@
+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
+inevitable naming collisions.  \scripture is now simply an
+alias of \catcite, with a view to eventual deprecation.
+Version 2.0.
diff --git a/Master/texmf-dist/doc/latex/catechis/README b/Master/texmf-dist/doc/latex/catechis/README
index 2681a7d3942..bea604b473f 100644
--- a/Master/texmf-dist/doc/latex/catechis/README
+++ b/Master/texmf-dist/doc/latex/catechis/README
@@ -1,11 +1,12 @@
 +AMDG
 
-This readme is for catechis v1.1, uploaded on 1 Sep 2008.
+This readme is for catechis v2.0, uploaded on 11 Jan 1202
+(13 Jan 2018).
 
-This document is copyright 2008 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
+This document is copyright 11E4 (2008) 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
@@ -14,24 +15,15 @@ later version.
 
 This work has the LPPL maintenance status 'maintained'.
 
-The Current Maintainer of this work is Donald P. Goodman
-(dgoodmaniii@gmail.com).
+The Current Maintainer of this work is Donald P. Goodman.
 
 This work consists of the files catechis.ins, catechis.sty, and
-this README.
+test.tex.
 
 This document should run properly on any properly running LaTeX
-system.  It's been tested specifically with TeXLive 2008 on
-GNU/Linux (2.6 kernel).
+system.  It's been tested specifically with TeXLive on Linux (2.6.2
+kernel).
 
 catechis is intended to provide basic and advanced macros for
 producing catechism texts.  It is meant to be extensively
 customizable.
-
-CHANGES:
-17 Jan 2008 --- the initial package, v1.0.  All
-functionality was present.
-1 Sep 2008 --- v1.1.  Fixed up the enumerates offered to
-make them work; previously indentation was spotty at best.
-Sacrificed most of their flexibility to do this, but felt it
-was for the best overall.
diff --git a/Master/texmf-dist/doc/latex/catechis/catechis.pdf b/Master/texmf-dist/doc/latex/catechis/catechis.pdf
index 35911344a8f..c766e901154 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/doc/latex/catechis/lppl.txt b/Master/texmf-dist/doc/latex/catechis/lppl.txt
new file mode 100644
index 00000000000..22443139013
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/catechis/lppl.txt
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c  2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+    Everyone is allowed to distribute verbatim copies of this
+    license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute.  This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but 
+it is written in such a way that you can use it even if your work is 
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work.  If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+   `Work'
+    Any work being distributed under this License.
+    
+   `Derived Work'
+    Any work that under any applicable law is derived from the Work.
+
+   `Modification' 
+    Any procedure that produces a Derived Work under any applicable
+    law -- for example, the production of a file containing an
+    original file associated with the Work or a significant portion of
+    such a file, either verbatim or with modifications and/or
+    translated into another language.
+
+   `Modify'
+    To apply any procedure that produces a Derived Work under any
+    applicable law.
+    
+   `Distribution'
+    Making copies of the Work available from one person to another, in
+    whole or in part.  Distribution includes (but is not limited to)
+    making any electronic components of the Work accessible by
+    file transfer protocols such as FTP or HTTP or by shared file
+    systems such as Sun's Network File System (NFS).
+
+   `Compiled Work'
+    A version of the Work that has been processed into a form where it
+    is directly usable on a computer system.  This processing may
+    include using installation facilities provided by the Work,
+    transformations of the Work, copying of components of the Work, or
+    other activities.  Note that modification of any installation
+    facilities provided by the Work constitutes modification of the Work.
+
+   `Current Maintainer'
+    A person or persons nominated as such within the Work.  If there is
+    no such explicit nomination then it is the `Copyright Holder' under
+    any applicable law.
+
+   `Base Interpreter' 
+    A program or process that is normally needed for running or
+    interpreting a part or the whole of the Work.    
+
+    A Base Interpreter may depend on external components but these
+    are not considered part of the Base Interpreter provided that each
+    external component clearly identifies itself whenever it is used
+    interactively.  Unless explicitly specified when applying the
+    license to the Work, the only applicable Base Interpreter is a
+    `LaTeX-Format' or in the case of files belonging to the 
+    `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1.  Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope.  In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2.  You may distribute a complete, unmodified copy of the Work as you
+received it.  Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3.  You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4.  If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work.  You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work.  Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5.  If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6.  If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition.  Only
+the Current Maintainer is allowed to add such statements of exemption 
+to a component of the Work. 
+
+  a. If a component of this Derived Work can be a direct replacement
+     for a component of the Work when that component is used with the
+     Base Interpreter, then, wherever this component of the Work
+     identifies itself to the user when used interactively with that
+     Base Interpreter, the replacement component of this Derived Work
+     clearly and unambiguously identifies itself as a modified version
+     of this component to the user when used interactively with that
+     Base Interpreter.
+     
+  b. Every component of the Derived Work contains prominent notices
+     detailing the nature of the changes to that component, or a
+     prominent reference to another file that is distributed as part
+     of the Derived Work and that contains a complete and accurate log
+     of the changes.
+  
+  c. No information in the Derived Work implies that any persons,
+     including (but not limited to) the authors of the original version
+     of the Work, provide any support, including (but not limited to)
+     the reporting and handling of errors, to recipients of the
+     Derived Work unless those persons have stated explicitly that
+     they do provide such support for the Derived Work.
+
+  d. You distribute at least one of the following with the Derived Work:
+
+       1. A complete, unmodified copy of the Work; 
+          if your distribution of a modified component is made by
+          offering access to copy the modified component from a
+          designated place, then offering equivalent access to copy
+          the Work from the same or some similar place meets this
+          condition, even though third parties are not compelled to
+          copy the Work along with the modified component;
+
+       2. Information that is sufficient to obtain a complete,
+          unmodified copy of the Work.
+
+7.  If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8.  The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9.  Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+     
+10. a. A Derived Work may be distributed under a different license
+       provided that license itself honors the conditions listed in
+       Clause 6 above, in regard to the Work, though it does not have
+       to honor the rest of the conditions in this license.
+      
+    b. If a Derived Work is distributed under a different license, that
+       Derived Work must provide sufficient documentation as part of
+       itself to allow each recipient of that Derived Work to honor the 
+       restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12.  Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work.  Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose.  The entire risk as to the quality and performance
+of the Work is with you.  Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1.  Make a reasonable attempt to trace the Current Maintainer (and
+     the Copyright Holder, if the two differ) through the means of
+     an Internet or similar search.
+
+ 2.  If this search is successful, then enquire whether the Work
+     is still maintained.
+
+  a. If it is being maintained, then ask the Current Maintainer
+     to update their communication data within one month.
+     
+  b. If the search is unsuccessful or no action to resume active
+     maintenance is taken by the Current Maintainer, then announce
+     within the pertinent community your intention to take over
+     maintenance.  (If the Work is a LaTeX work, this could be
+     done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+     maintenance of the Work to you, then this takes effect
+     immediately upon announcement.
+     
+  b. If the Current Maintainer is not reachable and the Copyright
+     Holder agrees that maintenance of the Work be passed to you,
+     then this takes effect immediately upon announcement.  
+    
+ 4.  If you make an `intention announcement' as described in 2b. above
+     and after three months your intention is challenged neither by
+     the Current Maintainer nor by the Copyright Holder nor by other
+     people, then you may arrange for the Work to be changed so as
+     to name you as the (new) Current Maintainer.
+     
+ 5.  If the previously unreachable Current Maintainer becomes
+     reachable once more within three months of a change completed
+     under the terms of 3b) or 4), then that Current Maintainer must
+     become or remain the Current Maintainer upon request provided
+     they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer.  You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license.  These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license.  You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license.  It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate.  Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component.  While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community.  It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one.  Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified.  Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+  %% pig.dtx
+  %% Copyright 2005 M. Y. Name
+  %
+  % This work may be distributed and/or modified under the
+  % conditions of the LaTeX Project Public License, either version 1.3
+  % of this license or (at your option) any later version.
+  % The latest version of this license is in
+  %   http://www.latex-project.org/lppl.txt
+  % and version 1.3 or later is part of all distributions of LaTeX
+  % version 2005/12/01 or later.
+  %
+  % This work has the LPPL maintenance status `maintained'.
+  % 
+  % The Current Maintainer of this work is M. Y. Name.
+  %
+  % This work consists of the files pig.dtx and pig.ins
+  % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.  
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+   The LPPL requires that distributions of the Work contain all the
+   files of the Work.  It is therefore important that you provide a
+   way for the licensee to determine which files constitute the Work.
+   This could, for example, be achieved by explicitly listing all the
+   files of the Work near the copyright notice of each file or by
+   using a line such as:
+
+    % This work consists of all files listed in manifest.txt.
+   
+   in that place.  In the absence of an unequivocal list it might be
+   impossible for the licensee to determine what is considered by you
+   to comprise the Work and, in such a case, the licensee would be
+   entitled to make reasonable conjectures as to which files comprise
+   the Work.
+
diff --git a/Master/texmf-dist/doc/latex/catechis/test.tex b/Master/texmf-dist/doc/latex/catechis/test.tex
deleted file mode 100644
index 2d62266d7d5..00000000000
--- a/Master/texmf-dist/doc/latex/catechis/test.tex
+++ /dev/null
@@ -1,100 +0,0 @@
-% +AMDG  See catechis.sty for dedication of this test 
-% file.  Pray for us!  Have mercy on us!
-% 
-% This document is copyright 2008 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
-% or modified under the terms of that license or, at your option, any
-% later version.
-% 
-% This work has the LPPL maintenance status 'maintained'.
-% 
-% The Current Maintainer of this work is Donald P. Goodman.
-% 
-% This work consists of the files catechis.ins, catechis.sty, and
-% test.tex, along with README.
-\documentclass[12pt]{article}
-\title{Testing the \texttt{catechis} Package}
-\author{Donald P.\ Goodman III}
-\date{\today}
-
-\usepackage{catechis}
-
-\begin{document}
-\maketitle
-
-\catques{Who made us?}{God made us.}
-
-\catques{Why did God make us?}{God made us to know Him, love Him, 
-and serve Him, and by so doing to gain Heaven.}
-\catques{Are you going to write any actual examples, or just copy
-them all from other catechisms?}{Wait for it; I'm going to write
-some of my own.  The above are verbatim or nearly verbatim from the
-Baltimore Catechism, for those who do not know.}
-\catques{Did you make a package for writing catechisms?  For 
-serious?}{Yes, I did.  I had a number of reasons for this:
-\begin{enumerate}
-\item I wanted to typeset one or two for myself.
-\catcomment{This although I've already done so in a very hacked,
-difficult to read and difficult to write style.  But at least I'm
-(hopefully) making it easier for others.}
-\begin{enumerate}
-\item There's one in \textit{Thomistic Salvation}.
-\catcomment{And it's not half bad.  I think it addresses the issues it
-was meant to address pretty thoroughly, in a basic, catechism sort of
-way.}
-\item There's also one in \textit{Officium Parvum}.\label{testlabel}
-\catcomment{This one could use some work.  But it still isn't
-terrible.}
-\end{enumerate}
-\item It's a part of my plan to make a complete Catholic 
-desktop (though what that plan is, exactly, is still somewhat 
-up in the air).
-\catcomment{I'm trying to flesh this idea out a little more.  It will
-at least contain a couple of \LaTeX\ packages and a multilingual
-Scripture-searching tool; hopefully also a Catholic calendar desklet
-and similar items.}
-\end{enumerate}
-} % 
-
-\catques{All right, I guess so.  But it still seems weird.}{Maybe.  
-But I think (hope) it'll bear fruit.
-\catcomment{And I'm very hopeful.  Hope is, after all, one of the
-three theological virtues, and mentioned repeatedly in the Scriptures
-as necessary for us to have.}
-}% 
-
-\catques{Here's a really long question that I'm trying to make 
-wrap onto another line so that we can see how that will behave.  
-Will it behave well?}{Yes, it will behave well.  The algorithm 
-is reasonably obedient and well-behaved.}
-\catques{What about the Scripture citations you often see in
-catechisms?  Can this hooty-falooty package of yours handle those?}{%
-I'm glad you asked.  Yes, this package can easily handle those.
-\catcomment{Even in conjunction with a catcomment, you'll notice;
-versatility (and ease of goal) is always the key.}
-\citetitle
-\scripture{In the beginning was the Word, and the Word was with God,
-and the Word was God.}{St.~John 1:1.}
-\scripture{Where wast thou when I laid up the foundations of the 
-earth? tell me if thou hast understanding.}{Job 38:4}
-}%
-\catques{Finally, how do the labels work with the hacked
-enumerates?}{Well, they work all right, thanks to \texttt{varioref}; 
-in fact, here's one:  \ref{testlabel}.}
-\catques{I want to see some double-digit question numbers.}{I'm
-working on it; only one more question to go.}
-\catques{Finally; do they indent properly and all, at least with the
-defaults?}{Yes, they indent exactly as one would expect.
-\catcomment{Although in this, my first real foray into serious
-\LaTeX\ programming, I found that very little works as expected, and
-one must have a very thorough knowledge of internals to avoid being
-surprised and having to work quite hard to figure out some unexpected
-results.}
-}
- 
-\end{document}
diff --git a/Master/texmf-dist/source/latex/catechis/catechis.dtx b/Master/texmf-dist/source/latex/catechis/catechis.dtx
new file mode 100644
index 00000000000..4eda60e7e6a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/catechis/catechis.dtx
@@ -0,0 +1,540 @@
+% \iffalse
+% +AMDG  This document was begun on E January 1202, and it
+% is humbly dedicated to her Immaculate Heart for
+% her prayers, and to the Sacred Heart of Jesus for His
+% mercy.
+%
+% This document is copyright 2017 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
+% or modified under the terms of that license or, at your option, any
+% later version.
+% 
+% This work has the LPPL maintenance status 'maintained'.
+% 
+% The Current Maintainer of this work is Donald P. Goodman
+% (dgoodmaniii@gmail.com).
+% 
+% This work consists of catechis.dtx, catechis.ins, and
+% derived files catechis.sty and catechis.pdf.
+% \fi
+
+% \iffalse
+%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+%<package>\ProvidesPackage{catechis}[2018/01/13 v2.0 Support for writing catechism questions and answers]
+%<*driver>
+\documentclass{ltxdoc}
+
+\usepackage{doc}
+\usepackage{array}
+\usepackage{lettrine}
+	\setcounter{DefaultLines}{3}
+	\setlength{\DefaultFindent}{2pt}
+	\renewcommand{\LettrineFontHook}{\color{red}}
+\usepackage{url}
+\usepackage{spverbatim}
+\usepackage{fancyvrb}
+	\newcommand\vitem[1][]{\SaveVerb[%
+		aftersave={\item[\textnormal{\bfseries\UseVerb[#1]{vsave}}]}]{vsave}}
+\usepackage[typeone]{dozenal}
+\usepackage{lmodern}
+\usepackage[]{catechis}
+\usepackage[colorlinks]{hyperref}
+\usepackage{makeidx}
+\EnableCrossrefs
+\PageIndex
+\CodelineNumbered
+\RecordChanges
+\makeindex
+
+\def\exline{\bigskip\hrule\bigskip}
+
+\tracingmacros=3 \begin{document} \DocInput{catechis.dtx}
+\end{document}
+%</driver> \fi
+%
+% \title{The |catechis| Package, v2.0} \author{Donald P.\
+% Goodman III} \date{\today}
+%
+% \maketitle
+%
+% \begin{abstract}
+% \noindent
+% The catechism (a text consisting of explicitly-stated and
+% usually numbered questions and answers) has long been an
+% important vehicle for teaching the basics of concepts.
+% \LaTeX, however, does not by default have much facility
+% for producing such texts.  The |catechis| package provides
+% a number of highly customizable macros for writing
+% catechisms, including a numbered question-and-answer
+% environment; comments on answers; and citations.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Introduction}
+%
+% Catechisms are largely known for basic religious
+% instruction, and this has indeed been their primary use.
+% For this reason alone, \LaTeX\ ought to have some
+% facilities for authoring them.  Furthermore, the form is
+% useful for other topics, as well; it provides an easy way
+% to give basic information on a topic, making it easily
+% extractable by eye from the full text, while still
+% allowing more advanced discussion for those who wish to
+% plunge more deeply into a given question.
+%
+% |catechis| is packaged according to the \LaTeX\
+% \textsc{docstrip} utility, which allows automatic
+% extraction of code and documentation from the same files.
+%
+% This is version 2.0 of |catechis|; it represents a mostly
+% complete rewrite of the package, which is therefore much
+% simpler and more robust.
+%
+% \section{The State of the \TeX\ for Catechisms}
+% \label{sect:state}
+%
+% \LaTeX\ has basically no provision for producing
+% well-formed catechisms.  It's easy enough to fake it, of
+% course; for example:
+%
+% \begin{verbatim}
+% \begin{enumerate}
+%		\item\textbf{Who made us?} \\ God made us.
+%		\item\textbf{Why did God make us?} \\ God made us to
+%			know Him, love Him, and serve Him, and by so doing
+%			to gain everlasting life with Him in Heaven.
+% \end{enumerate}
+% \end{verbatim}
+%
+% This gives the following result:
+%
+% \exline
+%\begin{enumerate}
+%		\item\textbf{Who made us?} \\ God made us.
+%		\item\textbf{Why did God make us?} \\ God made us to
+%			know Him, love Him, and serve Him, and by so doing
+%			to gain everlasting life with Him in Heaven.
+%\end{enumerate}
+% \exline
+%
+% However, this solution is far from satisfactory.  It's
+% unportable, fit really only for this one document;
+% uncustomizable, because it's hard-wired to do only this
+% one thing; unmodifiable, at least automatically, because
+% it uses explicit visual formatting in the text; and far
+% too wordy.  What is desired is something more along the
+% lines of the following:
+%
+% \begin{verbatim}
+% \catques{Who made us?}{God made us.}
+% \catques{Why did God make us?}{God made us to
+%	know Him, love Him, and serve Him, and by so doing
+%	to gain everlasting life with Him in Heaven.}
+% \end{verbatim}
+%
+% Which, with the |catechis| package, produces this:
+%
+% \exline
+% \catques{Who made us?}{God made us.}
+% \catques{Why did God make us?}{God made us to
+%	know Him, love Him, and serve Him, and by so doing
+%	to gain everlasting life with Him in Heaven.}
+% \catques{What will happen if the question is really long,
+% so that it wraps to the next line?}{It will work properly,
+% with the wrapped line appropriately indented.  The answer,
+% as you have already seen, will behave likewise.}
+% \exline
+%
+% |catechis| provides these facilities and more to produce
+% high-quality, useful catechisms.
+%
+% \section{Basic Usage}
+% \label{sect:basics}
+%
+% The most basic usage of |catechis| is encompassed by the
+% \DescribeMacro{\catques}|\catques| macro:
+%
+% \begin{center}
+% \cmd{\catques} \marg{question} \marg{answer}
+% \end{center}
+%
+% There is no more to this than meets the eye.  Both
+% arguments are mandatory, though either may be empty; the
+% first is the question, and the second is the answer.  It
+% is often helpful to indent sensibly to keep these more
+% readable in the source:
+%
+% \begin{verbatim}
+% \catques{What is the question?}{%
+%        The question is, ``What is the question?''}%
+% \end{verbatim}
+%
+% This produces the following:
+%
+% \exline
+% \catques{What is the question?}{The question is, ``What is the question?''}%
+% \exline
+%
+% Our next macro, \DescribeMacro{\catcomment}|\catcomment|,
+% really shows the genius of the catechism concept.  The
+% question and answer are the \emph{basic} information; it's
+% easily followed up by a comment, which is visually
+% separate and can be skipped by those interested in, or
+% only ready for, the basics, but is still sensibly placed
+% and ready for those who wish it.
+%
+% \exline
+% \catques{What is the question?}{The question is, ``What is the question?''}%
+% \catcomment{This is a comment.  It's very interesting, it
+% wraps and indents correctly, and the package's default
+% comment style is demonstrated here.}
+% \catques{How are the questions numbered?  Are they
+% numbered sequentially, throughout the text?}{Yes, the
+% questions are numbered sequentially throughout the text.
+% You can reset the numbers manually, which we'll talk about
+% later; but by default, there is one question stream which
+% is numbered from 1 on up.}
+% \catcomment{We're numbering questions sequentially to show
+% that you can have catechism questions scattered throughout
+% a text, or your text can be entirely in the form of a
+% catechism.  |catechis| works either way.}
+% \exline
+%
+% There is also the \DescribeMacro{\catexplic}|\catexplic|
+% command, which works essentially identically to
+% |\catcomment| but can include paragraph breaks and is
+% intended for much lengthier commentary on the answer.
+%
+% \begin{verbatim}
+% \catques{What is the question?}{The question is, ``What is the question?''}%
+% \catcomment{This is a comment.  It's very interesting, it
+% wraps and indents correctly, and the package's default
+% comment style is demonstrated here.}
+% \catexplic{We can make some really impressive things
+% happen with this command.  While comments allow
+% short explanatory comments on an answer, explics
+% give us field to go on for a long time, if we want.
+%
+% We can put in paragraph breaks, and we can even do the
+% following:
+% \begin{compactenum}
+% \item We can put lists in them!
+% \item Isn't that cool?  This can provide a great way to
+% give advanced information on a topic that people can read
+% if they want, or just skip on to the next question!
+% \end{compactenum}\restoreindents
+%
+% You can really produce beautiful catechetical works using
+% this facility, which will do a great job of instructing
+% people at all levels of expertise.
+% }%
+% \end{verbatim}
+%
+% \exline
+% \catques{What is the question?}{The question is, ``What is the question?''}%
+% \catcomment{This is a comment.  It's very interesting, it
+% wraps and indents correctly, and the package's default
+% comment style is demonstrated here.}
+% \catexplic{We can make some really impressive things
+% happen with this command.  While comments allow
+% short explanatory comments on an answer, explics
+% give us field to go on for a long time, if we want.
+%
+% We can put in paragraph breaks, the indentation of which
+% we can control with fine granularity; and we can even do the
+% following:
+%
+% \begin{compactenum}
+% \item We can put lists in them!
+% \item Isn't that cool?  This can provide a great way to
+% give advanced information on a topic that people can read
+% if they want, or just skip on to the next question!
+% \end{compactenum}\restoreindents
+%
+% You can really produce beautiful catechetical works using
+% this facility, which will do a great job of instructing
+% people at all levels of expertise.
+%
+% }%
+% \exline
+%
+% You'll note that lists \emph{will} hose all of
+% |catechis|'s careful indentation, so after using one in a
+% |\catexplic|, you must issue
+% \DescribeMacro{\restoreindents}|\restoreindents| to get
+% everything back to normal.
+%
+% Catechisms also routinely provide citations to support
+% their claims; |catechis| provides for this, too.  A
+% heading for a group of citations is printed by issuing
+% \DescribeMacro{\catcitetitle}|\catcitetitle|, and each
+% individual citation is printed by issuing the |\catcite|
+% command, which takes the citation as the first argument
+% and the source as the second:
+%
+% \begin{center}
+% \DescribeMacro{\catcite}
+% \cmd{\catcite} \marg{citation} \marg{source}
+% \end{center}
+%
+% An example:
+%
+% \begin{verbatim}
+% \catcitetitle
+% \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{verbatim}
+%
+% \exline
+% \catcitetitle
+% \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}
+% \exline
+%
+% Lastly, |catechis| gives some provisions for more
+% customary catechetical enumerates.  It uses standard
+% features from the |paralist| package for this, and simply
+% makes those the default.
+%
+% \begin{verbatim}
+% \catques{Can we do enumerates?}{Yes, we can do those; we
+% can even do them in a special way, so that it looks more
+% like the way catechisms customarily look.}
+% \catcomment{Just check this out; we have here a comment
+% giving slightly more detailed information, then an
+% enumerate giving \emph{much} more detailed information.}
+% \begin{enumerate}
+% \item Here, we have the first item, with some extra
+% details elaborating on what was said before.
+% \item Here, we have another item.
+% \item Here, we have still another.
+% \end{enumerate}
+% \end{verbatim}
+% 
+% \exline
+% \catques{Can we do enumerates?}{Yes, we can do those; we
+% can even do them in a special way, so that it looks more
+% like the way catechisms customarily look.}
+% \catcomment{Just check this out; we have here a comment
+% giving slightly more detailed information, then an
+% enumerate giving \emph{much} more detailed information.}
+% \begin{compactenum}
+% \item Here, we have the first item, with some extra
+% details elaborating on what was said before.
+% \item Here, we have another item.
+% \item Here, we have still another.
+% \end{compactenum}
+% \exline
+%
+% \section{Customization}
+% \label{sect:custom}
+%
+% Pretty much everything in the package can be customized.
+% The names of the necessary commands and lengths are fairly
+% predictable: they will start with |\cat|, be followed by
+% the type of thing (|ques|, |comm|, |explic|, etc.), and
+% then the property to be set (|sty|, |indent|, |hindent|,
+% etc.).
+%
+% In all cases, lengths are set with |\setlength|, while
+% commands are set with |\newcommand| or |\def|.
+%
+% \begin{description}
+% \vitem|catquesnum| \DescribeMacro{catquesnum} The counter
+% which |catechis| maintains for the questions.  It can be
+% set or reset with the usual \LaTeX\ counter commands
+% (e.g., |\setcounter|, |\addtocounter|).
+% \vitem|\thecatquesnum| \DescribeMacro{\thecatquesnum}  The
+% actual typeset version of |catquesnum|.  By default, this
+% 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|.
+%	\vitem|\catquesindent| \DescribeMacro{\catquesindent}
+%	The indentation of the first line of the question in
+%	|\catques|.  By default, |0em|.
+% \vitem|\catqueshindent| \DescribeMacro{\catqueshindent}
+% The indentation of subsequent lines of the question in
+% |\catques|.  By default, |2em|.
+% \vitem|\catquessty| \DescribeMacro{\catquessty} The style
+% in which the question will be printed in |\catques|.  By
+% default, |\bfseries|.
+%	\vitem|\catansindent| \DescribeMacro{\catansindent}
+%	The indentation of the first line of the answer in
+%	|\catques|.  By default, |2em|.
+% \vitem|\catanshindent| \DescribeMacro{\catanshindent}
+% The indentation of subsequent lines of the answer in
+% |\catques|.  By default, |2em|.
+% \vitem|\catanssty| \DescribeMacro{\catanssty} The style
+% in which the answer will be printed in |\catques|.  By
+% default, empty.
+%	\vitem|\catcommindent| \DescribeMacro{\catcommindent}
+%	The indentation of the first line of the comment in
+%	|\catcomment|.  By default, |2em|.
+% \vitem|\catcommhindent| \DescribeMacro{\catcommhindent}
+% The indentation of subsequent lines of the comment in
+% |\catcomment|.  By default, |2em|.
+% \vitem|\catcommsty| \DescribeMacro{\catcommsty} The style
+% in which the comment will be printed in |\catcomment|.  By
+% default, empty.
+%	\vitem|\catexplicindent| \DescribeMacro{\catexplicindent}
+%	The indentation of the first line of the paragraphs in a 
+%	|\catexplic|.  By default, |4em|.
+% \vitem|\catexplichindent| \DescribeMacro{\catexplichindent}
+% The indentation of subsequent lines of the paragraphs in a
+% |\catexplic|.  By default, |2em|.
+% \vitem|\catexplicsty| \DescribeMacro{\catexplicsty} The style
+% in which the comment will be printed in |\catexplic|.  By
+% default, |\small|.
+% \vitem|\catcitetitleword|
+% \DescribeMacro{\catcitetitleword}  The word which the
+% |\catcitetitle| command will print.  By default,
+% |Citations|.
+% \vitem|\catcitetitlesty| \DescribeMacro{\catcitetitlesty}
+% The style in which |\catcitetitle| will print its
+% contents.  By default, |\Large\scshape|.
+%	\vitem|\catciteindent| \DescribeMacro{\catciteindent} The
+%	indentation of the first line of the citation itself
+%	(that is, the quotation) in a |\catcite|.  By default,
+%	|0em|.
+% \vitem|\catcitehindent| \DescribeMacro{\catcitehindent}
+% The indentation of subsequent lines in the citation itself
+% (that is, the quotation) in a |\catcite|.  By default,
+% |0em|.
+% \vitem|\catcitesty| \DescribeMacro{\catcitesty} The style
+% in which the citation itself (that is, the quotation) will
+% be printed in |\catcite|.  By default, |\itshape|.
+%	\vitem|\catsrcindent| \DescribeMacro{\catsrcindent} The
+%	indentation of the first line of the source
+%	in a |\catcite|.  By default, |2em|.
+% \vitem|\catsrchindent| \DescribeMacro{\catsrchindent}
+% The indentation of subsequent lines in the source
+% in a |\catcite|.  By default, |2em|.
+% \vitem|\catsrcsty| \DescribeMacro{\catsrcsty} The style in
+% which the source will be printed in |\catcite|.  By
+% default, empty.
+% \end{description}
+%
+% Finally, the list settings are all from |paralist|, so
+% that package's documentation should be consulted for
+% changing the defaults set up for them.
+%
+% These options are sufficient to manipulate |catechis|
+% into behaving however you'd like.
+%
+% \section{Implementation}
+%
+% Start by requiring |paralist|, to take care of our custom
+% enumerates.
+%    \begin{macrocode}
+\RequirePackage{paralist}
+	\setdefaultenum{(a)}{(1)}{(i)}{(A)}
+	\setdefaultleftmargin{3.8em}{}{}{}{}{}
+%    \end{macrocode}
+% Now we create the indentations and styles for the default
+% question counter, the questions themselves, and the
+% answers.  We also set sensible defaults.
+%    \begin{macrocode}
+\newlength{\catquesindent}\setlength{\catquesindent}{0em}
+\newlength{\catqueshindent}\setlength{\catqueshindent}{2em}
+\newlength{\catansindent}\setlength{\catansindent}{2em}
+\newlength{\catanshindent}\setlength{\catanshindent}{2em}
+\newlength{\catquesnumwd}\setlength{\catquesnumwd}{2em}
+\newcounter{catquesnum}\setcounter{catquesnum}{0}
+\def\catquesnumsty{\bfseries}
+\def\catquessty{\bfseries}
+\def\catanssty{}
+\renewcommand{\thecatquesnum}{\arabic{catquesnum}.}
+%    \end{macrocode}
+% Here, we define the catechism question macro.  Nothing
+% much surprising here.
+%    \begin{macrocode}
+\def\catques#1#2{%
+	\stepcounter{catquesnum}%
+	{\parindent=\catquesindent\hangindent=\catqueshindent\hangafter=1%
+	{\par\leavevmode\hbox to\catquesnumwd{\catquesnumsty\thecatquesnum}%
+		\catquessty #1}\par}%
+	{\parindent=\catansindent\hangindent=\catanshindent\hangafter=1%
+		{\par\catanssty #2}\par}%
+}%
+%    \end{macrocode}
+% Define the catechism comments, and set sensible defaults
+% for the settings.
+%    \begin{macrocode}
+\def\catcommentsty{\itshape}
+\newlength{\commindent}\setlength{\commindent}{2em}
+\newlength{\commhindent}\setlength{\commhindent}{2em}
+\def\catcomment#1{%
+	{\parindent=\commindent\hangindent=\commhindent\hangafter=1%
+	{\par\catcommentsty #1}\par}
+}%
+%    \end{macrocode}
+% Define the catechism explications (longer than comments,
+% allowing paragraph breaks), and set sensible defaults for
+% their settings.
+%    \begin{macrocode}
+\def\catexplicsty{\small}
+\newlength{\explicindent}\setlength{\explicindent}{4em}
+\newlength{\explichindent}\setlength{\explichindent}{2em}
+\long\def\catexplic#1{%
+	{\par\everypar={\parindent=\explicindent\hangindent=\explichindent\hangafter=1}%
+	{\par\catexplicsty\  #1}\par}%
+}%
+%    \end{macrocode}
+% Because lists always seem to run roughshod over
+% indentation settings, and because it's easier to do this
+% than to write custom lists just for this package, we
+% define |\restoreindents| to fix settings after a list in a
+% |\catexplic|.
+%    \begin{macrocode}
+\def\restoreindents{%
+	\par%
+	\everypar={%
+		\parindent=\explicindent%
+		\hangindent=\explichindent%
+		\hangafter=1%
+	}%
+	\par%
+}%
+%    \end{macrocode}
+% Define the commands to produce citation titles, and set
+% sensible defaults.
+%    \begin{macrocode}
+\def\catcitetitlesty{\Large\scshape}%
+\def\catcitetitleword{Citations}%
+\def\catcitetitle{%
+	\begin{center}%
+		\catcitetitlesty\catcitetitleword%
+	\end{center}%
+}%
+%    \end{macrocode}
+% Define actual citations macros and lengths.
+%    \begin{macrocode}
+\def\catcitesty{\itshape}%
+\def\catsrcsty{}%
+\newlength{\catciteindent}\setlength{\catciteindent}{0em}%
+\newlength{\catcitehindent}\setlength{\catcitehindent}{0em}%
+\newlength{\catsrcindent}\setlength{\catsrcindent}{2em}%
+\newlength{\catsrchindent}\setlength{\catsrchindent}{2em}%
+\def\catcite#1#2{%
+	{\parindent=\catciteindent\hangindent=\catcitehindent\hangafter=1%
+		{\par\catcitesty #1}\par}%
+	{\parindent=\catsrcindent\hangindent=\catsrchindent\hangafter=1%
+		{\par\catsrcsty#2}\par}%
+}%
+\let\scripture=\catcite
+%    \end{macrocode}
+%
+% And that's it.  Happy \TeX{}ing!
+%
+% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/catechis/catechis.ins b/Master/texmf-dist/source/latex/catechis/catechis.ins
index 7ff9a08c15c..9d955c9ba2d 100644
--- a/Master/texmf-dist/source/latex/catechis/catechis.ins
+++ b/Master/texmf-dist/source/latex/catechis/catechis.ins
@@ -1,33 +1,64 @@
-% +AMDG  This document was produced on 12 September 2007, the Feast of the 

-% Holy Name of Mary, and it is humbly dedicated to her, the Blessed Virgin 

-% Mary, for her prayers, and to the Sacred Heart of Jesus for His mercy.

-% 

-% This document is copyright 2008 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

-% or modified under the terms of that license or, at your option, any

-% later version.

-% 

-% This work has the LPPL maintenance status 'maintained'.

-% 

-% The Current Maintainer of this work is Donald P. Goodman.

-% 

-% This work consists of the files catechis.ins, catechis.sty, and

-% test.tex, along with README.

-% 

-\documentclass{ltxdoc}

-\title{The \texttt{catechis} Package}

-\author{Donald P.\ Goodman III}

-\date{\today}

-

-\usepackage{doc}

-\usepackage{catechis}

-\usepackage{makeidx}

-

-\begin{document}

-\DocInput{catechis.sty}

-\end{document}

+% +AMDG  This document was begun on E January 1202, and it
+% is humbly dedicated to her Immaculate Heart for
+% her prayers, and to the Sacred Heart of Jesus for His
+% mercy.
+%
+% This document is copyright 2015 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
+% or modified under the terms of that license or, at your option, any
+% later version.
+% 
+% This work has the LPPL maintenance status 'maintained'.
+% 
+% The Current Maintainer of this work is Donald P. Goodman
+% (dgoodmaniii@gmail.com).
+% 
+% This work consists of catechis.dtx, catechis.ins, and
+% derived files catechis.sty and catechis.pdf.
+
+\input docstrip.tex
+
+\preamble
+This is a generated file.
+
+This document is copyright 2014 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
+or modified under the terms of that license or, at your option, any
+later version.
+
+This work has the LPPL maintenance status 'maintained'.
+
+The Current Maintainer of this work is Donald P. Goodman
+(dgoodmaniii@gmail.com).
+
+This work consists of catechis.dtx, catechis.ins, and
+derived files catechis.sty and catechis.pdf.
+\endpreamble
+
+\keepsilent
+\generate{\file{catechis.sty}{\from{catechis.dtx}{package}}}
+
+\Msg{******************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the}
+\Msg{* following file into a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space catechis.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file catechis.dtx}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{******************************************************}
+
+\endbatchfile
diff --git a/Master/texmf-dist/tex/latex/catechis/catechis.sty b/Master/texmf-dist/tex/latex/catechis/catechis.sty
index d9c2b5842ec..f957968e4d7 100644
--- a/Master/texmf-dist/tex/latex/catechis/catechis.sty
+++ b/Master/texmf-dist/tex/latex/catechis/catechis.sty
@@ -1,610 +1,96 @@
-% \iffalse
-% +AMDG  This document was begun on 9 November 2007, the 
-% commemoration of St. Theodore the Martyr, and it is humbly 
-% dedicated to him and to the Immaculate Heart of Mary 
-% for their prayers, and to the Sacred Heart of Jesus 
-% for His mercy.  Also to St. Peter Damien, Hammer of 
-% heretics, and to St. Pius V, and St. Thomas Aquinas; pray 
-% for us!
-% 
-% This document is copyright 2008 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
-% or modified under the terms of that license or, at your option, any
-% later version.
-% 
-% This work has the LPPL maintenance status 'maintained'.
-% 
-% The Current Maintainer of this work is Donald P. Goodman
-% (dgoodmaniii@gmail.com).
-% 
-% This work consists of the files catechis.ins and
-% catechis.sty, along with the README.
-% \fi
-%
-% \maketitle
-% \begin{abstract}
-% The |catechis| package is a simple package which defines a number of highly 
-% customizable macros for writing catechisms.  These include a numbered 
-% question environment; a command for comments and one for scripture
-% citations; and special commands and lengths which can be easily 
-% altered for each, thus making, for example, the indentation of each question 
-% and answer easily altered according to situation and taste.
-% \end{abstract}
-% 
-% \tableofcontents
-% 
-% \section{Introduction}
-% 
-% There is no package which provides appropriate commands for writing 
-% catechism questions and explanations.  One-off hacks are, of course, 
-% quite easy to produce:
-% \begin{quote}
-% |\begin{enumerate}| \\
-% |\item \textbf{Who made us?} \\ God made us.| \\
-% |\item \textbf{Why did God make us?} \\  God made us to know | \\
-% |Him, love Him, and serve Him, and by so doing to gain | \\
-% |everlasting life with Him in Heaven.|\\
-% |\end{enumerate}|
-% \end{quote}
-% However, this solution is far from satisfactory.  It's unportable, fit really 
-% only for this one document; uncustomizable, because it's hard-wired to do 
-% only this one thing; unmodifiable, at least automatically, because it uses 
-% explicit visual formatting in the text (which itself it totally antithetical 
-% to \LaTeX\ principles); and far too wordy.  What is desired is something 
-% more along the lines of the following:
-% \begin{quote}
-% |\catques{Who made us?}{God made us.}| \\
-% |\catques{Why did God make us?}{God made us to know Him, love |\\
-% |Him, and serve Him, and by so doing to gain everlasting life |\\
-% |with Him in Heaven.}|
-% \end{quote}
-% The |catechis| package was designed to provide just these such commands, 
-% with significant further additions useful for catechism writing, as well.
-% 
-% This document was produced in accordance with the \LaTeX\ 
-% \textsc{docstrip} utility.
-%
-% This is version 1.1 of |catechis|; the only change is some
-% cleaning up of the |enumerate|s, mostly just hard-wiring
-% everything so that it actually works.  While this comes at
-% the cost of flexibility, it gains\ldots well, actually
-% working, so I considered this a good deal.  Hopefully I'll
-% be able to add some flexibility on this score in the
-% future; until then, you can still use the default
-% |enumerate|s but calling them outside of a |\catques|.
-%
-% Any questions, comments, and improvements can be sent to the package author, 
-% Donald Goodman, at dgoodmaniii at gmail dot com.
-% 
-% \section{Basic Usage}
-% 
-% Basic usage is\ldots well, it's basic.  There's one basic command which 
-% answers most catechism needs: \DescribeMacro{\catques}|\catques|.  
-% \cmd{\catques} is, as the name implies, the means of formatting most 
-% catechism questions.  Its usage is simple:
-% \begin{quote}
-% \cs{catques}\marg{question text}\marg{answer text}
-% \end{quote}
-% And that's all there is to it.  A question number will be generated, the 
-% question itself will be formatted, then a line break, and then the answer 
-% will be formatted.  And you're done.  The above, for example, looks like 
-% this:
-% \begin{quote}
-% \catques{Who made us?}{God made us.}\catques{Why did God make us?}{God made 
-% us to know Him, love Him, and serve Him, and by so doing to gain everlasting 
-% life with Him in Heaven.}
-% \end{quote}
-% Minus the indentation added by the |quote| environment I've wrapped it in 
-% here, of course.
-%
-% That is, in a nutshell, all there is to the basic usage of the |catechis| 
-% package.
-%
-% \subsection{The List Hacks}
-%
-% The package also includes some ugly hacks on |enumerate| which,
-% though ugly, do what they are supposed to do.  That is, they alter the
-% indentation and spacing of the |enumerate| environments to make it
-% conform with those in traditional catechisms that have fallen under my
-% gaze.  What these means, practically, is merely the following:
-% \begin{enumerate}
-% \item The labels for the environments are altered appropriately;
-% rather than beginning with arabic numerals, it begins with lower-case
-% letters, then moves on to arabic numerals, then to romanettes.
-% \item The punctuation is different; first level is followed by a
-% period, second is enclosed in parentheses, third is followed by a
-% period.
-% \item The indentation is altered to make it work better with the
-% question indentation used.
-% \end{enumerate}
-% So enjoy the |enumerate|s, though they're really not anything
-% remarkable.
-%
-% \subsection{Customization of Basic Usage}
-%
-% However, there's much more to it than that \emph{if the user wants there to 
-% be}.  In the tradition of Peter Wilson,\footnote{Author of a number of highly 
-% customizable and versatile packages and classes, from |tocbibind| and 
-% |epigraph| to the monumental |memoir| class, which has a manual well worth 
-% the reading even if the class will not be used.  His packages are 
-% masterpieces; no comparison is meant (or possible) between them and this 
-% rather hackish and inelegant one.} I endeavored to make the 
-% package as customizable as possible.  Thus, more or less all of the 
-% formatting decisions (namely, all except those which are universal among all 
-% works of the type) have been placed inside command names or specially named 
-% lengths, to be altered by standard \LaTeX\ |\renewcommand|s or 
-% |\setlength|s.  Use of these commands can easily be found from any number of 
-% basic \LaTeX\ tutorials.\footnote{The most useful, this author found, was 
-% the nearly ubiquitous \textit{The Not-so-short Introduction to \LaTeXe}, 
-% available from CTAN.}
-%
-% For example, if you don't want the question number to be in bold (the 
-% default), you just have to redefine the macro\DescribeMacro{\quesnumweight} 
-% | \quesnumweight|, and it will take on the weight you put there.  If you 
-% wanted normal weight, just say:
-% \begin{quote}
-% |\renewcommand\quesnumweight{}|
-% \end{quote}
-% Your question number will now be weightless; that is, normal weight, not 
-% bolded.  You've overridden the default.  This command, like all such 
-% commands, will only take effect on those |\catques| commands issued 
-% \emph{after} the formatting command is issued.
-% 
-% But though your question number will then be formatted as you like, you may 
-% not like the question itself.  You may want the question itself to also be 
-% normal weight.  Use the macro\DescribeMacro{\questionweight} 
-% | \questionweight|.  If you want to italicize them, redefine the macros 
-% \DescribeMacro{\quesnumstyle}|\quesnumstyle| and 
-% \DescribeMacro{\questionstyle}|\questionstyle|.  To do this, simply place the 
-% name of the command you want to work on the unit in the argument of the 
-% macro; no braces are needed, being added by the package itself.  Thus, issue 
-% the simple command |\renewcommand\questionstyle{\textit}|, and the question 
-% will become italicized.
-%
-% Formatting the answer is predictable:  use the macros 
-% \DescribeMacro{\answeight}|\answeight| and 
-% \DescribeMacro{\ansstyle}|\ansstyle| in the same way.
-%
-% If you want to change the spacing involved, you must begin to use 
-% |\setlength| commands instead, but the principle is identical.  Say, for 
-% example, that you don't like the amount of space put in between the questions 
-% by default (1em plus 2pt minus 2pt).  All you have to do is change the 
-% length named \DescribeMacro{\questionskip}|\questionskip|.  |\questionskip| 
-% is rubber by default, because otherwise the package would produce horrible 
-% |overfull vbox| errors every time it was used; this cannot be overriden 
-% without changing the internal definitions of the package itself.  I did this 
-% so that unsuspecting newby users, God bless them, wouldn't unknowingly make 
-% it impossible for \LaTeX\ to properly justify their pages.  Thus, that 
-% plus 2pt minus 2pt rubber length is unchangeable.  I may change this in 
-% future releases, but for now, it's there for good.
-%
-% On the other hand, all other lengths are, by default, rigid, though they 
-% can be made rubber by defining them as such.  If, for example, you want to 
-% change the space in between the questions and answers, just give a new 
-% length to \DescribeMacro{\answerskip}|\answerskip|, which defaults to 0em.  
-% 
-% For the indentations, the lengths are again broken into those for questions 
-% and those for answers.  Plus, indentation styles are provided, to allow for 
-% either hanging or normal indentation.  First, the question indents.
-% 
-% The question indents depend upon the \emph{style} of indentation for their 
-% implementation.  By ``style'' I mean just ``hanging'' or ``normal.''  The 
-% default for questions is ``hanging''; that's how the second line of the 
-% question is indented inward while the first line is flush with the margin.  
-% If you don't like this behavior, then simply redefine the command 
-% \DescribeMacro{\quesindentstyle}|\quesindentstyle| from |\hangindent| (the 
-% default) to |\parindent| (normal, paragraph-style indentation).  For the 
-% answers, use \DescribeMacro{\ansindentstyle}|\ansindentstyle|, which defaults 
-% to |\parindent|, rather than to |\hangindent| like its question counterpart.
-%
-% Next, you have to modify the lengths (maybe).  First, the basic answer 
-% indentation.  By default, the answers are indented by a specific amount, 
-% namely \DescribeMacro{\defanswerindent}|\defanswerindent| minus 
-% \DescribeMacro{\answerindent}|\answerindent|.  This was to allow for the 
-% indentation to be easily set to be equal to the question number plus the 
-% space prior to the beginning of the question text.  |\defanswerindent| is 
-% set to precisely that length, and |\answerindent| is initialized at 0.  If 
-% you want, for example, the answers to be flush to the left margin along with 
-% the question number, simply define |\answerindent| to cancel out 
-% |\defanswerindent|:
-% \begin{quote}
-% |\settowidth\answerindent{\quesnumweight{\quesnumstyle{\thequesnum.  }}}%|
-% \end{quote}
-% I wish it weren't that complicated, but that's what it takes; hopefully I'll 
-% be able to make it more intuitive later.  For some reason simply issuing 
-% |\setlength\answerindent{\the\defanswerindent}| does not work; I hope to 
-% resolve this question soon.
-%
-% Otherwise, however, simply set |\answerindent| equal to whatever you want to 
-% \emph{subtract} from |\defanswerindent|, the default.  If you want the 
-% indentation to be larger, make sure you define your |\answerindent| as a 
-% negative length.
-%
-% Now for the paragraph indentations for questions and answers.  We've already 
-% seen how to set indentation ``style.''  To change actual indentation length 
-% (whether hanging or normal) use the 
-% \DescribeMacro{\quesparindent}|\quesparindent| (which modifies an internal 
-% variable, |\defquesparindent|, in the same way as |\answerindent| does) and 
-% \DescribeMacro{\ansparindent}|\ansparindent|, which works independently.  
-% By default, |\defquesparindent| is set to equal the width of the question 
-% number plus the space preceeding the beginning of actual question text; 
-% since |\answerindent| takes care of this already for answers, it is initially 
-% set to zero.  To cancel out |\defquesparindent|, simply redefine it as for 
-% cancelling |\defanswerindent| (replacing |\answerindent| with 
-% |\quesparindent|, of course).  |\ansparindent| can be increased or decreased 
-% in the usual way.
-% 
-% The right indentation of the answers can also be changed with the 
-% predictably named length \DescribeMacro{\rtanswerindent}|\rtanswerindent|.  
-% It can be changed in the normal manner.
-%
-% The |enumerate|s are not particularly customizable; this is because
-% I found altering the default \LaTeX\ code for them unbelievably hairy.
-% Even as they are, they are remarkably ugly, and include one hack for
-% getting the margins lined up properly that is quite probably the
-% absolute worst piece of programming I've ever done.  But struggle as I
-% might (for hours) I couldn't get it to work without it, so\ldots there
-% we are.  
-% 
-% That essentially completes the discussion of the basic command of the 
-% |catechis| package.  Now we may discuss some of its more advanced features.
-% 
-% \section{Advanced Features}
-%
-% \subsection{Comments}
-%
-% \DescribeMacro{\catcomment}
-% Oftentimes in catechisms the answer, while giving the basic truth
-% behind the subject, doesn't give enough information.  For this sort of
-% situation the |\catcomment| command was prepared.  Basically, |\catcomment|
-% places a comment (by default, in normal weight italic) wherever it
-% happens to be issued, with the same left and right indentation as its
-% parent element.
-%
-% It's important that |\catcomment|s be issued as part of their parent
-% element (normally, a |\catques| answer); that is, it should be issued
-% \emph{before} the closing brace (|}|) of whatever it's commenting on.
-% Otherwise, the spacing will probably look quite odd.  This is because
-% |\catcomment| doesn't issue any |\par|s; it's literally part of whatever
-% it's issued in.  But that's for the code
-% section.\footnote{\textit{See} section \ref{sect:code}, at
-% \pageref{sect:code}.}
-% 
-% By default, as said above, |\catcomment|s are set in normal weight
-% italic; their indentation will be identical to that of the parent
-% element.  I have not included any way to alter the indentation easily,
-% as I didn't see any reasonable explanation for doing so.  I'm willing,
-% of course, to take contrary arguments.
-% 
-% \DescribeMacro{\commentstyle}\DescribeMacro{\commentweight}
-% The macros |\commentweight| and |\commentstyle| can both be 
-% redefined to format the comments to your needs and tastes.  They are 
-% redefined in the usual way.
-% 
-% \subsection{Citations Lists}
-% 
-% Most catechisms also include citation lists (usually Scriptural,
-% entirely or nearly so) to justify their points, especially on the more
-% important questions.  So |catechis| includes a way to typeset such
-% entries, as well.
-%
-% \DescribeMacro{\citetitle}\DescribeMacro{citeword}
-% The |\citetitle| command would normally be issued at the beginning
-% of the section including citations.  By default, it simply skips
-% down 1em, then prints what's contained in the macro |\citeword| (by
-% default, this is simply ``Scripture'') in small caps, centered, and
-% then turns things back over to the user.  If you want something
-% other than ``Scripture'' to be printed as the title, simply redefine
-% |\citeword| to something else (say, ``Citations'') by issuing the
-% following:
-% \begin{quote}
-% |\renewcommand\citeword{Citations}|
-% \end{quote}
-%
-% \DescribeMacro{\citetitlestyle}\DescribeMacro{\citetitleweight}
-% To alter the style in which the |\citetitle| is printed, just
-% redefine the macros |\citetitleweight| and |\citetitlestyle|.  By
-% default, |\citetitleweight| is set to nothing (that is, normal
-% weight) and |\citetitlestyle| to |\textsc|.
-% 
-% \DescribeMacro{\scripture}
-% Next, you simply issue the |\scripture| command repeatedly, once for
-% each citation in your list.  (In retrospect, this really should have
-% been something more like |\citation|, but I'm afraid of conflicts with
-% \textsc{Bib}\TeX, about which I know nothing.)  |\scripture| takes
-% two arguments, the first the citation itself and the second its
-% source.  It simply fills the current line with space, starts a new
-% one, prints its first argument, fills the final line of that argument
-% with space, and then prints its second argument left justified.  So
-% the command should be formatted like so:
-% \begin{quote}
-% \cs{scripture}\marg{citation text}\marg{source text}
-% \end{quote}
-% 
-% Yes, you guessed it; the formatting can be customized.  By default,
-% the citation is printed in normal weight italics, and the source is
-% printed in normal weight Roman.  You can changed each one of these
-% easily by redefining commands.
-% 
-% \DescribeMacro{\citeweight}\DescribeMacro{\citestyle}
-% \DescribeMacro{\citesize}
-% The three macros in the left margin control the formatting of the
-% citations.  This time, however, the size can be individually
-% controlled.  This is because I was able to use |\par|s internally in
-% the macros without hosing all the other formatting, since the
-% citations are all set aside on their own and not dependent on their
-% parent element.  So enjoy; just redefine the commands as usual.
-%
-% \DescribeMacro{\sourceweight}\DescribeMacro{\sourcestyle}
-% \DescribeMacro{\sourcesize}
-% The three macros in the left margin at this paragraph control the
-% formatting of the source.  It's pretty tight, huh?  Really, though,
-% there isn't much to say; I'm only continuing to write so that this
-% paragraph will fill up enough to offset the margin space used by by
-% those commands.
-% 
-% So that's the package.  Please refer to Section \ref{sect:examp} for
-% visual examples of the default behavior of these macros.  I pray
-% that this package be useful to you and lead to the edification and
-% salvation of souls.
-% 
-% \section{Examples}
-% \label{sect:examp}
-% 
-% This section is intended to demonstrate the default behavior of the
-% macros.  It also demonstrates the heavily modified |enumerate|
-% environment that is employed, but not described here because it
-% involves no new macros but those in standard \LaTeX.  So here it
-% goes.
-% \setcounter{quesnum}{0}
-% 
-% \catques{Who made us?}{God made us.}
-% 
-% \catques{Why did God make us?}{God made us to know Him, love Him, 
-% and serve Him, and by so doing to gain Heaven.}
-% \catques{Are you going to write any actual examples, or just copy
-% them all from other catechisms?}{Wait for it; I'm going to write
-% some of my own.  The two above are from the Baltimore Catechism,
-% verbatim or nearly so, for those who don't know.}
-% \catques{Did you make a package for writing catechisms?  For 
-% serious?}{Yes, I did.  I had a number of reasons for this:
-% \begin{enumerate}
-% \item I wanted to typeset one or two for myself.
-% \catcomment{This although I've already done so in a very hacked,
-% difficult to read and difficult to write style.  But at least I'm
-% (hopefully) making it easier for others.}
-% \begin{enumerate}
-% \item There's one in \textit{Thomistic Salvation}.
-% \catcomment{And it's not half bad.  I think it addresses the issues it
-% was meant to address pretty thoroughly, in a basic, catechism sort of
-% way.}
-% \item There's also one in \textit{Officium Parvum}.\label{testlabel}
-% \catcomment{This one could use some work.  But it still isn't
-% terrible.}
-% \begin{enumerate}
-% \item And now for a few more items\ldots 
-% \begin{enumerate}
-% \item Just to see what they look like.
-% \end{enumerate}
-% \end{enumerate}
-% \end{enumerate}
-% \item It's a part of my plan to make a complete Catholic 
-% desktop (though what that plan is, exactly, is still somewhat 
-% up in the air).
-% \catcomment{I'm trying to flesh this idea out a little more.  It will
-% at least contain a couple of \LaTeX\ packages and a multilingual
-% Scripture-searching tool; hopefully also a Catholic calendar desklet
-% and similar items.}
-% \end{enumerate}
-% } % 
-% 
-% \catques{All right, I guess so.  But it still seems weird.}{Maybe.  
-% But I think (hope) it'll bear fruit.
-% \catcomment{And I'm very hopeful.  Hope is, after all, one of the
-% three theological virtues, and mentioned repeatedly in the Scriptures
-% as necessary for us to have.}
-% }% 
-% 
-% \catques{Here's a really long question that I'm trying to make 
-% wrap onto another line so that we can see how that will behave.  
-% Will it behave well?}{Yes, it will behave well.  The algorithm 
-% is reasonably obedient and well-behaved.}
-% \catques{What about the Scripture citations you often see in
-% catechisms?  Can this hooty-falooty package of yours handle those?}{%
-% I'm glad you asked.  Yes, this package can easily handle those.
-% \catcomment{Even in conjunction with a catcomment, you'll notice;
-% versatility (and ease of goal) is always the key.}
-% \citetitle
-% \scripture{In the beginning was the Word, and the Word was with God,
-% and the Word was God.}{St.~John 1:1.}
-% \scripture{Where wast thou when I laid up the foundations of the 
-% earth? tell me if thou hast understanding.}{Job 38:4}
-% }%
-% \catques{Finally, how do the labels work with the hacked
-% |enumerate|s?}{Well, they work all right, thanks to |varioref|; in fact, 
-% here's one:  \ref{testlabel}.}
-% \catques{I want to see some double-digit question numbers.}{I'm
-% working on it; only one more question to go.}
-% \catques{Finally; do they indent properly and all, at least with the
-% defaults?}{Yes, they indent exactly as one would expect.
-% \catcomment{Although in this, my first real foray into serious
-% \LaTeX\ programming, I found that very little works as expected, and
-% one must have a very thorough knowledge of internals to avoid being
-% surprised and having to work quite hard to figure out some unexpected
-% results.}
-% }
-% \catques{Do the enumerates line up properly even when
-% there are two digits in the question number?}{
-% \begin{enumerate}
-% \item Do the enumerates still have proper margins with
-% multiple-digit question numbers?
-% \item Why, yes.  Yes, they do.
-% \end{enumerate}
-% }
-%
-% \section{Implementation}
-% \label{sect:code}
-% 
-% Here's the specifications of the code.  Bear with me; I'm really
-% only an amateur \LaTeX\ programmer (the code will reveal this to
-% anyone with real experience), so it's probably pretty sloppy.
-% 
-% First we name the package. 
-%    \begin{macrocode}
-\ProvidesPackage{catechis}
-%    \end{macrocode}
-% 
-% Then we call the packages that we're going to require.  I call
-% |calc| and |ifthen| reflexively; neither are used extensively, but
-% both some.  |varioref| is needed for hacking |enumerate|; I needed
-% its |\labelformat| command.
-%    \begin{macrocode}
-\RequirePackage{calc}
-\RequirePackage{ifthen}
-\RequirePackage{varioref}
-%    \end{macrocode}
-% 
-% Now we delcare some default settings that may be redeclared by the
-% user; the user just has to |\renewcommand| them.  These are almost all
-% visual formatting issues best hidden from the author.
-%    \begin{macrocode}
-\newcommand\quesnumweight{\textbf}% 
-\newcommand\questionweight{\textbf}%
-\newcommand\answeight{}%
-\newcommand\quesnumstyle{}% 
-\newcommand\questionstyle{}%
-\newcommand\ansstyle{}%
-\newcommand\quesindentstyle{\hangindent}%
-\newcommand\ansindentstyle{\parindent}%
-\newcommand\commentweight{}\newcommand\commentstyle{\textit}%
-\newcommand\citeweight{}\newcommand\citestyle{\textit}% 
-\newcommand\sourceweight{}\newcommand\sourcestyle{}% 
-\newcommand\citetitleweight{}\newcommand\citetitlestyle{\textsc}
-\newcommand\citeword{Scripture}
-\newcommand\citesize{\small}
-\newcommand\sourcesize{\small}
-%    \end{macrocode}
-% 
-% Now we declare the necessary lengths.  Once again, these are
-% formatting issues best hidden from the author.
-%    \begin{macrocode}
-\newlength\questionskip
-\setlength\questionskip{1em} % Space b/f questions; in macros, rubber
-\newlength\answerskip
-\setlength\answerskip{0pt} % Space before answers
-\newlength\answerindent\newlength\rtanswerindent
-\setlength\rtanswerindent{0em} % Right indentation of answers
-\newlength\defanswerindent % Used internally only, below
-\newlength\defquesparindent % Default question parindent
-\newlength\quesparindent % Customizable question parindent
-\newlength\ansparindent % Customizable answer parindent
-\setlength\ansparindent{0em} % Initialize to zero
-%    \end{macrocode}
-%
-% Now we delcare the counter for the questions.  Obvious enough.
-%    \begin{macrocode}
-\newcounter{quesnum}
-%    \end{macrocode}
-% 
-% Now we begin to define the commands for the catechism questions.
-% The first is, obviously, |\catques|; within |\catques| we also
-% redefine all the |enumerate| macros, so that it won't hose the
-% |enumerate|s in other, non-catechism parts of the document.
-%    \begin{macrocode}
-\newcommand\catques[2]{%
-\refstepcounter{quesnum}%
-\begingroup\par\setlength\parskip{\the\questionskip plus 2pt minus 2pt}%
-\settowidth\defquesparindent{% This sucks; but for some reason the
-% indentation eats closing spaces, so...
-\quesnumweight{\quesnumstyle{\thequesnum.  }}}%
-\ifthenelse{\quesindentstyle=\hangindent}{%
-\setlength\parindent{0pt}}{\hangafter=1}%
-\setlength\quesindentstyle{\the\defquesparindent-\the\quesparindent}%
-\quesnumweight{\quesnumstyle{\thequesnum\@.}}  %
-\questionweight{\questionstyle{#1}}\hfill\par\endgroup%
-\begingroup\par\setlength\parskip{\the\answerskip}%
-\ifthenelse{%
-\ansindentstyle=\hangindent}{%
-\setlength\parindent{0pt}}{\hangafter=1}%
-\setlength\ansindentstyle{\the\ansparindent}%
-\settowidth\defanswerindent{%
-\quesnumweight{\quesnumstyle{\thequesnum.  }}}%
-\setlength\leftskip{\the\defanswerindent-\the\answerindent}%
-\setlength\rightskip{\the\rtanswerindent}%
-\answeight{\ansstyle{#2}}\hfill\par\endgroup%
-\renewcommand\theenumi{\alph{enumi}}%
-\labelformat{enumi}{\thequesnum(\theenumi)}%
-\renewcommand\theenumii{\arabic{enumii}}%
-\labelformat{enumii}{\thequesnum(\theenumi)(\theenumii)}%
-\renewcommand\theenumiii{\roman{enumiii}}%
-\labelformat{enumiii}{\thequesnum(\theenumi)(\theenumii)(\theenumiii)}%
-\renewcommand\theenumiv{\Alph{enumiv}}%
-\labelformat{enumiv}{\thequesnum(\theenumi)(\theenumii)(\theenumiii)%
-(\theenumiv)}%
-\settowidth\leftmarginiii{2em}%
-\settowidth\leftmarginiv{2em}%
-\renewcommand\@listi{%
-\settowidth\leftmargin{\the\defquesparindent.  }%
-\setlength\parsep{0em}%
-\setlength\itemsep{0em plus 2pt minus 2pt}%
-\setlength\topsep{0em}
-\setlength\partopsep{0em}
-\setlength\parskip{0em}
-}% end redef of \@listi
-\renewcommand\@listii{%
-\settowidth\leftmargin{(\theenumi)  }%
-\setlength\parsep{0em}%
-\setlength\itemsep{0em plus 2pt minus 2pt}%
-\setlength\topsep{0em}
-\setlength\partopsep{0em}
-\setlength\parskip{0em}
-}% end redef of \@listii
-\renewcommand\@listiii{%
-\settowidth\leftmargin{\theenumii.  }%
-\setlength\parsep{0em}%
-\setlength\itemsep{0em plus 2pt minus 2pt}%
-\setlength\topsep{0em}
-\setlength\partopsep{0em}
-\setlength\parskip{0em}
-}% end redef of \@listiii
-\renewcommand\@listiv{%
-\settowidth\leftmargin{\theenumiii.  }%
-\setlength\parsep{0em}%
-\setlength\itemsep{0em plus 2pt minus 2pt}%
-\setlength\topsep{0em}
-\setlength\partopsep{0em}
-\setlength\parskip{0em}
-}% end redef of \@listiv
+%%
+%% This is file `catechis.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% catechis.dtx  (with options: `package')
+%% This is a generated file.
+%% 
+%% This document is copyright 2014 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
+%% or modified under the terms of that license or, at your option, any
+%% later version.
+%% 
+%% This work has the LPPL maintenance status 'maintained'.
+%% 
+%% The Current Maintainer of this work is Donald P. Goodman
+%% (dgoodmaniii@gmail.com).
+%% 
+%% This work consists of catechis.dtx, catechis.ins, and
+%% 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]
+\RequirePackage{paralist}
+\setdefaultenum{(a)}{(1)}{(i)}{(A)}
+\setdefaultleftmargin{3.8em}{}{}{}{}{}
+\newlength{\catquesindent}\setlength{\catquesindent}{0em}
+\newlength{\catqueshindent}\setlength{\catqueshindent}{2em}
+\newlength{\catansindent}\setlength{\catansindent}{2em}
+\newlength{\catanshindent}\setlength{\catanshindent}{2em}
+\newlength{\catquesnumwd}\setlength{\catquesnumwd}{2em}
+\newcounter{catquesnum}\setcounter{catquesnum}{0}
+\def\catquesnumsty{\bfseries}
+\def\catquessty{\bfseries}
+\def\catanssty{}
+\renewcommand{\thecatquesnum}{\arabic{catquesnum}.}
+\def\catques#1#2{%
+\stepcounter{catquesnum}%
+{\parindent=\catquesindent\hangindent=\catqueshindent\hangafter=1%
+{\par\leavevmode\hbox to\catquesnumwd{\catquesnumsty\thecatquesnum}%
+\catquessty #1}\par}%
+{\parindent=\catansindent\hangindent=\catanshindent\hangafter=1%
+{\par\catanssty #2}\par}%
 }%
-%    \end{macrocode}
-% My, wasn't that messy?  Now, on to the |\catcomment| command.
-% Now we define the |\catcomment| command.  It's pretty simple,
-% actually, thanks to lacking the identation issues that |\catques| was
-% so plagued by.
-%    \begin{macrocode}
-\newcommand\catcomment[1]{%
-\hspace*{\stretch{1}}\\\small\commentweight{\commentstyle{#1}}%
-\hspace*{\stretch{1}}\normalsize%
+\def\catcommentsty{\itshape}
+\newlength{\commindent}\setlength{\commindent}{2em}
+\newlength{\commhindent}\setlength{\commhindent}{2em}
+\def\catcomment#1{%
+{\parindent=\commindent\hangindent=\commhindent\hangafter=1%
+{\par\catcommentsty #1}\par}
 }%
-%    \end{macrocode}
-%
-% Now we begin the commands for citing Scriptural citations.  In
-% lists, that is.  Not too complex, either.
-%    \begin{macrocode}
-\newcommand\citetitle{%
-\vspace*{1em}%
-\begin{center}\citetitleweight{\citetitlestyle{\citeword}}\end{center}
-}% end the \citetitle command
-\newcommand\scripture[2]{%
-\par\citesize\citeweight{\citestyle{#1}}\nolinebreak[1]%
-\quad\hspace*{\fill}\mbox{\sourcesize\sourceweight{\sourcestyle{#2}}}%
-\par\normalsize%
-}% end the \scripture command
-%    \end{macrocode}
-% 
-% \printindex
+\def\catexplicsty{\small}
+\newlength{\explicindent}\setlength{\explicindent}{4em}
+\newlength{\explichindent}\setlength{\explichindent}{2em}
+\long\def\catexplic#1{%
+{\par\everypar={\parindent=\explicindent\hangindent=\explichindent\hangafter=1}%
+{\par\catexplicsty\  #1}\par}%
+}%
+\def\restoreindents{%
+\par%
+\everypar={%
+\parindent=\explicindent%
+\hangindent=\explichindent%
+\hangafter=1%
+}%
+\par%
+}%
+\def\catcitetitlesty{\Large\scshape}%
+\def\catcitetitleword{Citations}%
+\def\catcitetitle{%
+\begin{center}%
+\catcitetitlesty\catcitetitleword%
+\end{center}%
+}%
+\def\catcitesty{\itshape}%
+\def\catsrcsty{}%
+\newlength{\catciteindent}\setlength{\catciteindent}{0em}%
+\newlength{\catcitehindent}\setlength{\catcitehindent}{0em}%
+\newlength{\catsrcindent}\setlength{\catsrcindent}{2em}%
+\newlength{\catsrchindent}\setlength{\catsrchindent}{2em}%
+\def\catcite#1#2{%
+{\parindent=\catciteindent\hangindent=\catcitehindent\hangafter=1%
+{\par\catcitesty #1}\par}%
+{\parindent=\catsrcindent\hangindent=\catsrchindent\hangafter=1%
+{\par\catsrcsty#2}\par}%
+}%
+\let\scripture=\catcite
+\endinput
+%%
+%% End of file `catechis.sty'.