From 83556912266859c0d8e6e1bc048b5b8ba1bfcc93 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 16 Oct 2013 22:59:42 +0000 Subject: biblatex-philosophy (16oct13) git-svn-id: svn://tug.org/texlive/trunk@31922 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/english-philosophy.lbx | 4 +--- .../biblatex-philosophy/italian-philosophy.lbx | 4 +--- .../biblatex-philosophy/philosophy-classic.bbx | 2 +- .../biblatex-philosophy/philosophy-classic.cbx | 2 +- .../biblatex-philosophy/philosophy-modern.bbx | 2 +- .../biblatex-philosophy/philosophy-modern.cbx | 2 +- .../biblatex-philosophy/philosophy-standard.bbx | 4 ++-- .../biblatex-philosophy/philosophy-verbose.bbx | 2 +- .../biblatex-philosophy/philosophy-verbose.cbx | 24 +++++++++++++++++++++- 9 files changed, 32 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy') 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 50b4aa1c472..d7599a96b65 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{english-philosophy.lbx} - [2013/08/30 v0.9b valbusa beta] + [2013/10/15 v0.9c valbusa beta] \InheritBibliographyExtras{english} @@ -34,8 +34,6 @@ origed = {{orig\adddotspace ed\adddot}{orig\adddotspace ed\adddot}}, editor = {{\mkpureparens{ed\adddot}}{\mkpureparens{ed\adddot}}}, editors = {{\mkpureparens{eds\adddot}}{\mkpureparens{eds\adddot}}}, - andothers = {{\mkbibemph{et\addabbrvspace al\adddot}} - {\mkbibemph{et\addabbrvspace al\adddot}}}, reviewof = {{Review of}{Review of}}, translationas = {{trans\adddot}{trans\adddot}}, backrefpage = {{cited on page}{cited on p\adddot}}, 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 12835d28f5b..66aa3773b80 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{italian-philosophy.lbx} - [2013/08/30 v0.9b valbusa beta] + [2013/10/15 v0.9c valbusa beta] \InheritBibliographyExtras{italian} @@ -35,8 +35,6 @@ langitalian = {{italiano}{it\adddot}}, editor = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, editors = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, - andothers = {{\mkbibemph{et\addabbrvspace al\adddot}} - {\mkbibemph{et\addabbrvspace al\adddot}}}, backrefpage = {{Citato a pagina}{Citato a \bibstring{page}\adddot}}, backrefpages = {{Citato alle pagine}{Citato alle \bibstring{pages}\adddot}}, pages = {{pagine}{\iftoggle{bbx:classical}{pp\adddot}{p\adddot}}}, 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 9b5bd15c5d5..b2aedc358a4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-classic.bbx} - [2013/08/30 v0.9b valbusa beta] + [2013/10/15 v0.9c valbusa beta] \RequireBibliographyStyle{authoryear} 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 bf503326b1d..fda14d3487c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-classic.cbx} - [2013/08/30 v0.9b valbusa beta] + [2013/10/15 v0.9c valbusa beta] \RequireCitationStyle{authoryear-comp} diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx index a665333fa8e..1bffca56bd2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-modern.bbx} - [2013/08/30 v0.9b valbusa beta] + [2013/10/15 v0.9c valbusa beta] \RequireBibliographyStyle{philosophy-classic} diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx index 3a8e6366ed7..7d01887e4f8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-modern.cbx} - [2013/08/30 v0.9b valbusa beta] + [2013/10/15 v0.9c valbusa beta] \RequireCitationStyle{philosophy-classic} diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx index 53ea27db13f..c67fcedf250 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-standard.bbx} - [2013/08/30 v0.9b valbusa beta] + [2013/10/15 v0.9c valbusa beta] \RequireBiber[2] @@ -623,7 +623,7 @@ \newunit\newblock \printfield{version}% \newunit\newblock - \iftoggle{bbx:inbeforejournal}{\usebibmacro{in:}}{} + \iftoggle{bbx:inbeforejournal}{\usebibmacro{in:}}{}% \usebibmacro{journal+issuetitle}% \newunit\newblock \usebibmacro{byeditor+others}% 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 1dc4d3a5896..1e3605fa025 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.bbx} - [2013/08/30 v0.9b valbusa beta] + [2013/10/15 v0.9c valbusa beta] \RequireBibliographyStyle{authortitle} 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 c20fcef377c..4689759e58d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.cbx} - [2013/08/30 v0.9b valbusa beta] + [2013/10/15 v0.9c valbusa beta] \RequireCitationStyle{verbose-trad2} @@ -39,6 +39,28 @@ \AtEveryCite{% \togglefalse{bbx:annotation}% \iftoggle{cbx:latinemph}{\renewcommand*{\mkibid}{\emph}}{}% +\renewbibmacro*{name:andothers}{% + \ifboolexpr{ + test {\ifnumequal{\value{listcount}}{\value{liststop}}} + and + test \ifmorenames + } + {\ifnumgreater{\value{liststop}}{1} + {\finalandcomma} + {}% + \andothersdelim\bibstring[\mkibid]{andothers}} + {}} +\newbibmacro*{list:andothers}{% + \ifboolexpr{ + test {\ifnumequal{\value{listcount}}{\value{liststop}}} + and + test \ifmoreitems + } + {\ifnumgreater{\value{liststop}}{1} + {\finalandcomma} + {}% + \andmoredelim\bibstring[\mkibid]{andmore}} + {}} \iftoggle{cbx:scauthorscite}{% \DeclareNameFormat{labelname}{% \renewcommand{\mkbibnamefirst}{\textsc}% -- cgit v1.2.3