biblatex-fiwi 1.2 (19jul12)

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

7 files changed, 425 insertions, 164 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 83b5943b645..597b7a8fb49 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
@@ -1,32 +1,47 @@
-% $Id: fiwi-yearbeginning.bbx, v 1.1e 2012/02/16 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v 1.2 2012/07/20 Simon Spiegel
 % Stil mit Jahrestahl nach Autor
 
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.1e 2012/02/16 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2 2012/07/20 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}
 
-\DeclareFieldFormat{yearparens}{\mkbibparens{#1}\iffieldequalstr{entrytype}{collection}{}{\addcolon\addspace}}
-%\DeclareFieldFormat{pages}{#1}
+\DeclareFieldFormat{yearparens}{\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}
-       {\printfield{labelyear}}
+       {\iftoggle{isreview}{\printfield{year}}%
+       {\printfield{labelyear}}}
        {\printfield{year}\iffieldsequal{year}{endyear}{}{\printfield{endyear}}}%
        \printfield{extrayear}%
-       \ifboolexpr{ ( not test {\iffieldundef{origyear}} 
+       \ifboolexpr{ ( (not test {\iffieldundef{origyear}} 
+       or test {\iffieldequalstr{relatedtype}{origpubin}})
        and test {\iftoggle{origyearwithyear}} 
        and  test {\iffieldundef{origtitle}} ) }%
        {\iftoggle{origyearbrackets}
-       {\addthinspace\mkbibbrackets{\printfield{origyear}}}
-       {\addslash\printfield{origyear}}}%
+       {\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}}}}%
        {}%
        }}}
      
@@ -38,7 +53,7 @@
     {\bibstring{idempp}}%
     {\bibstring{idem\thefield{gender}}}}{%
     \printnames{editor}}\addspace}%
-     \iffieldequalstr{entrytype}{book}{}{\usebibmacro{editorstrg}}}}  
+     \ifentrytype{book}{}{\usebibmacro{editorstrg}}}}  
        
 \renewbibmacro*{editorstrg}{%
   \printtext{\mkbibparens{\unspace
@@ -48,7 +63,7 @@
     \bibstring{editor}%
   \fi}}%
     \ifthenelse{\(
-  \iffieldequalstr{entrytype}{book}%
+  \ifentrytype{book}%
   \and \ifnameundef{author}%
   \and \not \ifnameundef{editor}%
   \)%
@@ -72,7 +87,7 @@
   {\printfield{issue}}}}%        
   
   \renewbibmacro*{journal+issuetitle}{%
-  \iffieldequalstr{entrytype}{periodical}
+  \ifentrytype{periodical}
   {\usebibmacro{periodical}}
   {\usebibmacro{journal}}%
   \setunit*{\addspace}%
@@ -87,7 +102,7 @@
 	{\addcomma}}%
 \iffieldundef{number}
 	{}{\printtext{\addspace\printfield{number}}\addspace}%
-\iffieldequalstr{entrytype}{periodical}{\usebibmacro{labelyear+extrayear}}{}
+\ifentrytype{periodical}{\usebibmacro{labelyear+extrayear}}{}
 \printfield{eid}%%
 \usebibmacro{issue+date}%
 \iffieldundef{issuetitle}{}{\addcolon\addspace\printtext{\usebibmacro{issue}}}
@@ -108,10 +123,39 @@
        {}
        {\printlist{location}}%
         \iftoggle{printpublisher}
-     {\setunit{\isdot\addcolon\addspace}\printlist{publisher}\setunit{\addcomma\space}}%
+     {\setunit{\isdot\addcolon\addspace}%
+     \printlist{publisher}%
+     \setunit{\addcomma\space}}%
           {}
-     \iftoggle{dontprintorig}{\printfield{labelyear}}{}}}
+     \iftoggle{dontprintorig}{\printfield{year}}{}}}
+
+\renewbibmacro*{addendum+pubstate}{%
+	\printfield{pubstate}%
+	\newunit\newblock%
+	\printfield{addendum}}
+  
+\renewbibmacro*{doi+eprint+url}{%
+  \iftoggle{bbx:doi}
+    {\printfield{doi}}
+    {}%
+  \newblock
+  \iftoggle{bbx:eprint}
+    {\usebibmacro{eprint}}
+    {}%
+  \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}{%
 \printlist{location}%
         \iftoggle{printpublisher}%
@@ -119,9 +163,19 @@
         {\setunit*{\space}}%
         {\setunit{\isdot\addcolon\space}\printlist{publisher}}}%
         {\setunit*{\space}}%        
