biblatex-manuscripts-philology (25jun14)

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

5 files changed, 41 insertions, 13 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 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}