From 05761c2234110d9e0e74000a9b02db81b18aab76 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 22 Jun 2020 20:52:23 +0000 Subject: bibleref (22jun20) git-svn-id: svn://tug.org/texlive/trunk@55626 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/bibleref/CHANGES | 5 ++- Master/texmf-dist/doc/latex/bibleref/bibleref.pdf | Bin 286825 -> 286852 bytes .../latex/bibleref/samples/sample-categories.pdf | Bin 12303 -> 12301 bytes .../latex/bibleref/samples/sample-indextools.pdf | Bin 9463 -> 9462 bytes .../doc/latex/bibleref/samples/sample-xidx.pdf | Bin 19439 -> 19167 bytes .../doc/latex/bibleref/samples/sample.pdf | Bin 39426 -> 39145 bytes .../texmf-dist/source/latex/bibleref/bibleref.dtx | 43 +++++++++++++++++++-- Master/texmf-dist/tex/latex/bibleref/bibleref.sty | 27 ++++++++++++- 8 files changed, 70 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/bibleref/CHANGES b/Master/texmf-dist/doc/latex/bibleref/CHANGES index 29d7c6e9622..57e84275250 100644 --- a/Master/texmf-dist/doc/latex/bibleref/CHANGES +++ b/Master/texmf-dist/doc/latex/bibleref/CHANGES @@ -1,5 +1,8 @@ +1.25 + * Add \ibible macro + * Add more abbreviations 1.24 - * Add more abbreviation + * Add more abbreviations * Add more \brthreeabbrvname 1.23 * Add Tt abbreviation diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf index 99a06b20116..d4ff6eaae5f 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 4ccfb376e42..492e1feea37 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 21662c84381..de8d024b7eb 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 a4d31ce675a..8fdf8354250 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 3f58999daad..23b49008381 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 0802fcf73ba..1eb50d80043 100644 --- a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx +++ b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx @@ -220,9 +220,9 @@ %Note that \meta{name} must be the full name, not the %abbreviated name of the book. For example, to change %Revelation to Apoc, do -%\verb|\setbookname{Revelation}{Apoc}| +%\verb|\setbooktitle{Revelation}{Apoc}| %(\textbf{Note} that you shouldn't do -%\verb|\setbookname{Rev}{Apoc}|) +%\verb|\setbooktitle{Rev}{Apoc}|) % %If you want a different title for a book depending on whether it's %in the main body of the document or in the index, you can set the @@ -309,6 +309,12 @@ %This is similar to \cs{ibiblechvs} except that it only displays the %verse(s) in the text. % +%\begin{definition}[\DescribeMacro{\ibible}] +%\cs{ibible}\oarg{format}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt) +%\end{definition} +%This is similar to \cs{ibiblech} except that it does not display the +%anything in the text. +% %You may need to create your own custom \app{makeindex} style file %as the default uses a comma and space to separate the item from %the page number, which may cause confusion. For example, you @@ -1008,7 +1014,7 @@ % Declare package % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2019/12/10 1.24 (NLCT and MR)] +\ProvidesPackage{bibleref}[2020/06/22 1.25 (NLCT and MR)] % \end{macrocode} % Need to do some conditional stuff % \begin{macrocode} @@ -1604,6 +1610,7 @@ \newcommand*\br@Wis{\br@Wisdom}% \newcommand*\br@Wisd{\br@Wisdom}% \newcommand*\br@Ecclus{\br@Ecclesiasticus}% +\newcommand*\br@Sir{\br@Ecclesiasticus}% \newcommand*\br@Isa{\br@Isaiah}% \newcommand*\br@Jer{\br@Jeremiah}% \newcommand*\br@Lam{\br@Lamentations}% @@ -2668,6 +2675,36 @@ defined}{}}} % \end{macrocode} %\end{macro} % +% \begin{macro}{\ibible} +%\changes{1.25}{2020/06/22}{new} +% Only displays verse(s) but indexes under the book and chapters. +% \begin{macrocode} +\newcommand*{\ibible}[1][\bvidxpgformat]{% + \let\@bv@current@titlestyle\BRbooktitlestyle + \let\@bv@current@chapterstyle\BRchapterstyle + \let\@bv@current@versestyle\BRversestyle% added on analogy with previous line + \let\@bv@current@bkchsep\BRbkchsep + \let\@bv@current@chvsep\BRchvsep + \let\@bv@current@vrsep\BRvrsep% add me, too! + \def\@bv@restore{% + \let\BRbooktitlestyle\@bv@current@titlestyle + \let\BRchapterstyle\@bv@current@chapterstyle + \let\BRversestyle\@bv@current@versestyle% added on analogy with previous line + \let\BRbkchsep\@bv@current@bkchsep + \let\BRchvsep\@bv@current@chvsep + \let\BRvrsep\@bv@current@vrsep% add me, too! + }% + \def\BRbooktitlestyle##1{}% + \def\BRchapterstyle##1{}% + \def\BRversestyle##1{}% added on analogy with previous line + \def\BRbkchsep{}% + \def\BRchvsep{}% + \def\BRvrsep{}% add me, too! + \def\@bv@idxpgformat{#1}% + \@bv@idxtrue\def\@bv@idxentry{}\@bible@verse +} +% \end{macrocode} +% \end{macro} %\begin{macro}{\bvidxpgformat} % Default page number format for bible verse index entries % \begin{macrocode} diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty index 701cea4bb00..72b17561112 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}[2019/12/10 1.24 (NLCT and MR)] +\ProvidesPackage{bibleref}[2020/06/22 1.25 (NLCT and MR)] \RequirePackage{ifthen} \RequirePackage{fmtcount} \RequirePackage{amsgen} @@ -469,6 +469,7 @@ \newcommand*\br@Wis{\br@Wisdom}% \newcommand*\br@Wisd{\br@Wisdom}% \newcommand*\br@Ecclus{\br@Ecclesiasticus}% +\newcommand*\br@Sir{\br@Ecclesiasticus}% \newcommand*\br@Isa{\br@Isaiah}% \newcommand*\br@Jer{\br@Jeremiah}% \newcommand*\br@Lam{\br@Lamentations}% @@ -1158,6 +1159,30 @@ defined}{}}} \def\@bv@idxpgformat{#1}% \@bv@idxtrue\def\@bv@idxentry{}\@bible@verse } +\newcommand*{\ibible}[1][\bvidxpgformat]{% + \let\@bv@current@titlestyle\BRbooktitlestyle + \let\@bv@current@chapterstyle\BRchapterstyle + \let\@bv@current@versestyle\BRversestyle% added on analogy with previous line + \let\@bv@current@bkchsep\BRbkchsep + \let\@bv@current@chvsep\BRchvsep + \let\@bv@current@vrsep\BRvrsep% add me, too! + \def\@bv@restore{% + \let\BRbooktitlestyle\@bv@current@titlestyle + \let\BRchapterstyle\@bv@current@chapterstyle + \let\BRversestyle\@bv@current@versestyle% added on analogy with previous line + \let\BRbkchsep\@bv@current@bkchsep + \let\BRchvsep\@bv@current@chvsep + \let\BRvrsep\@bv@current@vrsep% add me, too! + }% + \def\BRbooktitlestyle##1{}% + \def\BRchapterstyle##1{}% + \def\BRversestyle##1{}% added on analogy with previous line + \def\BRbkchsep{}% + \def\BRchvsep{}% + \def\BRvrsep{}% add me, too! + \def\@bv@idxpgformat{#1}% + \@bv@idxtrue\def\@bv@idxentry{}\@bible@verse +} \newcommand*{\bvidxpgformat}{textrm} \AtBeginDocument{% \ifdefined\bbl@ifunset\else% -- cgit v1.2.3