-\iftoggle{dontprintorig}{\iftoggle{printpublisher}{\addspace}{}\printfield{labelyear}}{}\usebibmacro{origyear}%
+\iftoggle{dontprintorig}
+{\iftoggle{printpublisher}%
+	{\addspace}{}%
+	\ifboolexpr{(
+	test {\iftoggle{isreview}} 
+	or test {\iftoggle{dontprintorig}} )}
+	{\printfield{year}}
+	{\printfield{labelyear}}}
+	{}\usebibmacro{origyear}%
 }%     
 
+
+
 \newbibmacro*{inst+loc}{%
   \iflistundef{institution}
     {\iflistundef{location}
@@ -157,13 +211,13 @@
      \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*{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}
@@ -178,8 +232,8 @@
 \usebibmacro{begentry}%
 \usebibmacro{author/translator}%
 \usebibmacro{labelyear+extrayear}%
-\newblock\toggletrue{isreview}
-\usebibmacro{review}{\thefield{usera}}%
+\newblock\toggletrue{isreview}%
+\usebibmacro{review}{\thefield{related}}%
 \togglefalse{isreview}\newunit\newblock
 \usebibmacro{bytranslator}%
 \newunit\newblock
@@ -216,7 +270,9 @@
 	{\setunit{\addperiod}}
 	{\addcomma\addspace\printfield{pages}}%
 \newunit\newblock%
-\bibsentence\printfield{note}%
+\iffieldundef{note}
+{}
+{\bibsentence\printfield{note}}%
 \newunit\newblock%
 \usebibmacro{doi+eprint+url}%
 %\setunit{.}\newblock
@@ -281,9 +337,9 @@
   \printfield{note}%
   \newunit
   \usebibmacro{org+publ+loc+year}
-  \newunit\newblock%
+  \newblock%
   \usebibmacro{chap+pag}%
-  %\setunit{\par}\newblock
+  \newblock%
   \addspace\usebibmacro{decidetranslatedversion}%
   \newblock
   \usebibmacro{doi+eprint+url}%
@@ -321,7 +377,7 @@
   \newunit\newblock%
 \usebibmacro{publ+loc+origyear}%
 \usebibmacro{chap+pag}%
-\newblock\newunit
+\newblock%\newunit
 \usebibmacro{doi+eprint+url}%
 \addspace\usebibmacro{decidetranslatedversion}%
 \newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index 0ba480046f3..926c73f7036 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
@@ -1,18 +1,18 @@
-% $Id: fiwi.bbx, v1.1d 2012/02/16 Simon Spiegel
+% $Id: fiwi.bbx, v1.2 2012/07/20 Simon Spiegel
 
-\ProvidesFile{fiwi.bbx}[v1.1d 2012/02/16 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.2 2012/07/20 film studies bibliography style]
 
-\@ifpackagelater{biblatex}{2011/11/12}
+\@ifpackagelater{biblatex}{2012/07/01}
      {}
      {\PackageError{biblatex}
 	{Outdated 'biblatex' package}
-	{The 'fiwi' style requires biblatex v1.7 or later.\MessageBreak
+	{The 'fiwi' style requires biblatex v2.0 or later.\MessageBreak
 	 You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
 	 This is a fatal error. I'm aborting now.}%
       \endinput}
 
 \RequireBibliographyStyle{standard}
-\RequireBiber[2]
+%\RequireBiber[2]
 
 
 \defcounter{highnamepenalty}{0}
@@ -20,6 +20,7 @@
 
 \renewcommand*{\multinamedelim}{\addslash}%
 \renewcommand*{\finalnamedelim}{\addslash}%
+%\renewcommand*{\finentrypunct}{\iftoggle{dontprintorig}{AA}{BB\addperiod}}
 
 
 % Diverse Variablen
@@ -52,10 +53,14 @@
 \togglefalse{bibpages}
 \providetoggle{isreview}
 \togglefalse{isreview}
+\providetoggle{ignorearticle}
+\toggletrue{ignorearticle}
 
 
+\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}}
@@ -98,8 +103,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}
+\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}
 
 \InitializeBibliographyStyle{%
   \let\bbx@lasthash\undefined}
