biblatex-manuscripts-philology (21sep16)

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

17 files changed, 72 insertions, 33 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.bib b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib
index 554b2f99e1c..554b2f99e1c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf
new file mode 100644
index 00000000000..985878454be
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.tex b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex
index 1e0d9e88d16..9a43f1ec4d2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex
@@ -4,9 +4,9 @@
 \setmainlanguage{english}
 \setmainfont{Linux Libertine O}
 \usepackage[backend=biber,bibstyle=manuscripts,citestyle=verbose]{biblatex}
-\addbibresource{example.bib}
+\addbibresource{biblatex-manuscripts-philology-example.bib}
 \begin{document}
-\title{Examples}
+\title{biblatex-manuscripts-philology-examples}
 \author{Maïeul Rouquette}
 \maketitle
 \nocite{*}
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf
index 6ec25b6ae96..53afea76166 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex
index deb6f81a7aa..c517a3577cd 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex
@@ -19,8 +19,8 @@
 	subtitle={New data types},
 	email={maieul <at> maieul <dot> net},
 	author={Maïeul Rouquette},
-	revision={1.10.1},
-	date={07/09/2016},
+	revision={1.11.0},
+	date={21/09/2016},
 	url={https://github.com/maieul/biblatex-manuscripts-philology}}
 
 
@@ -228,27 +228,31 @@ You can use the special field \bibfield{sortshelfmark} if the way you shelf mark
 You can redefine, with \cs{renewcommand} some commands defined in \file{manuscripts.bbx}. The commands starting with \cs{mk...} take one argument, the other take no argument. In these command, use the punctuation commands of \biblatex.
 
 \begin{ltxsyntax}
-\csitem{collectionshelfmarkpunct} the punct between \bibfield{collection} and \bibfield{shelfmark}. By default \cs{addspace}.
+\csitem{collectionshelfmarkpunct} the punctuation between \bibfield{collection} and \bibfield{shelfmark}. By default \cs{addspace}.
 
-\csitem{datingpagespunct} the punct between \bibfield{dating} and \bibfield{pages}. By default \cs{addcomma}\cs{addspace}. The \cs{isdot} is automatically called when printing \bibfield{dating} field. 
+\csitem{columnslayerpunct} the punctuation between \bibfield{columns} and \bibfield{layer}. By default \cs{addsemicolon}\cs{addspace}.
 
-\csitem{librarycollectionpunct} the punct between \bibfield{library} and \bibfield{collection}. By default \cs{addcomma}\cs{addspace}.
+\csitem{datingpagespunct} the punctuation between \bibfield{dating} and \bibfield{pages}. By default \cs{addcomma}\cs{addspace}. The \cs{isdot} is automatically called when printing \bibfield{dating} field. 
+
+\csitem{librarycollectionpunct} the punctuation between \bibfield{library} and \bibfield{collection}. By default \cs{addcomma}\cs{addspace}.
 
 \csitem{mkcolumns} the way the \bibfield{columns} are printed. By default, in parens.
 
+\csitem{mkcolumnslayer} the way the \bibfield{columns} and \bibfield{layer} fields are printed together. By default, in parens.
+
 \csitem{mklocation} the way the \bibfield{location} is printed. By default, with the command \cs{mkbibnamefamily}.
 
 \csitem{mkmanuscriptdescriptionlabel} the way the label are printed before the special field. By default, in bold, following with \cs{manuscriptdescriptionlabelpunct}.
 
 \csitem{mkshcite} the way the shorthand is printed when using \cs{shcite}. By default, no special formatting.
 
-\cs{locationlibrarypunct} the punct between \bibfield{location} and \bibfield{library}.  By default \cs{addcolon}\cs{addspace}.
+\cs{locationlibrarypunct} the punctuation between \bibfield{location} and \bibfield{library}.  By default \cs{addcolon}\cs{addspace}.
 
-\cs{manuscriptdescriptionlabelpunct} the punct between label and text, for the special fields. By default \cs{addcolon}\cs{addspace}.
+\cs{manuscriptdescriptionlabelpunct} the punctuation between label and text, for the special fields. By default \cs{addcolon}\cs{addspace}.
 
-\cs{moreinterpunct} the punct between each special fields when printing in the same paragraph. By default \cs{addcolon}\cs{addspace}.
+\cs{moreinterpunct} the punctuation between each special fields when printing in the same paragraph. By default \cs{addcolon}\cs{addspace}.
 
-\cs{pagetotalpagespunct} the punct between \bibfield{pagetotal} and \bibfield{pages}. By default \cs{addcolon}\cs{addspace}.
+\cs{pagetotalpagespunct} the punctuation between \bibfield{pagetotal} and \bibfield{pages}. By default \cs{addcolon}\cs{addspace}.
 \end{ltxsyntax}
 
 \subsection{Commands to use in the \bibfield{pages} field}
@@ -272,7 +276,11 @@ To use this package with the features of \verb+biblatex-realauthor+, you must us
 
 \begin{changelog}
 
-\begin{release}{1.10.1}{2016-06-09}
+\begin{release}{1.11.0}{2016-09-21}
+  \item Fix typographical bug when using both \bibfield{layer} and \bibfield{columns} fields without \bibfield{pages} field.
+\end{release}
+
+\begin{release}{1.10.1}{2016-09-07}
   \item Use \cs{mkbibnamefamily} instead of \cs{mkbibnamelast} (biblatex 3.3 and later).
 \end{release}
 
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf
deleted file mode 100644
index cdf27ba74de..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/makefile b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/makefile
index c124f4dc726..50a403d2106 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/makefile
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/makefile
@@ -1,9 +1,9 @@
 all: *tex *bib
 	xelatex --shell-escape biblatex-manuscripts-philology.tex
 	xelatex --shell-escape biblatex-manuscripts-philology.tex
-	xelatex --shell-escape example.tex
-	biber example
-	xelatex --shell-escape example.tex
+	xelatex --shell-escape biblatex-manuscripts-philology-example.tex
+	biber biblatex-manuscripts-philology-example
+	xelatex --shell-escape biblatex-manuscripts-philology-example.tex
 
 clean:
 	$(MAKE) -C documentation clean
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile
index d01c1c4d7a7..9e988010666 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/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/example.tex documentation/biblatex-manuscripts-philology.tex documentation/example.bib
+all: documentation/biblatex-manuscripts-philology-example.tex documentation/biblatex-manuscripts-philology.tex documentation/biblatex-manuscripts-philology-example.bib
 	$(MAKE) -C documentation all
\ No newline at end of file
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