summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-philosophy
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-06-24 23:49:21 +0000
committerKarl Berry <karl@freefriends.org>2013-06-24 23:49:21 +0000
commitf1316ac6bcdaef58b97ed975aacd6f5a22794db0 (patch)
tree1ffb6f473b1450e730578db6d1651e7b6bbaea06 /Master/texmf-dist/tex/latex/biblatex-philosophy
parented7d04fd989e4c6c3bce98cf8762f3edf6ac106c (diff)
biblatex-philosophy (20jun13)
git-svn-id: svn://tug.org/texlive/trunk@30917 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx67
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx30
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx71
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx98
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx42
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx40
9 files changed, 211 insertions, 163 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 f35bbc99fd0..783a59bf6de 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/04/13 v0.8e valbusa beta]
+ [2013/06/20 v0.8f valbusa beta]
\InheritBibliographyExtras{english}
@@ -23,7 +23,7 @@
-\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\textendash}}%
-\NewBibliographyString{transtolang,cited,reviewof,origed,nodate}
+\NewBibliographyString{cited,reviewof,origed,nodate}
\DeclareBibliographyStrings{%
inherit = {english},
@@ -32,12 +32,12 @@
ibidem = {{ivi}{ivi}},
loccit = {{ibidem}{ibidem}},
origed = {{orig\adddotspace ed\adddot}{orig\adddotspace ed\adddot}},
- transtolang = {{trans\adddot}{trans\adddot}},
editor = {{\mkpureparens{ed\adddot}}{\mkpureparens{ed\adddot}}},
editors = {{\mkpureparens{eds\adddot}}{\mkpureparens{eds\adddot}}},
andothers = {{\mkbibemph{et\addabbrvspace al\adddot}}
{\mkbibemph{et\addabbrvspace al\adddot}}},
reviewof = {{Review of}{Review of}},
+ translationas = {{trans\adddot}{trans\adddot}},
backrefpage = {{cited on page}{cited on p\adddot}},
backrefpages = {{cited on pages}{cited on pp\adddot}}}
%%
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 c61ae87d84d..401d45bf7d7 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/04/13 v0.8e valbusa beta]
+ [2013/06/20 v0.8f valbusa beta]
\InheritBibliographyExtras{italian}
@@ -22,7 +22,7 @@
-\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\textendash}}%
-\NewBibliographyString{transtolang,origed,cited,reviewof,nodate,section}
+\NewBibliographyString{origed,cited,reviewof,nodate,section}
\DeclareBibliographyStrings{%
inherit = {italian},
@@ -33,8 +33,6 @@
loccit = {{ibidem}{ibidem}},
origed = {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}},
langitalian = {{italiano}{it\adddot}},
- transtolang = {{traduzione\addspace italiana}
- {\bibsstring{translator}\adddotspace \bibsstring{langitalian}}},
editor = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}},
editors = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}},
andothers = {{\mkbibemph{et\addabbrvspace al\adddot}}
@@ -55,7 +53,9 @@
translationof = {{traduzione di}{trad\adddotspace di}},
translationas = {{traduzione italiana}{trad\adddotspace it\adddot}},
reviewof = {{Recensione di}{Recensione di}},
-section = {{sezione}{sez\adddot}}}
+section = {{sezione}{sez\adddot}},
+sections = {{sezioni}{\iftoggle{bbx:classical}{sezz\adddot}{sez\adddot}}},
+}
%%
%% Copyright 2009-2013 by Ivan Valbusa
%%
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 d2ce3f8b2ad..e88d2f76c29 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/04/13 v0.8e valbusa beta]
+ [2013/06/20 v0.8f valbusa beta]
\RequireBibliographyStyle{authoryear}
@@ -41,10 +41,10 @@
\renewcommand{\labelnamepunct}{\addcomma\space}%
\renewbibmacro*{relateddate}{%
\setunit*{\addspace}%
- \printdate}
+ \printdate}%
\renewbibmacro*{commarelateddate}{%
\setunit*{\addcomma\space}%
- \printdate}
+ \printdate}%
\DeclareCiteCommand{\bbx@crossref@inbook}
{}%
{\iffieldundef{shorthand}{%
@@ -59,7 +59,7 @@
{\usebibmacro{cite:shorthand}}}%
{}%
{}%
-\DeclareCiteCommand{\bbx@crossref@incollection}
+\DeclareCiteCommand{\bbx@crossref@incollection}%
{}%
{\iffieldundef{shorthand}{%
\usebibmacro{citeindex}%
@@ -76,41 +76,42 @@
\newbibmacro*{date+extrayear:crossref}{%
\begingroup%
\clearfield{month}%
- \ifboolexpr{
+ \clearfield{day}%
+ \ifboolexpr{%
test {\iffieldundef{date}}
and
test {\iffieldundef{year}}
}%
{\iftoggle{bbx:nodate}{\printtext[parens]{%
- \midsentence\bibstring{nodate}}}{}}
+ \midsentence\bibstring{nodate}}}{}}%
{\printtext[parens]{\printdateextra}}%
\endgroup}%
\newbibmacro*{date+extrayear}{}%
-}
+}%
\AtBeginDocument{%
\iftoggle{bbx:square}
{\renewcommand{\bibopenparen}{\bibopenbracket}%
\renewcommand{\bibcloseparen}{\bibclosebracket}}%
- {}
+ {}%
\setcounter{maxnamesincross}{\value{maxnames}}%
\setcounter{minnamesincross}{\value{minnames}}%
-}
+}%
\AtEveryBibitem{%
\iffieldequalstr{entrysubtype}{classic}{%
- \togglefalse{bbx:nodate}}}
+ \togglefalse{bbx:nodate}}}%
\renewbibmacro*{relateddate}{}
\renewbibmacro*{commarelateddate}{}
\renewbibmacro*{issue+date}{%
- \ifboolexpr{
+ \ifboolexpr{%
test {\iffieldundef{issue}}
and
test {\iffieldundef{month}}
- }
+ }%
{}%
- {\ifdefstring{\bbx@volnumformat}{parens}
+ {\ifdefstring{\bbx@volnumformat}{parens}%
{\printtext{%
\printfield{issue}\setunit*{\addspace}%
\printdate}}%
@@ -121,63 +122,64 @@
\renewbibmacro*{date+extrayear}{%
\begingroup%
\clearfield{month}%
- \ifboolexpr{
+ \clearfield{day}%
+ \ifboolexpr{%
test {\iffieldundef{date}}
and
test {\iffieldundef{year}}
}%
{\iftoggle{bbx:nodate}{\printtext[parens]{%
- \midsentence\bibstring{nodate}}}{}}
+ \midsentence\bibstring{nodate}}}{}}%
{\printtext[parens]{\printdateextra}}%
\endgroup}%
\renewbibmacro*{author}{%
- \ifboolexpr{
+ \ifboolexpr{%
test \ifuseauthor
and
not test {\ifnameundef{author}}
}%
- {\usebibmacro{bbx:dashcheck}
- {\bibnamedash}
+ {\usebibmacro{bbx:dashcheck}%
+ {\bibnamedash}%
{\usebibmacro{bbx:savehash}%
\printnames{author}%
\iffieldundef{nameaddon}{}%
{\setunit{\addspace}%
\printtext[brackets]{\printfield{nameaddon}}}%
-\iffieldundef{authortype}
- {\setunit{\addspace}}
+\iffieldundef{authortype}%
+ {\setunit{\addspace}}%
{\setunit{\addcomma\space}}}%
- \iffieldundef{authortype}
+ \iffieldundef{authortype}%
{}%
{\usebibmacro{authorstrg}%
\setunit{\addspace}}}%
- {\global\undef\bbx@lasthash
+ {\global\undef\bbx@lasthash%
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
\usebibmacro{date+extrayear}}%
\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}
+ \usebibmacro{bbx:editor}{editorstrg}}%
\renewbibmacro*{editor+others}{%
- \usebibmacro{bbx:editor}{editor+othersstrg}}
+ \usebibmacro{bbx:editor}{editor+othersstrg}}%
\renewbibmacro*{bbx:editor}[1]{%
- \ifboolexpr{
+ \ifboolexpr{%
test \ifuseeditor
and
not test {\ifnameundef{editor}}
}%
- {\usebibmacro{bbx:dashcheck}
- {\bibnamedash}
+ {\usebibmacro{bbx:dashcheck}%
+ {\bibnamedash}%
{\printnames{editor}%
\setunit{\addspace}%
\usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
\clearname{editor}%
\setunit{\addspace}}%
- {\global\undef\bbx@lasthash
+ {\global\undef\bbx@lasthash%
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
\usebibmacro{date+extrayear}}%
-\DeclareCiteCommand{\bbx@crossref@inbook}
+\DeclareCiteCommand{\bbx@crossref@inbook}%
{}%
{\usebibmacro{citeindex}%
\ifuseeditor{%
@@ -190,7 +192,7 @@
{}%
{}%
-\DeclareCiteCommand{\bbx@crossref@incollection}
+\DeclareCiteCommand{\bbx@crossref@incollection}%
{}%
{\usebibmacro{citeindex}%
\ifuseeditor{%
@@ -204,6 +206,11 @@
{}%
\define@key{blx@bib1}{restoreclassic}[]{}
\define@key{blx@bib2}{restoreclassic}[true]{}
+\define@key{blx@bib1}{nodate}[]{}%
+\define@key{blx@bib2}{nodate}[true]{%
+ \ifstrequal{#1}{false}{%
+ \togglefalse{bbx:nodate}%
+}{}}%
%%
%% Copyright 2009-2013 by Ivan Valbusa
%%
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 20e4296b976..d094a7c432f 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/04/13 v0.8e valbusa beta]
+ [2013/06/20 v0.8f valbusa beta]
\RequireCitationStyle{authoryear-comp}
@@ -33,10 +33,12 @@
\AtEveryCite{%
\iftoggle{cbx:scauthorscite}%
- {\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}%
-\renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}%
-\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}%
-{}}
+ {%
+ \renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}%
+ \renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}%
+ \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}%
+ \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}%
+ {}}%
\DeclareNameFormat{labelname}{%
\bibhyperref{%
\ifcase\value{uniquename}%
@@ -58,9 +60,9 @@
\newbibmacro*{cite:init:AT}{%
\ifnumless{\value{multicitecount}}{2}
{\global\boolfalse{cbx:parens}%
- \global\undef\cbx@lasthash}
- {\iffieldundef{prenote}
- {}
+ \global\undef\cbx@lasthash}%
+ {\iffieldundef{prenote}%
+ {}%
{\global\undef\cbx@lasthash}}}
\newbibmacro*{cite:reinit:AT}{%
@@ -69,9 +71,9 @@
\newbibmacro*{cite:AT}{%
\iffieldundef{shorthand}
{\iffieldequals{namehash}{\cbx@lasthash}
- {\setunit{\compcitedelim}}
+ {\setunit{\compcitedelim}}%
{\ifnameundef{labelname}
- {}
+ {}%
{\printnames{labelname}%
\setunit{\nametitledelim}}%
\savefield{namehash}{\cbx@lasthash}}%
@@ -82,7 +84,7 @@
\newbibmacro*{citetitle:AT}{%
\iffieldundef{shorthand}
- {\usebibmacro{cite:title:AT}}
+ {\usebibmacro{cite:title:AT}}%
{\usebibmacro{cite:shorthand}}%
\setunit{\multicitedelim}}
@@ -90,7 +92,7 @@
\iffieldequals{namehash}{\cbx@lasthash}
{\setunit{\compcitedelim}}
{\ifnameundef{labelname}
- {}
+ {}%
{\printnames{labelname}%
\setunit{%
\global\booltrue{cbx:parens}%
@@ -266,7 +268,6 @@
\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}%
{\usebibmacro{cite:label}%
\setunit{\addspace}%
-
\usebibmacro{cite:labelyear+extrayear}%
\usebibmacro{cite:reinit}}%
{\iffieldequals{namehash}{\cbx@lasthash}%
@@ -281,7 +282,8 @@
\setunit{\nameyeardelim}%
\usebibmacro{cite:labelyear+extrayear}%
\savefield{namehash}{\cbx@lasthash}%
- \savefield{labelyear}{\cbx@lastyear}}}}
+ \iffieldundef{postnote}%
+ {\savefield{labelyear}{\cbx@lastyear}}{}}}}
\DeclareCiteCommand*{\cite}
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
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 54327309a79..61768258367 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/04/13 v0.8e valbusa beta]
+ [2013/06/20 v0.8f valbusa beta]
\RequireBibliographyStyle{philosophy-classic}
@@ -24,15 +24,15 @@
yearleft=false}
\newlength{\yeartitle}
\newlength{\postnamesep}
-\setlength{\yeartitle}{0.8em}%
+\setlength{\yeartitle}{0.8em}
\setlength{\postnamesep}{0.5ex plus 2pt minus 1pt}
\setlength{\bibitemsep}{\postnamesep}
\setlength{\bibnamesep}{1.5ex plus 2pt minus 1pt}
\setlength{\bibhang}{4\parindent}
-\AtBeginBibliography{
+\AtBeginBibliography{%
\iftoggle{bbx:yearleft}{%
-\setlength{\yeartitle}{\fill}}
+\setlength{\yeartitle}{\fill}}%
{}}
\newcommand{\postsep}{\par\nobreak\vskip\postnamesep%
\hskip-\bibhang\ignorespaces}
@@ -44,8 +44,9 @@
\renewbibmacro*{date+extrayear}{%
\begingroup%
\clearfield{month}%
+ \clearfield{day}%
\makebox[\bibhang][r]{\printtext{%
- \ifboolexpr{
+ \ifboolexpr{%
test {\iffieldundef{date}}
and
test {\iffieldundef{year}}
@@ -58,40 +59,40 @@
\renewbibmacro*{labeltitle}{%
\iffieldundef{label}%
- {\iffieldundef{shorttitle}
+ {\iffieldundef{shorttitle}%
{\printfield{title}\clearfield{title}}%
{\printfield[title]{shorttitle}}}%
{\printtext{\printfield{label}}%
\postsep}}
\renewbibmacro*{author}{%
- \ifboolexpr{
+ \ifboolexpr{%
test \ifuseauthor
and
not test {\ifnameundef{author}}
- }
- {\usebibmacro{bbx:dashcheck}
+ }%
+ {\usebibmacro{bbx:dashcheck}%
{}%
{\usebibmacro{bbx:savehash}%
\printnames{author}%
\iffieldundef{nameaddon}{}%
{\setunit{\addspace}%
\printtext[brackets]{\printfield{nameaddon}}}%
- \iffieldundef{authortype}
+ \iffieldundef{authortype}%
{}%
{\setunit{\addcomma\space}}%
\usebibmacro{authorstrg}%
\postsep}}%
- {\global\undef\bbx@lasthash
+ {\global\undef\bbx@lasthash%
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
\usebibmacro{date+extrayear}}%
\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}
+ \usebibmacro{bbx:editor}{editorstrg}}%
\renewbibmacro*{editor+others}{%
- \usebibmacro{bbx:editor}{editor+othersstrg}}
+ \usebibmacro{bbx:editor}{editor+othersstrg}}%
\renewbibmacro*{bbx:editor}[1]{%
- \ifboolexpr{
+ \ifboolexpr{%
test \ifuseeditor
and
not test {\ifnameundef{editor}}
@@ -108,7 +109,7 @@
{\usebibmacro{#1}%
\clearname{editor}%
\printtext{\addcomma\space}}{}}%
-\DeclareCiteCommand{\bbx@crossref@inbook}
+\DeclareCiteCommand{\bbx@crossref@inbook}%
{}%
{\usebibmacro{citeindex}%
\ifuseeditor{%
@@ -121,14 +122,14 @@
{}%
{}%
-\DeclareCiteCommand{\bbx@crossref@incollection}
+\DeclareCiteCommand{\bbx@crossref@incollection}%
{}%
{\usebibmacro{citeindex}%
\ifuseeditor{%
\ifthenelse{\value{listtotal}=2}%
{\printnames[][-\value{maxnamesincross}]{labelname}}%
{\printnames[][-\value{minnamesincross}]{labelname}}}%
- {\usebibmacro{labeltitle}}
+ {\usebibmacro{labeltitle}}%
\setunit*{\addspace}%
\usebibmacro{classic:date+extrayear}}%
{}%
@@ -137,7 +138,8 @@
\newbibmacro*{classic:date+extrayear}{%
\begingroup%
\clearfield{month}%
- \ifboolexpr{
+ \clearfield{day}%
+ \ifboolexpr{%
test {\iffieldundef{date}}
and
test {\iffieldundef{year}}
@@ -152,11 +154,12 @@
\define@key{blx@bib2}{restoreclassic}[true]{%
\ifstrequal{#1}{true}{%
\setlength{\bibhang}{\parindent}%
- \renewcommand{\labelnamepunct}{\newunitpunct}
+ \renewcommand{\labelnamepunct}{\newunitpunct}%
\renewbibmacro*{date+extrayear}{%
\begingroup%
\clearfield{month}%
- \ifboolexpr{
+ \clearfield{day}%
+ \ifboolexpr{%
test {\iffieldundef{date}}
and
test {\iffieldundef{year}}
@@ -166,53 +169,51 @@
{\printtext[parens]{\printdateextra}}%
\endgroup}%
\renewbibmacro*{author}{%
- \ifboolexpr{
+ \ifboolexpr{%
test \ifuseauthor
and
not test {\ifnameundef{author}}
}%
- {\usebibmacro{bbx:dashcheck}
- {\bibnamedash}
+ {\usebibmacro{bbx:dashcheck}%
+ {\bibnamedash}%
{\usebibmacro{bbx:savehash}%
\printnames{author}%
\iffieldundef{nameaddon}{}%
{\setunit{\addspace}%
\printtext[brackets]{\printfield{nameaddon}}}%
-\iffieldundef{authortype}
- {\setunit{\addspace}}
+\iffieldundef{authortype}%
+ {\setunit{\addspace}}%
{\setunit{\addcomma\space}}}%
- \iffieldundef{authortype}
+ \iffieldundef{authortype}%
{}%
{\usebibmacro{authorstrg}%
\setunit{\addspace}}}%
- {\global\undef\bbx@lasthash
+ {\global\undef\bbx@lasthash%
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
\usebibmacro{date+extrayear}}%
-
\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}
+ \usebibmacro{bbx:editor}{editorstrg}}%
\renewbibmacro*{editor+others}{%
- \usebibmacro{bbx:editor}{editor+othersstrg}}
+ \usebibmacro{bbx:editor}{editor+othersstrg}}%
\renewbibmacro*{bbx:editor}[1]{%
- \ifboolexpr{
+ \ifboolexpr{%
test \ifuseeditor
and
not test {\ifnameundef{editor}}
}%
- {\usebibmacro{bbx:dashcheck}
- {\bibnamedash}
+ {\usebibmacro{bbx:dashcheck}%
+ {\bibnamedash}%
{\printnames{editor}%
\setunit{\addspace}%
\usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
\clearname{editor}%
\setunit{\addspace}}%
- {\global\undef\bbx@lasthash
+ {\global\undef\bbx@lasthash%
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
\usebibmacro{date+extrayear}}%
-
\renewbibmacro*{labeltitle}{%
\iffieldundef{label}%
{\iffieldundef{shorttitle}%
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 c2da698bd2c..db88593a73b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
@@ -13,10 +13,18 @@
%% License information appended
%%
\ProvidesFile{philosophy-modern.cbx}
- [2013/04/13 v0.8e valbusa beta]
+ [2013/06/20 v0.8f valbusa beta]
\RequireCitationStyle{philosophy-classic}
+\DeclareCiteCommand{\fullcite}%
+ {\usebibmacro{prenote}}%
+ {\setkeys{blx@bib2}{restoreclassic}%
+ \usedriver%
+ {\DeclareNameAlias{sortname}{default}}%
+ {\thefield{entrytype}}}%
+ {\multicitedelim}%
+ {\usebibmacro{postnote}}%
%%
%% Copyright 2009-2013 by Ivan Valbusa
%%
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 4b77e146a71..c68f0a0ec4f 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/04/13 v0.8e valbusa beta]
+ [2013/06/20 v0.8f valbusa beta]
\RequireBiber[2]
@@ -90,24 +90,22 @@
\AtBeginBibliography{%
\iftoggle{bbx:scauthorsbib}{%
\DeclareNameFormat{sortname}{%
+\renewcommand{\mkbibnamefirst}{\textsc}%
+\renewcommand{\mkbibnamelast}{\textsc}%
+\renewcommand{\mkbibnameprefix}{\textsc}%
+\renewcommand{\mkbibnameaffix}{\textsc}%
\ifnumequal{\value{listcount}}{1}
{\iffirstinits
- {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}%
- {\textsc{#7}}}%MOD
- {\ifblank{#3}{\usebibmacro{name:last-first}{\textsc{#1}\nopunct}%
- {\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}
- {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}%
- {\textsc{#7}}}}%
+ {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+ {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}%
\ifblank{#3#5}
{}
{\usebibmacro{name:revsdelim}}}
{\iffirstinits
- {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}%
- {\textsc{#7}}}
- {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}%
- {\textsc{#7}}}}%
+ {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}
+ {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}}%
\usebibmacro{name:andothers}}}%
-{}}%
+ {}}%
\AtBeginDocument{%
\iftoggle{bbx:scauthors}{%
@@ -253,7 +251,7 @@
\iffieldundef{reprinttitle}%
{\printtext{\ifdefstring{\bbx@origfields}{origed}
{\bibstring{origed}}%
-{\bibstring{transtolang}}}\nopunct}%
+{\bibstring{translationas}}}\nopunct}%
{\printtext{\bibstring{reprint}}}\nopunct}
\newbibmacro*{origtitle:book}{%
@@ -272,7 +270,7 @@
\usebibmacro{origpublisher+origlocation+origdate}}
\newbibmacro*{origdata:book}{%
- \ifboolexpr{
+ \ifboolexpr{%
test {\iffieldundef{origtitle}}
and
test {\iffieldundef{origlocation}}
@@ -427,11 +425,11 @@
\renewbibmacro*{event+venue+date}{%v0.8
\printfield{eventtitle}%
- \ifboolexpr{
+ \ifboolexpr{%
test {\iffieldundef{venue}}
and
test {\iffieldundef{eventyear}}
- }
+ }%
{}
{\setunit*{\addspace}%
\printtext{%
@@ -797,11 +795,6 @@
\newunit\newblock
\printfield{edition}%
\newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
\printfield{volumes}%
\newunit\newblock
\usebibmacro{series+number}%
@@ -809,6 +802,11 @@
\printfield{note}%
\newunit\newblock
\usebibmacro{publisher+location+date}%
+ \newunit
+ \iffieldundef{maintitle}
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
@@ -853,11 +851,6 @@
\newunit\newblock
\printfield{edition}%
\newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
\printfield{volumes}%
\newunit\newblock
\usebibmacro{series+number}%
@@ -867,6 +860,11 @@
\usebibmacro{publisher+location+date}%
\newunit\newblock
\usebibmacro{chapter+pages}%
+ \newunit
+ \iffieldundef{maintitle}
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
@@ -908,11 +906,6 @@
\usebibmacro{event+venue+date}%
\newunit\newblock
\usebibmacro{byeditor+others}%
- \newunit\newblock
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
\newunit
\printfield{volumes}%
\newunit\newblock
@@ -924,6 +917,11 @@
\newunit
\usebibmacro{publisher+location+date}%
\newunit\newblock
+ \iffieldundef{maintitle}
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
+ \newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -1262,6 +1260,11 @@
by the 'biblatex-philosophy' styles.\MessageBreak
All the @set entries will be ignored}}
+\renewbibmacro*{bybookauthor}{%
+ \ifnamesequal{author}{bookauthor}%
+ {}%
+ {\printnames[default]{bookauthor}}}
+
\newbibmacro*{cross:maintitle+booktitle}{%
\iffieldundef{volume}
{}%
@@ -1322,16 +1325,18 @@
\DeclareFieldFormat[jurisdiction]{number}{\bibsstring{number}~{#1}}
\DeclareFieldFormat[jurisdiction]{nameaddon}{%
\ifinteger{#1}{\bibcpsstring{section}~\RN{#1}}{#1}}
-\DeclareFieldFormat[jurisdiction]{pages}{#1}
+\DeclareFieldFormat[jurisdiction]{pages}{%
+ \iffieldundef{bookpagination}{#1}{\mkpageprefix[bookpagination]{#1}}}
\DeclareFieldFormat[jurisdiction]{title}{%
\iffieldequalstr{entrysubtype}{international}{\emph{#1}}{#1}}
+\DeclareFieldFormat[jurisdiction]{notacomm}{nt\adddotspace#1} % \end{macrocode}
\newbibmacro*{juris:author}{%
\DeclareNameAlias{sortname}{default}%
- \ifboolexpr{
+ \ifboolexpr{%
test \ifuseauthor
and
not test {\ifnameundef{author}}
- }
+ }%
{%
\iffieldequalstr{type}{conclusions}{%
\printtext{Conclusioni dell'Avv\adddotspace generale}%
@@ -1354,6 +1359,18 @@
}%
\printeventdate}
+\newbibmacro*{addendum+pubstate:juris}{%
+ \printfield{usera}%notacomm
+ \newunit\newblock
+ \printfield{addendum}%
+ \newunit\newblock
+ \printfield{pubstate}%
+ \ifdefstring{\bbx@origfields}{none}{}{%
+ \newunit\newblock
+ \usebibmacro{origdata:article-inbook}}%
+ \newunit\newblock
+ \usebibmacro{library}}
+
\DeclareBibliographyDriver{jurisdiction}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -1366,6 +1383,7 @@
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
+ \iffieldundef{booktitle}{}{%
\usebibmacro{in:}%
\usebibmacro{maintitle+booktitle}%
\newunit\newblock
@@ -1391,19 +1409,20 @@
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
- \newunit\newblock
+ \newunit\newblock}
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate:article-inbook-incoll}%
+ \usebibmacro{addendum+pubstate:juris}%
\setunit{\addsemicolon\space}\newblock
\usebibmacro{related}%
\newunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
\DeclareStyleSourcemap{
-\maps{
+\maps[datatype=bibtex]{
\map{
\step[fieldsource=court , fieldtarget=author]
+ \step[fieldsource=notacomm , fieldtarget=usera]
\step[fieldsource=section , fieldtarget=nameaddon]
\step[fieldsource=transtitle , fieldtarget=origtitle]
\step[fieldsource=tranpublisher , fieldtarget=origpublisher]
@@ -1418,6 +1437,11 @@
}
}
\DeclareDataInheritance{*}{*}{\noinherit{annotation}}
+
+\DeclareFieldAlias[jurisdiction]{usera}[jurisdiction]{notacomm}
+\DeclareFieldAlias[jurisdiction]{nameadddon}[jurisdiction]{section}
+\DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court}
+
%%
%% 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 888a4c14c95..582b192f9b0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -13,21 +13,21 @@
%% License information appended
%%
\ProvidesFile{philosophy-verbose.bbx}
- [2013/04/13 v0.8e valbusa beta]
+ [2013/06/20 v0.8f valbusa beta]
\RequireBibliographyStyle{authortitle}
\RequireBibliographyStyle{philosophy-standard}
-\AtBeginShorthands{
- \togglefalse{bbx:annotation}
- \DeclareCiteCommand{\bbx@crossref@inbook}
+\AtBeginShorthands{%
+ \togglefalse{bbx:annotation}%
+ \DeclareCiteCommand{\bbx@crossref@inbook}%
{}%
{\iffieldundef{shorthand}%
{\usebibmacro{inbook:full}}%
{\usebibmacro{cite:shorthand}}}%
{}%
{}%
-\DeclareCiteCommand{\bbx@crossref@incollection}
+\DeclareCiteCommand{\bbx@crossref@incollection}%
{}%
{\iffieldundef{shorthand}%
{\usebibmacro{incollection:full}}%
@@ -36,41 +36,41 @@
{}%
}
\renewbibmacro*{author}{%
- \ifboolexpr{
+ \ifboolexpr{%
test \ifuseauthor
and
not test {\ifnameundef{author}}
- }
- {\usebibmacro{bbx:dashcheck}
- {\bibnamedash}
+ }%
+ {\usebibmacro{bbx:dashcheck}%
+ {\bibnamedash}%
{\printnames{author}%
\iffieldundef{nameaddon}{}%
{\setunit{\addspace}%
\printtext[brackets]{\printfield{nameaddon}}}%
\setunit{\addcomma\space}%
\usebibmacro{bbx:savehash}}%
- \usebibmacro{authorstrg}}
- {\global\undef\bbx@lasthash}}
+ \usebibmacro{authorstrg}}%
+ {\global\undef\bbx@lasthash}}%
\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}
+ \usebibmacro{bbx:editor}{editorstrg}}%
\renewbibmacro*{editor+others}{%
- \usebibmacro{bbx:editor}{editor+othersstrg}}
+ \usebibmacro{bbx:editor}{editor+othersstrg}}%
\renewbibmacro*{bbx:editor}[1]{%
- \ifboolexpr{
+ \ifboolexpr{%
test \ifuseeditor
and
not test {\ifnameundef{editor}}
- }
- {\usebibmacro{bbx:dashcheck}
- {\bibnamedash}
+ }%
+ {\usebibmacro{bbx:dashcheck}%
+ {\bibnamedash}%
{\printnames{editor}%
\setunit{\addspace}% #MOD#
\usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
- \clearname{editor}}
- {\global\undef\bbx@lasthash}}
-\DeclareCiteCommand{\bbx@crossref@inbook}
+ \clearname{editor}}%
+ {\global\undef\bbx@lasthash}}%
+\DeclareCiteCommand{\bbx@crossref@inbook}%
{}%
{\ifciteseen{%
\ifthenelse{\value{listtotal}=2}%
@@ -86,7 +86,7 @@
{\thefield{entrytype}}}}%
{}%
{}%
-\DeclareCiteCommand{\bbx@crossref@incollection}
+\DeclareCiteCommand{\bbx@crossref@incollection}%
{}%
{\ifciteseen{%
\ifthenelse{\value{listtotal}=2}%
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 daa7fe87b6e..409a242bef3 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/04/13 v0.8e valbusa beta]
+ [2013/06/20 v0.8f valbusa beta]
\RequireCitationStyle{verbose-trad2}
@@ -41,24 +41,30 @@
\iftoggle{cbx:latinemph}{\renewcommand*{\mkibid}{\emph}}{}%
\iftoggle{cbx:scauthorscite}{%
\DeclareNameFormat{labelname}{%
-\ifcase\value{uniquename}%
- \usebibmacro{name:last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}%
-\or
- \ifuseprefix
- {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#8}}}%
- {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#6}}{\textsc{#8}}}%
-\or
- \usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}%
-\fi
-\usebibmacro{name:andothers}}}{}}
+\renewcommand{\mkbibnamefirst}{\textsc}%
+\renewcommand{\mkbibnamelast}{\textsc}%
+\renewcommand{\mkbibnameprefix}{\textsc}%
+\renewcommand{\mkbibnameaffix}{\textsc}%
+ \ifcase\value{uniquename}%
+ \usebibmacro{name:last}{#1}{#3}{#5}{#7}%
+ \or
+ \ifuseprefix
+ {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}%
+ {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}%
+ \or
+ \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+ \fi
+ \usebibmacro{name:andothers}}}{}}%
\DeclareNameFormat{scdefault}{%
-\iffirstinits
- {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}}
- {\ifblank{#3}%
- {\usebibmacro{name:first-last}{\textsc{#1}}{#3}{#5}{\textsc{#7}}}%
- {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}%
-\usebibmacro{name:andothers}}
+\renewcommand{\mkbibnamefirst}{\textsc}%
+\renewcommand{\mkbibnamelast}{\textsc}%
+\renewcommand{\mkbibnameprefix}{\textsc}%
+\renewcommand{\mkbibnameaffix}{\textsc}%
+ \iffirstinits
+ {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}%
+ {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}%
+ \usebibmacro{name:andothers}}
\newbibmacro*{cite:opcit}{%
\printtext[bibhyperlink]{\bibstring[\mkibid]{opcit}}}