biblatex-bookinarticle (5feb16)

git-svn-id: svn://tug.org/texlive/trunk@39584 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 32 insertions, 20 deletions

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 6c3856ec2bc..ab86199de2f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.pdf
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 2d6dd112a7f..7d467f1ba87 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
@@ -20,15 +20,14 @@
 	subtitle={New data types},
 	email={maieul <at> maieul <dot> net},
 	author={Maïeul Rouquette},
-	revision={1.1.2},
-	date={05/02/2015},
+	revision={1.2.0},
+	date={05/02/2016},
 	url={https://github.com/maieul/biblatex-bookinarticle}}
 
 % biblatex
 \usepackage[citestyle=verbose]{biblatex}
 \usepackage{biblatex-bookinarticle}
-\addbibresource{example.bib}
-\addbibresource{example-bookinincollection.bib}
+\addbibresource{example-bookinarticle.bib}
 
 \begin{document}
 
@@ -105,7 +104,7 @@ The \bibfield{crossfield} of a \bibtype{bookinarticle} entry refering to a \bibt
 
 See the following example:
 
-\inputminted{latex}{example.bib}
+\inputminted[breaklines]{latex}{example-bookinarticle.bib}
 
 \subsubsection{For \bibtype{bookinincollection}}
 
@@ -165,6 +164,11 @@ All issues can be submitted, in French or English, in the GitHub issues page\foo
 
 \begin{changelog}
 
+
+\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}
+
 \begin{release}{1.1.2}{2015-02-05}
 \item Use the \bibfield{shortauthor} field to define the \bibfield{labelname} field (useful for some citation style, like authortitle).
 \end{release}
diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinincollection.bib b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinarticle.bib
index 5cb6efc2c5e..f27ab5f3aa1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinincollection.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinarticle.bib
@@ -1,3 +1,17 @@
+@bookinarticle{BHG226e,
+	Crossref = {VanDeun1990},
+	Pages = {326-335},
+	Title = {Mémoire sur le saint apôtre Barnabé}}
+
+@article{VanDeun1990,
+	Author = {Van Deun, Peter},
+	Journal = {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},
diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example.bib b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example.bib
deleted file mode 100644
index e8f3e569342..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example.bib
+++ /dev/null
@@ -1,13 +0,0 @@
-@bookinarticle{BHG226e,
-	Crossref = {VanDeun1990},
-	Pages = {326-335},
-	Title = {Mémoire sur le saint apôtre Barnabé}}
-
-@article{VanDeun1990,
-	Author = {Van Deun, Peter},
-	Journal = {Analecta Bollandiana},
-	Number = {108},
-	Pages = {323-335},
-	Subtitle = {Édition et traduction},
-	Title = {Un mémoire anonyme sur saint Barnabé (BHG 226e)},
-	Year = {1990}}
diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile
index d24dc7651f1..ffb9f045f47 100644
--- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile
+++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile
@@ -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.bib
+all:  documentation/biblatex-bookinarticle.tex documentation/example-bookinarticle.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 3701996f216..ad43d8223eb 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}[2015/02/05 v1.1.2 Book in article and book in incollection with biblatex]
+\ProvidesPackage{biblatex-bookinarticle}[2016/02/05 v1.2.0 Book in article and book in incollection with biblatex]
 
 % 1. The drivers
 \DeclareBibliographyDriver{inarticle}{%
@@ -113,6 +113,13 @@
 \DeclareFieldFormat[inincollection,bookinincollection]{booktitle}{\mkbibquote{#1\isdot}}
 \DeclareFieldFormat[inarticle,bookinarticle]{maintitle}{\mkbibquote{#1\isdot}}
 
+% Inspired from biblatex.def
+\DeclareFieldFormat[inarticle,bookinarticle]{series}{% series of a journal
+  \ifinteger{#1}
+    {\mkbibordseries{#1}~\bibstring{jourser}}
+    {\ifbibstring{#1}{\bibstring{#1}}{#1}}}
+\DeclareFieldFormat[inarticle,bookinarticle]{volume}{#1}% volume of a journal
+\DeclareFieldFormat[inarticle,bookinarticle]{number}{#1}% number of a journal
 
 %4. Inheritance