1 files changed, 46 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx
index b6131434506..9b8a0923176 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx
@@ -6,8 +6,9 @@
 %%
 %% biblatex-archaeology.dtx  (with options: `verbosetrad2noteCBX,verbosesharedCBX')
 %% 
+
 \ProvidesFile{verbose-trad2note-archaeology.cbx}
-[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+[2018/11/20 v2.1 biblatex-archaeology citation style (IB)]
 \def\archaeocitestyletitle{\blxarch@style@vttwo}
 \RequireCitationStyle{verbose-trad2}
 
@@ -34,7 +35,7 @@
     {\printnames{labelname}}%
   \ifsingletitle
     {}
-    {\iftoggle{archbool:uselabeltitle}{%
+    {\ifuselabeltitle{%
         \setunit*{\printdelim{labelnamepunct}}%
         \printfield[title]{labeltitle}}%
         {}}%
@@ -101,9 +102,20 @@
             {\setcounter{blxarch:\thefield{entrykey}}{\value{footnote}}}
             {}}
         {\newcounter{blxarch:\thefield{entrykey}}%
-        \setcounter{blxarch:\thefield{entrykey}}{\value{footnote}}}%
+         \setcounter{blxarch:\thefield{entrykey}}{\value{footnote}}}%
     \csxdef{cbx@f@\thefield{entrykey}}{\the\value{instcount}}%
-    \label{cbx@\the\value{instcount}}}
+    \label{cbx@\the\value{instcount}}
+   \edef\blxarch@ult@key@count{blxarch:ult:\therefsection:\thefield{namehash}:\the\value{footnote}}%
+   \ifltxcounter{\blxarch@ult@key@count}%
+        {\stepcounter{\blxarch@ult@key@count}}
+        {\newcounter{\blxarch@ult@key@count}%
+         \setcounter{\blxarch@ult@key@count}{1}}%
+   \edef\blxarch@ult@hash@count{blxarch:ult:\thefield{entrykey}:\the\value{footnote}:\therefsection}%
+   \ifltxcounter{\blxarch@ult@hash@count}%
+        {\stepcounter{\blxarch@ult@hash@count}}
+        {\newcounter{\blxarch@ult@hash@count}%
+         \setcounter{\blxarch@ult@hash@count}{1}}%
+}
 \renewcommand{\ifseenote}[2]{%
     \ifboolexpr{
         test {\iffootnote}
@@ -122,10 +134,15 @@
         }
         {#2}%
 }
-\DeclareDataInheritance
-{mvbook,book,collection,mvcollection,proceedings,mvproceedings,reference,mvreference}
-{inbook,bookinbook,suppbook,incollection,suppcollection,inproceedings,inreference}{%
-  \noinherit{options}
+\newcommand{\ifuselabeltitle}[2]{%
+    \edef\blxarch@ult@key@if{blxarch:ult:\thefield{entrykey}:\the\value{blxarch:\thefield{entrykey}}:\therefsection}%
+    \edef\blxarch@ult@hash@if{blxarch:ult:\therefsection:\thefield{namehash}:\the\value{blxarch:\thefield{entrykey}}}%
+    \ifltxcounter{\blxarch@ult@key@if}
+        {\ifnumgreater{\value{\blxarch@ult@hash@if}}{\value{\blxarch@ult@key@if}}
+            {#1}
+            {\iftoggle{archbool:uselabeltitle}{#1}{#2}}%
+        }
+        {\iftoggle{archbool:uselabeltitle}{#1}{#2}}%
 }
 \providebibmacro*{cite:short}{}
 \renewbibmacro*{cite:short}{%
@@ -135,33 +152,33 @@
     \iftoggle{archbool:citeshortin}
         {\ifboolexpr{
             not test {\iffieldundef{journaltitle}}
-or
-( not test {\ifshortform{false}}
-  and
-  not test {\iffieldundef{shortform}}
-)
- }
- {\usebibmacro{cite:short:in}}
- {\printfield[citetitle]{labeltitle}}%
+            or
+            ( not test {\ifshortform{false}}
+              and
+              not test {\iffieldundef{shortform}}
+            )
+         }
+         {\usebibmacro{cite:short:in}}
+         {\printfield[citetitle]{labeltitle}}%
         }
         {\printfield[citetitle]{labeltitle}}}%
 }
 \newbibmacro*{cite:short:in}{%
-\savebibmacro{extendeddate}%
-\renewbibmacro*{extendeddate}[2]{}%
-\iffieldundef{journaltitle}
-{\iffieldundef{shortform}
-{\printfield[citetitle]{labeltitle}}
-{\usebibmacro{in:}%
- \printfield{shortform}%
+    \savebibmacro{extendeddate}%
+    \renewbibmacro*{extendeddate}[2]{}%
+    \iffieldundef{journaltitle}
+        {\iffieldundef{shortform}
+            {\printfield[citetitle]{labeltitle}}
+            {\usebibmacro{in:}%
+             \printfield{shortform}%
              \setunit{\addspace}%
              \printfield[shortformvolume]{volume}%
- \setunit{\addspace}%
- \usebibmacro{bibliographydate}%
-}
-}
-{\usebibmacro{journal+issuetitle}}%
-\restorebibmacro{extendeddate}%
+             \setunit{\addspace}%
+             \usebibmacro{bibliographydate}%
+            }
+        }
+        {\usebibmacro{journal+issuetitle}}%
+    \restorebibmacro{extendeddate}%
 }
 \endinput
 %%