biblatex-philosophy (29nov17)

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

1 files changed, 128 insertions, 114 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
index b554f41a52a..56b5b77f1b2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -13,7 +13,7 @@
 %% License information appended
 %% 
 \ProvidesFile{philosophy-classic.bbx}
-[2017/10/05 v1.9.7 A set of styles for biblatex]
+[2017/11/29 v1.9.8 A set of styles for biblatex]
 
 
 \RequireBibliographyStyle{authoryear}
@@ -30,141 +30,155 @@
 \define@key{blx@bib2}{nodate}[true]{%
   \ifstrequal{#1}{false}{\togglefalse{bbx:nodate}}{}}%
 \def\bbx@opt@mergedate@maximum{%
-  \renewbibmacro*{date+extrayear}{%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-    {\usebibmacro{bbx:nodate}}
-    {\postsepyear{%
-          \printfield{issue}%
-           \setunit*{\addspace}%
-            \iffieldsequal{year}{labelyear}
-             {\printlabeldateextra}%
-             {\printfield{labelyear}%
-             \printfield{extrayear}}%
-          }}}%
-  \renewbibmacro*{date}{}%
-  \renewbibmacro*{issue+date}{}}
-
-\def\bbx@opt@mergedate@compact{%
-  \renewbibmacro*{date+extrayear}{%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-    {\usebibmacro{bbx:nodate}}
-    {\postsepyear{%
-           \iffieldsequal{year}{labelyear}
-           {\printlabeldateextra}%
-           {\printfield{labelyear}%
-            \printfield{extrayear}}%
-           }}}%
-  \renewbibmacro*{date}{}%
+  \renewbibmacro*{date+extradate}{%
+    \iffieldundef{labelyear}
+      {\usebibmacro{bbx:nodate}}
+      {\postsepyear{%
+         \iflabeldateisdate
+           {\printfield{issue}%
+            \setunit*{\addspace}%
+            \printdateextra}
+           {\printlabeldateextra}}}}%
+  \renewbibmacro*{date}{%
+    \iflabeldateisdate
+      {}
+      {\printdate}}%
   \renewbibmacro*{issue+date}{%
-    \iffieldundef{issue}
-    {}
+    \iflabeldateisdate
+      {}
       {\ifdefstring{\bbx@volnumformat}{parens}%
       {\printtext{%
-        \printfield{issue}%
-        \printdate}}%
+         \printfield{issue}%
+         \setunit*{\addspace}%
+         \printdate}}
       {\printtext[pureparens]{%
-        \printfield{issue}}}}%
-      \newunit}}
+         \printfield{issue}%
+         \setunit*{\addspace}%
+         \printdate}}}}}
+
+\def\bbx@opt@mergedate@compact{%
+  \renewbibmacro*{date+extradate}{%
+    \iffieldundef{labelyear}
+      {\usebibmacro{bbx:nodate}}
+      {\postsepyear{%
+         \iflabeldateisdate
+           {\printdateextra}
+           {\printlabeldateextra}}}}%
+  \renewbibmacro*{date}{%
+    \iflabeldateisdate
+      {}
+      {\printdate}}%
+  \renewbibmacro*{issue+date}{%
+    \ifboolexpr{not test {\iffieldundef{issue}}
+                or not test {\iflabeldateisdate}}
+      {\ifdefstring{\bbx@volnumformat}{parens}%
+         {\printtext{%
+         \printfield{issue}%
+         \setunit*{\addspace}%
+         \iflabeldateisdate
+           {}
+           {\printdate}%
+        }}%
+        {\printtext[pureparens]{%
+         \printfield{issue}%
+         \setunit*{\addspace}%
+         \iflabeldateisdate
+           {}
+           {\printdate}%
+        }}}
+      {}%
+    \newunit}}
+
 
 \def\bbx@opt@mergedate@basic{%
-  \renewbibmacro*{date+extrayear}{%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-    {\usebibmacro{bbx:nodate}}
-    {\postsepyear{%
-         \printfield{labelyear}%
-         \printfield{extrayear}%
-        }}}%
+  \renewbibmacro*{date+extradate}{%
+    \iffieldundef{labelyear}
+      {\usebibmacro{bbx:nodate}}
+      {\postsepyear{\printlabeldateextra}}}%
   \renewbibmacro*{date}{%
-    \iffieldundef{month}
-    {}
-    {\printdate}}%
+    \ifboolexpr{
+      test {\iflabeldateisdate}
+      and
+      not test {\ifdateshavedifferentprecision{label}{}}
+    }
+      {}
+      {\printdate}}%
   \renewbibmacro*{issue+date}{%
     \ifboolexpr{
-      test {\iffieldundef{issue}}
+      test {\iflabeldateisdate}
+      and
+      not test {\ifdateshavedifferentprecision{label}{}}
       and
-      test {\iffieldundef{month}}
+      test {\iffieldundef{issue}}
     }
-    {}
+      {}
       {\ifdefstring{\bbx@volnumformat}{parens}%
       {\printtext{%
-        \printfield{issue}\setunit*{\addspace}%
-        \printdate}}%
-      {\printtext[pureparens]{%
-        \printfield{issue}\setunit*{\addspace}%
-        \printdate}}}%
+         \printfield{issue}%
+         \setunit*{\addspace}%
+         \printdate}}
+      {\printtext[parens]{%
+         \printfield{issue}%
+         \setunit*{\addspace}%
+         \printdate}}}%
     \newunit}}
 
