biblatex-manuscripts-philology (21sep16)

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

9 files changed, 48 insertions, 17 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx
index 6dfda0920a9..00a2f31ded4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx
@@ -12,7 +12,7 @@
 % 
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{english-manuscripts.lbx}[2016/09/07 v1.10.1 manuscripts biblatex localisation]
+\ProvidesFile{english-manuscripts.lbx}[2016/09/21 v1.11.0 manuscripts biblatex localisation]%
 \InheritBibliographyStrings{english}
 \InheritBibliographyExtras{english}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx
index 65461fa7bac..ef104be05f8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx
@@ -12,7 +12,7 @@
 % 
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{french-manuscripts.lbx}[2016/09/07 v1.10.1 manuscripts biblatex localisation]
+\ProvidesFile{french-manuscripts.lbx}[2016/09/21 v1.11.0 manuscripts biblatex localisation]%
 \InheritBibliographyStrings{french}
 \InheritBibliographyExtras{french}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx
index e4e20b26261..56de1e499dd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx
@@ -12,7 +12,7 @@
 % 
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{italian-manuscripts.lbx}[2016/09/07 v1.10.1 manuscripts biblatex localisation]
+\ProvidesFile{italian-manuscripts.lbx}[2016/09/21 v1.11.0 manuscripts biblatex localisation]%
 \InheritBibliographyStrings{italian}
 \InheritBibliographyExtras{italian}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx
index a73ba11addd..3b55965896e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx
@@ -13,7 +13,7 @@
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
 \ProvidesFile{manuscripts-noautoshorthand.bbx}
-[2016/09/07 v1.10.1 biblatex bibliography style (MR)]
+[2016/09/21 v1.11.0 biblatex bibliography style (MR)]%
 
 
 \RequireBibliographyStyle{manuscripts-shared}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx
index 92ba829aac6..7e114e0f734 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx
@@ -13,5 +13,5 @@
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
 \ProvidesFile{manuscripts-noautoshorthand.dbx}
-[2016/09/07 v1.10.1 biblatex bibliography style (MR)]
+[2016/09/21 v1.11.0 biblatex bibliography style (MR)]
 \blx@inputonce{manuscripts-shared.dbx}{}{}{}{}{}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx
index 4da3121ea90..ef0589b9920 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx
@@ -14,7 +14,7 @@
 % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
 
 \ProvidesFile{manuscripts-commons}
-[2016/09/07 v1.10.1 biblatex bibliography style (MR)]
+[2016/09/21 v1.11.0 biblatex bibliography style (MR)]%
 
 \ifdef{\biblatexmultipledm@bibstyle}
 	{\RequireBibliographyStyle{\biblatexmultipledm@bibstyle}}
@@ -34,6 +34,7 @@
 
 \newcommand{\mkcolumns}[1]{\addspace\mkbibparens{#1}}
 \newcommand{\mklayer}[1]{\addspace\mkbibparens{#1}}
+\newcommand{\mkcolumnslayer}[1]{\addspace\mkbibparens{#1}}%
 \newcommand{\mklocation}[1]{\mkbibnamefamily{#1}}
 \newcommand{\mkmanuscriptdescriptionlabel}[1]{\textbf{#1}\manuscriptdescriptionlabelpunct}
 \newcommand{\mkshcite}[1]{#1}
@@ -42,6 +43,7 @@
 \newcommand{\manuscriptdescriptionlabelpunct}{\addcolon\addspace}
 \newcommand{\moreinterpunct}{\addsemicolon\addspace}
 \newcommand{\pagetotalpagespunct}{\addcolon\addspace}
+\newcommand{\columnslayerpunct}{\addsemicolon\addspace}%
 
 
 \def\recto{r}
@@ -102,12 +104,40 @@
   
 \newbibmacro{manuscript:pages}{%
 	\printfield{pagetotal}%
-	\iffieldundef{columns}{}{\bibstring[\mkcolumns]{\strfield{columns}column}}%
-	\setunit{\pagetotalpagespunct}%
-	\printfield{pages}%
-	\iffieldundef{layer}{}{\bibstring[\mklayer]{\strfield{layer}layer}}%
+	\iffieldundef{pages}%
+    {%
+    \usebibmacro{manuscript:columns+layer}%
+    }%
+    {%
+    \usebibmacro{manuscript:columns}%
+	  \setunit{\pagetotalpagespunct}%
+	  \printfield{pages}%
+	  \usebibmacro{manuscript:layer}%
+	  }%
 } 
 
+\newbibmacro{manuscript:columns+layer}{%
+ \ifboolexpr{test {\iffieldundef{columns}} or test{\iffieldundef{layer}}}{%
+   \usebibmacro{manuscript:columns}%
+   \usebibmacro{manuscript:layer}%
+ }%
+ {%
+   \printtext[columns+layer]{%
+     \bibstring{\strfield{columns}column}%
+     \setunit{\columnslayerpunct}%
+     \bibstring{\strfield{layer}layer}%
+   }%
+ }%
+}%
+
+\newbibmacro{manuscript:columns}{%
+  \iffieldundef{columns}{}{\bibstring[\mkcolumns]{\strfield{columns}column}}%
+}%
+
+\newbibmacro{manuscript:layer}{%
+  \iffieldundef{layer}{}{\bibstring[\mklayer]{\strfield{layer}layer}}%
+}%
+
 \newbibmacro{support+dating}{%
   \printfield{support}%
   \newunit%
@@ -122,9 +152,10 @@
 \DeclareFieldFormat{collection+shelfmark}{%
   \printtext[title]{#1}%
 }
-\DeclareFieldFormat{dating}{#1\isdot}
+\DeclareFieldFormat{columns+layer}{\mkcolumnslayer{#1}}%
+\DeclareFieldFormat{dating}{#1\isdot}%
 
-\DeclareFieldFormat{support}{\bibstring{#1}}
+\DeclareFieldFormat{support}{\bibstring{#1}}%
 
 \DeclareNameFormat{manuscript}{%
   \nameparts{#1}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx
index 0106866a7e4..185a55da7d5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx
@@ -12,8 +12,8 @@
 % 
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files manuscripts.dbx, manuscripts.bbx, french-manuscripts.lbx and english-manuscripts.lbx
-\ProvidesFile{manuscripts-shared.dbx}
-[2016/09/07 v1.10.1 biblatex bibliography style (MR)]
+\ProvidesFile{manuscripts-shared.dbx}%
+[2016/09/21 v1.11.0 biblatex bibliography style (MR)]%
 \DeclareDatamodelEntrytypes{manuscript}
 \DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,sortshelfmark,support,columns,layer}
 \DeclareDatamodelFields[type=list,datatype=name]{scribe,owner}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx
index a6397215039..551f99fc6e1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx
@@ -12,8 +12,8 @@
 % 
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{manuscripts.bbx}
-[2016/09/07 v1.10.1 biblatex bibliography style (MR)]
+\ProvidesFile{manuscripts.bbx}%
+[2016/09/21 v1.11.0 biblatex bibliography style (MR)]%
 
 
 \RequireBibliographyStyle{manuscripts-shared}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx
index 33340abad92..643763b3e60 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx
@@ -13,5 +13,5 @@
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
 \ProvidesFile{manuscripts.dbx}
-[2016/09/07 v1.10.1 biblatex bibliography style (MR)]
+[2016/09/21 v1.11.0 biblatex bibliography style (MR)]
 \blx@inputonce{manuscripts-shared.dbx}{}{}{}{}{}
\ No newline at end of file