biblatex-philosophy (19sep15)

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

1 files changed, 305 insertions, 19 deletions

diff --git a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
index d4bca3ad097..eff131fbab0 100644
--- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
+++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
@@ -98,7 +98,7 @@
 %<english-lbx>\ProvidesFile{english-philosophy.lbx}
 %<spanish-lbx>\ProvidesFile{spanish-philosophy.lbx}
 %<*standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx>
-    [2015/06/13 v1.1 valbusa beta]
+    [2015/09/19 v1.2 valbusa beta]
 %</standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx>
 %<*driver>
 \documentclass[10pt]{ltxdoc}
@@ -262,7 +262,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{3553}
+% \CheckSum{3932}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -280,7 +280,8 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \changes{v1.1}{2015/06/13}{Maintenance release.Updated documentation.}
+% \changes{v1.2}{2015/09/19}{Maintenance release. New value \opt{superscript} for \opt{editionformat} option.}
+% \changes{v1.1}{2015/06/13}{Maintenance release. Updated documentation.}
 % \changes{v1.0}{2015/03/31}{Corrected a bug in \opt{volumeformat} and \opt{volnumformat} options. Change value \opt{romanupp} to \opt{Roman} in \opt{volume format} and \opt{edition format}. Corrected bug in \opt{related format} options: now the related block is not preceded by semicolon when using values \opt{parens} and \opt{brackets} styles. §updated documentation}
 % \changes{v0.9i}{2015/03/14}{Corrected a bug with \opt{shorthandintro} option.}
 % \changes{v0.9h}{2015/01/14}{New option \opt{lowscauthors}. Corrected some bugs. Updated documentation.}
@@ -760,7 +761,7 @@
 %\end{latexcode}
 %you can restore the default format for all but \bibtype{article} entries.
 %
-%\optitem[arabic]{editionformat}{\opt{arabic}, \opt{roman}, \opt{romansc}, \opt{Roman}}
+%\optitem[arabic]{editionformat}{\opt{arabic}, \opt{roman}, \opt{romansc}, \opt{Roman}, \opt{superscript}}
 %This option provides three styles for typesetting the \bibfield{edition} field:
 %				\begin{valuelist}
 %				\item[arabic] 
@@ -771,6 +772,8 @@
 %							\ldots \emph{Book Title}, \textsc{iii} ed., \ldots 
 %					\item[Roman] 
 %							\ldots \emph{Book Title}, III ed., \ldots 
+%					\item[superscript] 
+%							\ldots \emph{Book Title}, Publisher, Location 2010\textsuperscript{3}. Available only for \sty{philosophy-verbose} style. 
 %					\end{valuelist}
 %
 %\boolitem[false]{inbeforejournal}
@@ -1332,8 +1335,13 @@
           {\textsc{\Rn{#1}}~\bibstring{edition}}%
           {\ifdefstring{\bbx@editionformat}{roman}%
             {\Rn{#1}~\bibstring{edition}}
-            {\optionerror{editionformat}}}}}}
-    {#1}}%\isdot??
+            {\ifdefstring{\bbx@editionformat}{superscript}%
+            {\ClassError{biblatex-philosophy}
+    {\MessageBreak**** Option 'editionformat=superscript' 
+    available only for philosophy-verbose style}
+    {\MessageBreak**** Option 'editionformat=superscript' 
+    available only for philosophy-verbose style}
+}{}}}}}}{#1}}%\isdot??
 \DeclareFieldFormat{related}{%
   \ifdefstring{\bbx@relatedformat}{parens}%
   {\mkpureparens{#1}}%
@@ -1776,14 +1784,22 @@
   \togglefalse{bbx:annotation}%
 \iffieldundef{relatedstring}%
   {\bibstring{translationas}\space}%
-  {\setunit{\bibstring{translationas}\space}}%
-  \renewcommand*{\mkpureparens}{\unspace\addsemicolon\space}%horrible trick
-  \renewcommand*{\mkbibbrackets}{\unspace\addsemicolon\space}%horrible trick
+  {\printtext{\addspace}}%
+  \ifentrytype{article}{}{%horrible trick
+  \renewcommand*{\mkpureparens}{\unspace\addsemicolon\space}%
+  \renewcommand*{\mkbibbrackets}{\unspace\addsemicolon\space}}%
   \relatedcite{\thefield{related}}}
 %    \end{macrocode}
 % \subsubsection{Bibliography drivers}
 %    \begin{macrocode}
  \DeclareBibliographyDriver{article}{%
+\renewbibmacro*{related:default}[1]{%
+  \togglefalse{cbx:scauthorscite}%
+  \togglefalse{bbx:annotation}%
+\iffieldundef{relatedstring}%
+  {\bibstring{translationas}\space}%
+  {\setunit{\bibstring{translationas}\space}}%
+  \relatedcite{\thefield{related}}}
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/translator+others}%
@@ -2576,10 +2592,13 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate:article-inbook-incoll}%
-  \setunit{\bibpagerefpunct}\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}%
@@ -2598,10 +2617,13 @@
     {}%
   \newunit\newblock
   \usebibmacro{doi+eprint+url}%
-  \setunit{\bibpagerefpunct}\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}%
@@ -3253,6 +3275,21 @@
 %    \begin{macrocode}
 \RequireBibliographyStyle{authortitle}
 \RequireBibliographyStyle{philosophy-standard}
