biblatex-fiwi (3dec12)

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

7 files changed, 367 insertions, 50 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 597b7a8fb49..246fabdafbc 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 1.2 2012/07/20 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v 1.2a 2012/12/03 Simon Spiegel
 % Stil mit Jahrestahl nach Autor
 
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2 2012/07/20 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2a 2012/12/03 film studies bibliography style Author (Year)]
 
 \RequireBibliographyStyle{fiwi}
 
@@ -110,6 +110,7 @@
 }
 
 \renewbibmacro*{org+publ+loc+year}{%
+\iftoggle{printaddress}{}{\clearlist{location}}
   \iffieldundef{organization}
     {}
     {\printfield{organization}%
@@ -130,6 +131,11 @@
      \iftoggle{dontprintorig}{\printfield{year}}{}}}
 
 \renewbibmacro*{addendum+pubstate}{%
+	\ifboolexpr{%
+( test {\iftoggle{ignoreaddendum}} and test {\ifbibliography})
+or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
+}
+{\clearfield{addendum}}{}%
 	\printfield{pubstate}%
 	\newunit\newblock%
 	\printfield{addendum}}
@@ -157,6 +163,7 @@
 
 %\newbibmacro*{publ+loc+origyear+inentry}{%
 \newbibmacro*{publ+loc+origyear}{%
+\iftoggle{printaddress}{}{\clearlist{location}}
 \printlist{location}%
         \iftoggle{printpublisher}%
         {\iflistundef{publisher}%
@@ -177,6 +184,7 @@
 
 
 \newbibmacro*{inst+loc}{%
+\iftoggle{printaddress}{}{\clearlist{location}}
   \iflistundef{institution}
     {\iflistundef{location}
        {}
@@ -278,7 +286,7 @@
 %\setunit{.}\newblock
 %\addspace\usebibmacro{origyear+location+title}%
 %\newblock
-\addspace\usebibmacro{decidetranslatedversion}%
+\addspace\usebibmacro{related:translatedas}%
 \newblock
 \usebibmacro{addendum+pubstate}%
 \newunit\newblock
@@ -340,10 +348,10 @@
   \newblock%
   \usebibmacro{chap+pag}%
   \newblock%
-  \addspace\usebibmacro{decidetranslatedversion}%
-  \newblock
+  \addspace\usebibmacro{related:translatedas}%
+  \newblock%
   \usebibmacro{doi+eprint+url}%
-  \newblock
+  \newblock%
   \usebibmacro{addendum+pubstate}%
   \newblock}
   \usebibmacro{pageref}%  
@@ -379,7 +387,7 @@
 \usebibmacro{chap+pag}%
 \newblock%\newunit
 \usebibmacro{doi+eprint+url}%
-\addspace\usebibmacro{decidetranslatedversion}%
+\addspace\usebibmacro{related}%
 \newblock
 \usebibmacro{addendum+pubstate}%
   \newunit\newblock
@@ -414,7 +422,7 @@
   \newunit\newblock
  \usebibmacro{publ+loc+year}%
   \newblock
-\addspace\usebibmacro{decidetranslatedversion}%
+\addspace\usebibmacro{related:translatedas}%
   \newunit\newblock
   \usebibmacro{chap+pag}%
   %\setunit{\par}\newblock
@@ -439,7 +447,7 @@
   \newunit\newblock
   \iffieldundef{month}{}{\usebibmacro{date}}%
   \newunit\newblock
-  \addspace\usebibmacro{decidetranslatedversion}%
+  \addspace\usebibmacro{related}%
   \newblock
 \printfield{note}%
   %\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 926c73f7036..b1161045a5f 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.2 2012/07/20 Simon Spiegel
+% $Id: fiwi.bbx, v1.2a 2012/12/03 Simon Spiegel
 
-\ProvidesFile{fiwi.bbx}[v1.2 2012/07/20 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.2a 2012/12/03 film studies bibliography style]
 
 \@ifpackagelater{biblatex}{2012/07/01}
      {}
@@ -20,7 +20,7 @@
 
 \renewcommand*{\multinamedelim}{\addslash}%
 \renewcommand*{\finalnamedelim}{\addslash}%
-%\renewcommand*{\finentrypunct}{\iftoggle{dontprintorig}{AA}{BB\addperiod}}
+%\renewcommand*{\finentrypunct}{\iftoggle{dontprintorig}{}{\addperiod}}
 
 
 % Diverse Variablen
@@ -29,6 +29,8 @@
 \toggletrue{citeprefix}
 \providetoggle{printseriesflag}
 \providetoggle{printpublisher}
+\providetoggle{printaddress}
+\toggletrue{printaddress}
 \providetoggle{germfassung}
 \providetoggle{intransdecision}
 \providetoggle{usera}
@@ -55,7 +57,116 @@
 \togglefalse{isreview}
 \providetoggle{ignorearticle}
 \toggletrue{ignorearticle}
+\providetoggle{ignoreforeword}
+\togglefalse{ignoreforeword}
+\providetoggle{ignoreforewordcit}
+\togglefalse{ignoreforewordcit}
+\providetoggle{ignoreafterword}
+\togglefalse{ignoreafterword}
+\providetoggle{ignoreafterwordcit}
+\togglefalse{ignoreafterwordcit}
+\providetoggle{ignoreintroduction}
+\togglefalse{ignoreintroduction}
+\providetoggle{ignoreintroductioncit}
+\togglefalse{ignoreintroductioncit}
+\providetoggle{ignoreaddendum}
+\togglefalse{ignoreaddendum}
+\providetoggle{ignoreaddendumcit}
+\togglefalse{ignoreaddendumcit}
+
+
+
+\DeclareDatamodelFields[type=field, datatype=literal]{parttitle}
+
+\DeclareBibliographyOption{ignoreaddendum}[true]{%
+\ifstrequal{#1}{true}
+{\toggletrue{ignoreaddendum}\toggletrue{ignoreaddendumcit}}
+{\togglefalse{ignoreaddendum}\togglefalse{ignoreaddendumcit}}
+\ifstrequal{#1}{both}
+{\toggletrue{ignoreaddendum}\toggletrue{ignoreaddendumcit}}
+{}
+\ifstrequal{#1}{bib}
+{\toggletrue{ignoreaddendum}}
+{}
+\ifstrequal{#1}{cite}
+{\toggletrue{ignoreaddendumcit}}
+{}
+}%
+
+\DeclareBibliographyOption{ignoreforeword}[true]{%
+\ifstrequal{#1}{true}
+{\toggletrue{ignoreforeword}\toggletrue{ignoreforewordcit}}
+{\togglefalse{ignoreforeword}\togglefalse{ignoreforewordcit}}
+\ifstrequal{#1}{both}
+{\toggletrue{ignoreforeword}\toggletrue{ignoreforewordcit}}
+{}
+\ifstrequal{#1}{bib}
+{\toggletrue{ignoreforeword}}
+{}
+\ifstrequal{#1}{cite}
+{\toggletrue{ignoreforewordcit}}
+{}
+}%
 
+\DeclareBibliographyOption{ignoreafterword}[true]{%
+\ifstrequal{#1}{true}
+{\toggletrue{ignoreafterword}\toggletrue{ignoreafterwordcit}}
+{\togglefalse{ignoreafterword}\togglefalse{ignoreafterwordcit}}
+\ifstrequal{#1}{both}
+{\toggletrue{ignoreafterword}\toggletrue{ignoreafterwordcit}}
+{}
+\ifstrequal{#1}{bib}
+{\toggletrue{ignoreafterword}}
+{}
+\ifstrequal{#1}{cite}
+{\toggletrue{ignoreafterwordcit}}
+{}
+}%
+
+\DeclareBibliographyOption{ignoreintroduction}[true]{%
+\ifstrequal{#1}{true}
+{\toggletrue{ignoreintroduction}\toggletrue{ignoreintroductioncit}}
+{\togglefalse{ignoreintroduction}\togglefalse{ignoreintroductioncit}}
+\ifstrequal{#1}{both}
+{\toggletrue{ignoreintroduction}\toggletrue{ignoreintroductioncit}}
+{}
+\ifstrequal{#1}{bib}
+{\toggletrue{ignoreintroduction}}
+{}
+\ifstrequal{#1}{cite}
+{\toggletrue{ignoreintroductioncit}}
+{}
+}%
+
+\DeclareBibliographyOption{ignoreparatext}[true]{%
+\ifstrequal{#1}{true}
+{\toggletrue{ignoreintroduction}\toggletrue{ignoreintroductioncit}
+\toggletrue{ignoreafterword}\toggletrue{ignoreafterwordcit}
+\toggletrue{ignoreforeword}\toggletrue{ignoreforewordcit}
+\toggletrue{ignoreaddendum}\toggletrue{ignoreaddendumcit}
+}
+{}
+\ifstrequal{#1}{both}
+{\toggletrue{ignoreintroduction}\toggletrue{ignoreintroductioncit}
+\toggletrue{ignoreafterword}\toggletrue{ignoreafterwordcit}
+\toggletrue{ignoreforeword}\toggletrue{ignoreforewordcit}
+\toggletrue{ignoreaddendum}\toggletrue{ignoreaddendumcit}
+}{}
+\ifstrequal{#1}{bib}
+{\toggletrue{ignoreintroduction}
+\toggletrue{ignoreafterword}
+\toggletrue{ignoreforeword}
+\toggletrue{ignoreaddendum}
+}
+{}
+\ifstrequal{#1}{cite}
+{\toggletrue{ignoreintroductioncit}
+\toggletrue{ignoreafterwordcit}
+\toggletrue{ignoreforewordcit}
+\toggletrue{ignoreaddendumcit}
+}
+{}
+}%
 
 \DeclareBibliographyOption{ignorearticle}[true]{\settoggle{ignorearticle}{#1}}
 \DeclareBibliographyOption{partofcited}[true]{\settoggle{partofcitedflag}{#1}}
@@ -103,6 +214,42 @@
 {}
 }%
 
+% Filter für \printbibliography
+%\defbibcheck{ignoreforeword}{%
+%                \toggletrue{ignoreforeword}}
+%\defbibcheck{ignoreafterword}{%
+%                 \toggletrue{ignoreafterword}}
+%\defbibcheck{ignoreintroduction}{%
+%                 \toggletrue{ignoreintroduction}}
+%\defbibcheck{ignoreparatext}{%
+%                 \toggletrue{ignoreforeword}\toggletrue{ignoreafterword}%
+%                 \toggletrue{ignoreintroduction}}
+%\defbibcheck{printpublisher}{%
+%                 \toggletrue{printpublisher}}
+%\defbibcheck{ignorepublisher}{%
+%                 \togglefalse{printpublisher}}                
+%\defbibcheck{ignoreaddress}{%
+%                 \togglefalse{printaddress}}                 
+%\defbibcheck{ignorepubloc}{%
+%                 \togglefalse{printaddress}\togglefalse{printpublisher}}                 
+                 
+%ignore-Befehle
+\newcommand*{\ignoreaddendumtrue}{\toggletrue{ignoreaddendum}}
+\newcommand*{\ignoreaddendumfalse}{\togglefalse{ignoreaddendum}}                                  
+\newcommand*{\ignoreforewordtrue}{\toggletrue{ignoreforeword}}
+\newcommand*{\ignoreforewordfalse}{\togglefalse{ignoreforeword}}                                  
+\newcommand*{\ignoreafterwordtrue}{\toggletrue{ignoreafterword}}
+\newcommand*{\ignoreafterwordfalse}{\togglefalse{ignoreafterword}}                                  
+\newcommand*{\ignoreintroductiontrue}{\toggletrue{ignoreintroduction}}
+\newcommand*{\ignoreintroductionfalse}{\togglefalse{ignoreintroduction}}                                  
+\newcommand*{\ignorepublisherfalse}{\toggletrue{printpublisher}}
+\newcommand*{\ignorepublishertrue}{\togglefalse{printpublisher}}                                  
+\newcommand*{\ignoreaddresstrue}{\toggletrue{printaddress}}
+\newcommand*{\ignoreaddressfalse}{\togglefalse{printaddress}}                                  
+\newcommand*{\ignorelocationtrue}{\toggletrue{printaddress}}
+\newcommand*{\ignorelocationfalse}{\togglefalse{printaddress}}                                  
+                 
+
 \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}
 
@@ -144,8 +291,10 @@
 {\mkpageprefix[pagination]{#1}}
 {#1}}
 
-\DeclareFieldFormat[review]{title}{#1}
+%\DeclareFieldFormat{related}{\addspace\mkbibparens{#1}}
+\DeclareFieldFormat[review]{title}{\mkbibquote{#1}}
 \DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat{parttitle}{\mkbibemph{#1}}
 \DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
 \DeclareFieldFormat[phdthesis]{title}{\mkbibemph{#1}}
 \DeclareFieldFormat{subtitle}{\mkbibemph{#1}}
@@ -153,6 +302,7 @@
 \DeclareFieldFormat{shorthandwidth}{#1}
 \DeclareFieldFormat{film}{\film{#1}} 
 \DeclareFieldFormat{plain}{\mkbibparens{#1}.}
+\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}}
@@ -174,6 +324,7 @@
 {\addspace\mkbibparens{\textsuperscript{1}#1}}}
 \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}
@@ -376,8 +527,8 @@
 \nosort{type_title}{\regexp{\ALos\s+}}
 \nosort{type_title}{\regexp{\AL'\s+}}
 }
-\DeclareSourcemap{
-  \maps[datatype=bibtex]{
+\DeclareStyleSourcemap{
+  \maps{
     \map{
        \step[fieldset=abstract, null]
        \step[fieldset=annote, null]
@@ -428,6 +579,7 @@ fromhebrew = {aus dem Hebr\"aischen},
 fromjapanese = {aus dem Japanischen},
 frompolish = {aus dem Polnischen},
 bycompiler  = {zusammengestellt von},
+bypublisher = {bei},
 ibidem = {ebd\adddot\addspace},
 url		= {},
 urlseen	= {Zugriff am},
@@ -439,6 +591,8 @@ minutes = {min},
 tvseason = {Staffel},
 tvepisode = {Folge},
 airdate = {},
+astitle = {als},
+part = {Teil},
 undated = {undatiert},
 translatedto = {dt\adddot},
 reviewof = {Rezension von},
@@ -462,14 +616,74 @@ january          = {Januar},
 % commands
 
 \renewbibmacro*{finentry}{\iftoggle{intransdecision}% 
-{\unspace}{\addperiod}} % unklar, \finentry nicht geht
+{\unspace}{\addperiod}} % unklar, warum \finentry nicht geht
 
 \renewcommand{\bibsetup}{\raggedright}
 \newcommand*{\mkibid}[1]{#1}
 
 \DeclareRobustCommand{\film}{\textsc}
 
+\renewbibmacro*{byeditor+othersstrg}{%
+\ifboolexpr{%
+( test {\iftoggle{ignoreforeword}} and test {\ifbibliography})
+or ( test {\iftoggle{ignoreforewordcit}} and test {\ifcitation} )
+}
+{\clearname{foreword}}{}%
+\ifboolexpr{%
+( test {\iftoggle{ignoreafterword}} and test {\ifbibliography})
+or ( test {\iftoggle{ignoreafterwordcit}} and test {\ifcitation} )
+}
+{\clearname{afterword}}{}%
+\ifboolexpr{%
+( test {\iftoggle{ignoreintroduction}} and test {\ifbibliography})
+or ( test {\iftoggle{ignoreintroductioncit}} and test {\ifcitation} )
+}
+{\clearname{introduction}}{}%
+  \iffieldundef{editortype}
+    {\def\abx@tempa{byeditor}}
+    {\edef\abx@tempa{by\thefield{editortype}}}%
+  \let\abx@tempb=\empty
+  \ifnamesequal{editor}{translator}
+    {\appto\abx@tempa{tr}%
+     \appto\abx@tempb{\clearname{translator}}}
+    {}%
+  \ifnamesequal{editor}{commentator}
+    {\appto\abx@tempa{co}%
+     \appto\abx@tempb{\clearname{commentator}}}
+    {\ifnamesequal{editor}{annotator}
+       {\appto\abx@tempa{an}%
+        \appto\abx@tempb{\clearname{annotator}}}
+       {}}%
+  \ifnamesequal{editor}{introduction}
+    {\appto\abx@tempa{in}%
+     \appto\abx@tempb{\clearname{introduction}}}
+    {\ifnamesequal{editor}{foreword}
+       {\appto\abx@tempa{fo}%
+        \appto\abx@tempb{\clearname{foreword}}}
+       {\ifnamesequal{editor}{afterword}
+          {\appto\abx@tempa{af}%
+           \appto\abx@tempb{\clearname{afterword}}}
+          {}}}%
+  \ifbibxstring{\abx@tempa}
+    {\printtext{\bibstring{\abx@tempa}}\abx@tempb}
+    {\usebibmacro{bytypestrg}{editor}{editor}}}
+
 \renewbibmacro*{bytranslator+others}{% Bei incollection wird translator nach dem Titel ausgegeben
+\ifboolexpr{%
+ ( test {\iftoggle{ignoreforeword}} and test {\ifbibliography} )
+or ( test {\iftoggle{ignoreforewordcit}} and test {\ifcitation} )
+}
+{\clearname{foreword}}{}
+\ifboolexpr{%
+( test {\iftoggle{ignoreafterword}} and test {\ifbibliography})
+or ( test {\iftoggle{ignoreafterwordcit}} and test {\ifcitation} )
+}
+{\clearname{afterword}}{}
+\ifboolexpr{%
+( test {\iftoggle{ignoreintroduction}} and test {\ifbibliography})
+or ( test {\iftoggle{ignoreintroductioncit}} and test {\ifcitation} )
+}
+{\clearname{introduction}}{}
 \ifthenelse{\ifnameundef{translator} \or \ifentrytype{incollection}}
     {}
   {\def\abx@tempa{bytranslator}%
@@ -532,6 +746,11 @@ january          = {Januar},
 
 \renewbibmacro*{addendum+pubstate}{%
 \addspace%
+\ifboolexpr{%
+( test {\iftoggle{ignoreaddendum}} and test {\ifbibliography})
+or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
+}
+{\clearfield{addendum}}{}
   \printfield{addendum}%
   \newunit\newblock
   \printfield{pubstate}}
@@ -724,7 +943,9 @@ or test {\ifentrytype{set}}}
        {\usebibmacro{maintitle}%
         \newunit\newblock
 	\printfield{volume}%
-	\printfield{part}%
+	\iffieldundef{parttitle}%
+	{\printfield{part}}
+	{}%
 	\setunit{\addcolon\space}}}%
   \printfield{title}%
   \iffieldundef{maintitle}
@@ -734,7 +955,14 @@ or test {\ifentrytype{set}}}
   \newunit
   \printfield{subtitle}%
   \newunit
-  \printfield{titleaddon}}
+  \printfield{titleaddon}
+  \iffieldundef{parttitle}
+  {}
+  {%
+  \printtext{\bibstring{part}%
+  \addspace\printfield{part}%
+  \addcolon\addspace\printfield{parttitle}}}%
+  }
 
 \newbool{bbx@inset}
 
@@ -767,10 +995,85 @@ or test {\ifentrytype{set}}}
     {#1}
     {#2}}
  
+\DeclareFieldFormat{related:origpubin}{}
+
+\renewbibmacro*{related:origpubin}[1]{%
+}
+
+
+\newbibmacro*{related:translationof}[1]{%
+\mkbibparens{\usebibmacro{origyear+location+title}}}
 
 
 
-\newbibmacro*{decidetranslatedversion}
+\renewbibmacro*{related}{%
+  \ifboolexpr{
+    not test {\iftoggle{bbx:related}}
+    or
+    test {\iffieldundef{related}}
+  }
+    {\iffieldundef{origtitle}
+    {}
+    {\usebibmacro{related:translatedas}}}
+    {\setcounter{bbx:relatedcount}{0}%
+     \setcounter{bbx:relatedtotal}{0}%
+     \def\do##1{\stepcounter{bbx:relatedtotal}}%
+     \docsvfield{related}%
+     \def\do{%
+       \stepcounter{bbx:relatedcount}%
+       \ifnumgreater{\value{bbx:relatedcount}}{1}
+         {\printtext{\relateddelim}}
+         {}}%
+     \ifbibmacroundef{related:\strfield{relatedtype}}
+       {\appto{\do}{\usebibmacro{related:default}}}
+       {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}%
+     \iffieldformatundef{related:\strfield{relatedtype}}
+       {\def\bbx@tempa{related}}
+       {\def\bbx@tempa{related:\strfield{relatedtype}}}%
+     \printtext[\bbx@tempa]{%
+       \iffieldundef{relatedstring}
+         {\ifboolexpr{
+            test {\ifnumgreater{\value{bbx:relatedtotal}}{1}}
+            and
+            test {\ifbibxstring{\thefield{relatedtype}s}}
+          }
+            {\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}}
+            {\iffieldbibstring{relatedtype}
+               {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}}
+               {}}}
+         {\iffieldbibstring{relatedstring}
+            {\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}}
+            {\printtext{\printfield{relatedstring}\relatedpunct}}}%
+       \docsvfield{related}}\togglefalse{intransdecision}}}
+
+
+\renewbibmacro*{related:multivolume}[1]{%
+  \entrydata*{#1}{%
+    \printfield{volume}%
+    \printfield{part}%
+    \setunit{\addcolon\space}%
+    \usebibmacro{title}%
+    \ifboolexpr{
+      test {\ifnamesequal{author}{savedauthor}}
+      or
+      test {\ifnameundef{author}}
+    } 
+      {}
+      {\usebibmacro{bytypestrg}{author}{author}%
+       \setunit{\addspace}%
+       \printnames[byauthor]{author}
+       \newunit\newblock}%
+    \ifboolexpr{
+      test {\ifnamesequal{editor}{savededitor}}
+      or
+      test {\ifnameundef{editor}}
+    } 
+      {}
+      {\usebibmacro{byeditor+others}%
+       \newunit\newblock}%
+  \printdate}}
+
+\newbibmacro*{related:translatedas}[1]
 {%
 \iftoggle{dontprintorig}
 {}
@@ -778,35 +1081,32 @@ or test {\ifentrytype{set}}}
 	test {\iftoggle{germfassung}}
 and test {\iffieldequalstr{relatedtype}{translatedas}}}
 	{\toggletrue{dontprintorig}\toggletrue{intransdecision}%
-	\usebibmacro{related:translatedas}{\thefield{related}}
+	\entrydata{\thefield{related}}{%
+    \printtext[germfassung]{%
+    \usedriver{}{\thefield{entrytype}}\unspace}%
+    }
 	\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}%
 {\iffieldequalstr{relatedtype}{translationof}
 {\entrydata*{\thefield{related}}{%
-\setunit{}\newblock\printtext[origtit]{\printfield[noformat]{title}%
+\setunit{}\newblock\printtext[origtit:related]{\printfield[noformat]{title}%
+\iftoggle{printaddress}{}{\clearlist{location}}%
 \iflistundef{location}{}%
 {\adddot\addspace\printlist{location}%
-\iftoggle{printpublisher}
+\iftoggle{printpublisher}%
 {\iflistundef{publisher}
 {}
 {\setunit{\isdot\addcolon\addspace}
@@ -818,6 +1118,7 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
 }}}
 {}}
 {\setunit{}\newblock\printtext[origtit]{\printfield{origtitle}%
+\iftoggle{printaddress}{}{\clearlist{location}}%
 \iflistundef{origlocation}{}%
 {\adddot\addspace\printlist{origlocation}%
 \iftoggle{printpublisher}%
@@ -961,11 +1262,14 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
        \usebibmacro{labelyear+extrayear}}}}
 
 \newbibmacro*{publ+loc+year}{%
+\iftoggle{printaddress}{}{\clearlist{location}}
 \printlist{location}%
 \iftoggle{printpublisher}%
 		{\iflistundef{publisher}%
 		{\setunit*{\space}}%
-		{\setunit{\isdot\addcolon\addspace}
+		{\iflistundef{location}
+		{\adddot\addspace}
+		{\setunit{\isdot\addcolon\addspace}}
 		\printlist{publisher}\setunit{\addcomma\space}}}%
 		{\setunit*{\space}}%
 \usebibmacro{labelyear+extrayear}%
@@ -994,6 +1298,7 @@ and (test {\iffieldundef{origyear}}%
 }  
 
 \newbibmacro*{org+publ+loc+year}{%
+\iftoggle{printaddress}{}{\clearlist{location}}
 \iffieldundef{organization}%
 {}%
 {\printfield{organization}%
@@ -1013,6 +1318,7 @@ and (test {\iffieldundef{origyear}}%
   \usebibmacro{labelyear+extrayear}}
   
 \newbibmacro*{inst+loc+year}{%
+\iftoggle{printaddress}{}{\clearlist{location}}
   \iflistundef{institution}
     {\iflistundef{location}
        {}
@@ -1117,7 +1423,7 @@ and (test {\iffieldundef{origyear}}%
 {}
 {\bibsentence\printfield{note}}%
 %\setunit{.}\newblock
-\usebibmacro{decidetranslatedversion}%
+\usebibmacro{related}%
   \newblock
   \usebibmacro{addendum+pubstate}%
   \newunit\newblock%
@@ -1187,27 +1493,29 @@ and (test {\iffieldundef{origyear}}%
   %\setunit{\par}\newblock
   %\usebibmacro{doi+eprint+url}%
   %\newunit\newblock
-  \addspace\usebibmacro{decidetranslatedversion}%
+  \addspace\usebibmacro{related}%
   \newblock
   \usebibmacro{addendum+pubstate}%
   \newblock}
-  \usebibmacro{pageref}%  
+  \usebibmacro{pageref}%
+  %\newunit\newblock
+  %\usebibmacro{related}%  
   \usebibmacro{finentry}}
   
-  \DeclareBibliographyDriver{book}{%
+\DeclareBibliographyDriver{book}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \iftoggle{dontprintorig}{}{%
   \ifnameundef{author}%
-  {\ifnameundef{editor}
-  {}
+  {\ifnameundef{editor}%
+  {}%
   {\usebibmacro{editor}\addspace}}%
 {\usebibmacro{author/translator+others}}}%
 \newblock
 \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \newunit\newblock
   \ifnameundef{author}
-  {}
+  {\usebibmacro{bytranslator+others}}
   {\usebibmacro{byeditor+others}}%
   \newunit\newblock
   \printfield{note}%
@@ -1224,7 +1532,7 @@ and (test {\iffieldundef{origyear}}%
 \ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}}
 {}
 {\addperiod\addspace\usebibmacro{doi+eprint+url}}%
-\addspace\usebibmacro{decidetranslatedversion}%
+\addspace\usebibmacro{related}%
 \newblock
 \usebibmacro{addendum+pubstate}%
 \newunit\newblock
@@ -1258,7 +1566,7 @@ and (test {\iffieldundef{origyear}}%
   \usebibmacro{ser+num}%
   \newunit\newblock
  \usebibmacro{publ+loc+year}%
-\addspace\usebibmacro{decidetranslatedversion}
+\addspace\usebibmacro{related}
   \newunit\newblock
   \usebibmacro{chap+pag}%
   %\setunit{\par}\newblock
@@ -1306,7 +1614,7 @@ and (test {\iffieldundef{origyear}}%
   \newunit\newblock
   \usebibmacro{date}%
   \newunit\newblock
-  \addspace\usebibmacro{decidetranslatedversion}
+  \addspace\usebibmacro{related}
   \newunit\newblock
   \printfield{note}%
   %\newunit\newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index 6ef2ff58d32..483d52aa2f6 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.2 2012/07/20 Simon Spiegel
+% $Id: fiwi.cbx,v 1.2a 2012/12/03 Simon Spiegel
 
 \ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.2 2012/07/20 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx,v 1.2a 2012/12/03 spiegel $]
 
 
 \ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true}
@@ -294,7 +294,8 @@ and test {\iftoggle{citecompletefilm}}}
   
   
 \DeclareCiteCommand{\fullcite}
-  {\usebibmacro{prenote}}%
+  {{}%
+  \usebibmacro{prenote}}%
   {\usedriver%
      {}
      {\thefield{entrytype}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
index 6cd8a88d1bb..c5445d99745 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}[2012/07/20 1.2 film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2012/12/03 1.2a 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 a29b2a28d50..1a48c5674c0 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.2 2012/07/20 Simon Spiegel
+% $Id: fiwi2.bbx, v 1.2a 2012/12/03 Simon Spiegel
 % Stil mit Jahrestahl nach Autor
 
-\ProvidesFile{fiwi2.bbx}[v 1.2 2012/07/20 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.2a 2012/12/03 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 403d1f2e61d..1dc29dcf29f 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.2 2012/07/20 Simon Spiegel
+% $Id: fiwi2.cbx,v 1.2a 2012/12/03 Simon Spiegel
 
 \ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.2 2012/07/20 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx,v 1.2a 2012/12/03 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 6cd8a88d1bb..c5445d99745 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}[2012/07/20 1.2 film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2012/12/03 1.2a film studies bibliography style data model]
 \RequireBiber[3]