summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-fiwi/README2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdfbin236142 -> 235816 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx146
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx36
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx2
10 files changed, 124 insertions, 101 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/README b/Master/texmf-dist/doc/latex/biblatex-fiwi/README
index 7cf94d26b2f..94589a11491 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 2012/12/03 v1.2a
+biblatex-fiwi 2012/12/09 v1.2b
Copyright (c) 2011-2012 Simon Spiegel <simon(at)simifilm.ch>
************************************************************
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 91cd2f4f116..83d3988d1ca 100644
--- a/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf
Binary files differ
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 e32a0646582..aed94d2bcb7 100644
--- a/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex
@@ -1,5 +1,5 @@
%!TEX encoding = IsoLatin9
-% biblatex-fiwi,v 1.2a 2012/12/03
+% biblatex-fiwi,v 1.29 2012/12/09
\documentclass{ltxdockit}
\usepackage[latin9]{inputenc}
\usepackage{hyphsubst}
@@ -30,7 +30,7 @@
url={http://www.ctan.org/tex-archive/macros/latex/contrib/csquotes/},
author={Simon Spiegel},
email={simon@simifilm.ch},
- revision={1.2a},
+ revision={1.2b},
date={\rcstoday}}
\hypersetup{%
@@ -121,11 +121,11 @@ Bug"=Reports oder Fragen und Anregungen zur Weiterentwicklung des Stils sind ste
\subsection{License}
-Copyright © 2003--2011 Simon Spiegel. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt} This package is author"=maintained.
+Copyright © 2003--2013 Simon Spiegel. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt} This package is author"=maintained.
\subsection{Voraussetzungen}
-\sty{biblatex-fiwi} benötigt \sty{biblatex} ab Version 2.0. Die Verwendung des \bibtex{}"=Ersatzes \bin{biber}\fnurl{http://biblatex-biber.sourceforge.net/} in der Version 1.0 oder höher wird dringend empfohlen. Zwar sollten diverse Funktionen auch mit \bibtex funktionieren, ich selber verwende aber seit längerem ausschließlich \bin{biber} und kann deshalb für nichts garantieren. Da mittlerweile sowohl \bin{biber} als auch \sty{biblatex} Bestandteil der \TeX{}"=Distributionen \TeX{}~Live\fnurl{http://www.tug.org/texlive} und MiK\TeX{}\fnurl{http://www.miktex.org} sind, sollten beide den meisten Benutzern ohnehin zur Verfügung stehen.
+\sty{biblatex-fiwi} benötigt \sty{biblatex} ab Version 2.4. Die Verwendung des \bibtex{}"=Ersatzes \bin{biber}\fnurl{http://biblatex-biber.sourceforge.net/} in der Version 1.4 oder höher wird dringend empfohlen. Zwar sollten diverse Funktionen auch mit \bibtex funktionieren, ich selber verwende aber seit längerem ausschließlich \bin{biber} und kann deshalb für nichts garantieren. Da mittlerweile sowohl \bin{biber} als auch \sty{biblatex} Bestandteil der \TeX{}"=Distributionen \TeX{}~Live\fnurl{http://www.tug.org/texlive} und MiK\TeX{}\fnurl{http://www.miktex.org} sind, sollten beide den meisten Benutzern ohnehin zur Verfügung stehen.
\subsection{Zu dieser Anleitung}
Diese Anleitung behandelt nur die spezifischen Anpassungen und Eigenheiten von \sty{biblatex-fiwi} und ist nicht als allgemeine Einführung in \sty{biblatex} gedacht. Für Informationen zu \sty{biblatex} empfehle ich das exzellente \sty{biblatex}"=Manual sowie die deutschsprachige Einführung von Dominik Waßenhoven\fnurl{http://biblatex.dominik-wassenhoven.de/dtk.shtml}.
@@ -1012,7 +1012,13 @@ Für die Beispiele wurden folgende Optionen zusätzlich zu den Standardeinstellun
\section{Versionsgeschichte}
+
\begin{changelog}
+
+\begin{release}{1.2b}{2012-12-09}
+\item Korrigiert zwei dumme Fehler der vorhergehen Version
+\end{release}
+
\begin{release}{1.2a}{2012-12-03}
\item Neue Optionen \opt{ignoreforeword}, \opt{ignoreafterword}, \opt{ignoreintroduction} und \opt{ignoreparatext} (Anregung von Rolf Niepraschk) \see{opt}
\item Dazu passende Befehle für Wechsel innerhalb des Dokuments \see{opt}
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 246fabdafbc..af899f16989 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.2a 2012/12/03 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v 1.2b 2012/12/09 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2a 2012/12/03 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2b 2012/12/09 film studies bibliography style Author (Year)]
\RequireBibliographyStyle{fiwi}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index b1161045a5f..37550efebee 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
@@ -1,12 +1,12 @@
-% $Id: fiwi.bbx, v1.2a 2012/12/03 Simon Spiegel
+% $Id: fiwi.bbx, v1.2b 2012/12/09 Simon Spiegel
-\ProvidesFile{fiwi.bbx}[v1.2a 2012/12/03 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.2b 2012/12/09 film studies bibliography style]
-\@ifpackagelater{biblatex}{2012/07/01}
+\@ifpackagelater{biblatex}{2012/11/26}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
- {The 'fiwi' style requires biblatex v2.0 or later.\MessageBreak
+ {The 'fiwi' style requires biblatex v2.4 or later.\MessageBreak
You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
@@ -14,6 +14,37 @@
\RequireBibliographyStyle{standard}
%\RequireBiber[2]
+\DeclareSourcemap{
+ \maps[datatype=bibtex]{
+ \map{
+ \pertype{movie}
+ \pertype{misc}
+ \pertype{video}
+ \step[fieldsource=author, fieldtarget=director, final]
+}
+\map{
+ \pertype{movie}
+ \pertype{misc}
+ \pertype{video}
+ \step[fieldsource=director]
+ \step[fieldset=author, origfieldval]
+}
+\map{
+ \pertype{movie}
+ \pertype{misc}
+ \pertype{video}
+ \step[fieldsource=editor, fieldtarget=scriptwriter, final]
+}
+ \map{
+ \pertype{movie}
+ \pertype{misc}
+ \pertype{video}
+ \step[fieldsource=scriptwriter]
+ \step[fieldset=editor, origfieldval]
+}
+}
+}
+
\defcounter{highnamepenalty}{0}
\defcounter{lownamepenalty}{0}
@@ -23,7 +54,8 @@
%\renewcommand*{\finentrypunct}{\iftoggle{dontprintorig}{}{\addperiod}}
-% Diverse Variablen
+% Diverse Schalter
+
\providetoggle{filmruntime}
\providetoggle{citeprefix}
\toggletrue{citeprefix}
@@ -74,9 +106,7 @@
\providetoggle{ignoreaddendumcit}
\togglefalse{ignoreaddendumcit}
-
-
-\DeclareDatamodelFields[type=field, datatype=literal]{parttitle}
+% BibliographyOptions
\DeclareBibliographyOption{ignoreaddendum}[true]{%
\ifstrequal{#1}{true}
@@ -196,8 +226,6 @@
{\settoggle{origyearwithyear}{#1}}{}
\ifstrequal{#1}{brackets}{\toggletrue{origyearwithyear}
\toggletrue{origyearbrackets}{}}}
-
-
\DeclareBibliographyOption{origyearsuperscript}[true]{\settoggle{origyearsuperscript}{#1}}
\DeclareBibliographyOption{pages}[true]{%
\ifstrequal{#1}{true}
@@ -213,27 +241,19 @@
{\toggletrue{citepages}}
{}
}%
+
+\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}
-% 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
+
+% Schalter als Befehle
+\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*{\nociteprefix}{\togglefalse{citeprefix}}% Schaltet Namens-Prefix aus
\newcommand*{\ignoreaddendumtrue}{\toggletrue{ignoreaddendum}}
\newcommand*{\ignoreaddendumfalse}{\togglefalse{ignoreaddendum}}
\newcommand*{\ignoreforewordtrue}{\toggletrue{ignoreforeword}}
@@ -246,28 +266,14 @@
\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}
-
-\InitializeBibliographyStyle{%
- \let\bbx@lasthash\undefined}
+\newcommand*{\ignorelocationtrue}{\togglefalse{printaddress}}
+\newcommand*{\ignorelocationfalse}{\toggletrue{printaddress}}
-% Schalter als Befehle
-\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*{\nociteprefix}{\togglefalse{citeprefix}}% Schaltet Namens-Prefix aus
-
\renewcommand*{\mkbibnameprefix}[1]{#1\addspace}
\renewrobustcmd*{\bibnamedelimi}{\addnbthinspace}
\renewrobustcmd*{\bibinitdelim}{\addnbthinspace}
-\DeclareBibliographyCategory{ubers}
% format definitions
@@ -291,14 +297,31 @@
{\mkpageprefix[pagination]{#1}}
{#1}}
+\DeclareFieldFormat{tvmaintitle}{\film{#1}\addcolon\addspace}
+%\DeclareFieldFormat{labelyear}{\mknumalph{#1}}
+\DeclareFieldFormat{film}{\film{#1}}
+\DeclareFieldFormat{title}{\mkbibemph{#1}}
+\DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot}
+\DeclareFieldFormat[movie]{citetitle}{\film{#1}}
+\DeclareFieldAlias[misc]{title}[movie]{title}
+\DeclareFieldAlias[video]{title}[movie]{title}
+
+\DeclareIndexFieldAlias[movie]{indextitle}[misc]{indextitle}
+\DeclareIndexFieldAlias[video]{indextitle}[misc]{indextitle}
+
+\DeclareBibliographyAlias{movie}{misc}
+\DeclareBibliographyAlias{video}{misc}
+
%\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}}
-\DeclareFieldFormat{booksubtitle}{\mkbibemph{#1}}
+\DeclareFieldFormat{subtitle}{#1}
+
+\DeclareFieldFormat[movie,misc,video]{subtitle}{\mkbibparens{#1}\addperiod}
+%\DeclareFieldFormat{booksubtitle}{\mkbibemph{#1}}
\DeclareFieldFormat{shorthandwidth}{#1}
\DeclareFieldFormat{film}{\film{#1}}
\DeclareFieldFormat{plain}{\mkbibparens{#1}.}
@@ -310,7 +333,7 @@
\DeclareFieldFormat{episode}{\bibstring{tvepisode} #1}
\DeclareFieldFormat{urldate}{\addthinspace --\addnbspace\bibstring{urlseen}\space#1}
\DeclareFieldFormat{url}{$\langle$\url{#1}$\rangle$}
-\DeclareFieldFormat[misc]{pagetotal}{#1\bibstring{minutes}}
+\DeclareFieldFormat[misc,movie,video]{pagetotal}{#1\bibstring{minutes}}
\DeclareFieldFormat[online]{note}{#1~\adddot}
\DeclareFieldFormat{origendyear}{\bibdatedash#1}
\DeclareFieldFormat{endyear}{\bibdatedash#1\iffieldequalstr{endyear}{}
@@ -364,10 +387,15 @@
\DeclareNameAlias{withannotator}{bytranslator}
\DeclareNameAlias{withintroduction}{bytranslator}
\DeclareNameAlias{withforeword}{bytranslator}
+\DeclareNameAlias[misc,movie,video]{author}[movie]{director}
+\DeclareNameAlias[misc,movie,video]{scriptwriter}[movie]{director}
\DeclareNameAlias{author}{sortname}
\DeclareNameAlias{editor}{author}
\DeclareNameAlias{bookauthor}{author}
+
+
+
% name format definitions
\DeclareNameFormat{sortname}{%
@@ -399,7 +427,7 @@
{}
{\usebibmacro{name:revsdelim}}%
\usebibmacro{name:andothers}}
-
+
\newbibmacro*{director:first-last}[4]{%
\usebibmacro{name:delim}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
@@ -526,6 +554,7 @@
\nosort{type_title}{\regexp{\ALes\s+}}
\nosort{type_title}{\regexp{\ALos\s+}}
\nosort{type_title}{\regexp{\AL'\s+}}
+\nosort{type_title}{\regexp{\AO\s+}}
}
\DeclareStyleSourcemap{
\maps{
@@ -1161,11 +1190,12 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
\newbibmacro*{filmtitle}
{\iffieldundef{maintitle}
-{\printfield[film]{title}}
+{\printtext{\printfield[film]{title}}}
{\printfield[film]{maintitle}\newunit}%
\iffieldundef{subtitle}%
{}%
-{\setunit{}\addspace\printfield[plain]{subtitle}}%
+{\setunit{}%
+\printtext{\addspace\printfield{subtitle}}}%
\iffieldundef{volume}%
{}%
{\printfield[season]{volume}}%
@@ -1190,12 +1220,8 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
{\printlist{organization}}
}
-\newbibmacro*{director}{%
-\ifnameundef{director}
-{\ifnameundef{author}
-{}
-{\ifpunct{\unspace}{}\printnames[director]{author}}}
-{\ifpunct{\unspace}{}\printnames[director]{director}}
+\newbibmacro*{directors}{%
+\ifpunct{\unspace}{}\printnames{director}
}
\newbibmacro*{mtitle+vol+btitle+bstitle}{%
@@ -1578,13 +1604,13 @@ and (test {\iffieldundef{origyear}}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{misc}{%
+\DeclareBibliographyDriver{movie}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\newblock%
\usebibmacro{filmtitle}%
\newunit\newblock%
- \usebibmacro{director}%
+ \usebibmacro{directors}%
\iffieldundef{entrysubtype}
{\usebibmacro{movie:regular}}%
{\iffieldequalstr{entrysubtype}{serial}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index 483d52aa2f6..185f5e0ebe8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
@@ -1,19 +1,21 @@
-% $Id: fiwi.cbx,v 1.2a 2012/12/03 Simon Spiegel
+% $Id: fiwi.cbx,v 1.2b 2012/12/09 Simon Spiegel
\ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.2a 2012/12/03 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx,v 1.2b 2012/12/09 spiegel $]
\ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true}
+\RequireBibliographyStyle{fiwi}
+
+
\newbool{cbx@bool}
\providetoggle{citefullfilm}
\newcommand*{\fullcitefilm}{\settoggle{citefullfilm}{true}}
\DeclareBibliographyOption{fullcitefilm}[false]{\settoggle{citefullfilm}{#1}}
-
\providetoggle{citecompletefilm}
\newcommand*{\completecitefilm}{\settoggle{citecompletefilm}{true}}
@@ -37,29 +39,15 @@
\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}}
-\DeclareFieldFormat[misc]{subtitle}{#1}
-\DeclareFieldFormat[movie]{subtitle}{#1}
-\DeclareFieldFormat{title}{\mkbibemph{#1}}
\DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot}
-\DeclareFieldFormat[misc]{citetitle}{\film{#1}}
-\DeclareIndexFieldFormat[misc]{indextitle}{%
+\DeclareFieldFormat[misc,video,movie]{citetitle}{\film{#1}}
+\DeclareIndexFieldFormat[movie,misc,video]{indextitle}{%
\usebibmacro{index:filmtitle}{\index}{#1}}
\DeclareIndexNameFormat{default}{%
\iftoggle{xindy}{\usebibmacro{xindy:name}{\index}{#1}{#3}{#5}{#7}}
{\usebibmacro{index:name}{\index}{#1}{#3}{#5}{#7}}}
-\DeclareFieldAlias[movie]{title}[misc]{title}
-\DeclareFieldAlias[video]{title}[misc]{title}
-
-\DeclareIndexFieldAlias[movie]{indextitle}[misc]{indextitle}
-\DeclareIndexFieldAlias[video]{indextitle}[misc]{indextitle}
-
-\DeclareBibliographyAlias{movie}{misc}
-\DeclareBibliographyAlias{video}{misc}
-
\DeclareNameFormat{labelname}{%
\ifcase\value{uniquename}%
@@ -124,7 +112,7 @@
% Zitierbefehle für Filme und Serien
\newbibmacro*{cite:tv}{%
-\ifciteseen{\ifboolexpr{ test {\ifnameundef{author}}
+\ifciteseen{\ifboolexpr{ test {\ifnameundef{director}}
and test {\iffieldundef{maintitle}}}
{\iffieldundef{extratitle}
{\usebibmacro{cite:filmtitle}}
@@ -163,7 +151,7 @@ and test {\iffieldundef{maintitle}}}
\printtext[bibhyperref]{\printfield[film]{title}
\addspace\mkbibparens{%
\printlist{location}\iflistundef{organization}{}{\addcomma\addspace\printlist{organization}}\addspace\printfield[]{year}\addcomma\addspace%
-\printnames[director]{author}\unspace}}}%
+\printnames[director]{director}\unspace}}}%
\newbibmacro*{cite:film}{%
\iftoggle{citefullfilm}%
@@ -211,14 +199,14 @@ and test {\iftoggle{citecompletefilm}}}
\printtext[bibhyperref]{\printfield[film]{title}}%
\addspace\printtext[citeyear]%
{\printfield{subtitle}\setunit*{\addcomma\addspace}%
- \printnames[director]{author}\addcomma\addthinspace\printlist{location}%
+ \printnames[director]{director}\addcomma\addthinspace\printlist{location}%
\addspace\printfield{year}}
}
\newbibmacro*{cite:film:directorcountry}{% Film mit Regisseur
\printtext[bibhyperref]{\printfield[film]{title}}%
\addspace\mkbibparens{%
- \printnames[director]{author}%
+ \printnames{director}%
\addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}
\newbibmacro*{cite}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
index c5445d99745..0273f1a8aa4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
@@ -16,13 +16,16 @@
%%
-\ProvidesFile{fiwi.dbx}[2012/12/03 1.2a film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2012/12/09 1.2b film studies bibliography style data model]
\RequireBiber[3]
-\DeclareDatamodelFields[type=list, datatype=name]{
- director}
+\DeclareDatamodelFields[type=field, datatype=literal]{parttitle}
+\DeclareDatamodelFields[type=list, datatype=name]{director}
+\DeclareDatamodelFields[type=list, datatype=name]{scriptwriter}
+\DeclareDatamodelFields[type=list, datatype=name]{actor}
-\DeclareDatamodelEntryfields[movie]{
- director}
+\DeclareDatamodelEntryfields[movie]{director}
+\DeclareDatamodelEntryfields[movie]{scriptwriter}
+\DeclareDatamodelEntryfields[movie]{actor}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index 1a48c5674c0..c82eed72454 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.2a 2012/12/03 Simon Spiegel
+% $Id: fiwi2.bbx, v 1.2b 2012/12/09 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi2.bbx}[v 1.2a 2012/12/03 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.2b 2012/12/09 film studies bibliography style Author (Year)]
\RequireBibliographyStyle{fiwi-yearbeginning}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx
index 1dc29dcf29f..293483440c0 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.2a 2012/12/03 Simon Spiegel
+% $Id: fiwi2.cbx,v 1.2b 2012/12/09 Simon Spiegel
\ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.2a 2012/12/03 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx,v 1.2b 2012/12/09 spiegel $]
\RequireCitationStyle{fiwi}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
index c5445d99745..b1301d693de 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/12/03 1.2a film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2012/12/09 1.2b film studies bibliography style data model]
\RequireBiber[3]
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 02:53:45 +0000