From 05fe4ccdb67ada03c2269390b10cb438d7d6202c Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 31 Jul 2018 20:53:48 +0000
Subject: bibleref (31jul18)

git-svn-id: svn://tug.org/texlive/trunk@48319 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/latex/bibleref/bibleref.dtx | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'Master/texmf-dist/source/latex/bibleref/bibleref.dtx')

diff --git a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
index d64869837ec..19b5ed8fc0b 100644
--- a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
+++ b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
@@ -973,7 +973,7 @@
 % Declare package
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bibleref}[2018/07/29 1.19 (NLCT and MR)]
+\ProvidesPackage{bibleref}[2018/07/31 1.20 (NLCT and MR)]
 %    \end{macrocode}
 % Need to do some conditional stuff
 %    \begin{macrocode}
@@ -2100,8 +2100,11 @@ defined}{}}}
 %    \end{macrocode}
 % Makes \verb+:+ normal character (babel-french).
 %\changes{1.19}{2018/07/29}{Add \cs{shorthandoff}\verb+:+ (for babel)}
+%\changes{1.20}{2018/07/31}{Check before using \cs{shorthandoff}\verb+:+ (for babel)}
 %    \begin{macrocode}
-  \shorthandoff:%
+  \bbl@ifunset{bbl@active@\string:}%
+    {}%  
+    {\shorthandoff:}%
 %    \end{macrocode}
 % This looks for a command called
 % \cs{br@}\meta{name} (defined earlier). 
@@ -2290,9 +2293,12 @@ defined}{}}}
 %    \end{macrocode}
 %\changes{1.14}{2011/01/19}{added \cs{@bv@restore}}
 %\changes{1.19}{2018/07/29}{Add \cs{shorthandon}\verb+:+ (for babel)}
+%\changes{1.20}{2018/07/31}{Check before using \cs{shorthandon}\verb+:+ (for babel)}
 %    \begin{macrocode}
 \@bv@restore
-\shorthandon:%
+\bbl@ifunset{bbl@active@\string:}%
+  {}%  
+  {\shorthandon:}%
 }
 %    \end{macrocode}
 %\end{macro}
@@ -2496,12 +2502,11 @@ defined}{}}}
 \newcommand*{\bvidxpgformat}{textrm}
 %    \end{macrocode}
 %\end{macro}
-% Define \cs{shorthandoff} and \cs{shortandon} if babel is not loaded.
+% Define \cs{bbl@ifunset} if babel is not loaded.
 %    \begin{macrocode}
 \AtBeginDocument{%
-  \ifdefined\shorthandoff\else%
-    \let\shorthandoff\@gobble%
-    \let\shorthandon\@gobble%
+  \ifdefined\bbl@ifunset\else%
+    \def\bbl@ifunset#1#2#3{}%
   \fi%
 }%
 %    \end{macrocode}
-- 
cgit v1.2.3

