From 07cc5c2480421e2ca1ca9fd8e58897a4c42dc0e7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 9 Apr 2017 22:39:28 +0000 Subject: biblatex-claves (9apr17) git-svn-id: svn://tug.org/texlive/trunk@43723 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/biblatex-claves/claves.bbx | 15 ++++++++++++--- Master/texmf-dist/tex/latex/biblatex-claves/claves.dbx | 5 +++-- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/biblatex-claves/claves.bbx b/Master/texmf-dist/tex/latex/biblatex-claves/claves.bbx index e2c62d8eeb1..ccf5fcd16eb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-claves/claves.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-claves/claves.bbx @@ -14,7 +14,7 @@ % This work consists of the files claves.dbx, claves.bbx % 0. Preamble -\ProvidesFile{claves.dbx}[2016/09/25 v1.1.0 biblatex bibliography style (MR)] +\ProvidesFile{claves.dbx}[2017/04/09 v1.2.0 biblatex bibliography style (MR)] \ifdef{\biblatexmultipledm@bibstyle} {\RequireBibliographyStyle{\biblatexmultipledm@bibstyle}} @@ -30,9 +30,13 @@ \maps[datatype=bibtex]{% \map[overwrite]{% \step[fieldsource=#1,final]% - \step[fieldset=claves,fieldvalue={\string\multiclavesseparator\space#1\string\clavisseparator{}},append]% + \step[fieldset=claves,fieldvalue={\string\multiclavesseparator\space\string\clavisformat{#1}\string\clavisseparator{}},append]% \step[fieldset=claves,origfieldval, append] }% + \map[overwrite]{% + \step[fieldsource=entrykey,match=\regexp{^#1$},final] + \step[fieldset=claves_definition, origfieldval] + }% }% }% } @@ -41,6 +45,8 @@ \newcommand{\multiclavesseparator}{\addsemicolon\ifpunct{\addspace}{}} \newcommand{\clavisseparator}{\addspace} \DeclareFieldFormat{claves}{\mkbibparens{#1}} +\DeclareFieldFormat{claves_definition}{\clavisformat{#1}} +\newcommand{\clavisformat}[1]{#1} % 3. Patching macro standard to add claves @@ -82,7 +88,7 @@ } \defbibenvironment{claves}%Inspired from shorthand environment {\list - {\printfield[labelwidth]{entrykey}} + {\printtext[claves_definition]{\printfield[labelwidth]{entrykey}}} {\setlength{\labelwidth}{\shorthandwidth}% \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% @@ -105,6 +111,9 @@ %5. Inheritance + \DeclareDataInheritance{*}{*}{% + \noinherit{claves_definition}% + }% \DeclareDataInheritance{*}{inbook}{% \noinherit{claves}% diff --git a/Master/texmf-dist/tex/latex/biblatex-claves/claves.dbx b/Master/texmf-dist/tex/latex/biblatex-claves/claves.dbx index 362b45d2504..d07384f0a4c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-claves/claves.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-claves/claves.dbx @@ -13,9 +13,10 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files claves.dbx, claves.bbx \ProvidesFile{claves.dbx} -[2016/09/25 v1.1.0 biblatex bibliography style (MR)] +[2017/04/09 v1.2.0 biblatex bibliography style (MR)] \DeclareDatamodelFields[type=field,datatype=literal]{% - claves% + claves,% + claves_definition% } \endinput \ No newline at end of file -- cgit v1.2.3