summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-07-01 21:32:47 +0000
committerKarl Berry <karl@freefriends.org>2017-07-01 21:32:47 +0000
commit0792b667fdad9b1d93a69e48afb2b4ac475c3df0 (patch)
treeb51b596b9e120f6d63cd9aeccf41d0e762a98553 /Master/texmf-dist/tex/latex
parent3a68b1e93b8c444a9dd1307be0fbc648b9e8c572 (diff)
bibleref (1jul17)
git-svn-id: svn://tug.org/texlive/trunk@44737 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/bibleref/bibleref-xidx.sty16
-rw-r--r--Master/texmf-dist/tex/latex/bibleref/bibleref.sty55
2 files changed, 57 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref-xidx.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref-xidx.sty
index 01755c677b8..315c45affd4 100644
--- a/Master/texmf-dist/tex/latex/bibleref/bibleref-xidx.sty
+++ b/Master/texmf-dist/tex/latex/bibleref/bibleref-xidx.sty
@@ -54,13 +54,25 @@
\def\@bibleverse(#1:{%
\def\@bv@chidxsort{}%
\def\@bv@chidxentry{}%
- \@br@chsty{#1}%
+ \bv@dbl@ch#1/\@nil%
+ \@br@chsty{\bv@dbl@ch@one}%
+ \ifx\bv@dbl@ch@two\@empty\else%
+ \@bv@dbl@ch@twotrue%
+ \BRotherchapterstyle{\@br@chsty{\bv@dbl@ch@two}}%
+ \@bv@dbl@ch@twofalse%
+ \fi%
\@@bibleverse
}
\def\@bibleverser-(#1:{%
\def\@bv@chidxsort{}%
\def\@bv@chidxentry{}%
- \@br@chsty{#1}%
+ \bv@dbl@ch#1/\@nil%
+ \@br@chsty{\bv@dbl@ch@one}%
+ \ifx\bv@dbl@ch@two\@empty\else%
+ \@bv@dbl@ch@twotrue%
+ \BRotherchapterstyle{\@br@chsty{\bv@dbl@ch@two}}%
+ \@bv@dbl@ch@twofalse%
+ \fi%
\@@bibleverse
}
\def\@@bibleverse#1){%
diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
index 29e41bd6167..f9e2051ffd2 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}[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 @@ defined}{}}}
\ifx\@bv@tmp\@empty
\def\@bv@bvmacro{\@@bibleversenosep}%
\else
- \@br@chsty{#1}%
+ \bv@dbl@ch#1/\@nil%
+ \expandafter\@br@chsty\expandafter{\bv@dbl@ch@one}%
+ \ifx\bv@dbl@ch@two\@empty\else%
+ \@bv@dbl@ch@twotrue%
+ \BRotherchapterstyle{\@br@chsty{\bv@dbl@ch@two}}%
+ \@bv@dbl@ch@twofalse%
+ \fi%
\def\@bv@bvmacro{\@@bibleverse}%
\fi
\@bv@bvmacro
}
+\def\bv@dbl@ch#1/#2\@nil{%
+ \gdef\bv@dbl@ch@one{#1}%
+ \gdef\bv@dbl@ch@two{#2}%
+ \def\bv@dbl@ch@get@two##1/\@nil{%
+ \gdef\bv@dbl@ch@two{##1}%
+ }%
+ \ifx\bv@dbl@ch@two\@empty\else%
+ \expandafter\bv@dbl@ch@get@two\bv@dbl@ch@two\@nil%
+ \fi%
+}%
+\newif\if@bv@dbl@ch@two%
\def\@bibleverser-(#1:{%
- \def\@bv@tmp{#1}%
- \ifx\@bv@tmp\@empty
+ \bv@dbl@ch#1/\@nil%
+ \ifx\bv@dbl@ch@one\@empty
\else
- \ifnum\@bv@tmp<10\relax
- \@bv@addtochidxsort{00#1:}%
+ \ifnum\bv@dbl@ch@one<10\relax
+ \@bv@addtochidxsort{00\bv@dbl@ch@one:}%
\else
- \ifnum\@bv@tmp<100\relax
- \@bv@addtochidxsort{0#1:}%
+ \ifnum\bv@dbl@ch@one<100\relax
+ \@bv@addtochidxsort{0\bv@dbl@ch@one:}%
\else
- \@bv@addtochidxsort{#1:}%
+ \@bv@addtochidxsort{\bv@dbl@ch@one:}%
\fi
\fi
- \@bv@do{\protect\BRchapterstyle{#1}}%
+ \@bv@do{\protect\BRchapterstyle{\bv@dbl@ch@one}}%
+ \ifx\bv@dbl@ch@two\@empty\else%
+ \@bv@dbl@ch@twotrue%
+ \BRotherchapterstyle{\@br@chsty{\bv@dbl@ch@two}}%
+ \@bv@dbl@ch@twofalse%
+ \fi%
\fi
\@@bibleverse
}
@@ -925,7 +948,11 @@ defined}{}}}
\newtoks\@bv@tmpb
\newcommand*{\@bv@addtoidx}[1]{%
\if@bv@idx
- \@bv@tmpa={#1}%
+ \if@bv@dbl@ch@two%
+ \@bv@tmpa={\protect\BRotherchapterstyle{#1}}%
+ \else%
+ \@bv@tmpa={#1}%
+ \fi%
\@bv@tmpb=\expandafter{\@bv@idxentry}%
\protected@edef\@bv@idxentry{\the\@bv@tmpb\the\@bv@tmpa}%
\fi}
@@ -933,7 +960,11 @@ defined}{}}}
\if@bv@idx
\@bv@tmpa={#1}%
\@bv@tmpb=\expandafter{\@bv@chidxsort}%
- \edef\@bv@chidxsort{\the\@bv@tmpb\the\@bv@tmpa}%
+ \if@bv@dbl@ch@two%
+ \edef\@bv@chidxsort{\the\@bv@tmpb}%
+ \else%
+ \edef\@bv@chidxsort{\the\@bv@tmpb\the\@bv@tmpa}%
+ \fi%
\fi
}
\newif\if@bv@idx