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 --- .../documentation/biblatex-morenames.pdf | Bin 106893 -> 132702 bytes .../documentation/biblatex-morenames.tex | 81 +++++++++++++++++-- ...example-bookineditor-BookineditorFromEditor.bib | 25 ++++++ ...example-bookineditor-BookineditorFromEditor.dot | 86 +++++++++++++++++++++ ...example-bookineditor-BookineditorFromEditor.pdf | Bin 0 -> 17924 bytes .../example-bookineditor-IneditorFromEditor.pdf | Bin 0 -> 17928 bytes .../documentation/example-bookineditor.bib | 14 ++++ .../documentation/example-bookineditor.dot | 38 +++++++++ .../documentation/example-bookineditor.pdf | Bin 14747 -> 17482 bytes .../documentation/example-maineditor.pdf | Bin 21838 -> 21836 bytes .../documentation/generate-crossref-graphs.py | 14 +++- .../tex/latex/biblatex-morenames/morenames.bbx | 51 +++++++++--- .../tex/latex/biblatex-morenames/morenames.dbx | 2 +- 13 files changed, 290 insertions(+), 21 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.bib create mode 100644 Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.dot create mode 100644 Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.pdf create mode 100644 Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-IneditorFromEditor.pdf (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 7636cc4ed78..67fda68661d 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 10222f0952f..15e3a59512f 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 @@ -18,14 +18,15 @@ \usepackage[citestyle=verbose,bibstyle=morenames]{biblatex} \bibliography{example-maineditor.bib} \bibliography{example-bookineditor.bib} +\bibliography{example-bookineditor-BookineditorFromEditor.bib} % Meta-datas \titlepage{% title={Biblatex-morenames}, subtitle={New fields of name type for standard biblatex entry types}, email={maieul maieul net}, author={Maïeul Rouquette}, - revision={1.1.0}, - date={07/06/2016}, + revision={1.2.0}, + date={08/09/2016}, url={https://git.framasoft.org/maieul/biblatex-morenames}} @@ -167,17 +168,30 @@ The graph~\ref{example-maineditor} shows the fields inheritance. \subsection{\bibfield{ineditor} and \bibfield{bookineditor}} \subsubsection{Meaning} -For a \bibtype{article}, a \bibtype{inbook} entry, \bibfield{ineditor} means the editor of the single contribution, while \bibfield{editor} means the editor of the global volume. +For a \bibtype{article} or a \bibtype{inbook} entry, \bibfield{ineditor} means the editor of the single contribution, while \bibfield{editor} means the editor of the global volume. For a \bibtype{bookinbook}, \bibfield{bookineditor} means the editor of the (ancient) edited book, while \bibfield{editor} means the editor of the global volume. +The \bibtype{ineditor} or the \bibfield{bookineditor} field is typeset immediately after the title of the subentry, while the \bibtype{editor} field is typeset after the title of the main entry. -\subsubsection{.bib example} + + + +Notes that if the value of \bibtype{bookineditor} or \bibfield{ineditor} field is equal to the \bibfield{editor} field, this last one is not printed. + +There is two modes of inheritance for these fields: the default one and the optional one. + +\subsubsection{Default inheritance mode} + +With the default inheritance mode, the \bibtype{bookineditor} field of the subentry is never inherited from the main entry. + + +\paragraph{.bib example} \inputminted[breaklines]{latex}{example-bookineditor.bib} -\subsubsection{Fields inheritance} +\paragraph{Fields inheritance} The graph~\ref{example-bookineditor} shows the fields inheritance. @@ -185,17 +199,70 @@ The graph~\ref{example-bookineditor} shows the fields inheritance. \centering \includegraphics[height=0.99\textheight]{example-bookineditor.pdf} \label{example-bookineditor} - \caption{Inheritance related to the \bibtype{bookineditor} field} + \caption{Inheritance related to the \bibtype{bookineditor} field, default setting} \end{figure} -\subsubsection{Output example} + + +\paragraph{Output example} \begin{quotation} \cite{BHG226} + + \cite{BHG225} +\end{quotation} +\subsubsection{Optional inheritance} + +With the optional inheritance, the \bibfield{bookineditor} or \bibfield{ineditor} field of the subentry is inherited from the \bibfield{editor} field of the main entry, except if the subentrty has already a \bibfield{bookineditor} or \bibfield{ineditor} field. + + +To enable this feature for the \bibfield{ineditor} field, just add in your preamble, after loading biblatex, the following line: +\begin{minted}{latex} +\toggletrue{BookineditorFromEditor} +\end{minted} + +To enable this feature for the \bibfield{ineditor} field, just add in your preamble, after loading biblatex, the following line: +\begin{minted}{latex} +\toggletrue{BookineditorFromEditor} +\end{minted} + +\paragraph{.bib example} + +\inputminted[breaklines]{latex}{example-bookineditor-BookineditorFromEditor.bib} + +\paragraph{Fields inheritance} + +The graph~\ref{example-bookineditor-BookineditorFromEditor} shows the fields inheritance. + +\begin{figure} + \centering + \includegraphics[height=0.99\textheight]{example-bookineditor-BookineditorFromEditor.pdf} + \label{example-bookineditor-BookineditorFromEditor} + \caption{Inheritance related to the \bibtype{bookineditor} field with optional inheritance} +\end{figure} + + +\paragraph{Output example} + +\begin{quotation} + \cite{BHG226a} + + \cite{BHG225a} \end{quotation} \section{Change history} \begin{changelog} + +\begin{release}{1.2.0}{2016-09-08} + \item If the \bibfield{bookineditor} or \bibfield{ineditor} field is equal to the\bibfield{editor} field, the last one is not printed. + \item Add two options to make \bibfield{bookineditor} or \bibfield{ineditor} to be inherited from \bibfield{editor} field. +\end{release} + +\begin{release}{1.1.1}{2016-09-07} + \item Don't define again \verb+bybookineditor+ macro if already defined by \emph{biblatex-bookinother}. +\end{release} + + \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} diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.bib b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.bib new file mode 100644 index 00000000000..89481731a9c --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.bib @@ -0,0 +1,25 @@ +@bookinbook{BHG226a, + Author = {{Alexandre de Chypre}}, + Crossref = {CCSG26a}, + Bookineditor = {Van Deun, Peter}, + Pages = {83-122}, + Title = {Laudatio Barnabae} +} +@book{CCSG26a, + Editor = {Peter Van Deun and Jacques Noret}, + Number = {26}, + Series = {Corpus Christianorum Series Graeca}, + Title = {Hagiographica Cypria}} + +@bookinbook{BHG225a, + Crossref = {AAA2.2a}, + Pages = {292-302}, + Title = {Acta Barnabae} +} +@book{AAA2.2a, + Editor = {Maximilien Bonnet}, + Date = {1903}, + Location = {Leipzig}, + Publisher = {Hermann Mendelssohn}, + Title = {Acta Apostolorum Apocrypha}, + Volume = {2.2}} diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.dot b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.dot new file mode 100644 index 00000000000..951ed7eb9e2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.dot @@ -0,0 +1,86 @@ +digraph Biberdata { + compound = true; + edge [ arrowhead=open ]; + graph [ style=filled, rankdir=LR ]; + node [ + fontsize=10, + fillcolor=white, + style=filled, + shape=box ]; + + subgraph "cluster_section0/AAA2.2a" { + fontsize="10"; + label="AAA2.2a (BOOK)"; + tooltip="AAA2.2a (BOOK)"; + fillcolor="#a0d0ff"; + + "section0/AAA2.2a/editor" [ label="EDITOR" ] + "section0/AAA2.2a/location" [ label="LOCATION" ] + "section0/AAA2.2a/publisher" [ label="PUBLISHER" ] + "section0/AAA2.2a/title" [ label="TITLE" ] + "section0/AAA2.2a/volume" [ label="VOLUME" ] + "section0/AAA2.2a/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/BHG225a" { + fontsize="10"; + label="BHG225a (BOOKINBOOK)"; + tooltip="BHG225a (BOOKINBOOK)"; + fillcolor="#a0d0ff"; + + "section0/BHG225a/bookineditor" [ label="BOOKINEDITOR" ] + "section0/BHG225a/booktitle" [ label="BOOKTITLE" ] + "section0/BHG225a/crossref" [ label="CROSSREF" ] + "section0/BHG225a/editor" [ label="EDITOR" ] + "section0/BHG225a/location" [ label="LOCATION" ] + "section0/BHG225a/pages" [ label="PAGES" ] + "section0/BHG225a/publisher" [ label="PUBLISHER" ] + "section0/BHG225a/title" [ label="TITLE" ] + "section0/BHG225a/volume" [ label="VOLUME" ] + "section0/BHG225a/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/BHG226a" { + fontsize="10"; + label="BHG226a (BOOKINBOOK)"; + tooltip="BHG226a (BOOKINBOOK)"; + fillcolor="#a0d0ff"; + + "section0/BHG226a/author" [ label="AUTHOR" ] + "section0/BHG226a/bookineditor" [ label="BOOKINEDITOR" ] + "section0/BHG226a/booktitle" [ label="BOOKTITLE" ] + "section0/BHG226a/crossref" [ label="CROSSREF" ] + "section0/BHG226a/editor" [ label="EDITOR" ] + "section0/BHG226a/number" [ label="NUMBER" ] + "section0/BHG226a/pages" [ label="PAGES" ] + "section0/BHG226a/series" [ label="SERIES" ] + "section0/BHG226a/title" [ label="TITLE" ] + } + + subgraph "cluster_section0/CCSG26a" { + fontsize="10"; + label="CCSG26a (BOOK)"; + tooltip="CCSG26a (BOOK)"; + fillcolor="#a0d0ff"; + + "section0/CCSG26a/editor" [ label="EDITOR" ] + "section0/CCSG26a/number" [ label="NUMBER" ] + "section0/CCSG26a/series" [ label="SERIES" ] + "section0/CCSG26a/title" [ label="TITLE" ] + } + + + + "section0/AAA2.2a/editor" -> "section0/BHG225a/bookineditor" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/BOOKINEDITOR inherited via CROSSREF from AAA2.2a/EDITOR" ] + "section0/AAA2.2a/editor" -> "section0/BHG225a/editor" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/EDITOR inherited via CROSSREF from AAA2.2a/EDITOR" ] + "section0/AAA2.2a/location" -> "section0/BHG225a/location" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/LOCATION inherited via CROSSREF from AAA2.2a/LOCATION" ] + "section0/AAA2.2a/publisher" -> "section0/BHG225a/publisher" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/PUBLISHER inherited via CROSSREF from AAA2.2a/PUBLISHER" ] + "section0/AAA2.2a/title" -> "section0/BHG225a/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/BOOKTITLE inherited via CROSSREF from AAA2.2a/TITLE" ] + "section0/AAA2.2a/volume" -> "section0/BHG225a/volume" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/VOLUME inherited via CROSSREF from AAA2.2a/VOLUME" ] + "section0/AAA2.2a/year" -> "section0/BHG225a/year" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/YEAR inherited via CROSSREF from AAA2.2a/YEAR" ] + "section0/CCSG26a/editor" -> "section0/BHG226a/editor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226a/EDITOR inherited via CROSSREF from CCSG26a/EDITOR" ] + "section0/CCSG26a/number" -> "section0/BHG226a/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226a/NUMBER inherited via CROSSREF from CCSG26a/NUMBER" ] + "section0/CCSG26a/series" -> "section0/BHG226a/series" [ penwidth="2.0", color="#7d7879", tooltip="BHG226a/SERIES inherited via CROSSREF from CCSG26a/SERIES" ] + "section0/CCSG26a/title" -> "section0/BHG226a/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226a/BOOKTITLE inherited via CROSSREF from CCSG26a/TITLE" ] + +} diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.pdf b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.pdf new file mode 100644 index 00000000000..9c4ac8a2076 Binary files /dev/null and b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-IneditorFromEditor.pdf b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-IneditorFromEditor.pdf new file mode 100644 index 00000000000..ea29669ed2e Binary files /dev/null and b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor-IneditorFromEditor.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.bib b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.bib index d32c46c0f0b..55d8e92adaf 100644 --- a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.bib +++ b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-bookineditor.bib @@ -10,3 +10,17 @@ Number = {26}, Series = {Corpus Christianorum Series Graeca}, Title = {Hagiographica Cypria}} + +@bookinbook{BHG225, + Bookineditor = {Maximilien Bonnet}, + Crossref = {AAA2.2}, + Pages = {292-302}, + Title = {Acta Barnabae} +} +@book{AAA2.2, + Editor = {Maximilien Bonnet}, + Date = {1903}, + Location = {Leipzig}, + Publisher = {Hermann Mendelssohn}, + Title = {Acta Apostolorum Apocrypha}, + Volume = {2.2}} 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 0eacc952705..08c9966e93c 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 @@ -8,6 +8,38 @@ digraph Biberdata { style=filled, shape=box ]; + subgraph "cluster_section0/AAA2.2" { + fontsize="10"; + label="AAA2.2 (BOOK)"; + tooltip="AAA2.2 (BOOK)"; + fillcolor="#a0d0ff"; + + "section0/AAA2.2/editor" [ label="EDITOR" ] + "section0/AAA2.2/location" [ label="LOCATION" ] + "section0/AAA2.2/publisher" [ label="PUBLISHER" ] + "section0/AAA2.2/title" [ label="TITLE" ] + "section0/AAA2.2/volume" [ label="VOLUME" ] + "section0/AAA2.2/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/BHG225" { + fontsize="10"; + label="BHG225 (BOOKINBOOK)"; + tooltip="BHG225 (BOOKINBOOK)"; + fillcolor="#a0d0ff"; + + "section0/BHG225/bookineditor" [ label="BOOKINEDITOR" ] + "section0/BHG225/booktitle" [ label="BOOKTITLE" ] + "section0/BHG225/crossref" [ label="CROSSREF" ] + "section0/BHG225/editor" [ label="EDITOR" ] + "section0/BHG225/location" [ label="LOCATION" ] + "section0/BHG225/pages" [ label="PAGES" ] + "section0/BHG225/publisher" [ label="PUBLISHER" ] + "section0/BHG225/title" [ label="TITLE" ] + "section0/BHG225/volume" [ label="VOLUME" ] + "section0/BHG225/year" [ label="YEAR" ] + } + subgraph "cluster_section0/BHG226" { fontsize="10"; label="BHG226 (BOOKINBOOK)"; @@ -39,6 +71,12 @@ digraph Biberdata { + "section0/AAA2.2/editor" -> "section0/BHG225/editor" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/EDITOR inherited via CROSSREF from AAA2.2/EDITOR" ] + "section0/AAA2.2/location" -> "section0/BHG225/location" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/LOCATION inherited via CROSSREF from AAA2.2/LOCATION" ] + "section0/AAA2.2/publisher" -> "section0/BHG225/publisher" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/PUBLISHER inherited via CROSSREF from AAA2.2/PUBLISHER" ] + "section0/AAA2.2/title" -> "section0/BHG225/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/BOOKTITLE inherited via CROSSREF from AAA2.2/TITLE" ] + "section0/AAA2.2/volume" -> "section0/BHG225/volume" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/VOLUME inherited via CROSSREF from AAA2.2/VOLUME" ] + "section0/AAA2.2/year" -> "section0/BHG225/year" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/YEAR inherited via CROSSREF from AAA2.2/YEAR" ] "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" ] 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 b0177f55506..0fc74bf1204 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.pdf b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/example-maineditor.pdf index 76f59a39fb6..943ec74c4c8 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/doc/latex/biblatex-morenames/documentation/generate-crossref-graphs.py b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/generate-crossref-graphs.py index a6e2d8c0808..9cf8bd87311 100644 --- a/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/generate-crossref-graphs.py +++ b/Master/texmf-dist/doc/latex/biblatex-morenames/documentation/generate-crossref-graphs.py @@ -9,9 +9,15 @@ import os +# specific preamble for some file +specific_preamble = { + "example-bookineditor-BookineditorFromEditor":"\\toggletrue{BookineditorFromEditor}\n" +} + #List all the files on the current directory directory_files = os.listdir(".") + #Loop on them, and for the .bib file, generate the .tex, .dot and .pdf file for file_name in directory_files: basename, ext = os.path.splitext(file_name) @@ -22,8 +28,12 @@ for file_name in directory_files: # write the .tex file content tex_file_name = basename + ".tex" tex_file_content = "\documentclass{article}\n\ - \\usepackage[bibstyle=morenames]{biblatex}\n\ - \\bibliography{" + file_name + "}\n\ + \\usepackage[bibstyle=morenames]{biblatex}\n" + + if basename in specific_preamble: + tex_file_content = tex_file_content + specific_preamble[basename] + + tex_file_content = tex_file_content + "\\bibliography{" + file_name + "}\n\ \\begin{document}\n\ \\nocite{*}\n\ \end{document}" 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