From 41f724b3302213df79b8bedd68983d9b7eae7b15 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Jun 2016 23:20:36 +0000 Subject: biblatex-morenames (7jun16) git-svn-id: svn://tug.org/texlive/trunk@41356 c570f23f-e606-0410-a88d-b1316a301751 --- .../documentation/biblatex-morenames.pdf | Bin 106438 -> 106893 bytes .../documentation/biblatex-morenames.tex | 9 +++- .../documentation/example-bookineditor.dot | 6 +-- .../documentation/example-bookineditor.pdf | Bin 14748 -> 14747 bytes .../documentation/example-maineditor.dot | 54 ++++++++++----------- .../documentation/example-maineditor.pdf | Bin 21866 -> 21838 bytes .../tex/latex/biblatex-morenames/morenames.bbx | 17 +++++-- .../tex/latex/biblatex-morenames/morenames.dbx | 2 +- 8 files changed, 51 insertions(+), 37 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/biblatex-morenames.pdf b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/biblatex-morenames.pdf index 9f642a4cd21..7636cc4ed78 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/biblatex-morenames.pdf and b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/biblatex-morenames.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/biblatex-morenames.tex b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/biblatex-morenames.tex index debc1a40ff1..10222f0952f 100644 --- a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/biblatex-morenames.tex +++ b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/biblatex-morenames.tex @@ -24,8 +24,8 @@ subtitle={New fields of name type for standard biblatex entry types}, email={maieul maieul net}, author={Maïeul Rouquette}, - revision={1.0.0}, - date={06/04/2016}, + revision={1.1.0}, + date={07/06/2016}, url={https://git.framasoft.org/maieul/biblatex-morenames}} @@ -195,6 +195,11 @@ The graph~\ref{example-bookineditor} shows the fields inheritance. \section{Change history} \begin{changelog} + +\begin{release}{1.1.0}{2016-06-07} + \item Add error message to know more quickly break compatibility with new releases of biblatex. +\end{release} + \begin{release}{1.0.0}{2016-04-06} \item First public release. \end{release} diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.dot b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.dot index c2fc1a9b370..0eacc952705 100644 --- a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.dot +++ b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.dot @@ -39,9 +39,9 @@ digraph Biberdata { - "section0/CCSG26/title" -> "section0/BHG226/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/BOOKTITLE inherited via CROSSREF from CCSG26/TITLE" ] - "section0/CCSG26/series" -> "section0/BHG226/series" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/SERIES inherited via CROSSREF from CCSG26/SERIES" ] - "section0/CCSG26/number" -> "section0/BHG226/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/NUMBER inherited via CROSSREF from CCSG26/NUMBER" ] "section0/CCSG26/editor" -> "section0/BHG226/editor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/EDITOR inherited via CROSSREF from CCSG26/EDITOR" ] + "section0/CCSG26/number" -> "section0/BHG226/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/NUMBER inherited via CROSSREF from CCSG26/NUMBER" ] + "section0/CCSG26/series" -> "section0/BHG226/series" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/SERIES inherited via CROSSREF from CCSG26/SERIES" ] + "section0/CCSG26/title" -> "section0/BHG226/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/BOOKTITLE inherited via CROSSREF from CCSG26/TITLE" ] } diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.pdf b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.pdf index 22a13c0783c..b0177f55506 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.pdf and b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-maineditor.dot b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-maineditor.dot index 5400e42dbb2..c0304d2fa47 100644 --- a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-maineditor.dot +++ b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-maineditor.dot @@ -8,6 +8,21 @@ digraph Biberdata { style=filled, shape=box ]; + subgraph "cluster_section0/HistoireduChristianisme" { + fontsize="10"; + label="HistoireduChristianisme (MVCOLLECTION)"; + tooltip="HistoireduChristianisme (MVCOLLECTION)"; + fillcolor="#a0d0ff"; + + "section0/HistoireduChristianisme/editor" [ label="EDITOR" ] + "section0/HistoireduChristianisme/location" [ label="LOCATION" ] + "section0/HistoireduChristianisme/publisher" [ label="PUBLISHER" ] + "section0/HistoireduChristianisme/subtitle" [ label="SUBTITLE" ] + "section0/HistoireduChristianisme/title" [ label="TITLE" ] + "section0/HistoireduChristianisme/volumes" [ label="VOLUMES" ] + "section0/HistoireduChristianisme/year" [ label="YEAR" ] + } + subgraph "cluster_section0/Maraval1998" { fontsize="10"; label="Maraval1998 (INCOLLECTION)"; @@ -49,38 +64,23 @@ digraph Biberdata { "section0/Pietri1998/year" [ label="YEAR" ] } - subgraph "cluster_section0/HistoireduChristianisme" { - fontsize="10"; - label="HistoireduChristianisme (MVCOLLECTION)"; - tooltip="HistoireduChristianisme (MVCOLLECTION)"; - fillcolor="#a0d0ff"; - - "section0/HistoireduChristianisme/editor" [ label="EDITOR" ] - "section0/HistoireduChristianisme/location" [ label="LOCATION" ] - "section0/HistoireduChristianisme/publisher" [ label="PUBLISHER" ] - "section0/HistoireduChristianisme/subtitle" [ label="SUBTITLE" ] - "section0/HistoireduChristianisme/title" [ label="TITLE" ] - "section0/HistoireduChristianisme/volumes" [ label="VOLUMES" ] - "section0/HistoireduChristianisme/year" [ label="YEAR" ] - } - + "section0/HistoireduChristianisme/editor" -> "section0/Pietri1998/maineditor" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINEDITOR inherited via CROSSREF from HistoireduChristianisme/EDITOR" ] + "section0/HistoireduChristianisme/location" -> "section0/Pietri1998/location" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/LOCATION inherited via CROSSREF from HistoireduChristianisme/LOCATION" ] + "section0/HistoireduChristianisme/publisher" -> "section0/Pietri1998/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/PUBLISHER inherited via CROSSREF from HistoireduChristianisme/PUBLISHER" ] + "section0/HistoireduChristianisme/subtitle" -> "section0/Pietri1998/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINSUBTITLE inherited via CROSSREF from HistoireduChristianisme/SUBTITLE" ] + "section0/HistoireduChristianisme/title" -> "section0/Pietri1998/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINTITLE inherited via CROSSREF from HistoireduChristianisme/TITLE" ] + "section0/HistoireduChristianisme/volumes" -> "section0/Pietri1998/volumes" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/VOLUMES inherited via CROSSREF from HistoireduChristianisme/VOLUMES" ] + "section0/Pietri1998/editor" -> "section0/Maraval1998/editor" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/EDITOR inherited via CROSSREF from Pietri1998/EDITOR" ] "section0/Pietri1998/location" -> "section0/Maraval1998/location" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/LOCATION inherited via CROSSREF from Pietri1998/LOCATION" ] - "section0/Pietri1998/year" -> "section0/Maraval1998/year" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/YEAR inherited via CROSSREF from Pietri1998/YEAR" ] - "section0/Pietri1998/mainsubtitle" -> "section0/Maraval1998/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/MAINSUBTITLE inherited via CROSSREF from Pietri1998/MAINSUBTITLE" ] - "section0/Pietri1998/volume" -> "section0/Maraval1998/volume" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/VOLUME inherited via CROSSREF from Pietri1998/VOLUME" ] "section0/Pietri1998/maineditor" -> "section0/Maraval1998/maineditor" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/MAINEDITOR inherited via CROSSREF from Pietri1998/MAINEDITOR" ] - "section0/Pietri1998/title" -> "section0/Maraval1998/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/BOOKTITLE inherited via CROSSREF from Pietri1998/TITLE" ] - "section0/Pietri1998/publisher" -> "section0/Maraval1998/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/PUBLISHER inherited via CROSSREF from Pietri1998/PUBLISHER" ] + "section0/Pietri1998/mainsubtitle" -> "section0/Maraval1998/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/MAINSUBTITLE inherited via CROSSREF from Pietri1998/MAINSUBTITLE" ] "section0/Pietri1998/maintitle" -> "section0/Maraval1998/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/MAINTITLE inherited via CROSSREF from Pietri1998/MAINTITLE" ] - "section0/Pietri1998/editor" -> "section0/Maraval1998/editor" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/EDITOR inherited via CROSSREF from Pietri1998/EDITOR" ] + "section0/Pietri1998/publisher" -> "section0/Maraval1998/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/PUBLISHER inherited via CROSSREF from Pietri1998/PUBLISHER" ] + "section0/Pietri1998/title" -> "section0/Maraval1998/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/BOOKTITLE inherited via CROSSREF from Pietri1998/TITLE" ] + "section0/Pietri1998/volume" -> "section0/Maraval1998/volume" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/VOLUME inherited via CROSSREF from Pietri1998/VOLUME" ] "section0/Pietri1998/volumes" -> "section0/Maraval1998/volumes" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/VOLUMES inherited via CROSSREF from Pietri1998/VOLUMES" ] - "section0/HistoireduChristianisme/subtitle" -> "section0/Pietri1998/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINSUBTITLE inherited via CROSSREF from HistoireduChristianisme/SUBTITLE" ] - "section0/HistoireduChristianisme/title" -> "section0/Pietri1998/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINTITLE inherited via CROSSREF from HistoireduChristianisme/TITLE" ] - "section0/HistoireduChristianisme/editor" -> "section0/Pietri1998/maineditor" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINEDITOR inherited via CROSSREF from HistoireduChristianisme/EDITOR" ] - "section0/HistoireduChristianisme/publisher" -> "section0/Pietri1998/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/PUBLISHER inherited via CROSSREF from HistoireduChristianisme/PUBLISHER" ] - "section0/HistoireduChristianisme/volumes" -> "section0/Pietri1998/volumes" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/VOLUMES inherited via CROSSREF from HistoireduChristianisme/VOLUMES" ] - "section0/HistoireduChristianisme/location" -> "section0/Pietri1998/location" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/LOCATION inherited via CROSSREF from HistoireduChristianisme/LOCATION" ] + "section0/Pietri1998/year" -> "section0/Maraval1998/year" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/YEAR inherited via CROSSREF from Pietri1998/YEAR" ] } diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-maineditor.pdf b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-maineditor.pdf index 9056c4626c9..76f59a39fb6 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-maineditor.pdf and b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-maineditor.pdf differ diff --git a/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.bbx b/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.bbx index d9964672402..ad970f67929 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/04/06 v1.0.0 biblatex bibliography style to have more name fields (MR)] +[2016/06/07 v1.1.0 biblatex bibliography style to have more name fields (MR)] %0. Preamble @@ -119,6 +119,11 @@ % 3.2 Patching maintitle+title in order to add the maineditor in @incollection (original was defined in standard.bbx) % + +\newcommand{\morenames@failpatch@macro}[1]{% + \PackageError{biblatex-morenames}{Fail to patch `#1` macro}{}% +} + \newbibmacro*{bymaineditor+others}{% \ifnameundef{maineditor} {} @@ -136,21 +141,25 @@ \usebibmacro{bymaineditor+others}% } {} - {} + {\morenames@failpatch@macro{maintitle+booktitle}} % 3.3 Patching @inbook and @article drivers in order to add the ineditor +\newcommand{\morenames@failpatch@driver}[1]{% + \PackageError{biblatex-morenames}{Fail to patch `#1` driver}{}% +} + \xpatchbibdriver{inbook}% {\usebibmacro{byauthor}} {\usebibmacro{byauthor}\newunit\usebibmacro{byineditor}} {} - {} + {\morenames@failpatch@driver{inbook}} \xpatchbibdriver{article}% {\usebibmacro{byauthor}} {\usebibmacro{byauthor}\newunit\usebibmacro{byineditor}} {} - {} + {\morenames@failpatch@driver{article}} \DeclareNameAlias{bookineditor}[byeditor]{ineditor} diff --git a/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.dbx b/Master/texmf-dist/tex/latex/biblatex-morenames/morenames.dbx index 970680af3b7..3ceaec400b0 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/04/06 v1.0.0 biblatex bibliography style to have more name fields (MR)] +[2016/06/07 v1.1.0 biblatex bibliography style to have more name fields (MR)] %1. New fields \DeclareDatamodelFields[type=list,datatype=name]{ -- cgit v1.2.3