biblatex-fiwi 1.1d (22dec11)

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

16 files changed, 563 insertions, 199 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/README b/Master/texmf-dist/doc/latex/biblatex-fiwi/README
index ee6c64fd86b..7d6aedc0252 100644
--- a/Master/texmf-dist/doc/latex/biblatex-fiwi/README
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/README
@@ -1,4 +1,4 @@
-biblatex-fiwi 2011/12/06 v1.1c
+biblatex-fiwi 2011/12/21 v1.1d
 Copyright (c) 2011 Simon Spiegel <simon(at)simifilm.ch>
   
 ************************************************************
@@ -69,6 +69,13 @@ This work consists of the following files:
  * fiwi-yearbeginning.bbx
  * fiwi.cbx
  * fiwi2.cbx
- * biblatex-fiwi.pdf	% German documentation  
- * biblatex-fiwi.tex	% German documentation 
- * examples.bib			% bib for documentation	
\ No newline at end of file
+ * biblatex-fiwi.pdf			% German documentation
+ * biblatex-fiwi.tex			% German documentation 
+ * example-biblatex-fiwi.tex		% examples
+ * example-biblatex-fiwi-options.tex	% examples
+ * example-biblatex-fiwi-options.pdf	% examples
+ * example-biblatex-fiwi.pdf		% examples
+ * example-biblatex-fiwi2.tex		% examples
+ * example-biblatex-fiwi2-options.pdf	% examples
+ * example-biblatex-fiwi2.pdfn  	% examples
+ * examples.bib				% bib for documentation	and example
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf b/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf
index 72c1e6c502e..df4f12bf311 100644
--- a/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex b/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex
index 463e0a7ecb6..d76734c38a7 100644
--- a/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex
@@ -30,7 +30,7 @@
   url={http://www.ctan.org/tex-archive/macros/latex/contrib/csquotes/},
   author={Simon Spiegel},
   email={simon@simifilm.ch},
-  revision={1.1c},
+  revision={1.1d},
   date={\rcstoday}}
 
 \hypersetup{%
@@ -584,7 +584,7 @@ labelyear=false}
 \section{Beispiele}\label{beisp}
 Die folgenden Beispiele sollen einen Einblick geben, was mit \sty{biblatex-fiwi} alles möglich ist. 
 
