summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/CHANGES2
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/bibleref.pdfbin264207 -> 265924 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdfbin12428 -> 12427 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdfbin9544 -> 9544 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdfbin19734 -> 19764 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample.pdfbin39891 -> 39911 bytes
-rw-r--r--Master/texmf-dist/source/latex/bibleref/bibleref.dtx19
-rw-r--r--Master/texmf-dist/tex/latex/bibleref/bibleref.sty15
8 files changed, 23 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/latex/bibleref/CHANGES b/Master/texmf-dist/doc/latex/bibleref/CHANGES
index 6038f5eacd0..28aece2a1ef 100644
--- a/Master/texmf-dist/doc/latex/bibleref/CHANGES
+++ b/Master/texmf-dist/doc/latex/bibleref/CHANGES
@@ -1,3 +1,5 @@
+1.20:
+ * Before switching off `:` shorthand, test if it is a shorthand.
1.19:
* \bibleverse and \ibibleverse are now robust, and so can be used in section title, caption, etc.
* Fix bug when using french and frenchb option of babel with pdflatex (because `:` character is active with this configuration).
diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf
index 7bd752584e0..41c689bd737 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/samples/sample-categories.pdf b/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf
index 8c3f2042af7..d17eaa1ed78 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 6c925efcb23..1b2fca35d27 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 38bf9097e1d..fa2494e13a7 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 d6f38313b83..80274e11dd3 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 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}
diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
index 70b619745b6..92e35ab202a 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}[2018/07/29 1.19 (NLCT and MR)]
+\ProvidesPackage{bibleref}[2018/07/31 1.20 (NLCT and MR)]
\RequirePackage{ifthen}
\RequirePackage{fmtcount}
\RequirePackage{amsgen}
@@ -797,7 +797,9 @@ defined}{}}}
\@bible@verse
}
\newcommand*{\@bible@verse}[1]{%
- \shorthandoff:%
+ \bbl@ifunset{bbl@active@\string:}%
+ {}%
+ {\shorthandoff:}%
\@ifundefined{br@#1}%
{%
\PackageError{bibleref}{Unknown book '#1'}{}%
@@ -926,7 +928,9 @@ defined}{}}}
\@bv@idxfalse
\fi
\@bv@restore
-\shorthandon:%
+\bbl@ifunset{bbl@active@\string:}%
+ {}%
+ {\shorthandon:}%
}
\newcommand*{\@do@biblerefindex}[1]{%
\ifx\@bv@category\@empty
@@ -1031,9 +1035,8 @@ defined}{}}}
}
\newcommand*{\bvidxpgformat}{textrm}
\AtBeginDocument{%
- \ifdefined\shorthandoff\else%
- \let\shorthandoff\@gobble%
- \let\shorthandon\@gobble%
+ \ifdefined\bbl@ifunset\else%
+ \def\bbl@ifunset#1#2#3{}%
\fi%
}%
\endinput