summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-philosophy
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-16 22:19:13 +0000
committerKarl Berry <karl@freefriends.org>2017-04-16 22:19:13 +0000
commitb364f92b27a4d5a7f91bc65ced2abf2afa90c230 (patch)
tree4b4b10e593b7d14c5052c6139a5db781bd9f7709 /Master/texmf-dist/tex/latex/biblatex-philosophy
parent4ced71c3924d49982b3a67a7e2967fe29ef3241c (diff)
biblatex-philosophy (14apr17)
git-svn-id: svn://tug.org/texlive/trunk@43860 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.lbx33
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx57
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx205
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx396
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx288
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx346
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx504
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx115
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx117
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx57
11 files changed, 1105 insertions, 1024 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 e92e571d153..dcf52ebc806 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
@@ -13,31 +13,32 @@
%% License information appended
%%
\ProvidesFile{english-philosophy.lbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
\InheritBibliographyExtras{english}
\DeclareBibliographyExtras{%
-\protected\def\bibrangedash{%
- -\penalty\hyphenpenalty}%
- \protected\def\bibdatedash{\textendash}}%
+\protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+\protected\def\bibdaterangesep{\bibrangedash}%
+}%
\NewBibliographyString{opcited}
\DeclareBibliographyStrings{%
- inherit = {english},
- opcited = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
- opcit = {{cit\adddot}{cit\adddot}},
- ibidem = {{ibid\adddot}{ibid\adddot}},
- loccit = {{ibid\adddot}{ibid\adddot}},
- translationas = {{trans\adddot}{trans\adddot}},
- withcommentator = {{commentary by}{comment\adddot\ by}},
- withannotator = {{annotations by}{annots\adddot\ by}},
- withintroduction = {{introduction by}{intro\adddot\ by}},
- withforeword = {{foreword by}{forew\adddot\ by}},
- withafterword = {{afterword by}{afterw\adddot\ by}}
+ inherit = {english},
+ opcited = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+ opcit = {{cit\adddot}{cit\adddot}},
+ ibidem = {{ibid\adddot}{ibid\adddot}},
+ loccit = {{ibid\adddot}{ibid\adddot}},
+ translationas = {{trans\adddot}{trans\adddot}},
+ withcommentator = {{commentary by}{comment\adddot\ by}},
+ withannotator = {{annotations by}{annots\adddot\ by}},
+ withintroduction = {{introduction by}{intro\adddot\ by}},
+ withforeword = {{foreword by}{forew\adddot\ by}},
+ withafterword = {{afterword by}{afterw\adddot\ by}}
+ andothers = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+ andmore = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
}
%%
%% Copyright 2009-2017 by Ivan Valbusa
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx
new file mode 100644
index 00000000000..25a7a72da55
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx
@@ -0,0 +1,57 @@
+%%
+%% This is file `french-philosophy.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx (with options: `french-lbx')
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
+%%
+%% License information appended
+%%
+\ProvidesFile{french-philosophy.lbx}
+[2017/04/13 v1.9.5 A set of styles for biblatex]
+
+
+\InheritBibliographyExtras{french}
+
+\DeclareBibliographyExtras{%
+\protected\def\mkbibnamefamily#1{#1}%
+\protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+\protected\def\bibdaterangesep{\bibrangedash}%
+}%
+
+\NewBibliographyString{opcited}
+
+\DeclareBibliographyStrings{%
+ inherit = {french},
+ opcited = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+ opcit = {{cit\adddot}{cit\adddot}},%%FIXME
+ ibidem = {{ibid\adddot}{ibid\adddot}},%%FIXME
+ loccit = {{ibid\adddot}{ibid\adddot}},%%FIXME
+ translationas = {{trad\adddot}{trad\adddot}},%%FIXME
+ withcommentator = {{commentaires \smartof}{comment\adddotspace\smartof}},%%FIXME
+ withannotator = {{annotations \smartof}{annot\adddotspace\smartof}},%%FIXME
+ withintroduction = {{introduction \smartof}{introd\adddotspace\smartof}},%%FIXME
+ withforeword = {{pr\'eface \smartof}{pr\'ef\adddotspace\smartof}},%%FIXME
+ withafterword = {{postface \smartof}{postf\adddotspace\smartof}}%%FIXME
+ andothers = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+ andmore = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+ }
+%%
+%% Copyright 2009-2017 by Ivan Valbusa
+%%
+%% This program is provided under the terms of the
+%% LaTeX Project Public License distributed from CTAN
+%% archives in directory macros/latex/base/lppl.txt.
+%%
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
+%%
+%% This work has the LPPL maintenance status "author-maintained".
+%%
+%%
+%% End of file `french-philosophy.lbx'.
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 58edc25fb44..32f5c27a36e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
@@ -13,47 +13,48 @@
%% License information appended
%%
\ProvidesFile{italian-philosophy.lbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
\InheritBibliographyExtras{italian}
\DeclareBibliographyExtras{%
-\protected\def\bibrangedash{%
- -\penalty\hyphenpenalty}%
- \protected\def\bibdatedash{\textendash}}%
+ \protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+ \protected\def\bibdaterangesep{\bibrangedash}%
+}%
\NewBibliographyString{opcited}
\DeclareBibliographyStrings{%
- inherit = {italian},
- opcited = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
- ibidem = {{ivi}{ivi}},
- loccit = {{ibidem}{ibidem}},
- editor = {{a cura di}{a cura di}},
- editors = {{a cura di}{a cura di}},
- backrefpage = {{citato a pagina}{citato a \bibsstring{page}\adddot}},
- backrefpages = {{citato alle pagine}{citato alle \bibsstring{pages}\adddot}},
- nodate = {{senza data}{s\adddot d\adddot}},
- volumes = {{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol\adddot}}},
- pages = {{pagine}{\iftoggle{bbx:classical}{pp\adddot}{p\adddot}}},
- columns = {{colonne}{\iftoggle{bbx:classical}{coll\adddot}{col\adddot}}},
- lines = {{righe}{\iftoggle{bbx:classical}{rr\adddot}{r\adddot}}},
- verses = {{versi}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}},
- paragraphs = {{paragrafi}{\iftoggle{bbx:classical}{parr\adddot}{par\adddot}}},
- section = {{sezione}{sez\adddot}},
- sections = {{sezioni}{\iftoggle{bbx:classical}{sezz\adddot}{sez\adddot}}},
- withcommentator = {{commenti di}{commenti di}},
- withannotator = {{annotazioni di}{annotazioni di}},
- withintroduction = {{introduzione di}{introduzione di}},
- withforeword = {{prefazione di}{prefazione di}},
- withafterword = {{postfazione di}{postfazione di}},
- origpubas = {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}},
- bypublisher = {{\addcomma\space}{\addcomma\space}},
- astitle = {{come}{come}},
- reviewof = {{recensione di}{rec\adddotspace di}},
- byreviser = {{revisione di}{rev\adddotspace di}},
- translationof = {{traduzione di}{trad\adddotspace di}},
- translationas = {{traduzione italiana}{trad\adddotspace it\adddot}}
+ inherit = {italian},
+ opcited = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+ ibidem = {{ivi}{ivi}},
+ loccit = {{ibidem}{ibidem}},
+ editor = {{a cura di}{a cura di}},
+ editors = {{a cura di}{a cura di}},
+ backrefpage = {{citato a pagina}{citato a \bibsstring{page}\adddot}},
+ backrefpages = {{citato alle pagine}{citato alle \bibsstring{pages}\adddot}},
+ nodate = {{senza data}{s\adddot d\adddot}},
+ volumes = {{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol\adddot}}},
+ pages = {{pagine}{\iftoggle{bbx:classical}{pp\adddot}{p\adddot}}},
+ columns = {{colonne}{\iftoggle{bbx:classical}{coll\adddot}{col\adddot}}},
+ lines = {{righe}{\iftoggle{bbx:classical}{rr\adddot}{r\adddot}}},
+ verses = {{versi}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}},
+ paragraphs = {{paragrafi}{\iftoggle{bbx:classical}{parr\adddot}{par\adddot}}},
+ byreviser = {{revisione di}{rev\adddotspace di}},
+ translationof = {{traduzione di}{trad\adddotspace di}},
+ translationas = {{traduzione italiana}{trad\adddotspace it\adddot}},
+ reviewof = {{recensione di}{rec\adddotspace di}},
+ origpubas = {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}},
+ astitle = {{come}{come}},
+ bypublisher = {{\addcomma\space}{\addcomma\space}},
+ section = {{sezione}{sez\adddot}},
+ sections = {{sezioni}{\iftoggle{bbx:classical}{sezz\adddot}{sez\adddot}}},
+ withcommentator = {{commenti di}{commenti di}},
+ withannotator = {{annotazioni di}{annotazioni di}},
+ withintroduction = {{introduzione di}{introduzione di}},
+ withforeword = {{prefazione di}{prefazione di}},
+ withafterword = {{postfazione di}{postfazione di}},
+ andothers = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+ andmore = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
reviser = {{revisore}{rev\adddot}},% FIXME: missing
revisers = {{revisori}{rev\adddot}},% FIXME: missing
founder = {{fondatore}{fond\adddot}},% FIXME: missing
@@ -61,141 +62,141 @@
continuator = {{continuatore}{cont\adddot}},% FIXME: missing
continuators = {{continuatori}{cont\adddot}},% FIXME: missing
editortr = {{curatore e traduttore}% FIXME: missing
- {cur\adddotspace e trad\adddot}},
+ {cur\adddotspace e trad\adddot}},
editorstr = {{curatori e traduttori}% FIXME: missing
- {cur\adddotspace e trad\adddot}},
+ {cur\adddotspace e trad\adddot}},
editorco = {{curatore e commentatore}% FIXME: missing
- {cur\adddotspace e comm\adddot}},
+ {cur\adddotspace e comm\adddot}},
editorsco = {{curatori e commentatori}% FIXME: missing
- {cur\adddotspace e comm\adddot}},
+ {cur\adddotspace e comm\adddot}},
editoran = {{curatore e annotatore}% FIXME: missing
- {cur\adddotspace e annot\adddot}},
+ {cur\adddotspace e annot\adddot}},
editorsan = {{curatori e annotatori}% FIXME: missing
- {cur\adddotspace e annot\adddot}},
+ {cur\adddotspace e annot\adddot}},
editorin = {{curatore e introduzione}% FIXME: missing
- {cur\adddotspace e introd\adddot}},
+ {cur\adddotspace e introd\adddot}},
editorsin = {{curatori e introduzione}% FIXME: missing
- {cur\adddotspace e introd\adddot}},
+ {cur\adddotspace e introd\adddot}},
editorfo = {{curatore e prefazione}% FIXME: missing
- {cur\adddotspace e pref\adddot}},
+ {cur\adddotspace e pref\adddot}},
editorsfo = {{curatori e prefazione}% FIXME: missing
- {cur\adddotspace e pref\adddot}},
+ {cur\adddotspace e pref\adddot}},
editoraf = {{curatore e postfazione}% FIXME: missing
- {cur\adddotspace e postf\adddot}},
+ {cur\adddotspace e postf\adddot}},
editorsaf = {{curatori e postfazione}% FIXME: missing
- {cur\adddotspace e postf\adddot}},
+ {cur\adddotspace e postf\adddot}},
editortrco = {{curatore, traduttore\finalandcomma\ e commentatore}% FIXME: missing
- {ed.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
+ {ed.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
editorstrco = {{curatori, traduttori\finalandcomma\ e commentatori}% FIXME: missing
- {eds.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
+ {eds.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
editortran = {{curatore, traduttore\finalandcomma\ e annotatore}% FIXME: missing
- {ed.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
+ {ed.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
editorstran = {{curatori, traduttori\finalandcomma\ e annotatori}% FIXME: missing
- {eds.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
+ {eds.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
editortrin = {{curatore, traduttore\finalandcomma\ e introduzione}% FIXME: missing
- {ed.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
+ {ed.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
editorstrin = {{curatori, traduttori\finalandcomma\ e introduzione}% FIXME: missing
- {eds.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
+ {eds.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
editortrfo = {{curatore, traduttore\finalandcomma\ e prefazione}% FIXME: missing
- {ed.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
+ {ed.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
editorstrfo = {{curatori, traduttori\finalandcomma\ e prefazione}% FIXME: missing
- {eds.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
+ {eds.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
editortraf = {{curatore, traduttore\finalandcomma\ e postfazione}% FIXME: missing
- {ed.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
+ {ed.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
editorstraf = {{curatori, traduttori\finalandcomma\ e postfazione}% FIXME: missing
- {eds.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
+ {eds.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
editorcoin = {{curatore, commentatore\finalandcomma\ e introduzione}% FIXME: missing
- {ed.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
+ {ed.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
editorscoin = {{curatori, commentatori\finalandcomma\ e introduzione}% FIXME: missing
- {eds.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
+ {eds.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
editorcofo = {{curatore, commentatore\finalandcomma\ e prefazione}% FIXME: missing
- {ed.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
+ {ed.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
editorscofo = {{curatori, commentatori\finalandcomma\ e prefazione}% FIXME: missing
- {eds.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
+ {eds.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
editorcoaf = {{curatore, commentatore\finalandcomma\ e postfazione}% FIXME: missing
- {ed.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
+ {ed.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
editorscoaf = {{curatori, commentatori\finalandcomma\ e postfazione}% FIXME: missing
- {eds.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
+ {eds.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
editoranin = {{curatore, annotatore\finalandcomma\ e introduzione}% FIXME: missing
- {ed.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
+ {ed.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
editorsanin = {{curatori, annotatori\finalandcomma\ e introduzione}% FIXME: missing
- {eds.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
+ {eds.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
editoranfo = {{curatore, annotatore\finalandcomma\ e prefazione}% FIXME: missing
- {ed.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
+ {ed.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
editorsanfo = {{curatori, annotatori\finalandcomma\ e prefazione}% FIXME: missing
- {eds.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
+ {eds.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
editoranaf = {{curatore, annotatore\finalandcomma\ e postfazione}% FIXME: missing
- {ed.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}},
+ {ed.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}},
editorsanaf = {{curatori, annotatori\finalandcomma\ e postfazione}% FIXME: missing
- {eds.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}},
+ {eds.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}},
editortrcoin = {{curatore, traduttore, commentatore\finalandcomma\ e introduzione}% FIXME: missing
- {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e introd\adddot}},
+ {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e introd\adddot}},
editorstrcoin = {{curatori, traduttori, commentatori\finalandcomma\ e introduzione}% FIXME: missing
- {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e introd\adddot}},
+ {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e introd\adddot}},
editortrcofo = {{curatore, traduttore, commentatore\finalandcomma\ e prefazione}% FIXME: missing
- {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e pref\adddot}},
+ {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e pref\adddot}},
editorstrcofo = {{curatori, traduttori, commentatori\finalandcomma\ e prefazione}% FIXME: missing
- {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e pref\adddot}},
+ {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e pref\adddot}},
editortrcoaf = {{curatore, traduttore, commentatore\finalandcomma\ e postfazione}% FIXME: missing
- {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e postf\adddot}},
+ {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e postf\adddot}},
editorstrcoaf = {{curatori, traduttori, commentatori\finalandcomma\ e postfazione}% FIXME: missing
- {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e postf\adddot}},
+ {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e postf\adddot}},
editortranin = {{curatore, traduttore, annotatore\finalandcomma\ e introduzione}% FIXME: missing
- {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e introd\adddot}},
+ {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e introd\adddot}},
editorstranin = {{curatori, traduttori, annotatori\finalandcomma\ e introduzione}% FIXME: missing
- {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e introd\adddot}},
+ {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e introd\adddot}},
editortranfo = {{curatore, traduttore, annotatore\finalandcomma\ e prefazione}% FIXME: missing
- {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e pref\adddot}},
+ {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e pref\adddot}},
editorstranfo = {{curatori, traduttori, annotatori\finalandcomma\ e prefazione}% FIXME: missing
- {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e pref\adddot}},
+ {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e pref\adddot}},
editortranaf = {{curatore, traduttore, annotatore\finalandcomma\ e postfazione}% FIXME: missing
- {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e postf\adddot}},
+ {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e postf\adddot}},
editorstranaf = {{curatori, traduttori, annotatori\finalandcomma\ e postfazione}% FIXME: missing
- {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e postf\adddot}},
+ {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e postf\adddot}},
translatorco = {{traduttore e commentatore}% FIXME: missing
- {trad\adddot\ e comm\adddot}},
+ {trad\adddot\ e comm\adddot}},
translatorsco = {{traduttori e commentatori}% FIXME: missing
- {trad\adddot\ e comm\adddot}},
+ {trad\adddot\ e comm\adddot}},
translatoran = {{traduttore e annotatore}% FIXME: missing
- {trad\adddot\ e annot\adddot}},
+ {trad\adddot\ e annot\adddot}},
translatorsan = {{traduttori e annotatori}% FIXME: missing
- {trad\adddot\ e annot\adddot}},
+ {trad\adddot\ e annot\adddot}},
translatorin = {{traduzione e introduzione}% FIXME: missing
- {trad\adddot\ e introd\adddot}},
+ {trad\adddot\ e introd\adddot}},
translatorsin = {{traduzione e introduzione}% FIXME: missing
- {trad\adddot\ e introd\adddot}},
+ {trad\adddot\ e introd\adddot}},
translatorfo = {{traduzione e prefazione}% FIXME: missing
- {trad\adddot\ e pref\adddot}},
+ {trad\adddot\ e pref\adddot}},
translatorsfo = {{traduzione e prefazione}% FIXME: missing
- {trad\adddot\ e pref\adddot}},
+ {trad\adddot\ e pref\adddot}},
translatoraf = {{traduzione e postfazione}% FIXME: missing
- {trad\adddot\ e postf\adddot}},
+ {trad\adddot\ e postf\adddot}},
translatorsaf = {{traduzione e postfazione}% FIXME: missing
- {trad\adddot\ e postf\adddot}},
+ {trad\adddot\ e postf\adddot}},
translatorcoin = {{traduzione, commenti\finalandcomma\ e introduzione}% FIXME: missing
- {trans., comm\adddot\finalandcomma\ e introd\adddot}},
+ {trans., comm\adddot\finalandcomma\ e introd\adddot}},
translatorscoin = {{traduzione, commenti\finalandcomma\ e introduzione}% FIXME: missing
- {trans., comm\adddot\finalandcomma\ e introd\adddot}},
+ {trans., comm\adddot\finalandcomma\ e introd\adddot}},
translatorcofo = {{traduzione, commenti\finalandcomma\ e prefazione}% FIXME: missing
- {trans., comm\adddot\finalandcomma\ e pref\adddot}},
+ {trans., comm\adddot\finalandcomma\ e pref\adddot}},
translatorscofo = {{traduzione, commenti\finalandcomma\ e prefazione}% FIXME: missing
- {trans., comm\adddot\finalandcomma\ e pref\adddot}},
+ {trans., comm\adddot\finalandcomma\ e pref\adddot}},
translatorcoaf = {{traduzione, commenti\finalandcomma\ e postfazione}% FIXME: missing
- {trans., comm\adddot\finalandcomma\ e postf\adddot}},
+ {trans., comm\adddot\finalandcomma\ e postf\adddot}},
translatorscoaf = {{traduzione, commenti\finalandcomma\ e postfazione}% FIXME: missing
- {trans., comm\adddot\finalandcomma\ e postf\adddot}},
+ {trans., comm\adddot\finalandcomma\ e postf\adddot}},
translatoranin = {{traduzione, annotazioni\finalandcomma\ e introduzione}% FIXME: missing
- {trans., annot\adddot\finalandcomma\ e introd\adddot}},
+ {trans., annot\adddot\finalandcomma\ e introd\adddot}},
translatorsanin = {{traduzione, annotazioni\finalandcomma\ e introduzione}% FIXME: missing
- {trans., annot\adddot\finalandcomma\ e introd\adddot}},
+ {trans., annot\adddot\finalandcomma\ e introd\adddot}},
translatoranfo = {{traduzione, annotazioni\finalandcomma\ e prefazione}% FIXME: missing
- {trans., annot\adddot\finalandcomma\ e pref\adddot}},
+ {trans., annot\adddot\finalandcomma\ e pref\adddot}},
translatorsanfo = {{traduzione, annotazioni\finalandcomma\ e prefazione}% FIXME: missing
- {trans., annot\adddot\finalandcomma\ e pref\adddot}},
+ {trans., annot\adddot\finalandcomma\ e pref\adddot}},
translatoranaf = {{traduzione, annotazioni\finalandcomma\ e postfazione}% FIXME: missing
- {trans., annot\adddot\finalandcomma\ e postf\adddot}},
+ {trans., annot\adddot\finalandcomma\ e postf\adddot}},
translatorsanaf = {{traduzione, annotazioni\finalandcomma\ e postfazione}% FIXME: missing
- {trans., annot\adddot\finalandcomma\ e postf\adddot}},
+ {trans., annot\adddot\finalandcomma\ e postf\adddot}},
byreviewer = {{recensito da}{rec\adddotspace da}},% FIXME: missing: UNSURE
byfounder = {{fondato da}{fond\adddotspace da}},% FIXME: missing
bycontinuator = {{continuato da}{cont\adddotspace da}},% FIXME: missing: UNSURE
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 9c96745039f..8bf0089640b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -13,8 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-classic.bbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
\RequireBibliographyStyle{authoryear}
@@ -27,18 +26,160 @@
\settoggle{bbx:square}{#1}}
\DeclareBibliographyOption{nodate}[true]{%
\settoggle{bbx:nodate}{#1}}
+\define@key{blx@bib1}{nodate}[]{}%
+\define@key{blx@bib2}{nodate}[true]{%
+ \ifstrequal{#1}{false}{\togglefalse{bbx:nodate}}{}}%
+\def\bbx@opt@mergedate@maximum{%
+ \renewbibmacro*{date+extrayear}{%
+ \ifboolexpr{%
+ test {\iffieldundef{date}}
+ and
+ test {\iffieldundef{year}}
+ }%
+ {\usebibmacro{bbx:nodate}}
+ {\postsepyear{%
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \iffieldsequal{year}{labelyear}
+ {\printlabeldateextra}%
+ {\printfield{labelyear}%
+ \printfield{extrayear}}%
+ }}}%
+ \renewbibmacro*{date}{}%
+ \renewbibmacro*{issue+date}{}}
+
+\def\bbx@opt@mergedate@compact{%
+ \renewbibmacro*{date+extrayear}{%
+ \ifboolexpr{%
+ test {\iffieldundef{date}}
+ and
+ test {\iffieldundef{year}}
+ }%
+ {\usebibmacro{bbx:nodate}}
+ {\postsepyear{%
+ \iffieldsequal{year}{labelyear}
+ {\printlabeldateextra}%
+ {\printfield{labelyear}%
+ \printfield{extrayear}}%
+ }}}%
+ \renewbibmacro*{date}{}%
+ \renewbibmacro*{issue+date}{%
+ \iffieldundef{issue}
+ {}
+ {\ifdefstring{\bbx@volnumformat}{parens}%
+ {\printtext{%
+ \printfield{issue}%
+ \printdate}}%
+ {\printtext[pureparens]{%
+ \printfield{issue}}}}%
+ \newunit}}
+
+\def\bbx@opt@mergedate@basic{%
+ \renewbibmacro*{date+extrayear}{%
+ \ifboolexpr{%
+ test {\iffieldundef{date}}
+ and
+ test {\iffieldundef{year}}
+ }%
+ {\usebibmacro{bbx:nodate}}
+ {\postsepyear{%
+ \printfield{labelyear}%
+ \printfield{extrayear}%
+ }}}%
+ \renewbibmacro*{date}{%
+ \iffieldundef{month}
+ {}
+ {\printdate}}%
+ \renewbibmacro*{issue+date}{%
+ \ifboolexpr{
+ test {\iffieldundef{issue}}
+ and
+ test {\iffieldundef{month}}
+ }
+ {}
+ {\ifdefstring{\bbx@volnumformat}{parens}%
+ {\printtext{%
+ \printfield{issue}\setunit*{\addspace}%
+ \printdate}}%
+ {\printtext[pureparens]{%
+ \printfield{issue}\setunit*{\addspace}%
+ \printdate}}}%
+ \newunit}}
+
+\def\bbx@opt@mergedate@minimum{%
+ \renewbibmacro*{date+extrayear}{%
+ \ifboolexpr{%
+ test {\iffieldundef{date}}
+ and
+ test {\iffieldundef{year}}
+ }%
+ {\usebibmacro{bbx:nodate}}
+ {\postsepyear{%
+ \printfield{labelyear}%
+ \printfield{extrayear}%
+ }}}%
+ \renewbibmacro*{date}{%
+ \ifboolexpr{
+ test {\iffieldundef{month}}
+ and
+ test {\iffieldundef{extrayear}}
+ }
+ {}
+ {\printdate}}%
+ \renewbibmacro*{issue+date}{%
+ \ifboolexpr{
+ test {\iffieldundef{issue}}
+ and
+ test {\iffieldundef{month}}
+ and
+ test {\iffieldundef{extrayear}}
+ }
+ {}
+ {\ifdefstring{\bbx@volnumformat}{parens}%
+ {\printtext{%
+ \printfield{issue}\setunit*{\addspace}%
+ \printdate}}%
+ {\printtext[pureparens]{%
+ \printfield{issue}\setunit*{\addspace}%
+ \printdate}}}%
+ \newunit}}
+\def\bbx@opt@mergedate@false{%
+ \renewbibmacro*{date+extrayear}{%
+ \ifboolexpr{%
+ test {\iffieldundef{date}}
+ and
+ test {\iffieldundef{year}}
+ }%
+ {\usebibmacro{bbx:nodate}}
+ {\postsepyear{%
+ \printfield{labelyear}%
+ \printfield{extrayear}%
+ }}}%
+ \renewbibmacro*{date}{\printdate}%
+ \renewbibmacro*{issue+date}{%
+ {\ifdefstring{\bbx@volnumformat}{parens}%
+ {\printtext{%
+ \printfield{issue}\setunit*{\addspace}%
+ \printdate}}%
+ {\printtext[pureparens]{%
+ \printfield{issue}\setunit*{\addspace}%
+ \printdate}}}}}
\ExecuteBibliographyOptions{%
nodate = true,
+ mergedate = basic,
uniquename = false,
pagetracker = true,
singletitle = false,
square = false,
- mergedate = basic,
dashed = true,
}
+\newcommand*{\postsepyear}[1]{%
+ \printtext[parens]{#1}}
+\newbibmacro*{bbx:nodate}{%
+ \iftoggle{bbx:nodate}{%
+ \postsepyear{\midsentence\bibstring{nodate}}{}}}
\AtBeginShorthands{%
-\togglefalse{bbx:annotation}%
\renewcommand{\labelnamepunct}{\addcomma\space}%
\renewbibmacro*{relateddate}{%
\setunit*{\addspace}%
@@ -46,8 +187,11 @@
\renewbibmacro*{commarelateddate}{%
\setunit*{\addcomma\space}%
\printdate}%
+\savebibmacro{date+extrayear}
+\renewbibmacro*{date+extrayear}{}
\DeclareCiteCommand{\bbx@crossref@inbook}
- {}%
+ {\renewcommand*{\postsepyear}{\printtext[parens]}%
+ \restorebibmacro{date+extrayear}}%
{\iffieldundef{shorthand}{%
\usebibmacro{citeindex}%
\ifuseeditor{%
@@ -56,12 +200,13 @@
{\printnames[][-\value{minnamesincross}]{labelname}}}%
{\usebibmacro{labeltitle}}%
\setunit*{\addspace}%
- \usebibmacro{date+extrayear:crossref}}%
+ \usebibmacro{date+extrayear}}%
{\usebibmacro{cite:shorthand}}}%
{}%
{}%
\DeclareCiteCommand{\bbx@crossref@incollection}%
- {}%
+ {\renewcommand*{\postsepyear}{\printtext[parens]}%
+ \restorebibmacro{date+extrayear}}%
{\iffieldundef{shorthand}{%
\usebibmacro{citeindex}%
\ifuseeditor{%
@@ -70,210 +215,100 @@
{\printnames[][-\value{minnamesincross}]{labelname}}}%
{\usebibmacro{labeltitle}}%
\setunit*{\addspace}%
- \usebibmacro{date+extrayear:crossref}}%
+ \usebibmacro{date+extrayear}}%
{\usebibmacro{cite:shorthand}}}%
{}%
{}%
-\newbibmacro*{date+extrayear:crossref}{%
- \begingroup%
- \clearfield{month}%
- \clearfield{day}%
- \ifboolexpr{%
- test {\iffieldundef{date}}
- and
- test {\iffieldundef{year}}
- }%
- {\iftoggle{bbx:nodate}{\printtext[parens]{%
- \midsentence\bibstring{nodate}}}{}}%
- {\printtext[parens]{\printdateextra}}%
- \endgroup}%
-\newbibmacro*{date+extrayear}{}%
-\renewbibmacro*{date}{\printdate}%
-\renewbibmacro*{issue+date}{%
- \printtext[pureparens]{%
- \iffieldundef{issue}
- {\usebibmacro{date}}
- {\printfield{issue}%
- \setunit*{\addspace}%
- \usebibmacro{date}}}%
- \newunit}
}%
-
\AtBeginDocument{%
+ \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}}{}
\iftoggle{bbx:square}
{\renewcommand{\bibopenparen}{\bibopenbracket}%
- \renewcommand{\bibcloseparen}{\bibclosebracket}}%
+ \renewcommand{\bibcloseparen}{\bibclosebracket}}%
{}%
\setcounter{maxnamesincross}{\value{maxnames}}%
\setcounter{minnamesincross}{\value{minnames}}%
}%
-\DeclareNameFormat{labelname}{%
-\nameparts{#1}%
-\bibhyperref{\ifcase\value{uniquename}%
-\usebibmacro{name:family}
-{\namepartfamily}
-{\namepartgiven}
-{\namepartprefix}
-{\namepartsuffix}%
-\or
-\ifuseprefix
-{\usebibmacro{name:given-family}
-{\namepartfamily}
-{\namepartgiveni}
-{\namepartprefix}
-{\namepartsuffixi}}
-{\usebibmacro{name:given-family}
-{\namepartfamily}
-{\namepartgiveni}
-{\namepartprefixi}
-{\namepartsuffixi}}%
-\or
-\usebibmacro{name:given-family}
-{\namepartfamily}
-{\namepartgiven}
-{\namepartprefix}
-{\namepartsuffix}%
-\fi
-\usebibmacro{name:andothers}}}
-
\AtEveryBibitem{%
-\iffieldequalstr{entrysubtype}{classic}{%
- \togglefalse{bbx:nodate}}}%
+ \iffieldequalstr{entrysubtype}{classic}{%
+ \togglefalse{bbx:nodate}}%
+}%
\renewbibmacro*{relateddate}{}
\renewbibmacro*{commarelateddate}{}
- \renewbibmacro*{issue+date}{%
- \ifboolexpr{%
- test {\iffieldundef{issue}}
- and
- test {\iffieldundef{month}}
- }%
- {}%
- {\ifdefstring{\bbx@volnumformat}{parens}%
- {\printtext{%
- \printfield{issue}\setunit*{\addspace}%
- \printdate}}%
- {\printtext[pureparens]{%
- \printfield{issue}\setunit*{\addspace}%
- \printdate}}}%
- \newunit}%
-\renewbibmacro*{date+extrayear}{%
- \begingroup%
- \clearfield{month}%
- \clearfield{day}%
- \ifboolexpr{%
- test {\iffieldundef{date}}
- and
- test {\iffieldundef{year}}
- }%
- {\iftoggle{bbx:nodate}{\printtext[parens]{%
- \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}}%
- {\setunit{\addcomma\space}}}%
- \iffieldundef{authortype}%
- {}%
+ \printtext[brackets]{\printfield{nameaddon}}}%*
+ \iffieldundef{authortype}
+ {\setunit{\printdelim{nameyeardelim}}}
+ {\setunit{\printdelim{editorstrgdelim}}}}%*
+ \iffieldundef{authortype}
+ {}
{\usebibmacro{authorstrg}%
-\setunit{\addspace}}}%
- {\global\undef\bbx@lasthash%
+ \setunit{\printdelim{nameyeardelim}}}}%
+ {\global\undef\bbx@lasthash
\usebibmacro{labeltitle}%
- \setunit*{\addspace}}%
- \usebibmacro{date+extrayear}}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extrayear}}
-\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}%
-\renewbibmacro*{editor+others}{%
- \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}}%
+ \setunit{\printdelim{editorstrgdelim}}%MOD
+ \usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
\clearname{editor}%
- \setunit{\addspace}}%
- {\global\undef\bbx@lasthash%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {\global\undef\bbx@lasthash
\usebibmacro{labeltitle}%
- \setunit*{\addspace}}%
- \usebibmacro{date+extrayear}}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extrayear}}
-\renewbibmacro*{translator}{%
-\usebibmacro{bbx:translator}{translatorstrg}}%
-\renewbibmacro*{translator+others}{%
-\usebibmacro{bbx:translator}{translator+othersstrg}}%
\renewbibmacro*{bbx:translator}[1]{%
-\ifboolexpr{%
-test \ifusetranslator
-and
-not test {\ifnameundef{translator}}
-}%
-{\usebibmacro{bbx:dashcheck}%
-{\bibnamedash}%
-{\printnames{translator}%
-\setunit{\addspace}%
-\usebibmacro{bbx:savehash}}%
-\usebibmacro{#1}%
-\clearname{translator}%
-\setunit{\addspace}}%
-{\global\undef\bbx@lasthash%
-\usebibmacro{labeltitle}%
-\setunit*{\addspace}}%
-\usebibmacro{date+extrayear}}%
-\renewbibmacro*{translatorstrg}{%
-\printtext[editortype]{%
-\ifboolexpr{
-test {\ifnumgreater{\value{translator}}{1}}
-or
-test {\ifandothers{translator}}
-}
-{\bibstring{translators}}
-{\bibstring{translator}}}}
-\renewbibmacro*{translator+othersstrg}{%
-\ifboolexpr{
-test {\ifnumgreater{\value{translator}}{1}}
-or
-test {\ifandothers{translator}}
-}
-{\def\abx@tempa{translators}}
-{\def\abx@tempa{translator}}%
-\ifnamesequal{translator}{commentator}
-{\appto\abx@tempa{co}%
-\clearname{commentator}}
-{\ifnamesequal{translator}{annotator}
-{\appto\abx@tempa{an}%
-\clearname{annotator}}
-{}}%
-\ifnamesequal{translator}{introduction}
-{\appto\abx@tempa{in}%
-\clearname{introduction}}
-{\ifnamesequal{translator}{foreword}
-{\appto\abx@tempa{fo}%
-\clearname{foreword}}
-{\ifnamesequal{translator}{afterword}
-{\appto\abx@tempa{af}%
-\clearname{afterword}}
-{}}}%
-\printtext[editortype]{\bibstring{\abx@tempa}}}
+ \ifboolexpr{
+ test \ifusetranslator
+ and
+ not test {\ifnameundef{translator}}
+ }
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}
+ {\printnames{translator}%
+ \setunit{\printdelim{editorstrgdelim}}%MOD
+ \usebibmacro{bbx:savehash}}%
+ \usebibmacro{#1}%MOD
+ \clearname{translator}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extrayear}}
+\renewbibmacro*{labeltitle}{%
+ \iffieldundef{label}
+ {\iffieldundef{shorttitle}
+ {\printfield{title}%
+ \clearfield{title}}
+ {\printfield[title]{shorttitle}}\blx@postpunct}
+ {\printfield{label}}}
\DeclareCiteCommand{\bbx@crossref@inbook}%
{}%
{\usebibmacro{citeindex}%
@@ -283,7 +318,7 @@ test {\ifandothers{translator}}
{\printnames[][-\value{minnamesincross}]{labelname}}}%
{\usebibmacro{labeltitle}}%
\setunit*{\addspace}%
- \usebibmacro{date+extrayear}}%
+ \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
{}%
{}%
\DeclareCiteCommand{\bbx@crossref@incollection}%
@@ -295,14 +330,9 @@ test {\ifandothers{translator}}
{\printnames[][-\value{minnamesincross}]{labelname}}}%
{\usebibmacro{labeltitle}}%
\setunit*{\addspace}%
- \usebibmacro{date+extrayear}}%
+ \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
{}%
{}%
-\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-2017 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 5cd071de7f6..6d339f95292 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
@@ -13,28 +13,24 @@
%% License information appended
%%
\ProvidesFile{philosophy-classic.cbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
\RequireCitationStyle{authoryear-comp}
-\ExecuteBibliographyOptions{%
- citetracker = true,
-}
-
-\AtEveryCite{%
- \iftoggle{cbx:scauthorscite}%
- {\let\mkbibnamefamily\mkbibsc%
- \let\mkbibnamegiven\mkbibsc%
- \let\mkbibnameprefix\mkbibsc%
- \let\mkbibnamesuffix\mkbibsc}%
- {}}%
+\ExecuteBibliographyOptions{citetracker}
-\newcommand{\switchclass}[2]{%
+\newcommand{\switchATAY}[2]{%
\iffieldequalstr{entrysubtype}{classic}%
{\usebibmacro{#1}}%
{\usebibmacro{#2}}}
+\newbibmacro*{cbx:testshorthand}[1]{%
+\ifboolexpr{
+ not test {\iftoggle{cbx:shorthandintro}}
+ or
+ test \ifciteseen}
+ {\usebibmacro{cite:shorthand}}{\usebibmacro{#1}%
+ \usebibmacro{shorthandintro}}}
\newbibmacro*{cite:init:AT}{%
\ifnumless{\value{multicitecount}}{2}
{\global\boolfalse{cbx:parens}%
@@ -46,24 +42,27 @@
\newbibmacro*{cite:reinit:AT}{%
\global\undef\cbx@lasthash}
-\newbibmacro*{cite:AT}{%
- \iffieldundef{shorthand}
- {\iffieldequals{namehash}{\cbx@lasthash}
- {\setunit{\compcitedelim}}%
+\newbibmacro*{cite:AT:noshorthand}{%
+\iffieldequals{namehash}{\cbx@lasthash}
+ {\setunit{\compcitedelim}}
{\ifnameundef{labelname}
{}%
{\printnames{labelname}%
- \setunit{\nametitledelim}}%
+ \setunit{\printdelim{nametitledelim}}}%
\savefield{namehash}{\cbx@lasthash}}%
\usebibmacro{cite:title:AT}}
- {\usebibmacro{cite:shorthand}%
+
+\newbibmacro*{cite:AT}{%
+ \iffieldundef{shorthand}
+ {\usebibmacro{cite:AT:noshorthand}}
+ {\usebibmacro{cbx:testshorthand}{cite:AT:noshorthand}%
\usebibmacro{cite:reinit:AT}}%
\setunit{\multicitedelim}}
\newbibmacro*{citetitle:AT}{%
\iffieldundef{shorthand}
{\usebibmacro{cite:title:AT}}%
- {\usebibmacro{cite:shorthand}}%
+ {\usebibmacro{cbx:testshorthand}{cite:title:AT}}%
\setunit{\multicitedelim}}
\newbibmacro*{textcite:AT}{%
@@ -73,24 +72,21 @@
{}%
{\printnames{labelname}%
\setunit{%
- \global\booltrue{cbx:parens}%
- \addspace\bibopenparen}}%
+ \global\booltrue{cbx:parens}%
+ \printdelim{nametitledelim}\bibopenparen}}%
+ \stepcounter{textcitecount}%
\savefield{namehash}{\cbx@lasthash}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
\iffieldundef{shorthand}
{\usebibmacro{cite:title:AT}}%
- {\iftoggle{cbx:shorthandintro}{%
- \ifciteseen{%
- \usebibmacro{cite:shorthand}}%
- {\usebibmacro{shorthandintro}}}%
- {\usebibmacro{cite:shorthand}}}%
+ {\usebibmacro{cbx:testshorthand}{cite:title:AT}}%
\setunit{%
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}
+ \textcitedelim}}
\newbibmacro*{cite:title:AT}{%
\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
@@ -99,20 +95,20 @@
\ifnameundef{labelname}
{\setunit{%
\global\booltrue{cbx:parens}%
- \addspace\bibopenparen}}
+ \extpostnotedelim\bibopenparen}}
{\setunit{\postnotedelim}}%
\printfield{postnote}%
\ifthenelse{\value{multicitecount}=\value{multicitetotal}}
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
{\setunit{%
\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \textcitedelim}}}
\newbibmacro*{cite:init:AY}{%
\ifnumless{\value{multicitecount}}{2}
{\global\boolfalse{cbx:parens}%
@@ -121,98 +117,93 @@
{\iffieldundef{prenote}
{}
{\global\undef\cbx@lasthash
- \global\undef\cbx@lastyear}}}
+ \global\undef\cbx@lastyear}}}
\newbibmacro*{cite:reinit:AY}{%
\global\undef\cbx@lasthash
\global\undef\cbx@lastyear}
+\newbibmacro*{cite:AY:noshorthand}{%
+\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+ {\usebibmacro{cite:label}%
+ \setunit{\printdelim{nonameyeardelim}}%
+ \usebibmacro{cite:labelyear+extrayear}%
+ \usebibmacro{cite:reinit}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+ \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+ {\setunit{\addcomma}%
+ \usebibmacro{cite:extrayear}}
+ {\setunit{\compcitedelim}%
+ \usebibmacro{cite:labelyear+extrayear}%
+ \savefield{labelyear}{\cbx@lastyear}}}
+ {\printnames{labelname}%
+ \setunit{\printdelim{nameyeardelim}}%
+ \usebibmacro{cite:labelyear+extrayear}%
+ \savefield{namehash}{\cbx@lasthash}%
+ \savefield{labelyear}{\cbx@lastyear}}}}
+
\newbibmacro*{cite:AY}{%
- \iffieldundef{shorthand}%
- {\usebibmacro{cite:noshorthand}}%
- {\iftoggle{cbx:shorthandintro}%
- {\ifciteseen{\usebibmacro{cite:shorthand}}%
- {\usebibmacro{cite:noshorthand}%
- \usebibmacro{shorthandintro}}}%
- {\usebibmacro{cite:shorthand}}%
- \usebibmacro{cite:reinit:AY}}%
+ \iffieldundef{shorthand}
+ {\usebibmacro{cite:AY:noshorthand}}%
+ {\usebibmacro{cbx:testshorthand}{cite:AY:noshorthand}%
+ \usebibmacro{cite:reinit}}%
\setunit{\multicitedelim}}
-\newbibmacro*{textcite:AY}{%
- \iffieldequals{namehash}{\cbx@lasthash}%
- {\iffieldundef{shorthand}%noshorthand
- {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
- \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
- {\setunit{\addcomma}%
- \usebibmacro{cite:extrayear}}%
- {\setunit{\compcitedelim}%
- \usebibmacro{cite:labelyear+extrayear}%
- \savefield{labelyear}{\cbx@lastyear}}}%
- {\setunit{\compcitedelim}%shorthand
- \iftoggle{cbx:shorthandintro}%
- {\ifciteseen
- {\usebibmacro{cite:shorthand}}%
- {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
- \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
+\newbibmacro*{textcite:AY:noshorthand:A}{%
+\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+ \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
{\setunit{\addcomma}%
- \usebibmacro{cite:extrayear}}%
+ \usebibmacro{cite:extrayear}}
{\setunit{\compcitedelim}%
\usebibmacro{cite:labelyear+extrayear}%
- \savefield{labelyear}{\cbx@lastyear}}%
- \usebibmacro{shorthandintro}}}%
- {\usebibmacro{cite:shorthand}}%
- \global\undef\cbx@lastyear}}%
+ \savefield{labelyear}{\cbx@lastyear}}}
+
+\newbibmacro*{textcite:AY:noshorthand:B}{%
+\usebibmacro{cite:label}%
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \printdelim{nonameyeardelim}\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite:labelyear+extrayear}}
+
+\newbibmacro*{textcite:AY:noshorthand:C}{%
+\iffieldundef{labelyear}
+ {\usebibmacro{cite:label}}
+ {\usebibmacro{cite:labelyear+extrayear}}%
+ \savefield{labelyear}{\cbx@lastyear}}
+
+\newbibmacro*{textcite:AY}{%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {\iffieldundef{shorthand}
+ {\usebibmacro{textcite:AY:noshorthand:A}}
+ {\setunit{\compcitedelim}%
+\usebibmacro{cbx:testshorthand}{textcite:AY:noshorthand:A}%
+ \global\undef\cbx@lastyear}}
{\ifnameundef{labelname}%
- {\iffieldundef{shorthand}%shorthand
- {\usebibmacro{cite:label}%
- \setunit{%
- \global\booltrue{cbx:parens}%
- \addspace\bibopenparen}%
- \ifnumequal{\value{citecount}}{1}%
- {\usebibmacro{prenote}}%
- {\usebibmacro{cite:shorthand}}%
- \usebibmacro{cite:labelyear+extrayear}}%
- {\iftoggle{cbx:shorthandintro}%
- {\ifciteseen%shorthand
- {\usebibmacro{cite:shorthand}}%
- {\usebibmacro{cite:label}%
- \setunit{%
- \global\booltrue{cbx:parens}%
- \addspace\bibopenparen}%
- \ifnumequal{\value{citecount}}{1}%
- {\usebibmacro{prenote}}%
- {\usebibmacro{cite:shorthand}}%
- \usebibmacro{cite:labelyear+extrayear}%
- \usebibmacro{shorthandintro}}}}%
- {\usebibmacro{cite:shorthand}}}%
+ {\iffieldundef{shorthand}
+ {\usebibmacro{textcite:AY:noshorthand:B}}
+ {\usebibmacro{cbx:testshorthand}{textcite:AY:noshorthand:B}}}
{\printnames{labelname}%
-\setunit{%
- \global\booltrue{cbx:parens}%
- \addspace\bibopenparen}%
-\ifnumequal{\value{citecount}}{1}%
- {\usebibmacro{prenote}}%
- {}%
- \iffieldundef{shorthand}%noshorthand
- {\iffieldundef{labelyear}%
- {\usebibmacro{cite:label}}%
- {\usebibmacro{cite:labelyear+extrayear}}%
- \savefield{labelyear}{\cbx@lastyear}}%
- {\iftoggle{cbx:shorthandintro}%
- {\ifciteseen%
- {\usebibmacro{cite:shorthand}}%
- {\iffieldundef{labelyear}%
- {\usebibmacro{cite:label}}%
- {\usebibmacro{cite:labelyear+extrayear}}%
- \savefield{labelyear}{\cbx@lastyear}%
- \usebibmacro{shorthandintro}}%
- \global\undef\cbx@lastyear}%
- {\usebibmacro{cite:shorthand}}}%
- \savefield{namehash}{\cbx@lasthash}}}%
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \printdelim{nameyeardelim}\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \iffieldundef{shorthand}
+ {\usebibmacro{textcite:AY:noshorthand:C}}%
+ {\usebibmacro{cbx:testshorthand}{textcite:AY:noshorthand:C}%
+ \global\undef\cbx@lastyear}}%
+ \stepcounter{textcitecount}%
+ \savefield{namehash}{\cbx@lasthash}}%
\setunit{%
- \ifbool{cbx:parens}%
- {\bibcloseparen\global\boolfalse{cbx:parens}}%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}%
+ \textcitedelim}}
\newbibmacro*{textcite:postnote:AY}{%
\usebibmacro{postnote}%
@@ -227,44 +218,21 @@
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
\multicitedelim}}}
-\renewbibmacro*{cite:shorthand}{%
- \printtext[bibhyperref]{\printfield{shorthand}}}
\renewbibmacro*{cite:init}{%
- \switchclass{cite:init:AT}{cite:init:AY}}
+ \switchATAY{cite:init:AT}{cite:init:AY}}
\renewbibmacro*{cite:reinit}{%
- \switchclass{cite:reinit:AT}{cite:reinit:AY}}
+ \switchATAY{cite:reinit:AT}{cite:reinit:AY}}
\renewbibmacro*{cite}{%
- \switchclass{cite:AT}{cite:AY}}
+ \switchATAY{cite:AT}{cite:AY}}
\renewbibmacro*{textcite}{%
- \switchclass{textcite:AT}{textcite:AY}}
+ \switchATAY{textcite:AT}{textcite:AY}}
\renewbibmacro*{textcite:postnote}{%
- \switchclass{textcite:postnote:AT}{textcite:postnote:AY}}
-
-\newbibmacro*{cite:noshorthand}{%
-\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}%
- {\usebibmacro{cite:label}%
-\setunit{\addspace}%
-\usebibmacro{cite:labelyear+extrayear}%
- \usebibmacro{cite:reinit}}%
- {\iffieldequals{namehash}{\cbx@lasthash}%
- {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
- \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
- {\setunit{\addcomma}%
- \usebibmacro{cite:extrayear}}%
- {\setunit{\compcitedelim}%
- \usebibmacro{cite:labelyear+extrayear}%
- \savefield{labelyear}{\cbx@lastyear}}}%
- {\printnames{labelname}%
- \setunit{\nameyeardelim}%
- \usebibmacro{cite:labelyear+extrayear}%
- \savefield{namehash}{\cbx@lasthash}%
- \iffieldundef{postnote}%
- {\savefield{labelyear}{\cbx@lastyear}}{}}}}
+ \switchATAY{textcite:postnote:AT}{textcite:postnote:AY}}
\DeclareCiteCommand*{\cite}
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \switchclass{citetitle:AT}{citeyear}}%
+ \switchATAY{citetitle:AT}{citeyear}}%
{}
{\usebibmacro{postnote}}
@@ -272,16 +240,17 @@
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \switchclass{citetitle:AT}{citeyear}}
+ \switchATAY{citetitle:AT}{citeyear}}
{}
{\usebibmacro{postnote}}
-
\DeclareCiteCommand{\citetitle}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\usebibmacro{prenote}}
- {\indexfield{indextitle}%
- \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
+ {\ifciteindex
+ {\indexfield{indextitle}}
+ {}%
+ \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
{\multicitedelim}
{\usebibmacro{postnote}}
@@ -289,8 +258,10 @@
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\usebibmacro{prenote}}
- {\indexfield{indextitle}%
- \printtext[bibhyperref]{\printfield[citetitle]{title}}}
+ {\ifciteindex
+ {\indexfield{indextitle}}
+ {}%
+ \printtext[bibhyperref]{\printfield[citetitle]{title}}}
{\multicitedelim}
{\usebibmacro{postnote}}
@@ -302,6 +273,29 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand*{\citeyear}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\printtext[bibhyperref]{\printfield{year}\printfield{extrayear}}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\citedate}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\printtext[bibhyperref]{\printdate}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\citedate}
+ {\boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\printtext[bibhyperref]{\printdateextra}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
\DeclareCiteCommand{\footcitet}[\mkbibfootnote]
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
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 ebef2925fc8..03b1c1bc8d1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
@@ -13,17 +13,84 @@
%% License information appended
%%
\ProvidesFile{philosophy-modern.bbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
\RequireBibliographyStyle{philosophy-classic}
\newtoggle{bbx:yearleft}
\DeclareBibliographyOption{yearleft}[true]{%
\settoggle{bbx:yearleft}{#1}}
-\ExecuteBibliographyOptions{%
- yearleft=false}
-
+\define@key{blx@biblist1}{restoreclassic}[]{}
+\define@key{blx@biblist2}{restoreclassic}[true]{\setkeys{blx@bib2}{restoreclassic}}%
+\define@key{blx@bib1}{restoreclassic}[]{}
+\define@key{blx@bib2}{restoreclassic}[true]{%
+\ifstrequal{#1}{true}{%
+\setlength{\bibhang}{\parindent}%
+\renewcommand{\labelnamepunct}{\newunitpunct}%
+\renewcommand*{\postsepyear}[1]{\printtext[parens]{##1}}%
+\renewbibmacro*{author}{%
+ \ifboolexpr{
+ test \ifuseauthor
+ and
+ not test {\ifnameundef{author}}
+ }
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}%
+ {\usebibmacro{bbx:savehash}%
+ \printnames{author}%
+ \iffieldundef{nameaddon}{}%
+ {\setunit{\addspace}%
+ \printtext[brackets]{\printfield{nameaddon}}}%*
+ \iffieldundef{authortype}
+ {\setunit{\printdelim{nameyeardelim}}}%
+ {\setunit{\printdelim{editorstrgdelim}}}}%*
+ \iffieldundef{authortype}
+ {}%
+ {\usebibmacro{authorstrg}%
+ \setunit{\printdelim{nameyeardelim}}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extrayear}}%
+\renewbibmacro*{bbx:editor}[1]{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}%
+ {\printnames{editor}%
+ \setunit{\printdelim{editorstrgdelim}}%
+ \usebibmacro{bbx:savehash}}%
+ \usebibmacro{##1}%
+ \clearname{editor}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extrayear}}%
+\renewbibmacro*{bbx:translator}[1]{%
+ \ifboolexpr{
+ test \ifusetranslator
+ and
+ not test {\ifnameundef{translator}}
+ }
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}%
+ {\printnames{translator}%
+ \setunit{\printdelim{editorstrgdelim}}%
+ \usebibmacro{bbx:savehash}}%
+ \usebibmacro{##1}%
+ \clearname{translator}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extrayear}}%
+}{}}%
+\ExecuteBibliographyOptions{yearleft=false}
+\renewcommand{\labelnamepunct}{}
\newlength{\yeartitle}
\newlength{\postnamesep}
\setlength{\yeartitle}{0.8em}
@@ -31,110 +98,95 @@
\setlength{\bibitemsep}{\postnamesep}
\setlength{\bibnamesep}{1.5ex plus 2pt minus 1pt}
\setlength{\bibhang}{4\parindent}
-
-\AtBeginBibliography{%
-\iftoggle{bbx:yearleft}{%
-\setlength{\yeartitle}{\fill}}%
-{}}
-\newcommand{\postsep}{\par\nobreak\vskip\postnamesep%
- \hskip-\bibhang\ignorespaces}
-\renewcommand{\labelnamepunct}{}
\AtBeginShorthands{%
-\renewcommand{\postsep}{}%\addspace in version 1.9.3
-\renewcommand{\labelnamepunct}{\newunitpunct}}
-\renewbibmacro*{date+extrayear}{%
- \begingroup%
- \clearfield{month}%
- \clearfield{day}%
- \makebox[\bibhang][r]{\printtext{%
- \ifboolexpr{%
- test {\iffieldundef{date}}
- and
- test {\iffieldundef{year}}
- }%
- {\iftoggle{bbx:nodate}{\printtext{%
- \midsentence\bibstring{nodate}}}{}}%
- {\printtext{\printdateextra}}%
- \hskip\yeartitle}}%
- \nopunct%
- \endgroup}%
+ \renewcommand{\postsep}{\addspace}%
+ \renewcommand{\labelnamepunct}{\newunitpunct}}
+\AtBeginBibliography{%
+ \iftoggle{bbx:yearleft}{%
+ \setlength{\yeartitle}{\fill}}{}}
+\newcommand{\postsep}{%
+ \null\par\nobreak\vskip\postnamesep%
+ \hskip-\bibhang\ignorespaces}
+\renewcommand*{\postsepyear}[1]{%
+ \printtext{\makebox[\bibhang][r]{%
+ #1\hskip\yeartitle}}\nopunct}
+\renewbibmacro*{bbx:nodate}{%
+ \postsepyear{%
+ \iftoggle{bbx:nodate}{%
+ \midsentence\bibstring{nodate}}{}}}
\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}%
+ \printtext[brackets]{\printfield{nameaddon}}}%*
+ \postsep}%
+ \usebibmacro{date+extrayear}%
+ \iffieldundef{authortype}
{}%
- {\setunit{\addcomma\space}}%
- \usebibmacro{authorstrg}%
- \postsep}}%
- {\global\undef\bbx@lasthash%
- \usebibmacro{labeltitle}%
- \postsep%
- \setunit*{\addspace}}%
- \usebibmacro{date+extrayear}}%
-\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}%
-\renewbibmacro*{editor+others}{%
- \usebibmacro{bbx:editor}{editor+othersstrg}}%
+ {\usebibmacro{authorstrg}%
+ \printtext{\addcomma\space}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \postsep%
+ \usebibmacro{date+extrayear}%
+ }%
+ }
+
\renewbibmacro*{bbx:editor}[1]{%
-\ifboolexpr{%
-test \ifuseeditor
-and
-not test {\ifnameundef{editor}}
-}%
-{\usebibmacro{bbx:dashcheck}%
- {}%
- {\printnames{editor}%
- \postsep%ADD
- \usebibmacro{bbx:savehash}}%
- \usebibmacro{date+extrayear}%
- \usebibmacro{#1}%
- \clearname{editor}%
- \printtext{\addcomma\space}%
-}%
-{\global\undef\bbx@lasthash%
- \usebibmacro{labeltitle}%
- \postsep%
- \usebibmacro{date+extrayear}%
-}%
+ \ifboolexpr{%
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }%
+ {\usebibmacro{bbx:dashcheck}%
+ {}%
+ {\printnames{editor}%
+ \postsep%
+ \usebibmacro{bbx:savehash}}%
+ \usebibmacro{date+extrayear}%
+ \usebibmacro{#1}%
+ \clearname{editor}%
+ \printtext{\addcomma\space}%
+ }%
+ {\global\undef\bbx@lasthash%
+ \usebibmacro{labeltitle}%
+ \postsep%
+ \usebibmacro{date+extrayear}%
+ }%
}%
-\renewbibmacro*{translator}{%
-\usebibmacro{bbx:translator}{translatorstrg}}
-\renewbibmacro*{translator+others}{%
-\usebibmacro{bbx:translator}{translator+othersstrg}}
+
\renewbibmacro*{bbx:translator}[1]{%
-\ifboolexpr{%
-test \ifusetranslator
-and
-not test {\ifnameundef{translator}}
-}%
-{\usebibmacro{bbx:dashcheck}%
- {}%
- {\printnames{translator}%
-\postsep%ADD
- \usebibmacro{bbx:savehash}}%
- \usebibmacro{date+extrayear}%
- \usebibmacro{#1}%
- \clearname{translator}%
- \printtext{\addcomma\space}%
-}%
-{\global\undef\bbx@lasthash%
- \usebibmacro{labeltitle}%
- \postsep%
- \usebibmacro{date+extrayear}%
-}%
+ \ifboolexpr{%
+ test \ifusetranslator
+ and
+ not test {\ifnameundef{translator}}
+ }%
+ {\usebibmacro{bbx:dashcheck}%
+ {}%
+ {\printnames{translator}%
+ \postsep%
+ \usebibmacro{bbx:savehash}}%
+ \usebibmacro{date+extrayear}%
+ \usebibmacro{#1}%
+ \clearname{translator}%
+ \printtext{\addcomma\space}%
+ }%
+ {\global\undef\bbx@lasthash%
+ \usebibmacro{labeltitle}%
+ \postsep%
+ \usebibmacro{date+extrayear}%
+ }%
}%
\DeclareCiteCommand{\bbx@crossref@inbook}%
- {}%
+ {\renewcommand*{\postsepyear}{\printtext[parens]}}%
{\usebibmacro{citeindex}%
\ifuseeditor{%
\ifthenelse{\value{listtotal}=2}%
@@ -142,11 +194,11 @@ not test {\ifnameundef{translator}}
{\printnames[][-\value{minnamesincross}]{labelname}}}%
{\usebibmacro{labeltitle}}%
\setunit*{\addspace}%
- \usebibmacro{classic:date+extrayear}}%
+ \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
{}%
{}%
\DeclareCiteCommand{\bbx@crossref@incollection}%
- {}%
+ {\renewcommand*{\postsepyear}{\printtext[parens]}}%
{\usebibmacro{citeindex}%
\ifuseeditor{%
\ifthenelse{\value{listtotal}=2}%
@@ -154,111 +206,9 @@ not test {\ifnameundef{translator}}
{\printnames[][-\value{minnamesincross}]{labelname}}}%
{\usebibmacro{labeltitle}}%
\setunit*{\addspace}%
- \usebibmacro{classic:date+extrayear}}%
+ \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
{}%
{}%
-\newbibmacro*{classic:date+extrayear}{%
- \begingroup%
- \clearfield{month}%
- \clearfield{day}%
- \ifboolexpr{%
- test {\iffieldundef{date}}
- and
- test {\iffieldundef{year}}
- }%
- {\iftoggle{bbx:nodate}{\printtext[parens]{%
- \midsentence\bibstring{nodate}}}{}}%
- {\printtext[parens]{%
- \printfield{labelyear}%
- \printfield{extrayear}}}%
- \endgroup}%
-\define@key{blx@bib1}{restoreclassic}[]{}
-\define@key{blx@bib2}{restoreclassic}[true]{%
- \ifstrequal{#1}{true}{%
- \setlength{\bibhang}{\parindent}%
- \renewcommand{\labelnamepunct}{\newunitpunct}%
-\renewbibmacro*{date+extrayear}{%
- \begingroup%
- \clearfield{month}%
- \clearfield{day}%
- \ifboolexpr{%
- test {\iffieldundef{date}}
- and
- test {\iffieldundef{year}}
- }%
- {\iftoggle{bbx:nodate}{\printtext[parens]{%
- \midsentence\bibstring{nodate}}}{}}%
- {\printtext[parens]{\printdateextra}}%
- \endgroup}%
-\renewbibmacro*{author}{%
- \ifboolexpr{%
- test \ifuseauthor
- and
- not test {\ifnameundef{author}}
- }%
- {\usebibmacro{bbx:dashcheck}%
- {\bibnamedash}%
- {\usebibmacro{bbx:savehash}%
- \printnames{author}%
- \iffieldundef{nameaddon}{}%
- {\setunit{\addspace}%
- \printtext[brackets]{\printfield{nameaddon}}}%
-\iffieldundef{authortype}%
- {\setunit{\addspace}}%
- {\setunit{\addcomma\space}}}%
- \iffieldundef{authortype}%
- {}%
- {\usebibmacro{authorstrg}%
- \setunit{\addspace}}}%
- {\global\undef\bbx@lasthash%
- \usebibmacro{labeltitle}%
- \setunit*{\addspace}}%
- \usebibmacro{date+extrayear}}%
-\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}%
-\renewbibmacro*{editor+others}{%
- \usebibmacro{bbx:editor}{editor+othersstrg}}%
-\renewbibmacro*{bbx:editor}[1]{%
- \ifboolexpr{%
- test \ifuseeditor
- and
- not test {\ifnameundef{editor}}
- }%
- {\usebibmacro{bbx:dashcheck}%
- {\bibnamedash}%
- {\printnames{editor}%
-\setunit{\addspace}%
-\usebibmacro{bbx:savehash}}%
- \usebibmacro{#1}%
- \clearname{editor}%
- \setunit{\addspace}}%
- {\global\undef\bbx@lasthash%
- \usebibmacro{labeltitle}%
- \setunit*{\addspace}}%
- \usebibmacro{date+extrayear}}%
-\renewbibmacro*{translator}{%
-\usebibmacro{bbx:translator}{translatorstrg}}%
-\renewbibmacro*{translator+others}{%
-\usebibmacro{bbx:translator}{translator+othersstrg}}%
-\renewbibmacro*{bbx:translator}[1]{%
-\ifboolexpr{%
-test \ifusetranslator
-and
-not test {\ifnameundef{translator}}
-}%
-{\usebibmacro{bbx:dashcheck}%
-{\bibnamedash}%
-{\printnames{translator}%
-\setunit{\addspace}%
-\usebibmacro{bbx:savehash}}%
-\usebibmacro{#1}%
-\clearname{translator}%
-\setunit{\addspace}}%
-{\global\undef\bbx@lasthash%
-\usebibmacro{labeltitle}%
-\setunit*{\addspace}}%
-\usebibmacro{date+extrayear}}%
- }{}}%
%%
%% Copyright 2009-2017 by Ivan Valbusa
%%
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 a75314dd082..d14da742054 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
@@ -13,19 +13,10 @@
%% License information appended
%%
\ProvidesFile{philosophy-modern.cbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
\RequireCitationStyle{philosophy-classic}
-\DeclareCiteCommand{\fullcite}%
- {\usebibmacro{prenote}}%
- {\setkeys{blx@bib2}{restoreclassic}%
- \usedriver%
- {\DeclareNameAlias{sortname}{default}}%
- {\thefield{entrytype}}}%
- {\multicitedelim}%
- {\usebibmacro{postnote}}%
%%
%% Copyright 2009-2017 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 3f31d086d44..97b5324528b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
@@ -13,8 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-standard.bbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
\RequireBiber[3]
@@ -26,12 +25,18 @@
\DeclareLanguageMapping{italian}{italian-philosophy}
\DeclareLanguageMapping{english}{english-philosophy}
\DeclareLanguageMapping{spanish}{spanish-philosophy}
+\DeclareLanguageMapping{french}{french-philosophy}
\newtoggle{bbx:annotation}
\newtoggle{bbx:library}
\newtoggle{bbx:inbeforejournal}
\newtoggle{bbx:classical}
\newtoggle{bbx:lowscauthors}
\newtoggle{cbx:shorthandintro}
+\newtoggle{cbx:scauthorscite}
+\newtoggle{bbx:scauthorsbib}
+\newtoggle{cbx:scauthorscitefn}
+\newtoggle{cbx:latinemph}
+
\DeclareBibliographyOption{annotation}[true]{%
\settoggle{bbx:annotation}{#1}}
\DeclareBibliographyOption{library}[true]{%
@@ -44,6 +49,8 @@
\settoggle{bbx:lowscauthors}{#1}}
\DeclareBibliographyOption{shorthandintro}[true]{%
\settoggle{cbx:shorthandintro}{#1}}
+\DeclareBibliographyOption{latinemph}[true]{%
+ \settoggle{cbx:latinemph}{#1}}
\newcommand{\bbx@publocformat}{}
\newcommand{\bbx@volnumformat}{}
\newcommand{\bbx@relatedformat}{}
@@ -69,20 +76,31 @@
\newcommand{\bbx@origfields}{}
\DeclareEntryOption{origed}[true]{%
\renewcommand{\bbx@origfields}{origed}}
-\newtoggle{cbx:scauthorscite}
-\newtoggle{bbx:scauthorsbib}
\DeclareBibliographyOption{scauthorsbib}[true]{%
\settoggle{bbx:scauthorsbib}{#1}}
\DeclareBibliographyOption{scauthorscite}[true]{%
\settoggle{cbx:scauthorscite}{#1}}
+\define@key{blx@bib1}{annotation}[]{}
+\define@key{blx@bib2}{annotation}[true]{\settoggle{bbx:annotation}{#1}}
+\define@key{blx@biblist1}{annotation}[]{}
+\define@key{blx@biblist2}{annotation}[true]{\settoggle{bbx:annotation}{#1}}
\ExecuteBibliographyOptions{%
publocformat = publocyear,
- origfieldsformat = semicolon,
volnumformat = plain,
+ origfieldsformat = semicolon,
+ relatedformat = semicolon,
+ editionformat = arabic,
+ volumeformat = arabic,
+ scauthors = false,
editionformat = arabic,
volumeformat = arabic,
shorthandintro = true,
library = true,
+ annotation = false,
+ latinemph = false,
+ classical = false,
+ inbeforejournal = false,
+ lowscauthors = false,
useprefix = true,
maxcitenames = 2,
mincitenames = 1,
@@ -94,7 +112,7 @@
\newcounter{maxnamesincross}
\newcounter{minnamesincross}
\AtBeginDocument{%
-\ifdefstring{\bbx@scauthors}{all}
+\ifdefstring{\bbx@scauthors}{bibcite}
{%
\toggletrue{bbx:scauthorsbib}%
\toggletrue{cbx:scauthorscite}%
@@ -110,24 +128,52 @@
\toggletrue{cbx:scauthorscite}%
}%
{}%
+\ifdefstring{\bbx@scauthors}{citefn}
+{%
+ \toggletrue{cbx:scauthorscitefn}%
+}%
+{}%
+\ifdefstring{\bbx@scauthors}{bibcitefn}
+{%
+ \toggletrue{bbx:scauthorsbib}%
+ \toggletrue{cbx:scauthorscitefn}%
+}%
+{}%
+\ifdefstring{\bbx@scauthors}{all}
+{%
+ \usebibmacro{scswitch}
+}%
+{}%
+}
+\AtBeginBibliography{%
+ \togglefalse{cbx:scauthorscite}%
+ \togglefalse{cbx:shorthandintro}%
}
-\AtBeginBibliography{\togglefalse{cbx:scauthorscite}}%
+\AtBeginShorthands{%
+ \togglefalse{bbx:annotation}%
+ \togglefalse{cbx:shorthandintro}%
+}
+\AtEveryCite{%
+ \togglefalse{bbx:annotation}%
+}
+\providecommand*{\mkibid}[1]{\iftoggle{cbx:latinemph}{\emph{#1}}{#1}}
+\newcommand*{\volnumpunct}{\addcomma\space}
\renewcommand*{\newunitpunct}{\addcomma\space}
\renewcommand*{\subtitlepunct}{\addperiod\space}
\renewcommand*{\intitlepunct}{\nopunct\addspace}
\renewcommand*{\relatedpunct}{\addsemicolon\space}
-\newcommand*{\volnumpunct}{\addcomma\space}
+\DeclareDelimFormat{editorstrgdelim}{\addspace}
\newrobustcmd*{\mkpureparens}[1]{%
\begingroup
\blx@blxinit
\blx@setsfcodes
- \blx@postpunct(#1\blx@postpunct)\midsentence%
+ \bibleftparen#1\bibrightparen%
\endgroup}
\newrobustcmd*{\mkpurebrackets}[1]{%
\begingroup
\blx@blxinit
\blx@setsfcodes
- \blx@postpunct[#1\blx@postpunct]\midsentence%
+ \bibleftbracket#1\bibrightbracket%
\endgroup}
\newcommand*{\annotationfont}{\footnotesize}
\newcommand*{\libraryfont}{}
@@ -135,8 +181,8 @@
\ifdefstring{\bbx@editionformat}{Roman}
{\uppercase}%
{\ifdefstring{\bbx@editionformat}{romansc}
- {\scshape}%
- {\relax}}}%
+ {\scshape}%
+ {\relax}}}%
\newrobustcmd*{\edfnt}[1]{%
\begingroup
\expandafter\editionfont%
@@ -147,13 +193,12 @@
\textsc{\MakeLowercase{#1}}}%
{\textsc{#1}}}
\newbibmacro*{scswitch}{%
-\let\mkbibnamefamily\mkbibsc%
-\let\mkbibnamegiven\mkbibsc%
-\let\mkbibnameprefix\mkbibsc%
-\let\mkbibnamesuffix\mkbibsc}
+ \let\mkbibnamefamily\mkbibsc%
+ \let\mkbibnamegiven\mkbibsc%
+ \let\mkbibnameprefix\mkbibsc%
+ \let\mkbibnamesuffix\mkbibsc}
\DeclareNameFormat{sortname}{%
- \iftoggle{bbx:scauthorsbib}{%
- \usebibmacro{scswitch}}{}%
+ \iftoggle{bbx:scauthorsbib}{\usebibmacro{scswitch}}{}%
\nameparts{#1}%
\ifnumequal{\value{listcount}}{1}
{\ifgiveninits
@@ -185,6 +230,61 @@
{\namepartprefix}
{\namepartsuffix}}}%
\usebibmacro{name:andothers}}%
+\DeclareNameFormat{labelname}{%
+ \iftoggle{cbx:scauthorscite}{\usebibmacro{scswitch}}{}%
+ \iftoggle{cbx:scauthorscitefn}{\iffootnote{\usebibmacro{scswitch}}{}}{}%
+ \bibhyperref{\nameparts{#1}%
+ \ifcase\value{uniquename}%
+ \usebibmacro{name:family}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartprefix}%
+ {\namepartsuffix}%
+ \or
+ \ifuseprefix
+ {\usebibmacro{name:given-family}%
+ {\namepartfamily}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffixi}}%
+ {\usebibmacro{name:given-family}%
+ {\namepartfamily}%
+ {\namepartgiveni}%
+ {\namepartprefixi}%
+ {\namepartsuffixi}}%
+ \or
+ \usebibmacro{name:given-family}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartprefix}%
+ {\namepartsuffix}%
+ \fi
+ \usebibmacro{name:andothers}}}%
+\DeclareNameFormat{scdefault}{%
+\usebibmacro{scswitch}%
+ \nameparts{#1}%
+ \ifgiveninits
+ {\usebibmacro{name:given-family}%
+ {\namepartfamily}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}}%
+ {\usebibmacro{name:given-family}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartprefix}%
+ {\namepartsuffix}}%
+ \usebibmacro{name:andothers}}%
+\DeclareCiteCommand{\fullcite}
+ {\usebibmacro{prenote}}
+ {\setkeys{blx@bib2}{restoreclassic}%
+ \usedriver
+ {\iftoggle{cbx:scauthorscite}%
+ {\DeclareNameAlias{sortname}{scdefault}}%
+ {\DeclareNameAlias{sortname}{default}}}%
+ {\thefield{entrytype}}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
\DeclareFieldFormat[bookinbook,thesis]{title}{\mkbibemph{#1}}
\DeclareFieldFormat[review]{title}{\bibcplstring{reviewof}\addspace#1}
\DeclareFieldFormat[review]{citetitle}{\bibcplstring{reviewof}\addspace#1}
@@ -201,6 +301,7 @@
\DeclareFieldFormat{library}{\libraryfont #1}
\DeclareFieldFormat{pureparens}{\mkpureparens{#1}}
\DeclareFieldFormat{editortype}{\mkpureparens{#1}}
+\DeclareFieldAlias{authortype}{editortype}
\DeclareFieldFormat{backrefparens}{\mkpureparens{#1}}
\DeclareFieldFormat*{number}{%
\ifdefstring{\bbx@volnumformat}{strings}{%
@@ -212,19 +313,16 @@
\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}%
- {\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??
+ {\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??
\DeclareFieldFormat{volume}{%
\bibstring{volume}~%
\ifinteger{#1}{%
@@ -261,73 +359,116 @@
{\optionerror{relatedformat}}}}}%
\DeclareFieldAlias{related:origpubin}{related}
\DeclareFieldAlias{related:origpubas}{related}
-\DeclareFieldFormat{relatedstring:default}{#1\addspace}
+\DeclareFieldFormat{relatedstring:default}{#1\addspace}%\addspace needed
+\renewbibmacro*{translatorstrg}{%
+ \printtext[editortype]{%
+ \ifboolexpr{
+ test {\ifnumgreater{\value{translator}}{1}}
+ or
+ test {\ifandothers{translator}}
+ }
+ {\bibstring{translators}}
+ {\bibstring{translator}}}}
+\renewbibmacro*{translator+othersstrg}{%
+ \ifboolexpr{
+ test {\ifnumgreater{\value{translator}}{1}}
+ or
+ test {\ifandothers{translator}}
+ }
+ {\def\abx@tempa{translators}}
+ {\def\abx@tempa{translator}}%
+ \ifnamesequal{translator}{commentator}
+ {\appto\abx@tempa{co}%
+ \clearname{commentator}}
+ {\ifnamesequal{translator}{annotator}
+ {\appto\abx@tempa{an}%
+ \clearname{annotator}}
+ {}}%
+ \ifnamesequal{translator}{introduction}
+ {\appto\abx@tempa{in}%
+ \clearname{introduction}}
+ {\ifnamesequal{translator}{foreword}
+ {\appto\abx@tempa{fo}%
+ \clearname{foreword}}
+ {\ifnamesequal{translator}{afterword}
+ {\appto\abx@tempa{af}%
+ \clearname{afterword}}
+ {}}}%
+ \printtext[editortype]{\bibstring{\abx@tempa}}}
\renewbibmacro*{citeindex}{%
- \ifciteindex{\indexnames{labelname}}{}}%
+ \ifciteindex
+ {\indexnames{labelname}}
+ {}}
\renewbibmacro*{bibindex}{%
- \ifbibindex{\indexnames{author}%
- \indexnames{editor}%
- \indexnames{editora}%
- \indexnames{editorb}%
- \indexnames{editorc}}%
- {}}%
-
-\renewbibmacro*{addendum+pubstate}{%
- \printfield{addendum}%
- \newunit\newblock
- \printfield{pubstate}%
- \ifdefstring{\bbx@origfields}{none}{}{%
- \newunit\newblock
- \usebibmacro{origdata:book}}%
- \newunit\newblock
- \usebibmacro{library}}
-
-\newbibmacro*{addendum+pubstate:article-inbook-incoll}{%
- \printfield{addendum}%
- \newunit\newblock
- \printfield{pubstate}%
- \ifdefstring{\bbx@origfields}{none}{}{%
- \newunit\newblock
- \usebibmacro{origdata:article-inbook}}%
- \newunit\newblock
- \usebibmacro{library}}
-
+ \ifbibindex
+ {\indexnames{labelname}}
+ {}}
\newbibmacro*{volnumdefault}{%
-\printfield{volume}%
- \setunit*{\volnumpunct}%
- \printfield{number}}
+ \printfield{volume}%
+ \setunit*{\volnumpunct}%
+ \printfield{number}}
\newbibmacro*{volnumparens}{%
-\nopunct%
-\printtext[pureparens]{%
-\printfield{volume}%
- \setunit*{\volnumpunct}%
- \printfield{number}}}
+ \nopunct%
+ \printtext[pureparens]{%
+ \printfield{volume}%
+ \setunit*{\volnumpunct}%
+ \printfield{number}}}
\newbibmacro*{volnumstrings}{%
\iffieldundef{volume}{}{%
\printfield{volume}\setunit*{\volnumpunct}}%
- \iffieldundef{number}{}{%
+ \iffieldundef{number}{}{%
\printfield{number}}}
+\renewbibmacro*{volume+number+eid}{%
+ \ifdefstring{\bbx@volnumformat}{strings}
+ {\usebibmacro{volnumstrings}}%
+ {\ifdefstring{\bbx@volnumformat}{parens}
+ {\usebibmacro{volnumparens}}%
+ {\ifdefstring{\bbx@volnumformat}{plain}
+ {\usebibmacro{volnumdefault}}%
+ {\optionerror{volnumformat}}}}%
+ \setunit{\addcomma\space}%
+ \printfield{eid}}
+
\renewbibmacro*{journal}{%
- \iffieldundef{journaltitle}
+ \ifboolexpr{
+ test {\iffieldundef{journaltitle}}
+ and
+ test {\iffieldundef{journalsubtitle}}
+ }
{}
{\printtext[journaltitle]{%
\printfield[titlecase]{journaltitle}%
- \midsentence%
\setunit{\subtitlepunct}%
\printfield[titlecase]{journalsubtitle}}}}
\renewbibmacro*{periodical}{%
- \iffieldundef{title}
- {}%
+ \ifboolexpr{
+ test {\iffieldundef{title}}
+ and
+ test {\iffieldundef{subtitle}}
+ }
+ {}
{\printtext[title]{%
\printfield[titlecase]{title}%
- \midsentence%
\setunit{\subtitlepunct}%
\printfield[titlecase]{subtitle}}}}
+\renewbibmacro*{issue}{%
+ \ifboolexpr{
+ test {\iffieldundef{issuetitle}}
+ and
+ test {\iffieldundef{issuesubtitle}}
+ }
+ {}
+ {\printtext[issuetitle]{%
+ \printfield[titlecase]{issuetitle}%
+ \setunit{\subtitlepunct}%
+\printfield[titlecase]{issuesubtitle}}}}
+
+
\renewbibmacro*{journal+issuetitle}{%
\usebibmacro{journal}%
\setunit*{\addspace}%
@@ -351,26 +492,18 @@
{\newunit
\printfield{series}%
\setunit{\addspace}\midsentence}%
- \newunit
\usebibmacro{volume+number+eid}%
- \setunit{\addcomma\space}%
- \printfield{eid}%
\setunit{\addspace}%
\usebibmacro{issue+date}%
\setunit{\addcolon\space}%
\usebibmacro{issue}%
\newunit}
-\renewbibmacro*{volume+number+eid}{%
- \ifdefstring{\bbx@volnumformat}{strings}
- {\usebibmacro{volnumstrings}}%
- {\ifdefstring{\bbx@volnumformat}{parens}
- {\usebibmacro{volnumparens}}%
- {\ifdefstring{\bbx@volnumformat}{plain}
- {\usebibmacro{volnumdefault}}%
- {\optionerror{volnumformat}}}}%
- \setunit{\addcomma\space}%
- \printfield{eid}}
+\renewbibmacro*{series+number}{%
+ \printfield{series}%
+ \setunit*{\addcomma\space}%
+ \printfield{number}%
+ \newunit}
\renewbibmacro*{issue+date}{%
\printtext[pureparens]{%
@@ -388,7 +521,7 @@
and
test {\iffieldundef{eventyear}}
}%
- {}
+ {}%
{\setunit*{\addspace}%
\printtext{%
\printfield{venue}%
@@ -396,12 +529,6 @@
\printeventdate}}%
\newunit}
-\renewbibmacro*{series+number}{%
- \printfield{series}%
- \setunit*{\addcomma\space}%
- \printfield{number}%
- \newunit}
-
\renewbibmacro*{publisher+location+date}{%
\ifdefstring{\bbx@publocformat}{loccolonpub}
{\usebibmacro{loccolonpub}}
@@ -426,31 +553,6 @@
{\ifdefstring{\bbx@publocformat}{publocyear}%
{\usebibmacro{orgpublocyear}}{\optionerror{publocformat}}}}}
-\newbibmacro*{library}{%
-\iftoggle{bbx:library}{%
- \iffieldundef{library}%
- {}%
- {\setunit{\addperiod\space}%
- {\printfield{library}}}}%
- {}}
-\renewbibmacro*{pageref}{%
- \iflistundef{pageref}
- {}%
- {\setunit{\addperiod\space}%
- \printtext[backrefparens]{%
- \ifnumgreater{\value{pageref}}{1}
- {\bibcpstring{backrefpages}\ppspace}%
- {\bibcpstring{backrefpage}\ppspace}%
- \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct}}%
-
-\renewbibmacro*{finentry}{%
- \iftoggle{bbx:annotation}%
- {\iffieldundef{annotation}%
- {\finentry}%
- {\setunit{\addperiod\par\nobreak\vspace*{.5ex}}%
- \printtext[annotation]{\printfield{annotation}\finentry\par}}}%
- {\finentry}}
-
\newbibmacro*{publocyear}{%
\iflistundef{publisher}%
{}%
@@ -531,6 +633,52 @@
\printlist{organization}%
\usebibmacro{commarelateddate}%
\newunit}
+
+\renewbibmacro*{addendum+pubstate}{%
+ \printfield{addendum}%
+ \newunit\newblock
+ \printfield{pubstate}%
+ \ifdefstring{\bbx@origfields}{none}{}{%
+ \newunit\newblock
+ \usebibmacro{origdata:book}}%
+ \newunit\newblock
+ \usebibmacro{library}}
+
+\newbibmacro*{addendum+pubstate:article-inbook-incoll}{%
+ \printfield{addendum}%
+ \newunit\newblock
+ \printfield{pubstate}%
+ \ifdefstring{\bbx@origfields}{none}{}{%
+ \newunit\newblock
+ \usebibmacro{origdata:article-inbook}}%
+ \newunit\newblock
+ \usebibmacro{library}}
+
+\newbibmacro*{library}{%
+ \iftoggle{bbx:library}{%
+ \iffieldundef{library}%
+ {}%
+ {\setunit{\addperiod\space}%
+ {\printfield{library}}}}%
+ {}}
+
+\renewbibmacro*{pageref}{%
+ \iflistundef{pageref}
+ {}%
+ {\setunit{\addperiod\space}%
+ \printtext[backrefparens]{%
+ \ifnumgreater{\value{pageref}}{1}
+ {\bibcpstring{backrefpages}\ppspace}%
+ {\bibcpstring{backrefpage}\ppspace}%
+ \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct}}%
+
+\renewbibmacro*{finentry}{%
+ \iftoggle{bbx:annotation}%
+ {\iffieldundef{annotation}%
+ {\finentry}%
+ {\setunit{\addperiod\par\nobreak\vspace*{.5ex}}%
+ \printtext[annotation]{\printfield{annotation}\finentry\par}}}%
+ {\finentry}}
\newbibmacro*{relateddate}{%
\setunit*{\addspace}%
\printdate}
@@ -539,8 +687,7 @@
\printdate}
\newbibmacro*{related:clearauthors}{%
\renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}%
- \renewbibmacro*{author/editor+others/translator+others}{%
- \usebibmacro{bbx:savehash}}%
+ \renewbibmacro*{author/editor+others/translator+others}{\usebibmacro{bbx:savehash}}%
\renewbibmacro*{editor+others}{\usebibmacro{bbx:savehash}}%
\renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}%
\renewbibmacro*{author/editor}{\usebibmacro{bbx:savehash}}%
@@ -567,8 +714,8 @@
test {\iffieldundef{relatedstring}}
}
{\printtext{\bibstring{translationas}}}{}%
- \printtext{\addspace}%
- \relatedcite{\thefield{related}}}
+ \printtext{\addspace}%
+ \relatedcite{\thefield{related}}}
\renewbibmacro*{begrelatedloop}{%
\renewrobustcmd*{\mkpureparens}{\relatedpunct}%
\renewrobustcmd*{\mkpurebrackets}{\relatedpunct}}
@@ -582,63 +729,63 @@
\usebibmacro{related:init}%
\usebibmacro{related}}{}}
\renewbibmacro*{bybookauthor}{%
-\ifnamesequal{author}{bookauthor}%
-{}%
-{\printnames[default]{bookauthor}}}
+ \ifnamesequal{author}{bookauthor}%
+ {}%
+ {\printnames[default]{bookauthor}}}
\newbibmacro*{xrefdata}{%
-\iffieldundef{volume}
-{}%
-{\printfield{volume}%
-\printfield{part}%
-\setunit{\addcolon\space}%
-\printfield{booktitle}}%
-\newunit\newblock
-\usebibmacro{byeditor+others}%
-\newunit\newblock
-\printfield{edition}%
-\newunit
-\printfield{volumes}%
-\newunit\newblock
-\usebibmacro{series+number}%
-\newunit\newblock
-\printfield{note}%
-\newunit\newblock
-\usebibmacro{publisher+location+date}%
-\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
-\usebibmacro{phil:related}%
-\newunit\newblock
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}
+ \iffieldundef{volume}
+ {}%
+ {\printfield{volume}%
+ \printfield{part}%
+ \setunit{\addcolon\space}%
+ \printfield{booktitle}}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit
+ \printfield{volumes}%
+ \newunit\newblock
+ \usebibmacro{series+number}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{publisher+location+date}%
+ \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
+ \usebibmacro{phil:related}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
\newbibmacro*{crossrefdata}{%
-\iffieldundef{maintitle}
-{\printfield{volume}%
-\printfield{part}}
-{}%
-\newunit\newblock
-\usebibmacro{chapter+pages}%
-\newunit\newblock
-\iftoggle{bbx:isbn}
-{\printfield{isbn}}
-{}%
-\newunit\newblock
-\usebibmacro{doi+eprint+url}%
-\newblock
-\usebibmacro{phil:related}%
-\newunit\newblock
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}
+ \iffieldundef{maintitle}
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{chapter+pages}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newblock
+ \usebibmacro{phil:related}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
\newbibmacro*{origpublisher+origlocation+origdate}{%
\ifdefstring{\bbx@publocformat}{loccolonpub}
{\usebibmacro{origloccolonpub}\setunit{\bibpagespunct}%
@@ -1405,11 +1552,11 @@
\newunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
-
\DeclareBibliographyDriver{set}{%
\savefield{annotation}{\@phil@nnote}%
\clearfield{annotation}%
- \entryset{}{}%
+ \entryset{\ifnumgreater{\thefield{entrysetcount}}{1}%
+ {\setkeys{blx@bib2}{restoreclassic}}{}}{}%
\newunit\newblock
\restorefield{annotation}{\@phil@nnote}%
\usebibmacro{pageref}%
@@ -1535,7 +1682,6 @@
\DeclareFieldAlias[jurisdiction]{usera}[jurisdiction]{notacomm}
\DeclareFieldAlias[jurisdiction]{nameadddon}[jurisdiction]{section}
\DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court}
-
%%
%% Copyright 2009-2017 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 07e86deea4c..4bd07a9e026 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -13,15 +13,12 @@
%% License information appended
%%
\ProvidesFile{philosophy-verbose.bbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
\RequireBibliographyStyle{authortitle}
\RequireBibliographyStyle{philosophy-standard}
-
\AtBeginShorthands{%
- \togglefalse{bbx:annotation}%
\DeclareCiteCommand{\bbx@crossref@inbook}%
{}%
{\iffieldundef{shorthand}%
@@ -37,19 +34,6 @@
{}%
{}%
}
-\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??
\renewbibmacro*{author}{%
\ifboolexpr{%
test \ifuseauthor
@@ -61,15 +45,12 @@
{\printnames{author}%
\iffieldundef{nameaddon}{}%
{\setunit{\addspace}%
- \printtext[brackets]{\printfield{nameaddon}}}%
- \setunit{\addcomma\space}%
+ \printtext[brackets]{\printfield{nameaddon}}}%MOD
+ \setunit{\printdelim{editorstrgdelim}}%
\usebibmacro{bbx:savehash}}%
\usebibmacro{authorstrg}}%
{\global\undef\bbx@lasthash}}%
-\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}%
-\renewbibmacro*{editor+others}{%
- \usebibmacro{bbx:editor}{editor+othersstrg}}%
+
\renewbibmacro*{bbx:editor}[1]{%
\ifboolexpr{%
test \ifuseeditor
@@ -79,11 +60,27 @@
{\usebibmacro{bbx:dashcheck}%
{\bibnamedash}%
{\printnames{editor}%
-\setunit{\addspace}%
+\setunit{\printdelim{editorstrgdelim}}%MOD
\usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
\clearname{editor}}%
{\global\undef\bbx@lasthash}}%
+
+\renewbibmacro*{bbx:translator}[1]{%
+ \ifboolexpr{%
+ test \ifusetranslator
+ and
+ not test {\ifnameundef{translator}}
+ }%
+ {\usebibmacro{bbx:dashcheck}%
+ {\bibnamedash}%
+ {\printnames{translator}%
+\setunit{\printdelim{editorstrgdelim}}%MOD
+ \usebibmacro{bbx:savehash}}%
+ \usebibmacro{#1}%
+ \clearname{translator}}%
+ {\global\undef\bbx@lasthash}}%
+
\newbibmacro*{nodash:author}{%
\ifboolexpr{%
test \ifuseauthor
@@ -129,10 +126,44 @@
\renewbibmacro*{relateddate}{%
\setunit*{\addspace}%
- \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}}
+ \printdate\ifdefstring{\bbx@editionformat}{superscript}%
+ {\printfield{edition}}{}}
\renewbibmacro*{commarelateddate}{%
\setunit*{\addcomma\space}%
- \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}}
+ \printdate\ifdefstring{\bbx@editionformat}{superscript}%
+ {\printfield{edition}}{}}
+\DeclareCiteCommand{\bbx@crossref@inbook}%
+ {}%
+ {\ifciteseen{%
+ \ifthenelse{\value{listtotal}=2}%
+ {\printnames[][-\value{maxnamesincross}]{labelname}}%
+ {\printnames[][-\value{minnamesincross}]{labelname}}%
+ \setunit*{\addcomma\space}\printtext{%
+ \printfield[citetitle]{labeltitle}%
+ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+ {\setunit{\addspace\midsentence}}%
+ \bibstring{opcit}}}%
+ {\DeclareNameAlias{sortname}{default}%
+ \usebibmacro{usedriver:book}}}%
+ {}%
+ {}%
+\DeclareCiteCommand{\bbx@crossref@incollection}%
+ {}%
+ {\ifciteseen{%
+\ifthenelse{\value{listtotal}=2}%
+ {\printnames[][-\value{maxnamesincross}]{labelname}}%
+ {\printnames[][-\value{minnamesincross}]{labelname}}%
+ \setunit{\addspace}%
+ \usebibmacro{editorstrg}%
+ \setunit*{\addcomma\space}\printtext{%
+ \printfield[citetitle]{labeltitle}%
+ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+ {\setunit{\addspace\midsentence}}%
+ \bibstring{opcit}}}%
+ {\DeclareNameAlias{sortname}{default}%
+ \usebibmacro{usedriver:collection}}}%
+ {}%
+ {}%
\DeclareBibliographyDriver{book}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -430,38 +461,6 @@
\newunit\newblock
\usebibmacro{pageref}%
}
-\DeclareCiteCommand{\bbx@crossref@inbook}%
- {}%
- {\ifciteseen{%
- \ifthenelse{\value{listtotal}=2}%
- {\printnames[][-\value{maxnamesincross}]{labelname}}%
- {\printnames[][-\value{minnamesincross}]{labelname}}%
- \setunit*{\addcomma\space}\printtext{%
- \printfield[citetitle]{labeltitle}%
- \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
- {\setunit{\addspace\midsentence}}%
- \bibstring{opcit}}}%
- {\DeclareNameAlias{sortname}{default}%
- \usebibmacro{usedriver:book}}}%
- {}%
- {}%
-\DeclareCiteCommand{\bbx@crossref@incollection}%
- {}%
- {\ifciteseen{%
-\ifthenelse{\value{listtotal}=2}%
- {\printnames[][-\value{maxnamesincross}]{labelname}}%
- {\printnames[][-\value{minnamesincross}]{labelname}}%
- \setunit{\addspace}%
- \usebibmacro{editorstrg}%
- \setunit*{\addcomma\space}\printtext{%
- \printfield[citetitle]{labeltitle}%
- \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
- {\setunit{\addspace\midsentence}}%
- \bibstring{opcit}}}%
- {\DeclareNameAlias{sortname}{default}%
- \usebibmacro{usedriver:collection}}}%
- {}%
- {}%
%%
%% Copyright 2009-2017 by Ivan Valbusa
%%
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 ad20510bbc7..c1c46b87a3f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
@@ -13,97 +13,21 @@
%% License information appended
%%
\ProvidesFile{philosophy-verbose.cbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
\RequireCitationStyle{verbose-trad2}
-\newtoggle{cbx:latinemph}
\newtoggle{cbx:commacit}
-\DeclareBibliographyOption{latinemph}[true]{%
- \settoggle{cbx:latinemph}{#1}}
\DeclareBibliographyOption{commacit}[true]{%
\settoggle{cbx:commacit}{#1}}
\ExecuteBibliographyOptions{%
idemtracker=false,
loccittracker=strict,
- latinemph=false,
commacit=false}
-\renewcommand*{\mkibid}{\iftoggle{cbx:latinemph}{\emph}{}}
-\AtEveryCite{%
- \togglefalse{bbx:annotation}%
- \renewbibmacro*{name:andothers}{%
- \ifboolexpr{%
- test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
- and
- test \ifmorenames
- }%
- {\ifnumgreater{\value{liststop}}{1}%
- {\finalandcomma}%
- {}%
- \andothersdelim\bibstring[\mkibid]{andothers}}%
- {}}%
- \renewbibmacro*{list:andothers}{%
- \ifboolexpr{%
- test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
- and
- test \ifmoreitems
- }%
- {\ifnumgreater{\value{liststop}}{1}%
- {\finalandcomma}%
- {}%
- \andmoredelim\bibstring[\mkibid]{andmore}}%
- {}}%
-\DeclareNameFormat{labelname}{%
-\iftoggle{cbx:scauthorscite}{%
- \iffootnote{%
- \usebibmacro{scswitch}}{}}{}%
- \nameparts{#1}%
- \bibhyperref{\ifcase\value{uniquename}%
- \usebibmacro{name:family}%
- {\namepartfamily}%
- {\namepartgiven}%
- {\namepartprefix}%
- {\namepartsuffix}%
- \or
- \ifuseprefix
- {\usebibmacro{name:given-family}%
- {\namepartfamily}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartsuffixi}}%
- {\usebibmacro{name:given-family}%
- {\namepartfamily}%
- {\namepartgiveni}%
- {\namepartprefixi}%
- {\namepartsuffixi}}%
- \or
- \usebibmacro{name:given-family}%
- {\namepartfamily}%
- {\namepartgiven}%
- {\namepartprefix}%
- {\namepartsuffix}%
- \fi
- \usebibmacro{name:andothers}}}%
-}%
-\DeclareNameFormat{scdefault}{%
-\iffootnote{\usebibmacro{scswitch}}{}%
- \nameparts{#1}%
- \ifgiveninits
- {\usebibmacro{name:given-family}%
- {\namepartfamily}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartsuffix}}%
- {\usebibmacro{name:given-family}%
- {\namepartfamily}%
- {\namepartgiven}%
- {\namepartprefix}%
- {\namepartsuffix}}%
- \usebibmacro{name:andothers}}%
+\AtEveryCite{\togglefalse{bbx:annotation}}
\newbibmacro*{cite:opcit}{%
\printtext[bibhyperlink]{\bibstring[\mkibid]{opcited}}}
@@ -112,7 +36,6 @@
\bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
\bibstring[\mkibid]{loccit}}}%
\global\toggletrue{cbx:loccit}}
-
\renewbibmacro*{cite:ibid}{%
\ifloccit
{\usebibmacro{cite:loccit}}{%
@@ -127,9 +50,7 @@
\iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
{\setunit{\addspace\midsentence}}}%
\bibstring{opcit}}}
-
-\renewbibmacro*{cite:full}{%
- \iftoggle{cbx:shorthandintro}{%
+\newbibmacro{cite:full:noshorthand}{%
\usebibmacro{cite:full:citepages}%
\global\toggletrue{cbx:fullcite}%
\printtext[bibhypertarget]{%
@@ -137,16 +58,21 @@
{\iftoggle{cbx:scauthorscite}{%
\DeclareNameAlias{sortname}{scdefault}}%
{\DeclareNameAlias{sortname}{default}}}%
- {\thefield{entrytype}}}%
- \usebibmacro{shorthandintro}}%
- {\usebibmacro{cite:shorthand}}}
+ {\thefield{entrytype}}}}
+
+\renewbibmacro*{cite:full}{%
+\iffieldundef{shorthand}
+ {\usebibmacro{cite:full:noshorthand}}
+ {\iftoggle{cbx:shorthandintro}
+ {\usebibmacro{cite:full:noshorthand}%
+ \usebibmacro{shorthandintro}}%
+ {\usebibmacro{cite:shorthand}}}}
\renewbibmacro*{cite:idem}{%
\iftoggle{cbx:scauthorscite}{%
\bibstring[\mkbibsc]{idem\thefield{gender}}}{%
\bibstring[\mkibid]{idem\thefield{gender}}}%
\setunit{\nametitledelim}}
-
\newbibmacro*{ccite:cite}{%
\usebibmacro{related:clearauthors}%
\usebibmacro{cite:citepages}%
@@ -161,20 +87,11 @@
{\usebibmacro{cite:full}%
\usebibmacro{cite:save}}}}
\DeclareCiteCommand{\ccite}
-{\usebibmacro{prenote}}%
-{\usebibmacro{citeindex}%
- \usebibmacro{ccite:cite}}
-{\multicitedelim}
-{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\fullcite}
-{\usebibmacro{prenote}}
-{\usedriver
- {\iftoggle{cbx:scauthorscite}%
- {\DeclareNameAlias{sortname}{scdefault}}%
- {\DeclareNameAlias{sortname}{default}}}%
- {\thefield{entrytype}}}
-{\multicitedelim}
-{\usebibmacro{postnote}}
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \usebibmacro{ccite:cite}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
%%
%% Copyright 2009-2017 by Ivan Valbusa
%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx
index 6b91a7064e6..7c3eb5b760b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx
@@ -13,47 +13,42 @@
%% License information appended
%%
\ProvidesFile{spanish-philosophy.lbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
\InheritBibliographyExtras{spanish}
\DeclareBibliographyExtras{%
-\protected\def\bibrangedash{%
- -\penalty\hyphenpenalty}%
- \protected\def\bibdatedash{\textendash}}%
+\protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+\protected\def\bibdaterangesep{\bibrangedash}%
+}%
\NewBibliographyString{opcited}
\DeclareBibliographyStrings{%
- inherit = {spanish},
+ inherit = {spanish},
opcited = {{\'{o}p\adddotspace cit\adddot}{\'{o}p\adddot cit\adddot}},
- opcit = {{cit\adddot}{cit\adddot}},
- ibidem = {{ivi}{ivi}},
- loccit = {{ibidem}{ibidem}},
- langspanish = {{espa\~{n}ol}{es\adddot}},
- editor = {{ed\adddot}{ed\adddot}},
- editors = {{ed\adddot}{eds\adddot}},
- byreviser = {{revisi\'{o}n de}{rev\adddotspace de}},
- reviewof = {{rese\~{n}a de}{rese\~{n}a de}},%%FIXME
- backrefpage = {{citado en la p\'{a}gina}{citado en la \bibsstring{page}\adddot}},%%FIXME
- backrefpages = {{citado en las p\'{a}ginas}{citado en las \bibsstring{pages}\adddot}},%%FIXME
- pages = {{p\'aginas}{\iftoggle{bbx:classical}{p\'ags\adddot}{p\'ag\adddot}}},
- columns = {{columnas}{\iftoggle{bbx:classical}{cols\adddot}{col\adddot}}},
- lines = {{l\'ineas}{\iftoggle{bbx:classical}{ll\adddot}{l\adddot}}},
- verses = {{versos}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}},
- volumes = {{vol\'uumenes}{\iftoggle{bbx:classical}{vols\adddot}{vol\adddot}}},
- withcommentator = {{comentarios de}{com\adddotspace de}},
- withannotator = {{notas de}{notas de}},
- withintroduction = {{introducci\'{o}n de}{intr\adddotspace de}},
- withforeword = {{prefacio de}{pref\adddotspace de}},
- withafterword = {{postfacio de}{postfacio de}},
- translationof = {{traducci\'{o}n al espa\~{n}ol de}{trad\adddotspace de}},
- translationas = {{traducido al espa\~{n}ol como}{trad\adddotspace es\adddot}},
- origpubas = {{edici\'{o}n original}{ed\adddot orig\adddot}},
- section = {{secci\'{o}n}{sec\adddot}},
- sections = {{secciones}{\iftoggle{bbx:classical}{secs\adddot}{sec\adddot}}}
+ opcit = {{cit\adddot}{cit\adddot}},
+ ibidem = {{ivi}{ivi}},
+ loccit = {{ibidem}{ibidem}},
+ langspanish = {{espa\~{n}ol}{es\adddot}},
+ editor = {{ed\adddot}{ed\adddot}},
+ editors = {{ed\adddot}{eds\adddot}},
+ byreviser = {{revisi\'{o}n de}{rev\adddotspace de}},
+ reviewof = {{rese\~{n}a de}{rese\~{n}a de}},%%FIXME
+ backrefpage = {{citado en la p\'{a}gina}{citado en la \bibsstring{page}\adddot}},%%FIXME
+ backrefpages = {{citado en las p\'{a}ginas}{citado en las p\'ags\adddot}},%%FIXME
+ withcommentator = {{comentarios de}{com\adddotspace de}},
+ withannotator = {{notas de}{notas de}},
+ withintroduction = {{introducci\'{o}n de}{intr\adddotspace de}},
+ withforeword = {{prefacio de}{pref\adddotspace de}},
+ withafterword = {{postfacio de}{postfacio de}},
+ translationof = {{traducci\'{o}n al espa\~{n}ol de}{trad\adddotspace de}},
+ translationas = {{traducido al espa\~{n}ol como}{trad\adddotspace es\adddot}},
+ origpubas = {{edici\'{o}n original}{ed\adddot orig\adddot}},
+ section = {{secci\'{o}n}{sec\adddot}},
+ sections = {{secciones}{\iftoggle{bbx:classical}{secs\adddot}{sec\adddot}}}
+ andmore = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
}
%%
%% Copyright 2009-2017 by Ivan Valbusa
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 17:21:02 +0000