texlive[48319] Master/texmf-dist: bibleref (31jul18)
commits+karl at tug.org
commits+karl at tug.org
Tue Jul 31 22:53:48 CEST 2018
Revision: 48319
http://tug.org/svn/texlive?view=revision&revision=48319
Author: karl
Date: 2018-07-31 22:53:48 +0200 (Tue, 31 Jul 2018)
Log Message:
-----------
bibleref (31jul18)
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/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 2018-07-31 20:52:36 UTC (rev 48318)
+++ trunk/Master/texmf-dist/doc/latex/bibleref/CHANGES 2018-07-31 20:53:48 UTC (rev 48319)
@@ -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).
Modified: trunk/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf
===================================================================
(Binary files differ)
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 2018-07-31 20:52:36 UTC (rev 48318)
+++ trunk/Master/texmf-dist/source/latex/bibleref/bibleref.dtx 2018-07-31 20:53:48 UTC (rev 48319)
@@ -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 @@
% \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 at ifunset{bbl at active@\string:}%
+ {}%
+ {\shorthandoff:}%
% \end{macrocode}
% This looks for a command called
% \cs{br@}\meta{name} (defined earlier).
@@ -2290,9 +2293,12 @@
% \end{macrocode}
%\changes{1.14}{2011/01/19}{added \cs{@bv at 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 at restore
-\shorthandon:%
+\bbl at ifunset{bbl at active@\string:}%
+ {}%
+ {\shorthandon:}%
}
% \end{macrocode}
%\end{macro}
@@ -2496,12 +2502,11 @@
\newcommand*{\bvidxpgformat}{textrm}
% \end{macrocode}
%\end{macro}
-% Define \cs{shorthandoff} and \cs{shortandon} if babel is not loaded.
+% Define \cs{bbl at ifunset} if babel is not loaded.
% \begin{macrocode}
\AtBeginDocument{%
- \ifdefined\shorthandoff\else%
- \let\shorthandoff\@gobble%
- \let\shorthandon\@gobble%
+ \ifdefined\bbl at ifunset\else%
+ \def\bbl at ifunset#1#2#3{}%
\fi%
}%
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty 2018-07-31 20:52:36 UTC (rev 48318)
+++ trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty 2018-07-31 20:53:48 UTC (rev 48319)
@@ -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 @@
\@bible at verse
}
\newcommand*{\@bible at verse}[1]{%
- \shorthandoff:%
+ \bbl at ifunset{bbl at active@\string:}%
+ {}%
+ {\shorthandoff:}%
\@ifundefined{br@#1}%
{%
\PackageError{bibleref}{Unknown book '#1'}{}%
@@ -926,7 +928,9 @@
\@bv at idxfalse
\fi
\@bv at restore
-\shorthandon:%
+\bbl at ifunset{bbl at active@\string:}%
+ {}%
+ {\shorthandon:}%
}
\newcommand*{\@do at biblerefindex}[1]{%
\ifx\@bv at category\@empty
@@ -1031,9 +1035,8 @@
}
\newcommand*{\bvidxpgformat}{textrm}
\AtBeginDocument{%
- \ifdefined\shorthandoff\else%
- \let\shorthandoff\@gobble%
- \let\shorthandon\@gobble%
+ \ifdefined\bbl at ifunset\else%
+ \def\bbl at ifunset#1#2#3{}%
\fi%
}%
\endinput
More information about the tex-live-commits
mailing list