+
 \def\bbx@opt@mergedate@minimum{%
-  \renewbibmacro*{date+extrayear}{%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-    {\usebibmacro{bbx:nodate}}
-    {\postsepyear{%
-         \printfield{labelyear}%
-         \printfield{extrayear}%
-        }}}%
+  \renewbibmacro*{date+extradate}{%
+    \iffieldundef{labelyear}
+      {\usebibmacro{bbx:nodate}}
+      {\postsepyear{\printlabeldateextra}}}%
   \renewbibmacro*{date}{%
     \ifboolexpr{
-      test {\iffieldundef{month}}
+      test {\iflabeldateisdate}
       and
-      test {\iffieldundef{extrayear}}
+      not test {\ifdateshavedifferentprecision{label}{}}
+      and
+      test {\iffieldundef{extradate}}
     }
-    {}
-    {\printdate}}%
+      {}
+      {\printdate}}%
   \renewbibmacro*{issue+date}{%
     \ifboolexpr{
-      test {\iffieldundef{issue}}
+      test {\iflabeldateisdate}
       and
-      test {\iffieldundef{month}}
+      not test {\ifdateshavedifferentprecision{label}{}}
       and
-      test {\iffieldundef{extrayear}}
+      test {\iffieldundef{extradate}}
+      and
+      test {\iffieldundef{issue}}
     }
-    {}
+      {}
       {\ifdefstring{\bbx@volnumformat}{parens}%
       {\printtext{%
-        \printfield{issue}\setunit*{\addspace}%
-        \printdate}}%
+         \printfield{issue}%
+         \setunit*{\addspace}%
+         \printdate}}
       {\printtext[pureparens]{%
-        \printfield{issue}\setunit*{\addspace}%
-        \printdate}}}%
+         \printfield{issue}%
+         \setunit*{\addspace}%
+         \printdate}}}%
     \newunit}}
 
