biblatex-fiwi (10jan14)

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

7 files changed, 442 insertions, 197 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 f71f4ea77b7..37a32d12111 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
@@ -1,31 +1,164 @@
-% $Id: fiwi-yearbeginning.bbx, v 1.2d 2013/05/13 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v 1.2e 2014/01/10 Simon Spiegel
 % Stil mit Jahrestahl nach Autor
 
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2d 2013/05/13 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2e 2014/01/10 film studies bibliography style Author (Year)]
 
 \RequireBibliographyStyle{fiwi}
 
-\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{yearparens}{%
+\iffieldundef{year}
+{\mkbibbrackets{#1}\ifentrytype{collection}{}{\addcolon\addspace}}
+{\mkbibparens{#1}\ifentrytype{collection}{}{\addcolon\addspace}}}
 \DeclareFieldFormat{pubstate}%
 {\ifbibstring{#1}{\mkbibbrackets{\midsentence\bibstring{#1}}}{#1}}
 
 
-%\DeclareFieldFormat{pages}{#1}
-
 \renewcommand{\ppspace}{}
 
-\renewbibmacro*{labelyear+extrayear}{%
-  \iffieldundef{year}
-    {\bibstring[\mkbibbrackets]{undated}\addcolon\addspace}
-    {\printtext[yearparens]{%
-       \iffieldundef{endyear}
-       {\iftoggle{isreview}{\printfield{year}}%
-       {\printfield{labelyear}}}
-       {\printfield{year}\iffieldsequal{year}{endyear}{}{\printfield{endyear}}}%
-       \printfield{extrayear}%
-       \ifboolexpr{ ( (not test {\iffieldundef{origyear}} 
+\DeclareBibliographyOption{mergedate}[true]{%
+  \ifcsdef{bbx@opt@mergedate@#1}
+    {\csuse{bbx@opt@mergedate@#1}}
+    {\PackageError{biblatex}
+       {Invalid option 'mergedate=#1'}
+       {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
+        'true' (=compact), and 'false'.}}}
+
+\providebibmacro*{date+extrayear}{}
+
+
+\def\bbx@opt@mergedate@true{\bbx@opt@mergedate@basic}
+
+\def\bbx@opt@mergedate@maximum{%
+  \renewbibmacro*{date+extrayear}{%
+      \printtext[yearparens]{%
+         \iftoggle{isreview}{\printfield{year}}%
+         {\printfield{issue}%
+	 {\setunit*{\addspace}%
+	 \printdateextralabel%
+	 \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}
+       {\printfield{year}\printfield{extrayear}}}%
+       \usebibmacro{date:origyear}}%      
+  \renewbibmacro*{date}{}%
+  \renewbibmacro*{issue+date}{%
+    \iffieldundef{pages}
+  {}
+  {\ifterm{}{\setunit{\addcomma\addspace}}}
+\iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addcolon\addthinspace}\printtext{%
+  \iffieldundef{issue}%
+  {\iffieldundef{month}%
+  {}%
+  {\iffieldundef{day}%
+  {\ifpunctmark{*}%
+  {\addspace}{}%
+  \setunit{\addspace}}%
+  {\printdate\ifpunctmark{*}{\addspace}{}}}}%
+  {\printfield{issue}}}%
+}}}%
+
+\def\bbx@opt@mergedate@basic{%
+  \renewbibmacro*{date+extrayear}{%
+  \printtext[yearparens]{%
+	 \iftoggle{isreview}{\printfield{year}}%
+	 {\printfield{labelyear}%
+	 \printfield{extrayear}%
+	 \usebibmacro{date:origyear}}}}%
+  \renewbibmacro*{date}{%
+    \iffieldundef{month}
+      {}
+      {\printdate}}%
+  \renewbibmacro*{issue+date}{%
+    \iffieldundef{pages}
+  {}
+  {\ifterm{}{\setunit{\addcomma\addspace}}}
+  \iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{%
+  \iffieldundef{issue}%
+  {\iffieldundef{month}%
+  {}%
+  {\iffieldundef{day}%
+  {\ifpunctmark{*}%
+  {\addspace}{}\printfield{month}%
+  \iffieldundef{endmonth}%
+  {}%
+  {\printtext[endyear]{\mkbibmonth{\thefield{endmonth}}}}%
+  \setunit{\addspace}}%
+  {\ifpunctmark{*}{\addspace}{}\printdate}}}%
+  {\printfield{issue}}}}%
+}
+
+\def\bbx@opt@mergedate@minimum{%
+  \renewbibmacro*{date+extrayear}{%
+  \printtext[yearparens]{%
+	 \iftoggle{isreview}{\printfield{year}}%
+	 {\printfield{labelyear}%
+	 \printfield{extrayear}%
+	 \usebibmacro{date:origyear}}}}}%
+  \renewbibmacro*{date}{%
+    \ifboolexpr{
+      test {\iffieldundef{month}}
+      and
+      test {\iffieldundef{extrayear}}
+    }
+      {}
+      {\printdate}}%
+  \renewbibmacro*{issue+date}{%
+    \iffieldundef{pages}
+  {}
+  {\ifterm{}{\setunit{\addcomma\addspace}}}
+  \iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{%
+  \iffieldundef{issue}%
+  {\iffieldundef{month}%
+  {}%
+  {\iffieldundef{day}%
+  {\ifpunctmark{*}%
+  {\addspace}{}%
+  \setunit{\addspace}}%
+  {\ifpunctmark{*}{\addspace}{}}}}%
+  {\printfield{issue}}%
+      \addspace\printdate}%
+    \newunit}%
+%
+
+\def\bbx@opt@mergedate@false{%
+  \renewbibmacro*{date+extrayear}{%
+  \printtext[yearparens]{%
+	 \iftoggle{isreview}{\printfield{year}}%
+	 {\printfield{labelyear}%
+	 \printfield{extrayear}%
+	 \usebibmacro{date:origyear}}}}%
+  \renewbibmacro*{date}{\printdate}%
+  \renewbibmacro*{issue+date}{%
+    \iffieldundef{pages}
+  {}
+  {\ifterm{}{\setunit{\addcomma\addspace}}}
+  \iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{%
+  \iffieldundef{issue}%
+  {\iffieldundef{month}%
+  {}%
+  {\iffieldundef{day}%
+  {\ifpunctmark{*}%
+  {\addspace}{}%
+  \setunit{\addspace}}%
+  {\ifpunctmark{*}{\addspace}{}}}}%
+  {\printfield{issue}\addspace}%
+  \printdate}%
+  \newunit}%
+}
+
+\ExecuteBibliographyOptions{indexing=cite,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labeldate=true,mergedate=true}
+
+\newbibmacro{date:origyear}{%
+\ifboolexpr{ ( (not test {\iffieldundef{origyear}} 
        or test {\iffieldequalstr{relatedtype}{origpubin}})
        and test {\iftoggle{origyearwithyear}} 
        and  test {\iffieldundef{origtitle}} ) }%
@@ -42,9 +175,8 @@
        \printfield[origyear]{year}%
        }}
        {\printfield{origyear}}}}%
-       {}%
-       }}}
-     
+       {}}
+
 \renewbibmacro*{incollectioneditor}{%
   \ifnameundef{editor}
     {}
@@ -71,20 +203,7 @@
   {\addspace}%
   {\addcolon}}
 
-
-\renewbibmacro*{issue+date}{%
-  \iffieldundef{pages}
-  {}
-  {\ifterm{}{\setunit{\addcomma\addspace}}}
-  \iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{%
-  \iffieldundef{issue}%
-  {\iffieldundef{month}%
-  {}%
-  {\iffieldundef{day}%
-  {\ifpunctmark{*}{\addspace}{}\printfield{month}\iffieldundef{endmonth}{}{\printtext[endyear]{\mkbibmonth{\thefield{endmonth}}}}%
-  \setunit{\addspace}}%
-  {\ifpunctmark{*}{\addspace}{}\printdate}}}%
-  {\printfield{issue}}}}%        
+       
   
   \renewbibmacro*{journal+issuetitle}{%
   \ifentrytype{periodical}
@@ -96,15 +215,23 @@
     {\newunit
      \printfield{series}%
      \setunit{\addspace}}%
-\iffieldundef{volume}{}{\newunit\printfield{volume}%
+\iffieldundef{volume}{}{%
+\iftoggle{bbx:volumeinparens}
+{\addspace\mkbibparens{\printfield{volume}\unspace}}
+{\newunit\printfield{volume}}%
 \iffieldundef{number}%
-	{\iffieldundef{pages}{\addperiod}{\addcomma}}
-	{\addcomma}}%
+	{\ifboolexpr{%
+( test {\iffieldundef{number}} and not test {\iffieldundef{issuetitle}})
+}
+	{\addcolon}%
+	{\iffieldundef{pages}{\addperiod}{\addcomma}}}
+	{\iftoggle{bbx:volumeinparens}{}{\addcomma}}}%
 \iffieldundef{number}
 	{}{\printtext{\addspace\printfield{number}}\addspace}%
-\ifentrytype{periodical}{\usebibmacro{labelyear+extrayear}}{}
+\ifentrytype{periodical}{\usebibmacro{date+extrayear}}{}
 \printfield{eid}%%
-\usebibmacro{issue+date}%
+\ifentrytype{periodical}{}
+{\usebibmacro{issue+date}}%
 \iffieldundef{issuetitle}{}{\addcolon\addspace\printtext{\usebibmacro{issue}}}
 \ifnameundef{editor}{}{\addperiod\addspace\usebibmacro{byeditor}\setunit{\addcomma\space}}%%
 }
@@ -118,16 +245,17 @@
   \iflistundef{publisher}
     {\iflistundef{location}
        {}
-       {\printlist{location}%
+       {\printlist{location}\addspace\usebibmacro{date}%
         \setunit{\addspace}}}
     {\iflistundef{location}
        {}
        {\printlist{location}}%
         \iftoggle{printpublisher}
      {\setunit{\isdot\addcolon\addspace}%
-     \printlist{publisher}%
+     \printlist{publisher}\addspace%
+     \usebibmacro{date}%
      \setunit{\addcomma\space}}%
-          {}
+     {\addspace\usebibmacro{date}}
      \iftoggle{dontprintorig}{\printfield{year}}{}}}
 
 \renewbibmacro*{addendum+pubstate}{%
@@ -151,34 +279,26 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
   \newblock
   \iftoggle{bbx:url}
     {\usebibmacro{url+urldate}}
-    {}}  
-     
-     
-     
-
-%\newbibmacro*{publ+loc+origyear}{%
-%\iffieldequalstr{relatedtype}{origpubin}
-%{\usebibmacro{related:origpubin}{\thefield{related}}}
-%{\usebibmacro{publ+loc+origyear+inentry}}}
+    {}} 
 
-%\newbibmacro*{publ+loc+origyear+inentry}{%
 \newbibmacro*{publ+loc+origyear}{%
 \iftoggle{printaddress}{}{\clearlist{location}}
 \printlist{location}%
-        \iftoggle{printpublisher}%
-        {\iflistundef{publisher}%
-        {\setunit*{\space}}%
+\iftoggle{printpublisher}%
+    {\iflistundef{publisher}%
+        {}%
         {\setunit{\isdot\addcolon\space}\printlist{publisher}}}%
         {\setunit*{\space}}%        
-\iftoggle{dontprintorig}
-{\iftoggle{printpublisher}%
-	{\addspace}{}%
-	\ifboolexpr{(
-	test {\iftoggle{isreview}} 
-	or test {\iftoggle{dontprintorig}} )}
-	{\printfield{year}}
-	{\printfield{labelyear}}}
-	{}\usebibmacro{origyear}%
+	\iftoggle{dontprintorig}
+		{\iftoggle{printpublisher}%
+			{\addspace}{}%
+			\ifboolexpr{(
+			test {\iftoggle{isreview}} 
+			or test {\iftoggle{dontprintorig}} )}
+				{\printfield{year}}
+				{\printfield{labelyear}}}
+			{\usebibmacro{date}}%
+		\usebibmacro{origyear}%
 }%     
 
 
@@ -218,15 +338,6 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
     {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
      \setunit*{\addspace}}}
-     
-%\renewbibmacro*{translatedversion}[1]{%
-%  \toggletrue{intransdecision}%
-%  \edef\@tempa{\noexpand\docsvlist{#1}}%
-%  \def\do##1{\toggletrue{dontprintextrayear}\printtext[germfassung]{%
-%  \fullcite{##1}}}%
-%  \@tempa\toggletrue{dontprintorig}%
-%  \togglefalse{dontprintextrayear}\togglefalse{intransdecision}}
-  
 \renewbibmacro*{labeltitle}{%
   \iffieldundef{label}
     {\iffieldundef{shorttitle}
@@ -239,7 +350,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/translator}%
-  \usebibmacro{labelyear+extrayear}%
+  \usebibmacro{date+extrayear}%
   \newblock\toggletrue{isreview}%
   \usebibmacro{review}{\thefield{related}}%
   \togglefalse{isreview}\newunit\newblock
@@ -247,10 +358,55 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
   \newunit\newblock
   \usebibmacro{in:}%
   %\newblock%
-  \usebibmacro{journal+issuetitle}%
+  \ifboolexpr {
+  not test {\iflistundef{location}}
+  and not test {\ifnameundef{editor}}
+  }
+  {\iftoggle{partofcited}
+  {\iffieldundef{xref}
+  {\mancite\textcite{\thefield{crossref}}}
+  {\mancite\textcite{\thefield{xref}}}
+  \usebibmacro{chap+pag}}
+  {\newblock%
+  \ifnameundef{bookauthor}%
+  {\ifnameundef{editor}
+  {}
+  {\usebibmacro{incollectioneditor}}}
+  {\usebibmacro{bybookauthor}}
+  %\newunit
+  \newblock%
+  \usebibmacro{mtitle+vol+btitle+bstitle}%
+  \ifnamesequal{author}{editor}
+  {\ifnameundef{bookauthor}
+  {}
+  {\usebibmacro{byeditor}}}
+  {}
+  \ifnamesequal{author}{bookauthor}
+  {\ifnameundef{editor}
+  {}
+  {\usebibmacro{byeditor}\newunit}%
+  {}
+  }%
+  \newunit\newblock
+  \iffieldundef{maintitle}
+    {\printfield{volume}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+    \printfield{edition}%
+  \printfield{note}%
+  \newunit
+  \usebibmacro{org+publ+loc+year}
+  \newblock%
+  \usebibmacro{chap+pag}%
+  \newblock}}
+  {\usebibmacro{journal+issuetitle}%
   \iffieldundef{pages}
   	{\setunit{\addperiod}}
-  	{\addcomma\addspace\printfield{pages}}%
+  	{\addcomma\addspace\printfield{pages}}}%
   \newunit\newblock%
   \bibsentence\printfield{note}%
   \newunit\newblock
@@ -271,7 +427,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/translator}%
-  \usebibmacro{labelyear+extrayear}%
+  \usebibmacro{date+extrayear}%
   \newblock
   \usebibmacro{title}%
   \newunit\newblock
@@ -309,7 +465,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
   \usebibmacro{test:partofcited}%
   \iftoggle{dontprintorig}{}%
   {\usebibmacro{author/translator}%
-  \usebibmacro{labelyear+extrayear}}%
+  \usebibmacro{date+extrayear}}%
   %\newunit\newblock
   \usebibmacro{title}%
   \newunit\newblock
@@ -381,7 +537,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
   {}
   {\usebibmacro{editor}\addspace}}%
   {\usebibmacro{author/translator+others}}%
-  \usebibmacro{labelyear+extrayear}}%
+  \usebibmacro{date+extrayear}}%
   \newblock
   \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \newunit\newblock
@@ -459,7 +615,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/editor/translator}%
-  \usebibmacro{labelyear+extrayear}%
+  \usebibmacro{date+extrayear}%
   \newunit\newblock
   \usebibmacro{title}%
     \newunit\newblock
@@ -484,7 +640,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/translator}%
-  \usebibmacro{labelyear+extrayear}%
+  \usebibmacro{date+extrayear}%
   \newunit\newblock
   \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \newunit\newblock
@@ -510,7 +666,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/translator}%
-  \usebibmacro{labelyear+extrayear}%  
+  \usebibmacro{date+extrayear}%  
   \newunit\newblock
   \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \newunit\newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index 5930e1ff662..b27b970db44 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
@@ -1,6 +1,6 @@
-% $Id: fiwi.bbx, v1.2d 2013/05/13 Simon Spiegel
+% $Id: fiwi.bbx, v1.2e 2014/01/10 Simon Spiegel
 
-\ProvidesFile{fiwi.bbx}[v1.2d 2013/05/13 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.2e 2014/01/10 film studies bibliography style]
 
 \@ifpackagelater{biblatex}{2013/05/01}
      {}
@@ -62,6 +62,8 @@
 
 \providetoggle{bbx:scriptwriter}
 \togglefalse{bbx:scriptwriter}
+\providetoggle{bbx:volumeinparens}
+\togglefalse{bbx:volumeinparens}
 \providetoggle{filmruntime}
 \providetoggle{citeprefix}
 \toggletrue{citeprefix}
@@ -201,6 +203,7 @@
 	{}
   }%
 
+\DeclareBibliographyOption{parensvolume}[true]{\settoggle{bbx:volumeinparens}{#1}}
 \DeclareBibliographyOption{script}[true]{\settoggle{bbx:scriptwriter}{#1}}
 \DeclareBibliographyOption{ignorearticle}[true]{\settoggle{ignorearticle}{#1}}
 \DeclareBibliographyOption{partofcited}[true]{\settoggle{partofcitedflag}{#1}}
@@ -247,7 +250,7 @@
 	{}
   }%
                                 
-\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{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=true,labeldate=true,isbn=false,babel=hyphen,}
 \ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labeldate=false,labeltitle=true}
 
 \InitializeBibliographyStyle{%
@@ -350,7 +353,10 @@
   {\mbox{\addspace}} 
   {}}
 \DeclareFieldFormat{ser+num}{\mkbibparens{#1}}
-\DeclareFieldFormat[article,review]{volume}{\bibstring{jourvol}\addnbthinspace{#1}}
+\DeclareFieldFormat[article,review]{volume}{%
+\iftoggle{bbx:volumeinparens}{\unspace\bibstring{jourvol}\addnbthinspace{#1}}
+{\bibstring{jourvol}\addnbthinspace{#1}}
+}
 \DeclareFieldFormat[article,review,periodical]{number}{\bibstring{number}\addnbthinspace{#1}}
 \DeclareFieldFormat{origyearbook}{\iftoggle{origyearsuperscript}
 {\addspace\mkbibparens{#1}}
@@ -620,7 +626,7 @@ fromjapanese = {aus dem Japanischen},
 frompolish = {aus dem Polnischen},
 bycompiler  = {zusammengestellt von},
 bypublisher = {bei},
-ibidem = {ebd\adddot\addspace},
+ibidem = {ebd\adddot},
 url		= {},
 urlseen	= {Zugriff am},
 in          = {In\addcolon},
@@ -639,6 +645,7 @@ reviewof = {Rezension von},
 prepublished = {Online-Vorver\"offentlichung},
 page             = {S\adddot\addnbspace},
 pages            = {S\adddot\addnbspace},
+nodate           = {undatiert},
 january          = {Januar},
   february         = {Februar},
   march            = {M\"arz},
@@ -661,7 +668,7 @@ january          = {Januar},
 \renewcommand{\bibsetup}{\raggedright}
 \newcommand*{\mkibid}[1]{#1}
 
-\DeclareRobustCommand{\film}{\textsc}
+\newrobustcmd{\film}{\textsc}
 
 \renewbibmacro*{byeditor+othersstrg}{%
 \ifboolexpr{%
@@ -785,7 +792,7 @@ or ( test {\iftoggle{ignoreintroductioncit}} and test {\ifcitation} )
   {\item}
 
 \renewbibmacro*{addendum+pubstate}{%
-\addspace%
+\unspace%
 \ifboolexpr{%
 ( test {\iftoggle{ignoreaddendum}} and test {\ifbibliography})
 or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
@@ -875,17 +882,15 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
     {\printfield{label}}}
     
 \renewbibmacro*{date}{%
-  \iffieldundef{year}%
-    {\bibstring[\mkbibbrackets]{undated}\addcolon\addspace}%
-    {\iffieldundef{month}
+	\iffieldundef{month}
        {\printfield{labelyear}}
        {\iffieldundef{day}
 	  {\printfield{month}%
            \setunit{\addspace}%
 	   \printfield{labelyear}}
-	  {\printdate}}}}
+	  {\printdate}}}
 	       
-\newbibmacro*{labelyear+extrayear}{%
+\newbibmacro*{date+extrayear}{%
 \ifboolexpr{test {\iftoggle{usera}}
 or test {\ifentrytype{set}}}
 {\usebibmacro{labelyear}}
@@ -893,7 +898,8 @@ or test {\ifentrytype{set}}}
     {\bibstring[\mkbibbrackets]{undated}\addcolon\addspace}
     {\printtext{%
        \iffieldundef{endyear}%
-       {\printfield{year}%
+       {\iftoggle{dontprintextrayear}%
+       {\printfield{year}}{\printdateextralabel}%%
        \ifboolexpr{( 
        test {\iftoggle{origyearwithyear}} 
        ( and not test {\iffieldundef{origyear}}  
@@ -903,21 +909,19 @@ or test {\ifentrytype{set}}}
        {\addthinspace\mkbibbrackets{%
        \iffieldequalstr{relatedtype}{origpubin}
        {\entrydata*{\thefield{related}}{%
-       \printfield[origyear]{year}
+       \printfield[origyear]{year}%
        }}
        {\printfield{origyear}}
        }}
        {\addslash%
        \iffieldequalstr{relatedtype}{origpubin}
-       {\entrydata*{\thefield{related}}{%
-       \printfield[origyear]{year}
-       }}
-       {\printfield{origyear}}
-       }}{}}%
-       {\printfield{year}\iffieldsequal{year}{endyear}%
+       		{\entrydata*{\thefield{related}}{%
+       			\printfield[origyear]{year}}}
+       		{\printfield{origyear}}}}
+       		{}}%
+       {\printfield{year}%
+       \iffieldsequal{year}{endyear}%
        {}{\printfield{endyear}}}%
-       \iftoggle{dontprintextrayear}%
-       {}{\printfield{extrayear}}%
        }}}}
        
 \newbibmacro*{labelyear}{%
@@ -1114,7 +1118,7 @@ or test {\ifentrytype{set}}}
   \printdate}}
 
 \newbibmacro*{related:translatedas}[1]
-{%
+{\toggletrue{dontprintextrayear}%
 \iftoggle{dontprintorig}
 {}
 {\ifboolexpr{%
@@ -1287,29 +1291,31 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
      \setunit{\addspace}}%
   \iffieldundef{volume}
 	{}
-	{\addcomma\addspace\printfield{volume}{\addcomma}}%
+	{\iftoggle{bbx:volumeinparens}
+	{\mkbibparens{\printfield{volume}\unspace}}	
+	{\addcomma\addspace\printfield{volume}%
+	\ifboolexpr{%
+( test {\iffieldundef{number}} and not test {\iffieldundef{issuetile}})
+}
+	{\addcolon}%
+	{\addcomma}}}%
   \iffieldundef{number}
 	{}
 	{\printtext{\addspace\printfield{number}}\addspace}%
   \printfield{eid}%
   \usebibmacro{title+issuetitle}
 }
+
+
   
 \renewbibmacro*{issue+date}{%
   \ifterm{}{\setunit{\addcomma\addspace}}%
   \iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{%
     \iffieldundef{issue}
-      {\iffieldundef{month}
-         {\usebibmacro{labelyear+extrayear}}
-         {\iffieldundef{day}
-            {\printfield{month}\iffieldundef{endmonth}
-            {}{\printtext[endyear]{\mkbibmonth{\thefield{endmonth}}}}%
-             \setunit{\addspace}%
-             \usebibmacro{labelyear+extrayear}}
-            {\printdate}}}
+      {\usebibmacro{date+extrayear}}
       {\printfield{issue}%
        \setunit{\addcomma\addspace}%
-       \usebibmacro{labelyear+extrayear}}}}
+       \usebibmacro{date+extrayear}}}}
 
 \newbibmacro*{publ+loc+year}{%
 \iftoggle{printaddress}{}{\clearlist{location}}
@@ -1322,7 +1328,7 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
 		{\setunit{\isdot\addcolon\addspace}}
 		\printlist{publisher}\setunit{\addcomma\space}}}%
 		{\setunit*{\space}}%
-\usebibmacro{labelyear+extrayear}%
+\usebibmacro{date+extrayear}%
 \usebibmacro{origyear}%
 }%
 
@@ -1365,7 +1371,7 @@ and (test {\iffieldundef{origyear}}%
 	{\setunit{\isdot\addcolon\space}%
 	\printlist{publisher}\setunit{\addcomma\space}}%
           {\addspace}}%
-  \usebibmacro{labelyear+extrayear}}
+  \usebibmacro{date+extrayear}}
   
 \newbibmacro*{inst+loc+year}{%
 \iftoggle{printaddress}{}{\clearlist{location}}
@@ -1380,7 +1386,7 @@ and (test {\iffieldundef{origyear}}%
         \setunit{\isdot\addcolon\space}}%
      \printlist{institution}%
      \setunit{\addspace}}%
-  \usebibmacro{labelyear+extrayear}}
+  \usebibmacro{date+extrayear}}
   
 \newbibmacro*{chap+pag}{%
   \iffieldundef{chapter}
@@ -1440,8 +1446,53 @@ and (test {\iffieldundef{origyear}}%
   \newunit\newblock
   \usebibmacro{in:}%
   %\newblock%
-  \usebibmacro{journal+issuetitle}%
-  \printfield{pages}
+    \ifboolexpr {
+  not test {\iflistundef{location}}
+  and not test {\ifnameundef{editor}}
+  }
+  {\iftoggle{partofcited}%
+  {\iffieldundef{xref}%
+  {\mancite\textcite{\thefield{crossref}}}%
+  {\mancite\textcite{\thefield{xref}}}
+  \usebibmacro{chap+pag}}%
+  {\newunit\newblock%
+  \ifnameundef{bookauthor}%
+  {\ifnameundef{editor}
+  {}
+  {\usebibmacro{incollectioneditor}}}
+  {\usebibmacro{bybookauthor}}
+  %\newunit
+  \newblock%
+  \usebibmacro{mtitle+vol+btitle+bstitle}%
+  \ifnamesequal{author}{editor}
+  {\ifnameundef{bookauthor}
+  {}
+  {\usebibmacro{byeditor}}}
+  {}
+  \ifnamesequal{author}{bookauthor}
+  {\ifnameundef{editor}
+  {}
+  {\usebibmacro{byeditor}\newunit}%
+  {}
+  }}%
+  \newunit\newblock
+  \iffieldundef{maintitle}
+    {\printfield{volume}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock%
+  \printfield{edition}%
+  \printfield{note}%
+  \newunit%
+  \usebibmacro{org+publ+loc+year}
+  \newblock%
+  \usebibmacro{chap+pag}%
+  }
+  {\usebibmacro{journal+issuetitle}%
+  \printfield{pages}}
   \newblock
   \bibsentence\printfield{note}%
   %\setunit{.}\newblock
@@ -1551,7 +1602,7 @@ and (test {\iffieldundef{origyear}}%
   %\usebibmacro{doi+eprint+url}%
   %\newunit\newblock
   \addspace\usebibmacro{related}%
-  \newunit\newblock
+  \newblock
   \iftoggle{bbx:isbn}
     {\printfield{isbn}}
     {}%
@@ -1594,7 +1645,7 @@ and (test {\iffieldundef{origyear}}%
 	{}
 	{\addperiod\addspace\usebibmacro{doi+eprint+url}}%
   \addspace\usebibmacro{related}%
-  \newunit\newblock
+  \newblock
   \iftoggle{bbx:isbn}
     {\printfield{isbn}}
     {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index 54e46ba2d5b..d8baafaee69 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.2d 2013/05/13 Simon Spiegel
+% $Id: fiwi.cbx,v 1.2e 2014/01/10 Simon Spiegel
 
 \ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.2d 2013/05/13 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx,v 1.2e 2014/01/09 spiegel $]
 
 
-\ExecuteBibliographyOptions{labeldate=true,autocite=inline,firstinits=false,uniquename=full,uniquelist=true}
+\ExecuteBibliographyOptions{labeldate=true,autocite=inline,firstinits=false,uniquename=full,uniquelist=true,ibidtracker=constrict}
 
 
 \RequireBibliographyStyle{fiwi}  
@@ -12,6 +12,8 @@
   
 
 \newbool{cbx@bool}
+\newbool{cbx:parens}
+\newbool{cbx:loccit}
 \providetoggle{citefullfilm} 
 \newcommand*{\fullcitefilm}{\settoggle{citefullfilm}{true}}
 \DeclareBibliographyOption{fullcitefilm}[false]{\settoggle{citefullfilm}{#1}}
@@ -39,6 +41,11 @@
 \providetoggle{xindy}
 \DeclareBibliographyOption{xindy}[true]{\settoggle{xindy}{#1}}
 
+\DeclareBibliographyOption{ibidpage}[true]{%
+  \ifstrequal{#1}{true}
+    {\ExecuteBibliographyOptions{loccittracker=constrict}}
+    {\ExecuteBibliographyOptions{loccittracker=false}}}
+
 
 \DeclareFieldFormat{citeyear}{\mkbibparens{#1}}
 \DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot}
@@ -61,6 +68,11 @@
   \fi
   \usebibmacro{name:andothers}}
 
+\newbibmacro*{cite:postnote}{%
+  \ifbool{cbx:loccit}
+    {}
+    {\usebibmacro{postnote}}}
+
 \renewbibmacro*{name:last}[4]{%
   \iftoggle{citeprefix}
     {\usebibmacro{name:delim}{#3#1}%
@@ -104,6 +116,12 @@
 \newcommand{\citealts}{\cites}
 \newcommand{\Citealts}{\Cites}
 
+\newbibmacro*{cite:ibid}{%
+  \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}%
+  \ifloccit
+    {\global\booltrue{cbx:loccit}}
+    {}}
+
 \renewbibmacro*{citeindex}{%
   \ifciteindex{%
   \indexnames[indexname]{labelname}}
@@ -144,7 +162,7 @@ and test {\iffieldundef{maintitle}}}
 {\iffieldundef{maintitle}
 {\printtext[bibhyperref]{\printfield[film]{title}}}%
 {\printtext[bibhyperref]{\printfield[tvmaintitle]{maintitle}%
-\printfield[film]{title}}}
+\printfield[film]{title}}}%
 }
 
 \newbibmacro*{cite:serialfull}{%
@@ -209,34 +227,58 @@ and test {\iftoggle{citecompletefilm}}}
    \printnames{director}%
    \addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}
    
+    
 \newbibmacro*{cite}{%
-\iffieldundef{shorthand}
-{\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{year}\AND\iffieldundef{urlyear}}%
-{\usebibmacro{cite:label}}%
-{\printtext[bibhyperref]{\printnames{labelname}}\nameyeardelim%
-\usebibmacro{cite:year+labelyear}}}%
-{\usebibmacro{cite:shorthand}}}%
+  \global\boolfalse{cbx:loccit}%
+  \iffieldundef{shorthand}
+    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\usebibmacro{cite:ibid}}
+       {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+          {\usebibmacro{cite:label}%
+           \setunit{\addspace}}
+          {\printnames{labelname}%
+           \setunit{\nameyeardelim}}%
+        \usebibmacro{cite:labelyear+extrayear}}}
+    {\usebibmacro{cite:shorthand}}}    
+    
     
 \newbibmacro*{textcite}{%
+  \global\boolfalse{cbx:loccit}%
   \ifnameundef{labelname}
     {\iffieldundef{shorthand}
-       {\usebibmacro{cite:label}}
+       {\usebibmacro{cite:label}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \addspace\bibopenparen}%
+        \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
+        \usebibmacro{cite:labelyear+extrayear}}
        {\usebibmacro{cite:shorthand}}}
     {\printnames{labelname}%
-     \global\booltrue{cbx@bool}%
-     \addspace\bibopenparen
+     \setunit{%
+       \global\booltrue{cbx:parens}%
+       \addspace\bibopenparen}%
+     \ifnumequal{\value{citecount}}{1}
+       {\usebibmacro{prenote}}
+       {}%
      \iffieldundef{shorthand}
-       {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{urlyear}}
-          {\usebibmacro{cite:label}}
-          {\usebibmacro{cite:year+labelyear}}}
+       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+          {\usebibmacro{cite:ibid}}
+          {\iffieldundef{labelyear}
+             {\usebibmacro{cite:label}}
+             {\usebibmacro{cite:labelyear+extrayear}}}}
        {\usebibmacro{cite:shorthand}}}}
-
+    
 \newbibmacro*{citeyear}{%
+  \global\boolfalse{cbx:loccit}%
   \iffieldundef{shorthand}
-    {\iffieldundef{year}
-       {\usebibmacro{cite:label}}
-       {\usebibmacro{cite:year+labelyear}}}
-    {\usebibmacro{cite:shorthand}}}
+    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\usebibmacro{cite:ibid}}
+       {\iffieldundef{labelyear}
+          {\usebibmacro{cite:label}}
+          {\usebibmacro{cite:labelyear+extrayear}}}}
+    {\usebibmacro{cite:shorthand}}}    
 
 \newbibmacro*{cite:shorthand}{%
   \printtext[bibhyperref]{\printfield{shorthand}}}
@@ -246,13 +288,13 @@ and test {\iftoggle{citecompletefilm}}}
     {\BibliographyWarning{Missing author/editor+year or label}}
     {\printtext[bibhyperref]{\printnames{labelname}}}}
 
-\newbibmacro*{cite:year+labelyear}{%
+\newbibmacro*{cite:labelyear+extrayear}{%
   \printtext[bibhyperref]{%
     \iffieldundef{year}%
     {\bibstring[\mkbibbrackets]{undated}\printfield{extrayear}}%
     {\printfield{labelyear}}%
     \printfield{extrayear}}}
-
+    
 \newbibmacro*{xindy:name}[5]{%
   \begingroup
   \ifuseprefix
@@ -279,7 +321,16 @@ and test {\iftoggle{citecompletefilm}}}
     \unexpanded{#1}{#3}}%
   \theindexentry
   \endgroup}
-  
+
+\newbibmacro*{textcite:postnote}{%
+  \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
+    {\ifbool{cbx:parens}
+       {\bibcloseparen}
+       {}}
+    {\ifbool{cbx:parens}
+       {\postnotedelim}
+       {\addspace\bibopenparen}%
+     \printfield{postnote}\bibcloseparen}}  
   
 \DeclareCiteCommand{\fullcite}
   {{}%
@@ -288,44 +339,36 @@ and test {\iftoggle{citecompletefilm}}}
      {}
      {\thefield{entrytype}}}
   {\multicitedelim\unspace}% aus unklaren Gruenden hat es hier ein Space zu viel
-  {\usebibmacro{postnote}} 
+  {\usebibmacro{cite:postnote}} 
  
 
 \DeclareCiteCommand{\cite}
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \ifthenelse{\ifciteibid\AND
-            \NOT\iffirstonpage}
-      {\bibstring[\mkibid]{ibidem}}{\usebibmacro{cite}}}
+   \usebibmacro{cite}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand*{\cite}
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \ifthenelse{\ifciteibid\AND
-            \NOT\iffirstonpage}
-      {\bibstring[\mkibid]{ibidem}}{\usebibmacro{citeyear}}}
+   \usebibmacro{citeyear}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\parencite}[\mkbibparens]
   {\usebibmacro{prenote}}
-  {\ifthenelse{\ifciteibid\AND
-            \NOT\iffirstonpage}%
-      {\bibstring[\mkibid]{ibidem}\unspace}%
-   {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand*{\parencite}[\mkbibparens]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \iffirstonpage{\usebibmacro{citeyear}}
-   {\bibstring[\mkibid]{ibidem}}}
+   \usebibmacro{citeyear}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\inparencite}[]
  {}
@@ -335,7 +378,7 @@ and test {\iftoggle{citecompletefilm}}}
   \usebibmacro{prenote}%
   \usebibmacro{citeyear}}%
  {\multicitedelim}%
- {\usebibmacro{postnote}
+ {\usebibmacro{cite:postnote}
  \unspace\bibcloseparen}
 
 \DeclareCiteCommand{\citetitle}
@@ -345,26 +388,26 @@ and test {\iftoggle{citecompletefilm}}}
   {\indexfield{indextitle}%
    \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\citeyear}
   {\usebibmacro{prenote}}
   {\usebibmacro{citeyear}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\citeurl}
   {\usebibmacro{prenote}}
   {\printfield[citeurl]{url}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\citealtnoibidem}
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\citetnoibidem}
   {\usebibmacro{prenote}}
@@ -396,31 +439,26 @@ and test {\iftoggle{citecompletefilm}}}
       \printfield{postnote}\bibcloseparen}}
 
 \DeclareCiteCommand{\textcite}
-  {\boolfalse{cbx@bool}%
-   \usebibmacro{prenote}}
+  {\boolfalse{cbx:parens}}
   {\usebibmacro{citeindex}%
-  \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
-  {\bibstring[\mkibid]{ibidem}}%
-   {\usebibmacro{textcite}}}
-  {\ifbool{cbx@bool}
-     {\bibcloseparen\global\boolfalse{cbx@bool}}
-     {}%
-   \multicitedelim}
-  {\iffieldundef{postnote}
-     {\ifbool{cbx@bool}
-        {\bibcloseparen}
-	{}}
-     {\ifbool{cbx@bool}
-        {\postnotedelim}
-	{\addspace\bibopenparen}%
-      \printfield{postnote}\bibcloseparen}}
+   \iffirstcitekey
+     {\setcounter{textcitetotal}{1}}
+     {\stepcounter{textcitetotal}%
+      \textcitedelim}%
+   \usebibmacro{textcite}}
+  {\ifbool{cbx:parens}
+     {\bibcloseparen\global\boolfalse{cbx:parens}}
+     {}}
+  {\usebibmacro{textcite:postnote}}
+
+
       
 \DeclareCiteCommand{\citeepisode}
   {\usebibmacro{prenote}}
   {\indexfield{indextitle}%
   \usebibmacro{cite:episode}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
       
 \DeclareCiteCommand{\citefilm}
   {\usebibmacro{prenote}}
@@ -431,14 +469,14 @@ and test {\iftoggle{citecompletefilm}}}
   {\usebibmacro{cite:tv}}{\ifciteseen{\usebibmacro{cite:film:seen}}
    {\usebibmacro{cite:film}}}}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\citecfilm}
   {\usebibmacro{prenote}}
   {\indexfield{indextitle}%
    \usebibmacro{cite:film:countryear}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\citefullfilm}
   {\usebibmacro{prenote}}
@@ -447,12 +485,12 @@ and test {\iftoggle{citecompletefilm}}}
   {\usebibmacro{cite:serialfull}}
   {\usebibmacro{cite:film}}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\citefilmnoindex}
   {\usebibmacro{prenote}}
   {\usebibmacro{cite:film}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{cite:postnote}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
index 7e790fceaca..f2e5ac49dab 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/05/13 1.3 film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2014/01/10 1.2e film studies bibliography style data model]
 \RequireBiber[3]
 
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index f424574fc80..faf34c1ca91 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.2d 2013/05/13 Simon Spiegel
+% $Id: fiwi2.bbx, v 1.2e 2014/01/10 Simon Spiegel
 % Stil mit Jahrestahl nach Autor
 
-\ProvidesFile{fiwi2.bbx}[v 1.2d 2013/05/13 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.2e 2014/01/10 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 cf7864a7f8c..526a96b5974 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.2d 2013/05/13 Simon Spiegel
+% $Id: fiwi2.cbx,v 1.2e 2014/01/09 Simon Spiegel
 
 \ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.2d 2013/05/13 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx,v 1.2e 2014/01/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 04c836774b9..c0bac6b0095 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
@@ -16,7 +16,7 @@
 %%
 
 
-\ProvidesFile{fiwi.dbx}[2013/05/13 1.3 film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2014/05/10 1.2e film studies bibliography style data model]
 \RequireBiber[3]