-Für die Beispiele wurden folgende Optionen  zusätzlich zu den Standardeinstellungen aktiviert: \kvopt{publisher}{true}, \kvopt{series}{true} und \kvopt{partofcited}{true}.
+Für die Beispiele wurden folgende Optionen  zusätzlich zu den Standardeinstellungen aktiviert: \kvopt{publisher}{true}, \kvopt{series}{true} und \kvopt{partofcited}{true}. Weitere Beispiele mit anderen Einstellungen finden sich in den separaten PDF"=Dateien.
 
 \begin{ltxexample}
 @collection{clute.j:1999,
@@ -777,10 +777,14 @@ Für die Beispiele wurden folgende Optionen  zusätzlich zu den Standardeinstellun
 \fullcite{Ndalianis.A:2009b}
 
 \section{Versionsgeschichte}
-%\cite{todorov}
-%
-%\cite{Suvin.D:2007a,Suvin.D:2007b}
+
 \begin{changelog}
+\begin{release}{1.1d}{2011-12-13}
+\item Separate Beispiele mit unterschiedlichen Einstellungen hinzugefügt
+\item Viel Detail"=Aufräumarbeiten, zahlreiche kleine Unregelmäßigkeiten korrigiert
+\item Zukünftige Versionen sollten dank eines neuen Testverfahrens seltener neue Fehler einführen
+\end{release}
+
 \begin{release}{1.1c}{2011-12-06}
 \item Die Option \opt{partofcited hinzugeführt} \see{sub:kurz}
 \item Das Format des Beispiels für \file{biber.conf} angepasst \see{sub:sort}
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.pdf b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.pdf
new file mode 100644
index 00000000000..8ff57191969
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.tex b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.tex
new file mode 100644
index 00000000000..b090ca41f70
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.tex
@@ -0,0 +1,32 @@
+\documentclass[a4paper]{scrartcl}
+\usepackage[utf8]{inputenc}
+\usepackage[ngerman]{babel}
+\usepackage[OT2,T1]{fontenc}
+\usepackage{mathpazo}
+\usepackage{graphicx}
+\usepackage{btxdockit}
+\usepackage[german=guillemets]{csquotes}
+\usepackage[citestyle=fiwi,bibstyle=fiwi,series=true,publisher=true,germ=true,origyearwithyear=true,origyearsuperscript=true,dashed=true,partofcited=true]{biblatex}
+\ExecuteBibliographyOptions{backend=biber}
+\ExecuteBibliographyOptions{bibencoding=utf8}
+\ExecuteBibliographyOptions{sorting=title}
+
+\bibliography{examples} 
+\fullcitefilm
+
+
+
+\begin{document}
+\title{biblatex-fiwi}\subtitle{Beispiele für die Optionen}\date{}\maketitle
+\noindent Dieses Dokument zeigt die Darstellungsweise des \sty{biblatex}"=Stils \sty{fiwi} mit folgenden aktivierten Optionen: \opt{series,publisher,germ,origyearwithyear,origyearsuperscript,} \opt{dashed} und \opt{partofcited} \\ \\
+
+\noindent Zuerst zitieren wir ein paar Filme: \citefilm{Haller.D:1965}, \citefilm{Liebeneiner.W:1952}, \citefilm{Bradley.D:1960} und \citefilm{Menzies.W:1953}
+
+Dann einen Haufen Texte: \textcite{sklovskij.v:1969a} \textcite{Spiegel.S:2010c}, \textcite{Muller.A:2010a}, \textcite{Wells.H:1908}, \textcite{Spiegel.S:2007b}, \textcite{Lukian.1981}, \textcite{Kepler.J:1993}, \textcite{Coleridge:1983a}, \textcite{vonMatt.P:2002}, \textcite{Keitz.U:2004a}, \textcite{Wells.HG:1980}, \textcite{Ackerman.Strickland:1981}, \textcite{Ball.A:2003a}, \textcite{Anderson.P:1971a}, \textcite{Gaudreault.A:1993}, \textcite{Poe.E:1982c}, \textcite{Poe.E:1999a}, \textcite{Parrinder.P:1980}, \textcite{Wells.H:1980*2}, \textcite{James.H:2004a}, \textcite{James.H:2007a}, \textcite{Hedeler.W:2005a}, \textcite{Ballhausen.T:2009a}, \textcite{Zymner.R:2003a}, \textcite{Zymner.R:2011a}, \textcite{Nelmes.J:2011b}, \textcite{Kirchner.A:2008a} und \textcite{Kuhn.A:1990*2}.
+
+\defbibheading{film}{\addsec{Filmographie}}
+
+\printbibliography[nottype=movie]
+\printbibliography[type=movie,heading=film]
+
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi.pdf b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi.pdf
new file mode 100644
index 00000000000..35cce83bf37
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi.tex b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi.tex
new file mode 100644
index 00000000000..1e8f00c6638
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi.tex
@@ -0,0 +1,32 @@
+\documentclass[a4paper]{scrartcl}
+\usepackage[utf8]{inputenc}
+\usepackage[ngerman]{babel}
+\usepackage[OT2,T1]{fontenc}
+\usepackage{mathpazo}
+\usepackage{graphicx}
+\usepackage{btxdockit}
+\usepackage[german=guillemets]{csquotes}
+\usepackage[citestyle=fiwi,bibstyle=fiwi]{biblatex}
+\ExecuteBibliographyOptions{backend=biber}
+\ExecuteBibliographyOptions{bibencoding=utf8}
+\ExecuteBibliographyOptions{sorting=title}
+
+\bibliography{examples} 
+\fullcitefilm
+
+
+
+\begin{document}
+\title{biblatex-fiwi}\subtitle{Beispiele für die Grundeinstellung}\date{}\maketitle
+\noindent Dieses Dokument zeigt die Darstellungsweise des \sty{biblatex}"=Stils \sty{fiwi} mit den Grundeinstellungen.\\ \\
+
+\noindent Zuerst zitieren wir ein paar Filme: \citefilm{Haller.D:1965}, \citefilm{Liebeneiner.W:1952}, \citefilm{Bradley.D:1960} und \citefilm{Menzies.W:1953}
+
+Dann einen Haufen Texte: \textcite{sklovskij.v:1969a} \textcite{Spiegel.S:2010c}, \textcite{Muller.A:2010a}, \textcite{Wells.H:1908}, \textcite{Spiegel.S:2007b}, \textcite{Lukian.1981}, \textcite{Kepler.J:1993}, \textcite{Coleridge:1983a}, \textcite{vonMatt.P:2002}, \textcite{Keitz.U:2004a}, \textcite{Wells.HG:1980}, \textcite{Ackerman.Strickland:1981}, \textcite{Ball.A:2003a}, \textcite{Anderson.P:1971a}, \textcite{Gaudreault.A:1993}, \textcite{Poe.E:1982c}, \textcite{Poe.E:1999a}, \textcite{Parrinder.P:1980}, \textcite{Wells.H:1980*2}, \textcite{James.H:2004a}, \textcite{James.H:2007a}, \textcite{Hedeler.W:2005a}, \textcite{Ballhausen.T:2009a}, \textcite{Zymner.R:2003a}, \textcite{Zymner.R:2011a}, \textcite{Nelmes.J:2011b}, \textcite{Kirchner.A:2008a} und \textcite{Kuhn.A:1990*2}.
+
+\defbibheading{film}{\addsec{Filmographie}}
+
+\printbibliography[nottype=movie]
+\printbibliography[type=movie,heading=film]
+
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi2-options.pdf b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi2-options.pdf
new file mode 100644
index 00000000000..99359bdcdd8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi2-options.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi2.pdf b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi2.pdf
new file mode 100644
index 00000000000..a838a1603cf
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi2.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi2.tex b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi2.tex
new file mode 100644
index 00000000000..fd94721de64
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/example-biblatex-fiwi2.tex
@@ -0,0 +1,32 @@
+\documentclass[a4paper]{scrartcl}
+\usepackage[utf8]{inputenc}
+\usepackage[ngerman]{babel}
+\usepackage[OT2,T1]{fontenc}
+\usepackage{mathpazo}
+\usepackage{graphicx}
+\usepackage{btxdockit}
+\usepackage[german=guillemets]{csquotes}
+\usepackage[citestyle=fiwi,bibstyle=fiwi2]{biblatex}
+\ExecuteBibliographyOptions{backend=biber}
+\ExecuteBibliographyOptions{bibencoding=utf8}
+\ExecuteBibliographyOptions{sorting=title}
+
+\bibliography{examples} 
+\fullcitefilm
+
+
+
+\begin{document}
+\title{biblatex-fiwi2}\subtitle{Beispiele für die Grundeinstellung}\date{}\maketitle
+\noindent Dieses Dokument zeigt die Darstellungsweise des \sty{biblatex}"=Stils \sty{fiwi2} mit den Grundeinstellungen.\\ \\
+
+\noindent Zuerst zitieren wir ein paar Filme: \citefilm{Haller.D:1965}, \citefilm{Liebeneiner.W:1952}, \citefilm{Bradley.D:1960} und \citefilm{Menzies.W:1953}
+
+Dann einen Haufen Texte: \textcite{sklovskij.v:1969a} \textcite{Spiegel.S:2010c}, \textcite{Muller.A:2010a}, \textcite{Wells.H:1908}, \textcite{Spiegel.S:2007b}, \textcite{Lukian.1981}, \textcite{Kepler.J:1993}, \textcite{Coleridge:1983a}, \textcite{vonMatt.P:2002}, \textcite{Keitz.U:2004a}, \textcite{Wells.HG:1980}, \textcite{Ackerman.Strickland:1981}, \textcite{Ball.A:2003a}, \textcite{Anderson.P:1971a}, \textcite{Gaudreault.A:1993}, \textcite{Poe.E:1982c}, \textcite{Poe.E:1999a}, \textcite{Parrinder.P:1980}, \textcite{Wells.H:1980*2}, \textcite{James.H:2004a}, \textcite{James.H:2007a}, \textcite{Hedeler.W:2005a}, \textcite{Ballhausen.T:2009a}, \textcite{Zymner.R:2003a}, \textcite{Zymner.R:2011a}, \textcite{Nelmes.J:2011b}, \textcite{Kirchner.A:2008a} und \textcite{Kuhn.A:1990*2}.
+
+\defbibheading{film}{\addsec{Filmographie}}
+
+\printbibliography[nottype=movie]
+\printbibliography[type=movie,heading=film]
+
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/examples.bib b/Master/texmf-dist/doc/latex/biblatex-fiwi/examples.bib
index ed1a69c5fd3..a2259ce5346 100644
--- a/Master/texmf-dist/doc/latex/biblatex-fiwi/examples.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/examples.bib
@@ -1,19 +1,277 @@
 %% This BibTeX bibliography file was created using BibDesk.
-%% http://bibdesk.sourceforge.net/
+%% http://www.cs.ucsd.edu/~mmccrack/bibdesk.html
 
 
-%% Created for Simon Spiegel at 2011-09-14 17:00:10 +0200 
+%% Created for Simon Spiegel at 2011-12-11 22:04:53 +0100 
 
 
 %% Saved with string encoding Unicode (UTF-8) 
 
 
 
+@incollection{Kuhn.A:1990*2,
+	Address = {London and New York},
+	Author = {Kuhn, Annette},
+	Booktitle = {Alien Zone. Cultural Theory and Contemporary Science Fiction Cinema},
+	Editor = {Kuhn, Annette},
+	Gender = {sf},
+	Pages = {1--12},
+	Publisher = {Verso},
+	Title = {Introduction. Cultural Theory and Science Fiction Cinema},
+	Year = {1990}}
+
+@book{Kirchner.A:2008a,
+	Address = {Marburg},
+	Editor = {Kirchner, Andreas and Prümm, Karl and Richling, Martin},
+	Publisher = {Schüren},
+	Subtitle = {Beiträge zur Geschichte und Poetik des Videobildes},
+	Title = {Abschied vom Zelluloid?},
+	Year = {2008}}
+
+@book{Nelmes.J:2011b,
+	Address = {London},
+	Editor = {Nelmes, Jill},
+	Publisher = {Routledge},
+	Title = {Analysing the Screenplay},
+	Year = {2011}}
+
+@book{Zymner.R:2003a,
+	Address = {Paderborn},
+	Author = {Zymner, Rüdiger},
+	Isbn = {3-89785-377-9},
+	Publisher = {mentis},
+	Title = {Gattungstheorie: Probleme und Positionen der Literaturwissenschaft},
+	Year = {2003}}
+
+@book{Zymner.R:2011a,
+	Address = {Stuttgart},
+	Editor = {Zymner, Rüdiger},
+	Isbn = {978-3-476-02343-8},
+	Publisher = {Metzler},
+	Title = {Handbuch Gattungstheorie},
+	Year = {2011}}
+
+@article{Ballhausen.T:2009a,
+	Author = {Ballhausen, Thomas},
+	Doi = {10.1007/978-3-211-87465-3_5},
+	Isbn = {978-3-211-87465-3},
+	Issuetitle = {Humans in Outer Space -- Interdisciplinary Odysseys},
+	Journal = {Studies in Space Policy},
+	Pages = {35-43},
+	Title = {What’s the story, mother? Some thoughts on Science Fiction Film and Space Travel},
+	Volume = {1},
+	Year = {2009}}
+
+@article{Hedeler.W:2005a,
+	Author = {Hedeler, Wladislaw},
+	Editor = {Kirschner, Lutz and Spehr, Christoph},
+	Editortype = {compiler},
+	Issuetitle = {Sozialismus auf dem Mars},
+	Journal = {Berliner Debatte Initial},
+	Number = {1},
+	Pages = {29-42},
+	Title = {Alexander Bogdanows Mars-Romane als kommunistische Utopie},
+	Volume = {16},
+	Year = {2005}}
+
+@book{James.H:2007a,
+	Address = {München},
+	Afterword = {Nicol, Karl Ludwig},
+	Author = {James, Henry},
+	Edition = {4},
+	Origdate = {1898},
+	Origlanguage = {american},
+	Origlocation = {London},
+	Origtitle = {The Turn of the Screw},
+	Publisher = {dtv},
+	Read = {1},
+	Title = {Das Durchdrehen der Schraube},
+	Translator = {Nicol, Karl Ludwig},
+	Year = {2007}}
+
+@incollection{James.H:2004a,
+	Address = {Boston},
+	Author = {James, Henry},
+	Bookauthor = {James, Henry},
+	Booksubtitle = {Complete, Authoritative Text with Biographical, Historical, and Cultural Contexts, Critical History, and Essays from Five Contemporary Critical Perspectives},
+	Booktitle = {The Turn of the Screw},
+	Edition = {2},
+	Editor = {Beidler, Peter G.},
+	Origdate = {1898},
+	Pages = {22--120},
+	Publisher = {Bedford Books},
+	Read = {1},
+	Series = {Case Studies in Contemporary Criticism},
+	Title = {The Turn of the Screw},
+	Usera = {James.H:2007a},
+	Year = {2004}}
+
+@incollection{Wells.HG:1980,
+	Address = {Sussex},
+	Author = {Wells, H. G.},
+	Bookauthor = {Wells, H. G.},
+	Booktitle = {H.{\,}G. Wells's Literary Criticism},
+	Crossref = {Parrinder.P:1980},
+	Origdate = {1938},
+	Pages = {248--249},
+	Publisher = {Harvester},
+	Title = {Fiction about the Future},
+	Year = {1980}}
+
+@book{Parrinder.P:1980,
+	Address = {Brighton and Sussex},
+	Author = {Wells, H. G.},
+	Editor = {Philmus, Robert M. and Parrinder, Patrick},
+	Title = {H.{\,}G. Wells's Literary Criticism},
+	Year = {1980}}
+
+@incollection{Wells.H:1980*2,
+	Author = {Wells, H. G.},
+	Crossref = {Parrinder.P:1980},
+	Origdate = {1933},
+	Pages = {240--245},
+	Title = {Preface to \emph{The Scientific Romances}}}
+
+@movie{Menzies.W:1953,
+	Address = {USA},
+	Author = {Menzies, William Cameron},
+	Subtitle = {Invasion vom Mars},
+	Title = {Invaders from Mars},
+	Year = {1953}}
+
+@movie{Bradley.D:1960,
+	Address = {USA},
+	Author = {Bradley, David},
+	Pagetotal = {74},
+	Title = {12 to the Moon},
+	Year = {1960}}
+
+@movie{Liebeneiner.W:1952,
+	Address = {AU},
+	Author = {Liebeneiner, Wolfgang},
+	Title = {1. April 2000},
+	Year = {1952}}
+
+@movie{Haller.D:1965,
+	Address = {GB},
+	Author = {Haller, Daniel},
+	Sorttitle = {Die, Monster, Die!},
+	Title = {Die, Monster, Die!},
+	Year = {1965}}
+
+@article{Gaudreault.A:1993,
+	Address = {Basel and Frankfurt a.\,M.},
+	Author = {Gaudreault, André},
+	Issuetitle = {Georges Méliès -- Magier der Filmkunst},
+	Journal = {KINtop. Jahrbuch zur Erforschung des frühen Films},
+	Month = {11},
+	Number = {2},
+	Origdate = {1984},
+	Origlanguage = {english},
+	Pages = {31--44},
+	Title = {Theatralik, Narrativität und \enquote{Trickästhetik}. Eine Neubewertung der Filme von Georges Méliès},
+	Translator = {Kessler, Frank},
+	Year = {1993}}
+
+@incollection{Anderson.P:1971a,
+	Address = {New York},
+	Author = {Anderson, Poul},
+	Booktitle = {The Arbor House Treasury of Modern Science Fiction},
+	Editor = {Silverberg, Robert and Greenberg, Martin H.},
+	Origdate = {1971},
+	Pages = {715--754},
+	Publisher = {Arbor House},
+	Read = {1},
+	Title = {The Queen of Air and Darkness},
+	Year = {1980}}}
+
+@collection{Ackerman.Strickland:1981,
+	Address = {Bloomington},
+	Author = {Ackerman, Forrest J. and Strickland, A. W.},
+	Title = {A Reference Guide to American Science Fiction Films},
+	Volume = {1},
+	Year = {1981}}
+
+@incollection{Keitz.U:2004a,
+	Address = {Berlin},
+	Author = {von Keitz, Ursula},
+	Booktitle = {Zeitsprünge: wie Filme Geschichte(n) erzählen},
+	Editor = {Rüffert, Christine and Schenk, Irmbert and Tews, Karl-Heinz Schmid Alfred},
+	Options = {useprefix=false},
+	Pages = {151--161},
+	Publisher = {Bertz},
+	Title = {Das Zeitverlies: zur Deorientierung filmischer Chronologie in Alain Resnais' \film{L'année dernière à Marienbad}},
+	Year = {2004}}
+
+@article{vonMatt.P:2002,
+	Author = {von Matt, Peter},
+	Date = {2002-07-07},
+	Journal = {NZZ am Sonntag},
+	Options = {useprefix=false},
+	Pages = {68--69},
+	Title = {Wie Hoffmanns stolpernde Gestalten Sir Newton überlisten},
+	Titleaddon = {Zürcher Abschiedsvorlesung über die Theorie und Tradition der phantastischen Literatur}}
+
+@book{Coleridge:1983a,
+	Address = {Routlegde and Kegan Paul},
+	Author = {Coleridge, Samuel Taylor},
+	Editor = {Engell, James and Bate, W. Jackson},
+	Maintitle = {The Collected Works of Samuel Taylor Coleridge},
+	Number = {316},
+	Origdate = {1817},
+	Part = {2},
+	Publisher = {Princeton University Press},
+	Series = {The Bollinger Series},
+	Title = {Biographia Literaria, or Biographical Sketches of My Literary Life and Opinions},
+	Volume = {7},
+	Year = {1983}}
+
+@incollection{Lukian.1981,
+	Address = {Berlin and Weimar},
+	Author = {Lukian},
+	Bookauthor = {Lukian},
+	Edition = {2},
+	Editor = {Werner, Jürgen and Greiner-Mai, Herbert},
+	Maintitle = {Werke in drei Bänden},
+	Origlanguage = {greek},
+	Origtitle = {Alêthês Historia},
+	Pages = {301--349},
+	Series = {Bibliothek der Antike. Griechische Reihe},
+	Title = {Wahre Geschichte},
+	Translator = {Wieland, Christoph Martin},
+	Volume = {2},
+	Year = {1981}}
+
+@book{Wells.H:1908,
+	Address = {London},
+	Author = {Wells, H. G.},
+	Origdate = {1905},
+	Shorttitle = {A Modern Utopia},
+	Title = {Tono-Bungay and A Modern Utopia},
+	Year = {1908}}
+
+@book{Muller.A:2010a,
+	Address = {Berlin},
+	Author = {Müller, André},
+	Number = {24},
+	Publisher = {Lit},
+	Read = {1},
+	Series = {Politica et Ars},
+	Subtitle = {Positionen des fiktionalen Films zwischen Gattungstraditionen und gesellschaftlichen Zukunftsdiskursen},
+	Title = {Film und Utopie},
+	Year = {2010}}
+
+@review{Spiegel.S:2010c,
+	Author = {Spiegel, Simon},
+	Journal = {Zeitschrift für Fantastikforschung},
+	Number = {1},
+	Pages = {124--126},
+	Usera = {Muller.A:2010a},
+	Year = {2010}}
+
 @review{Spiegel.S:2009a,
 	Author = {Spiegel, Simon},
 	Date = {2009-12-17},
-	Date-Added = {2011-09-14 16:35:07 +0200},
-	Date-Modified = {2011-09-14 16:37:16 +0200},
 	Journal = {Basler Zeitung},
 	Pages = {21--23},
 	Title = {Welcome to Pandora},
@@ -22,22 +280,15 @@
 @movie{Cameron.J:2009b,
 	Address = {USA and GB},
 	Author = {Cameron, James},
-	Date-Added = {2011-09-14 16:34:07 +0200},
-	Date-Modified = {2011-09-14 16:34:07 +0200},
 	Pagetotal = {162},
-	Read = {Yes},
 	Subtitle = {Avatar -- Aufbruch nach Pandora},
 	Title = {Avatar},
-	Url = {http://imdb.com/title/tt0499549},
-	Year = {2009},
-	Bdsk-Url-1 = {http://imdb.com/title/tt0499549}}
+	Year = {2009}}
 
 @movie{Ball.A:2003a,
 	Address = {USA},
 	Author = {Ball, Alan},
 	Date = {2003/},
-	Date-Added = {2011-09-14 08:09:32 +0200},
-	Date-Modified = {2011-09-14 08:11:19 +0200},
 	Entrysubtype = {serial},
 	Organization = {HBO},
 	Title = {True Blood}}
@@ -61,21 +312,14 @@
 	Pages = {128--134},
 	Usera = {Oeuver.A:2010a},
 	Volume = {5},
-	Year = {2011},
-	Bdsk-Url-1 = {http://dx.doi.org/10.3167/proj.2011.050209}}
+	Year = {2011}}
 
 @book{Spiegel.S:2007b,
 	Address = {Marburg},
 	Author = {Spiegel, Simon},
-	Date-Added = {2011-08-24 16:57:12 +0200},
-	Date-Modified = {2011-08-24 16:57:12 +0200},
-	Isbn = {9783894725167},
-	Keywords = {Science Fiction, Film, Verfremdung, Suvin},
 	Number = {16},
 	Publisher = {Schüren},
-	Read = {Yes},
 	Series = {Zürcher Filmstudien},
-	Standort = {Privat},
 	Subtitle = {Zu einer Poetik des Science-Fiction-Films},
 	Title = {Die Konstitution des Wunderbaren},
 	Year = {2007}}
@@ -93,15 +337,9 @@
 @movie{Kubrick.S:1975,
 	Address = {GB and USA},
 	Author = {Kubrick, Stanley},
-	Date-Added = {2011-08-23 12:41:52 +0200},
-	Date-Modified = {2011-08-23 12:41:52 +0200},
-	Read = {Yes},
 	Title = {Barry Lyndon},
 	Year = {1975}}
 
-@set{todorov,
-	entryset = {Todorov.T:1970,Todorov.T:1992}}
-
 @book{Todorov.T:1992,
 	Address = {Frankfurt a.\,M.},
 	Author = {Todorov, Tzvetan},
@@ -119,18 +357,14 @@
 	Author = {Todorov, Tzvetan},
 	Title = {Introduction à la littérature fantastique},
 	Year = {1970}}
-	
-	
+
 @incollection{Poe.E:1982c,
 	Address = {London and New York},
 	Author = {Poe, Edgar Allan},
 	Bookauthor = {Poe, Edgar Allan},
 	Booktitle = {The Complete Tales and Poems of Edgar Allan Poe},
-	Date-Added = {2011-08-23 11:29:16 +0200},
-	Date-Modified = {2011-08-24 16:56:19 +0200},
 	Origdate = {1843},
 	Pages = {223--230},
-	Read = {Yes},
 	Title = {The Black Cat},
 	Usera = {Poe.E:1999a},
 	Year = {1982}}
@@ -140,8 +374,6 @@
 	Author = {Poe, Edgar Allan},
 	Bookauthor = {Poe, Edgar Allan},
 	Booktitle = {Der schwarze Kater. Erzählungen},
-	Date-Added = {2011-08-23 11:29:16 +0200},
-	Date-Modified = {2011-08-24 16:56:31 +0200},
 	Maintitle = {Gesammelte Werke in 5 Bänden},
 	Origdate = {1843},
 	Origlanguage = {american},
@@ -157,8 +389,6 @@
 	Address = {USA},
 	Author = {Lidelof, Damon and Cuse, Carlton and Abrams, J. J.},
 	Date = {2004/2010},
-	Date-Added = {2011-08-22 22:23:14 +0200},
-	Date-Modified = {2011-08-22 22:24:03 +0200},
 	Entrysubtype = {serial},
 	Organization = {ABC},
 	Title = {Lost}}
@@ -166,12 +396,9 @@
 @movie{Reardon.J:1994a,
 	Address = {USA},
 	Author = {Reardon, Jim},
-	Date-Added = {2011-08-22 22:21:27 +0200},
-	Date-Modified = {2011-08-22 22:21:27 +0200},
 	Maintitle = {The Simpsons},
 	Number = {6},
 	Rating = {5},
-	Read = {Yes},
 	Title = {Treehouse of Horror V},
 	Volume = {6},
 	Year = {1994}}
@@ -179,9 +406,6 @@
 @movie{Kubrick.S:1968,
 	Address = {GB and USA},
 	Author = {Kubrick, Stanley},
-	Date-Added = {2011-08-22 22:09:46 +0200},
-	Date-Modified = {2011-08-24 16:56:41 +0200},
-	Read = {Yes},
 	Shorttitle = {2001},
 	Subtitle = {2001: Odyssee im Weltraum},
 	Title = {2001: A Space Odyssey},
@@ -190,8 +414,6 @@
 @book{Kuhn.T:1976,
 	Address = {Frankfurt a.\,M.},
 	Author = {Kuhn, Thomas Samuel},
-	Date-Added = {2011-08-22 22:07:11 +0200},
-	Date-Modified = {2011-09-14 07:51:13 +0200},
 	Edition = {2., rev. u. um das Postskriptum von 1969 ergänzte Aufl.},
 	Origdate = {1962},
 	Origlanguage = {english},
@@ -199,7 +421,6 @@
 	Origpublisher = {University of Chicago Press},
 	Origtitle = {The Structure of Scientific Revolutions},
 	Publisher = {Suhrkamp},
-	Read = {Yes},
 	Title = {Die Struktur wissenschaftlicher Revolutionen},
 	Translator = {Vetter, Hermann},
 	Year = {1976}}
@@ -207,13 +428,10 @@
 @book{Kant.I:2004a,
 	Address = {Frankfurt a.\,M.},
 	Author = {Kant, Immanuel},
-	Date-Added = {2011-08-22 22:05:44 +0200},
-	Date-Modified = {2011-08-24 16:55:49 +0200},
 	Editor = {Weischedel, Wilhelm},
 	Maintitle = {Werkausgabe},
 	Origdate = {1790},
 	Publisher = {Suhrkamp},
-	Read = {Yes},
 	Title = {Kritik der Urteilskraft},
 	Volume = {10},
 	Year = {1996}}
@@ -222,8 +440,6 @@
 	Address = {München},
 	Author = {Å klovskij, Viktor},
 	Booktitle = {Texte zur allgemeinen Literaturtheorie und zur Theorie der Prosa},
-	Date-Added = {2011-08-22 21:52:47 +0200},
-	Date-Modified = {2011-08-24 16:56:02 +0200},
 	Editor = {Striedter, Jurij},
 	Maintitle = {Texte der Russsischen Formalisten},
 	Number = {6},
@@ -233,56 +449,17 @@
 	Origtitle = {Iskusstvo kak priem},
 	Pages = {3--35},
 	Publisher = {Wilhelm Fink Verlag},
-	Read = {Yes},
 	Series = {Theorie und Geschichte der Literatur und der der schönen Künste. Texte und Abhandlungen},
 	Title = {Die Kunst als Verfahren},
 	Translator = {Fieguth, Rolf},
 	Volume = {1},
-	Year = {1969},
-	Annote = {,,Somit kann eine Sache 1) geschaffen sein als prosaische
-		  und wahrgenommen werden als dichterische, 2) geschaffen
-		  sein als dichterische und wahrgenommen werden als
-		  prosaische. Das zeigt, dass das Künstlerische, das, was
-		  sich auf die Poesie einer gegebenen Sache beziehen
-		  lässt, Resultat der Art unseres Wahrnehmens ist;
-		  künstlerisch nun, im engen Sinne, wollen wir Dinge
-		  nenne, die in besonderen Verfahren hergestellt wurden,
-		  deren Zweck darin bestand, dass diese Werke mit
-		  grösstmöglicher Sicherheit als künstlerisch
-		  wahrgenommen würden.`` 7 ,,Ziel der Kunst ist es, ein
-		  Empfinden des Gegenstandes zu vermitteln, als Sehen und
-		  nicht als Wiedererkennen; das Verfahren der Kunst ist das
-		  Verfahren der ,,Verfremdung`` [ostranenie] der Dinge und
-		  das Verfahren der erschwerten Form, ein Verfahren, das die
-		  Schwierigkeit und Länge der Wahrnehmung steigert, denn
-		  der Wahrnehmungsprozess ist in der Kunst Selbszweck und
-		  muss verlängert werden: die Kunst ist ein Mittel, das
-		  Machen einer Sache zu erleben; das Gemachte hingegen ist in
-		  der Kunst unwichtig.`` 15 Tolstoj: Beschreibungen mit
-		  unüblichen Begriffen, nennt die Dinge nicht beim
-		  gebräuchlichen Namen, 17 ,,Untersuchen wir die
-		  dichterische Sprache sowohl in ihrem Laut- und Wortbestand
-		  als auch in ihrem Charakter der Anordnung der Worte und der
-		  Sinnstrukturen, die aus ihren Worten gefügt sind, so
-		  treffen wir überall auf dasselbe Merkmal des
-		  Künstlerischen: dass es absichtlich für eine vom
-		  Automatismus befreite Wahrnehmung geschaffen ist und dass
-		  das Ziel des Schöpfers das Sehen dieses
-		  Künstlerischen ist, und es ,,künstlich`` so gemacht
-		  ist, dass die Wahrnehmung bei ihm aufgehalten wird und ihre
-		  höchstmögliche Kraft und Dauer erreicht, wobei die
-		  Sache nicht in ihrer Dimension wahrgenommen wird, sondern
-		  gewissermassen in ihrer Kontinuität. Diesen Bedingungen
-		  nun enstpricht die ,,dichterische Sprache``.`` 31},
-	Bdsk-File-1 = {YnBsaXN0MDDUAQIDBAUIJidUJHRvcFgkb2JqZWN0c1gkdmVyc2lvblkkYXJjaGl2ZXLRBgdUcm9vdIABqAkKFRYXGyIjVSRudWxs0wsMDQ4RFFpOUy5vYmplY3RzV05TLmtleXNWJGNsYXNzog8QgASABqISE4ACgAOAB1lhbGlhc0RhdGFccmVsYXRpdmVQYXRo0hgNGRpXTlMuZGF0YU8RAcoAAAAAAcoAAgAADE1hY2ludG9zaCBIRAAAAAAAAAAAAAAAAAAAAMfUs/FIKwAAAAjbhQ0/Pz8jOERCODYucGRmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACNuGw86OSQAAAAAAAAAAAAIAAwAACSAAAAAAAAAAAAAAAAAAAAALPz8/IzhEQjg1LlYAABAACAAAx9SX0QAAABEACAAAw86AOQAAAAEAFAAI24UACNfYAAi+HQAIS2kAAJLzAAIAR01hY2ludG9zaCBIRDpVc2VyczpzaW1pOkRyb3Bib3g6UHVibGlrYXRpb25lbjo/Pz8jOERCODUuVjo/Pz8jOERCODYucGRmAAAOACwAFQBTAwwAawBsAG8AdgBzAGsAaQBqAC4AVgAxADkANgA5AGEALgBwAGQAZgAPABoADABNAGEAYwBpAG4AdABvAHMAaAAgAEgARAASAEVVc2Vycy9zaW1pL0Ryb3Bib3gvUHVibGlrYXRpb25lbi9TzIxrbG92c2tpai5WL1PMjGtsb3Zza2lqLlYxOTY5YS5wZGYAABMAAS8AABUAAgAL//8AAIAF0hwdHh9YJGNsYXNzZXNaJGNsYXNzbmFtZaMfICFdTlNNdXRhYmxlRGF0YVZOU0RhdGFYTlNPYmplY3RvEDYALgAuAC8ALgAuAC8AUAB1AGIAbABpAGsAYQB0AGkAbwBuAGUAbgAvAFMDDABrAGwAbwB2AHMAawBpAGoALgBWAC8AUwMMAGsAbABvAHYAcwBrAGkAagAuAFYAMQA5ADYAOQBhAC4AcABkAGbSHB0kJaIlIVxOU0RpY3Rpb25hcnkSAAGGoF8QD05TS2V5ZWRBcmNoaXZlcgAIABEAFgAfACgAMgA1ADoAPABFAEsAUgBdAGUAbABvAHEAcwB2AHgAegB8AIYAkwCYAKACbgJwAnUCfgKJAo0CmwKiAqsDGgMfAyIDLwM0AAAAAAAAAgEAAAAAAAAAKAAAAAAAAAAAAAAAAAAAA0Y=}}
+	Year = {1969}}
 
 @incollection{Kepler.J:1993,
 	Address = {München},
 	Author = {Kepler, Johannes},
 	Bookauthor = {Kepler, Johannes},
 	Booktitle = {Calendaria et prognostica. Astronomica minora. Somnium},
-	Date-Added = {2011-08-22 16:21:06 +0200},
-	Date-Modified = {2011-08-24 16:56:23 +0200},
 	Editora = {Bialas, Volker and Grössing, Helmuth},
 	Editoratype = {redactor},
 	Maintitle = {Gesammelte Werke},
@@ -297,30 +474,12 @@
 	Volume = {11},
 	Year = {1993}}
 
-@incollection{Wells.HG:1980,
-	Address = {Sussex},
-	Author = {Wells, H. G.},
-	Bookauthor = {Wells, H. G.},
-	Booktitle = {H.{\,}G. Wells's Literary Criticism},
-	Date-Added = {2011-08-22 15:55:56 +0200},
-	Date-Modified = {2011-08-24 16:56:12 +0200},
-	Editor = {Philmus, Robert M. and Parrinder, Patrick},
-	Origdate = {1938},
-	Pages = {248--249},
-	Publisher = {Harvester},
-	Read = {Yes},
-	Title = {Fiction about the Future},
-	Year = {1980}}
-
 @collection{clute.j:1999,
 	Address = {London},
-	Date-Added = {2011-08-22 15:46:27 +0200},
-	Date-Modified = {2011-08-24 16:55:56 +0200},
 	Edition = {2},
 	Editor = {Clute, John and Nicholls, Peter},
 	Origdate = {1979},
 	Publisher = {Orbit},
-	Read = {Yes},
 	Title = {The Encyclopedia of Science Fiction},
 	Year = {1999}}
 
@@ -331,7 +490,6 @@
 	Journal = {Critical Quarterly},
 	Number = {1},
 	Pages = {119--137},
-	Standort = {PDF},
 	Title = {Politics: Inside the Whale, or etsi communismus non daretur: Reflections on How to Live When a Truly Just Society is a Necessity but Nowhere on the Horizon},
 	Volume = {49},
 	Year = {2007}}
@@ -339,14 +497,12 @@
 @article{Suvin.D:2007a,
 	Author = {Suvin, Darko},
 	Journal = {Extrapolation},
-	Keywords = {Science Fiction, Krieg, USA, Starship Troopers},
 	Number = {1},
 	Pages = {9-34},
-	Standort = {PDF},
 	Title = {Of Starship Troopers and Refuseniks: War and Militarism in U.S. Science Fiction, Part 2},
 	Volume = {48},
-	Year = {2007}}$
-	
+	Year = {2007}}
+
 @book{Pearson.R:2009a,
 	Address = {London and New York},
 	Editor = {Pearson, Roberta E.},
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 0288ca603a5..727584961a8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
@@ -1,13 +1,14 @@
-% $Id: fiwi-yearbeginning.bbx, v 1.1c 2011/12/03 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v 1.1e 2011/12/21 Simon Spiegel
 % Stil mit Jahrestahl nach Autor
 
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.1c 2011/12/03 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.1d 2011/12/21 film studies bibliography style Author (Year)]
 
 \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}
 
