From 1d489c5acd49115955f035380e9ec36c51701827 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 14 May 2010 18:25:04 +0000 Subject: bibleref 1.12 (11may10) git-svn-id: svn://tug.org/texlive/trunk@18247 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/bibleref/bibleref.sty | 82 +++++++++++++++++++++-- 1 file changed, 77 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bibleref') diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty index b0cfc873c64..c09911c7c6e 100644 --- a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty +++ b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files bibleref.dtx and bibleref.ins and the derived files bibleref.sty, sample-multind.tex, sample.tex, bibleref.perl. +%% This work consists of the files bibleref.dtx and bibleref.ins and the derived files bibleref.sty, bibleref-manual.tex, sample-multind.tex, sample.tex, bibleref.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2010/04/29 1.11 (NLCT)] +\ProvidesPackage{bibleref}[2010/05/11 1.12 (NLCT)] \RequirePackage{ifthen} \RequirePackage{fmtcount} \newcommand*{\BRbooknumberstyle}[1]{#1 } @@ -52,6 +52,7 @@ \newcommand*{\BRbooktitlestyle}[1]{#1} \newcommand*{\BRchapterstyle}[1]{#1} \newcommand*{\BRversestyle}[1]{#1} +\newcommand*{\BRversesuffixstyle}[1]{#1} \newcommand*{\BRbkchsep}{ } \newcommand*{\BRchvsep}{:} \newcommand*{\BRchsep}{;} @@ -411,6 +412,7 @@ \renewcommand*{\BRbooktitlestyle}[1]{##1}% \renewcommand*{\BRchapterstyle}[1]{##1}% \renewcommand*{\BRversestyle}[1]{##1}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% \renewcommand*{\BRbookof}{}% \renewcommand*{\BRgospel}{}% \renewcommand*{\BRepistletothe}{}% @@ -429,6 +431,7 @@ \renewcommand*{\BRbooktitlestyle}[1]{##1}% \renewcommand*{\BRchapterstyle}[1]{##1}% \renewcommand*{\BRversestyle}[1]{##1}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% \renewcommand*{\BRbookof}{}% \renewcommand*{\BRgospel}{}% \renewcommand*{\BRepistletothe}{}% @@ -448,6 +451,7 @@ \renewcommand*{\BRbooktitlestyle}[1]{##1}% \renewcommand*{\BRchapterstyle}[1]{\MakeUppercase{\romannumeral##1}}% \renewcommand*{\BRversestyle}[1]{##1}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% \renewcommand*{\BRbookof}{}% \renewcommand*{\BRgospel}{}% \renewcommand*{\BRepistletothe}{}% @@ -467,6 +471,7 @@ \renewcommand*{\BRbooktitlestyle}[1]{##1}% \renewcommand*{\BRchapterstyle}[1]{\romannumeral##1}% \renewcommand*{\BRversestyle}[1]{##1}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% \renewcommand*{\BRbookof}{}% \renewcommand*{\BRgospel}{}% \renewcommand*{\BRepistletothe}{}% @@ -486,6 +491,7 @@ \renewcommand*{\BRbooktitlestyle}[1]{##1}% \renewcommand*{\BRchapterstyle}[1]{\romannumeral##1}% \renewcommand*{\BRversestyle}[1]{##1}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% \renewcommand*{\BRbookof}{}% \renewcommand*{\BRgospel}{}% \renewcommand*{\BRepistletothe}{}% @@ -505,6 +511,7 @@ \renewcommand*{\BRbooktitlestyle}[1]{##1}% \renewcommand*{\BRchapterstyle}[1]{\romannumeral##1}% \renewcommand*{\BRversestyle}[1]{##1}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% \renewcommand*{\BRbookof}{}% \renewcommand*{\BRgospel}{}% \renewcommand*{\BRepistletothe}{}% @@ -524,6 +531,7 @@ \renewcommand*{\BRbooktitlestyle}[1]{##1}% \renewcommand*{\BRchapterstyle}[1]{\romannumeral##1}% \renewcommand*{\BRversestyle}[1]{##1}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% \renewcommand*{\BRbookof}{}% \renewcommand*{\BRgospel}{}% \renewcommand*{\BRepistletothe}{}% @@ -543,6 +551,7 @@ \renewcommand*{\BRbooktitlestyle}[1]{##1}% \renewcommand*{\BRchapterstyle}[1]{\romannumeral##1}% \renewcommand*{\BRversestyle}[1]{##1}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% \renewcommand*{\BRbookof}{}% \renewcommand*{\BRgospel}{}% \renewcommand*{\BRepistletothe}{}% @@ -574,6 +583,7 @@ chapter \numberstringnum{##1}}% \renewcommand{\BRvrsep}{ to }% \renewcommand{\BRvsep}{, }% \renewcommand{\BRversestyle}[1]{\numberstringnum{##1}}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% } \DeclareOption{default}{\brs@default} \DeclareOption{jerusalem}{\brs@jerusalem} @@ -630,20 +640,82 @@ Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}} \@@br@vrsty#2\end% \fi } +\def\br@stripverse#1{% + \def\@br@versenum{}% + \def\@br@versesuffix{}% + \@br@stripverse#1\relax +} +\def\@br@stripverse#1#2{% + \@br@checkisdigit{#1}% + \if@br@isdigit + \expandafter\toks@\expandafter{\@br@versenum}% + \edef\@br@versenum{\the\toks@#1}% + \let\@br@next\@br@stripverse + \else + \def\@br@versesuffix{#1}% + \let\@br@next\@@br@stripverse + \fi + \ifx#2\relax + \let\@br@next\relax + \fi + \@br@next#2% +} +\def\@@br@stripverse#1\relax{% + \protected@edef\@br@versesuffix{\@br@versesuffix#1}% +} +\newif\if@br@isdigit +\newcommand*{\@br@checkisdigit}[1]{% + \@br@isdigittrue + \if#10\relax + \else + \if#11\relax + \else + \if#12\relax + \else + \if#13\relax + \else + \if#14\relax + \else + \if#15\relax + \else + \if#16\relax + \else + \if#17\relax + \else + \if#18\relax + \else + \if#19\relax + \else + \@br@isdigitfalse + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi +} \def\@do@verses#1,#2\end{% \def\@br@tmp{#1}% \ifx\@br@tmp\@empty \else - \ifnum\@br@tmp<10\relax + \br@stripverse{#1}% + \ifnum\@br@versenum<10\relax \@bv@addtochidxsort{00#1}% \else - \ifnum\@br@tmp<100\relax + \ifnum\@br@versenum<100\relax \@bv@addtochidxsort{0#1}% \else \@bv@addtochidxsort{#1}% \fi \fi - \@bv@do{\BRversestyle{#1}}% + \edef\@br@tmp{% + \noexpand\BRversestyle{\@br@versenum}% + \noexpand\BRversesuffixstyle{\@br@versesuffix}}% + \expandafter\@bv@do\expandafter{\@br@tmp}% \fi \ifx\relax#2\relax \else -- cgit v1.2.3