From ee49a12585f0a4521d33b2f5e49ea25763aee514 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 17 Nov 2018 22:23:31 +0000 Subject: bibleref (17nov18) git-svn-id: svn://tug.org/texlive/trunk@49180 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/bibleref/CHANGES | 8 +- Master/texmf-dist/doc/latex/bibleref/README | 2 +- Master/texmf-dist/doc/latex/bibleref/bibleref.pdf | Bin 265924 -> 263994 bytes .../latex/bibleref/samples/sample-categories.pdf | Bin 12427 -> 12427 bytes .../latex/bibleref/samples/sample-indextools.pdf | Bin 9544 -> 9544 bytes .../doc/latex/bibleref/samples/sample-xidx.pdf | Bin 19764 -> 19776 bytes .../doc/latex/bibleref/samples/sample.pdf | Bin 39911 -> 39928 bytes .../texmf-dist/source/latex/bibleref/bibleref.dtx | 98 +++++++++++---------- Master/texmf-dist/tex/latex/bibleref/bibleref.sty | 3 +- 9 files changed, 58 insertions(+), 53 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/bibleref/CHANGES b/Master/texmf-dist/doc/latex/bibleref/CHANGES index 28aece2a1ef..2b8a71c487d 100644 --- a/Master/texmf-dist/doc/latex/bibleref/CHANGES +++ b/Master/texmf-dist/doc/latex/bibleref/CHANGES @@ -1,17 +1,19 @@ +1.21 + * Add Wis abbreviation 1.20: - * Before switching off `:` shorthand, test if it is a shorthand. + * Before switching off `:` shorthand, test if it is a shorthand. 1.19: * \bibleverse and \ibibleverse are now robust, and so can be used in section title, caption, etc. * Fix bug when using french and frenchb option of babel with pdflatex (because `:` character is active with this configuration). 1.18: - * Fix bug with indexing when using non unicode engine. + * Fix bug with indexing when using non unicode engine. 1.17: * Use / to mark the two numbering of the Psalms : \bibleverse{Ps}{23/24} 1.16: * Don't add the \bvidxpgformat in the .idx file if defined as empty. 1.15: - * Correct indexing for book without chapter. Thanks to Raphaël Pinson. + * Correct indexing for book without chapter. Thanks to Raphaël Pinson. 1.14: diff --git a/Master/texmf-dist/doc/latex/bibleref/README b/Master/texmf-dist/doc/latex/bibleref/README index ea5eb6531f1..1d92d980505 100644 --- a/Master/texmf-dist/doc/latex/bibleref/README +++ b/Master/texmf-dist/doc/latex/bibleref/README @@ -35,4 +35,4 @@ fmtcount amsgen This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. +See https://www.latex-project.org/lppl/ for the details of that license. diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf index 41c689bd737..9b4d59d8deb 100644 Binary files a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf and b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf differ diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf b/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf index d17eaa1ed78..4121541aae9 100644 Binary files a/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf and b/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf differ diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdf b/Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdf index 1b2fca35d27..da8e5c62556 100644 Binary files a/Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdf and b/Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdf differ diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf b/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf index fa2494e13a7..9a578dd0728 100644 Binary files a/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf and b/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf differ diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf b/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf index 80274e11dd3..1a332e74997 100644 Binary files a/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf and b/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf differ diff --git a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx index 19b5ed8fc0b..10fc5f510c7 100644 --- a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx +++ b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx @@ -30,7 +30,7 @@ \usepackage{bibleref} \usepackage[colorlinks,bookmarks,pdfauthor={Nicola L.C. Talbot and Ma\"{i}eul Rouquette}, hyperindex=false, - pdftitle={bibleref.sty: a LaTeX package for + pdftitle={bibleref.sty: a LaTeX package for typesetting bible references}]{hyperref} \CheckSum{2503} @@ -59,11 +59,11 @@ %\begin{definition}[\DescribeMacro{\bibleverse}] %\cs{bibleverse}\marg{book title}\texttt(\meta{chapter}\texttt{:}\meta{verse(s)}\texttt) %\end{definition} -%This command can be used to cite a bible book, chapter or verse +%This command can be used to cite a bible book, chapter or verse %or range of chapters or verses. % %\begin{important} -%Be careful if you use \sty{bibleref} with \sty{babel} as some of +%Be careful if you use \sty{bibleref} with \sty{babel} as some of %\styfmt{babel}'s language options make the colon character active, %which will cause a problem for \cs{bibleverse} (and \ics{ibibleverse}, %described later). Check the \styfmt{babel} documentation to find out @@ -116,23 +116,23 @@ % \texttt{(}\meta{v}\texttt{-}\meta{v}\texttt{:)} % With this syntax, the verses would be formatted as if they were chapters. % \end{important} -% -% For the book of Psalms, there is a double numbering: one following the Massoretic Texts, the other one following the Septuagint. +% +% For the book of Psalms, there is a double numbering: one following the Massoretic Texts, the other one following the Septuagint. % Depending on your field, you may use one numbering or the other one. % However, you can also provide both numbers. -% In this case, use the slash (\slash) to separate the two numbers :\\ -% \verb|\bibleverse{Ps}(23/22:)| +% In this case, use the slash (\slash) to separate the two numbers :\\ +% \verb|\bibleverse{Ps}(23/22:)| % % The alternative number will be, by default, typeset between parenthesis. % However, you can redefine the \cs{BRotherchapterstyle} macro to modify the way this number is inserted. % For example, to print it in superscript:\\ % % \begin{verbatim} -% \renewcommand{\BRotherchapterstyle}[1]{\textsuperscript{#1}} -% \end{verbatim} -% or to delete it: -% \begin{verbatim} -% \renewcommand{\BRotherchapterstyle}[1]{} +% \renewcommand{\BRotherchapterstyle}[1]{\textsuperscript{#1}} +% \end{verbatim} +% or to delete it: +% \begin{verbatim} +% \renewcommand{\BRotherchapterstyle}[1]{} % \end{verbatim} %\subsection{Examples} %\begin{center} @@ -141,7 +141,7 @@ %\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\ %\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\ %\verb|\bibleverse{Exod}(20-21:)| & \bibleverse{Exod}(20-21:)\\ -%\verb|\bibleverse{Ps}(23/22:)| & \bibleverse{Ps}(23/22:)\\ +%\verb|\bibleverse{Ps}(23/22:)| & \bibleverse{Ps}(23/22:)\\ %\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\ %\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\ %\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\ @@ -153,7 +153,7 @@ %\end{tabular} %\end{center} % \subsection{Style} -%The style of the reference can be specified either by +%The style of the reference can be specified either by %package option or as the argument to the command %\begin{definition}[\DescribeMacro{\biblerefstyle}] %\cs{biblerefstyle}\marg{style} @@ -161,7 +161,7 @@ %Styles are listed in Table~\ref{tab:styles}. % %\begin{table}[tbh] -%\caption{Bible Citation Styles (can be used as package option or in the argument to +%\caption{Bible Citation Styles (can be used as package option or in the argument to %\cs{biblerefstyle})} %\label{tab:styles} %\vspace{10pt} @@ -180,15 +180,15 @@ %\end{center} %\end{table} % -%You can change the name of a book using +%You can change the name of a book using %\begin{definition}[\DescribeMacro{\setbooktitle}] %\cs{setbooktitle}\marg{name}\marg{new title} %\end{definition} %Note that \meta{name} must be the full name, not the %abbreviated name of the book. For example, to change -%Revelation to Apoc, do +%Revelation to Apoc, do %\verb|\setbookname{Revelation}{Apoc}| -%(\textbf{Note} that you shouldn't do +%(\textbf{Note} that you shouldn't do %\verb|\setbookname{Rev}{Apoc}|) % %If you want a different title for a book depending on whether it's @@ -197,7 +197,7 @@ %\begin{definition}[\DescribeMacro{\setindexbooktitle}] %\cs{setindexbooktitle}\marg{name}\marg{title} %\end{definition} -%In this case, \meta{name} should be the name you'll use in +%In this case, \meta{name} should be the name you'll use in %\cs{ibibleverse}. For example, if you do: %\begin{verbatim} %\setbooktitle{Psalms}{Psalm} @@ -225,7 +225,7 @@ %where \meta{commands} are %the commands needed to modify the citation style. % -%Example: +%Example: %This new style is based on the \qt{default} style, but %has verses in lower case Roman numerals, and redefines %\qt{Revelation} as \qt{Apocalypse}. @@ -247,13 +247,13 @@ %\cs{ibibleverse}\oarg{format}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt) %\end{definition} %This does the same as \cs{bibleverse} -%but also adds an index entry (provided you have used -%\cs{makeindex} in the preamble.) The default page number -%format is given by the command +%but also adds an index entry (provided you have used +%\cs{makeindex} in the preamble.) The default page number +%format is given by the command %\begin{definition}[\DescribeMacro{\bvidxpgformat}] %\cs{bvidxpgformat} %\end{definition} -%This is \texttt{textrm} by default, but can be redefined. To +%This is \texttt{textrm} by default, but can be redefined. To %override the page number format for a particular entry you can %use the optional argument to \cs{ibibleverse}. For example: %\begin{verbatim} @@ -271,7 +271,7 @@ %\begin{definition}[\DescribeMacro{\ibiblevs}] %\cs{ibiblevs}\oarg{format}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt) %\end{definition} -%This is similar to \cs{ibiblechvs} except that it only displays the +%This is similar to \cs{ibiblechvs} except that it only displays the %verse(s) in the text. % %You may need to create your own custom \app{makeindex} style file @@ -298,7 +298,7 @@ %\app{makeindex} or \app{xindy}. If omitted \meta{category title} is %used. % -%Note that \ics{ibibleverse}, \ics{ibiblechvs} and \ics{ibiblevs} +%Note that \ics{ibibleverse}, \ics{ibiblechvs} and \ics{ibiblevs} %use the category that is currently set. If you need to keep %switching categories, you may find it easier to define a shortcut %command. For example, suppose you're discussing the differences @@ -319,7 +319,7 @@ %\subsection{The \sty{bibleref-xidx} Package} % %The \sty{bibleref} package comes with a supplementary package -%\sty{bibleref-xidx} that modifies the way bible references are added to +%\sty{bibleref-xidx} that modifies the way bible references are added to %the index. With no package options, i.e., just %\begin{verbatim} %\usepackage{bibleref-xidx} @@ -340,7 +340,7 @@ %\item[\pkgopt{noverses}] Don't show the verses in the index. %\item[\pkgopt{verses}] Show the verses (and chapters) in the index %(default). -%\item[\pkgopt{nochapters}] Don't show the chapters (and verses) in the +%\item[\pkgopt{nochapters}] Don't show the chapters (and verses) in the %index. %\item[\pkgopt{chapters}] Show the chapters in the index (default). %\end{description} @@ -400,7 +400,7 @@ %When you run \app{makeindex}, the references will now be sorted %in numerical order. % -%If you want to subdivide the index into, say, old and new +%If you want to subdivide the index into, say, old and new %testament, you can add this to the mapping. For example: %\begin{verbatim} %\biblerefmap{Genesis}{1@Old Testament!01} @@ -433,7 +433,7 @@ %\ProvidesPackage{bibleref-mystyle}[2011/01/19 v1.0 Bible reference %style conforming to something or other] %\end{verbatim} -%(Change the date and the brief description in the line above to +%(Change the date and the brief description in the line above to %something more appropriate.) Next you need to load \sty{bibleref}: %\begin{verbatim} %\RequirePackage{bibleref} @@ -464,7 +464,7 @@ % %Next you need to create a file called ``README'' that contains some %information about your new package, including what license you want -%to distribute it under. (If you don't know anything about licenses, +%to distribute it under. (If you don't know anything about licenses, %I recommend you choose the \LaTeX\ Project Public License, LPPL.) % %It's worth adding a sample file or a little bit of documentation @@ -481,17 +481,17 @@ %itself. After that people can download and use it. % %\section{Acknowledgements} -%Many thanks to all the useful comments from comp.text.tex, +%Many thanks to all the useful comments from comp.text.tex, %especially from Jesse~Billett, Brooks~Moses and Ulrich~M.~Schwarz. % % Many thanks also to Rapha\"{e}l Pinson, which have debbuged indexing for books without chapter. % %\section{Bug and feature request} -% For all bug and feature requests, please open an ``issue'' on +% For all bug and feature requests, please open an ``issue'' on % \begin{important} % \url{https://git.framasoft.org/maieul/bibleref/issues} % \end{important} -% +% %\StopEventually{\clearpage\phantomsection %\PrintIndex % @@ -973,7 +973,7 @@ % Declare package % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2018/07/31 1.20 (NLCT and MR)] +\ProvidesPackage{bibleref}[2018/11/17 1.21 (NLCT and MR)] % \end{macrocode} % Need to do some conditional stuff % \begin{macrocode} @@ -1030,7 +1030,7 @@ % \end{macrocode} %\end{macro} %\begin{macro}{\BRepistletothe} -% As above but for epistles to +% As above but for epistles to % people. % \begin{macrocode} \newcommand*{\BRepistletothe}{} @@ -1060,7 +1060,7 @@ %\end{macro} %\changes{1.17}{2017/06/30}{Add syntaxis to use double numbering of the Psalms} % \begin{macro}{\BRchapterstyle} -% The way the alternate chapter number is shown. +% The way the alternate chapter number is shown. % By default, in parenthesis. % \begin{macrocode} \newcommand*{\BRotherchapterstyle}[1]{(#1)}% @@ -1117,7 +1117,7 @@ % \end{macrocode} %\end{macro} %\begin{macro}{\BRperiod} -% This can be redefined to put a full stop after +% This can be redefined to put a full stop after % book names. % \begin{macrocode} \newcommand*{\BRperiod}{} @@ -1443,6 +1443,7 @@ \newcommand*\br@Rv{\br@Revelation} % \end{macrocode} % More synonyms. +%\changes{1.21}{2018/11/17}{Add Wis abbreviation} % \begin{macrocode} \newcommand*\br@Gen{\br@Genesis}% \newcommand*\br@Exod{\br@Exodus}% @@ -1464,6 +1465,7 @@ \newcommand*\br@Prov{\br@Proverbs}% \newcommand*\br@Eccl{\br@Ecclesiastes}% \newcommand*\br@SofS{\br@SongofSongs}% +\newcommand*\br@Wis{\br@Wisdom}% \newcommand*\br@Wisd{\br@Wisdom}% \newcommand*\br@Ecclus{\br@Ecclesiasticus}% \newcommand*\br@Isa{\br@Isaiah}% @@ -1649,7 +1651,7 @@ % \end{macrocode} %\end{macro} %\begin{macro}{\brs@MLA} -%MLA Style +%MLA Style % \begin{macrocode} \newcommand*{\brs@MLA}{% \braltabbrvname @@ -1674,7 +1676,7 @@ % \end{macrocode} %\end{macro} %\begin{macro}{\brs@chicago} -%Chicago Style +%Chicago Style % \begin{macrocode} \newcommand*{\brs@chicago}{% \braltabbrvname @@ -1763,7 +1765,7 @@ defined}{}}} %\begin{definition} %\cs{setbooktitle}\marg{fullname}\marg{title} %\end{definition} -% Redefines the title of book \meta{fullname}. +% Redefines the title of book \meta{fullname}. % \begin{macrocode} \newcommand*{\setbooktitle}[2]{% \@ifundefined{br@#1}% @@ -1926,7 +1928,7 @@ defined}{}}} %\end{macro} % %\begin{macro}{\@br@stripverse} -% Strip trailing letters from verse. Number is stored in +% Strip trailing letters from verse. Number is stored in % \cs{@br@versenum} and the suffix is stored in % \cs{@br@versesuffix}. % \begin{macrocode} @@ -2103,11 +2105,11 @@ defined}{}}} %\changes{1.20}{2018/07/31}{Check before using \cs{shorthandoff}\verb+:+ (for babel)} % \begin{macrocode} \bbl@ifunset{bbl@active@\string:}% - {}% + {}% {\shorthandoff:}% % \end{macrocode} % This looks for a command called -% \cs{br@}\meta{name} (defined earlier). +% \cs{br@}\meta{name} (defined earlier). % After the book title, it then checks % to see if there is a bracket \verb|(| immediately following it. % \begin{macrocode} @@ -2283,7 +2285,7 @@ defined}{}}} \edef\@bv@tmpc{\@bv@idxpgformat}%\@bv@tmpa and \@bv@tmpb are tokens \ifx\@empty\@bv@tmpc% \@do@biblerefindex% - {\@@bv@idxsort\relax @\@bv@tmp}% + {\@@bv@idxsort\relax @\@bv@tmp}% \else% \@do@biblerefindex% {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}% @@ -2297,7 +2299,7 @@ defined}{}}} % \begin{macrocode} \@bv@restore \bbl@ifunset{bbl@active@\string:}% - {}% + {}% {\shorthandon:}% } % \end{macrocode} @@ -2334,7 +2336,7 @@ defined}{}}} % for the given key. % In case we use unicode character with non unicode engines (using fontspec), we need a little hack to: % \begin{itemize} -% \item Transform the input 16 bits (or more) content to series of \cs{char}; +% \item Transform the input 16 bits (or more) content to series of \cs{char}; % \item Use the detokinzed version of this representation of characters to define the \cs{@bibleref@map@XXX} commands. % \end{itemize} % In this case, we do it using \cs{biblerefmap@}, passing a transformed forme of the first argument of \cs{biblerefmap}. @@ -2704,7 +2706,7 @@ Another new testament reference \ibibleverse{Matt}. \author{Nicola Talbot} \maketitle -Long citation in text: +Long citation in text: \biblerefstyle{text}% \bibleverse{IICor}(12:15,18,21-33) and \bibleverse{Jeremiah}. diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty index 92e35ab202a..93c0769c58c 100644 --- a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty +++ b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2018/07/31 1.20 (NLCT and MR)] +\ProvidesPackage{bibleref}[2018/11/17 1.21 (NLCT and MR)] \RequirePackage{ifthen} \RequirePackage{fmtcount} \RequirePackage{amsgen} @@ -376,6 +376,7 @@ \newcommand*\br@Prov{\br@Proverbs}% \newcommand*\br@Eccl{\br@Ecclesiastes}% \newcommand*\br@SofS{\br@SongofSongs}% +\newcommand*\br@Wis{\br@Wisdom}% \newcommand*\br@Wisd{\br@Wisdom}% \newcommand*\br@Ecclus{\br@Ecclesiasticus}% \newcommand*\br@Isa{\br@Isaiah}% -- cgit v1.2.3