biblatex-opcit-booktitle (10jun16)

git-svn-id: svn://tug.org/texlive/trunk@41338 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 28 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty b/Master/texmf-dist/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty
index 23c65dba8f0..8859aabcadb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty
@@ -15,7 +15,7 @@
 % 
 % The Current Maintainer of this work is Maïeul Rouquette
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{biblatex-opcit-booktitle}[2016/03/27 v1.3.0 Manage op. cit. when using subentry]
+\ProvidesPackage{biblatex-opcit-booktitle}[2016/06/09 v1.5.0 Manage op. cit. when using subentry]
 \RequirePackage{xpatch}
 
 \DeclareFieldFormat{bibhypertarget:crossref}{%
@@ -35,20 +35,35 @@
    {#2}%
    {#1}}
 
+
+\RequirePackage{ltxcmds}
+\newcommand{\opcit@booktitle@failpatch}[2]{%
+  \PackageError{opcit-booktitle}{Fail to patch `#1` bibmacro (#2)}{}%
+}
+
 % verbose-trad-1 and verbose-trad2
-\xpatchbibmacro{cite}%
-  {\usebibmacro{cite:full}%
-       \usebibmacro{cite:save}}%
-  {\usebibmacro{cite:test:ifrelated}}%
-  {}%
-  {}%
+\ifboolexpr{%
+  test{\ltx@iffileloaded{verbose-trad2.cbx}}%
+  or test{\ltx@iffileloaded{verbose-trad1.cbx}}%
+  }{%
+  \xpatchbibmacro{cite}%
+    {\usebibmacro{cite:full}%
+         \usebibmacro{cite:save}}%
+    {\usebibmacro{cite:test:ifrelated}}%
+    {}%
+    {\opcit@booktitle@failpatch{cite}{verbose-trad1.cbx or verbose-trad2.cbx}}%
+}%
+{}
 
 % verbose-trad3. Not that lines must be applied AFTER the previous one
-\xpatchbibmacro{cite}%
-  {\usebibmacro{cite:full}}%
-  {\usebibmacro{cite:test:ifrelated:verbose-trad3}}%
-  {}%
-  {}%
+\ltx@iffileloaded{verbose-trad3.cbx}{%
+  \xpatchbibmacro{cite}%
+    {\usebibmacro{cite:full}}%
+    {\usebibmacro{cite:test:ifrelated:verbose-trad3}}%
+    {}%
+    {\opcit@booktitle@failpatch{cite}{verbose-trad3.cbx}}%
+}{}
+
 \newbibmacro*{cite:test:ifrelated}%
       {\ifboolexpr {%
          test {\iffieldundef{crossref}}%
@@ -185,7 +200,7 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \printnames{labelname}%
-  \setunit*{\nametitledelim}%
+  \setunit*{\printdelim{nametitledelim}}%
   \usebibmacro{title}%
   \newunit
   \printlist{language}%