+
 \renewcommand{\ppspace}{}
 
 \renewbibmacro*{labelyear+extrayear}{%
@@ -24,11 +25,8 @@
        {\addslash\printfield{origyear}}%
        {}%
        }}}
-
-
      
-             
-\renewbibmacro*{editor}{%
+\renewbibmacro*{incollectioneditor}{%
   \ifnameundef{editor}
     {\let\bbx@lasthash\@undefined}
     {{\ifnamesequal{author}{editor}{%
@@ -36,9 +34,9 @@
     {\bibstring{idempp}}%
     {\bibstring{idem\thefield{gender}}}}{%
     \printnames{editor}}\addspace
-	\savefield{namehash}{\bbx@lasthash}}%
+	\global\undef\bbx@lasthash}%
      \iffieldequalstr{entrytype}{book}{}{\usebibmacro{editorstrg}}}}  
-     
+       
 \renewbibmacro*{editorstrg}{%
   \printtext{\mkbibparens{\unspace
   \ifnum\theeditor>1
@@ -76,7 +74,7 @@
      \printfield{series}%
      \setunit{\addspace}}%
 \iffieldundef{volume}{}{\printfield{volume}\iffieldundef{number}{\iffieldundef{pages}{\addperiod}{\addcomma}}{\addcomma}}%
-  \setunit*{\adddot}%
+  \setunit*{\addperiod\addspace}%
 \iffieldundef{number}{}{\printtext{\addspace\printfield{number}}\addspace}%
 \ifnameundef{editor}{}{\addperiod\addspace\usebibmacro{byeditor}\setunit{\addcomma\space}}%
 \printfield{eid}%%
@@ -100,7 +98,7 @@
         \iftoggle{printpublisher}
      {\setunit{\isdot\addcolon\addspace}\printlist{publisher}\setunit{\addcomma\space}}%
           {}
-     }}
+     \iftoggle{dontprintorig}{\printfield{labelyear}}{}}}
      
 \newbibmacro*{publ+loc+origyear}{%
 \printlist{location}%
@@ -109,7 +107,7 @@
         {\setunit*{\space}}%
         {\setunit{\isdot\addcolon\space}\printlist{publisher}}}%
         {\setunit*{\space}}%        
