summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-14 21:52:44 +0000
committerKarl Berry <karl@freefriends.org>2017-03-14 21:52:44 +0000
commitaf53b4ba9787a49af57dc3abc2ebe77e5f93474e (patch)
tree170db402095ad152a4efcbf4139009ab300a5548 /Master/texmf-dist/tex/latex
parent9567f224aed1af01ef4a8df55c8c01176c489106 (diff)
biblatex-philosophy (14mar17)
git-svn-id: svn://tug.org/texlive/trunk@43501 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx45
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx104
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx28
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx96
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx34
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx28
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx624
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx60
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx216
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx42
10 files changed, 622 insertions, 655 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 81de9dc9c19..9aa2223d203 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
@@ -5,17 +5,15 @@
%% The original source files were:
%%
%% biblatex-philosophy.dtx (with options: `english-lbx')
-%% ______________________________________________________
-%% The biblatex-philosophy package
-%% Copyright (C) 2009-2017 Ivan Valbusa
-%% All rights reserved
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
%%
-%% License information appended
+%% License information appended
%%
\ProvidesFile{english-philosophy.lbx}
- [2017/02/16 v1.9.1 A set of styles for biblatex]
-
-
+[2017/03/14 v1.9.2 A set of styles for biblatex]
@@ -26,33 +24,32 @@
-\penalty\hyphenpenalty}%
\protected\def\bibdatedash{\textendash}}%
-\NewBibliographyString{cited,origed}
+\NewBibliographyString{opcited}
\DeclareBibliographyStrings{%
inherit = {english},
- origed = {{orig\adddotspace ed\adddot}{orig\adddotspace ed\adddot}},
- cited = {{cit\adddot}{cit\adddot}},
- nodate = {{no date}{n\adddot d\adddot}},
+ opcited = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+ opcit = {{cit\adddot}{cit\adddot}},
ibidem = {{ibid\adddot}{ibid\adddot}},
loccit = {{ibid\adddot}{ibid\adddot}},
- editor = {{ed\adddot}{ed\adddot}},
- editors = {{eds\adddot}{eds\adddot}},
- reviewof = {{Review of}{Review of}},
translationas = {{trans\adddot}{trans\adddot}},
- backrefpage = {{cited on page}{cited on p\adddot}},
- backrefpages = {{cited on pages}{cited on pp\adddot}}
+ 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}}
}
%%
-%% Copyright 2009-2017 by Ivan Valbusa
+%% 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.
+%% 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
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "author-maintained".
%%
%%
%% End of file `english-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 2214e7b2370..d1c5ef76899 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
@@ -5,17 +5,15 @@
%% The original source files were:
%%
%% biblatex-philosophy.dtx (with options: `italian-lbx')
-%% ______________________________________________________
-%% The biblatex-philosophy package
-%% Copyright (C) 2009-2017 Ivan Valbusa
-%% All rights reserved
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
%%
-%% License information appended
+%% License information appended
%%
\ProvidesFile{italian-philosophy.lbx}
- [2017/02/16 v1.9.1 A set of styles for biblatex]
-
-
+[2017/03/14 v1.9.2 A set of styles for biblatex]
@@ -25,50 +23,96 @@
\protected\def\bibrangedash{%
-\penalty\hyphenpenalty}%
\protected\def\bibdatedash{\textendash}}%
-
-\NewBibliographyString{origed,cited}
-
+\NewBibliographyString{opcited}
\DeclareBibliographyStrings{%
inherit = {italian},
- cited = {{cit\adddot}{cit\adddot}},
- origed = {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}},
- nodate = {{senza data}{s\adddotspace d\adddot}},
- opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+ 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}},
- reviewof = {{recensione di}{recensione di}},
- byreviser = {{revisione di}{revisione di}},
- backrefpage = {{Citato a pagina}{Citato a \bibsstring{page}\adddot}},
- backrefpages = {{Citato alle pagine}{Citato alle \bibsstring{pages}\adddot}},
+ 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}}},
- paragraphs = {{paragrafi}{\iftoggle{bbx:classical}{parr\adddot}{par\adddot}}},
- volumes = {{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol\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}},
- translationof = {{traduzione di}{trad\adddotspace di}},
- translationas = {{traduzione italiana}{trad\adddotspace it\adddot}}
+ 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}}
+ reviser = {{revisore}{rev\adddot}},% FIXME: missing
+ revisers = {{revisori}{rev\adddot}},% FIXME: missing
+ founder = {{fondatore}{fond\adddot}},% FIXME: missing
+ founders = {{fondatori}{fond\adddot}},% FIXME: missing
+ continuator = {{continuatore}{cont\adddot}},% FIXME: missing
+ continuators = {{continuatori}{cont\adddot}},% FIXME: missing
+ 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
+ bycollaborator = {{in collaborazione con}{in coll\adddotspace con}},% FIXME: missing: UNSURE
+ book = {{libro}{lib\adddot}},% FIXME: missing: UNSURE
+ part = {{parte}{pt\adddot}},% FIXME: missing: UNSURE
+ issue = {{uscita}{uscita}},% FIXME: missing: UNSURE
+ reprintas = {{ristampato come}{rist\adddotspace come}},% FIXME: missing
+ reprintfrom = {{ristampato da}{rist\adddotspace da}},% FIXME: missing
+ translationfrom = {{tradotto da}{trad\adddotspace da}},% FIXME: missing
+ origpubin = {{originalmente pubblicato in}{orig\adddotspace pub\adddotspace in}},% FIXME: missing: UNSURE
+ candthesis = {{candidato}{cand\adddot}},% FIXME: missing
+ software = {{software}{software}},% FIXME: missing
+ datacd = {{CD-ROM}{CD-ROM}},% FIXME: missing
+ audiocd = {{audio CD}{audio CD}},% FIXME: missing
+ urlfrom = {{disponibile su}{disponibile su}},% FIXME: missing: UNSURE
+ inpreparation = {{in preparazione}{in preparazione}},% FIXME: missing
+ forthcoming = {{in uscita}{in uscita}},% FIXME: missing
+ prepublished = {{pre-pubblicato}{pre-pubblicato}},% FIXME: missing: UNSURE
+ thiscite = {{specialmente}{spec\adddot}},% FIXME: missing: UNSURE
+ langcatalan = {{catalano}{catalano}},% FIXME: missing
+ langcroatian = {{croato}{croato}},% FIXME: missing
+ langczech = {{ceco}{ceco}},% FIXME: missing
+ langestonian = {{estone}{estone}},% FIXME: missing
+ langfinnish = {{finnico}{finnico}},% FIXME: missing
+ langpolish = {{polacco}{polacco}},% FIXME: missing
+ langrussian = {{russo}{russo}},% FIXME: missing
+ langslovene = {{sloveno}{sloveno}},% FIXME: missing
+ fromcatalan = {{dal catalano}{dal catalano}},% FIXME: missing
+ fromcroatian = {{dal croato}{dal croato}},% FIXME: missing
+ fromczech = {{dal ceco}{dal ceco}},% FIXME: missing
+ fromestonian = {{dall'estone}{dall'estone}},% FIXME: missing
+ fromfinnish = {{dal finnico}{dal finnico}},% FIXME: missing
+ frompolish = {{dal polacco}{dal polacco}},% FIXME: missing
+ fromrussian = {{dal russo}{dal russo}},% FIXME: missing
+ fromslovene = {{dallo sloveno}{dallo sloveno}},% FIXME: missing
+ circa = {{circa}{ca\adddot}},% FIXME: missing
+ spring = {{primavera}{prim\adddot}},% FIXME: missing
+ summer = {{estate}{est\adddot}},% FIXME: missing
+ autumn = {{autunno}{aut\adddot}},% FIXME: missing
+ winter = {{inverno}{inv\adddot}},% FIXME: missing
}
%%
-%% Copyright 2009-2017 by Ivan Valbusa
+%% 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.
+%% 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
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "author-maintained".
%%
%%
%% End of file `italian-philosophy.lbx'.
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 1e366e88c42..01e7040ccfe 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -5,17 +5,15 @@
%% The original source files were:
%%
%% biblatex-philosophy.dtx (with options: `classic-bbx')
-%% ______________________________________________________
-%% The biblatex-philosophy package
-%% Copyright (C) 2009-2017 Ivan Valbusa
-%% All rights reserved
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
%%
-%% License information appended
+%% License information appended
%%
\ProvidesFile{philosophy-classic.bbx}
- [2017/02/16 v1.9.1 A set of styles for biblatex]
-
-
+[2017/03/14 v1.9.2 A set of styles for biblatex]
@@ -224,16 +222,16 @@
\togglefalse{bbx:nodate}%
}{}}%
%%
-%% Copyright 2009-2017 by Ivan Valbusa
+%% 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.
+%% 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
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "author-maintained".
%%
%%
%% End of file `philosophy-classic.bbx'.
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 ee35ebba936..315c6ff5310 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
@@ -5,68 +5,30 @@
%% The original source files were:
%%
%% biblatex-philosophy.dtx (with options: `classic-cbx')
-%% ______________________________________________________
-%% The biblatex-philosophy package
-%% Copyright (C) 2009-2017 Ivan Valbusa
-%% All rights reserved
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
%%
-%% License information appended
+%% License information appended
%%
\ProvidesFile{philosophy-classic.cbx}
- [2017/02/16 v1.9.1 A set of styles for biblatex]
-
-
+[2017/03/14 v1.9.2 A set of styles for biblatex]
\RequireCitationStyle{authoryear-comp}
-\newtoggle{cbx:scauthorscite}
-
-\DeclareBibliographyOption{scauthorscite}[true]{%
- \settoggle{cbx:scauthorscite}{#1}}
-
\ExecuteBibliographyOptions{%
- scauthorscite = false,
citetracker = true,
}
\AtEveryCite{%
- \iftoggle{cbx:scauthorscite}%
- {\let\mkbibnamefamily\mkbibsc%
- \let\mkbibnamegiven\mkbibsc%
- \let\mkbibnameprefix\mkbibsc%
- \let\mkbibnameaffix\mkbibsc}%
- {}}%
-
-\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}}}
+\renewcommand*{\mkbibnamefamily}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
+\renewcommand*{\mkbibnamegiven}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
+\renewcommand*{\mkbibnameprefix}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
+\renewcommand*{\mkbibnamesuffix}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
+}
\newcommand{\switchclass}[2]{%
\iffieldequalstr{entrysubtype}{classic}%
@@ -110,8 +72,8 @@
{}%
{\printnames{labelname}%
\setunit{%
- \global\booltrue{cbx:parens}%
- \addspace\bibopenparen}}%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenparen}}%
\savefield{namehash}{\cbx@lasthash}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
@@ -143,12 +105,12 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
{\setunit{%
\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
\multicitedelim}}}
\newbibmacro*{cite:init:AY}{%
\ifnumless{\value{multicitecount}}{2}
@@ -158,7 +120,7 @@
{\iffieldundef{prenote}
{}
{\global\undef\cbx@lasthash
-\global\undef\cbx@lastyear}}}
+ \global\undef\cbx@lastyear}}}
\newbibmacro*{cite:reinit:AY}{%
\global\undef\cbx@lasthash
@@ -257,12 +219,12 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
{\setunit{%
\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
\multicitedelim}}}
\renewbibmacro*{cite:shorthand}{%
\printtext[bibhyperref]{\printfield{shorthand}}}
@@ -357,16 +319,16 @@
{\multicitedelim}
{\usebibmacro{postnote}}
%%
-%% Copyright 2009-2017 by Ivan Valbusa
+%% 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.
+%% 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
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "author-maintained".
%%
%%
%% End of file `philosophy-classic.cbx'.
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 1b7ab9d5345..440dc436894 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
@@ -5,17 +5,15 @@
%% The original source files were:
%%
%% biblatex-philosophy.dtx (with options: `modern-bbx')
-%% ______________________________________________________
-%% The biblatex-philosophy package
-%% Copyright (C) 2009-2017 Ivan Valbusa
-%% All rights reserved
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
%%
-%% License information appended
+%% License information appended
%%
\ProvidesFile{philosophy-modern.bbx}
- [2017/02/16 v1.9.1 A set of styles for biblatex]
-
-
+[2017/03/14 v1.9.2 A set of styles for biblatex]
@@ -25,6 +23,7 @@
\settoggle{bbx:yearleft}{#1}}
\ExecuteBibliographyOptions{%
yearleft=false}
+
\newlength{\yeartitle}
\newlength{\postnamesep}
\setlength{\yeartitle}{0.8em}
@@ -37,6 +36,7 @@
\iftoggle{bbx:yearleft}{%
\setlength{\yeartitle}{\fill}}%
{}}
+
\newcommand{\postsep}{\par\nobreak\vskip\postnamesep%
\hskip-\bibhang\ignorespaces}
\renewcommand{\labelnamepunct}{}
@@ -150,8 +150,8 @@
{\iftoggle{bbx:nodate}{\printtext[parens]{%
\midsentence\bibstring{nodate}}}{}}%
{\printtext[parens]{%
- \printfield{labelyear}%
- \printfield{extrayear}}}%
+ \printfield{labelyear}%
+ \printfield{extrayear}}}%
\endgroup}%
\define@key{blx@bib1}{restoreclassic}[]{}
\define@key{blx@bib2}{restoreclassic}[true]{%
@@ -226,16 +226,16 @@
{\printfield{label}}}%
}{}}%
%%
-%% Copyright 2009-2017 by Ivan Valbusa
+%% 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.
+%% 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
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "author-maintained".
%%
%%
%% End of file `philosophy-modern.bbx'.
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 4399ae80aee..11f2f7618a6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
@@ -5,17 +5,15 @@
%% The original source files were:
%%
%% biblatex-philosophy.dtx (with options: `modern-cbx')
-%% ______________________________________________________
-%% The biblatex-philosophy package
-%% Copyright (C) 2009-2017 Ivan Valbusa
-%% All rights reserved
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
%%
-%% License information appended
+%% License information appended
%%
\ProvidesFile{philosophy-modern.cbx}
- [2017/02/16 v1.9.1 A set of styles for biblatex]
-
-
+[2017/03/14 v1.9.2 A set of styles for biblatex]
@@ -29,16 +27,16 @@
{\multicitedelim}%
{\usebibmacro{postnote}}%
%%
-%% Copyright 2009-2017 by Ivan Valbusa
+%% 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.
+%% 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
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "author-maintained".
%%
%%
%% End of file `philosophy-modern.cbx'.
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 e81084caa64..73f2df0c4e6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
@@ -5,48 +5,38 @@
%% The original source files were:
%%
%% biblatex-philosophy.dtx (with options: `standard-bbx')
-%% ______________________________________________________
-%% The biblatex-philosophy package
-%% Copyright (C) 2009-2017 Ivan Valbusa
-%% All rights reserved
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
%%
-%% License information appended
+%% License information appended
%%
\ProvidesFile{philosophy-standard.bbx}
- [2017/02/16 v1.9.1 A set of styles for biblatex]
+[2017/03/14 v1.9.2 A set of styles for biblatex]
-
-
-\def\optionerror#1{%
-\ClassError{biblatex-philosophy}
-{\MessageBreak**** Unknown value for '#1' option}
-{\MessageBreak**** Unknown value for '#1' option}
-}
-
\RequireBiber[3]
\RequireBibliographyStyle{standard}
+
+\def\optionerror#1{%
+ \ClassError{biblatex-philosophy}
+ {\MessageBreak**** Unknown value for '#1' option}
+ {\MessageBreak**** Unknown value for '#1' option}}
\DeclareLanguageMapping{italian}{italian-philosophy}
\DeclareLanguageMapping{english}{english-philosophy}
\DeclareLanguageMapping{spanish}{spanish-philosophy}
\newtoggle{bbx:annotation}
\newtoggle{bbx:library}
-\newtoggle{bbx:scauthors}
-\newtoggle{bbx:scauthorsbib}
\newtoggle{bbx:inbeforejournal}
\newtoggle{bbx:classical}
\newtoggle{bbx:lowscauthors}
\newtoggle{cbx:shorthandintro}
-
\DeclareBibliographyOption{annotation}[true]{%
\settoggle{bbx:annotation}{#1}}
\DeclareBibliographyOption{library}[true]{%
\settoggle{bbx:library}{#1}}
-\DeclareBibliographyOption{scauthors}[true]{%
- \settoggle{bbx:scauthors}{#1}}
-\DeclareBibliographyOption{scauthorsbib}[true]{%
- \settoggle{bbx:scauthorsbib}{#1}}
\DeclareBibliographyOption{inbeforejournal}[true]{%
\settoggle{bbx:inbeforejournal}{#1}}
\DeclareBibliographyOption{classical}[true]{%
@@ -55,14 +45,12 @@
\settoggle{bbx:lowscauthors}{#1}}
\DeclareBibliographyOption{shorthandintro}[true]{%
\settoggle{cbx:shorthandintro}{#1}}
-
\newcommand{\bbx@publocformat}{}
\newcommand{\bbx@volnumformat}{}
\newcommand{\bbx@relatedformat}{}
-\newcommand{\bbx@origfields}{}
\newcommand{\bbx@editionformat}{}
\newcommand{\bbx@volumeformat}{}
-
+\newcommand{\bbx@scauthors}{}
\DeclareBibliographyOption{publocformat}[publocyear]{%
\renewcommand{\bbx@publocformat}{#1}}
\DeclareBibliographyOption{volnumformat}[plain]{%
@@ -77,81 +65,57 @@
\renewcommand{\bbx@editionformat}{#1}}
\DeclareBibliographyOption{volumeformat}[arabic]{%
\renewcommand{\bbx@volumeformat}{#1}}
-
+\DeclareBibliographyOption{scauthors}[all]{%
+ \renewcommand{\bbx@scauthors}{#1}}
+\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}}
\ExecuteBibliographyOptions{%
- lowscauthors = false,
publocformat = publocyear,
- annotation = false,
- library = true,
- scauthors = false,
- scauthorsbib = false,
origfieldsformat = semicolon,
- inbeforejournal = false,
volnumformat = plain,
editionformat = arabic,
volumeformat = arabic,
- classical = false,
+ shorthandintro = true,
+ library = true,
useprefix = true,
maxcitenames = 2,
mincitenames = 1,
maxbibnames = 999,
- minbibnames = 999,
- shorthandintro = true}
+ minbibnames = 999}
\setcounter{biburlnumpenalty}{9000}
\setcounter{biburlucpenalty}{9000}
\setcounter{biburllcpenalty}{9000}
\newcounter{maxnamesincross}
\newcounter{minnamesincross}
\AtBeginDocument{%
+\ifdefstring{\bbx@scauthors}{all}
+{%
+ \toggletrue{bbx:scauthorsbib}%
+ \toggletrue{cbx:scauthorscite}%
+}%
+{}%
+\ifdefstring{\bbx@scauthors}{bib}
+{%
+ \toggletrue{bbx:scauthorsbib}%
+}%
+{}%
+\ifdefstring{\bbx@scauthors}{cite}
+{%
+ \toggletrue{cbx:scauthorscite}%
+}%
+{}%
\iftoggle{bbx:lowscauthors}%
{\newrobustcmd*{\mkbibsc}[1]{\textsc{\MakeLowercase{#1}}}}%
{\newrobustcmd*{\mkbibsc}[1]{\textsc{#1}}}%
-\iftoggle{bbx:scauthors}{%
- \toggletrue{bbx:scauthorsbib}%
- \toggletrue{cbx:scauthorscite}}%
-{}}
-\AtBeginBibliography{%
-\iftoggle{bbx:scauthorsbib}{%
-\DeclareNameFormat{sortname}{%
- \let\mkbibnamefamily\mkbibsc%
- \let\mkbibnamegiven\mkbibsc%
- \let\mkbibnameprefix\mkbibsc%
- \let\mkbibnameaffix\mkbibsc%
- \nameparts{#1}%
- \ifnumequal{\value{listcount}}{1}
- {\ifgiveninits
- {\usebibmacro{name:family-given}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefix}
- {\namepartsuffix}}
- {\usebibmacro{name:family-given}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}}%
- \ifboolexpe{%
- test {\ifdefvoid\namepartgiven}
- and
- test {\ifdefvoid\namepartprefix}}
- {}
- {\usebibmacro{name:revsdelim}}}
- {\ifgiveninits
- {\usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefix}
- {\namepartsuffix}}
- {\usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}}}%
- \usebibmacro{name:andothers}}}%
- {}}%
+}
+\AtBeginBibliography{\togglefalse{cbx:scauthorscite}}%
\renewcommand*{\newunitpunct}{\addcomma\space}
\renewcommand*{\subtitlepunct}{\addperiod\space}
\renewcommand*{\intitlepunct}{\nopunct\addspace}
@@ -159,42 +123,97 @@
\newcommand*{\volnumpunct}{\addcomma\space}
\newrobustcmd*{\mkpureparens}[1]{%
\begingroup
- \blx@blxinit
- \blx@setsfcodes
- \blx@postpunct(#1\blx@postpunct)\midsentence%
+ \blx@blxinit
+ \blx@setsfcodes
+ \blx@postpunct(#1\blx@postpunct)\midsentence%
\endgroup}
\newrobustcmd*{\mkpurebrackets}[1]{%
-\begingroup
-\blx@blxinit
-\blx@setsfcodes
-\blx@postpunct[#1\blx@postpunct]\midsentence%
-\endgroup}
-\renewbibmacro*{citeindex}{%
-\ifciteindex{\indexnames{labelname}}{}}%
-\renewbibmacro*{bibindex}{%
-\ifbibindex{\indexnames{author}%
-\indexnames{editor}%
-\indexnames{editora}%
-\indexnames{editorb}%
-\indexnames{editorc}}%
-{}}%
+ \begingroup
+ \blx@blxinit
+ \blx@setsfcodes
+ \blx@postpunct[#1\blx@postpunct]\midsentence%
+ \endgroup}
\newcommand*{\annotationfont}{\footnotesize}
\newcommand*{\libraryfont}{}
\newcommand*{\editionfont}{%
- \ifdefstring{\bbx@editionformat}{Roman}
- {\uppercase}%
- {\ifdefstring{\bbx@editionformat}{romansc}
- {\scshape}%
- {\relax}}%
- }%
+ \ifdefstring{\bbx@editionformat}{Roman}
+ {\uppercase}%
+ {\ifdefstring{\bbx@editionformat}{romansc}
+ {\scshape}%
+ {\relax}}}%
\newrobustcmd*{\edfnt}[1]{%
\begingroup
- \expandafter\editionfont
+ \expandafter\editionfont%
\expandafter{\romannumeral#1}%
\endgroup}
+\DeclareNameFormat{sortname}{%
+ \iftoggle{bbx:scauthorsbib}{%
+ \let\mkbibnamefamily\mkbibsc%
+ \let\mkbibnamegiven\mkbibsc%
+ \let\mkbibnameprefix\mkbibsc%
+ \let\mkbibnamesuffix\mkbibsc}{}%
+ \nameparts{#1}%
+ \ifnumequal{\value{listcount}}{1}
+ {\ifgiveninits
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffix}}
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}}%
+ \ifboolexpe{%
+ test {\ifdefvoid\namepartgiven}
+ and
+ test {\ifdefvoid\namepartprefix}}
+ {}
+ {\usebibmacro{name:revsdelim}}}
+ {\ifgiveninits
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffix}}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}}}%
+ \usebibmacro{name:andothers}}%
+\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}}}
\DeclareFieldFormat[bookinbook,thesis]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat[review]{title}{\bibcpstring{reviewof}\addspace#1}
-\DeclareFieldFormat[review]{citetitle}{\bibcpstring{reviewof}\addspace#1}
+\DeclareFieldFormat[review]{title}{\bibcplstring{reviewof}\addspace#1}
+\DeclareFieldFormat[review]{citetitle}{\bibcplstring{reviewof}\addspace#1}
\DeclareFieldFormat[inreference,article]{title}{\mkbibquote{#1}}
\DeclareFieldFormat[bookinbook,thesis]{citetitle}{\mkbibemph{#1}}
\DeclareFieldFormat{origtitle}{\mkbibemph{#1}}
@@ -209,30 +228,6 @@
\DeclareFieldFormat{pureparens}{\mkpureparens{#1}}
\DeclareFieldFormat{editortype}{\mkpureparens{#1}}
\DeclareFieldFormat{backrefparens}{\mkpureparens{#1}}
-\DeclareFieldFormat{volume}{%
- \bibstring{volume}~%
- \ifinteger{#1}{%
- \ifdefstring{\bbx@volumeformat}{arabic}%
- {#1}%
- {\ifdefstring{\bbx@volumeformat}{Roman}%
- {\RN{#1}}%
- {\ifdefstring{\bbx@volumeformat}{romansc}%
- {\textsc{\Rn{#1}}}%
- {\ifdefstring{\bbx@volumeformat}{roman}%
- {\Rn{#1}}{\optionerror{volumeformat}}}}}}{#1}}
-\DeclareFieldFormat[article]{volume}{%
-\ifdefstring{\bbx@volnumformat}{strings}
- {\bibstring{volume}~}%
- {}%
- \ifinteger{#1}{%
- \ifdefstring{\bbx@volumeformat}{arabic}%
- {#1}%
- {\ifdefstring{\bbx@volumeformat}{Roman}%
- {\RN{#1}}%
- {\ifdefstring{\bbx@volumeformat}{romansc}%
- {\textsc{\Rn{#1}}}%
- {\ifdefstring{\bbx@volumeformat}{roman}%
- {\Rn{#1}}{\optionerror{volumeformat}}}}}}{#1}}
\DeclareFieldFormat*{number}{%
\ifdefstring{\bbx@volnumformat}{strings}{%
\bibstring{number}~#1}{#1}}
@@ -256,138 +251,53 @@
available only for philosophy-verbose style}
{\MessageBreak**** Option 'editionformat=superscript'
available only for philosophy-verbose style}}{}}}}}}{#1}}%\isdot??
+\DeclareFieldFormat{volume}{%
+ \bibstring{volume}~%
+ \ifinteger{#1}{%
+ \ifdefstring{\bbx@volumeformat}{arabic}%
+ {#1}%
+ {\ifdefstring{\bbx@volumeformat}{Roman}%
+ {\RN{#1}}%
+ {\ifdefstring{\bbx@volumeformat}{romansc}%
+ {\textsc{\Rn{#1}}}%
+ {\ifdefstring{\bbx@volumeformat}{roman}%
+ {\Rn{#1}}%
+ {\optionerror{volumeformat}}}}}}{#1}}
+\DeclareFieldFormat[article]{volume}{%
+ \ifdefstring{\bbx@volnumformat}{strings}
+ {\bibstring{volume}~}%
+ {}%
+ \ifinteger{#1}{%
+ \ifdefstring{\bbx@volumeformat}{arabic}%
+ {#1}%
+ {\ifdefstring{\bbx@volumeformat}{Roman}%
+ {\RN{#1}}%
+ {\ifdefstring{\bbx@volumeformat}{romansc}%
+ {\textsc{\Rn{#1}}}%
+ {\ifdefstring{\bbx@volumeformat}{roman}%
+ {\Rn{#1}}x%
+ {\optionerror{volumeformat}}}}}}{#1}}
\DeclareFieldFormat{related}{%
\ifdefstring{\bbx@relatedformat}{parens}%
- {\mkpureparens{#1}}%
- {\ifdefstring{\bbx@relatedformat}{brackets}%
- {\mkpurebrackets{#1}}%
- {\ifdefstring{\bbx@relatedformat}{semicolon}%
- {#1}{\optionerror{relatedformat}}}}}%
+ {\mkpureparens{#1}}%
+ {\ifdefstring{\bbx@relatedformat}{brackets}%
+ {\mkpurebrackets{#1}}%
+ {\ifdefstring{\bbx@relatedformat}{semicolon}%
+ {#1}%
+ {\optionerror{relatedformat}}}}}%
\DeclareFieldAlias{related:origpubin}{related}
\DeclareFieldAlias{related:origpubas}{related}
\DeclareFieldFormat{relatedstring:default}{#1\addspace}
-\newbibmacro*{origpublisher+origlocation+origdate}{%
-\ifdefstring{\bbx@publocformat}{loccolonpub}
-{\usebibmacro{origloccolonpub}\setunit{\bibpagespunct}%
- \printfield{userc}}{\ifdefstring{\bbx@publocformat}{locpubyear}
-{\usebibmacro{origlocpubyear}\setunit{\bibpagespunct}%
- \printfield{userc}}
-{\usebibmacro{origpublocyear}\setunit{\bibpagespunct}%
- \printfield{userc}}}}
-
-\newbibmacro*{origpublocyear}{%
-\iflistundef{origpublisher}%
-{\printlist{origlocation}%
-\setunit*{\addspace}%
- \printorigdate}%
-{\printlist{origpublisher}%
- \setunit*{\addcomma\space}%
-\printlist{origlocation}%
-\setunit*{\addspace}%
- \printorigdate}%
- \newunit}
-
-\newbibmacro*{origloccolonpub}{%
-\iflistundef{origlocation}{}%
- {\printlist{origlocation}}%
- \iflistundef{origpublisher}%
- {\setunit*{\addspace}%
-\printorigdate}%
- {\setunit*{\addcolon\space}%
- \printlist{origpublisher}%
- \setunit*{\addcomma\space}%
- \printorigdate}%
- \newunit}
-
-\newbibmacro*{origlocpubyear}{%
-\iflistundef{origlocation}{}%
- {\printlist{origlocation}}%
- \iflistundef{origpublisher}%
- {\setunit*{\addspace}%
-\printorigdate}%
- {\setunit*{\addcomma\space}%
- \printlist{origpublisher}%
- \setunit*{\addcomma\space}%
- \printorigdate}%
- \newunit}
-
-\newbibmacro*{reprinttitle}{%
- \iffieldundef{reprinttitle}{}{%
- \iffieldsequal{reprinttitle}{title}{}{%
- \printfield[title]{reprinttitle}%
- \setunit{\addcomma\space}}}%
-\iffieldundef{userb}{}{%
- \printfield{userb}}}%
-
-\newbibmacro*{transorigstring}{%
-\iffieldundef{reprinttitle}%
-{\printtext{\ifdefstring{\bbx@origfields}{origed}
-{\bibstring{origed}}%
-{\bibstring{translationas}}}\nopunct}%
-{\printtext{\bibstring{reprint}}}\nopunct}
-
-\newbibmacro*{origtitle:book}{%
- \iffieldundef{origtitle}{}{
- \printfield[origtitle]{origtitle}%
- \setunit{\addcomma\space}}
-\iffieldundef{userb}{}{%
- \printfield{userb}}}%
-
-\newbibmacro*{origtitledata:book}{%
-\usebibmacro{transorigstring}%
-\iffieldundef{reprinttitle}%
-{\usebibmacro{origtitle:book}}%
-{\usebibmacro{reprinttitle}}%
-\newunit\newblock
- \usebibmacro{origpublisher+origlocation+origdate}}
-
-\newbibmacro*{origdata:book}{%
- \ifboolexpr{%
- test {\iffieldundef{origtitle}}
- and
- test {\iffieldundef{origlocation}}
- and
- test {\iffieldundef{origpublisher}}
- and
- test {\iffieldundef{origyear}}
- }%
- {}%
- {\ifdefstring{\bbx@relatedformat}{parens}
- {\nopunct\printtext[pureparens]{\usebibmacro{origtitledata:book}}}
- {\ifdefstring{\bbx@relatedformat}{brackets}
- {\nopunct\printtext[brackets]{\usebibmacro{origtitledata:book}}}
- {\setunit{\addsemicolon\space}%
- \printtext{\usebibmacro{origtitledata:book}}}}}}
-
-\newbibmacro*{origtitle:article-inbook-incoll}{%
- \iffieldundef{origtitle}{}{%
- \printfield[origtitle]{origtitle}%
-\setunit{\addcomma\space}}%
-\iffieldundef{usera}{}{%
-\usebibmacro{in:}%
-\printfield{usera}%
- \setunit{\addcomma\space}}%
-\iffieldundef{userb}{}{%
- \printfield{userb}%
- \newunit}}
-
-\newbibmacro*{origtitledata:article-inbook-incoll}{%
- \usebibmacro{transorigstring}%
- \setunit{\addspace}%
- \usebibmacro{origtitle:article-inbook-incoll}%
- \usebibmacro{origpublisher+origlocation+origdate}}
+\renewbibmacro*{citeindex}{%
+ \ifciteindex{\indexnames{labelname}}{}}%
+\renewbibmacro*{bibindex}{%
+ \ifbibindex{\indexnames{author}%
+ \indexnames{editor}%
+ \indexnames{editora}%
+ \indexnames{editorb}%
+ \indexnames{editorc}}%
+ {}}%
-\newbibmacro*{origdata:article-inbook}{%
- \iflistundef{origlocation}{}{%
- \ifdefstring{\bbx@relatedformat}{parens}
- {\nopunct\printtext[pureparens]{%
- \usebibmacro{origtitledata:article-inbook-incoll}}}%
- {\ifdefstring{\bbx@relatedformat}{brackets}
- {\nopunct\printtext[brackets]{%
- \usebibmacro{origtitledata:article-inbook-incoll}}}%
- {\setunit{\addsemicolon\space}%
- \printtext{%
- \usebibmacro{origtitledata:article-inbook-incoll}}}}}}
\renewbibmacro*{addendum+pubstate}{%
\printfield{addendum}%
\newunit\newblock
@@ -437,7 +347,7 @@
\renewbibmacro*{periodical}{%
\iffieldundef{title}
- {}
+ {}%
{\printtext[title]{%
\printfield[titlecase]{title}%
\midsentence%
@@ -448,7 +358,7 @@
\usebibmacro{journal}%
\setunit*{\addspace}%
\iffieldundef{series}
- {}
+ {}%
{\newunit%
\printfield{series}\setunit{\addspace}\midsentence}%
\newunit%
@@ -463,7 +373,7 @@
\usebibmacro{periodical}%
\setunit*{\addspace}%
\iffieldundef{series}
- {}
+ {}%
{\newunit
\printfield{series}%
\setunit{\addspace}\midsentence}%
@@ -497,7 +407,7 @@
\usebibmacro{date}}}%
\newunit}
-\renewbibmacro*{event+venue+date}{%v0.8
+\renewbibmacro*{event+venue+date}{%
\printfield{eventtitle}%
\ifboolexpr{%
test {\iffieldundef{venue}}
@@ -555,8 +465,8 @@
{\setunit{\addperiod\space}%
\printtext[backrefparens]{%
\ifnumgreater{\value{pageref}}{1}
- {\bibstring{backrefpages}\ppspace}%
- {\bibstring{backrefpage}\ppspace}%
+ {\bibcpstring{backrefpages}\ppspace}%
+ {\bibcpstring{backrefpage}\ppspace}%
\printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct}}%
\renewbibmacro*{finentry}{%
@@ -676,26 +586,149 @@
{}%
{}%
\renewbibmacro*{related:default}[1]{%
-\togglefalse{cbx:scauthorscite}%
-\togglefalse{bbx:annotation}%
-\ifboolexpr{
-test {\iffieldundef{relatedtype}}
-and
-test {\iffieldundef{relatedstring}}
-}
-{\printtext{\bibstring{translationas}}}{}%
-\printtext{\addspace}%
-\relatedcite{\thefield{related}}}
+ \togglefalse{bbx:annotation}%
+ \ifboolexpr{
+ test {\iffieldundef{relatedtype}}
+ and
+ test {\iffieldundef{relatedstring}}
+ }
+ {\printtext{\bibstring{translationas}}}{}%
+ \printtext{\addspace}%
+ \relatedcite{\thefield{related}}}
\renewbibmacro*{begrelatedloop}{%
\renewrobustcmd*{\mkpureparens}{\relatedpunct}%
\renewrobustcmd*{\mkpurebrackets}{\relatedpunct}}
\newbibmacro*{phil:related}{%
\iftoggle{bbx:related}
- {\ifdefstring{\bbx@relatedformat}{semicolon}%
- {\setunit{\relatedpunct}}%
- {\setunit{\addspace}}%
- \usebibmacro{related:init}%
- \usebibmacro{related}}{}}
+ {\iffieldequalstr{relatedtype}{multivolume}%
+ {\setunit{\addperiod}}%
+ {\ifdefstring{\bbx@relatedformat}{semicolon}%
+ {\setunit{\relatedpunct}}%
+ {\setunit{\addspace}}}%
+ \usebibmacro{related:init}%
+ \usebibmacro{related}}{}}
+\newbibmacro*{origpublisher+origlocation+origdate}{%
+ \ifdefstring{\bbx@publocformat}{loccolonpub}
+ {\usebibmacro{origloccolonpub}\setunit{\bibpagespunct}%
+ \printfield{userc}}{\ifdefstring{\bbx@publocformat}{locpubyear}
+ {\usebibmacro{origlocpubyear}\setunit{\bibpagespunct}%
+ \printfield{userc}}
+ {\usebibmacro{origpublocyear}\setunit{\bibpagespunct}%
+ \printfield{userc}}}}
+
+\newbibmacro*{origpublocyear}{%
+ \iflistundef{origpublisher}%
+ {\printlist{origlocation}%
+ \setunit*{\addspace}%
+ \printorigdate}%
+ {\printlist{origpublisher}%
+ \setunit*{\addcomma\space}%
+ \printlist{origlocation}%
+ \setunit*{\addspace}%
+ \printorigdate}%
+ \newunit}
+
+\newbibmacro*{origloccolonpub}{%
+ \iflistundef{origlocation}{}%
+ {\printlist{origlocation}}%
+ \iflistundef{origpublisher}%
+ {\setunit*{\addspace}%
+ \printorigdate}%
+ {\setunit*{\addcolon\space}%
+ \printlist{origpublisher}%
+ \setunit*{\addcomma\space}%
+ \printorigdate}%
+ \newunit}
+
+\newbibmacro*{origlocpubyear}{%
+ \iflistundef{origlocation}{}%
+ {\printlist{origlocation}}%
+ \iflistundef{origpublisher}%
+ {\setunit*{\addspace}%
+ \printorigdate}%
+ {\setunit*{\addcomma\space}%
+ \printlist{origpublisher}%
+ \setunit*{\addcomma\space}%
+ \printorigdate}%
+ \newunit}
+
+\newbibmacro*{reprinttitle}{%
+ \iffieldundef{reprinttitle}{}{%
+ \iffieldsequal{reprinttitle}{title}{}{%
+ \printfield[title]{reprinttitle}%
+ \setunit{\addcomma\space}}}%
+ \iffieldundef{userb}{}{%
+ \printfield{userb}}}%
+
+\newbibmacro*{transorigstring}{%
+ \iffieldundef{reprinttitle}%
+ {\printtext{\ifdefstring{\bbx@origfields}{origed}
+ {\bibstring{origpubas}}%
+ {\bibstring{translationas}}}\nopunct}%
+ {\printtext{\bibstring{reprint}}}\nopunct}
+
+\newbibmacro*{origtitle:book}{%
+ \iffieldundef{origtitle}{}{
+ \printfield[origtitle]{origtitle}%
+ \setunit{\addcomma\space}}
+ \iffieldundef{userb}{}{%
+ \printfield{userb}}}%
+
+\newbibmacro*{origtitledata:book}{%
+ \usebibmacro{transorigstring}%
+ \iffieldundef{reprinttitle}%
+ {\usebibmacro{origtitle:book}}%
+ {\usebibmacro{reprinttitle}}%
+ \newunit\newblock
+ \usebibmacro{origpublisher+origlocation+origdate}}
+
+\newbibmacro*{origdata:book}{%
+ \ifboolexpr{%
+ test {\iffieldundef{origtitle}}
+ and
+ test {\iffieldundef{origlocation}}
+ and
+ test {\iffieldundef{origpublisher}}
+ and
+ test {\iffieldundef{origyear}}
+ }%
+ {}%
+ {\ifdefstring{\bbx@relatedformat}{parens}
+ {\nopunct\printtext[pureparens]{\usebibmacro{origtitledata:book}}}
+ {\ifdefstring{\bbx@relatedformat}{brackets}
+ {\nopunct\printtext[brackets]{\usebibmacro{origtitledata:book}}}
+ {\setunit{\addsemicolon\space}%
+ \printtext{\usebibmacro{origtitledata:book}}}}}}
+
+\newbibmacro*{origtitle:article-inbook-incoll}{%
+ \iffieldundef{origtitle}{}{%
+ \printfield[origtitle]{origtitle}%
+ \setunit{\addcomma\space}}%
+ \iffieldundef{usera}{}{%
+ \usebibmacro{in:}%
+ \printfield{usera}%
+ \setunit{\addcomma\space}}%
+ \iffieldundef{userb}{}{%
+ \printfield{userb}%
+ \newunit}}
+
+\newbibmacro*{origtitledata:article-inbook-incoll}{%
+ \usebibmacro{transorigstring}%
+ \setunit{\addspace}%
+ \usebibmacro{origtitle:article-inbook-incoll}%
+ \usebibmacro{origpublisher+origlocation+origdate}}
+
+\newbibmacro*{origdata:article-inbook}{%
+ \iflistundef{origlocation}{}{%
+ \ifdefstring{\bbx@relatedformat}{parens}
+ {\nopunct\printtext[pureparens]{%
+ \usebibmacro{origtitledata:article-inbook-incoll}}}%
+ {\ifdefstring{\bbx@relatedformat}{brackets}
+ {\nopunct\printtext[brackets]{%
+ \usebibmacro{origtitledata:article-inbook-incoll}}}%
+ {\setunit{\addsemicolon\space}%
+ \printtext{%
+ \usebibmacro{origtitledata:article-inbook-incoll}}}}}}
\DeclareBibliographyDriver{article}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -854,7 +887,6 @@ test {\iffieldundef{relatedstring}}
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inbook}{%
-\togglefalse{cbx:scauthorscite}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator+others}%
@@ -913,7 +945,6 @@ test {\iffieldundef{relatedstring}}
\usebibmacro{finentry}}
\DeclareBibliographyDriver{incollection}{%
-\togglefalse{cbx:scauthorscite}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator+others}%
@@ -970,7 +1001,6 @@ test {\iffieldundef{relatedstring}}
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inproceedings}{%
-\togglefalse{cbx:scauthorscite}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator+others}%
@@ -1345,13 +1375,13 @@ test {\iffieldundef{relatedstring}}
\usebibmacro{finentry}}
\DeclareBibliographyDriver{set}{%
-\savefield{annotation}{\@phil@nnote}%
-\clearfield{annotation}%
-\entryset{}{}%
-\newunit\newblock
-\restorefield{annotation}{\@phil@nnote}%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}
+ \savefield{annotation}{\@phil@nnote}%
+ \clearfield{annotation}%
+ \entryset{}{}%
+ \newunit\newblock
+ \restorefield{annotation}{\@phil@nnote}%
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
\renewbibmacro*{bybookauthor}{%
\ifnamesequal{author}{bookauthor}%
@@ -1422,7 +1452,7 @@ test {\iffieldundef{relatedstring}}
\iffieldundef{bookpagination}{#1}{\mkpageprefix[bookpagination]{#1}}}
\DeclareFieldFormat[jurisdiction]{title}{%
\iffieldequalstr{entrysubtype}{international}{\emph{#1}}{#1}}
-\DeclareFieldFormat[jurisdiction]{notacomm}{nt\adddotspace#1} % \end{macrocode}
+\DeclareFieldFormat[jurisdiction]{notacomm}{nt\adddotspace#1}% \end{macrocode}
\newbibmacro*{juris:author}{%
\DeclareNameAlias{sortname}{default}%
\ifboolexpr{%
@@ -1438,7 +1468,7 @@ test {\iffieldundef{relatedstring}}
\iffieldundef{authortype}
{}
{\setunit{\addcomma\space}%
-\usebibmacro{authorstrg}}}
+ \usebibmacro{authorstrg}}}
{}%
\iffieldequalstr{type}{conclusions}{%
\setunit{\addspace}%
@@ -1481,9 +1511,9 @@ test {\iffieldundef{relatedstring}}
\usebibmacro{maintitle+booktitle}%
\newunit\newblock
\printtext{%
- \printfield{labelyear}%
- \printfield{extrayear}}
- \usebibmacro{byeditor+others}%
+ \printfield{labelyear}%
+ \printfield{extrayear}}
+ \usebibmacro{byeditor+others}%
\newunit\newblock
\printfield{edition}%
\newunit
@@ -1537,16 +1567,16 @@ test {\iffieldundef{relatedstring}}
\DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court}
%%
-%% Copyright 2009-2017 by Ivan Valbusa
+%% 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.
+%% 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
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "author-maintained".
%%
%%
%% End of file `philosophy-standard.bbx'.
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 a08676efcb2..3eb3c9daa66 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -5,37 +5,21 @@
%% The original source files were:
%%
%% biblatex-philosophy.dtx (with options: `verbose-bbx')
-%% ______________________________________________________
-%% The biblatex-philosophy package
-%% Copyright (C) 2009-2017 Ivan Valbusa
-%% All rights reserved
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
%%
-%% License information appended
+%% License information appended
%%
\ProvidesFile{philosophy-verbose.bbx}
- [2017/02/16 v1.9.1 A set of styles for biblatex]
-
-
+[2017/03/14 v1.9.2 A set of styles for biblatex]
\RequireBibliographyStyle{authortitle}
\RequireBibliographyStyle{philosophy-standard}
-\DeclareFieldFormat{edition}{%
- \ifinteger{#1}{%
- \ifdefstring{\bbx@editionformat}{arabic}
- {\mkbibordedition{#1}~\bibstring{edition}}
- {\ifdefstring{\bbx@editionformat}{Roman}%
- {\RN{#1}~\bibstring{edition}}%
- {\ifdefstring{\bbx@editionformat}{romansc}%
- {\textsc{\Rn{#1}}~\bibstring{edition}}%
- {\ifdefstring{\bbx@editionformat}{roman}%
- {\Rn{#1}~\bibstring{edition}}
- {\ifdefstring{\bbx@editionformat}{superscript}%
- {\mkbibsuperscript{#1}}%
- {\optionerror{editionformat}}}}}}}{#1}}%\isdot??
-
\AtBeginShorthands{%
\togglefalse{bbx:annotation}%
\DeclareCiteCommand{\bbx@crossref@inbook}%
@@ -53,6 +37,19 @@
{}%
{}%
}
+\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
@@ -137,7 +134,6 @@
\renewbibmacro*{commarelateddate}{%
\setunit*{\addcomma\space}%
\printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}}
-
\DeclareBibliographyDriver{book}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -445,7 +441,7 @@
\printfield[citetitle]{labeltitle}%
\iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
{\setunit{\addspace\midsentence}}%
- \bibstring{cited}}}%
+ \bibstring{opcit}}}%
{\DeclareNameAlias{sortname}{default}%
\usebibmacro{usedriver:book}}}%
{}%
@@ -462,22 +458,22 @@
\printfield[citetitle]{labeltitle}%
\iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
{\setunit{\addspace\midsentence}}%
- \bibstring{cited}}}%
+ \bibstring{opcit}}}%
{\DeclareNameAlias{sortname}{default}%
\usebibmacro{usedriver:collection}}}%
{}%
{}%
%%
-%% Copyright 2009-2017 by Ivan Valbusa
+%% 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.
+%% 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
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "author-maintained".
%%
%%
%% End of file `philosophy-verbose.bbx'.
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 080b30fd8d5..c0ec21ec6b6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
@@ -5,28 +5,23 @@
%% The original source files were:
%%
%% biblatex-philosophy.dtx (with options: `verbose-cbx')
-%% ______________________________________________________
-%% The biblatex-philosophy package
-%% Copyright (C) 2009-2017 Ivan Valbusa
-%% All rights reserved
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
%%
-%% License information appended
+%% License information appended
%%
\ProvidesFile{philosophy-verbose.cbx}
- [2017/02/16 v1.9.1 A set of styles for biblatex]
-
-
+[2017/03/14 v1.9.2 A set of styles for biblatex]
\RequireCitationStyle{verbose-trad2}
-\newtoggle{cbx:scauthorscite}
\newtoggle{cbx:latinemph}
\newtoggle{cbx:commacit}
-\DeclareBibliographyOption{scauthorscite}[true]{%
- \settoggle{cbx:scauthorscite}{#1}}
\DeclareBibliographyOption{latinemph}[true]{%
\settoggle{cbx:latinemph}{#1}}
\DeclareBibliographyOption{commacit}[true]{%
@@ -35,91 +30,44 @@
\ExecuteBibliographyOptions{%
idemtracker=false,
loccittracker=strict,
- scauthorscite=false,
latinemph=false,
commacit=false}
-
+\renewcommand*{\mkibid}{\iftoggle{cbx:latinemph}{\emph}{}}
\AtEveryCite{%
-\togglefalse{bbx:annotation}%
-\iftoggle{cbx:latinemph}{\renewcommand*{\mkibid}{\emph}}{}%
-\renewbibmacro*{name:andothers}{%
- \ifboolexpr{%
- test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
- and
- test \ifmorenames
- }%
+ \togglefalse{bbx:annotation}%
+ \renewcommand*{\mkbibnamefamily}[1]{%
+ \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
+ \renewcommand*{\mkbibnamegiven}[1]{%
+ \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
+ \renewcommand*{\mkbibnameprefix}[1]{%
+ \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
+ \renewcommand*{\mkbibnamesuffix}[1]{%
+ \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
+ \renewbibmacro*{name:andothers}{%
+ \ifboolexpr{%
+ test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
+ and
+ test \ifmorenames
+ }%
{\ifnumgreater{\value{liststop}}{1}%
- {\finalandcomma}%
- {}%
- \andothersdelim\bibstring[\mkibid]{andothers}}%
+ {\finalandcomma}%
+ {}%
+ \andothersdelim\bibstring[\mkibid]{andothers}}%
{}}%
-\renewbibmacro*{list:andothers}{%
- \ifboolexpr{%
- test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
- and
- test \ifmoreitems
- }%
+ \renewbibmacro*{list:andothers}{%
+ \ifboolexpr{%
+ test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
+ and
+ test \ifmoreitems
+ }%
{\ifnumgreater{\value{liststop}}{1}%
- {\finalandcomma}%
- {}%
- \andmoredelim\bibstring[\mkibid]{andmore}}%
+ {\finalandcomma}%
+ {}%
+ \andmoredelim\bibstring[\mkibid]{andmore}}%
{}}%
-\iftoggle{cbx:scauthorscite}{%
-\DeclareNameFormat{labelname}{%
-\iffootnote{%
- \let\mkbibnamefamily\mkbibsc%
- \let\mkbibnamegiven\mkbibsc%
- \let\mkbibnameprefix\mkbibsc%
- \let\mkbibnameaffix\mkbibsc}{}%
- \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}{%
-\iffootnote{%
- \let\mkbibnamefamily\mkbibsc%
- \let\mkbibnamegiven\mkbibsc%
- \let\mkbibnameprefix\mkbibsc%
- \let\mkbibnameaffix\mkbibsc}{}%
- \nameparts{#1}%
- \ifgiveninits
- {\usebibmacro{name:given-family}%
- {\namepartfamily}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartsuffix}}%
- {\usebibmacro{name:given-family}%
- {\namepartfamily}%
- {\namepartgiven}%
- {\namepartprefix}%
- {\namepartsuffix}}%
- \usebibmacro{name:andothers}}%
+}%
\newbibmacro*{cite:opcit}{%
- \printtext[bibhyperlink]{\bibstring[\mkibid]{opcit}}}
+ \printtext[bibhyperlink]{\bibstring[\mkibid]{opcited}}}
\newbibmacro*{cite:loccit}{%
\printtext{%
@@ -128,78 +76,74 @@
\global\toggletrue{cbx:loccit}}
\renewbibmacro*{cite:ibid}{%
- \ifloccit
- {\usebibmacro{cite:loccit}}{%
- \printtext{%
- \bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
- \bibstring[\mkibid]{ibidem}}}}}%
+ \ifloccit
+ {\usebibmacro{cite:loccit}}{%
+ \printtext{%
+ \bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
+ \bibstring[\mkibid]{ibidem}}}}}%
-\renewbibmacro*{cite:title}{%OK
- \ifsingletitle{\usebibmacro{cite:opcit}}{%
- \printtext[bibhyperlink]{%
- \printfield[citetitle]{labeltitle}%
- \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
- {\setunit{\addspace\midsentence}}}%
- \bibstring{cited}}}
+\renewbibmacro*{cite:title}{%
+ \ifsingletitle{\usebibmacro{cite:opcit}}{%
+ \printtext[bibhyperlink]{%
+ \printfield[citetitle]{labeltitle}%
+ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+ {\setunit{\addspace\midsentence}}}%
+ \bibstring{opcit}}}
-\renewbibmacro*{cite:full}{%OK
- \iftoggle{cbx:shorthandintro}{%
- \usebibmacro{cite:full:citepages}%
- \global\toggletrue{cbx:fullcite}%
- \printtext[bibhypertarget]{%
- \usedriver
- {\iftoggle{cbx:scauthorscite}{%
- \DeclareNameAlias{sortname}{scdefault}}%
- {\DeclareNameAlias{sortname}{default}}}%
+\renewbibmacro*{cite:full}{%
+ \iftoggle{cbx:shorthandintro}{%
+ \usebibmacro{cite:full:citepages}%
+ \global\toggletrue{cbx:fullcite}%
+ \printtext[bibhypertarget]{%
+ \usedriver
+ {\DeclareNameAlias{sortname}{default}}%
{\thefield{entrytype}}}%
- \usebibmacro{shorthandintro}}%
+ \usebibmacro{shorthandintro}}%
{\usebibmacro{cite:shorthand}}}
\renewbibmacro*{cite:idem}{%
-\iftoggle{cbx:scauthorscite}{%
- \bibstring[\mkbibsc]{idem\thefield{gender}}}{%
- \bibstring[\mkibid]{idem\thefield{gender}}}%
+ \iftoggle{cbx:scauthorscite}{%
+ \bibstring[\mkbibsc]{idem\thefield{gender}}}{%
+ \bibstring[\mkibid]{idem\thefield{gender}}}%
\setunit{\nametitledelim}}
\newbibmacro*{ccite:cite}{%
-\usebibmacro{related:clearauthors}%
+ \usebibmacro{related:clearauthors}%
\usebibmacro{cite:citepages}%
\global\togglefalse{cbx:fullcite}%
\global\togglefalse{cbx:loccit}%
\bibhypertarget{cite\the\value{instcount}}{%
\ifciteseen
- {\iffieldundef{shorthand}
- {\usebibmacro{cite:title}%
- \usebibmacro{cite:save}}
- {\usebibmacro{cite:shorthand}}}
- {\usebibmacro{cite:full}%
- \usebibmacro{cite:save}}}}
+ {\iffieldundef{shorthand}
+ {\usebibmacro{cite:title}%
+ \usebibmacro{cite:save}}
+ {\usebibmacro{cite:shorthand}}}
+ {\usebibmacro{cite:full}%
+ \usebibmacro{cite:save}}}}
\DeclareCiteCommand{\ccite}
{\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
- \usebibmacro{ccite:cite}}
+ \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}}
+{\usedriver
+ {\DeclareNameAlias{sortname}{default}}%
+ {\thefield{entrytype}}}
+{\multicitedelim}
+{\usebibmacro{postnote}}
%%
-%% Copyright 2009-2017 by Ivan Valbusa
+%% 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.
+%% 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
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "author-maintained".
%%
%%
%% End of file `philosophy-verbose.cbx'.
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 99af7c1e057..12463853e5e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx
@@ -5,17 +5,15 @@
%% The original source files were:
%%
%% biblatex-philosophy.dtx (with options: `spanish-lbx')
-%% ______________________________________________________
-%% The biblatex-philosophy package
-%% Copyright (C) 2009-2017 Ivan Valbusa
-%% All rights reserved
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
%%
-%% License information appended
+%% License information appended
%%
\ProvidesFile{spanish-philosophy.lbx}
- [2017/02/16 v1.9.1 A set of styles for biblatex]
-
-
+[2017/03/14 v1.9.2 A set of styles for biblatex]
@@ -26,22 +24,21 @@
-\penalty\hyphenpenalty}%
\protected\def\bibdatedash{\textendash}}%
-\NewBibliographyString{origed,cited}
+\NewBibliographyString{opcited}
\DeclareBibliographyStrings{%
inherit = {spanish},
- origed = {{edici\'{o}n original}{ed\adddot orig\adddot}},
- cited = {{cit\adddot}{cit\adddot}},
- opcit = {{op\adddot cit\adddot}{op\adddot cit\adddot}},
+ 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: Maiuscola iniziale?
- backrefpage = {{Citado en la p\'{a}gina}{Citado en la \bibstring{page}\adddot}},%%FIXME: Maiuscola iniziale?
- backrefpages = {{Citado en las p\'{a}ginas}{Citado en las \bibstring{pages}\adddot}},%%FIXME: Maiuscola iniziale?
+ 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}}},
@@ -54,20 +51,21 @@
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}}}
}
%%
-%% Copyright 2009-2017 by Ivan Valbusa
+%% 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.
+%% 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
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "author-maintained".
%%
%%
%% End of file `spanish-philosophy.lbx'.