texlive[48306] Master/texmf-dist: bibleref (29jul18)
commits+karl at tug.org
commits+karl at tug.org
Sun Jul 29 23:15:15 CEST 2018
Revision: 48306
http://tug.org/svn/texlive?view=revision&revision=48306
Author: karl
Date: 2018-07-29 23:15:15 +0200 (Sun, 29 Jul 2018)
Log Message:
-----------
bibleref (29jul18)
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-29 21:14:59 UTC (rev 48305)
+++ trunk/Master/texmf-dist/doc/latex/bibleref/CHANGES 2018-07-29 21:15:15 UTC (rev 48306)
@@ -1,3 +1,6 @@
+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).
1.18:
* Fix bug with indexing when using non unicode engine.
1.17:
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-29 21:14:59 UTC (rev 48305)
+++ trunk/Master/texmf-dist/source/latex/bibleref/bibleref.dtx 2018-07-29 21:15:15 UTC (rev 48306)
@@ -973,7 +973,7 @@
% Declare package
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bibleref}[2018/07/21 1.18 (NLCT and MR)]
+\ProvidesPackage{bibleref}[2018/07/29 1.19 (NLCT and MR)]
% \end{macrocode}
% Need to do some conditional stuff
% \begin{macrocode}
@@ -2081,12 +2081,13 @@
%\end{macro}
%
%\begin{macro}{\bibleverse}
+%\changes{v1.19}{2018/07/29}{\cs{bibleverse} is now robust}
%\begin{definition}
%\cs{bibleverse}\marg{name}
%\end{definition}
% Displays references using current style.
% \begin{macrocode}
-\newcommand*{\bibleverse}{%
+\DeclareRobustCommand*{\bibleverse}{%
\let\@bv at restore\relax
\@bible at verse
}
@@ -2097,6 +2098,11 @@
% \begin{macrocode}
\newcommand*{\@bible at verse}[1]{%
% \end{macrocode}
+% Makes \verb+:+ normal character (babel-french).
+%\changes{1.19}{2018/07/29}{Add \cs{shorthandoff}\verb+:+ (for babel)}
+% \begin{macrocode}
+ \shorthandoff:%
+% \end{macrocode}
% This looks for a command called
% \cs{br@}\meta{name} (defined earlier).
% After the book title, it then checks
@@ -2283,8 +2289,10 @@
\fi
% \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)}
% \begin{macrocode}
\@bv at restore
+\shorthandon:%
}
% \end{macrocode}
%\end{macro}
@@ -2426,12 +2434,13 @@
%\end{macro}
%
%\begin{macro}{\ibibleverse}
+%\changes{v1.19}{2018/07/29}{\cs{ibibleverse} is now robust}
% This is like \cs{bibleverse},
% but also adds an index entry. The optional argument indicates
% how to format the page number (without the preceding backslash)
% e.g. \verb|\ibibleref[textit]{Romans}|.
% \begin{macrocode}
-\newcommand*{\ibibleverse}[1][\bvidxpgformat]{%
+\DeclareRobustCommand*{\ibibleverse}[1][\bvidxpgformat]{%
\def\@bv at idxpgformat{#1}%
\@bv at idxtrue\def\@bv at idxentry{}\bibleverse}
% \end{macrocode}
@@ -2487,6 +2496,15 @@
\newcommand*{\bvidxpgformat}{textrm}
% \end{macrocode}
%\end{macro}
+% Define \cs{shorthandoff} and \cs{shortandon} if babel is not loaded.
+% \begin{macrocode}
+\AtBeginDocument{%
+ \ifdefined\shorthandoff\else%
+ \let\shorthandoff\@gobble%
+ \let\shorthandon\@gobble%
+ \fi%
+}%
+% \end{macrocode}
%\iffalse
% \begin{macrocode}
%</bibleref.sty>
Modified: trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty 2018-07-29 21:14:59 UTC (rev 48305)
+++ trunk/Master/texmf-dist/tex/latex/bibleref/bibleref.sty 2018-07-29 21:15:15 UTC (rev 48306)
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bibleref}[2018/07/21 1.18 (NLCT and MR)]
+\ProvidesPackage{bibleref}[2018/07/29 1.19 (NLCT and MR)]
\RequirePackage{ifthen}
\RequirePackage{fmtcount}
\RequirePackage{amsgen}
@@ -792,11 +792,12 @@
\renewcommand*{\@bv at category}{#2}%
\renewcommand*{\@bv at categorysort}{#1}%
}
-\newcommand*{\bibleverse}{%
+\DeclareRobustCommand*{\bibleverse}{%
\let\@bv at restore\relax
\@bible at verse
}
\newcommand*{\@bible at verse}[1]{%
+ \shorthandoff:%
\@ifundefined{br@#1}%
{%
\PackageError{bibleref}{Unknown book '#1'}{}%
@@ -925,6 +926,7 @@
\@bv at idxfalse
\fi
\@bv at restore
+\shorthandon:%
}
\newcommand*{\@do at biblerefindex}[1]{%
\ifx\@bv at category\@empty
@@ -994,7 +996,7 @@
\xdef\@@bv at idxsort{#1\relax}%
}%
\fi}
-\newcommand*{\ibibleverse}[1][\bvidxpgformat]{%
+\DeclareRobustCommand*{\ibibleverse}[1][\bvidxpgformat]{%
\def\@bv at idxpgformat{#1}%
\@bv at idxtrue\def\@bv at idxentry{}\bibleverse}
\newcommand*{\ibiblechvs}[1][\bvidxpgformat]{%
@@ -1028,6 +1030,12 @@
\@bv at idxtrue\def\@bv at idxentry{}\@bible at verse
}
\newcommand*{\bvidxpgformat}{textrm}
+\AtBeginDocument{%
+ \ifdefined\shorthandoff\else%
+ \let\shorthandoff\@gobble%
+ \let\shorthandon\@gobble%
+ \fi%
+}%
\endinput
%%
%% End of file `bibleref.sty'.
More information about the tex-live-commits
mailing list