-\usebibmacro{origyear}%
+\iftoggle{dontprintorig}{\iftoggle{printpublisher}{\addspace}{}\printfield{labelyear}}{}\usebibmacro{origyear}%
 }%     
 
 \newbibmacro*{inst+loc}{%
@@ -124,6 +122,34 @@
         \setunit{\isdot\addcolon\space}}%
      \printlist{institution}}}
 
+\renewbibmacro*{author}{%
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
+       {\usebibmacro{bbx:savehash}%
+        \printnames{author}%
+	\iffieldundef{authortype}
+	  {\setunit{\addspace}}
+	  {\setunit{\addcomma\space}}}%
+     \iffieldundef{authortype}
+       {}
+       {\usebibmacro{authorstrg}%
+	\setunit{\addspace}}}%
+    {\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}}     
 
 \DeclareBibliographyDriver{review}{%
 \usebibmacro{bibindex}%
@@ -170,10 +196,10 @@
 \newunit\newblock%
 \usebibmacro{doi+eprint+url}%
 %\setunit{.}\newblock
-\addspace\usebibmacro{origyear+location+title}%
+%\addspace\usebibmacro{origyear+location+title}%
+\newblock
+\addspace\usebibmacro{decidetranslatedversion}%
 \newblock
-\usebibmacro{decidetranslatedversion}%
-  \newblock
 \usebibmacro{addendum+pubstate}%
 \newunit\newblock
 \usebibmacro{pageref}%
@@ -183,8 +209,9 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{test:partofcited}%
-  \usebibmacro{author/translator}%
-  \usebibmacro{labelyear+extrayear}%
+  \iftoggle{dontprintorig}{}%
+  {\usebibmacro{author/translator}%
+  \usebibmacro{labelyear+extrayear}}%
 %\newunit\newblock
   \usebibmacro{title}%
   \newunit\newblock
@@ -193,12 +220,14 @@
   \usebibmacro{in:}%
   %\newunit%
   \iftoggle{partofcited}
-  {\citetext{\thefield{xref}}}
+  {\iffieldundef{xref}
+  {\mancite\textcite{\thefield{crossref}}}
+  {\mancite\textcite{\thefield{xref}}}}
   {\newblock%
   \ifnameundef{bookauthor}%
   {\ifnameundef{editor}
   {}
-  {\usebibmacro{editor}}}
+  {\usebibmacro{incollectioneditor}}}
   {\usebibmacro{bybookauthor}}
   %\newunit
   \newblock%
@@ -231,7 +260,7 @@
   \usebibmacro{chap+pag}%
   %\setunit{\par}\newblock
   %\usebibmacro{doi+eprint+url}%
-  \newunit\newblock
+  \newblock
   \addspace\usebibmacro{decidetranslatedversion}%
   \newblock
   \usebibmacro{addendum+pubstate}%
@@ -242,13 +271,14 @@
   \DeclareBibliographyDriver{book}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \ifnameundef{author}%
+  \iftoggle{dontprintorig}
+  {}
+  {\ifnameundef{author}%
   {\ifnameundef{editor}%
   {}
-  {\usebibmacro{editor}\addspace}%
-  \usebibmacro{editorstrg}\addspace}%
+  {\usebibmacro{editor}\addspace}}%
 {\usebibmacro{author/translator+others}}%
-AA\usebibmacro{labelyear+extrayear}%
+\usebibmacro{labelyear+extrayear}}%
 \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 31da9091322..96475501b9b 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.1b 2011/11/22 Simon Spiegel