@@ -123,14 +128,17 @@
 \iftoggle{bibpages}
 {\addspace\mkpageprefix[pagination]{#1}}
 {\addspace #1}}
+
 \DeclareFieldFormat{postnote}{%
 \iftoggle{citepages}
 {\mkpageprefix[pagination]{#1}}
 {#1}}
+
 \DeclareFieldFormat{volcitepages}{%
 \iftoggle{citepages}
 {\mkpageprefix[pagination]{#1}}
 {#1}}
+
 \DeclareFieldFormat{multipostnote}{%
 \iftoggle{citepages}
 {\mkpageprefix[pagination]{#1}}
@@ -166,7 +174,7 @@
 {\addspace\mkbibparens{\textsuperscript{1}#1}}}
 \DeclareFieldFormat{origyearart}{\mkbibparens{#1}}
 \DeclareFieldFormat{origtit}{\mkbibparens{Original\addcolon\addspace #1}}
-\DeclareFieldFormat{germfassung}{\mkbibbrackets{\bibstring{translatedto}\adddot\addcolon\addspace#1}}
+\DeclareFieldFormat{germfassung}{\mkbibbrackets{\midsentence\bibstring{translatedto}\adddot\addcolon\addspace#1}}
 \DeclareFieldFormat{origyear}{\iftoggle{origyearsuperscript}
 {\textsuperscript{1}#1}
 {#1}}
@@ -197,6 +205,7 @@
 {\ifthenelse{\value{listcount}=3}{}{\addslash}}% 
 {}}}
 
+
 \DeclareNameAlias{byeditor}{bytranslator}
 \DeclareNameAlias{withafterword}{bytranslator}
 \DeclareNameAlias{byredactor}{bytranslator}
@@ -296,21 +305,15 @@
 
 \newcommand*{\mkfinalnamedelimfirst}[1]{\addspace\bibstring{and}\addspace}
 
-\newbibmacro*{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}}
+%\newbibmacro*{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}}
 	
-\newbibmacro*{review}[1]{%
-  \edef\@tempa{\noexpand\docsvlist{#1}}%
-  \def\do##1{\toggletrue{dontprintextrayear}\printtext{%
-  \mkbibquote{%
-  \iffieldundef{title}{}%
-  {\usebibmacro{title}}\bibstring{reviewof}\addspace\fullcite{##1}}}}%
-  \@tempa\togglefalse{dontprintextrayear}}
+
 
 \renewbibmacro*{url+urldate}{%
   \printfield{url}%
@@ -329,39 +332,9 @@
     \field{sortkey}
   }
   \sort{
-    \name{sortname}
-    \name{author}
-    \name{editor}
-    \name{translator}
     \field{maintitle}
     \field{sorttitle}
-    \field{title}
-  }
-  \sort{
-    \field{sortyear}
-    \field{year}
-  }
-  \sort{
-    \field{sorttitle}
-    \field{title}
-  }
-  \sort{
-    \field[padside=left,padwidth=4,padchar=0]{volume}
-    \field[padside=left,padwidth=4,padchar=0]{number}
-    \literal{0000}
-  }
-}
-
-\DeclareSortingScheme{filmtitle}{
-  \sort{
-    \field{presort}
-  }
-  \sort[final]{
-    \field{sortkey}
-  }
-  \sort{
-    \field{sorttitle}
-    \field{maintitle}
+      \field{title}
   }
   \sort{
 	  \field{sorttitle}
@@ -377,8 +350,46 @@
   }
 }
 
-\DeclareSortExclusion{misc,movie,video,reference,collection,periodical}{sortname,author,editor,translator}
-\DeclareSortExclusion{book,incollection,collection}{maintitle}
+
+
+% biber sorting
+
+\AtEndPreamble{%
+\iftoggle{ignorearticle}
+{\DeclareNosort{
+\nosort{type_title}{\regexp{\A.*\/}}
+\nosort{type_title}{\regexp{\AThe\s+}}
+\nosort{type_title}{\regexp{\ADie\s+}}
+\nosort{type_title}{\regexp{\ADer\s+}}
+\nosort{type_title}{\regexp{\ADas\s+}}
+\nosort{type_title}{\regexp{\AEin\s+}}
+\nosort{type_title}{\regexp{\AEine\s+}}
+\nosort{type_title}{\regexp{\AA\s+}}
+\nosort{type_title}{\regexp{\AUne\s+}}
+\nosort{type_title}{\regexp{\AUn\s+}}
+\nosort{type_title}{\regexp{\ALe\s+}}
+\nosort{type_title}{\regexp{\ALa\s+}}
+\nosort{type_title}{\regexp{\AGli\s+}}
+\nosort{type_title}{\regexp{\AIl\s+}}
+\nosort{type_title}{\regexp{\AEl\s+}}
+\nosort{type_title}{\regexp{\ALes\s+}}
+\nosort{type_title}{\regexp{\ALos\s+}}
+\nosort{type_title}{\regexp{\AL'\s+}}
+}
+\DeclareSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+       \step[fieldset=abstract, null]
+       \step[fieldset=annote, null]
+       \step[fieldset=annotation, null]
+} }
+}}
+{}
+\DeclareSortExclusion{book,incollection}{maintitle}
+\DeclareSortExclusion{collection}{maintitle,author,editor}
+}
+
+\DeclareSortExclusion{misc,video,movie}{author,editor,translator}
 
 % Data inheritance
 
@@ -406,8 +417,10 @@
 \NewBibliographyString{translatedto}
 \NewBibliographyString{prepublished}
 \NewBibliographyString{reviewof}
-\NewBibliographyString{citepage}
-\NewBibliographyString{citepages}
+\NewBibliographyString{airdate}
+\NewBibliographyString{undated}
+%\NewBibliographyString{citepage}
+%\NewBibliographyString{citepages}
 
 \DefineBibliographyStrings{german}{%
 andothers        = {et al\adddot},
@@ -425,6 +438,8 @@ phdthesis ={Unver\"offentlichte Dissertation},
 minutes = {min},
 tvseason = {Staffel},
 tvepisode = {Folge},
+airdate = {},
+undated = {undatiert},
 translatedto = {dt\adddot},
 reviewof = {Rezension von},
 prepublished = {Online-Vorver\"offentlichung},
@@ -455,7 +470,7 @@ january          = {Januar},
 \DeclareRobustCommand{\film}{\textsc}
 
 \renewbibmacro*{bytranslator+others}{% Bei incollection wird translator nach dem Titel ausgegeben
-\ifthenelse{\ifnameundef{translator} \or \iffieldequalstr{entrytype}{incollection}}
+\ifthenelse{\ifnameundef{translator} \or \ifentrytype{incollection}}
     {}
   {\def\abx@tempa{bytranslator}%
      \ifnamesequal{translator}{commentator}
@@ -523,7 +538,7 @@ january          = {Januar},
 
 \renewbibmacro*{author}{%
   \ifboolexpr{
-    test \ifuseauthor
+    test {\ifuseauthor}
     and
     not test {\ifnameundef{author}}
   }
@@ -602,9 +617,7 @@ january          = {Januar},
     
 \renewbibmacro*{date}{%
   \iffieldundef{year}%
-    {\iffieldundef{urlyear}%
-    {}%
-    {\printfield{urlyear}}}%
+    {\bibstring[\mkbibbrackets]{undated}\addcolon\addspace}%
     {\iffieldundef{month}
        {\printfield{labelyear}}
        {\iffieldundef{day}
@@ -615,20 +628,33 @@ january          = {Januar},
 	       
 \newbibmacro*{labelyear+extrayear}{%
 \ifboolexpr{test {\iftoggle{usera}}
-or test {\iffieldequalstr{entrytype}{set}}}
+or test {\ifentrytype{set}}}
 {\usebibmacro{labelyear}}
 {\iffieldundef{year}
-    {}
+    {\bibstring[\mkbibbrackets]{undated}\addcolon\addspace}
     {\printtext{%
        \iffieldundef{endyear}%
        {\printfield{year}%
        \ifboolexpr{( 
        test {\iftoggle{origyearwithyear}} 
-       and not test {\iffieldundef{origyear}}  
-       and test {\iffieldundef{origtitle}} )}
+       ( and not test {\iffieldundef{origyear}}  
+       or test {\iffieldequalstr{relatedtype}{origpubin}} )
+       and test {\iffieldundef{origtitle}} ) }
        {\iftoggle{origyearbrackets}
-       {\addthinspace\mkbibbrackets{\printfield{origyear}}}
-       {\addslash\printfield{origyear}}}{}}%
+       {\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}%
@@ -673,15 +699,21 @@ or test {\iffieldequalstr{entrytype}{set}}}
        \printfield[noformat]{title}%
        \newunit\printfield[noformat]{subtitle}}}%
   \printfield{titleaddon}
-  \ifboolexpr{ test {\iffieldundef{origyear}} 
-  or (not test {\iffieldundef{origyear}} and test {\iftoggle{origyearwithyear}} 
-       and  test {\iffieldundef{origtitle}} )}
+  \ifboolexpr{ (test {\iffieldundef{origyear}} and not test {\iffieldequalstr{relatedtype}{origpubin}} )
+  or (not test {\iffieldundef{origyear}} 
+  and not test {\iffieldequalstr{relatedtype}{origpubin}} 
+  and test {\iftoggle{origyearwithyear}} 
+  and  test {\iffieldundef{origtitle}} )}
   {}
+  {\iffieldequalstr{relatedtype}{origpubin}
+  {\setunit{\addspace}\printtext[origyearart]{\printfield{year}%
+  \iffieldundef{endyear}%
+  {}{\printfield{endyear}}}}
   {\iffieldundef{origtitle}
   {\setunit{\addspace}\printtext[origyearart]{\printfield{origyear}%
   \iffieldundef{origendyear}%
   {}{\printfield{origendyear}}}}
-  {}
+  {}}
   }}
   
 \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
@@ -737,29 +769,62 @@ or test {\iffieldequalstr{entrytype}{set}}}
  
 
 
+
 \newbibmacro*{decidetranslatedversion}
 {%
 \iftoggle{dontprintorig}
 {}
 {\ifboolexpr{%
 	test {\iftoggle{germfassung}}
-	and
-	not test {\iffieldundef{usera}}}
-	{\toggletrue{dontprintorig}%
-	\usebibmacro{translatedversion}{\thefield{usera}}}%
+and test {\iffieldequalstr{relatedtype}{translatedas}}}
+	{\toggletrue{dontprintorig}\toggletrue{intransdecision}%
+	\usebibmacro{related:translatedas}{\thefield{related}}
+	\togglefalse{intransdecision}}%
 	{\usebibmacro{origyear+location+title}}%
 }}
 
+\newbibmacro*{related:translatedas}[1]{%
+  \entrydata{#1}{%
+    \printtext[germfassung]{%
+    \usedriver{}{\thefield{entrytype}}}%
+    }}
+
+\newbibmacro*{review}[1]{%
+\toggletrue{dontprintextrayear}\printtext{%
+  \mkbibquote{%
+  \iffieldundef{title}{}%
+  {\usebibmacro{title}}\bibstring{reviewof}\addspace%
+  \entrydata{#1}{%
+  \usedriver{}{\thefield{entrytype}}}%
+  }}%
+  \togglefalse{dontprintextrayear}}
+
 \newbibmacro*{origyear+location+title}{%
 \iffieldundef{origtitle}%
-{}{\setunit{}\newblock\printtext[origtit]{\printfield{origtitle}%
+{\iffieldequalstr{relatedtype}{translationof}
+{\entrydata*{\thefield{related}}{%
+\setunit{}\newblock\printtext[origtit]{\printfield[noformat]{title}%
+\iflistundef{location}{}%
+{\adddot\addspace\printlist{location}%
+\iftoggle{printpublisher}
+{\iflistundef{publisher}
+{}
+{\setunit{\isdot\addcolon\addspace}
+\printlist{publisher}\setunit{\addcomma\space}}}
+{}}%
+\addspace\printdate%
+\iffieldundef{endyear}%
+{}{\printfield{endyear}}%
+}}}
+{}}
+{\setunit{}\newblock\printtext[origtit]{\printfield{origtitle}%
 \iflistundef{origlocation}{}%
 {\adddot\addspace\printlist{origlocation}%
 \iftoggle{printpublisher}%
 		{\iflistundef{origpublisher}%
 		{}%
 		{\setunit{\isdot\addcolon\addspace}
-		\printlist{origpublisher}\setunit{\addcomma\space}}}%
+		\printlist{orgpublisher}\setunit{\addcomma\space}}}%
 		{}%
 }%
 \iffieldundef{origyear}{}%
@@ -769,10 +834,34 @@ or test {\iffieldequalstr{entrytype}{set}}}
 {}{\printfield{origendyear}}}%
 }}}
        
+% serials
+\newbibmacro*{movie:serials}{
+\addcomma\newunit%
+\usebibmacro{filmloc}\addcomma\newunit%
+\usebibmacro{filmorg}
+\addspace\printdate%
+\iffieldequalstr{endyear}{}
+{\addspace .}
+{}%
+\newunit\newblock}
+  
+%normale Filme
+\newbibmacro*{movie:regular}{
+\addcomma\addspace
+\usebibmacro{filmloc}
+\addspace\printdate}
+
+%normale Filme
+\newbibmacro*{movie:tv}{%
+\usebibmacro{filmorg}%
+\addcomma%
+\printtext{\addspace\bibstring{airdate}\addspace\printdate}}
+
+       
 \newbibmacro*{filmtitle}
 {\iffieldundef{maintitle}
 {\printfield[film]{title}}
-{\printfield[film]{maintitle}}%
+{\printfield[film]{maintitle}\newunit}%
 \iffieldundef{subtitle}%
 {}%
 {\setunit{}\addspace\printfield[plain]{subtitle}}%
@@ -800,8 +889,12 @@ or test {\iffieldequalstr{entrytype}{set}}}
 {\printlist{organization}}
 }
 
-\newbibmacro*{director}{
-\ifpunct{\unspace}{}\printnames[director]{author}
+\newbibmacro*{director}{%
+\ifnameundef{director}
+{\ifnameundef{author}
+{}
+{\ifpunct{\unspace}{}\printnames[director]{author}}}
+{\ifpunct{\unspace}{}\printnames[director]{director}}
 }
 
 \newbibmacro*{mtitle+vol+btitle+bstitle}{%
@@ -832,7 +925,7 @@ or test {\iffieldequalstr{entrytype}{set}}}
 	{\setunit*{\addcomma}}}
 
 \renewbibmacro*{journal+issuetitle}{%
-  \iffieldequalstr{entrytype}{periodical}
+  \ifentrytype{periodical}
   {\usebibmacro{periodical}}
   {\usebibmacro{journal}}
   \setunit*{\addspace}%
@@ -880,13 +973,23 @@ or test {\iffieldequalstr{entrytype}{set}}}
 }%
 
 \newbibmacro*{origyear}{%
-\iffieldundef{origyear}%
+\ifboolexpr{ 
+not test {\iffieldequalstr{relatedtype}{origpubin}}
+and (test {\iffieldundef{origyear}}%
+	)}
   {}%
   {\ifboolexpr{ (test {\iffieldundef{origtitle}}
   and not test {\iftoggle{origyearwithyear}} )}
   %
-  {\printtext[origyearbook]{\printfield{origyear}%
-  \iffieldundef{origendyear}{}{\printfield{origendyear}}}}%
+  {\printtext[origyearbook]{\iffieldequalstr{relatedtype}{origpubin}
+       {\entrydata*{\thefield{related}}{%
+       \printfield{year}%
+       \iffieldundef{endyear}%
+  {}{\printfield{endyear}}%
+       }}%
+       {\printfield{origyear}%
+  \iffieldundef{origendyear}
+  {}{\printfield{origendyear}}}}}%
   {}}%
 }  
 
@@ -975,7 +1078,7 @@ or test {\iffieldequalstr{entrytype}{set}}}
 \usebibmacro{begentry}%
 \usebibmacro{author/translator}%
 \newblock\toggletrue{isreview}
-\usebibmacro{review}{\thefield{usera}}%
+\usebibmacro{review}{\thefield{related}}%
 \togglefalse{isreview}\newunit\newblock
 \usebibmacro{bytranslator}%
 \newunit\newblock
@@ -1010,7 +1113,9 @@ or test {\iffieldequalstr{entrytype}{set}}}
 \usebibmacro{journal+issuetitle}%
 \newunit\usebibmacro{chap+pag}%
 \newblock
-\bibsentence\printfield{note}%
+\iffieldundef{note}
+{}
+{\bibsentence\printfield{note}}%
 %\setunit{.}\newblock
 \usebibmacro{decidetranslatedversion}%
   \newblock
@@ -1169,35 +1274,24 @@ or test {\iffieldequalstr{entrytype}{set}}}
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \newblock%
-  \iffieldequalstr{entrysubtype}{serial}
-% Film- und Fersehserien  
-  {\usebibmacro{filmtitle}%
-  \newblock%
-  \usebibmacro{director}\addcomma\newunit%
-  \usebibmacro{filmloc}\addcomma\newunit%
-  \usebibmacro{filmorg}
-  \addspace\printdate%
-  \iffieldequalstr{endyear}{}
-  {\addspace .}
-  {}%
+  \usebibmacro{filmtitle}%
   \newunit\newblock%
-  \iffieldundef{pagetotal}
+  \usebibmacro{director}%
+\iffieldundef{entrysubtype}
+{\usebibmacro{movie:regular}}%
+{\iffieldequalstr{entrysubtype}{serial}%
+{\usebibmacro{movie:serials}}%
+{\iffieldequalstr{entrysubtype}{tv}%
+{\usebibmacro{movie:tv}}%
+{\usebibmacro{movie:regular}}}}%
+\iffieldundef{pagetotal}
   {}{
  \iftoggle{filmruntime}{\addcomma\addspace\printfield{pagetotal}}{}}
-  \iffieldundef{note}{}{\printfield{note}}
-  \usebibmacro{pageref}}
-% Normale Filme
-{\usebibmacro{filmtitle}%
-  \newblock%
-  \usebibmacro{director}\addcomma\addspace
-   \usebibmacro{filmloc}
-  \addspace\printdate%
-  \iffieldundef{pagetotal}
-  {}{
- \iftoggle{filmruntime}{\addcomma\addspace\printfield{pagetotal}}{}}
-  \iffieldundef{note}{}{\printfield{note}}
-  \usebibmacro{pageref}}%
-  \usebibmacro{finentry}}  
+ \iffieldundef{note}{}{\printfield{note}}%
+ \newunit\newblock
+%\usebibmacro{doi+eprint+url}
+ \usebibmacro{pageref}
+ \usebibmacro{finentry}} 
 
 \DeclareBibliographyDriver{online}{%
   \usebibmacro{bibindex}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index 0113e900f62..6ef2ff58d32 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
@@ -1,7 +1,7 @@
-% $Id: fiwi.cbx,v 1.1e 2012/02/16 Simon Spiegel
+% $Id: fiwi.cbx,v 1.2 2012/07/20 Simon Spiegel
 
 \ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.1e 2012/02/16 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx,v 1.2 2012/07/20 spiegel $]
 
 
 \ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true}
@@ -37,7 +37,7 @@
 \providetoggle{xindy}
 \DeclareBibliographyOption{xindy}[true]{\settoggle{xindy}{#1}}
 
-
+\DeclareFieldFormat{tvmaintitle}{\film{#1}\addcolon\addspace}
 \DeclareFieldFormat{citeyear}{\mkbibparens{#1}}
 %\DeclareFieldFormat{labelyear}{\mknumalph{#1}}
 \DeclareFieldFormat{film}{\film{#1}}
@@ -117,11 +117,29 @@
 \newcommand{\Citealts}{\Cites}
 
 \renewbibmacro*{citeindex}{%
-  \indexnames[indexname]{labelname}}%
+  \ifciteindex{%
+  \indexnames[indexname]{labelname}}
+  {}}%
 
 % Zitierbefehle für Filme und Serien
 
-\newbibmacro*{citeserial}{%
+\newbibmacro*{cite:tv}{%
+\ifciteseen{\ifboolexpr{ test {\ifnameundef{author}}
+and test {\iffieldundef{maintitle}}}
+{\iffieldundef{extratitle}
+{\usebibmacro{cite:filmtitle}}
+{\usebibmacro{cite:filmtitle}\addspace\mkbibparens{\printdate}}}
+{\usebibmacro{cite:filmtitle}}}
+{\usebibmacro{cite:filmtitle}
+\addspace\mkbibparens{%
+\iflistundef{organization}
+{\printlist{location}}
+{\printlist{organization}\addcomma}
+\printdate}}%
+}
+
+
+\newbibmacro*{cite:serial}{%
 \ifciteseen
 {\iffieldundef{shorttitle}
   {\printtext[bibhyperref]{\printfield[film]{title}}}  
@@ -134,8 +152,14 @@
 \printfield{year}}}}%
 }
 
+\newbibmacro*{cite:filmtitle}
+{\iffieldundef{maintitle}
+{\printtext[bibhyperref]{\printfield[film]{title}}}%
+{\printtext[bibhyperref]{\printfield[tvmaintitle]{maintitle}%
+\printfield[film]{title}}}
+}
 
-\newbibmacro*{citeserialfull}{%
+\newbibmacro*{cite:serialfull}{%
 \printtext[bibhyperref]{\printfield[film]{title}
 \addspace\mkbibparens{%
 \printlist{location}\iflistundef{organization}{}{\addcomma\addspace\printlist{organization}}\addspace\printfield[]{year}\addcomma\addspace%
@@ -146,12 +170,37 @@
    {\usebibmacro{cite:film:directorcountry}}
   {\iftoggle{citecompletefilm}%
    {\usebibmacro{cite:film:directorcountrytranstitle}}
-   {\printtext[bibhyperref]{\printfield[film]{title}}%
+   {\usebibmacro{cite:filmtitle}%
    \addspace\printfield[citeyear]{year}}}}
    
+\newbibmacro*{cite:episode}
+{\ifboolexpr{not test {\iffieldequalstr{entrysubtype}{tv}}
+and not test {\ifciteseen}
+and test {\iftoggle{citefullfilm}}}
+{\usebibmacro{cite:film:directorcountry}}
+{\ifboolexpr{not test {\iffieldequalstr{entrysubtype}{tv}}
+and not test {\ifciteseen}
+and test {\iftoggle{citecompletefilm}}}
+{\usebibmacro{cite:film:directorcountrytranstitle}}
+{\printtext[bibhyperref]{\printfield[film]{title}}%
+\ifciteseen{}{%
+\iffieldequalstr{entrysubtype}{tv}
+{\addspace\mkbibparens{%
+\iflistundef{organization}
+{\printlist{location}}%
+{\printlist{organization}\addcomma}
+\printdate}}{%
+\addspace\mkbibparens{%
+\iflistundef{organization}
+{\printlist{location}}
+{\printlist{organization}}
+\printfield{year}}}}}%
+}%
+}   
+   
 \newbibmacro*{cite:film:seen}{%
   	\iffieldundef{shorttitle}
-  	{\printtext[bibhyperref]{\printfield[film]{title}}}  
+  	{\usebibmacro{cite:filmtitle}}  
   	{\printtext[bibhyperref]{\printfield[film]{shorttitle}}}}   
 
 \newbibmacro*{cite:film:countryear}{%
@@ -212,9 +261,7 @@
 \newbibmacro*{cite:year+labelyear}{%
   \printtext[bibhyperref]{%
     \iffieldundef{year}%
-    {\iffieldequalstr{entrytype}{online}%
-    {\printfield{urlyear}}%
-    {}}%
+    {\bibstring[\mkbibbrackets]{undated}\printfield{extrayear}}%
     {\printfield{labelyear}}%
     \printfield{extrayear}}}
 
@@ -276,8 +323,8 @@
 \DeclareCiteCommand{\parencite}[\mkbibparens]
   {\usebibmacro{prenote}}
   {\ifthenelse{\ifciteibid\AND
-            \NOT\iffirstonpage}
-      {\bibstring[\mkibid]{ibidem}}
+            \NOT\iffirstonpage}%
+      {\bibstring[\mkibid]{ibidem}\unspace}%
    {\usebibmacro{citeindex}%
    \usebibmacro{cite}}}
   {\multicitedelim}
@@ -379,13 +426,21 @@
 	{\addspace\bibopenparen}%
       \printfield{postnote}\bibcloseparen}}
       
+\DeclareCiteCommand{\citeepisode}
+  {\usebibmacro{prenote}}
+  {\indexfield{indextitle}%
+  \usebibmacro{cite:episode}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+      
 \DeclareCiteCommand{\citefilm}
   {\usebibmacro{prenote}}
   {\indexfield{indextitle}%
-  \iffieldequalstr{entrysubtype}{serial}
-  {\usebibmacro{citeserial}}
-  {\ifciteseen{\usebibmacro{cite:film:seen}}
-   {\usebibmacro{cite:film}}}}
+  \iffieldequalstr{entrysubtype}{serial}%
+  {\usebibmacro{cite:serial}}%
+  {\iffieldequalstr{entrysubtype}{tv}%
+  {\usebibmacro{cite:tv}}{\ifciteseen{\usebibmacro{cite:film:seen}}
+   {\usebibmacro{cite:film}}}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
@@ -400,7 +455,7 @@
   {\usebibmacro{prenote}}
   {\indexfield{indextitle}%
   \iffieldequalstr{entrysubtype}{serial}
-  {\usebibmacro{citeserialfull}}
+  {\usebibmacro{cite:serialfull}}
   {\usebibmacro{cite:film}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
new file mode 100644
index 00000000000..6cd8a88d1bb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
@@ -0,0 +1,28 @@
+%% Copyright 2012 Simon Spiegel
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Simon Spiegel
+%%
+%% This work consists of the files:
+%%
+
+
+\ProvidesFile{fiwi.dbx}[2012/07/20 1.2 film studies bibliography style data model]
+\RequireBiber[3]
+
+
+\DeclareDatamodelFields[type=list, datatype=name]{
+  director}
+
+\DeclareDatamodelEntryfields[movie]{
+  director}
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index 8491ae35771..a29b2a28d50 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.1e 2012/02/16 Simon Spiegel
+% $Id: fiwi2.bbx, v 1.2 2012/07/20 Simon Spiegel
 % Stil mit Jahrestahl nach Autor
 
-\ProvidesFile{fiwi2.bbx}[v 1.1e 2012/02/16 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.2 2012/07/20 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 eeb51e98edd..403d1f2e61d 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.1e 2012/02/16 Simon Spiegel
+% $Id: fiwi2.cbx,v 1.2 2012/07/20 Simon Spiegel
 
 \ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.1e 2012/02/16 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx,v 1.2 2012/07/20 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
new file mode 100644
index 00000000000..6cd8a88d1bb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
@@ -0,0 +1,28 @@
+%% Copyright 2012 Simon Spiegel
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Simon Spiegel
+%%
+%% This work consists of the files:
+%%
+
+
+\ProvidesFile{fiwi.dbx}[2012/07/20 1.2 film studies bibliography style data model]
+\RequireBiber[3]
+
+
+\DeclareDatamodelFields[type=list, datatype=name]{
+  director}
+
+\DeclareDatamodelEntryfields[movie]{
+  director}
+