summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/book-of-common-prayer/README.md (renamed from Master/texmf-dist/doc/xelatex/book-of-common-prayer/README.md)6
-rw-r--r--Master/texmf-dist/doc/latex/book-of-common-prayer/book-of-common-prayer.pdfbin0 -> 128251 bytes
-rw-r--r--Master/texmf-dist/doc/latex/book-of-common-prayer/book-of-common-prayer.tex (renamed from Master/texmf-dist/doc/xelatex/book-of-common-prayer/book-of-common-prayer.tex)73
-rw-r--r--Master/texmf-dist/doc/xelatex/book-of-common-prayer/book-of-common-prayer.pdfbin95265 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/latex/book-of-common-prayer/book-of-common-prayer.sty (renamed from Master/texmf-dist/tex/xelatex/book-of-common-prayer/book-of-common-prayer.sty)33
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-xetex.tlpsrc1
7 files changed, 102 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/xelatex/book-of-common-prayer/README.md b/Master/texmf-dist/doc/latex/book-of-common-prayer/README.md
index a0671e1d95e..345d52cb672 100644
--- a/Master/texmf-dist/doc/xelatex/book-of-common-prayer/README.md
+++ b/Master/texmf-dist/doc/latex/book-of-common-prayer/README.md
@@ -1,6 +1,6 @@
-book-of-common-prayer (v1.0.0): Liturgical typesetting in the style of the 1979 Book of Common Prayer.
+book-of-common-prayer (v1.1.0): Liturgical typesetting in the style of the 1979 Book of Common Prayer.
===
-Copyright (C) 2021 Arlie Coles
+Copyright (C) 2022 Arlie Coles
This package can be redistributed and/or modified under the terms
of the LaTeX Project Public License 1.3c.
===
@@ -12,6 +12,6 @@ This package is designed to work with the Sabon font, but it is not necessary to
* Arial Unicode MS
* Junicode
-You should compile documents that use this package with XeLaTeX.
+You should compile documents that use this package with XeLaTeX or LuaLaTeX.
This material is subject to the LaTeX Project Public License 1.3c.
diff --git a/Master/texmf-dist/doc/latex/book-of-common-prayer/book-of-common-prayer.pdf b/Master/texmf-dist/doc/latex/book-of-common-prayer/book-of-common-prayer.pdf
new file mode 100644
index 00000000000..896602974fe
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/book-of-common-prayer/book-of-common-prayer.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/xelatex/book-of-common-prayer/book-of-common-prayer.tex b/Master/texmf-dist/doc/latex/book-of-common-prayer/book-of-common-prayer.tex
index c7338e5f487..61b18b9a098 100644
--- a/Master/texmf-dist/doc/xelatex/book-of-common-prayer/book-of-common-prayer.tex
+++ b/Master/texmf-dist/doc/latex/book-of-common-prayer/book-of-common-prayer.tex
@@ -26,12 +26,15 @@
\title{\texttt{book-of-common-prayer}\\
\Large Typesetting for liturgical documents in the style of the 1979 Book of Common Prayer \\
}
-\date{July 2021 \\ \textit{Version 1.0.0}}
+\date{February 2022 \\ \textit{Version 1.1.0}}
\author{Arlie Coles}
\begin{document}
\maketitle
+\tableofcontents
+
+\clearpage
\section{Introduction}
\texttt{book-of-common-prayer} is a \LaTeX\ package for liturgical documents in the style of the 1979 Book of Common Prayer\footnote{\url{http://justus.anglican.org/resources/bcp/formatted_1979.htm}}. It provides special typesetting tools for common liturgical situations (e.g. versicle and response, longer prayers, etc.) as well as formatting specifications for an entire document (e.g. font face, section headers, margins, etc.).
@@ -47,7 +50,13 @@ The standard font used in the 1979 Book of Common Prayer is Sabon\footnote{\url{
You should also have the fonts Arial Unicode MS\footnote{\url{https://docs.microsoft.com/en-us/typography/font-list/arial-unicode-ms}} and Junicode\footnote{\url{https://junicode.sourceforge.io/}} installed on your computer. These two fonts provide some special symbols used by \texttt{book-of-common-prayer}.
-Since \texttt{book-of-common-prayer} uses special fonts, you should compile your document with the Xe\LaTeX\ compiler.
+Since \texttt{book-of-common-prayer} uses special fonts, you should compile your document with the Lua\LaTeX\ or Xe\LaTeX\ compiler.
+
+\subsection{Music}
+
+\texttt{book-of-common-prayer} works with Lilypond\footnote{\url{http://lilypond.org/}} for inline music notation. If you have musical scores you would like to integrate into your document, you should use the \texttt{lyluatex} package by writing \lstinline|\usepackage{lyluatex}| in the preamble of your document.
+
+To compile your document with Lilypond scores, you must use Lua\LaTeX, e.g. \lstinline{lualatex -shell-escape your_document.tex}.
\subsection{Page setup}
@@ -91,6 +100,7 @@ There are also some special commands to fine-tune formatting when needed (usuall
\item \lstinline{\blankline} forces a blank line (similar to pressing \lstinline{Enter} twice in Microsoft Word). Usually, \LaTeX\ manages this type of spacing for you, but you can use this command if you need more manual control.
\item \lstinline{\deleteline} deletes an empty line's space (similar to backspacing over a blank line in Microsoft Word).
\item \lstinline{\tab} creates an indent (similar to pressing \lstinline{tab} in Microsoft Word).
+ \item \lstinline{\spacer} creates a very small vertical space when this kind of fine control is desired.
\end{itemize}
\subsection{Text formatting}
@@ -187,7 +197,8 @@ To put a box around some text, and italicize the text inside, we can use \lstinl
\caption{Boxes around text.}
\end{table}
-\blankline
+\continued
+\clearpage
\subsection{Environments}
Several environments are available in \texttt{book-of-common-prayer}. These are used for common formatting blocks, such as versicle-and-response exchanges or longer prayers.
@@ -198,8 +209,10 @@ Table \ref{tab:env_responses} shows how to use the \lstinline{responses} environ
Supported roles are \lstinline{priest}, \lstinline{deacon}, \lstinline{officiant}, \lstinline{servers}, and \lstinline{people}. Support for roles in French is also available (as \lstinline{pretre}, \lstinline{diacre}, \lstinline{officiant}, \lstinline{servants}, and \lstinline{peuple} respectively). The text associated with the \lstinline{people}/\lstinline{peuple} role is always bolded.
-\pagebreak
-\begin{table}[h]
+Other supported roles that will render as non-bolded are: \lstinline{subdeacon}, \lstinline{epistoler}, \lstinline{lector}.
+
+% \pagebreak
+\begin{table}[h!]
\centering
\begin{tabular}{ll}
\toprule
@@ -276,7 +289,7 @@ Table \ref{tab:env_vresponses} shows how to use the \lstinline{vresponses} envir
Sometimes, if the response is long, we might want to format it further. We can do this by placing the response inside of an \lstinline|\rlong{}| bracketing. We can then use line breaks (\lstinline{\\}) and tabs (\lstinline{\tab}) to format the response as we like. Table \ref{tab:env_vresponses_rlong} shows an example of this.
-% \clearpage
+\clearpage
\begin{table}[h!]
\centering
\begin{tabular}{ll}
@@ -462,5 +475,53 @@ Table \ref{tab:env_threecolprayer} shows how to use the \lstinline{threecolpraye
\end{table}
+\subsubsection{Psalm typesetting}
+
+It is possible to typeset psalms with a combination of an enumerated list and \lstinline{\psalmverse}, as shown in Table \ref{tab:psalms}.
+
+\begin{table}[h]
+\centering
+\begin{xtabular}{p{.45\textwidth}p{.45\textwidth}}
+\toprule
+\LaTeX\ code & Formatted output \\
+\midrule
+\begin{lstlisting}
+\begin{enumerate}[
+ leftmargin=*,
+ label=\textsc{\arabic*}
+ ]
+ \item \psalmverse
+ {The Lord is my shepherd:}
+ {Therefore can I lack nothing.}
+ \item \psalmverse
+ {He shall feed me
+ in a green pasture:}
+ {and lead me forth beside
+ the waters of comfort.}
+\end{enumerate}
+\end{lstlisting}
+&
+\sabon{
+\begin{enumerate}[
+ leftmargin=*,
+ label=\textsc{\arabic*}
+ ]
+ \item \psalmverse
+ {The Lord is my shepherd:}
+ {Therefore can I lack nothing.}
+ \item \psalmverse
+ {He shall feed me
+ in a green pasture:}
+ {and lead me forth beside
+ the waters of comfort.}
+\end{enumerate}
+}
+\\
+\bottomrule
+\end{xtabular}
+\caption{Typesetting psalms with an enumerated list and \lstinline{\\psalmverse}.}
+\label{tab:psalms}
+\end{table}
+
\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/book-of-common-prayer/book-of-common-prayer.pdf b/Master/texmf-dist/doc/xelatex/book-of-common-prayer/book-of-common-prayer.pdf
deleted file mode 100644
index 89e27100d8a..00000000000
--- a/Master/texmf-dist/doc/xelatex/book-of-common-prayer/book-of-common-prayer.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/xelatex/book-of-common-prayer/book-of-common-prayer.sty b/Master/texmf-dist/tex/latex/book-of-common-prayer/book-of-common-prayer.sty
index 168e95e56ae..68189ee7dbc 100644
--- a/Master/texmf-dist/tex/xelatex/book-of-common-prayer/book-of-common-prayer.sty
+++ b/Master/texmf-dist/tex/latex/book-of-common-prayer/book-of-common-prayer.sty
@@ -1,7 +1,7 @@
% Author: Arlie Coles
% License: LaTeX Project Public License 1.3c
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{book-of-common-prayer}[2021/06/27 Liturgical documents in the style of the Book of Common Prayer]
+\ProvidesPackage{book-of-common-prayer}[2022/02/26 Liturgical documents in the style of the Book of Common Prayer]
\RequirePackage[no-math]{fontspec}
\RequirePackage[left=0.5in, right=0.5in, vmargin=0.5in]{geometry}
@@ -20,6 +20,7 @@
\RequirePackage{pgf}
\RequirePackage{pgfopts}
\RequirePackage{bilingualpages}
+\RequirePackage{changepage}
% The BCP font is Sabon, so allow this option
\DeclareOption{sabon}{\setmainfont[Ligatures=TeX]{Sabon LT Std}}
@@ -49,8 +50,9 @@
\newcommand{\tab}{\hspace*{1em}}
\newcommand{\blankline}{\vspace{\parskip}}
\newcommand{\deleteline}{\vspace{-\parskip}}
+\newcommand{\spacer}{\vspace{0.1cm}} % A bit of breathing room between responses
-% Cover image
+% Cover image with border around it
\usepackage{graphicx}
\newcommand{\munepsfig}[3][scale=1.0]{% <===============================
\begin{figure}[!htbp]
@@ -110,7 +112,10 @@
% Roles to go with the responses - the people are bolded
\newcommand{\priest}[1]{\textit{Priest} & #1 \\}
\newcommand{\deacon}[1]{\textit{Deacon} & #1 \\}
+\newcommand{\subdeacon}[1]{\textit{Subdeacon} & #1 \\}
\newcommand{\officiant}[1]{\textit{Officiant} & #1 \\}
+\newcommand{\lector}[1]{\textit{Lector} & #1 \\}
+\newcommand{\epistoler}[1]{\textit{Epistoler} & #1 \\}
\newcommand{\people}[1]{\textit{People} & \textbf{#1} \\}
\newcommand{\servers}[1]{\textit{Servers} & #1 \\}
\newcommand{\contd}[1]{& #1 \\}
@@ -213,3 +218,27 @@
\par\nointerlineskip \vspace{.5\baselineskip}
}
\newcommand{\sectionline}{\makesectionline{black}{88}}
+
+% PSALMS
+% Command for the two-part structure of a psalm verse
+\newcommand{\psalmverse}[2]{
+ % Adjust parskip; no blank lines in between
+ \setlength{\parskip}{0pt}
+
+ % Render the first part
+ #1 *
+ % Hang in the second part
+ \begin{adjustwidth}{2em}{0pt}
+ #2
+ \end{adjustwidth}
+
+ % Put parskip back
+ \setlength{\parskip}{12pt}
+}
+
+
+% Cont'd marker at bottom of page
+\newcommand{\continued}{
+ \vspace*{\fill}
+ \instruct{\hfill \small \textit{(cont'd)}}
+}
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 031bb12bb1b..b9bc3f7adfe 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -116,6 +116,7 @@ depend blowup
depend bnumexpr
depend boites
depend bold-extra
+depend book-of-common-prayer
depend bookcover
depend bookest
depend booklet
diff --git a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
index 7559acc507c..7c566390432 100644
--- a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
@@ -12,7 +12,6 @@ depend bidicontour
depend bidipagegrid
depend bidishadowtext
depend bidipresentation
-depend book-of-common-prayer
depend businesscard-qrcode
depend cqubeamer
depend fixlatvian