+% $Id: fiwi.bbx, v1.1d 2011/12/21 Simon Spiegel
 
-\ProvidesFile{fiwi.bbx}[v1.1b 2011/11/22 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.1d 2011/12/21 film studies bibliography style]
 
 \@ifpackagelater{biblatex}{2011/11/12}
      {}
@@ -14,11 +14,18 @@
 \RequireBibliographyStyle{standard}
 \RequireBiber[2]
 
+
+\defcounter{highnamepenalty}{0}
+\defcounter{lownamepenalty}{0}
+
+\renewcommand*{\multinamedelim}{\addslash}%
+\renewcommand*{\finalnamedelim}{\addslash}%
+
+
 % Diverse Variablen
 \providetoggle{filmruntime}
 \providetoggle{citeprefix}
 \toggletrue{citeprefix}
-\providetoggle{bibliographydash}
 \providetoggle{printseriesflag}
 \providetoggle{printpublisher}
 \providetoggle{germfassung}
@@ -33,7 +40,12 @@
 \togglefalse{origyearwithyear}
 \providetoggle{origyearsuperscript}
 \togglefalse{origyearsuperscript}
+\providetoggle{partofcitedflag}
+\togglefalse{partofcitedflag}
+\providetoggle{partofcited}
+\togglefalse{partofcited}
 
