biblatex-philosophy (31mar15)

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

1 files changed, 149 insertions, 67 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
index 7453b9f5373..558de1cff92 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
@@ -7,13 +7,14 @@
 %% biblatex-philosophy.dtx  (with options: `standard-bbx')
 %%   ______________________________________________________
 %%   The biblatex-philosophy package
-%%   Copyright (C) 2009-2014 Ivan Valbusa
+%%   Copyright (C) 2009-2015 Ivan Valbusa
 %%   All rights reserved
 %% 
 %%   License information appended
 %% 
 \ProvidesFile{philosophy-standard.bbx}
-    [2015/03/14 v0.9i valbusa beta]
+    [2015/03/31 v1.0 valbusa beta]
+
 
 \RequireBiber[2]
 \RequireBibliographyStyle{standard}
@@ -146,7 +147,7 @@
 \newcommand*{\annotationfont}{\footnotesize}
 \newcommand*{\libraryfont}{}
 \newcommand*{\editionfont}{%
-    \ifdefstring{\bbx@editionformat}{romanupp}
+    \ifdefstring{\bbx@editionformat}{Roman}
       {\uppercase}%
       {\ifdefstring{\bbx@editionformat}{romansc}
       {\scshape}%
@@ -173,16 +174,39 @@
 \DeclareFieldFormat{library}{\libraryfont #1}
 \DeclareFieldFormat{backrefparens}{\mkpureparens{#1}}
 \DeclareFieldFormat{pureparens}{\mkpureparens{#1}}
-\DeclareFieldFormat*{volume}{%
+
+\def\optionerror#1{%
+\ClassError{biblatex-philosophy}
+    {\MessageBreak**** Unknown value for '#1' option}
+    {\MessageBreak**** Unknown value for '#1' option}
+}
+
+\DeclareFieldFormat{volume}{%
   \bibstring{volume}~%
   \ifinteger{#1}{%
   \ifdefstring{\bbx@volumeformat}{arabic}%
     {#1}%
-    {\ifdefstring{\bbx@volumeformat}{romanupp}%
+    {\ifdefstring{\bbx@volumeformat}{Roman}%
+       {\RN{#1}}%
+       {\ifdefstring{\bbx@volumeformat}{romansc}%
+         {\textsc{\Rn{#1}}}%
+         {\ifdefstring{\bbx@volumeformat}{roman}%
+           {\Rn{#1}}{\optionerror{volumeformat}}}}}}{#1}}
+
+\DeclareFieldFormat[article]{volume}{%
+\ifdefstring{\bbx@volnumformat}{strings}
+  {\bibstring{volume}~}%
+  {}%
+  \ifinteger{#1}{%
+  \ifdefstring{\bbx@volumeformat}{arabic}%
+    {#1}%
+    {\ifdefstring{\bbx@volumeformat}{Roman}%
        {\RN{#1}}%
        {\ifdefstring{\bbx@volumeformat}{romansc}%
          {\textsc{\Rn{#1}}}%
-         {#1}}}}{#1}}
+         {\ifdefstring{\bbx@volumeformat}{roman}%
+           {\Rn{#1}}{\optionerror{volumeformat}}}}}}{#1}}
+
 \DeclareFieldFormat*{number}{%
   \ifdefstring{\bbx@volnumformat}{strings}{%
     \bibstring{number}~#1}{#1}}
@@ -194,18 +218,21 @@
   \ifinteger{#1}{%
     \ifdefstring{\bbx@editionformat}{arabic}
       {\mkbibordedition{#1}~\bibstring{edition}}
-      {\ifdefstring{\bbx@editionformat}{romanupp}%
+      {\ifdefstring{\bbx@editionformat}{Roman}%
         {\RN{#1}~\bibstring{edition}}%
         {\ifdefstring{\bbx@editionformat}{romansc}%
           {\textsc{\Rn{#1}}~\bibstring{edition}}%
-          {\mkbibordedition{#1}~\bibstring{edition}}}}}
+          {\ifdefstring{\bbx@editionformat}{roman}%
+            {\Rn{#1}~\bibstring{edition}}
+            {\optionerror{editionformat}}}}}}
     {#1}}%\isdot??
 \DeclareFieldFormat{related}{%
   \ifdefstring{\bbx@relatedformat}{parens}%
   {\mkpureparens{#1}}%
   {\ifdefstring{\bbx@relatedformat}{brackets}%
   {\mkbibbrackets{#1}}%
-  {\printtext{\addsemicolon\space}#1}}}%
+  {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {#1}{\optionerror{relatedformat}}}}}%
 \newbibmacro*{origpublisher+origlocation+origdate}{%
 \ifdefstring{\bbx@publocformat}{loccolonpub}
 {\usebibmacro{origloccolonpub}\setunit{\bibpagespunct}%
@@ -422,7 +449,9 @@
       {\usebibmacro{volnumstrings}}%
       {\ifdefstring{\bbx@volnumformat}{parens}
       {\usebibmacro{volnumparens}}%
-      {\usebibmacro{volnumdefault}}}%
+      {\ifdefstring{\bbx@volnumformat}{plain}
+      {\usebibmacro{volnumdefault}}%
+      {\optionerror{volnumformat}}}}%
   \setunit{\addcomma\space}%
   \printfield{eid}}
 
@@ -461,21 +490,24 @@
   {\usebibmacro{loccolonpub}}
     {\ifdefstring{\bbx@publocformat}{locpubyear}
     {\usebibmacro{locpubyear}}
-    {\usebibmacro{publocyear}}}}
+      {\ifdefstring{\bbx@publocformat}{publocyear}%
+      {\usebibmacro{publocyear}}{\optionerror{publocformat}}}}}
 
 \renewbibmacro*{institution+location+date}{%
 \ifdefstring{\bbx@publocformat}{loccolonpub}
   {\usebibmacro{inloccolonpub}}
     {\ifdefstring{\bbx@publocformat}{locpubyear}
     {\usebibmacro{inlocpubyear}}
-    {\usebibmacro{inpublocyear}}}}
+      {\ifdefstring{\bbx@publocformat}{publocyear}%
+      {\usebibmacro{inpublocyear}}{\optionerror{publocformat}}}}}
 
 \renewbibmacro*{organization+location+date}{%
 \ifdefstring{\bbx@publocformat}{loccolonpub}
   {\usebibmacro{orgloccolonpub}}
     {\ifdefstring{\bbx@publocformat}{locpubyear}
     {\usebibmacro{orglocpubyear}}
-    {\usebibmacro{orgpublocyear}}}}
+      {\ifdefstring{\bbx@publocformat}{publocyear}%
+      {\usebibmacro{orgpublocyear}}{\optionerror{publocformat}}}}}
 
 \newbibmacro*{library}{%
 \iftoggle{bbx:library}{%
@@ -617,8 +649,8 @@
 \iffieldundef{relatedstring}%
   {\bibstring{translationas}\space}%
   {\setunit{\bibstring{translationas}\space}}%
-  \renewcommand*{\mkpureparens}{}%
-  \renewcommand*{\mkbibbrackets}{}%
+  \renewcommand*{\mkpureparens}{\unspace\addsemicolon\space}%horrible trick
+  \renewcommand*{\mkbibbrackets}{\unspace\addsemicolon\space}%horrible trick
   \relatedcite{\thefield{related}}}
  \DeclareBibliographyDriver{article}{%
   \usebibmacro{bibindex}%
@@ -649,10 +681,12 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate:article-inbook-incoll}%MOD
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}{\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -697,10 +731,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -734,10 +771,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -780,10 +820,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -842,10 +885,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate:article-inbook-incoll}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -902,10 +948,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate:article-inbook-incoll}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -964,10 +1013,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate:article-inbook-incoll}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1011,10 +1063,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1046,10 +1101,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1083,10 +1141,13 @@
   \usebibmacro{url+urldate}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1121,10 +1182,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1150,10 +1214,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1198,10 +1265,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1239,10 +1309,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1276,10 +1349,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1307,10 +1383,13 @@
     {}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1482,10 +1561,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate:juris}%
-  \setunit{\addsemicolon\space}\newblock
+  \newblock
   \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
     {}%
   \newunit\newblock
   \usebibmacro{pageref}%
@@ -1519,7 +1601,7 @@
 \DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court}
 
 %% 
-%%  Copyright 2009-2014 by Ivan Valbusa
+%%  Copyright 2009-2015 by Ivan Valbusa
 %% 
 %%  This program is provided under the terms of the
 %%  LaTeX Project Public License distributed from CTAN