+
+\DeclareFieldFormat{edition}{%
+  \ifinteger{#1}{%
+    \ifdefstring{\bbx@editionformat}{arabic}
+      {\mkbibordedition{#1}~\bibstring{edition}}
+      {\ifdefstring{\bbx@editionformat}{Roman}%
+        {\RN{#1}~\bibstring{edition}}%
+        {\ifdefstring{\bbx@editionformat}{romansc}%
+          {\textsc{\Rn{#1}}~\bibstring{edition}}%
+          {\ifdefstring{\bbx@editionformat}{roman}%
+            {\Rn{#1}~\bibstring{edition}}
+            {\ifdefstring{\bbx@editionformat}{superscript}%
+            {\mkbibsuperscript{#1}}%
+            {\optionerror{editionformat}}}}}}}{#1}}%\isdot??
+
 \AtBeginShorthands{%
 %    \end{macrocode}
 % The annotation field is omitted in the list of shorthands:
@@ -3360,7 +3397,254 @@
      }
        {\usebibmacro{nodash:editor+others}}
        {\usebibmacro{translator+others}}}}
+
+\newbibmacro*{relateddate}{%
+  \setunit*{\addspace}%
+  \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}}
+\newbibmacro*{commarelateddate}{%
+  \setunit*{\addcomma\space}%
+  \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}}
     
+\DeclareBibliographyDriver{book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor+others/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{maintitle+title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \ifdefstring{\bbx@editionformat}{superscript}{}%
+  {\printfield{edition}%
+  \newunit}%
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \newblock
+  \iftoggle{bbx:related}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{collection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{editor+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{maintitle+title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \ifdefstring{\bbx@editionformat}{superscript}{}%
+  {\printfield{edition}%
+  \newunit}%
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \newblock
+  \iftoggle{bbx:related}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\newbibmacro*{inbook:full}{%
+  \usebibmacro{bybookauthor}%
+  \newunit\newblock
+  \usebibmacro{maintitle+booktitle}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \ifdefstring{\bbx@editionformat}{superscript}{}%
+  {\printfield{edition}%
+  \newunit}%
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate:article-inbook-incoll}%
+  \newblock
+  \iftoggle{bbx:related}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+  \newbibmacro*{incollection:full}{%
+  \usebibmacro{maintitle+booktitle}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \ifdefstring{\bbx@editionformat}{superscript}{}%
+  {\printfield{edition}%
+  \newunit}%
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate:article-inbook-incoll}%
+  \newblock
+  \iftoggle{bbx:related}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+
+\DeclareBibliographyDriver{manual}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor}%
+  \newunit\newblock
+  \ifdefstring{\bbx@editionformat}{superscript}{}%
+  {\printfield{edition}%
+  \newunit\newblock}%
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \newblock
+  \iftoggle{bbx:related}
+    {\ifdefstring{\bbx@relatedformat}{semicolon}%
+    {\setunit{\addsemicolon\space}}%
+    {\setunit{\unspace\space}}%horrible trick
+    \usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+      
 \newbibmacro*{usedriver:book}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -3374,8 +3658,9 @@
   \newunit\newblock
   \usebibmacro{byeditor+others}%
   \newunit\newblock
-  \printfield{edition}%
-  \newunit
+  \ifdefstring{\bbx@editionformat}{superscript}{}%
+  {\printfield{edition}%
+  \newunit}%
   \printfield{volumes}%
   \newunit\newblock
   \usebibmacro{series+number}%
@@ -3422,8 +3707,9 @@
   \newunit\newblock
   \usebibmacro{byeditor+others}%
   \newunit\newblock
-  \printfield{edition}%
-  \newunit
+  \ifdefstring{\bbx@editionformat}{superscript}{}%
+  {\printfield{edition}%
+  \newunit}%
   \iffieldundef{maintitle}
     {\printfield{volume}%
      \printfield{part}}