From 124b1ee0fde140a15f9965ea59a7138e0179fe9b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 May 2013 23:43:48 +0000 Subject: biblatex-fiwi (13may13) git-svn-id: svn://tug.org/texlive/trunk@30448 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx | 6 +++--- Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx | 21 +++++++++++---------- Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx | 6 +++--- Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx | 9 +++++---- Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx | 4 ++-- Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx | 4 ++-- Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx | 13 ++++++++----- 7 files changed, 34 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx index 8ed41265922..f71f4ea77b7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx @@ -1,11 +1,11 @@ -% $Id: fiwi-yearbeginning.bbx, v 1.2c 2013/03/29 Simon Spiegel +% $Id: fiwi-yearbeginning.bbx, v 1.2d 2013/05/13 Simon Spiegel % Stil mit Jahrestahl nach Autor -\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2c 2013/03/29 film studies bibliography style Author (Year)] +\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2d 2013/05/13 film studies bibliography style Author (Year)] \RequireBibliographyStyle{fiwi} -\ExecuteBibliographyOptions{indexing=cite,maxnames=4,minnames=4,maxitems=9,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labelyear=true} +\ExecuteBibliographyOptions{indexing=cite,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labeldate=true} \DeclareFieldFormat{yearparens}{\mkbibparens{#1}\ifentrytype{collection}{}{\addcolon\addspace}} \DeclareFieldFormat{pubstate}% diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx index 225818fa542..5930e1ff662 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx @@ -1,8 +1,8 @@ -% $Id: fiwi.bbx, v1.2c 2013/03/29 Simon Spiegel +% $Id: fiwi.bbx, v1.2d 2013/05/13 Simon Spiegel -\ProvidesFile{fiwi.bbx}[v1.2c 2013/03/29 film studies bibliography style] +\ProvidesFile{fiwi.bbx}[v1.2d 2013/05/13 film studies bibliography style] -\@ifpackagelater{biblatex}{2012/11/26} +\@ifpackagelater{biblatex}{2013/05/01} {} {\PackageError{biblatex} {Outdated 'biblatex' package} @@ -49,6 +49,7 @@ }}} + \defcounter{highnamepenalty}{0} \defcounter{lownamepenalty}{0} @@ -246,8 +247,8 @@ {} }% -\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=1,maxitems=9,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labelyear=true,isbn=false,babel=hyphen,} -\ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labelyear=false,labeltitle=true} +\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=1,maxitems=9,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labeldate=true,isbn=false,babel=hyphen,} +\ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labeldate=false,labeltitle=true} \InitializeBibliographyStyle{% \let\bbx@lasthash\undefined} @@ -290,19 +291,19 @@ \DeclareFieldFormat{postnote}{% \iftoggle{citepages} {\mkpageprefix[pagination]{#1}} - {#1} + {#1}% } \DeclareFieldFormat{volcitepages}{% \iftoggle{citepages} {\mkpageprefix[pagination]{#1}} - {#1} + {#1}% } \DeclareFieldFormat{multipostnote}{% \iftoggle{citepages} {\mkpageprefix[pagination]{#1}} - {#1} + {#1}% } \DeclareFieldFormat{isan}{\mkbibacro{ISAN}\addcolon\space #1} @@ -397,7 +398,7 @@ \DeclareNameAlias{withintroduction}{bytranslator} \DeclareNameAlias{withforeword}{bytranslator} \DeclareNameAlias[misc,movie,video]{author}[movie]{director} -\DeclareNameAlias[misc,movie,video]{scriptwriter}[movie]{director} +\DeclareNameAlias[misc,movie,video]{editor}[movie]{scriptwriter} \DeclareNameAlias{author}{sortname} \DeclareNameAlias{editor}{author} \DeclareNameAlias{bookauthor}{author} @@ -1244,7 +1245,7 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}} \ifnamesequal{scriptwriter}{director} {\bibstring{writtendirectedby}\printnames{director}} {\ifpunct{\unspace}{}\bibstring{directedby}\printnames{director} - \newunit\bibstring{writtenby}\printnames{scriptwriter}} + \ifnameundef{scriptwriter}{}{\newunit\bibstring{writtenby}\printnames{scriptwriter}}} } \newbibmacro*{mtitle+vol+btitle+bstitle}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx index e072bfa5d8e..54e46ba2d5b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx @@ -1,10 +1,10 @@ -% $Id: fiwi.cbx,v 1.2c 2013/03/29 Simon Spiegel +% $Id: fiwi.cbx,v 1.2d 2013/05/13 Simon Spiegel \ProvidesFile{fiwi.cbx} -[\abx@cbxid $Id: fiwi.cbx,v 1.2c 2013/03/29 spiegel $] +[\abx@cbxid $Id: fiwi.cbx,v 1.2d 2013/05/13 spiegel $] -\ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true} +\ExecuteBibliographyOptions{labeldate=true,autocite=inline,firstinits=false,uniquename=full,uniquelist=true} \RequireBibliographyStyle{fiwi} diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx index 2896a0cab3f..7e790fceaca 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx @@ -16,7 +16,7 @@ %% -\ProvidesFile{fiwi.dbx}[2013/03/29 1.2c film studies bibliography style data model] +\ProvidesFile{fiwi.dbx}[2013/05/13 1.3 film studies bibliography style data model] \RequireBiber[3] @@ -25,7 +25,8 @@ \DeclareDatamodelFields[type=list, datatype=name]{scriptwriter} \DeclareDatamodelFields[type=list, datatype=name]{actor} -\DeclareDatamodelEntryfields[movie]{director} -\DeclareDatamodelEntryfields[movie]{scriptwriter} -\DeclareDatamodelEntryfields[movie]{actor} +\DeclareDatamodelEntryfields[movie,misc,video]{director} +\DeclareDatamodelEntryfields[movie,misc,video]{scriptwriter} +\DeclareDatamodelEntryfields[movie,misc,video]{actor} + diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx index 5d4da62dc27..f424574fc80 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx @@ -1,7 +1,7 @@ -% $Id: fiwi2.bbx, v 1.2c 2013/03/29 Simon Spiegel +% $Id: fiwi2.bbx, v 1.2d 2013/05/13 Simon Spiegel % Stil mit Jahrestahl nach Autor -\ProvidesFile{fiwi2.bbx}[v 1.2c 2013/03/29 film studies bibliography style Author (Year)] +\ProvidesFile{fiwi2.bbx}[v 1.2d 2013/05/13 film studies bibliography style Author (Year)] \RequireBibliographyStyle{fiwi-yearbeginning} diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx index 1a3a4bf5234..cf7864a7f8c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx @@ -1,7 +1,7 @@ -% $Id: fiwi2.cbx,v 1.2c 2013/03/29 Simon Spiegel +% $Id: fiwi2.cbx,v 1.2d 2013/05/13 Simon Spiegel \ProvidesFile{fiwi2.cbx} -[\abx@cbxid $Id: fiwi2.cbx,v 1.2c 2013/03/29 spiegel $] +[\abx@cbxid $Id: fiwi2.cbx,v 1.2d 2013/05/13 spiegel $] \RequireCitationStyle{fiwi} diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx index 15fbb186961..04c836774b9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx @@ -16,13 +16,16 @@ %% -\ProvidesFile{fiwi.dbx}[2013/03/29 1.2c film studies bibliography style data model] +\ProvidesFile{fiwi.dbx}[2013/05/13 1.3 film studies bibliography style data model] \RequireBiber[3] -\DeclareDatamodelFields[type=list, datatype=name]{ - director} +\DeclareDatamodelFields[type=field, datatype=literal]{parttitle} +\DeclareDatamodelFields[type=list, datatype=name]{director} +\DeclareDatamodelFields[type=list, datatype=name]{scriptwriter} +\DeclareDatamodelFields[type=list, datatype=name]{actor} -\DeclareDatamodelEntryfields[movie]{ - director} +\DeclareDatamodelEntryfields[movie,misc,video]{director} +\DeclareDatamodelEntryfields[movie,misc,video]{scriptwriter} +\DeclareDatamodelEntryfields[movie,misc,video]{actor} -- cgit v1.2.3