summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-09-27 21:09:17 +0000
committerKarl Berry <karl@freefriends.org>2016-09-27 21:09:17 +0000
commit3286700d65613e81b020ed472a0ee4d995166fd2 (patch)
treebb71f4936e56f9d0aa71cfceed7f256dde57dff0
parentcc030901f2a91dccbd6953f51c43943afd2f025b (diff)
bibleref (27sep16)
git-svn-id: svn://tug.org/texlive/trunk@42162 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/CHANGES3
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/bibleref.pdfbin243328 -> 243449 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/makefile4
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdfbin9846 -> 9846 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdfbin7819 -> 7817 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdfbin14976 -> 15049 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample.pdfbin31515 -> 31590 bytes
-rw-r--r--Master/texmf-dist/source/latex/bibleref/bibleref.dtx14
-rw-r--r--Master/texmf-dist/tex/latex/bibleref/bibleref.sty12
9 files changed, 24 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/bibleref/CHANGES b/Master/texmf-dist/doc/latex/bibleref/CHANGES
index 1e4ce737ce0..5e611d9c2fc 100644
--- a/Master/texmf-dist/doc/latex/bibleref/CHANGES
+++ b/Master/texmf-dist/doc/latex/bibleref/CHANGES
@@ -1,3 +1,6 @@
+1.16:
+ * Don't add the \bvidxpgformat in the .idx file if defined as empty.
+
1.15:
* Correct indexing for book without chapter. Thanks to Raphaƫl Pinson.
diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf
index b19408cc9ba..a78b4f83a4d 100644
--- a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf
+++ b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bibleref/makefile b/Master/texmf-dist/doc/latex/bibleref/makefile
index cc1f8fb7989..5ff9b224dc8 100644
--- a/Master/texmf-dist/doc/latex/bibleref/makefile
+++ b/Master/texmf-dist/doc/latex/bibleref/makefile
@@ -1,11 +1,11 @@
-all:bibleref.pdf
+all:bibleref.pdf bibleref.sty
rm -rf bibleref
mkdir bibleref
mkdir bibleref/samples
latexmk sample*tex
ln sample*tex bibleref/samples
ln sample*pdf bibleref/samples
- ln CHANGES *ins *dtx bibleref.pdf README makefile bibleref
+ ln CHANGES *ins *ist *dtx bibleref.pdf README makefile bibleref
@$(RM) ../bibleref.zip
zip -r ../bibleref.zip bibleref
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 978f71b311c..0b4cf632291 100644
--- a/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf
+++ b/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf
Binary files 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 c9de7954b1f..374de78b11a 100644
--- a/Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdf
+++ b/Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdf
Binary files 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 0d09abb3bd9..aea569a029c 100644
--- a/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf
+++ b/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf b/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf
index ac16bdfc085..52d72b92315 100644
--- a/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf
+++ b/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
index 7981b709968..b7bc3c58a54 100644
--- a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
+++ b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
@@ -942,7 +942,7 @@
% Declare package
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bibleref}[2016/09/10 1.15 (NLCT and MR)]
+\ProvidesPackage{bibleref}[2016/09/27 1.16 (NLCT and MR)]
% \end{macrocode}
% Need to do some conditional stuff
% \begin{macrocode}
@@ -2184,6 +2184,7 @@ defined}{}}}
% verse.
%\changes{1.09}{2009/04/26}{replaced \cs{index} with \cs{biblerefindex}}
%\changes{1.10}{2010/04/27}{separated child entry from parent entry to improve sorting}
+%\changes{1.16}{2016/09/27}{Don't add the \cs{bvidxpgformat} in the .idx file if defined as empty}
% \begin{macrocode}
\newcommand*{\@end@@bibleverse}{%
\if@bv@idx
@@ -2193,9 +2194,14 @@ defined}{}}}
\else
\def\@bv@tmp{\@bv@mainidxentry!\@bv@chidxsort @\@bv@idxentry}%
\fi
- \@do@biblerefindex
- {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}%
-% \begin{macrocode}
+ \edef\@bv@tmpc{\@bv@idxpgformat}%\@bv@tmpa and \@bv@tmpb are tokens
+ \ifx\@empty\@bv@tmpc%
+ \@do@biblerefindex%
+ {\@@bv@idxsort\relax @\@bv@tmp}%
+ \else%
+ \@do@biblerefindex%
+ {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}%
+ \fi%
\@bv@idxfalse
\fi
% \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
index d0650b859ca..29e41bd6167 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/10 1.15 (NLCT and MR)]
+\ProvidesPackage{bibleref}[2016/09/27 1.16 (NLCT and MR)]
\RequirePackage{ifthen}
\RequirePackage{fmtcount}
\RequirePackage{amsgen}
@@ -890,8 +890,14 @@ defined}{}}}
\else
\def\@bv@tmp{\@bv@mainidxentry!\@bv@chidxsort @\@bv@idxentry}%
\fi
- \@do@biblerefindex
- {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}%
+ \edef\@bv@tmpc{\@bv@idxpgformat}%\@bv@tmpa and \@bv@tmpb are tokens
+ \ifx\@empty\@bv@tmpc%
+ \@do@biblerefindex%
+ {\@@bv@idxsort\relax @\@bv@tmp}%
+ \else%
+ \@do@biblerefindex%
+ {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}%
+ \fi%
\@bv@idxfalse
\fi
\@bv@restore