biblatex-philosophy (31mar13)

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

9 files changed, 79 insertions, 42 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
index 0a3b644d8bd..2ef0738f7e9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
@@ -13,7 +13,7 @@
 %%   License information appended
 %% 
 \ProvidesFile{english-philosophy.lbx}
-    [2013/03/27 v0.8c valbusa beta]
+    [2013/03/30 v0.8d valbusa beta]
 
 
 \InheritBibliographyExtras{english}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
index df1eb3efe81..2f1aad3c49b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
@@ -13,7 +13,7 @@
 %%   License information appended
 %% 
 \ProvidesFile{italian-philosophy.lbx}
-    [2013/03/27 v0.8c valbusa beta]
+    [2013/03/30 v0.8d valbusa beta]
 
 
 \InheritBibliographyExtras{italian}
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 5d5a3d51e52..686b37ca9a5 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}
-    [2013/03/27 v0.8c valbusa beta]
+    [2013/03/30 v0.8d valbusa beta]
 
 
 \RequireBibliographyStyle{authoryear}
@@ -41,7 +41,41 @@
 \renewbibmacro*{commarelateddate}{%
   \setunit*{\addcomma\space}%
   \printdate}
-\renewbibmacro*{date+extrayear}{}%
+\DeclareCiteCommand{\bbx@crossref@inbook}
+  {}%
+  {\iffieldundef{shorthand}{%
+  \usebibmacro{citeindex}%
+  \ifuseeditor{%
+    \ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}}%
+     {\usebibmacro{labeltitle}}%
+    \setunit*{\addspace}%
+    \usebibmacro{date+extrayear:crossref}}%
+    {\usebibmacro{cite:shorthand}}}%
+  {}%
+  {}%
+\DeclareCiteCommand{\bbx@crossref@incollection}
+  {}%
+  {\iffieldundef{shorthand}{%
+  \usebibmacro{citeindex}%
+  \ifuseeditor{%
+    \ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}}%
+     {\usebibmacro{labeltitle}}%
+    \setunit*{\addspace}%
+    \usebibmacro{date+extrayear:crossref}}%
+    {\usebibmacro{cite:shorthand}}}%
+  {}%
+  {}%
+\newbibmacro*{date+extrayear:crossref}{%
+      \begingroup%
+        \clearfield{month}%
+    \iffieldundef{labelyear}
+      {\printtext[parens]{\midsentence\bibstring{nodate}}}
+      {\printtext[parens]{\printdateextra}}%
+       \endgroup}%
 }
 
 \AtBeginDocument{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
index d39a65b7e6a..d0f93e83ad1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
@@ -13,7 +13,7 @@
 %%   License information appended
 %% 
 \ProvidesFile{philosophy-classic.cbx}
-    [2013/03/27 v0.8c valbusa beta]
+    [2013/03/30 v0.8d valbusa beta]
 
 
 \RequireCitationStyle{authoryear-comp}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
index fa3f50f0ca1..2b08fd82a90 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
@@ -13,7 +13,7 @@
 %%   License information appended
 %% 
 \ProvidesFile{philosophy-modern.bbx}
-    [2013/03/27 v0.8c valbusa beta]
+    [2013/03/30 v0.8d valbusa beta]
 
 
 \RequireBibliographyStyle{philosophy-classic}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
index 02009f6dd01..680af62f0fc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
@@ -13,7 +13,7 @@
 %%   License information appended
 %% 
 \ProvidesFile{philosophy-modern.cbx}
-    [2013/03/27 v0.8c valbusa beta]
+    [2013/03/30 v0.8d valbusa beta]
 
 
 \RequireCitationStyle{philosophy-classic}
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 54a622be04d..327acc05fef 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
@@ -13,7 +13,7 @@
 %%   License information appended
 %% 
 \ProvidesFile{philosophy-standard.bbx}
-    [2013/03/27 v0.8c valbusa beta]
+    [2013/03/30 v0.8d valbusa beta]
 
 
 \RequireBiber[2]
@@ -87,24 +87,6 @@
 \setcounter{biburllcpenalty}{9000}
 \newcounter{maxnamesincross}
 \newcounter{minnamesincross}
-
-\AtBeginShorthands{
-  \togglefalse{bbx:annotation}
-  \DeclareCiteCommand{\bbx@crossref@inbook}
-  {}%
-  {\iffieldundef{shorthand}%
-    {\usebibmacro{inbook:full}}%
-    {\usebibmacro{cite:shorthand}}}%
-  {}%
-  {}%
-\DeclareCiteCommand{\bbx@crossref@incollection}
-  {}%
-  {\iffieldundef{shorthand}%
-    {\usebibmacro{incollection:full}}%
-    {\usebibmacro{cite:shorthand}}}%
-  {}%
-  {}%
-}
 \AtBeginBibliography{%
 \iftoggle{bbx:scauthorsbib}{%
 \DeclareNameFormat{sortname}{%
@@ -167,6 +149,7 @@
   \endgroup}
 \DeclareFieldFormat[bookinbook,thesis]{title}{\mkbibemph{#1}}
 \DeclareFieldFormat[review]{title}{\bibstring{reviewof}\addspace#1}
+\DeclareFieldFormat[review]{citetitle}{\bibstring{reviewof}\addspace#1}
 \DeclareFieldFormat[inreference,article]{title}{\mkbibquote{#1}}
 \DeclareFieldFormat[bookinbook,thesis]{citetitle}{\mkbibemph{#1}}
 \DeclareFieldFormat{origtitle}{\mkbibemph{#1}}
@@ -1412,7 +1395,8 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
-\DeclareDriverSourcemap[datatype=bibtex]{
+\DeclareStyleSourcemap{
+\maps{
     \map{
      \step[fieldsource=court         , fieldtarget=author]
      \step[fieldsource=section       , fieldtarget=nameaddon]
@@ -1427,6 +1411,7 @@
      \step[fieldsource=origpages     , fieldtarget=userc]
       }
     }
+  }
 \DeclareDataInheritance{*}{*}{\noinherit{annotation}}
 %% 
 %%  Copyright 2009-2013 by Ivan Valbusa
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
index e7a4788a6b5..37bb11457ad 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -13,11 +13,28 @@
 %%   License information appended
 %% 
 \ProvidesFile{philosophy-verbose.bbx}
-    [2013/03/27 v0.8c valbusa beta]
+    [2013/03/30 v0.8d valbusa beta]
 
 
 \RequireBibliographyStyle{authortitle}
 \RequireBibliographyStyle{philosophy-standard}
+\AtBeginShorthands{
+  \togglefalse{bbx:annotation}
+  \DeclareCiteCommand{\bbx@crossref@inbook}
+  {}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{inbook:full}}%
+    {\usebibmacro{cite:shorthand}}}%
+  {}%
+  {}%
+\DeclareCiteCommand{\bbx@crossref@incollection}
+  {}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{incollection:full}}%
+    {\usebibmacro{cite:shorthand}}}%
+  {}%
+  {}%
+}
 \renewbibmacro*{author}{%
   \ifboolexpr{
     test \ifuseauthor
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
index bef005baec4..cc62ca31ae1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
@@ -13,7 +13,7 @@
 %%   License information appended
 %% 
 \ProvidesFile{philosophy-verbose.cbx}
-    [2013/03/27 v0.8c valbusa beta]
+    [2013/03/30 v0.8d valbusa beta]
 
 
 \RequireCitationStyle{verbose-trad2}
@@ -93,22 +93,23 @@
       {\DeclareNameAlias{sortname}{default}}}%
       {\thefield{entrytype}}}%
   \usebibmacro{shorthandintro}}
-\DeclareNameFormat{noname}{}
+
+\newbibmacro*{cite:ccite}{%
+  \usebibmacro{cite:citepages}%
+  \global\togglefalse{cbx:fullcite}%
+  \global\togglefalse{cbx:loccit}%
+  \bibhypertarget{cite\the\value{instcount}}{%
+      \iffieldundef{shorthand}
+         {\usebibmacro{cite:title}%
+  \usebibmacro{cite:save}}%
+         {\usebibmacro{cite:shorthand}}}}
 \DeclareCiteCommand{\ccite}
-{\usebibmacro{prenote}%
-  \renewbibmacro*{author/translator+others}{}%
-  \renewbibmacro*{author/editor+others/translator+others}{}%
-  \renewbibmacro*{editor+others}{}%
-  \renewbibmacro*{author/translator+others}{}%
-  \renewbibmacro*{author/editor}{}%
-  \renewbibmacro*{author}{}%
-  \renewbibmacro*{editor}{}%
-  }%
-{\global\togglefalse{cbx:loccit}%
-\usedriver{\DeclareNameAlias{sortname}{noname}}
-{\thefield{entrytype}}}
+{\usebibmacro{prenote}}%
+{\usebibmacro{citeindex}%
+   \usebibmacro{cite:ccite}}
 {\multicitedelim}
 {\usebibmacro{cite:postnote}}
+
 %% 
 %%  Copyright 2009-2013 by Ivan Valbusa
 %%