From 8c91e2403bf36f6c4501689845f327d0285cfe54 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 7 Feb 2016 23:47:42 +0000 Subject: biblatex-bookinarticle (7feb16) git-svn-id: svn://tug.org/texlive/trunk@39617 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-bookinarticle-crossref.pdf | Bin 0 -> 23718 bytes .../documentation/biblatex-bookinarticle.dot | 117 +++++++++++++++++++++ .../documentation/biblatex-bookinarticle.pdf | Bin 70332 -> 92328 bytes .../documentation/biblatex-bookinarticle.tex | 36 ++++--- .../documentation/example-bookinarticle.bib | 24 +---- .../documentation/example-bookinincollection.bib | 19 ++++ .../biblatex-bookinarticle/documentation/makefile | 2 + .../doc/latex/biblatex-bookinarticle/makefile | 4 +- .../biblatex-bookinarticle.sty | 2 +- 9 files changed, 165 insertions(+), 39 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle-crossref.pdf create mode 100644 Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.dot create mode 100644 Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinincollection.bib (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle-crossref.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle-crossref.pdf new file mode 100644 index 00000000000..7f3057a12e8 Binary files /dev/null and b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle-crossref.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.dot b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.dot new file mode 100644 index 00000000000..e3f0e6242ff --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.dot @@ -0,0 +1,117 @@ +digraph Biberdata { + compound = true; + edge [ arrowhead=open ]; + graph [ style=filled, rankdir=LR ]; + node [ + fontsize=10, + fillcolor=white, + style=filled, + shape=box ]; + + subgraph "cluster_section0/Griggio2008" { + fontsize="10"; + label="Griggio2008 (COLLECTION)"; + tooltip="Griggio2008 (COLLECTION)"; + fillcolor="#deefff"; + + "section0/Griggio2008/editor" [ label="EDITOR" ] + "section0/Griggio2008/location" [ label="LOCATION" ] + "section0/Griggio2008/publisher" [ label="PUBLISHER" ] + "section0/Griggio2008/subtitle" [ label="SUBTITLE" ] + "section0/Griggio2008/title" [ label="TITLE" ] + "section0/Griggio2008/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/AcTiteLatin" { + fontsize="10"; + label="AcTiteLatin (BOOKININCOLLECTION)"; + tooltip="AcTiteLatin (BOOKININCOLLECTION)"; + fillcolor="#a0d0ff"; + + "section0/AcTiteLatin/bookauthor" [ label="BOOKAUTHOR" ] + "section0/AcTiteLatin/booktitle" [ label="BOOKTITLE" ] + "section0/AcTiteLatin/crossref" [ label="CROSSREF" ] + "section0/AcTiteLatin/editor" [ label="EDITOR" ] + "section0/AcTiteLatin/location" [ label="LOCATION" ] + "section0/AcTiteLatin/mainsubtitle" [ label="MAINSUBTITLE" ] + "section0/AcTiteLatin/maintitle" [ label="MAINTITLE" ] + "section0/AcTiteLatin/pages" [ label="PAGES" ] + "section0/AcTiteLatin/publisher" [ label="PUBLISHER" ] + "section0/AcTiteLatin/title" [ label="TITLE" ] + "section0/AcTiteLatin/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/Chiesa2008" { + fontsize="10"; + label="Chiesa2008 (INCOLLECTION)"; + tooltip="Chiesa2008 (INCOLLECTION)"; + fillcolor="#deefff"; + + "section0/Chiesa2008/author" [ label="AUTHOR" ] + "section0/Chiesa2008/booksubtitle" [ label="BOOKSUBTITLE" ] + "section0/Chiesa2008/booktitle" [ label="BOOKTITLE" ] + "section0/Chiesa2008/crossref" [ label="CROSSREF" ] + "section0/Chiesa2008/editor" [ label="EDITOR" ] + "section0/Chiesa2008/location" [ label="LOCATION" ] + "section0/Chiesa2008/pages" [ label="PAGES" ] + "section0/Chiesa2008/publisher" [ label="PUBLISHER" ] + "section0/Chiesa2008/title" [ label="TITLE" ] + "section0/Chiesa2008/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/BHG226e" { + fontsize="10"; + label="BHG226e (BOOKINARTICLE)"; + tooltip="BHG226e (BOOKINARTICLE)"; + fillcolor="#a0d0ff"; + + "section0/BHG226e/bookauthor" [ label="BOOKAUTHOR" ] + "section0/BHG226e/crossref" [ label="CROSSREF" ] + "section0/BHG226e/journaltitle" [ label="JOURNALTITLE" ] + "section0/BHG226e/mainsubtitle" [ label="MAINSUBTITLE" ] + "section0/BHG226e/maintitle" [ label="MAINTITLE" ] + "section0/BHG226e/number" [ label="NUMBER" ] + "section0/BHG226e/pages" [ label="PAGES" ] + "section0/BHG226e/title" [ label="TITLE" ] + "section0/BHG226e/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/VanDeun1990" { + fontsize="10"; + label="VanDeun1990 (ARTICLE)"; + tooltip="VanDeun1990 (ARTICLE)"; + fillcolor="#deefff"; + + "section0/VanDeun1990/author" [ label="AUTHOR" ] + "section0/VanDeun1990/journaltitle" [ label="JOURNALTITLE" ] + "section0/VanDeun1990/number" [ label="NUMBER" ] + "section0/VanDeun1990/pages" [ label="PAGES" ] + "section0/VanDeun1990/subtitle" [ label="SUBTITLE" ] + "section0/VanDeun1990/title" [ label="TITLE" ] + "section0/VanDeun1990/year" [ label="YEAR" ] + } + + + + "section0/Griggio2008/subtitle" -> "section0/Chiesa2008/booksubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/BOOKSUBTITLE inherited via CROSSREF from Griggio2008/SUBTITLE" ] + "section0/Griggio2008/location" -> "section0/Chiesa2008/location" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/LOCATION inherited via CROSSREF from Griggio2008/LOCATION" ] + "section0/Griggio2008/publisher" -> "section0/Chiesa2008/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/PUBLISHER inherited via CROSSREF from Griggio2008/PUBLISHER" ] + "section0/Griggio2008/title" -> "section0/Chiesa2008/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/BOOKTITLE inherited via CROSSREF from Griggio2008/TITLE" ] + "section0/Griggio2008/editor" -> "section0/Chiesa2008/editor" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/EDITOR inherited via CROSSREF from Griggio2008/EDITOR" ] + "section0/Griggio2008/year" -> "section0/Chiesa2008/year" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/YEAR inherited via CROSSREF from Griggio2008/YEAR" ] + "section0/Chiesa2008/location" -> "section0/AcTiteLatin/location" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/LOCATION inherited via CROSSREF from Chiesa2008/LOCATION" ] + "section0/Chiesa2008/publisher" -> "section0/AcTiteLatin/publisher" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/PUBLISHER inherited via CROSSREF from Chiesa2008/PUBLISHER" ] + "section0/Chiesa2008/year" -> "section0/AcTiteLatin/year" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/YEAR inherited via CROSSREF from Chiesa2008/YEAR" ] + "section0/Chiesa2008/author" -> "section0/AcTiteLatin/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/BOOKAUTHOR inherited via CROSSREF from Chiesa2008/AUTHOR" ] + "section0/Chiesa2008/editor" -> "section0/AcTiteLatin/editor" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/EDITOR inherited via CROSSREF from Chiesa2008/EDITOR" ] + "section0/Chiesa2008/title" -> "section0/AcTiteLatin/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/BOOKTITLE inherited via CROSSREF from Chiesa2008/TITLE" ] + "section0/Chiesa2008/booksubtitle" -> "section0/AcTiteLatin/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/MAINSUBTITLE inherited via CROSSREF from Chiesa2008/BOOKSUBTITLE" ] + "section0/Chiesa2008/booktitle" -> "section0/AcTiteLatin/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/MAINTITLE inherited via CROSSREF from Chiesa2008/BOOKTITLE" ] + "section0/VanDeun1990/year" -> "section0/BHG226e/year" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/YEAR inherited via CROSSREF from VanDeun1990/YEAR" ] + "section0/VanDeun1990/journaltitle" -> "section0/BHG226e/journaltitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/JOURNALTITLE inherited via CROSSREF from VanDeun1990/JOURNALTITLE" ] + "section0/VanDeun1990/author" -> "section0/BHG226e/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/BOOKAUTHOR inherited via CROSSREF from VanDeun1990/AUTHOR" ] + "section0/VanDeun1990/title" -> "section0/BHG226e/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/MAINTITLE inherited via CROSSREF from VanDeun1990/TITLE" ] + "section0/VanDeun1990/number" -> "section0/BHG226e/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/NUMBER inherited via CROSSREF from VanDeun1990/NUMBER" ] + "section0/VanDeun1990/subtitle" -> "section0/BHG226e/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/MAINSUBTITLE inherited via CROSSREF from VanDeun1990/SUBTITLE" ] + +} diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.pdf index ab86199de2f..cde8737e3d8 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.pdf and b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.tex b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.tex index 7d467f1ba87..4a5453156e4 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.tex +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.tex @@ -9,6 +9,7 @@ \usepackage{shortvrb} \usepackage{pifont} \usepackage{minted} +\usepackage{graphics} % Usefull commands \newcommand{\biblatex}{biblatex\xspace} \pretocmd{\bibfield}{\sloppy}{}{} @@ -20,15 +21,15 @@ subtitle={New data types}, email={maieul maieul net}, author={Maïeul Rouquette}, - revision={1.2.0}, - date={05/02/2016}, + revision={1.2.0a}, + date={07/02/2016}, url={https://github.com/maieul/biblatex-bookinarticle}} % biblatex \usepackage[citestyle=verbose]{biblatex} \usepackage{biblatex-bookinarticle} \addbibresource{example-bookinarticle.bib} - +\addbibresource{example-bookinincollection.bib} \begin{document} \printtitlepage @@ -77,12 +78,12 @@ A new entrytype is defined: \bibtype{bookinincollection}. It use the standard fi \item \bibfield{author} means the author of the ancient book. \item \textbf{\bibfield{bookauthor} means the author of the article where the book is edited, e.g. the modern editor of the book}. \item \bibfield{booksubtitle} means the subtitle of the article where the book is edited. - \item \bibfield{booktitle} means the title of the article where the book is edited. - \item \bibfield{maintitle} means the title of the collection were the article is published. - \item \bibfield{mainsubtitle} means the subtitle of the collection were the article is published. + \item \bibfield{booktitle} means the title of the article where the book is edited, in our example \enquote{\enquote{Non tibi proderit hec eruditio}. La versione latina degli \emph{Acta} greci del discepolo Tito}. + \item \bibfield{maintitle} means the title of the collection were the article is published, in our example \enquote{Suave mari magno\ldots}. + \item \bibfield{mainsubtitle} means the subtitle of the collection were the article is published, in our example \enquote{studi offerti dai colleghi udinesi a Ernesto Berti}. \item \bibfield{pages} means the pages where the book is edited. \item \bibfield{substitle} means the subtitle of the edited book. - \item \bibfield{title} means the title of the edited book. In our example \enquote{Mémoire sur le saint apôtre Barnabé}. + \item \bibfield{title} means the title of the edited book. In our example \enquote{Passio Sancti Titi Apostoli, Mense Ianurii die Quarto}. \end{itemize} @@ -121,7 +122,16 @@ The \bibfield{crossfield} of a \bibtype{bookinincollection} entry refering to a See the following example: -\inputminted{latex}{example-bookinincollection.bib} +\inputminted[breaklines]{latex}{example-bookinincollection.bib} +\subsubsection{Summary} +The graphs~\ref{crossref} summaries the use of cross-referencing. + +\begin{figure} + \centering +\includegraphics[height=0.99\textheight]{biblatex-bookinarticle-crossref.pdf} +\label{crossref} +\caption{Using crossref's mechanism with \emph{biblatex-bookinarticle}} +\end{figure} \subsection{\bibtype{inarticle} Entry Type} The package also provides a \bibtype{inarticle} Entry Type, to show a section of an article with its own title. It's like \bibtype{bookinarticle}, but the \bibtype{title} field is printed with italic, and not with quotation marks. @@ -131,13 +141,7 @@ The package also provides a \bibtype{inarticle} Entry Type, to show a section of The package also provides a \bibtype{inincollection} Entry Type, to show a section of an article with its own title. It's like \bibtype{bookinincollection}, but the \bibtype{title} field is printed with italic, and not with quotation marks. -\subsection{Loading package} -The package must be loaded after the \biblatex package: -\begin{minted}{latex} -\usepackage[…]{biblatex} -\usepackage{biblatex-bookinarticle} -\end{minted} \subsection{Loading package} @@ -165,6 +169,10 @@ All issues can be submitted, in French or English, in the GitHub issues page\foo \begin{changelog} +\begin{release}{1.2.0a}{2016-02-07} +\item Fix handbook. +\end{release} + \begin{release}{1.2.0}{2016-02-05} \item Formate \bibfield{series}, \bibfield{volume} and \bibfield{number} fields of \bibtype{inarticle} and \bibtype{bookinarticle} entries as \bibfield{series}, \bibfield{volume} and \bibfield{number} fields of \bibtype{article} entries. \end{release} diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinarticle.bib b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinarticle.bib index f27ab5f3aa1..d8427194e9f 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinarticle.bib +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinarticle.bib @@ -5,29 +5,9 @@ @article{VanDeun1990, Author = {Van Deun, Peter}, - Journal = {Analecta Bollandiana}, + Journaltitle = {Analecta Bollandiana}, Number = {108}, Pages = {323-335}, Subtitle = {Édition et traduction}, Title = {Un mémoire anonyme sur saint Barnabé (BHG 226e)}, - Year = {1990}} - -@bookinincollection{AcTiteLatin, - Crossref = {Chiesa2008}, - Pages = {51-54}, - Title = {Passio Sancti Titi Apostoli, Mense Ianurii die Quarto}} - -@incollection{Chiesa2008, - Author = {Paolo Chiesa}, - Crossref = {Griggio2008}, - Library = {ENS Ulm, Sorbonne centrale}, - Pages = {41-54}, - Title = {\enquote{Non tibi proderit hec eruditio}. La versione latina degli \emph{Acta} greci del discepolo Tito}} - -@collection{Griggio2008, - Address = {Udine}, - Editor = {Claudio Griggio and Fabio Vendruscolo}, - Publisher = {Forum Edizione}, - Subtitle = {studi offerti dai colleghi udinesi a Ernesto Berti}, - Title = {Suave mari magno\ldots}, - Year = {2008}} + Year = {1990}} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinincollection.bib b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinincollection.bib new file mode 100644 index 00000000000..16333bd13a8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinincollection.bib @@ -0,0 +1,19 @@ + +@bookinincollection{AcTiteLatin, + Crossref = {Chiesa2008}, + Pages = {51-54}, + Title = {Passio Sancti Titi Apostoli, Mense Ianurii die Quarto}} + +@incollection{Chiesa2008, + Author = {Paolo Chiesa}, + Crossref = {Griggio2008}, + Pages = {41-54}, + Title = {\enquote{Non tibi proderit hec eruditio}. La versione latina degli \emph{Acta} greci del discepolo Tito}} + +@collection{Griggio2008, + Location = {Udine}, + Editor = {Claudio Griggio and Fabio Vendruscolo}, + Publisher = {Forum Edizione}, + Subtitle = {studi offerti dai colleghi udinesi a Ernesto Berti}, + Title = {Suave mari magno\ldots}, + Year = {2008}} diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/makefile b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/makefile index 9f34e5f28c7..3d7b16d8cb4 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/makefile +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/makefile @@ -1,6 +1,8 @@ all: *tex *bib xelatex --shell-escape biblatex-bookinarticle.tex biber biblatex-bookinarticle + biber -output-format=dot --dot-include=crossref,field biblatex-bookinarticle + dot -Tpdf biblatex-bookinarticle.dot -o biblatex-bookinarticle-crossref.pdf xelatex --shell-escape biblatex-bookinarticle.tex clean:bookinarticle diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile index ffb9f045f47..2207f1f9da1 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile @@ -6,7 +6,7 @@ dist: all mkdir biblatex-bookinarticle ln README *sty *makefile biblatex-bookinarticle mkdir biblatex-bookinarticle/documentation - ln documentation/*tex documentation/*bib documentation/*pdf documentation/makefile biblatex-bookinarticle/documentation + ln documentation/*tex documentation/*bib documentation/*pdf documentation/*.dot documentation/makefile biblatex-bookinarticle/documentation $(RM) ../biblatex-bookinarticle.zip zip -r ../biblatex-bookinarticle.zip biblatex-bookinarticle @@ -15,5 +15,5 @@ clean: $(MAKE) -C documentation clean @$(RM) *.pdf *.toc *.aux *.out *.fdb_latexmk *.log *.bbl *.bcf *.blg *run.xml *.synctex.gz* -all: documentation/biblatex-bookinarticle.tex documentation/example-bookinarticle.bib +all: documentation/biblatex-bookinarticle.tex documentation/example-bookinarticle.bib documentation/example-bookinincollection.bib $(MAKE) -C documentation all diff --git a/Master/texmf-dist/tex/latex/biblatex-bookinarticle/biblatex-bookinarticle.sty b/Master/texmf-dist/tex/latex/biblatex-bookinarticle/biblatex-bookinarticle.sty index ad43d8223eb..fcf4b5abcc1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-bookinarticle/biblatex-bookinarticle.sty +++ b/Master/texmf-dist/tex/latex/biblatex-bookinarticle/biblatex-bookinarticle.sty @@ -12,7 +12,7 @@ % % The Current Maintainer of this work is Maïeul Rouquette \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{biblatex-bookinarticle}[2016/02/05 v1.2.0 Book in article and book in incollection with biblatex] +\ProvidesPackage{biblatex-bookinarticle}[2016/02/07 v1.2.0a Book in article and book in incollection with biblatex] % 1. The drivers \DeclareBibliographyDriver{inarticle}{% -- cgit v1.2.3