+
 \def\bbx@opt@mergedate@false{%
-  \renewbibmacro*{date+extrayear}{%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-    {\usebibmacro{bbx:nodate}}
-    {\postsepyear{%
-                \printfield{labelyear}%
-                \printfield{extrayear}%
-            }}}%
+  \renewbibmacro*{date+extradate}{%
+    \iffieldundef{labelyear}
+      {\usebibmacro{bbx:nodate}}
+      {\postsepyear{\printlabeldateextra}}}%
   \renewbibmacro*{date}{\printdate}%
   \renewbibmacro*{issue+date}{%
-      {\ifdefstring{\bbx@volnumformat}{parens}%
-      {\printtext{%
-        \printfield{issue}\setunit*{\addspace}%
-        \printdate}}%
-      {\printtext[pureparens]{%
-        \printfield{issue}\setunit*{\addspace}%
-        \printdate}}}}}
+    \ifdefstring{\bbx@volnumformat}{parens}%
+    {\printtext{%
+      \printfield{issue}%
+      \setunit*{\addspace}%
+      \usebibmacro{date}}}
+    {\printtext[pureparens]{%
+      \printfield{issue}%
+      \setunit*{\addspace}%
+      \usebibmacro{date}}}%
+    \newunit}}
 \ExecuteBibliographyOptions{%
   nodate      = true,
   mergedate   = basic,
@@ -187,11 +201,11 @@
 \renewbibmacro*{commarelateddate}{%
   \setunit*{\addcomma\space}%
   \printdate}%
-\savebibmacro{date+extrayear}
-\renewbibmacro*{date+extrayear}{}
+\savebibmacro{date+extradate}
+\renewbibmacro*{date+extradate}{}
 \DeclareCiteCommand{\bbx@crossref@inbook}
   {\renewcommand*{\postsepyear}{\printtext[parens]}%
-   \restorebibmacro{date+extrayear}}%
+   \restorebibmacro{date+extradate}}%
   {\iffieldundef{shorthand}{%
   \usebibmacro{citeindex}%
   \ifuseeditor{%
@@ -200,13 +214,13 @@
       {\printnames[][-\value{minnamesincross}]{labelname}}}%
      {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \usebibmacro{date+extrayear}}%
+    \usebibmacro{date+extradate}}%
     {\usebibmacro{cite:shorthand}}}%
   {}%
   {}%
 \DeclareCiteCommand{\bbx@crossref@incollection}%
   {\renewcommand*{\postsepyear}{\printtext[parens]}%
-   \restorebibmacro{date+extrayear}}%
+   \restorebibmacro{date+extradate}}%
   {\iffieldundef{shorthand}{%
   \usebibmacro{citeindex}%
   \ifuseeditor{%
@@ -215,7 +229,7 @@
       {\printnames[][-\value{minnamesincross}]{labelname}}}%
      {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \usebibmacro{date+extrayear}}%
+    \usebibmacro{date+extradate}}%
     {\usebibmacro{cite:shorthand}}}%
   {}%
   {}%
@@ -263,7 +277,7 @@
     {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
      \setunit*{\printdelim{nonameyeardelim}}}%
-  \usebibmacro{date+extrayear}}
+  \usebibmacro{date+extradate}}
 
 \renewbibmacro*{bbx:editor}[1]{%
   \ifboolexpr{
@@ -282,7 +296,7 @@
     {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
      \setunit*{\printdelim{nonameyeardelim}}}%
-  \usebibmacro{date+extrayear}}
+  \usebibmacro{date+extradate}}
 
 \renewbibmacro*{bbx:translator}[1]{%
   \ifboolexpr{
@@ -301,7 +315,7 @@
     {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
      \setunit*{\printdelim{nonameyeardelim}}}%
-  \usebibmacro{date+extrayear}}
+  \usebibmacro{date+extradate}}
 \renewbibmacro*{labeltitle}{%
   \iffieldundef{label}
     {\iffieldundef{shorttitle}
@@ -318,7 +332,7 @@
       {\printnames[][-\value{minnamesincross}]{labelname}}}%
      {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
+    \printtext[bibhyperref]{\usebibmacro{date+extradate}}}%
   {}%
   {}%
 \DeclareCiteCommand{\bbx@crossref@incollection}%
@@ -330,7 +344,7 @@
       {\printnames[][-\value{minnamesincross}]{labelname}}}%
      {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
+    \printtext[bibhyperref]{\usebibmacro{date+extradate}}}%
   {}%
   {}%
 %%