+\DeclareBibliographyOption{partofcited}[true]{\settoggle{partofcitedflag}{#1}}
 \DeclareBibliographyOption{germ}[true]{\settoggle{germfassung}{#1}}
 \DeclareBibliographyOption{noseries}[true]{%
 \ifstrequal{#1}{true}
@@ -46,10 +58,10 @@
 \DeclareBibliographyOption{publisher}[true]{\settoggle{printpublisher}{#1}}%
 \DeclareBibliographyOption{filmruntime}[true]{\settoggle{filmruntime}{#1}}%
 \DeclareBibliographyOption{citeprefix}[true]{\settoggle{citeprefix}{#1}}
+\newbibmacro*{bbx:savehash}{}
 \DeclareBibliographyOption{dashed}[true]{%
   \ifstrequal{#1}{true}
-    {\toggletrue{bibliographydash}%
-     \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
+    {\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
     {\renewbibmacro*{bbx:savehash}{}}}
 \DeclareBibliographyOption{yearatbeginning}[true]{%
 \ifstrequal{#1}{true}
@@ -58,7 +70,7 @@
 \DeclareBibliographyOption{origyearsuperscript}[true]{\settoggle{origyearsuperscript}{#1}}
 
 
-\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=3,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{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}
 
 \InitializeBibliographyStyle{%
@@ -68,7 +80,6 @@
 \newcommand*{\filmruntime}{\toggletrue{filmruntime}}% Schaltet Filmlaufzeit in Filmographie ein
 \newcommand*{\nopublisher}{\togglefalse{printpublisher}}% Verlag ein oder aus, standardmässig ein
 \newcommand*{\noseries}{\togglefalse{printseriesflag}}% Reihe ein oder aus, standardmässig ein
-\newcommand*{\bibliographydash}{\toggletrue{bibliographydash}}% Ersetzen von wiederh. Autoren in Bibliographie, standardmässig aus
 \newcommand*{\nociteprefix}{\togglefalse{citeprefix}}% Schaltet Namens-Prefix aus
 
 \renewcommand*{\mkbibnameprefix}[1]{#1\addspace}
@@ -153,14 +164,21 @@
 
 % name format definitions
 
-\DeclareNameFormat{sortname}{%
-    \iffirstinits
-      {\usebibmacro{name:last-first}{#1}{#4}{\bibsentence#5}{#7}}%
-      {\usebibmacro{name:last-first}{#1}{#3}{\bibsentence#5}{#7}}%#5
-    \ifblank{#3#5}
-      {}
-      {\usebibmacro{name:revsdelim}}%
+
+  
+  \DeclareNameFormat{sortname}{%
+  \ifnumequal{\value{listcount}}{1}
+    {\iffirstinits
+       {\usebibmacro{name:last-first}{#1}{#4}{\bibsentence#5}{#7}}
+       {\usebibmacro{name:last-first}{#1}{#3}{\bibsentence#5}{#7}}%
+     \ifblank{#3#5}
+       {}
+       {\usebibmacro{name:revsdelim}}}
+    {\iffirstinits
+       {\usebibmacro{name:last-first}{#1}{#4}{\bibsentence#5}{#7}}
+       {\usebibmacro{name:last-first}{#1}{#3}{\bibsentence#5}{#7}}}%
   \usebibmacro{name:andothers}}
+
   
 \DeclareNameFormat{bytranslator}{%
     \iffirstinits
@@ -190,6 +208,7 @@
   \mkbibnamelast{#1}\isdot
   \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
 
+
 \renewbibmacro*{name:last-first}[4]{%
   \ifuseprefix%
     {\usebibmacro{name:delim}{#3#1}%
@@ -455,35 +474,61 @@ january          = {Januar},
   \printfield{pubstate}}
 
 \renewbibmacro*{author}{%
-\iftoggle{usera}
-{}
-{%
-  \ifnameundef{author}
-    {\let\bbx@lasthash\@undefined}
-    \iftoggle{bibliographydash}
-    	{\usebibmacro{bbx:dashcheck}
-    		{\bibnamedash}%
-    		{\usebibmacro{bbx:savehash}%
-    		\printnames{author}\iffieldundef{nameaddon}
-    		{}{\printfield{nameaddon}}}%
-    \isdot\addcolon\addspace}
-    {\printnames{author}\iffieldundef{nameaddon}
-    {}{\printfield{nameaddon}}%  
-       \global\undef\bbx@lasthash%
-       \isdot\addcolon\addspace%
-        }}}%
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
+       {\usebibmacro{bbx:savehash}%
+        \printnames{author}%
+	\iffieldundef{authortype}
+	  {\setunit{\addspace}\addcolon\addspace}
+	  {\setunit{\addcomma\space}}}%
+     \iffieldundef{authortype}
+       {}
+       {\usebibmacro{authorstrg}\addcolon\addspace%
+	\setunit{\addspace}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\addspace}}}
+     
+    
 
 \renewbibmacro*{editor}{%
+  \usebibmacro{bbx:editor}{editorstrg}}
+\renewbibmacro*{editor+others}{%
+  \usebibmacro{bbx:editor}{editor+othersstrg}}
+\newbibmacro*{bbx:editor}[1]{%
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
+       {\printnames{editor}%
+	\addspace%
+	\usebibmacro{bbx:savehash}}%
+     \usebibmacro{#1}%
+     \clearname{editor}%
+     \setunit{\addspace}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\addspace}}}
+     
+\newbibmacro*{incollectioneditor}{%
   \ifnameundef{editor}
     {}
     {\iftoggle{dontprintorig}%
-    {\printnames{editor}\addspace}
+    {\printnames{editor}}%
     {\ifnamesequal{author}{editor}%
     {\ifthenelse{\value{author}>1}%
-    {\bibstring{idempp}}%
-    {\bibstring{idem\thefield{gender}}}}%
-    {\printnames{editor}}\addspace}}%
-     \usebibmacro{editorstrg}}
+    {\bibstring{idempp}\addnbspace}%
+    {\bibstring{idem\thefield{gender}}\addnbspace}}%
+    {\printnames{editor}}}}%
+     \usebibmacro{editorstrg}}     
      
 \newbibmacro*{collby}{%
 \ifnameundef{author}%
@@ -597,10 +642,6 @@ or test {\iffieldequalstr{entrytype}{set}}}
   \newunit
   \printfield{titleaddon}}
 
-\newbibmacro*{bbx:savehash}{%
-  \savefield{fullhash}{\bbx@lasthash}}
-
-
 \newbool{bbx@inset}
 
 \DeclareBibliographyDriver{set}{%
@@ -631,7 +672,9 @@ or test {\iffieldequalstr{entrytype}{set}}}
   }
     {#1}
     {#2}}
-    
+ 
+
+
 \newbibmacro*{decidetranslatedversion}
 {%
 \iftoggle{dontprintorig}
@@ -823,13 +866,38 @@ or test {\iffieldequalstr{entrytype}{set}}}
 \iftoggle{printseriesflag}%
 {\iffieldundef{series}%
 {}%
-    {\setunit{}\addnbspace\printtext{\mkbibparens{=\addspace%
+    {\setunit{}\addspace\printtext{\mkbibparens{=\addnbspace%
        \printfield{series}%
-       \setunit{\addcolon\addnbspace}%
-       \printfield{number}}}\adddot\addnbspace}%
+       \iffieldundef{number}{}{\setunit{\addcolon\addnbspace}%
+       \printfield{number}}}}\adddot\addnbspace}%
 }}%
 {}
 
+\newbibmacro*{test:partofcited}{%
+  \ifboolexpr{(
+  test {\iffieldundef{crossref}} )
+  and test {\iffieldundef{xref}} }
+  {}
+  {%
+  \ifboolexpr{( 
+  test {\iftoggle{partofcitedflag}}
+  and test {\ifentryseen{\thefield{xref}}}
+  )
+  or (
+  test {\iftoggle{partofcitedflag}}
+  and test {\ifentryseen{\thefield{crossref}}}
+  )}
+  {\toggletrue{partofcited}}{}}%
+  }
+
+\newbibmacro*{bbx:authorvolumepartof}{% Derzeit nicht gebraucht
+\ifnameundef{bookauthor}%
+  {\ifnameundef{editor}
+  {}
+  {\printnames[labelname][-1]{editor}}}
+  {\printnames[labelname][-1]{bookauthor}}
+\addspace\mkbibparens{\printfield{year}}}
+
 \DeclareBibliographyDriver{review}{%
 \usebibmacro{bibindex}%
 \usebibmacro{begentry}%
@@ -885,6 +953,7 @@ or test {\iffieldequalstr{entrytype}{set}}}
 \DeclareBibliographyDriver{incollection}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
+  \usebibmacro{test:partofcited}%
   \iftoggle{dontprintorig}{}{\usebibmacro{author/translator}}%
 %\newunit\newblock
   \usebibmacro{title}%
@@ -896,11 +965,15 @@ or test {\iffieldequalstr{entrytype}{set}}}
   \newunit\newblock
   \usebibmacro{in:}%
   %\newunit%
-  \newunit\newblock%
+  \iftoggle{partofcited}%
+  {\iffieldundef{xref}%
+  {\mancite\textcite{\thefield{crossref}}}%
+  {\mancite\textcite{\thefield{xref}}}}%
+  {\newunit\newblock%
   \ifnameundef{bookauthor}%
   {\ifnameundef{editor}
   {}
-  {\usebibmacro{editor}}}
+  {\usebibmacro{incollectioneditor}}}
   {\usebibmacro{bybookauthor}}
   %\newunit
   \newblock%
@@ -938,7 +1011,7 @@ or test {\iffieldequalstr{entrytype}{set}}}
   \addspace\usebibmacro{decidetranslatedversion}%
   \newblock
   \usebibmacro{addendum+pubstate}%
-  \newblock
+  \newblock}
   \usebibmacro{pageref}%  
   \usebibmacro{finentry}}
   
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index cf8805adc29..60027c4224c 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.1b 2011/11/22 Simon Spiegel
+% $Id: fiwi.cbx,v 1.1d 2011/12/21 Simon Spiegel
 
 \ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.1b 2011/11/22 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx,v 1.1d 2011/12/21 spiegel $]
 
 
 \ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true}
@@ -93,8 +93,6 @@
 \renewbibmacro*{index:title}[2]{%
   \iftoggle{xindy}{\usebibmacro{xindy:field}}{\usebibmacro{index:field}}{#1}{\thefield{indexsorttitle}}{\emph{#2}}}
 
-\renewcommand*{\multinamedelim}{\addslash}%
-\renewcommand*{\finalnamedelim}{\addslash}%
 \renewcommand{\postnotedelim}{\addcolon\addspace}
 \renewcommand{\sqspace}{\addnbthinspace}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index aa6e04eaa5e..7a23fe248c8 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.1b 2011/11/22 Simon Spiegel
+% $Id: fiwi2.bbx, v 1.1d 2011/12/21 Simon Spiegel
 % Stil mit Jahrestahl nach Autor
 
-\ProvidesFile{fiwi2.bbx}[v 1.1b 2011/11/22 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.1d 2011/12/21 film studies bibliography style Author (Year)]
 
 \RequireBibliographyStyle{fiwi}
 \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 ab4d220b87b..f293e346210 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.1b 2011/11/22 Simon Spiegel
+% $Id: fiwi2.cbx,v 1.1d 2011/12/21 Simon Spiegel
 
 \ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.1b 2011/11/22 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx,v 1.1d 2011/12/21 spiegel $]
 
 
 \RequireCitationStyle{fiwi}