diff options
18 files changed, 494 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf Binary files differindex 741e09765b8..5aa72775a46 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex index c83c968fcc1..3f8738c409c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex @@ -24,8 +24,8 @@ subtitle={New data types}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={2.1.1}, - date={16/06/2016}, + revision={2.2.0}, + date={08/09/2016}, url={https://github.com/maieul/biblatex-bookinarticle}} % biblatex @@ -38,6 +38,8 @@ \addbibresource{example-bookinjournal.bib} \addbibresource{example-bookinproceedings.bib} \addbibresource{example-bookinthesis.bib} +\addbibresource{example-bookininbook.bib} +\addbibresource{example-bookininarticle.bib} \begin{document} \printtitlepage @@ -72,10 +74,15 @@ The package provides: \item Inheritance's mechanism for these entry types. \item Integration of the entry types following the standard bibliography's styles of biblatex. \item Integration of the new fields of the \pkg{biblatex-morenames} package. + \item New fields when required and not defined in \pkg{biblatex-morenames} package. \end{itemize} \section{Loading package} + +The package requires \emph{biblatex} 3.4 or later. + + As the package defines new fields, you must load it as a \verb+bibstyle+ option of \biblatex package. \begin{minted}{latex} @@ -121,7 +128,7 @@ In the following parts of this handbook, we will describe, for each entry type, Here is a list of fields which are NOT inherited : \begin{itemize} \item \bibfield{author} means the author of the edited (ancient) book. - \item \bibfield{bookineditor} means the editor of the edited (ancient) book. + \item \bibfield{bookineditor} means the editor of the edited (ancient) book. If this field is equal to the \bibfield{editor} field, the last one is not printed. \item \bibfield{title} means the title of the edited (ancient) book. \item \bibfield{subtitle} means the subtitle of the edited (ancient) book. @@ -129,8 +136,12 @@ Here is a list of fields which are NOT inherited : If you use the \bibfield{ineditor} field of the \pkg{biblatex-morenames} package, it will be inherited as \bibfield{bookeditor} field. -Notes that the package take account of the \bibfield{maineditor} field of the \pkg{biblatex-morenames} package, if loaded. +Note that the package takes account of the \bibfield{maineditor} field of the \pkg{biblatex-morenames} package, if loaded. +Also note that the \bibfield{bookineditor} field is not added in the style of the \bibtype{bookinbook} entry type, because that is a standard \biblatex\ entry type. +Use the \pkg{biblatex-morenames} package to add this field to the style of \bibtype{bookinbook}. + + % Here, a loop on the entry type, to automatically generate the handbook \def\firstofthree#1#2#3{#1} @@ -140,7 +151,7 @@ Notes that the package take account of the \bibfield{maineditor} field of the \p \edef\entrytype{\firstofthree#1}% \edef\entrykey{\secondofthree#1}% \edef\entrymore{\thirdofthree#1}% - \subsection{\bibtype{bookin\entrytype}} + \newpage\subsection{\bibtype{bookin\entrytype}} \subsubsection{Meaning} For book edited in a \bibtype{\entrytype} entry. \subsubsection{.bib example} @@ -174,6 +185,8 @@ Notes that the package take account of the \bibfield{maineditor} field of the \p This is a more specific variant of \bibtype{bookincollection}. The standard styles will treat this entry type as an alias for \bibtype{bookincollection}. }}},% + {{inarticle}{Cohn1891_txt}{}},% + {{inbook}{Laudo}{\unexpanded{We use the \emph{biblatex-anonymous} package to manage the anonymous entry here.}}}, {{incollection}{AcTiteLatin}{% \unexpanded{\subsubsection{About \bibtype{bookininreference}} The package also provides a \bibtype{bookininreference} entry type for book edited in a \bibtype{inreference}. @@ -197,7 +210,7 @@ Notes that the package take account of the \bibfield{maineditor} field of the \p \item \bibtype{bookinmathesis} for book edited in a \bibtype{mathesis}; \item \bibtype{bookinphdthesis} for book edited in a \bibtype{phdthesis}. \end{itemize} - }}}% + }}},% } \section{Customization} @@ -208,11 +221,22 @@ The ways new entry types are printed are derived from the \verb+standard.bbx+ bi \begin{changelog} -\begin{release}{2.1.1}{2016-16-16} + +\begin{release}{2.2.0}{2016-09-08} + \item Add compatibility with \emph{biblatex-opcit-booktitle} package's mechanism. + \item Add \bibtype{bookininarticle} and \bibtype{ininarticle} entrytypes. + \item Add \bibtype{bookininbook} and \bibtype{ininbook} entrytypes. + \item Use \cs{printdelim}\verb+{nametitledelim}+ instead of directly calling \cs{labelnamepunct}. + \item Don't define again \verb+bybookineditor+ macro if already defined by \emph{biblatex-morenames}. + \item Fix bug with inheritance of \bibfield{titleaddon} and related field. + \item If the \bibfield{bookineditor} or \bibfield{ineditor} field is equal to the\bibfield{editor} field, the last one is not printed. +\end{release} + +\begin{release}{2.1.1}{2016-06-16} \item Use \cs{DeclareStyleSourceMap} instead of \cs{DeclareSourceMap}. \end{release} -\begin{release}{2.1.0}{2016-06-16} +\begin{release}{2.1.0}{2016-06-06} \item Add message to make more detectable breaking compatibility with new release of biblatex. \end{release} diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf Binary files differindex 04c4dd61fa1..957327fb426 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf Binary files differindex ceb01c497cc..0ecf7098479 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.bib b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.bib new file mode 100644 index 00000000000..05a3005e725 --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.bib @@ -0,0 +1,25 @@ +@article{Crusius1891, + Author={Otto Crusius and Leopold Cohn}, + Date={1891/1893}, + Journaltitle={Philologus}, + Journalsubtitle={Zeitschrift für das classische Altertum}, + Number={6}, + Pages={201-324}, + Series={Supplementband}, + Title={Zur handschriftlichen Uberlieferung, Kritik und Quellenkunde der Paroemiographen} +} + +@inarticle{Cohn1891, + Author={Leopold Cohn}, + Crossref={Crusius1891}, + Pages={224-267}, + Title={Zur Ueberlieferung des alphabetischen Corpus} +} + +@bookininarticle{Cohn1891_txt, + Crossref={Cohn1891}, + Pages={238-253}, + Title={Collectio~proverbiorum~cod.~Vat.~gr.~306}, + Subtitle={cum recensione D2 fere concinens} +} + diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.dot b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.dot new file mode 100644 index 00000000000..97e7f32f512 --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.dot @@ -0,0 +1,91 @@ +digraph Biberdata { + compound = true; + edge [ arrowhead=open ]; + graph [ style=filled, rankdir=LR ]; + node [ + fontsize=10, + fillcolor=white, + style=filled, + shape=box ]; + + subgraph "cluster_section0/Cohn1891" { + fontsize="10"; + label="Cohn1891 (INARTICLE)"; + tooltip="Cohn1891 (INARTICLE)"; + fillcolor="#a0d0ff"; + + "section0/Cohn1891/author" [ label="AUTHOR" ] + "section0/Cohn1891/bookauthor" [ label="BOOKAUTHOR" ] + "section0/Cohn1891/crossref" [ label="CROSSREF" ] + "section0/Cohn1891/endyear" [ label="ENDYEAR" ] + "section0/Cohn1891/journalsubtitle" [ label="JOURNALSUBTITLE" ] + "section0/Cohn1891/journaltitle" [ label="JOURNALTITLE" ] + "section0/Cohn1891/maintitle" [ label="MAINTITLE" ] + "section0/Cohn1891/number" [ label="NUMBER" ] + "section0/Cohn1891/pages" [ label="PAGES" ] + "section0/Cohn1891/series" [ label="SERIES" ] + "section0/Cohn1891/title" [ label="TITLE" ] + "section0/Cohn1891/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/Cohn1891_txt" { + fontsize="10"; + label="Cohn1891_txt (BOOKININARTICLE)"; + tooltip="Cohn1891_txt (BOOKININARTICLE)"; + fillcolor="#a0d0ff"; + + "section0/Cohn1891_txt/bookauthor" [ label="BOOKAUTHOR" ] + "section0/Cohn1891_txt/booktitle" [ label="BOOKTITLE" ] + "section0/Cohn1891_txt/crossref" [ label="CROSSREF" ] + "section0/Cohn1891_txt/endyear" [ label="ENDYEAR" ] + "section0/Cohn1891_txt/journalsubtitle" [ label="JOURNALSUBTITLE" ] + "section0/Cohn1891_txt/journaltitle" [ label="JOURNALTITLE" ] + "section0/Cohn1891_txt/mainauthor" [ label="MAINAUTHOR" ] + "section0/Cohn1891_txt/maintitle" [ label="MAINTITLE" ] + "section0/Cohn1891_txt/number" [ label="NUMBER" ] + "section0/Cohn1891_txt/pages" [ label="PAGES" ] + "section0/Cohn1891_txt/series" [ label="SERIES" ] + "section0/Cohn1891_txt/subtitle" [ label="SUBTITLE" ] + "section0/Cohn1891_txt/title" [ label="TITLE" ] + "section0/Cohn1891_txt/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/Crusius1891" { + fontsize="10"; + label="Crusius1891 (ARTICLE)"; + tooltip="Crusius1891 (ARTICLE)"; + fillcolor="#a0d0ff"; + + "section0/Crusius1891/author" [ label="AUTHOR" ] + "section0/Crusius1891/endyear" [ label="ENDYEAR" ] + "section0/Crusius1891/journalsubtitle" [ label="JOURNALSUBTITLE" ] + "section0/Crusius1891/journaltitle" [ label="JOURNALTITLE" ] + "section0/Crusius1891/number" [ label="NUMBER" ] + "section0/Crusius1891/pages" [ label="PAGES" ] + "section0/Crusius1891/series" [ label="SERIES" ] + "section0/Crusius1891/title" [ label="TITLE" ] + "section0/Crusius1891/year" [ label="YEAR" ] + } + + + + "section0/Cohn1891/author" -> "section0/Cohn1891_txt/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/BOOKAUTHOR inherited via CROSSREF from Cohn1891/AUTHOR" ] + "section0/Cohn1891/bookauthor" -> "section0/Cohn1891_txt/mainauthor" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/MAINAUTHOR inherited via CROSSREF from Cohn1891/BOOKAUTHOR" ] + "section0/Cohn1891/endyear" -> "section0/Cohn1891_txt/endyear" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/ENDYEAR inherited via CROSSREF from Cohn1891/ENDYEAR" ] + "section0/Cohn1891/journalsubtitle" -> "section0/Cohn1891_txt/journalsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/JOURNALSUBTITLE inherited via CROSSREF from Cohn1891/JOURNALSUBTITLE" ] + "section0/Cohn1891/journaltitle" -> "section0/Cohn1891_txt/journaltitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/JOURNALTITLE inherited via CROSSREF from Cohn1891/JOURNALTITLE" ] + "section0/Cohn1891/maintitle" -> "section0/Cohn1891_txt/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/MAINTITLE inherited via CROSSREF from Cohn1891/MAINTITLE" ] + "section0/Cohn1891/number" -> "section0/Cohn1891_txt/number" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/NUMBER inherited via CROSSREF from Cohn1891/NUMBER" ] + "section0/Cohn1891/series" -> "section0/Cohn1891_txt/series" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/SERIES inherited via CROSSREF from Cohn1891/SERIES" ] + "section0/Cohn1891/title" -> "section0/Cohn1891_txt/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/BOOKTITLE inherited via CROSSREF from Cohn1891/TITLE" ] + "section0/Cohn1891/year" -> "section0/Cohn1891_txt/year" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/YEAR inherited via CROSSREF from Cohn1891/YEAR" ] + "section0/Crusius1891/author" -> "section0/Cohn1891/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/BOOKAUTHOR inherited via CROSSREF from Crusius1891/AUTHOR" ] + "section0/Crusius1891/endyear" -> "section0/Cohn1891/endyear" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/ENDYEAR inherited via CROSSREF from Crusius1891/ENDYEAR" ] + "section0/Crusius1891/journalsubtitle" -> "section0/Cohn1891/journalsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/JOURNALSUBTITLE inherited via CROSSREF from Crusius1891/JOURNALSUBTITLE" ] + "section0/Crusius1891/journaltitle" -> "section0/Cohn1891/journaltitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/JOURNALTITLE inherited via CROSSREF from Crusius1891/JOURNALTITLE" ] + "section0/Crusius1891/number" -> "section0/Cohn1891/number" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/NUMBER inherited via CROSSREF from Crusius1891/NUMBER" ] + "section0/Crusius1891/series" -> "section0/Cohn1891/series" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/SERIES inherited via CROSSREF from Crusius1891/SERIES" ] + "section0/Crusius1891/title" -> "section0/Cohn1891/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/MAINTITLE inherited via CROSSREF from Crusius1891/TITLE" ] + "section0/Crusius1891/year" -> "section0/Cohn1891/year" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/YEAR inherited via CROSSREF from Crusius1891/YEAR" ] + +} diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf Binary files differnew file mode 100644 index 00000000000..3b9eef31729 --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.bib b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.bib new file mode 100644 index 00000000000..da62f64a650 --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.bib @@ -0,0 +1,22 @@ +@Book{Duebner1878, + author = {Dübner, F. and Bussemaker, U. Cats}, + title = {Scholia in Theocritum, Nicandrum et Oppianum}, + location = {Parisiis}, + publisher = {Editore Ambrosio Firmin--Didot}, + year = {1878}, +} + +@Inbook{Bussemaker1878, + author = {Bussemaker, U. Cats}, + title = {Scholia et Paraphrases in Nicandrum et Oppianum}, + pages = {243--364}, + crossref = {Duebner1878}, + titleaddon = {Partim nunc primum edidit, partim collatis cod. mss. emendavit, annotatione critica instruxit et indices confecit}, +} + +@Bookininbook{ScholiainOppianum1878, + author = {{Scholia~in~Oppianum}}, + title = {In Halieutica}, + pages = {260--364}, + crossref = {Bussemaker1878}, +} diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.dot b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.dot new file mode 100644 index 00000000000..5576af82210 --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.dot @@ -0,0 +1,78 @@ +digraph Biberdata { + compound = true; + edge [ arrowhead=open ]; + graph [ style=filled, rankdir=LR ]; + node [ + fontsize=10, + fillcolor=white, + style=filled, + shape=box ]; + + subgraph "cluster_section0/Bussemaker1878" { + fontsize="10"; + label="Bussemaker1878 (INBOOK)"; + tooltip="Bussemaker1878 (INBOOK)"; + fillcolor="#a0d0ff"; + + "section0/Bussemaker1878/author" [ label="AUTHOR" ] + "section0/Bussemaker1878/bookauthor" [ label="BOOKAUTHOR" ] + "section0/Bussemaker1878/booktitle" [ label="BOOKTITLE" ] + "section0/Bussemaker1878/crossref" [ label="CROSSREF" ] + "section0/Bussemaker1878/location" [ label="LOCATION" ] + "section0/Bussemaker1878/pages" [ label="PAGES" ] + "section0/Bussemaker1878/publisher" [ label="PUBLISHER" ] + "section0/Bussemaker1878/title" [ label="TITLE" ] + "section0/Bussemaker1878/titleaddon" [ label="TITLEADDON" ] + "section0/Bussemaker1878/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/Duebner1878" { + fontsize="10"; + label="Duebner1878 (BOOK)"; + tooltip="Duebner1878 (BOOK)"; + fillcolor="#a0d0ff"; + + "section0/Duebner1878/author" [ label="AUTHOR" ] + "section0/Duebner1878/location" [ label="LOCATION" ] + "section0/Duebner1878/publisher" [ label="PUBLISHER" ] + "section0/Duebner1878/title" [ label="TITLE" ] + "section0/Duebner1878/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/ScholiainOppianum1878" { + fontsize="10"; + label="ScholiainOppianum1878 (BOOKININBOOK)"; + tooltip="ScholiainOppianum1878 (BOOKININBOOK)"; + fillcolor="#a0d0ff"; + + "section0/ScholiainOppianum1878/author" [ label="AUTHOR" ] + "section0/ScholiainOppianum1878/bookauthor" [ label="BOOKAUTHOR" ] + "section0/ScholiainOppianum1878/booktitle" [ label="BOOKTITLE" ] + "section0/ScholiainOppianum1878/booktitleaddon" [ label="BOOKTITLEADDON" ] + "section0/ScholiainOppianum1878/crossref" [ label="CROSSREF" ] + "section0/ScholiainOppianum1878/location" [ label="LOCATION" ] + "section0/ScholiainOppianum1878/mainauthor" [ label="MAINAUTHOR" ] + "section0/ScholiainOppianum1878/maintitle" [ label="MAINTITLE" ] + "section0/ScholiainOppianum1878/pages" [ label="PAGES" ] + "section0/ScholiainOppianum1878/publisher" [ label="PUBLISHER" ] + "section0/ScholiainOppianum1878/title" [ label="TITLE" ] + "section0/ScholiainOppianum1878/year" [ label="YEAR" ] + } + + + + "section0/Bussemaker1878/author" -> "section0/ScholiainOppianum1878/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/BOOKAUTHOR inherited via CROSSREF from Bussemaker1878/AUTHOR" ] + "section0/Bussemaker1878/bookauthor" -> "section0/ScholiainOppianum1878/mainauthor" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/MAINAUTHOR inherited via CROSSREF from Bussemaker1878/BOOKAUTHOR" ] + "section0/Bussemaker1878/booktitle" -> "section0/ScholiainOppianum1878/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/MAINTITLE inherited via CROSSREF from Bussemaker1878/BOOKTITLE" ] + "section0/Bussemaker1878/location" -> "section0/ScholiainOppianum1878/location" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/LOCATION inherited via CROSSREF from Bussemaker1878/LOCATION" ] + "section0/Bussemaker1878/publisher" -> "section0/ScholiainOppianum1878/publisher" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/PUBLISHER inherited via CROSSREF from Bussemaker1878/PUBLISHER" ] + "section0/Bussemaker1878/title" -> "section0/ScholiainOppianum1878/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/BOOKTITLE inherited via CROSSREF from Bussemaker1878/TITLE" ] + "section0/Bussemaker1878/titleaddon" -> "section0/ScholiainOppianum1878/booktitleaddon" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/BOOKTITLEADDON inherited via CROSSREF from Bussemaker1878/TITLEADDON" ] + "section0/Bussemaker1878/year" -> "section0/ScholiainOppianum1878/year" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/YEAR inherited via CROSSREF from Bussemaker1878/YEAR" ] + "section0/Duebner1878/author" -> "section0/Bussemaker1878/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="Bussemaker1878/BOOKAUTHOR inherited via CROSSREF from Duebner1878/AUTHOR" ] + "section0/Duebner1878/location" -> "section0/Bussemaker1878/location" [ penwidth="2.0", color="#7d7879", tooltip="Bussemaker1878/LOCATION inherited via CROSSREF from Duebner1878/LOCATION" ] + "section0/Duebner1878/publisher" -> "section0/Bussemaker1878/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Bussemaker1878/PUBLISHER inherited via CROSSREF from Duebner1878/PUBLISHER" ] + "section0/Duebner1878/title" -> "section0/Bussemaker1878/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Bussemaker1878/BOOKTITLE inherited via CROSSREF from Duebner1878/TITLE" ] + "section0/Duebner1878/year" -> "section0/Bussemaker1878/year" [ penwidth="2.0", color="#7d7879", tooltip="Bussemaker1878/YEAR inherited via CROSSREF from Duebner1878/YEAR" ] + +} diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf Binary files differnew file mode 100644 index 00000000000..2589c375d9d --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf Binary files differindex 55c8f0c8670..444db38ed23 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf Binary files differindex 5eb7e7d1f87..37978701ea9 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf Binary files differindex 94db660917b..f11a5959667 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf Binary files differindex 4efb65a38ee..d56e33f2b1e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf Binary files differindex 475f35488b0..53a60153b50 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/generate-crossref-graphs.py b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/generate-crossref-graphs.py index 15485d8ad19..cfb906ebfd8 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/generate-crossref-graphs.py +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/generate-crossref-graphs.py @@ -24,6 +24,7 @@ for file_name in directory_files: tex_file_content = "\documentclass{article}\n\ \\usepackage[tools={bookinother,morenames},bibstyle=verbose]{biblatex-multiple-dm}\n\ \\usepackage[bibstyle=multiple-dm]{biblatex}\n\ + \\usepackage{biblatex-anonymous}\n\ \\bibliography{" + file_name + "}\n\ \\begin{document}\n\ \\nocite{*}\n\ @@ -35,7 +36,7 @@ for file_name in directory_files: # generate the .bcf, .dot and .pdf file os.system("pdflatex " + basename) os.system("biber -output-format=dot --dot-include=crossref,field " + basename) - os.system("dot -Tpdf " + basename + ".dot " + "-o " + basename + ".pdf") + os.system("dot -Gsplines=polyline -Tpdf " + basename + ".dot " + "-o " + basename + ".pdf") # delete the temporary files, to avoid distributing it and to have cleaner folder for ext in ["aux","bcf","blg","log","run.xml","tex"]: diff --git a/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.bbx b/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.bbx index e261da314b8..62091d79ca1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.bbx @@ -14,7 +14,7 @@ %0. Preamble \ProvidesFile{bookinother.bbx} -[2016/06/16 v2.1.1 biblatex bibliography style to have entry type for book edited in other entry type (MR)] +[2016/09/08 v2.2.0 biblatex bibliography style to have entry type for book edited in other entry type (MR)] \RequireBiber \RequirePackage{xpatch} @@ -24,12 +24,12 @@ -% 1. The drivers +% 1. The drivers for new entrytype \DeclareBibliographyDriver{inarticle}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\printdelim{nametitledelim}}\newblock% \usebibmacro{title}% \newunit \printlist{language}% @@ -40,7 +40,7 @@ \newunit\newblock \usebibmacro{in:}% \usebibmacro{bybookauthor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{maintitle}% \newunit\newblock \usebibmacro{bybookeditor}% @@ -62,12 +62,117 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} + + +\DeclareBibliographyDriver{ininarticle}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/translator+others}% + \setunit{\printdelim{nametitledelim}}\newblock% + \usebibmacro{title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit + \usebibmacro{bybookineditor}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{bybookauthor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{booktitle}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{bymainauthor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{maintitle}% + \newunit\newblock + \usebibmacro{bybookeditor}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{journal+issuetitle}% + \newunit + \usebibmacro{byeditor+others}% + \newunit + \usebibmacro{note+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{issn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + + + +\DeclareBibliographyDriver{ininbook}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/translator+others}% + \setunit{\printdelim{nametitledelim}}\newblock + \printfield{title}% + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit + \usebibmacro{bybookineditor}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{bybookauthor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{booktitle}% + \newunit + \newunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{bymainauthor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{maintitle}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \printfield{edition}% + \newunit + \printfield{volume}% + \printfield{part}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{finentry}} + \DeclareBibliographyDriver{inincollection}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\printdelim{nametitledelim}}\newblock% \usebibmacro{title}% \newunit \printlist{language}% @@ -78,7 +183,7 @@ \newunit\newblock \usebibmacro{in:}% \usebibmacro{bybookauthor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{booktitle}% \newunit \printlist{language}% @@ -128,7 +233,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\printdelim{nametitledelim}}\newblock% \usebibmacro{title}% \newunit \printlist{language}% @@ -139,7 +244,7 @@ \newunit\newblock \usebibmacro{in:}% \usebibmacro{bybookauthor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{booktitle}% \newunit \printlist{language}% @@ -196,7 +301,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -207,7 +312,7 @@ \newunit\newblock \usebibmacro{in:}% \usebibmacro{bybookauthor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{booktitle}% \newunit\newblock \printfield{note}% @@ -247,6 +352,8 @@ \DeclareBibliographyAlias{bookinreference}{incollection} \DeclareBibliographyAlias{bookininreference}{inincollection} \DeclareBibliographyAlias{bookinthesis}{inthesis} +\DeclareBibliographyAlias{bookininbook}{ininbook} +\DeclareBibliographyAlias{bookininarticle}{ininarticle} \DeclareStyleSourcemap{ \maps[datatype=bibtex]{ @@ -285,8 +392,10 @@ % 3.b Booinkeditor +% 3.b.i Tools for patching \newcommand{\bookinother@patch@failed}[1]{\PackageError{bookinother}{Unable to patch #1 driver}} +% 3.b.ii Patch standard drivers \xpatchbibdriver{incollection}% {\usebibmacro{byauthor}} {\usebibmacro{byauthor}\newunit\usebibmacro{bybookineditor}} @@ -299,14 +408,6 @@ {} {\bookinother@patch@failed{inproceedings}} -\newbibmacro*{bybookineditor}{% - \ifnameundef{bookineditor} - {} - {\usebibmacro{bytypestrg}{bookineditor}{editor}% - \setunit{\addspace}% - \printnames[byeditor]{bookineditor}% - \newunit}% - } \xpatchbibdriver{article}% {\usebibmacro{byauthor}} @@ -318,6 +419,34 @@ {} {\bookinother@patch@failed{article}} + + +% 3.b.iii Declare Bibmacro +\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% + +% 3.c Mainauthor + +\DeclareNameAlias{mainauthor}{bookauthor} +\DeclareNameAlias{bymainauthor}{bybookauthor} + +\newbibmacro*{bymainauthor}{% + \ifnamesequal{mainauthor}{bookauthor} + {} + {\printnames{mainauthor}}} + % 4. The formats for classical fields \DeclareFieldFormat[% @@ -326,7 +455,9 @@ ininproceedings,% ininreference,% inthesis,% + ininbook, ]{title}{\mkbibquote{#1\isdot}} + \DeclareFieldFormat[% inincollection,% bookinincollection,% @@ -336,8 +467,18 @@ bookininproceedings,% ininreference,% bookininreference,% + ininbook,% + bookininbook,% + ininarticle,% + bookininarticle% ]{booktitle}{\mkbibquote{#1\isdot}} -\DeclareFieldFormat[inarticle,bookinarticle]{maintitle}{\mkbibquote{#1\isdot}} + +\DeclareFieldFormat[% + inarticle,bookinarticle,% + ininarticle,bookininarticle% + ]{maintitle}{\mkbibquote{#1\isdot}} + + % Inspired from biblatex.def \DeclareFieldFormat[inarticle,bookinarticle]{series}{% series of a journal @@ -354,6 +495,7 @@ \inherit{ineditor}{bookeditor}% \inherit{title}{maintitle}% \inherit{subtitle}{mainsubtitle}% + \inherit{titleaddon}{maintitleaddon}% \noinherit{shorttitle} \noinherit{sorttitle} \noinherit{indextitle} @@ -371,10 +513,23 @@ \noinherit{indexsorttitle} } -\DeclareDataInheritance{inproceedings,incollection,inreference}{bookinincollection,inincollection,bookininproceedings,inproceedings,ininreference,bookininreference}{ +\DeclareDataInheritance% + {inproceedings, + incollection, + inreference, + inbook, + }% + {% + bookinincollection,inincollection,% + bookininproceedings,inproceedings,% + ininreference,bookininreference,% + bookininbook,ininbook,% + }{% \inherit{author}{bookauthor}% \inherit{title}{booktitle}% \inherit{subtitle}{booksubtitle}% + \inherit{titleaddon}{booktitleaddon}% + \inherit{bookauthor}{mainauthor}% \inherit{booktitle}{maintitle}% \inherit{booksubtitle}{mainsubtitle}% \inherit{booktitleaddon}{maintitleaddon}% @@ -405,8 +560,20 @@ \noinherit{indexsorttitle} } - - +\DeclareDataInheritance{inarticle}{bookininarticle,ininarticle}{% + \inherit{author}{bookauthor}% + \inherit{bookauthor}{mainauthor}% + \inherit{title}{booktitle}% + \inherit{subtitle}{booksubtitle}% + \inherit{titleaddon}{booktitleaddon}% + \inherit{booktitle}{maintitle}% + \inherit{booksubtitle}{mainsubtitle}% + \inherit{booktitleaddon}{maintitleaddon}% + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} % 6. Label name @@ -421,11 +588,55 @@ bookinreference,% bookinthesis,% bookinphdthesis,% - bookinmathesis + bookinmathesis, + bookininbook + bookininarticle ]{% \field{shortauthor} \field{author} \field{ineditor} \field{bookineditor} } + +% 7. Pour biblatex-bookinother + +\listadd\opcit@booktitle@entrytypes{inarticle} +\listadd\opcit@booktitle@entrytypes{bookinarticle} + +\listadd\opcit@booktitle@entrytypes{inincollection} +\listadd\opcit@booktitle@entrytypes{bookinincollection} + +\listadd\opcit@booktitle@entrytypes{ininproceedings} +\listadd\opcit@booktitle@entrytypes{bookininproceedings} + +\listadd\opcit@booktitle@entrytypes{ininreference} +\listadd\opcit@booktitle@entrytypes{bookininreference} + +\listadd\opcit@booktitle@entrytypes{inthesis} +\listadd\opcit@booktitle@entrytypes{bookinthesis} + +\listadd\opcit@booktitle@entrytypes{inphdthesis} +\listadd\opcit@booktitle@entrytypes{bookphdinthesis} + +\listadd\opcit@booktitle@entrytypes{inmathesis} +\listadd\opcit@booktitle@entrytypes{bookinmathesis} + +\listadd\opcit@booktitle@entrytypes{inincollection} +\listadd\opcit@booktitle@entrytypes{bookinincollection} + +\listadd\opcit@booktitle@entrytypes{inthesis} +\listadd\opcit@booktitle@entrytypes{bookinthesis} + +\listadd\opcit@booktitle@entrytypes{ininproceedings} +\listadd\opcit@booktitle@entrytypes{bookininproceedings} + +\listadd\opcit@booktitle@entrytypes{ininreference} +\listadd\opcit@booktitle@entrytypes{bookininreference} + +\listadd\opcit@booktitle@entrytypes{ininbook} +\listadd\opcit@booktitle@entrytypes{bookininbook} + +\listadd\opcit@booktitle@entrytypes{ininarticle} +\listadd\opcit@booktitle@entrytypes{bookininarticle} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.dbx b/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.dbx index ed4c2c3fd8b..fff44ae5982 100644 --- a/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.dbx @@ -13,13 +13,14 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files realauthor.dbx, realauthor.bbx \ProvidesFile{bookinother.dbx} -[2016/04/16 v2.0.0a biblatex bibliography style to have entry type for book edited in other entry type (MR)] +[2016/09/08 v2.2.0 biblatex bibliography style to have entry type for book edited in other entry type (MR)] %1. New fields \DeclareDatamodelFields[type=list,datatype=name]{ bookeditor, bookineditor, + mainauthor, } %2. For bookinother entrytypes @@ -41,10 +42,17 @@ inarticle, bookinincollection,bookininproceedings,bookininreference,% inincollection,ininproceedings,ininreference,% - bookinjournal% + bookinjournal,% + ininbook,bookininbook,% ]{% bookineditor } +\DeclareDatamodelEntryfields[% + ininarticle,bookininarticle% + ]{% + bookineditor, + mainauthor,% + } %3. For standard entry type \DeclareDatamodelEntryfields[ bookincollection,bookinproceedings,bookinreference |