biblatex-manuscripts-philology (25jun14)

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

8 files changed, 78 insertions, 20 deletions

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 b53000cebc3..283f839f19d 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 e0d4a496a1b..fff9282f8fe 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.2.0},
-	date={07/04/2014},
+	revision={1.4.0},
+	date={23/06/2014},
 	url={https://github.com/maieul/biblatex-manuscripts-philology}}
 
 
@@ -81,7 +81,7 @@ This bibtype can use the optional fields:
 
 \fielditem{dating}{litteral} the dating of the manuscript. It can be for example a century.
 
-\fielditem{layer}{key} for palimpsests, the layer which is studied. There is two possibility: 
+\label{field:layer}\fielditem{layer}{key} for palimpsests, the layer which is studied. There is two possibility: 
 	\begin{description}
 		\item[inf] for the inferior layer.
 		\item[sup] for the superior layer 
@@ -101,7 +101,7 @@ This bibtype can use the optional fields:
 \fielditem{pagination}{key} the pagination of part of manuscript which is studied. The standard pagination key are allowed, but the package add a new key: \verb+folio+.
 
 
-\fielditem{shorthand}{litteral} the shorthand of the manuscript. If this field is empty, the entry key will be used as shorthand, except if the version \opt{manuscript-noauthoshorthand} is loaded. See \secref{noauthoshorthand}.
+\fielditem{shorthand}{litteral} the shorthand of the manuscript. If this field is empty, the entry key will be used as shorthand, except if the version \opt{manuscript-noautoshorthand} is loaded. See \secref{noautoshorthand}.
 
 \fielditem{support}{key} the support of the manuscript, which will be translated in your work language. These keys are defined: \texttt{papyrus}, \texttt{paper}, \texttt{pergament}.
 
@@ -177,16 +177,16 @@ If you want to print a list of manuscripts with detailed fields listed in \secre
 \cnt{details}.
 
 \begin{minted}{latex}
-\printbibliography[type=manuscript,env=details,title=Description of manuscripts]
+\printshorthand[type=manuscript,env=details,title=Description of manuscripts]
 \end{minted}
 
 In this case, you must run two times biber: one after the first run of \LaTeX\ and one after the second run, to add in the \file{.bbl} the catalogues. After that, run a three time \LaTeX.
 
 If you use \opt{manuscripts-noautoshorthand} version, this list could contain manuscripts without shorthand. By default, the descriptions of such manuscripts will be aligned on the left of the shorthands column. 
 
-\label{bibcheck}An other solution is to make two lists: one with manuscripts with shorthand and one with manuscript withoutshortands. You can add to your \cmd{printbiblography} commands a \opt{bibcheck} option, equal to \opt{withshorthand} or \opt{withoutshorthand}:
+\label{bibcheck}An other solution is to make two lists: one with manuscripts with shorthand and one with manuscript withoutshortands. You can add to your \cmd{printbiblography} or \cmd{printshorthands}  commands a \opt{bibcheck} option, equal to \opt{withshorthand} or \opt{withoutshorthand}. As you:
 \begin{minted}{latex}
-\printbibliography[
+\printshorthands[
   type=manuscript,
   env=details,
   title=Description of used manuscripts,
@@ -198,6 +198,23 @@ If you use \opt{manuscripts-noautoshorthand} version, this list could contain ma
   check=withoutshorthand
 ]
 \end{minted}
+
+\subsection{Sorting list of manuscripts without shorthand}
+
+\label{sorting} If you doesn't use the shorthands' feature, you can want to print a list of manuscripts, sorted by Town, Library, Collection, Shelfmark.
+
+You can use, for that, the option \opt{sorting=manuscripts}. 
+
+\begin{minted}{latex}
+\printbibliography[
+  type=manuscript,
+  title=Description of other manuscripts,
+  sorting=manuscripts
+]
+\end{minted}
+
+You can use the special field \bibfield{sortshelfmark} if the way you shelf marks are sorted is not the way they are printed (like in normal entry type, you can use \bibfield{sorttitle}.
+
 \section{Customization}
 
 \subsection{Commands}
@@ -240,10 +257,23 @@ Some specific localization strings are defined in the \file{manucripts-xxx.lbx}
 
 The \file{manuscripts-shared.bbx} file defines bibmacros and field formats (read the \biblatex handbook to know more about bibmacro and field format). We can't list all of them, but you can look on them to know how to customize more finely the manuscripts description.
 
+\section{Use with biblatex-realauthor}\ref{biblatex-multiple-dm}
+
+To use this package with the features of \verb+biblatex-realauthor+, you must use the package \verb+biblatex-multiple-dm+.
+
+
 \section{Change history}
 
 \begin{changelog}
 
+\begin{release}{1.4.0}{2014-06-23}
+	\item Compatibility with \verb+biblatex-multiple-dm+.\see{biblatex-multiple-dm}
+\end{release}
+
+
+\begin{release}{1.3.0}{2014-06-16}
+	\item Add sorting description.\see{sorting}
+\end{release}
 
 \begin{release}{1.2.0}{2014-04-07}
 	\item Add \bibfield{layer}.\see{field:layer}
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
index 9d554d6c4fe..76d955c3fbd 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf
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 b086822f103..de384b3cda5 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,8 @@
 % 
 % 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}[2014/03/15\space v1.1.0\space manuscripts biblatex localisation]
+\ProvidesFile{english-manuscripts.lbx}[2014/03/15\space v1.1.0\space manuscripts biblatex localisation]
+\InheritBibliographyStrings{english}
 \InheritBibliographyExtras{english}
 
 \NewBibliographyString{1column}
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 9a20193e4bd..66712ab8ce4 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
@@ -13,6 +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{french-manuscripts.lbx}[2014/03/15\space v1.1.0\space manuscripts biblatex localisation]
+\InheritBibliographyStrings{french}
 \InheritBibliographyExtras{french}
 
 \NewBibliographyString{1column}
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 54b6f2ed023..003264f12b0 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
@@ -18,7 +18,7 @@
 
 \RequireBibliographyStyle{manuscripts-shared}
 
-% Mapping
+
 % Mapping
  \DeclareStyleSourcemap{
 	\maps[datatype=bibtex]{
@@ -30,6 +30,4 @@
         		}
   	}
 }
-\endinput
-
-\endinput
+\endinput
\ 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 e9ff295c1bc..3fc49a37d43 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
@@ -16,8 +16,9 @@
 \ProvidesFile{manuscripts-commons}
 [\abx@bbxid]
 
-
-\RequireBibliographyStyle{verbose}
+\ifdef{\biblatexmultipledm@bibstyle}
+	{\RequireBibliographyStyle{\biblatexmultipledm@bibstyle}}
+	{\RequireBibliographyStyle{verbose}}
 
 % This file contains code shared by manuscript.bbx and manuscript-noauthoshorthand.
 % This file is organized from the must close of user to the less close.
@@ -80,7 +81,7 @@
 \newbibmacro{collection+shelfmark}{%
 	\mkbibemph{%
 	  \printfield{collection}%
-	  \setunit{\collectionshelfmarkpunct}%
+	  \iffieldundef{collection}{}{\setunit{\collectionshelfmarkpunct}}%
 	  \printfield{shelfmark}%
 	}%
 }
@@ -90,7 +91,7 @@
 	  {\printfield{dating}}%
 }
 
