summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-fiwi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-09-14 22:24:31 +0000
committerKarl Berry <karl@freefriends.org>2016-09-14 22:24:31 +0000
commit8a55c7c1454b55cfef04908883b2bbc935513e2b (patch)
treea18b2ed0dd041dee4ddceddc7e13159f52abfaac /Master/texmf-dist/tex/latex/biblatex-fiwi
parent329aaf75e178c3d67a285b2dda8de1d1f94234c6 (diff)
biblatex-fiwi
git-svn-id: svn://tug.org/texlive/trunk@42069 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-fiwi')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx84
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx357
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx127
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx19
7 files changed, 420 insertions, 180 deletions
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 60949eebea6..0170548b063 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
@@ -1,7 +1,7 @@
-% $Id: fiwi-yearbeginning.bbx, v v1.5 2016/05/17 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v v1.6 2016/09/09 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.5 2016/05/17 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.6 2016/09/09 film studies bibliography style Author (Year)]
\RequireBibliographyStyle{fiwi}
@@ -13,6 +13,16 @@
{\ifbibstring{#1}{\mkbibbrackets{\midsentence\bibstring{#1}}}{#1}}
+\DeclareFieldFormat{origyearbook}{%
+ \iftoggle{origyearbrackets}%
+ {\addthinspace\bibopenbracket}{\addspace\bibopenparen}%
+ \iftoggle{origyearsuperscript}%
+ {\textsuperscript{1}#1}%
+ {#1}%
+ \iftoggle{origyearbrackets}
+ {\bibclosebracket}{\bibcloseparen}}
+
+
\renewcommand{\ppspace}{}
\DeclareBibliographyOption{mergedate}[true]{%
@@ -34,19 +44,23 @@
\iftoggle{isreview}{\printfield{year}}%
{\printfield{issue}%
{\setunit*{\addspace}%
- \printdateextralabel%
+ \iffieldsequal{year}{\thefield{labeldatesource}year}
+ {\printlabeldateextra}%
+ {\printfield{labelyear}%
+ \printfield{extrayear}}%
\usebibmacro{date:origyear}}%
}}}%
\renewbibmacro*{date}{}%
\renewbibmacro*{issue+date}{}%
}
+
\def\bbx@opt@mergedate@compact{%
\renewbibmacro*{date+extrayear}{%
\printtext[yearparens]{%
\iftoggle{isreview}{\printfield{year}}%
{\iffieldundef{day}
- {\printdateextralabel}
+ {\printlabeldateextra}
{\printfield{year}\printfield{extrayear}}}%
\usebibmacro{date:origyear}}%
\renewbibmacro*{date}{}%
@@ -70,8 +84,10 @@
\renewbibmacro*{date+extrayear}{%
\printtext[yearparens]{%
\iftoggle{isreview}{\printfield{year}}%
- {\printfield{labelyear}%
- \printfield{extrayear}%
+ {\iffieldsequal{year}{\thefield{labeldatesource}year}
+ {\printlabeldateextra}%
+ {\printfield{labelyear}%
+ \printfield{extrayear}}%
\usebibmacro{date:origyear}}}}%
\renewbibmacro*{date}{%
\iffieldundef{month}
@@ -155,7 +171,20 @@
\newunit}%
}
-\ExecuteBibliographyOptions{indexing=cite,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labeldate=true,mergedate=true}
+\ExecuteBibliographyOptions{%
+ indexing=cite,
+ useprefix=true,
+ sorting=nyt,
+ date=long,
+ urldate=long,
+ hyperref=auto,
+ pagetracker=true,
+ ibidtracker=context,
+ citetracker=true,
+ labeldateparts=true,
+ mergedate=true}
+
+
\newbibmacro{date:origyear}{%
\ifboolexpr{ ( (not test {\iffieldundef{origyear}}
@@ -168,15 +197,32 @@
{\entrydata*{\thefield{related}}{%
\printfield[origyear]{year}%
}}
- {\printfield{origyear}}}}%
+ {\iftoggle{origyearsuperscript}
+ {\textsuperscript{1}}{}%
+\printorigdate}}}%
{\addslash%
\iffieldequalstr{relatedtype}{origpubin}
{\entrydata*{\thefield{related}}{%
- \printfield[origyear]{year}%
+ \printfield[origyear]{year}%
}}
- {\printfield{origyear}}}}%
+ {\iftoggle{origyearsuperscript}
+{\textsuperscript{1}}{}%
+ \printorigdate}}}%
{}}
+
+\renewbibmacro*{bbx:origdate}
+{\iftoggle{origyearbrackets}%
+ {\addthinspace\bibopenbracket}{\addthinspace\bibopenparen}%
+ \iftoggle{origyearsuperscript}%
+ {\textsuperscript{1}\printorigdate}%
+ {\iffieldundef{origyear}{}
+ {\iffieldequalstr{origdateunspecified}{yearincentury}
+ {\number\numexpr\thefield{origyear}/100+1\relax \adddot\addnbthinspace{Jhdt\adddot}}
+ {\printorigdate}}}%
+ \iftoggle{origyearbrackets}
+ {\bibclosebracket}{\bibcloseparen}}
+
\renewbibmacro*{incollectioneditor}{%
\ifnameundef{editor}
{}
@@ -212,7 +258,7 @@
{\printfield{chapter}%
\iffieldundef{pages}%
{}%
- {\newunit\printfield{pages}}}%
+ {AA\newunit\printfield{pages}}}%
}
@@ -230,7 +276,7 @@
\iffieldundef{volume}{}{%
\iftoggle{bbx:volumeinparens}
{\addspace\mkbibparens{\printfield{volume}\unspace}}
-{\newunit\printfield{volume}}%
+{\setunit{,\addspace}\printfield{volume}}%
\iffieldundef{number}%
{\ifboolexpr{%
( test {\iffieldundef{number}} and not test {\iffieldundef{issuetitle}})
@@ -378,8 +424,8 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
}
{\iftoggle{partofcited}
{\iffieldundef{xref}
- {\mancite\textcite{\thefield{crossref}}}
- {\mancite\textcite{\thefield{xref}}}
+ {\mancite\textcite{\thefield{crossref}}}%
+ {\mancite\textcite{\thefield{xref}}}%
\usebibmacro{chap+pag}}
{\newblock%
\ifnameundef{bookauthor}%
@@ -487,10 +533,12 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\newunit\newblock
\usebibmacro{in:}%
%\newunit%
- \iftoggle{partofcited}
- {\iffieldundef{xref}
- {\mancite\textcite{\thefield{crossref}}}
- {\mancite\textcite{\thefield{xref}}}
+ \iftoggle{partofcited}%
+ {\iffieldundef{xref}%
+ {\entrydata*{\thefield{crossref}}{%
+ \printnames{labelname}\addspace\mkbibparens{\printlabeldateextra}}}
+ {\entrydata*{\thefield{xref}}{%
+ \printnames{labelname}\addspace\mkbibparens{\printlabeldateextra}}}
\usebibmacro{chap+pag}}
{\newblock%
\ifnameundef{bookauthor}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index b63981cd98c..4f6a3f3fa93 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
@@ -1,15 +1,15 @@
-% $Id: fiwi.bbx, v1.5 2016/05/17 Simon Spiegel
+% $Id: fiwi.bbx, v1.6 2016/09/09 Simon Spiegel
% Ragged2e
% Alternatetitle
% Uniquetitle
-\ProvidesFile{fiwi.bbx}[v1.5 2016/05/17 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.6 2016/09/09 film studies bibliography style]
-%\@ifpackagelater{biblatex}{2016/04/01}
+%\@ifpackagelater{biblatex}{2016/08/01}
% {}
% {\PackageError{biblatex}
% {Outdated 'biblatex' package}
-% {The 'fiwi' style requires biblatex v3.4 or later.\MessageBreak
+% {The 'fiwi' style requires biblatex v3.5 or later.\MessageBreak
% You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
% This is a fatal error. I'm aborting now.}%
% \endinput}
@@ -126,6 +126,9 @@
\togglefalse{ignoreaddendumcit}
\providetoggle{markmissingpublisher}
\togglefalse{markmissingpublisher}
+\newtoggle{cbx:orgigyearcite}
+\newtoggle{cbx:superscriptcite}
+
% BibliographyOptions
@@ -216,8 +219,6 @@
{}
}%
-
-
\DeclareBibliographyOption{publisher}[true]{%
\ifstrequal{#1}{true}
{\toggletrue{printpublisher}}
@@ -231,26 +232,30 @@
{}
}
-
\DeclareBibliographyOption{parensvolume}[true]{\settoggle{bbx:volumeinparens}{#1}}
+
\DeclareBibliographyOption{script}[true]{\settoggle{bbx:scriptwriter}{#1}}
\DeclareBibliographyOption{actor}[true]{\settoggle{bbx:actor}{#1}}
\DeclareBibliographyOption{ignorearticle}[true]{\settoggle{ignorearticle}{#1}}
\DeclareBibliographyOption{partofcited}[true]{\settoggle{partofcitedflag}{#1}}
\DeclareBibliographyOption{germ}[true]{\settoggle{germfassung}{#1}}
\DeclareBibliographyOption{translatedas}[true]{\settoggle{germfassung}{#1}}
+
\DeclareBibliographyOption{noseries}[true]{%
\ifstrequal{#1}{true}
{\togglefalse{printseriesflag}}
{\toggletrue{printseriesflag}}}%
\DeclareBibliographyOption{series}[true]{\settoggle{printseriesflag}{#1}}%
+
\DeclareBibliographyOption{nopublisher}[true]{%
\ifstrequal{#1}{true}
{\togglefalse{printpublisher}}
{\toggletrue{printpublisher}}}
+
\DeclareBibliographyOption{filmruntime}[true]{\settoggle{filmruntime}{#1}}%
\DeclareBibliographyOption{citeprefix}[true]{\settoggle{citeprefix}{#1}}
\newbibmacro*{bbx:savehash}{}
+
\DeclareBibliographyOption{dashed}[true]{%
\ifstrequal{#1}{true}
{\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
@@ -264,6 +269,7 @@
\ifstrequal{#1}{brackets}{\toggletrue{origyearwithyear}
\toggletrue{origyearbrackets}{}}}
\DeclareBibliographyOption{origyearsuperscript}[true]{\settoggle{origyearsuperscript}{#1}}
+
\DeclareBibliographyOption{pages}[true]{%
\ifstrequal{#1}{true}
{\toggletrue{bibpages}\toggletrue{citepages}}
@@ -278,9 +284,44 @@
{\toggletrue{citepages}}
{}
}%
+
+\DeclareBibliographyOption{origcite}[false]{%
+ \ifstrequal{#1}{true}
+ {\toggletrue{cbx:orgigyearcite}}
+ {}
+ \ifstrequal{#1}{superscript}
+ {\toggletrue{cbx:orgigyearcite}%
+ \toggletrue{cbx:superscriptcite}}
+ {}
+}%
-\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=1,maxitems=9,useprefix=true,sorting=nyt,date=long,datelabel=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=context,labeldate=true,isbn=false,autolang=hyphen}
-\ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labeltitle=true,uniquetitle=true}
+\ExecuteBibliographyOptions{%
+ indexing=cite,
+ maxnames=3,
+ minnames=1,
+ maxitems=9,
+ useprefix=true,
+ sorting=nyt,
+ origdate=long,
+ labeldate=year,
+ urldate=long,
+ hyperref=auto,
+ pagetracker=true,
+ ibidtracker=context,
+ citetracker=context,
+ isbn=false,
+ autolang=hyphen,
+ datezeros=false,
+ dateuncertain=true,
+ datecirca=true,
+ labeldateparts
+ }
+
+\ExecuteBibliographyOptions[misc,movie,video]{%
+ uniquename=false,
+ labeltitle=true,
+ uniquetitle=true
+ }
\InitializeBibliographyStyle{%
\let\bbx@lasthash\undefined}
@@ -313,6 +354,9 @@
% format definitions
+\DeclareLabeldate[movie,misc,video]{
+ \field{date}
+ }
\DeclareFieldFormat{pages}{%
\iftoggle{bibpages}
@@ -385,7 +429,7 @@
\DeclareFieldFormat{part}{\iffieldundef{parttitle}{.#1}{#1}}% physical part of a logical volume
\DeclareFieldFormat[misc]{note}{\mkbibparens{#1}}
\DeclareFieldFormat{addendum}{\mkbibparens{#1}}
-\DeclareFieldFormat{nameaddon}{\addspace\mkbibbrackets{=#1}}
+\DeclareFieldFormat{nameaddon}{\addspace\mkbibbrackets{#1}}
\DeclareFieldFormat{season}{\bibstring{tvseason} #1}
\DeclareFieldFormat{episode}{\bibstring{tvepisode} #1}
\DeclareFieldFormat{urldate}{\addthinspace --\addnbspace\bibstring{urlseen}\space#1}
@@ -404,16 +448,22 @@
{\bibstring{jourvol}\addnbthinspace{#1}}
}
\DeclareFieldFormat[article,review,periodical]{number}{\bibstring{number}\addnbthinspace{#1}}
-\DeclareFieldFormat{origyearbook}{\iftoggle{origyearsuperscript}
-{\addspace\mkbibparens{#1}}
-{\addspace\mkbibparens{\textsuperscript{1}#1}}}
+
+\DeclareFieldFormat{origyear}{\iftoggle{origyearsuperscript}
+ {\textsuperscript{1}#1}
+ {#1}}
+\DeclareFieldFormat{origyearbook}{%
+ \iftoggle{origyearbrackets}%
+ {\addthinspace\bibopenbracket}{\addslash}%
+ \iftoggle{origyearsuperscript}%
+ {\textsuperscript{1}#1}%
+ {#1}%
+ \iftoggle{origyearbrackets}
+ {\bibclosebracket}{}}
\DeclareFieldFormat{origyearart}{\mkbibparens{#1}}
\DeclareFieldFormat{origtit}{\mkbibparens{Original\addcolon\addspace #1}}
\DeclareFieldFormat{origtit:related}{Original\addcolon\addspace #1}
\DeclareFieldFormat{germfassung}{\mkbibbrackets{\midsentence\bibstring{translatedto}\adddot\addcolon\addspace#1}}
-\DeclareFieldFormat{origyear}{\iftoggle{origyearsuperscript}
-{\textsuperscript{1}#1}
-{#1}}
\DeclareListFormat{default}{%
\usebibmacro{list:delim}{#1}%
@@ -441,7 +491,8 @@
{\ifthenelse{\value{listcount}=3}{}{\addslash}}%
{}}}
-
+\DeclareNameAlias{bytranslator}{name:given-family}
+\DeclareNameAlias{actor}{bytranslator}
\DeclareNameAlias{byeditor}{bytranslator}
\DeclareNameAlias{withafterword}{bytranslator}
\DeclareNameAlias{byredactor}{bytranslator}
@@ -451,41 +502,49 @@
\DeclareNameAlias{withforeword}{bytranslator}
\DeclareNameAlias[misc,movie,video]{author}[movie]{director}
\DeclareNameAlias[misc,movie,video]{editor}[movie]{scriptwriter}
-\DeclareNameAlias{author}{sortname}
+\DeclareNameAlias{scriptwriter}{director}
+\DeclareNameAlias{author}{family-given}
\DeclareNameAlias{editor}{author}
\DeclareNameAlias{bookauthor}{author}
-
-
-
% name format definitions
- \DeclareNameFormat{sortname}{%
- \ifnumequal{\value{listcount}}{1}
- {\ifgiveninits
- {\usebibmacro{name:family-given}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefix}
- {\namepartsuffix}}
- {\usebibmacro{name:family-given}
- {\namepartfamily}%
- {\namepartgiven}%
- {\namepartprefix}
- {\namepartsuffix}}}%
- {\ifgiveninits
- {\usebibmacro{name:family-given}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefix}
- {\namepartsuffix}}
- {\usebibmacro{name:family-given}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}}}%
- \usebibmacro{name:andothers}}
+\newrobustcmd{\ifpseudo}[2]{%
+\ifboolexpr{%
+ ( not test {\ifdefvoid{\nameparttruefamily}} or not test
+ {\ifdefvoid{\nameparttruegiven}})}%
+ {#1}{#2}%
+}
+\DeclareNameFormat{family-given}{%
+ \ifgiveninits
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffix}
+ \ifpseudo%
+ {\usebibmacro{name:true:family-given}
+ {\nameparttruefamily}
+ {\nameparttruegiveni}
+ {\nameparttrueprefix}
+ {\nameparttruesuffix}}
+ {}
+ }
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiven}%
+ {\namepartprefix}%
+ {\namepartsuffix}%
+ \ifpseudo%
+ {\usebibmacro{name:true:family-given}%
+ {\nameparttruefamily}%
+ {\nameparttruegiven}%
+ {\nameparttrueprefix}%
+ {\nameparttruesuffix}}%
+ {}}%
+ \usebibmacro{name:andothers}}
+
\DeclareNameFormat{name:commas}{%
\renewcommand*{\multinamedelim}{\addcomma\addspace}%
\renewcommand*{\finalnamedelim}{\addcomma\addspace}%
@@ -494,7 +553,15 @@
{\namepartfamily}
{\namepartgiveni}
{\namepartprefix}
- {\namepartsuffix}}
+ {\namepartsuffix}
+ \ifpseudo%
+ {\addthinspace\bibopenbracket{=}\usebibmacro{actor:given-family}
+ {\nameparttruefamily}
+ {\nameparttruegiveni}
+ {\nameparttrueprefix}
+ {\nameparttruesuffix}
+ \bibclosebracket}
+ {}}
{\usebibmacro{actor:given-family}
{\namepartfamily}
{\namepartgiven}
@@ -502,18 +569,31 @@
{\namepartsuffix}}%
\ifblank{\namepartgiven\namepartprefix}
{}
- {\usebibmacro{name:revsdelim}}
+ {\usebibmacro{name:revsdelim}
+ \ifpseudo%
+ {\addthinspace\bibopenbracket{=}\usebibmacro{actor:given-family}
+ {\nameparttruefamily}
+ {\nameparttruegiven}
+ {\nameparttrueprefix}
+ {\nameparttruesuffix}\bibclosebracket}
+ {}}
\renewcommand*{\multinamedelim}{\addslash}%
\renewcommand*{\finalnamedelim}{\addslash}}
-
-\DeclareNameFormat{bytranslator}{%
+\DeclareNameFormat{name:given-family}{%
\ifgiveninits
{\usebibmacro{name:given-family}
{\namepartfamily}
{\namepartgiveni}
{\namepartprefix}
- {\namepartsuffix}}
+ {\namepartsuffix}
+ \ifpseudo%
+ {\addthinspace\bibopenbracket{=}\usebibmacro{name:given-family}
+ {\nameparttruefamily}
+ {\nameparttruegiveni}
+ {\nameparttrueprefix}
+ {\nameparttruesuffix}\bibclosebracket}
+ {}}
{\usebibmacro{name:given-family}
{\namepartfamily}
{\namepartgiven}
@@ -521,7 +601,14 @@
{\namepartsuffix}}%
\ifblank{\namepartgiven\namepartprefix}
{}
- {\usebibmacro{name:revsdelim}}%
+ {\usebibmacro{name:revsdelim}%
+ \ifpseudo%
+ {\addthinspace\bibopenbracket{=}\usebibmacro{name:given-family}
+ {\nameparttruefamily}
+ {\nameparttruegiven}
+ {\nameparttrueprefix}
+ {\nameparttruesuffix}\bibclosebracket}
+ {}}%
\usebibmacro{name:andothers}}
\DeclareNameFormat{actor}{%
@@ -550,7 +637,18 @@
\ifblank{\namepartgiven\namepartprefix}
{}
{\usebibmacro{name:revsdelim}}%
- \usebibmacro{name:andothers}}
+ \ifpseudo
+ {\addthinspace\bibopenbracket{=}%
+ \usebibmacro{director:given-family}
+ {\nameparttruefamily}
+ {\nameparttruegiven}
+ {\nameparttrueprefix}
+ {\nameparttruesuffix}%
+ \ifblank{\namepartgiven\namepartprefix}
+ {}
+ {\usebibmacro{name:revsdelim}}\bibclosebracket}
+ {}
+ \usebibmacro{name:andothers}}
\newbibmacro*{director:given-family}[4]{%
\usebibmacro{name:delim}{#2#3#1}%
@@ -564,7 +662,6 @@
\mkbibnamefamily{#1}\isdot
\ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}}
-
\renewbibmacro*{name:family-given}[4]{%
\ifuseprefix%
{\usebibmacro{name:delim}{#3#1}%
@@ -586,6 +683,36 @@
\ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}%
\addspace\ifdefvoid{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}}}
+\newbibmacro*{name:true:family-given}[4]{%
+\addthinspace\bibopenbracket{=}%
+ \ifuseprefix%
+ {\usebibmacro{name:delim}{#3#1}%
+ \usebibmacro{name:hook}{#3#1}%
+ \ifdefvoid{#3}{}{%
+ \ifcapital
+ {\mkbibnametrueprefix{\MakeCapital{#3}}\isdot}%
+ {\mkbibnametrueprefix{#3}\isdot}%
+ }%\ifpunctmark{'}{}{\addhighpenspace}}%
+ \mkbibnametruefamily{#1}\isdot%
+ \ifdefvoid{#2}
+ {}{\addcomma\addlowpenspace\mkbibnametruegiven{#2}\isdot}%
+ \ifdefvoid{#4}
+ {}{\addcomma\addlowpenspace\mkbibnametruesuffix{#4}\isdot}}%
+ {\usebibmacro{name:delim}{#1}%
+ \usebibmacro{name:hook}{#1}%
+ \mkbibnametruefamily{#1}\addspace\isdot
+ \ifdefvoid{#4}
+ {}
+ {\addlowpenspace\mkbibnametruesuffix{#4}\isdot}%
+ \addcomma\ifdefvoid{#3}{}{\addcomma}%
+ \ifdefvoid{#2}{}{\addlowpenspace\mkbibnametruegiven{#2}\isdot}%
+ \ifdefvoid{#4}{}{\addlowpenspace\mkbibnametruesuffix{#4}\isdot}%
+ \addspace\ifdefvoid{#3}
+ {}
+ {\addlowpenspace\mkbibnametrueprefix{#3}\isdot}}%
+ \bibclosebracket
+}
+
\renewbibmacro*{name:given-family}[4]{%
\usebibmacro{name:delimfirst}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
@@ -610,7 +737,7 @@
\mkbibnamefamily{#1}\isdot
\ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}}
- \newbibmacro*{name:delimfirst}[1]{%
+\newbibmacro*{name:delimfirst}[1]{%
\ifthenelse{\value{listcount}>\value{liststart}}
{\ifthenelse{\value{listcount}<\value{liststop}\OR
\ifmorenames}
@@ -620,6 +747,7 @@
\newcommand*{\mkfinalnamedelimfirst}[1]{\addspace\bibstring{and}\addspace}
+
%\newbibmacro*{translatedversion}[1]{%
% \toggletrue{intransdecision}%
% \edef\@tempa{\noexpand\docsvlist{#1}}%
@@ -627,8 +755,6 @@
% \fullcite{##1}}}%
% \@tempa\toggletrue{dontprintorig}%
% \togglefalse{dontprintextrayear}\togglefalse{intransdecision}}
-
-
\renewbibmacro*{url+urldate}{%
\printfield{url}%
@@ -732,7 +858,8 @@
%\NewBibliographyString{citepage}
%\NewBibliographyString{citepages}
-
+\DefineBibliographyExtras{german}{%
+\protected\def\bibdateeraprefix{-}}
\DefineBibliographyStrings{german}{%
andothers = {et al\adddot\addspace},
@@ -741,7 +868,6 @@ writtenby = {Buch\addcolon\addspace},
writtendirectedby = {Buch und Regie\addcolon\addspace},
fromhebrew = {aus dem Hebr\"aischen},
fromjapanese = {aus dem Japanischen},
-frompolish = {aus dem Polnischen},
bycompiler = {zusammengestellt von},
bypublisher = {bei},
ibidem = {ebd\adddot},
@@ -954,12 +1080,10 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\usebibmacro{labeltitle}%
\setunit*{\addspace}}}
-
-
\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}
+ \usebibmacro{bbx:editor}{editorstrg}}%
\renewbibmacro*{editor+others}{%
- \usebibmacro{bbx:editor}{editor+othersstrg}}
+ \usebibmacro{bbx:editor}{editor+othersstrg}}%
\newbibmacro*{bbx:editor}[1]{%
\ifboolexpr{
test \ifuseeditor
@@ -969,7 +1093,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{editor}%
- \iffieldundef{nameaddon}{}
+ \iffieldundef{nameaddon}{}%
{\printfield{nameaddon}}%
\addspace%
\iftoggle{isreview}{}{\usebibmacro{bbx:savehash}}}%
@@ -990,7 +1114,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
{\bibstring{idempp}\addnbspace}%
{\bibstring{idem\thefield{gender}}\addnbspace}}%
{\printnames{editor}}}}%
- \usebibmacro{editorstrg}}
+ \usebibmacro{editorstrg}}
\newbibmacro*{collby}{%
\ifnameundef{author}%
@@ -1020,39 +1144,38 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
{\printdate}}}
\newbibmacro*{date+extrayear}{%
-\ifboolexpr{test {\iftoggle{usera}}
-or test {\ifentrytype{set}}}
+\ifentrytype{set}
{\usebibmacro{labelyear}}
{\iffieldundef{year}
{\bibstring[\mkbibbrackets]{nodate}\addcolon\addspace}
- {\printtext{%
- \iffieldundef{endyear}%
- {\iftoggle{dontprintextrayear}%
- {\printfield{year}}{\printdateextralabel}%%
- \ifboolexpr{(
- test {\iftoggle{origyearwithyear}}
- ( and not test {\iffieldundef{origyear}}
- or test {\iffieldequalstr{relatedtype}{origpubin}} )
- and test {\iffieldundef{origtitle}} ) }
- {\iftoggle{origyearbrackets}
- {\addthinspace\mkbibbrackets{%
- \iffieldequalstr{relatedtype}{origpubin}
- {\entrydata*{\thefield{related}}{%
- \printfield[origyear]{year}%
- }}
- {\printfield{origyear}}
- }}
- {\addslash%
- \iffieldequalstr{relatedtype}{origpubin}
- {\entrydata*{\thefield{related}}{%
- \printfield[origyear]{year}}}
- {\printfield{origyear}}}}
- {}}%
- {\printfield{year}%
- \iffieldsequal{year}{endyear}%
- {}{\printfield{endyear}}}%
- }}}}
-
+ {\iftoggle{dontprintextrayear}%
+ {\printfield{year}}{\printdateextra}%%
+ \ifboolexpr{(
+ test {\iftoggle{origyearwithyear}}
+ ( and not test {\iffieldundef{origyear}}
+ or test {\iffieldequalstr{relatedtype}{origpubin}} )
+ and test {\iffieldundef{origtitle}} ) }
+ {\iffieldequalstr{relatedtype}{origpubin}
+ {\entrydata*{\thefield{related}}{%
+ \printfield[origyearbook]{year}%
+ }}
+ {\usebibmacro{bbx:origdate}}
+ {}}
+ {}}}}
+
+\newbibmacro*{bbx:origdate}
+{\iftoggle{origyearbrackets}%
+ {\addthinspace\bibopenbracket}{\addslash}%
+ \iftoggle{origyearsuperscript}%
+ {\textsuperscript{1}\printorigdate}%
+ {\iffieldundef{origyear}{}%
+ {\iffieldequalstr{origdateunspecified}{yearincentury}
+ {\number\numexpr\thefield{origyear}/100+1\relax
+ \adddot\addnbthinspace{Jhdt\adddot}}
+ {\printorigdate}}}%
+ \iftoggle{origyearbrackets}
+ {\bibclosebracket}{}}
+
\newbibmacro*{labelyear}{%
\iffieldundef{year}
{}
@@ -1102,8 +1225,7 @@ or test {\ifentrytype{set}}}
\iffieldundef{endyear}%
{}{\printfield{endyear}}}}
{\ifboolexpr{ (test{\iffieldundef{origtitle}} and not test {\ifentrytype{bookinbook}})}
- {\setunit{\addspace}\printtext[origyearart]{\printfield{origyear}%
- \printfield{origendyear}}}
+ {\setunit{\addspace}\printtext[origyear]{\mkbibparens{\printorigdate}}}
{}}
}}
@@ -1210,9 +1332,10 @@ or test {\ifentrytype{set}}}
test {\ifbibxstring{\thefield{relatedtype}s}}
}
{\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}}
- {\iffieldbibstring{relatedtype}
- {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}}
- {}}}
+ {%\iffieldbibstring{relatedtype}
+ %{\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}}
+ %{}
+ }}
{\iffieldbibstring{relatedstring}
{\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}}
{\printtext{\printfield{relatedstring}\relatedpunct}}}%
@@ -1302,9 +1425,12 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
}%
\iffieldundef{origyear}{}%
{\iflistundef{origlocation}
-{\adddot}{}\addspace\printorigdate
+{\adddot}{}
+\iffieldequalstr{origdateunspecified}{yearincentury}
+{\number\numexpr\thefield{origyear}/100+1\relax \adddot\addnbthinspace{Jhdt\adddot}}
+{\addspace\printorigdate
\iffieldundef{origendyear}
-{}{\printfield{origendyear}}}%
+{}{\printfield{origendyear}}}}%
}}}
% serials
@@ -1375,11 +1501,14 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
\ifnamesequal{scriptwriter}{director}
{\bibstring{writtendirectedby}\printnames{director}}
{\ifpunct{\unspace}{}\bibstring{directedby}\printnames{director}
- \ifnameundef{scriptwriter}{}{\newunit\bibstring{writtenby}\printnames{scriptwriter}}}
+ \ifnameundef{scriptwriter}
+ {}{\newunit\bibstring{writtenby}\printnames{scriptwriter}}}
}
\newbibmacro*{movie:actor}{%
- \bibstring{actors}\printnames[name:commas][-\value{listtotal}]{actor}
+\ifnameundef{actor}
+{}
+{\bibstring{actors}\printnames[name:commas][-\value{listtotal}]{actor}}
}
\newbibmacro*{mtitle+vol+btitle+bstitle}{%
@@ -1471,15 +1600,14 @@ and (test {\iffieldundef{origyear}}%
{\ifboolexpr{ (test {\iffieldundef{origtitle}}
and not test {\iftoggle{origyearwithyear}} )}
%
- {\printtext[origyearbook]{\iffieldequalstr{relatedtype}{origpubin}
- {\entrydata*{\thefield{related}}{%
- \printfield{year}%
+ {\iffieldequalstr{relatedtype}{origpubin}
+ {\printtext[origyearbook]{\entrydata*{\thefield{related}}{%
+ \printfield{year}}%
\iffieldundef{endyear}%
{}{\printfield{endyear}}%
}}%
- {\printfield{origyear}%
- \iffieldundef{origendyear}
- {}{\printfield{origendyear}}}}}%
+ {%\printorigdate
+ \usebibmacro{bbx:origdate}}}%
{}}%
}
@@ -1682,8 +1810,10 @@ and (test {\iffieldundef{origyear}}%
%\newunit%
\iftoggle{partofcited}%
{\iffieldundef{xref}%
- {\mancite\textcite{\thefield{crossref}}}%
- {\mancite\textcite{\thefield{xref}}}
+ {\entrydata*{\thefield{crossref}}{%
+ \printnames{labelname}\addspace\mkbibparens{\printlabeldateextra}}}
+ {\entrydata*{\thefield{xref}}{%
+ \printnames{labelname}\addspace\mkbibparens{\printlabeldateextra}}}
\usebibmacro{chap+pag}}%
{\newunit\newblock%
\ifnameundef{bookauthor}%
@@ -1718,7 +1848,6 @@ and (test {\iffieldundef{origyear}}%
\printfield{note}%
\newunit%
\usebibmacro{org+publ+loc+year}%
- %\printtext{\printfield{labelyear}}%
\newblock%
\usebibmacro{chap+pag}%
%\setunit{\par}\newblock
@@ -1763,7 +1892,7 @@ and (test {\iffieldundef{origyear}}%
\newunit\newblock%
\usebibmacro{publ+loc+year}%
\usebibmacro{chap+pag}%
- \newblock
+ \ifterm{.}{}\newblock
\ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}}
{}
{\addperiod\addspace\usebibmacro{doi+eprint+url}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index 9a5283cba4e..d7f851f0bb6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
@@ -1,9 +1,9 @@
-% $Id: fiwi.cbx,v v1.5 2016/05/17 Simon Spiegel
+% $Id: fiwi.cbx,v v1.5 2016/09/09 Simon Spiegel
\ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.5 2016/05/17 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx,v 1.6 2016/09/09 spiegel $]
-\ExecuteBibliographyOptions{labeldate=true,autocite=inline,giveninits=false,uniquename=full,uniquelist=true,ibidtracker=constrict}
+\ExecuteBibliographyOptions{autocite=inline,uniquename=allfull,uniquelist=true,ibidtracker=constrict}
\RequireBibliographyStyle{fiwi}
@@ -42,7 +42,8 @@
{\ExecuteBibliographyOptions{loccittracker=constrict}}
{\ExecuteBibliographyOptions{loccittracker=false}}}
-\DeclareFieldFormat{citeyear}{\mkbibparens{#1}}
+%\the\numexpr\value{parenlevel}
+\DeclareFieldFormat{citeyear}{\ifnumcomp{\value{parenlevel}}{>}{0}{#1}{\mkbibparens{#1}}}
\DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot}
\DeclareFieldFormat[misc,video,movie]{citetitle}{\film{#1}}
\DeclareIndexFieldFormat[movie,misc,video]{indextitle}{%
@@ -181,7 +182,7 @@ and test {\iffieldundef{maintitle}}}
\iflistundef{organization}
{\printlist{location}}
{\printlist{organization}}
-\printfield{year}}}}%
+\printdate}}}%
}
\newbibmacro*{cbx:cite-filmtitle}
@@ -201,15 +202,28 @@ and test {\iffieldundef{maintitle}}}
\printlist{location}\iflistundef{organization}{}{\addcomma\addspace\printlist{organization}}\addspace\printfield[]{year}\addcomma\addspace%
\printnames[director]{director}\unspace}}}%
+
\newbibmacro*{cite:film}{%
\iftoggle{citefullfilm}%
{\usebibmacro{cite:film:directorcountry}}%
{\iftoggle{citecompletefilm}%
{\usebibmacro{cbx:cite-film-directorcountrytranstitle}}%
{\usebibmacro{cbx:cite-filmtitle}%
- \addspace\printfield[citeyear]{year}}}}
+ \addspace%
+ \usebibmacro{cbx:filmdate}}}}
+
+\newbibmacro*{cbx:filmdate}
+{\printtext[citeyear]{%
+ \datecircaprint%
+ \printfield[]{year}%
+ \iffieldundef{labelendyear}
+ {}
+ {%\bibdatedash%
+ \enddatecircaprint%
+ \printfield{endyear}}%
+ \dateuncertainprint}}
-\newbibmacro*{cite:episode}
+\newbibmacro*{cbx:citeepisode}
{\ifboolexpr{not test {\iffieldequalstr{entrysubtype}{tv}}
and not test {\ifciteseen}
and test {\iftoggle{citefullfilm}}}
@@ -230,29 +244,31 @@ and test {\iftoggle{citecompletefilm}}}
\iflistundef{organization}
{\printlist{location}}
{\printlist{organization}}
-\printfield{year}}}}}%
+\printdate}}}}%
}%
}
-
+
\newbibmacro*{cbx:cite-film-seen}{%
\ifuniquetitle
{\iffieldundef{shorttitle}
{\usebibmacro{cbx:cite-filmtitle}}
{\printtext[bibhyperref]{\printfield[film]{shorttitle}}}}
- {\printtext[bibhyperref]{\printfield[film]{title} (\printfield{year})}}}
+ {\printtext[bibhyperref]{\printfield[film]{title}%
+ \addspace\usebibmacro{cbx:filmdate}}}}
\newbibmacro*{cite:film:countryear}{%
\printtext[bibhyperref]{\printfield[film]{title}
- \addspace\mkbibparens{\printlist{location}\addspace\printfield{year}}}}
+ \addspace\mkbibparens{\printlist{location}%
+ \addspace\usebibmacro{cbx:filmdate}}}}
\newbibmacro*{cbx:cite-film-directorcountrytranstitle}{% Film mit Regisseur, Land und dt. Titel
\printtext[bibhyperref]{\printfield[film]{title}}%
\iffieldundef{alternatetitle}
{}{\usebibmacro{bbx:cite-alternatetitle}}
- \addspace\printtext[citeyear]%
+ \addspace\usebibmacro{cbx:filmdate}%
{\printfield[plain]{subtitle}\setunit*{\addcomma\addspace}%
\printnames[director]{director}\addcomma\addthinspace\printlist{location}%
- \addspace\printfield{year}}
+ \addspace\usebibmacro{cbx:filmdate}}
}
\newbibmacro*{cite:film:directorcountry}{% Film mit Regisseur
@@ -261,7 +277,8 @@ and test {\iftoggle{citecompletefilm}}}
{}{\usebibmacro{bbx:cite-alternatetitle}}
\addspace\mkbibparens{%
\printnames{director}%
- \addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}
+ \addcomma\addthinspace\printlist{location}%
+ \addspace\usebibmacro{cbx:filmdate}}}
\newbibmacro*{cite}{%
@@ -272,7 +289,7 @@ and test {\iftoggle{citecompletefilm}}}
{\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
{\usebibmacro{cite:label}%
\setunit{\addspace}}
- {\printnames{labelname}%
+ {\printtext[bibhyperref]{\printnames{labelname}}%
\setunit{\nameyeardelim}}%
\usebibmacro{cite:labelyear+extrayear}}}
{\usebibmacro{cite:shorthand}}}
@@ -321,7 +338,7 @@ and test {\iftoggle{citecompletefilm}}}
{}%
\usebibmacro{cite:labelyear+extrayear}}
{\usebibmacro{cite:shorthand}}}
- {\printnames{labelname}%
+ {\printtext[bibhyperref]{\printnames{labelname}}%
\setunit{%
\global\booltrue{cbx:parens}%
\addspace\bibopenparen}%
@@ -357,14 +374,52 @@ and test {\iftoggle{citecompletefilm}}}
\newbibmacro*{cite:label}{%
\iffieldundef{label}
{\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
- {\printtext[bibhyperref]{\printfield{label}}}}
-
+ {\printtext[bibhyperref]{\printfield{label}}}}
+
\newbibmacro*{cite:labelyear+extrayear}{%
- \printtext[bibhyperref]{%
- \iffieldundef{year}%
- {\bibstring[\mkbibbrackets]{nodate}\printfield{extrayear}}%
- {\printfield{labelyear}}%
- \printfield{extrayear}}}
+ \iffieldundef{labelyear}
+ {}
+ {\printtext[bibhyperref]{%
+ \ifdefstring\blx@dateformat@labeldate{edtf}
+ {}
+ {\datecircaprint}%
+ \dateeraprintpre{labelyear}%
+ \mkyearzeros{\thefield{labelyear}}%
+ \printfield{extrayear}%
+ \iffieldsequal{labeldateera}{labelenddateera}{}
+ {\dateeraprint{labelyear}}%
+ \dateuncertainprint%
+ \ifdefstring\blx@dateformat@labeldate{edtf}
+ {\datecircaprintedtf}
+ {}%
+ \iffieldundef{labelendyear}
+ {}
+ {\iffieldsequal{labelyear}{labelendyear}{}
+ {\ifdefstring\blx@dateformat@labeldate{edtf}
+ {\slash}
+ {\bibdatedash
+ \setunit{\,}%
+ \enddatecircaprint}%
+ \dateeraprintpre{labelendyear}%
+ \mkyearzeros{\thefield{labelendyear}}%
+ \enddateuncertainprint%
+ \ifdefstring\blx@dateformat@labeldate{edtf}
+ {\enddatecircaprintedtf}
+ {}%
+ \dateeraprint{labelendyear}}}%
+ \iftoggle{cbx:orgigyearcite}%
+ {\usebibmacro{cite:origyerar}}{}}}}
+
+\newbibmacro*{cite:origyerar}{%
+\iffieldundef{origyear}
+{}
+{\addthinspace\mkbibbrackets{%
+\iftoggle{cbx:superscriptcite}
+{\textsuperscript{1}}{}%
+\iffieldequalstr{origdateunspecified}{yearincentury}
+ {\number\numexpr\thefield{origyear}/100+1\relax \adddot\addnbthinspace{Jhdt\adddot}}
+ {\printorigdate}}%
+}}
\newbibmacro*{xindy:name}[5]{%
\begingroup
@@ -404,9 +459,9 @@ and test {\iftoggle{citecompletefilm}}}
\printfield{postnote}\bibcloseparen}}
\DeclareCiteCommand{\fullcite}
- {{}%
- \usebibmacro{prenote}}%
- {\usedriver%
+ {{}%
+ \usebibmacro{prenote}}%
+ {\usedriver%
{}
{\thefield{entrytype}}}
{\multicitedelim\unspace}% aus unklaren Gruenden hat es hier ein Space zu viel
@@ -444,10 +499,10 @@ and test {\iftoggle{citecompletefilm}}}
\DeclareCiteCommand{\inparencite}[]
{}
{\usebibmacro{citeindex}%
- \printnames{labelname}
+ \printtext[bibhyperref]{\printnames{labelname}}
\bibopenparen%
\usebibmacro{prenote}%
- \usebibmacro{citeyear}}%
+ \mancite\usebibmacro{citeyear}}%
{\multicitedelim}%
{\usebibmacro{cite:postnote}
\unspace\bibcloseparen}
@@ -512,14 +567,14 @@ and test {\iftoggle{citecompletefilm}}}
\DeclareCiteCommand{\textcite}
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
- \iffirstcitekey
- {\setcounter{textcitetotal}{1}}
- {\stepcounter{textcitetotal}%
- \textcitedelim}%
- \usebibmacro{textcite}}
+ \iffirstcitekey
+ {\setcounter{textcitetotal}{1}}
+ {\stepcounter{textcitetotal}%
+ \textcitedelim}%
+ \usebibmacro{textcite}}
{\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}
{\usebibmacro{textcite:postnote}}
@@ -527,7 +582,7 @@ and test {\iftoggle{citecompletefilm}}}
\DeclareCiteCommand{\citeepisode}
{\usebibmacro{prenote}}
{\indexfield{indextitle}%
- \usebibmacro{cite:episode}}
+ \usebibmacro{cbx:citeepisode}}
{\multicitedelim}
{\usebibmacro{cite:postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
index e6c3797e100..ea373046c61 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
@@ -15,10 +15,9 @@
%%
-\ProvidesFile{fiwi.dbx}[2016/05/17 1.5 film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2016/09/09 1.6 film studies bibliography style data model]
\RequireBiber[3]
-
\DeclareDatamodelFields[type=field, datatype=literal]{parttitle}
\DeclareDatamodelFields[type=field, datatype=literal]{duration}
\DeclareDatamodelFields[type=field, datatype=literal]{durationtype}
@@ -37,4 +36,4 @@
scriptwriter,
actor}
-
+\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,trueprefix,truefamily,truesuffix,truegiven}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index 489cc528551..af17293838c 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 v1.5 2016/04/08 Simon Spiegel
+% $Id: fiwi2.bbx, v v1.6 2016/09/09 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi2.bbx}[v 1.5 2016/04/08 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.6 2016/09/09 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 612273517de..34d1596c8c0 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 v1.5 2016/05/17 Simon Spiegel
+% $Id: fiwi2.cbx,v v1.6 2016/09/09 Simon Spiegel
\ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.5 2016/05/17 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx,v 1.6 2016/09/09 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 ee397383f20..feba2692ea2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
@@ -14,16 +14,25 @@
%%
-\ProvidesFile{fiwi.dbx}[2016/05/17 1.5 film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2016/09/09 1.6 film studies bibliography style data model]
\RequireBiber[3]
-
\DeclareDatamodelFields[type=field, datatype=literal]{parttitle}
+\DeclareDatamodelFields[type=field, datatype=literal]{duration}
+\DeclareDatamodelFields[type=field, datatype=literal]{durationtype}
+\DeclareDatamodelFields[type=field, datatype=literal]{alternatetitle}
+\DeclareDatamodelFields[type=field, datatype=literal]{alternatetitlescript}
\DeclareDatamodelFields[type=list, datatype=name]{director}
\DeclareDatamodelFields[type=list, datatype=name]{scriptwriter}
\DeclareDatamodelFields[type=list, datatype=name]{actor}
-\DeclareDatamodelEntryfields[movie,misc,video]{director}
-\DeclareDatamodelEntryfields[movie,misc,video]{scriptwriter}
-\DeclareDatamodelEntryfields[movie,misc,video]{actor}
+\DeclareDatamodelEntryfields[movie,misc,video]{
+ duration,
+ durationtype,
+ alternatetitle,
+ alternatetitlescript,
+ director,
+ scriptwriter,
+ actor}
+\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,trueprefix,truefamily,truesuffix,truegiven}