From 29202d8bd8aea1ad316566d9c8012ffee2eedb85 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Sep 2016 22:24:47 +0000 Subject: biblatex-morenames git-svn-id: svn://tug.org/texlive/trunk@42070 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-morenames/morenames.bbx | 51 +++++++++++++++++----- .../tex/latex/biblatex-morenames/morenames.dbx | 2 +- 2 files changed, 41 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-morenames') diff --git a/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.bbx b/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.bbx index ad970f67929..8dc09b4b8d5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.bbx @@ -13,7 +13,7 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files realauthor.dbx, realauthor.bbx \ProvidesFile{morenames.bbx} -[2016/06/07 v1.1.0 biblatex bibliography style to have more name fields (MR)] +[2016/09/08 v1.2.0 biblatex bibliography style to have more name fields (MR)] %0. Preamble @@ -28,6 +28,26 @@ \inherit{editor}{maineditor} } +%1.two optionnal data inheritances +\providetoggle{IneditorFromEditor}% +\providetoggle{BookineditorFromEditor}% +\AtEndPreamble{% + \iftoggle{IneditorFromEditor}{% + \DeclareDataInheritance{book,mvbook}{inbook}{% + \inherit{editor}{ineditor}% + \inherit{editor}{editor}% + }% + }% + {} + \iftoggle{BookineditorFromEditor}{% + \DeclareDataInheritance{book,mvbook}{bookinbook}{% + \inherit{editor}{bookineditor}% + \inherit{editor}{editor}% + }% + }% + {}% +} + %2. New label names \DeclareLabelname[collection,proceedings,reference]{% @@ -169,17 +189,26 @@ {\usebibmacro{bytypestrg}{ineditor}{editor}% \setunit{\addspace}% \printnames[byeditor]{ineditor}% - \newunit}% + \newunit% + \ifnamesequal{ineditor}{editor}% + {\clearname{editor}}% + {}% + }% } -\newbibmacro*{bybookineditor}{% - \ifnameundef{bookineditor} - {} - {\usebibmacro{bytypestrg}{bookineditor}{editor}% - \setunit{\addspace}% - \printnames[byeditor]{bookineditor}% - \newunit}% - } - +\ifdefined\abx@macro@bybookineditor\else% + \newbibmacro*{bybookineditor}{% + \ifnameundef{bookineditor} + {}% + {\usebibmacro{bytypestrg}{bookineditor}{editor}% + \setunit{\addspace}% + \printnames[byeditor]{bookineditor}% + \newunit% + \ifnamesequal{bookineditor}{editor}% + {\clearname{editor}}% + {}% + }% + }% +\fi% \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.dbx b/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.dbx index 3ceaec400b0..920fcc6c8f7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.dbx @@ -13,7 +13,7 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files realauthor.dbx, realauthor.bbx \ProvidesFile{morenames.dbx} -[2016/06/07 v1.1.0 biblatex bibliography style to have more name fields (MR)] +[2016/09/08 v1.2.0 biblatex bibliography style to have more name fields (MR)] %1. New fields \DeclareDatamodelFields[type=list,datatype=name]{ -- cgit v1.2.3