Commit 6a8cb02a authored by Maïeul Rouquette's avatar Maïeul Rouquette
Browse files

Merge branch 'pre1.19'

parents 67257b51 e1406717
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:
......
......@@ -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 @@ defined}{}}}
%\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@restore\relax
\@bible@verse
}
......@@ -2097,6 +2098,11 @@ defined}{}}}
% \begin{macrocode}
\newcommand*{\@bible@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 @@ defined}{}}}
\fi
% \end{macrocode}
%\changes{1.14}{2011/01/19}{added \cs{@bv@restore}}
%\changes{1.19}{2018/07/29}{Add \cs{shorthandon}\verb+:+ (for babel)}
% \begin{macrocode}
\@bv@restore
\shorthandon:%
}
% \end{macrocode}
%\end{macro}
......@@ -2426,12 +2434,13 @@ defined}{}}}
%\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@idxpgformat{#1}%
\@bv@idxtrue\def\@bv@idxentry{}\bibleverse}
% \end{macrocode}
......@@ -2487,6 +2496,15 @@ defined}{}}}
\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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment