texlive[42162] Master/texmf-dist: bibleref (27sep16)

[commits+karl at tug.org]

Revision: 42162
          http://tug.org/svn/texlive?view=revision&revision=42162
Author:   karl
Date:     2016-09-27 23:09:17 +0200 (Tue, 27 Sep 2016)
Log Message:
-----------
bibleref (27sep16)

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/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.sty

Modified: trunk/Master/texmf-dist/doc/latex/bibleref/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bibleref/CHANGES	2016-09-27 21:08:42 UTC (rev 42161)
+++ trunk/Master/texmf-dist/doc/latex/bibleref/CHANGES	2016-09-27 21:09:17 UTC (rev 42162)
@@ -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. 
 

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	2016-09-27 21:08:42 UTC (rev 42161)
+++ trunk/Master/texmf-dist/doc/latex/bibleref/makefile	2016-09-27 21:09:17 UTC (rev 42162)
@@ -1,4 +1,4 @@
-all:bibleref.pdf
+all:bibleref.pdf bibleref.sty
 	rm -rf bibleref
 	mkdir bibleref
 	mkdir bibleref/samples
@@ -5,7 +5,7 @@
 	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
 

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	2016-09-27 21:08:42 UTC (rev 42161)
+++ trunk/Master/texmf-dist/source/latex/bibleref/bibleref.dtx	2016-09-27 21:09:17 UTC (rev 42162)
@@ -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 @@
 % 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 at bv@idx
@@ -2193,9 +2194,14 @@
   \else
     \def\@bv at tmp{\@bv at mainidxentry!\@bv at chidxsort @\@bv at idxentry}%
   \fi
-  \@do at biblerefindex
-      {\@@bv at idxsort\relax @\@bv at tmp|\@bv at idxpgformat}%
-%    \begin{macrocode}
+  \edef\@bv at tmpc{\@bv at idxpgformat}%\@bv at tmpa and \@bv at tmpb are tokens
+  \ifx\@empty\@bv at tmpc%
+    \@do at biblerefindex%
+        {\@@bv at idxsort\relax @\@bv at tmp}%    
+  \else%
+      \@do at biblerefindex%
+          {\@@bv at idxsort\relax @\@bv at tmp|\@bv at idxpgformat}%
+  \fi%
   \@bv at idxfalse
 \fi
 %    \end{macrocode}

Modified: trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty	2016-09-27 21:08:42 UTC (rev 42161)
+++ trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty	2016-09-27 21:09:17 UTC (rev 42162)
@@ -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 @@
   \else
     \def\@bv at tmp{\@bv at mainidxentry!\@bv at chidxsort @\@bv at idxentry}%
   \fi
-  \@do at biblerefindex
-      {\@@bv at idxsort\relax @\@bv at tmp|\@bv at idxpgformat}%
+  \edef\@bv at tmpc{\@bv at idxpgformat}%\@bv at tmpa and \@bv at tmpb are tokens
+  \ifx\@empty\@bv at tmpc%
+    \@do at biblerefindex%
+        {\@@bv at idxsort\relax @\@bv at tmp}%
+  \else%
+      \@do at biblerefindex%
+          {\@@bv at idxsort\relax @\@bv at tmp|\@bv at idxpgformat}%
+  \fi%
   \@bv at idxfalse
 \fi
 \@bv at restore