biblatex-philosophy (31mar13)

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

11 files changed, 163 insertions, 90 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
index bbeb801a346..c91ddea96b8 100644
--- a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
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 a04d697f066..1284c6900ec 100644
--- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
+++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
@@ -93,7 +93,7 @@
 %<verbose-cbx>\ProvidesFile{philosophy-verbose.cbx}
 %<italian-lbx>\ProvidesFile{italian-philosophy.lbx}
 %<english-lbx>\ProvidesFile{english-philosophy.lbx}
-    [2013/03/27 v0.8c valbusa beta]
+    [2013/03/30 v0.8d valbusa beta]
 
 %<*driver>
 \documentclass{ltxdoc}
@@ -182,7 +182,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{2947}
+% \CheckSum{2994}
 %
 % \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
@@ -200,7 +200,8 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \changes{v0.8c}{2013/03/27}{Removed \sty{biber.conf} configuration file. Added internal \file{biber} settings with \cmd{DeclareDriverSourcemap} command. Added \bibfield{trans-} field alias.}
+% \changes{v0.8d}{2013/03/30}{Fixed some bugs related to \cmd{DeclareDriverSourcemap}, \cmd{ccite}, and \bibtype{review} entry type}
+% \changes{v0.8c}{2013/03/27}{Removed \sty{biber.conf} configuration file. Added internal \file{biber} settings with \cmd{DeclareDriverSourcemap} command. Added \bibfield{trans-} field alias}
 % \changes{v0.8b}{2013/03/22}{Added \sty{biber.conf} configuration file}
 % \changes{v0.8a}{2013/04/18}{New \bibfield{entrysubtype} field for citing classical texts. New \bibfield{related} field mechanism. New \opt{relatedformat} option. New English documentation. Fixed some bugs}
 % \changes{v0.7c}{2011/05/16}{Fixed some bugs. New \opt{origfieldtype} option. Added \bibfield{nodate} bibliography string. Updated documentation}
@@ -1027,31 +1028,6 @@
 %    \begin{macrocode}
 \newcounter{maxnamesincross}
 \newcounter{minnamesincross}
-
-\AtBeginShorthands{
-%    \end{macrocode}
-% The annotation field is omitted in the list of shorthands:
-%    \begin{macrocode}
-  \togglefalse{bbx:annotation}
-%    \end{macrocode}
-% In the list of shorthands we always use the shorthand
-% for the cross-referenced entries: 
-%    \begin{macrocode}
-  \DeclareCiteCommand{\bbx@crossref@inbook}
-  {}%
-  {\iffieldundef{shorthand}%
-    {\usebibmacro{inbook:full}}%
-    {\usebibmacro{cite:shorthand}}}%
-  {}%
-  {}%
-\DeclareCiteCommand{\bbx@crossref@incollection}
-  {}%
-  {\iffieldundef{shorthand}%
-    {\usebibmacro{incollection:full}}%
-    {\usebibmacro{cite:shorthand}}}%
-  {}%
-  {}%
-}  
 %    \end{macrocode}
 % \subsubsection{Name format}
 %    \begin{macrocode}  
@@ -1134,6 +1110,7 @@
 %    \begin{macrocode}
 \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}}
@@ -2418,9 +2395,11 @@
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
 %    \end{macrocode}
-% Define new fields for \bibtype{jurisdiction} entry types.
+% Define new fields for \bibtype{jurisdiction} entry types and
+% \opt{orig-} fields mechanism:
 %    \begin{macrocode}
-\DeclareDriverSourcemap[datatype=bibtex]{
+\DeclareStyleSourcemap{
+\maps{
     \map{
      \step[fieldsource=court         , fieldtarget=author]
      \step[fieldsource=section       , fieldtarget=nameaddon]
@@ -2435,6 +2414,7 @@
      \step[fieldsource=origpages     , fieldtarget=userc]
       }
     }
+  }
 \DeclareDataInheritance{*}{*}{\noinherit{annotation}}
 %    \end{macrocode}
 % \iffalse
@@ -2481,10 +2461,41 @@
 \renewbibmacro*{commarelateddate}{%
   \setunit*{\addcomma\space}%
   \printdate}
-%    \end{macrocode}
-% No date after the author's/editor's name:
-%    \begin{macrocode}
-\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{%
@@ -2858,6 +2869,30 @@
 %    \begin{macrocode}
 \RequireBibliographyStyle{authortitle}
 \RequireBibliographyStyle{philosophy-standard}
+\AtBeginShorthands{
+%    \end{macrocode}
+% The annotation field is omitted in the list of shorthands:
+%    \begin{macrocode}
+  \togglefalse{bbx:annotation}
+%    \end{macrocode}
+% In the list of shorthands we always use the shorthand
+% for the cross-referenced entries: 
+%    \begin{macrocode}
+  \DeclareCiteCommand{\bbx@crossref@inbook}
+  {}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{inbook:full}}%
+    {\usebibmacro{cite:shorthand}}}%
+  {}%
+  {}%
+\DeclareCiteCommand{\bbx@crossref@incollection}
+  {}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{incollection:full}}%
+    {\usebibmacro{cite:shorthand}}}%
+  {}%
+  {}%
+}  
 %    \end{macrocode}
 % \paragraph{Authors and editors}
 %    \begin{macrocode}
@@ -3404,25 +3439,26 @@
       {\DeclareNameAlias{sortname}{default}}}%
       {\thefield{entrytype}}}%
   \usebibmacro{shorthandintro}}
+
+\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}}}}
 %    \end{macrocode}
 % \subsubsection{Citation commands}
-%    \begin{macrocode}
-\DeclareNameFormat{noname}{}
+%    \begin{macrocode}       
 \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}}
+
 %    \end{macrocode}
 % \iffalse
 %</verbose-cbx>
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
 %%