summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-07-29 21:15:15 +0000
committerKarl Berry <karl@freefriends.org>2018-07-29 21:15:15 +0000
commit5411eaee4bc1fcb7c8b6c7bd8099f04a4406dc0a (patch)
treef4c015ea8d8cbb22fd61b7fc3c72a5ef97176898
parent29c87f6f8d04ab90bd8fc5eac22d5fc1055a92c7 (diff)
bibleref (29jul18)
git-svn-id: svn://tug.org/texlive/trunk@48306 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/CHANGES3
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/bibleref.pdfbin264320 -> 264207 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdfbin12430 -> 12428 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample-indextools.pdfbin9543 -> 9544 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdfbin19599 -> 19734 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bibleref/samples/sample.pdfbin39746 -> 39891 bytes
-rw-r--r--Master/texmf-dist/source/latex/bibleref/bibleref.dtx24
-rw-r--r--Master/texmf-dist/tex/latex/bibleref/bibleref.sty14
8 files changed, 35 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/bibleref/CHANGES b/Master/texmf-dist/doc/latex/bibleref/CHANGES
index 25f6e7a1871..6038f5eacd0 100644
--- a/Master/texmf-dist/doc/latex/bibleref/CHANGES
+++ b/Master/texmf-dist/doc/latex/bibleref/CHANGES
@@ -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:
diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf
index 61e10fea4dd..7bd752584e0 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 80bdc7662d7..8c3f2042af7 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 70e4e5f7c7a..6c925efcb23 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 d63e8fd41f1..38bf9097e1d 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 f0171839960..d6f38313b83 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 6f2304ddbc8..d64869837ec 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/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>
diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
index 5c2bddb91fa..70b619745b6 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/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 @@ defined}{}}}
\renewcommand*{\@bv@category}{#2}%
\renewcommand*{\@bv@categorysort}{#1}%
}
-\newcommand*{\bibleverse}{%
+\DeclareRobustCommand*{\bibleverse}{%
\let\@bv@restore\relax
\@bible@verse
}
\newcommand*{\@bible@verse}[1]{%
+ \shorthandoff:%
\@ifundefined{br@#1}%
{%
\PackageError{bibleref}{Unknown book '#1'}{}%
@@ -925,6 +926,7 @@ defined}{}}}
\@bv@idxfalse
\fi
\@bv@restore
+\shorthandon:%
}
\newcommand*{\@do@biblerefindex}[1]{%
\ifx\@bv@category\@empty
@@ -994,7 +996,7 @@ defined}{}}}
\xdef\@@bv@idxsort{#1\relax}%
}%
\fi}
-\newcommand*{\ibibleverse}[1][\bvidxpgformat]{%
+\DeclareRobustCommand*{\ibibleverse}[1][\bvidxpgformat]{%
\def\@bv@idxpgformat{#1}%
\@bv@idxtrue\def\@bv@idxentry{}\bibleverse}
\newcommand*{\ibiblechvs}[1][\bvidxpgformat]{%
@@ -1028,6 +1030,12 @@ defined}{}}}
\@bv@idxtrue\def\@bv@idxentry{}\@bible@verse
}
\newcommand*{\bvidxpgformat}{textrm}
+\AtBeginDocument{%
+ \ifdefined\shorthandoff\else%
+ \let\shorthandoff\@gobble%
+ \let\shorthandon\@gobble%
+ \fi%
+}%
\endinput
%%
%% End of file `bibleref.sty'.