-\newbibmacro{location+library+series+shelfmark}{%
+\newbibmacro{location+library+collection+shelfmark}{%
 	\printlist{location}%
 	\setunit{\locationlibrarypunct}%
 	\printfield{library}%
@@ -164,8 +165,7 @@
 \DeclareBibliographyDriver{manuscript}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \usebibmacro{location+library+series+shelfmark}%
-  \newunit
+  \usebibmacro{location+library+collection+shelfmark}%
   \newunit
   \printlist{language}%
   \newunit\newblock
@@ -211,4 +211,32 @@
 
 \defbibcheck{withshorthand}{\iffieldundef{shorthand}{\skipentry}{}}
 \defbibcheck{withoutshorthand}{\iffieldundef{shorthand}{}{\skipentry}}
+
+
+%% 5.6 Sorting
+\DeclareSortingScheme{manuscripts}{
+  \sort{
+    \field{presort}
+  }
+  \sort[final]{
+    \field{sortkey}
+  }
+  \sort{
+  	\field{location}
+	\literal{0000}
+  }
+  \sort{
+    \field{library}
+    \literal{0000}
+  }
+  \sort{
+    \field{collection}
+    \field{0000}
+  }
+  \sort{
+  	\field[padside=left,padwidth=50,padchar=0]{sortshelfmark}
+    \field[padside=left,padwidth=50,padchar=0]{shelfmark}
+  }
+}
+
 \endinput
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 7a47fd1da9d..888486b570e 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
@@ -15,8 +15,8 @@
 \ProvidesFile{manuscripts-shared.dbx}
 [\abx@bbxid]
 \DeclareDatamodelEntrytypes{manuscript}
-\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,support,columns,layer}
+\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,sortshelfmark,support,columns,layer}
 \DeclareDatamodelFields[type=list,datatype=name]{scribe,owner}
 \DeclareDatamodelFields[type=list,datatype=literal]{origin}
-\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,shortcollection,columns,languages, collection,usualtitle,shelfmark,support,columns,origin,scribe,owner}
+\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,shortcollection,columns,languages, collection,usualtitle,shelfmark,sortshelfmark,support,columns,origin,scribe,owner}