From 1d5112325f65cbc2470ff12c81854ada5ce499a9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 16 Mar 2014 21:08:58 +0000 Subject: biblatex-manuscripts-philology (16mar14) git-svn-id: svn://tug.org/texlive/trunk@33195 c570f23f-e606-0410-a88d-b1316a301751 --- .../english-manuscripts.lbx | 2 +- .../french-manuscripts.lbx | 2 +- .../biblatex-manuscripts-philology/manuscripts.bbx | 33 +++++++++++++++++----- .../biblatex-manuscripts-philology/manuscripts.dbx | 4 +-- 4 files changed, 30 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-manuscripts-philology') 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 4da10fadf3e..9414c2db1ab 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 @@ -13,7 +13,7 @@ % 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{french-manuscripts.lbx}[2013/12/17\space v1.0.0\space manuscripts biblatex localisation] +\ProvidesFile{french-manuscripts.lbx}[2014/03/15\space v1.1.0\space manuscripts biblatex localisation] \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 8725f5f81a2..73b557f05c2 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,7 +13,7 @@ % 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{french-manuscripts.lbx}[2013/12/17\space v1.0.0\space manuscripts biblatex localisation] +\ProvidesFile{french-manuscripts.lbx}[2014/03/15\space v1.1.0\space manuscripts biblatex localisation] \InheritBibliographyExtras{french} \NewBibliographyString{1column} 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 4a31137feae..0340725651a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx @@ -155,7 +155,7 @@ \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{##1\hss}}} {\endlist} - {\item} + {\item\iffieldundef{shorthand}{\hspace{-\labelwidth}\hspace{-\labelsep}}} % 5. Others %% 5.1 Driver @@ -195,13 +195,9 @@ {\usebibmacro{cite:postnote}} %% 5.3 Mapping - \DeclareStyleSourcemap{ + +\DeclareStyleSourcemap{ \maps[datatype=bibtex]{ - \map{ - \pertype{manuscript} - \step[fieldsource=entrykey] - \step[fieldset=shorthand, origfieldval] - } \map[overwrite]{ \pertype{manuscript} \step[fieldsource=catalog,final] @@ -221,4 +217,27 @@ \DeclareLanguageMapping{english}{english-manuscripts} \DeclareLanguageMapping{french}{french-manuscripts} +% 5.6 Auto shorthand + +\newbool{bbx:msnoautoshorthand} +\DeclareBibliographyOption{msnoautoshorthand}[true]{% + \csuse{bool#1}{bbx:msnoautoshorthand}% +} + +\AtEveryCitekey{% + \notbool{bbx:msnoautoshorthand}{% + \ifentrytype{manuscript}{% + \iffieldundef{shorthand}{% + \savefield{entrykey}{\entrykey}% + \restorefield{shorthand}{\entrykey}% + }{}% + }{}% + }% + {}% +} + +% 5.7 bibcheck + +\defbibcheck{withshorthand}{\iffieldundef{shorthand}{\skipentry}{}} +\defbibcheck{withoutshorthand}{\iffieldundef{shorthand}{}{\skipentry}} \endinput 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 eddfabd573c..91045a5e51a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx @@ -14,8 +14,8 @@ % This work consists of the files manuscripts.dbx, manuscripts.bbx, french-manuscripts.lbx and english-manuscripts.lbx \DeclareDatamodelEntrytypes{manuscript} -\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,shortlibrary,columns, collection,usualtitle,shelfmark,support,columns} +\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,support,columns} \DeclareDatamodelFields[type=list,datatype=name]{scribe,owner} \DeclareDatamodelFields[type=list,datatype=literal]{origin} -\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,columns,languages, collection,usualtitle,shelfmark,support,columns,origin,scribe,owner} +\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,shortcollection,columns,languages, collection,usualtitle,shelfmark,support,columns,origin,scribe,owner} -- cgit v1.2.3