biblatex-subseries (23feb17)

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

5 files changed, 48 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries-example.pdf b/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries-example.pdf
index 992b25cf04a..4ed9b377817 100644
--- a/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries.pdf b/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries.pdf
index 58845b68c26..e4419fb2cf1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries.tex b/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries.tex
index bf1f3af9bbf..adcb76e3503 100644
--- a/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-subseries/documentation/biblatex-subseries.tex
@@ -24,8 +24,8 @@
 	subtitle={New data fields},
 	email={maieul <at> maieul <dot> net},
 	author={Maïeul Rouquette},
-	revision={1.1.0},
-	date={07/06/2016},
+	revision={1.2.0},
+	date={24/02/2017},
 	url={https://git.framasoft.org/maieul/biblatex-subseries}}
 
 % biblatex
@@ -38,18 +38,24 @@
 \tableofcontents
 \section{Introduction}
 
-Some publishers organize book series with subseries. In this case, two numbers are associated with one volume: the number inside the series and the number inside the subseries. That is the case of the series \emph{\foreignlanguage{latin}{Corpus Scriptorium Christianorum Orientalium}} published by Peeters.\footnote{\url{http://www.peeters-leuven.be/search_serie_book.asp?nr=94}}
+Some publishers organize book series with subseries. In this case, two numbers are associated with one volume: the number inside the series and the number inside the subseries. That is the case, for example, of the series \emph{\foreignlanguage{latin}{Corpus Scriptorium Christianorum Orientalium}} published by Peeters.\footnote{\url{http://www.peeters-leuven.be/search_serie_book.asp?nr=94}.}
+Sometime, there is also subsubseries, and number for subsubseries.
+
 This package provides new fields to manage such system.
 \section{Basic use}
 
 \subsection{The .bib file}
-You can use three more fields:
+You can use six additional fields:
 \begin{fieldlist}
 
 \fielditem{shortsubseries}{literal\LFMark} The shorthand form of the subseries. Not used by default styles.
 \fielditem{subnumber}{literal} The number of the book inside the subseries.
 \fielditem{subseries}{literal} The subseries.
 
+\fielditem{shortsubsubseries}{literal\LFMark} The shorthand form of the subsubseries. Not used by default styles.
+\fielditem{subsubnumber}{literal} The number of the book inside the subsubseries.
+\fielditem{subsubseries}{literal} The subsubseries.
+
 \end{fieldlist}
 
 
@@ -72,9 +78,11 @@ Here, an example of result with the default setting:
 \end{quotation}
 
 \section{Customization}
-You can redefine \cmd{subseriesseparator} to change the separator between series and subseries.
+You can redefine \cmd{subseriesseparator} to change the separator between series and subseries. You can also redefine \cmd{subsubseriesseparator} to change the separator between subseries and subsubseries. By default, it is the same as \cmd{subseriesseparator}.
+
+If you want to customize the \verb+series+number+ bibmacro, do not forget to call the \verb|subseries+subnumber| bibmacro inside. 
 
-If you want to customize the \verb+series+number+ bibmacro, do not forget to call the \verb|subseries+subnumber| bibmacro inside. You can also redefine it.
+You can also redefine this macro, and redefine the \verb+subsubseries+subsubnumber+ bibmacro which is called by the \verb|subseries+subnumber| bibmacro.
 
 
 \section{Use with other packages which provide new fields}
@@ -92,6 +100,10 @@ All issues can be submitted, in French or English, in the Framagit issues page.\
 
 \begin{changelog}
 
+\begin{release}{1.2.0}{2017-02-24}
+  \item Add \bibfield{subsubseries}, \bibfield{subsubnumber} and \bibfield{shortsubsubseries} fields.
+\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/tex/latex/biblatex-subseries/subseries.bbx b/Master/texmf-dist/tex/latex/biblatex-subseries/subseries.bbx
index 825ac68a1fd..430ca4ab7f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-subseries/subseries.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-subseries/subseries.bbx
@@ -13,7 +13,7 @@
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files subseries.dbx, subseries.bbx
 \ProvidesFile{subseries.dbx}
-[2016/06/07 v1.1.0 biblatex bibliography style (MR)]
+[2017/02/24 v1.2.0 biblatex bibliography style (MR)]%
 
 \ifdef{\biblatexmultipledm@bibstyle}
 	{\RequireBibliographyStyle{\biblatexmultipledm@bibstyle}}
@@ -21,16 +21,32 @@
 
 \RequirePackage{xpatch}
 
-\newcommand{\subseries@failtopatch}[1]{\PackageError{biblatex-subseries}{Unable to patch `#1` bibmacro}{}}
-\xapptobibmacro{series+number}{\usebibmacro{subseries+subnumber}}{}{}%Patch the standard bibmacro series+number
+\newcommand{\subseries@failtopatch}[1]{%
+  \PackageError{biblatex-subseries}{Unable to patch `#1` bibmacro}{}%
+}%
+
+%Patch the standard bibmacro series+number
+\xapptobibmacro{series+number}%
+  {\usebibmacro{subseries+subnumber}}%
+  {}%
+  {\subseries@failtopatch{series+number}}%
 
 \newbibmacro{subseries+subnumber}{%A default subseries+subnumber style
-  \setunit *{\subseriesseparator}%
+  \setunit*{\subseriesseparator}%
   \printfield{subseries}%
-  \setunit *{\addspace}%
+  \setunit*{\addspace}%
   \printfield{subnumber}%
+  \usebibmacro{subsubseries+subsubnumber}%
   \newunit%
 }
 
-\newcommand{\subseriesseparator}{\addspace---\addspace}
+\newbibmacro{subsubseries+subsubnumber}{%
+  \setunit*{\subsubseriesseparator}%
+  \printfield{subsubseries}%
+  \setunit*{\addspace}%
+  \printfield{subsubnumber}%
+}%
+
+\newcommand{\subseriesseparator}{\addspace---\addspace}%
+\newcommand{\subsubseriesseparator}{\subseriesseparator}%
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-subseries/subseries.dbx b/Master/texmf-dist/tex/latex/biblatex-subseries/subseries.dbx
index 0d406181787..95850036ea4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-subseries/subseries.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-subseries/subseries.dbx
@@ -1,4 +1,4 @@
-%% Copyright 2014 Maïeul Rouquette
+%% Copyright 2014-… Maïeul Rouquette
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -13,11 +13,16 @@
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files subseries.dbx, subseries.bbx
 \ProvidesFile{subseries.dbx}
-[2015/05/14 v1.0.0a biblatex bibliography style (MR)]
+[2017/02/24 v1.2.0 biblatex bibliography style (MR)]
 
 \DeclareDatamodelFields[type=field,datatype=literal]{%
   subnumber,%
   subseries,%
+  subsubnumber,%
+  subsubseries,%
+}
+\DeclareDatamodelFields[type=field,datatype=literal,label=true]{%
+  shortsubseries,%
+  shortsubsubseries%
 }
-\DeclareDatamodelFields[type=field,datatype=literal,label=true]{shortsubseries}
 \endinput
\ No newline at end of file