biblatex-subseries (23feb17)

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

2 files changed, 30 insertions, 9 deletions

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