summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/bibleref
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-29 13:41:25 +0000
committerKarl Berry <karl@freefriends.org>2010-04-29 13:41:25 +0000
commit3793428328652bd18a288a1ab5bd9f5aac85d765 (patch)
tree9c322f3a1325d505efd10961ecc711479008bd2d /Master/texmf-dist/tex/latex/bibleref
parent7b7497d5ec04f3a154975722b6b2725be6566271 (diff)
bibleref 1.10 (27apr10)
git-svn-id: svn://tug.org/texlive/trunk@18041 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/bibleref')
-rw-r--r--Master/texmf-dist/tex/latex/bibleref/bibleref.sty146
1 files changed, 109 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
index 106a78854f0..17cca438db0 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}[2010/04/26 1.09 (NLCT)]
+\ProvidesPackage{bibleref}[2010/04/27 1.10 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{fmtcount}
\newcommand*{\BRbooknumberstyle}[1]{#1 }
@@ -591,9 +591,23 @@ chapter \numberstringnum{##1}}%
\PackageError{bibleref}{bible ref style '#1' already
defined}{}}}
\newcommand*{\setbooktitle}[2]{%
-\@ifundefined{br@#1}{\PackageError{bibleref}{Unknown
-book `#1'}{}}{%
-\expandafter\def\csname br@#1\endcsname{#2}}}
+ \@ifundefined{br@#1}%
+ {%
+ \PackageError{bibleref}{Unknown book `#1'}{}%
+ }%
+ {%
+ \expandafter\def\csname br@#1\endcsname{#2}%
+ }%
+}
+\newcommand*{\setindexbooktitle}[2]{%
+ \@ifundefined{br@#1}%
+ {%
+ \PackageError{bibleref}{Unknown book `#1'}{}%
+ }%
+ {%
+ \expandafter\def\csname bri@#1\endcsname{#2}%
+ }%
+}
\newcommand*{\addbiblebook}[2]{%
\@ifundefined{br@#1}%
{%
@@ -611,43 +625,100 @@ Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}}
\@do@verses#1,\relax\end
\ifx\@nil#2\relax
\else
-\@bv@do{\BRvrsep}%
-\@@br@vrsty#2\end%
-\fi}
+ \@bv@addtochidxsort{-}%
+ \@bv@do{\BRvrsep}%
+ \@@br@vrsty#2\end%
+\fi
+}
\def\@do@verses#1,#2\end{%
-\ifthenelse{\equal{#1}{}}{}{\@bv@do{\BRversestyle{#1}}}%
-\ifx\relax#2\@empty
+\def\@br@tmp{#1}%
+\ifx\@br@tmp\@empty
+\else
+ \ifnum\@br@tmp<10\relax
+ \@bv@addtochidxsort{0#1}%
+ \else
+ \@bv@addtochidxsort{#1}%
+ \fi
+ \@bv@do{\BRversestyle{#1}}%
+\fi
+\ifx\relax#2\relax
\else
-\@bv@do{\BRvsep}%
-\@do@verses#2\end
+ \@bv@addtochidxsort{,}%
+ \@bv@do{\BRvsep}%
+ \@do@verses#2\end
\fi
}
\newcommand*{\bibleverse}[1]{%
-\@ifundefined{br@#1}{\PackageError{bibleref}{Unknown book '#1'}{%
-}}{\@bv@idxsort{\csname br@#1\endcsname}%
-\def\@bv@chidxsort{}%
-\@bv@do{\BRbooktitlestyle{\csname br@#1\endcsname}}}%
-\@ifnextchar({\BRbkchsep\@bv@addtoidx{!}\@bibleverse}{\@end@@bibleverse}%
+ \@ifundefined{br@#1}%
+ {%
+ \PackageError{bibleref}{Unknown book '#1'}{}%
+ }%
+ {%
+ \@bv@idxsort{\csname br@#1\endcsname}%
+ \def\@bv@chidxsort{}%
+ \BRbooktitlestyle{\csname br@#1\endcsname}%
+ \@ifundefined{bri@#1}%
+ {%
+ \def\@bv@mainidxentry{\BRbooktitlestyle{\csname br@#1\endcsname}}%
+ }%
+ {%
+ \def\@bv@mainidxentry{\BRbooktitlestyle{\csname bri@#1\endcsname}}%
+ }%
+ }%
+ \@ifnextchar(%
+ {\BRbkchsep\@bibleverse}%
+ {\@end@@bibleverse}%
}
\def\@bibleverse(#1:{%
-\ifthenelse{\equal{#1}{}}{}{%
-\ifthenelse{\equal{\@bv@chidxsort}{}}{%
-\def\@bvchidxsort{#1}\@bv@addtoidx{#1@}}{}%
-\@bv@do{\BRchapterstyle{#1}}}%
-\@@bibleverse}
+ \def\@bv@tmp{#1}%
+ \ifx\@bv@tmp\@empty
+ \else
+ \ifnum\@bv@tmp<10\relax
+ \@bv@addtochidxsort{0#1:}%
+ \else
+ \@bv@addtochidxsort{#1:}%
+ \fi
+ \@bv@do{\BRchapterstyle{#1}}%
+ \fi
+ \@@bibleverse
+}
\def\@bibleverser-(#1:{%
-\ifthenelse{\equal{#1}{}}{}{%
-\@bv@do{\BRchapterstyle{#1}}}%
-\@@bibleverse}
+ \def\@bv@tmp{#1}%
+ \ifx\@bv@tmp\@empty
+ \else
+ \ifnum\@bv@tmp<10\relax
+ \@bv@addtochidxsort{0#1:}%
+ \else
+ \@bv@addtochidxsort{#1:}%
+ \fi
+ \@bv@do{\BRchapterstyle{#1}}%
+ \fi
+ \@@bibleverse
+}
\def\@@bibleverse#1){%
-\ifthenelse{\equal{#1}{}}{}{\@bv@do{\BRchvsep}\@br@vrsty{#1}}%
-\@ifnextchar({\@bv@do{\BRchsep}\@bibleverse}%
-{\@ifnextchar-{\@bv@do{\BRvrsep}\@bibleverser}{\@end@@bibleverse}}}
+ \def\@bv@tmp{#1}%
+ \ifx\@bv@tmp\@empty
+ \else
+ \@bv@do{\BRchvsep}\@br@vrsty{#1}%
+ \fi
+ \@ifnextchar(%
+ {\@bv@do{\BRchsep}\@bibleverse}%
+ {\@ifnextchar-%
+ {\@bv@do{\BRvrsep}\@bibleverser}%
+ {\@end@@bibleverse}%
+ }%
+}
\newcommand*{\@end@@bibleverse}{%
\if@bv@idx
\expandafter\@do@bibleref@map\@@bv@idxsort\relax
- \biblerefindex{\@@bv@idxsort\relax @\@bv@idxentry|\@bv@idxpgformat}%
-\@bv@idxfalse
+ \ifx\@bv@idxentry\@empty
+ \def\@bv@tmp{\@bv@mainidxentry}%
+ \else
+ \def\@bv@tmp{\@bv@mainidxentry!\@bv@chidxsort @\@bv@idxentry}%
+ \fi
+ \biblerefindex
+ {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}%
+ \@bv@idxfalse
\fi
}
\newcommand*{\biblerefindex}{\index}
@@ -665,16 +736,17 @@ Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}}
\newtoks\@bv@tmpb
\newcommand{\@bv@addtoidx}[1]{%
\if@bv@idx
-\@bv@tmpa={#1}%
-\@bv@tmpb=\expandafter{\@bv@idxentry}%
-\edef\@bv@idxentry{\the\@bv@tmpb\the\@bv@tmpa}%
+ \@bv@tmpa={#1}%
+ \@bv@tmpb=\expandafter{\@bv@idxentry}%
+ \protected@edef\@bv@idxentry{\the\@bv@tmpb\the\@bv@tmpa}%
\fi}
-\newcommand{\@bv@addtoidxsort}[1]{%
+\newcommand{\@bv@addtochidxsort}[1]{%
\if@bv@idx
-\@bv@tmpa={#1}%
-\@bv@tmpb=\expandafter{\@@bv@idxsort}%
-\edef\@@bv@idxsort{\the\@bv@tmpb\the\@bv@tmpa}%
-\fi}
+ \@bv@tmpa={#1}%
+ \@bv@tmpb=\expandafter{\@bv@chidxsort}%
+ \edef\@bv@chidxsort{\the\@bv@tmpb\the\@bv@tmpa}%
+\fi
+}
\newif\if@bv@idx
\@bv@idxfalse
\newcommand{\@bv@idxsort}[1]{%