texlive[44737] Master/texmf-dist: bibleref (1jul17)

commits+karl at tug.org commits+karl at tug.org
Sat Jul 1 23:32:48 CEST 2017


Revision: 44737
          http://tug.org/svn/texlive?view=revision&revision=44737
Author:   karl
Date:     2017-07-01 23:32:47 +0200 (Sat, 01 Jul 2017)
Log Message:
-----------
bibleref (1jul17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/bibleref/CHANGES
    trunk/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf
    trunk/Master/texmf-dist/doc/latex/bibleref/makefile
    trunk/Master/texmf-dist/doc/latex/bibleref/sample.ist
    trunk/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf
    trunk/Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdf
    trunk/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf
    trunk/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf
    trunk/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
    trunk/Master/texmf-dist/tex/latex/bibleref/bibleref-xidx.sty
    trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty

Modified: trunk/Master/texmf-dist/doc/latex/bibleref/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bibleref/CHANGES	2017-07-01 21:32:33 UTC (rev 44736)
+++ trunk/Master/texmf-dist/doc/latex/bibleref/CHANGES	2017-07-01 21:32:47 UTC (rev 44737)
@@ -1,3 +1,5 @@
+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.
 

Modified: trunk/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/bibleref/makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bibleref/makefile	2017-07-01 21:32:33 UTC (rev 44736)
+++ trunk/Master/texmf-dist/doc/latex/bibleref/makefile	2017-07-01 21:32:47 UTC (rev 44737)
@@ -5,7 +5,7 @@
 	latexmk sample*tex
 	ln sample*tex bibleref/samples
 	ln sample*pdf bibleref/samples
-	ln CHANGES *ins *ist *dtx bibleref.pdf README makefile bibleref
+	ln CHANGES *ins *dtx bibleref.pdf README makefile bibleref
 	@$(RM) ../bibleref.zip
 	zip -r ../bibleref.zip bibleref
 

Modified: trunk/Master/texmf-dist/doc/latex/bibleref/sample.ist
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bibleref/sample.ist	2017-07-01 21:32:33 UTC (rev 44736)
+++ trunk/Master/texmf-dist/doc/latex/bibleref/sample.ist	2017-07-01 21:32:47 UTC (rev 44737)
@@ -38,9 +38,9 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-delim_0 "\\dotfill "
-delim_1 "\\dotfill "
-delim_2 "\\dotfill "
+delim_0  "\\dotfill "
+delim_1  "\\dotfill "
+delim_2  "\\dotfill "
 \endinput
 %%
 %% End of file `sample.ist'.

Modified: trunk/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/bibleref/bibleref.dtx	2017-07-01 21:32:33 UTC (rev 44736)
+++ trunk/Master/texmf-dist/source/latex/bibleref/bibleref.dtx	2017-07-01 21:32:47 UTC (rev 44737)
@@ -105,7 +105,7 @@
 % You \textbf{must not} use this syntax:\\
 % \texttt{(}\meta{ch}\texttt{:)-(}\meta{ch}\texttt{:)}
 %
-% Despite this syntax make a good typesetting, it make a problematic index: the chapter are typeset after the verse contained inside.
+% Despite this syntax make a good typesetting, it make a problematic index: the chapter are typeset after the verses contained inside.
 % \end{important}
 %
 % For the book without chapter (\bibleverse{Ob}; \bibleverse{IJn}; \bibleverse{IIJn}; \bibleverse{Phm}; \bibleverse{Jude}), you must add an empty chapter:
@@ -116,6 +116,24 @@
 % \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. 
+% 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:)| 
+%
+% 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]{} 
+% \end{verbatim}
 %\subsection{Examples}
 %\begin{center}
 %\begin{tabular}{ll}
@@ -123,6 +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{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:)\\
@@ -531,7 +550,13 @@
 \def\@bibleverse(#1:{%
   \def\@bv at chidxsort{}%
   \def\@bv at chidxentry{}%
-  \@br at chsty{#1}%
+  \bv at dbl@ch#1/\@nil%
+  \@br at chsty{\bv at dbl@ch at one}%
+  \ifx\bv at dbl@ch at two\@empty\else%
+    \@bv at dbl@ch at twotrue%
+    \BRotherchapterstyle{\@br at chsty{\bv at dbl@ch at two}}%
+    \@bv at dbl@ch at twofalse%
+  \fi%
   \@@bibleverse
 }
 %    \end{macrocode}
@@ -542,7 +567,13 @@
 \def\@bibleverser-(#1:{%
   \def\@bv at chidxsort{}%
   \def\@bv at chidxentry{}%
-  \@br at chsty{#1}%
+  \bv at dbl@ch#1/\@nil%
+  \@br at chsty{\bv at dbl@ch at one}%
+  \ifx\bv at dbl@ch at two\@empty\else%
+    \@bv at dbl@ch at twotrue%
+    \BRotherchapterstyle{\@br at chsty{\bv at dbl@ch at two}}%
+    \@bv at dbl@ch at twofalse%
+  \fi%
   \@@bibleverse
 }
 %    \end{macrocode}
@@ -942,7 +973,7 @@
 % Declare package
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bibleref}[2016/09/27 1.16 (NLCT and MR)]
+\ProvidesPackage{bibleref}[2017/06/30 1.17 (NLCT and MR)]
 %    \end{macrocode}
 % Need to do some conditional stuff
 %    \begin{macrocode}
@@ -1016,6 +1047,7 @@
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\BRchapterstyle}
+%
 % The style of the chapter number.
 % By default it simply displays its argument.
 %    \begin{macrocode}
@@ -1022,6 +1054,14 @@
 \newcommand*{\BRchapterstyle}[1]{#1}
 %    \end{macrocode}
 %\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. 
+% By default, in parenthesis.
+%    \begin{macrocode}
+\newcommand*{\BRotherchapterstyle}[1]{(#1)}%
+%    \end{macrocode}
+% \end{macro}
 %\begin{macro}{\BRversestyle}
 %The style of the verse number.
 % By default is simply displays its argument.
@@ -2109,7 +2149,13 @@
   \ifx\@bv at tmp\@empty
     \def\@bv at bvmacro{\@@bibleversenosep}%
   \else
-    \@br at chsty{#1}%
+    \bv at dbl@ch#1/\@nil%
+    \expandafter\@br at chsty\expandafter{\bv at dbl@ch at one}%
+    \ifx\bv at dbl@ch at two\@empty\else%
+      \@bv at dbl@ch at twotrue%
+      \BRotherchapterstyle{\@br at chsty{\bv at dbl@ch at two}}%
+      \@bv at dbl@ch at twofalse%
+    \fi%
     \def\@bv at bvmacro{\@@bibleverse}%
   \fi
   \@bv at bvmacro
@@ -2116,24 +2162,50 @@
 }
 %    \end{macrocode}
 %\end{macro}
+% \begin{macro}{\bv at dbl@ch}
+% This gets the two chapter numbers if there is alternative number (for example \verb+\bibleverse{Ps}(22/23:)+).
+%    \begin{macrocode}
+\def\bv at dbl@ch#1/#2\@nil{%
+  \gdef\bv at dbl@ch at one{#1}%
+  \gdef\bv at dbl@ch at two{#2}%
+  \def\bv at dbl@ch at get@two##1/\@nil{%
+    \gdef\bv at dbl@ch at two{##1}%
+  }%
+  \ifx\bv at dbl@ch at two\@empty\else%
+    \expandafter\bv at dbl@ch at get@two\bv at dbl@ch at two\@nil%
+  \fi%
+}%
+%    \end{macrocode}
+% \end{macro}
 %
+% \begin{macro}{\if at bv@dbl at ch@two}
+% This is set to TRUE before typesetting the alternative number.
+%    \begin{macrocode}
+\newif\if at bv@dbl at ch@two%
+%    \end{macrocode}
+% \end{macro}
 %\begin{macro}{\@bibleverser}
 % This gets the second part of a range spanning chapters.
 %    \begin{macrocode}
 \def\@bibleverser-(#1:{%
-  \def\@bv at tmp{#1}%
-  \ifx\@bv at tmp\@empty
+  \bv at dbl@ch#1/\@nil%
+  \ifx\bv at dbl@ch at one\@empty
   \else
-    \ifnum\@bv at tmp<10\relax
-      \@bv at addtochidxsort{00#1:}%
+    \ifnum\bv at dbl@ch at one<10\relax
+      \@bv at addtochidxsort{00\bv at dbl@ch at one:}%
     \else
-      \ifnum\@bv at tmp<100\relax
-        \@bv at addtochidxsort{0#1:}%
+      \ifnum\bv at dbl@ch at one<100\relax
+        \@bv at addtochidxsort{0\bv at dbl@ch at one:}%
       \else
-        \@bv at addtochidxsort{#1:}%
+        \@bv at addtochidxsort{\bv at dbl@ch at one:}%
       \fi
     \fi
-    \@bv at do{\protect\BRchapterstyle{#1}}%
+    \@bv at do{\protect\BRchapterstyle{\bv at dbl@ch at one}}%
+    \ifx\bv at dbl@ch at two\@empty\else%
+      \@bv at dbl@ch at twotrue%
+      \BRotherchapterstyle{\@br at chsty{\bv at dbl@ch at two}}%
+      \@bv at dbl@ch at twofalse%
+    \fi%
   \fi
   \@@bibleverse
 }
@@ -2273,7 +2345,11 @@
 \newtoks\@bv at tmpb
 \newcommand*{\@bv at addtoidx}[1]{%
 \if at bv@idx
-  \@bv at tmpa={#1}%
+  \if at bv@dbl at ch@two%
+    \@bv at tmpa={\protect\BRotherchapterstyle{#1}}%
+  \else%
+    \@bv at tmpa={#1}%
+  \fi%
   \@bv at tmpb=\expandafter{\@bv at idxentry}%
   \protected at edef\@bv at idxentry{\the\@bv at tmpb\the\@bv at tmpa}%
 \fi}
@@ -2287,7 +2363,11 @@
 \if at bv@idx
   \@bv at tmpa={#1}%
   \@bv at tmpb=\expandafter{\@bv at chidxsort}%
-  \edef\@bv at chidxsort{\the\@bv at tmpb\the\@bv at tmpa}%
+  \if at bv@dbl at ch@two%
+    \edef\@bv at chidxsort{\the\@bv at tmpb}%
+  \else%
+    \edef\@bv at chidxsort{\the\@bv at tmpb\the\@bv at tmpa}%
+  \fi%
 \fi
 }
 %    \end{macrocode}
@@ -2823,9 +2903,9 @@
 %\fi
 %\iffalse
 %    \begin{macrocode}
-delim_0	"\\dotfill "
-delim_1	"\\dotfill "
-delim_2	"\\dotfill "
+delim_0  "\\dotfill "
+delim_1  "\\dotfill "
+delim_2  "\\dotfill "
 %    \end{macrocode}
 %\fi
 %\iffalse

Modified: trunk/Master/texmf-dist/tex/latex/bibleref/bibleref-xidx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bibleref/bibleref-xidx.sty	2017-07-01 21:32:33 UTC (rev 44736)
+++ trunk/Master/texmf-dist/tex/latex/bibleref/bibleref-xidx.sty	2017-07-01 21:32:47 UTC (rev 44737)
@@ -54,13 +54,25 @@
 \def\@bibleverse(#1:{%
   \def\@bv at chidxsort{}%
   \def\@bv at chidxentry{}%
-  \@br at chsty{#1}%
+  \bv at dbl@ch#1/\@nil%
+  \@br at chsty{\bv at dbl@ch at one}%
+  \ifx\bv at dbl@ch at two\@empty\else%
+    \@bv at dbl@ch at twotrue%
+    \BRotherchapterstyle{\@br at chsty{\bv at dbl@ch at two}}%
+    \@bv at dbl@ch at twofalse%
+  \fi%
   \@@bibleverse
 }
 \def\@bibleverser-(#1:{%
   \def\@bv at chidxsort{}%
   \def\@bv at chidxentry{}%
-  \@br at chsty{#1}%
+  \bv at dbl@ch#1/\@nil%
+  \@br at chsty{\bv at dbl@ch at one}%
+  \ifx\bv at dbl@ch at two\@empty\else%
+    \@bv at dbl@ch at twotrue%
+    \BRotherchapterstyle{\@br at chsty{\bv at dbl@ch at two}}%
+    \@bv at dbl@ch at twofalse%
+  \fi%
   \@@bibleverse
 }
 \def\@@bibleverse#1){%

Modified: trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty	2017-07-01 21:32:33 UTC (rev 44736)
+++ trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty	2017-07-01 21:32:47 UTC (rev 44737)
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bibleref}[2016/09/27 1.16 (NLCT and MR)]
+\ProvidesPackage{bibleref}[2017/06/30 1.17 (NLCT and MR)]
 \RequirePackage{ifthen}
 \RequirePackage{fmtcount}
 \RequirePackage{amsgen}
@@ -52,6 +52,7 @@
 \newcommand*{\BRepistleof}{}
 \newcommand*{\BRbooktitlestyle}[1]{#1}
 \newcommand*{\BRchapterstyle}[1]{#1}
+\newcommand*{\BRotherchapterstyle}[1]{(#1)}%
 \newcommand*{\BRversestyle}[1]{#1}
 \newcommand*{\BRversesuffixstyle}[1]{#1}
 \newcommand*{\BRbkchsep}{ }
@@ -834,25 +835,47 @@
   \ifx\@bv at tmp\@empty
     \def\@bv at bvmacro{\@@bibleversenosep}%
   \else
-    \@br at chsty{#1}%
+    \bv at dbl@ch#1/\@nil%
+    \expandafter\@br at chsty\expandafter{\bv at dbl@ch at one}%
+    \ifx\bv at dbl@ch at two\@empty\else%
+      \@bv at dbl@ch at twotrue%
+      \BRotherchapterstyle{\@br at chsty{\bv at dbl@ch at two}}%
+      \@bv at dbl@ch at twofalse%
+    \fi%
     \def\@bv at bvmacro{\@@bibleverse}%
   \fi
   \@bv at bvmacro
 }
+\def\bv at dbl@ch#1/#2\@nil{%
+  \gdef\bv at dbl@ch at one{#1}%
+  \gdef\bv at dbl@ch at two{#2}%
+  \def\bv at dbl@ch at get@two##1/\@nil{%
+    \gdef\bv at dbl@ch at two{##1}%
+  }%
+  \ifx\bv at dbl@ch at two\@empty\else%
+    \expandafter\bv at dbl@ch at get@two\bv at dbl@ch at two\@nil%
+  \fi%
+}%
+\newif\if at bv@dbl at ch@two%
 \def\@bibleverser-(#1:{%
-  \def\@bv at tmp{#1}%
-  \ifx\@bv at tmp\@empty
+  \bv at dbl@ch#1/\@nil%
+  \ifx\bv at dbl@ch at one\@empty
   \else
-    \ifnum\@bv at tmp<10\relax
-      \@bv at addtochidxsort{00#1:}%
+    \ifnum\bv at dbl@ch at one<10\relax
+      \@bv at addtochidxsort{00\bv at dbl@ch at one:}%
     \else
-      \ifnum\@bv at tmp<100\relax
-        \@bv at addtochidxsort{0#1:}%
+      \ifnum\bv at dbl@ch at one<100\relax
+        \@bv at addtochidxsort{0\bv at dbl@ch at one:}%
       \else
-        \@bv at addtochidxsort{#1:}%
+        \@bv at addtochidxsort{\bv at dbl@ch at one:}%
       \fi
     \fi
-    \@bv at do{\protect\BRchapterstyle{#1}}%
+    \@bv at do{\protect\BRchapterstyle{\bv at dbl@ch at one}}%
+    \ifx\bv at dbl@ch at two\@empty\else%
+      \@bv at dbl@ch at twotrue%
+      \BRotherchapterstyle{\@br at chsty{\bv at dbl@ch at two}}%
+      \@bv at dbl@ch at twofalse%
+    \fi%
   \fi
   \@@bibleverse
 }
@@ -925,7 +948,11 @@
 \newtoks\@bv at tmpb
 \newcommand*{\@bv at addtoidx}[1]{%
 \if at bv@idx
-  \@bv at tmpa={#1}%
+  \if at bv@dbl at ch@two%
+    \@bv at tmpa={\protect\BRotherchapterstyle{#1}}%
+  \else%
+    \@bv at tmpa={#1}%
+  \fi%
   \@bv at tmpb=\expandafter{\@bv at idxentry}%
   \protected at edef\@bv at idxentry{\the\@bv at tmpb\the\@bv at tmpa}%
 \fi}
@@ -933,7 +960,11 @@
 \if at bv@idx
   \@bv at tmpa={#1}%
   \@bv at tmpb=\expandafter{\@bv at chidxsort}%
-  \edef\@bv at chidxsort{\the\@bv at tmpb\the\@bv at tmpa}%
+  \if at bv@dbl at ch@two%
+    \edef\@bv at chidxsort{\the\@bv at tmpb}%
+  \else%
+    \edef\@bv at chidxsort{\the\@bv at tmpb\the\@bv at tmpa}%
+  \fi%
 \fi
 }
 \newif\if at bv@idx



More information about the tex-live-commits mailing list