summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-03-31 23:45:49 +0000
committerKarl Berry <karl@freefriends.org>2013-03-31 23:45:49 +0000
commitf8f0948eed4a2ea8f7dc7a1ec41db780c911772d (patch)
tree708fac53877169ae020e63264f934120497decb3 /Master/texmf-dist/tex/latex
parent3f8b486d70d3eda8f8f15ae06507f0cdefa558bb (diff)
biblatex-fiwi (30mar13)
git-svn-id: svn://tug.org/texlive/trunk@29578 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx185
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx499
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx4
-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.dbx4
7 files changed, 393 insertions, 313 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 af899f16989..8ed41265922 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.2b 2012/12/09 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v 1.2c 2013/03/29 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2b 2012/12/09 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2c 2013/03/29 film studies bibliography style Author (Year)]
\RequireBibliographyStyle{fiwi}
@@ -236,62 +236,72 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
{\printfield{label}}}
\DeclareBibliographyDriver{review}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{author/translator}%
-\usebibmacro{labelyear+extrayear}%
-\newblock\toggletrue{isreview}%
-\usebibmacro{review}{\thefield{related}}%
-\togglefalse{isreview}\newunit\newblock
-\usebibmacro{bytranslator}%
-\newunit\newblock
-\usebibmacro{in:}%
-%\newblock%
-\usebibmacro{journal+issuetitle}%
-\iffieldundef{pages}{\setunit{\addperiod}}{\addcomma\addspace\printfield{pages}}%
-\newunit\newblock%
-\bibsentence\printfield{note}%
-\newunit\newblock%
-\usebibmacro{doi+eprint+url}%
-%\setunit{.}\newblock
-\addspace\usebibmacro{origyear+location+title}%
-\newblock
-\usebibmacro{addendum+pubstate}%
-\newunit\newblock
-\usebibmacro{pageref}%
-\finentry}
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator}%
+ \usebibmacro{labelyear+extrayear}%
+ \newblock\toggletrue{isreview}%
+ \usebibmacro{review}{\thefield{related}}%
+ \togglefalse{isreview}\newunit\newblock
+ \usebibmacro{bytranslator}%
+ \newunit\newblock
+ \usebibmacro{in:}%
+ %\newblock%
+ \usebibmacro{journal+issuetitle}%
+ \iffieldundef{pages}
+ {\setunit{\addperiod}}
+ {\addcomma\addspace\printfield{pages}}%
+ \newunit\newblock%
+ \bibsentence\printfield{note}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock%
+ \usebibmacro{doi+eprint+url}%
+ %\setunit{.}\newblock
+ \addspace\usebibmacro{origyear+location+title}%
+ \newblock
+ \usebibmacro{addendum+pubstate}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \finentry}
\DeclareBibliographyDriver{article}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{author/translator}%
-\usebibmacro{labelyear+extrayear}%
-\newblock
-\usebibmacro{title}%
-\newunit\newblock
-\usebibmacro{bytranslator}%
-\newunit\newblock
-\usebibmacro{in:}%
-%\newblock%
-\usebibmacro{journal+issuetitle}%
-\iffieldundef{pages}
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator}%
+ \usebibmacro{labelyear+extrayear}%
+ \newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \usebibmacro{bytranslator}%
+ \newunit\newblock
+ \usebibmacro{in:}%
+ %\newblock%
+ \usebibmacro{journal+issuetitle}%
+ \iffieldundef{pages}
{\setunit{\addperiod}}
{\addcomma\addspace\printfield{pages}}%
-\newunit\newblock%
-\iffieldundef{note}
-{}
-{\bibsentence\printfield{note}}%
-\newunit\newblock%
-\usebibmacro{doi+eprint+url}%
-%\setunit{.}\newblock
-%\addspace\usebibmacro{origyear+location+title}%
-%\newblock
-\addspace\usebibmacro{related:translatedas}%
-\newblock
-\usebibmacro{addendum+pubstate}%
-\newunit\newblock
-\usebibmacro{pageref}%
-\finentry}
+ \newunit\newblock%
+ \iffieldundef{note}
+ {}
+ {\bibsentence\printfield{note}}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock%
+ \usebibmacro{doi+eprint+url}%
+ %\setunit{.}\newblock
+ %\addspace\usebibmacro{origyear+location+title}%
+ %\newblock
+ \addspace\usebibmacro{related:translatedas}%
+ \newblock
+ \usebibmacro{addendum+pubstate}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \finentry}
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
@@ -300,7 +310,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\iftoggle{dontprintorig}{}%
{\usebibmacro{author/translator}%
\usebibmacro{labelyear+extrayear}}%
-%\newunit\newblock
+ %\newunit\newblock
\usebibmacro{title}%
\newunit\newblock
\usebibmacro{bytranslator}%
@@ -349,6 +359,10 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\usebibmacro{chap+pag}%
\newblock%
\addspace\usebibmacro{related:translatedas}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
\newblock%
\usebibmacro{doi+eprint+url}%
\newblock%
@@ -366,14 +380,14 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
{\ifnameundef{editor}%
{}
{\usebibmacro{editor}\addspace}}%
-{\usebibmacro{author/translator+others}}%
-\usebibmacro{labelyear+extrayear}}%
-\newblock
-\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ {\usebibmacro{author/translator+others}}%
+ \usebibmacro{labelyear+extrayear}}%
+ \newblock
+ \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
\newunit\newblock
\ifnameundef{author}
- {}
- {\usebibmacro{byeditor+others}}%
+ {}
+ {\usebibmacro{byeditor+others}}%
\newunit\newblock
\printfield{note}%
\newunit
@@ -383,25 +397,29 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\newunit\newblock
\printfield{edition}%
\newunit\newblock%
-\usebibmacro{publ+loc+origyear}%
-\usebibmacro{chap+pag}%
-\newblock%\newunit
-\usebibmacro{doi+eprint+url}%
-\addspace\usebibmacro{related}%
-\newblock
-\usebibmacro{addendum+pubstate}%
- \newunit\newblock
-\usebibmacro{pageref}%
-\finentry}
+ \usebibmacro{publ+loc+origyear}%
+ \usebibmacro{chap+pag}%
+ \newblock%\newunit
+ \usebibmacro{doi+eprint+url}%
+ \addspace\usebibmacro{related}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newblock
+ \usebibmacro{addendum+pubstate}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \finentry}
\DeclareBibliographyDriver{collection}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-%\usebibmacro{mtitle+vol+title+stitle}%
-\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-\newunit\newblock%
-\usebibmacro{collby}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ %\usebibmacro{mtitle+vol+title+stitle}%
+ \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ \newunit\newblock%
+ \usebibmacro{collby}%
\newunit\newblock
\usebibmacro{bytranslator}%
\newunit\newblock%
@@ -420,11 +438,15 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
- \usebibmacro{publ+loc+year}%
+ \usebibmacro{publ+loc+year}%
\newblock
-\addspace\usebibmacro{related:translatedas}%
+ \addspace\usebibmacro{related:translatedas}%
\newunit\newblock
\usebibmacro{chap+pag}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
%\setunit{\par}\newblock
\usebibmacro{doi+eprint+url}%
\newblock
@@ -449,7 +471,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\newunit\newblock
\addspace\usebibmacro{related}%
\newblock
-\printfield{note}%
+ \printfield{note}%
%\newunit\newblock
\addspace\usebibmacro{doi+eprint+url}%
\newblock
@@ -473,6 +495,9 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\usebibmacro{chap+pag}%
\newunit\newblock
\printfield{note}%
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index 37550efebee..225818fa542 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.2b 2012/12/09 Simon Spiegel
+% $Id: fiwi.bbx, v1.2c 2013/03/29 Simon Spiegel
-\ProvidesFile{fiwi.bbx}[v1.2b 2012/12/09 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.2c 2013/03/29 film studies bibliography style]
\@ifpackagelater{biblatex}{2012/11/26}
{}
@@ -14,9 +14,14 @@
\RequireBibliographyStyle{standard}
%\RequireBiber[2]
-\DeclareSourcemap{
+\DeclareStyleSourcemap{
\maps[datatype=bibtex]{
\map{
+ \step[fieldset=abstract, null]
+ \step[fieldset=annote, null]
+ \step[fieldset=annotation, null]
+}
+ \map{
\pertype{movie}
\pertype{misc}
\pertype{video}
@@ -41,9 +46,7 @@
\pertype{video}
\step[fieldsource=scriptwriter]
\step[fieldset=editor, origfieldval]
-}
-}
-}
+}}}
\defcounter{highnamepenalty}{0}
@@ -56,6 +59,8 @@
% Diverse Schalter
+\providetoggle{bbx:scriptwriter}
+\togglefalse{bbx:scriptwriter}
\providetoggle{filmruntime}
\providetoggle{citeprefix}
\toggletrue{citeprefix}
@@ -109,107 +114,106 @@
% BibliographyOptions
\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}}
-{}
-}%
+ \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}}
-{}
-}%
+ \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}}
-{}
-}%
+ \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}}
-{}
-}%
+ \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}
-}
-{}
-}%
+ \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{script}[true]{\settoggle{bbx:scriptwriter}{#1}}
\DeclareBibliographyOption{ignorearticle}[true]{\settoggle{ignorearticle}{#1}}
\DeclareBibliographyOption{partofcited}[true]{\settoggle{partofcitedflag}{#1}}
\DeclareBibliographyOption{germ}[true]{\settoggle{germfassung}{#1}}
\DeclareBibliographyOption{translatedas}[true]{\settoggle{germfassung}{#1}}
\DeclareBibliographyOption{noseries}[true]{%
-\ifstrequal{#1}{true}
-{\togglefalse{printseriesflag}}
-{\toggletrue{printseriesflag}}}%
+ \ifstrequal{#1}{true}
+ {\togglefalse{printseriesflag}}
+ {\toggletrue{printseriesflag}}}%
\DeclareBibliographyOption{series}[true]{\settoggle{printseriesflag}{#1}}%
-\DeclareBibliographyOption{nopublisher}[true]{\ifstrequal{#1}{true}
-{\togglefalse{printpublisher}}
-{\toggletrue{printpublisher}}}
+\DeclareBibliographyOption{nopublisher}[true]{%
+ \ifstrequal{#1}{true}
+ {\togglefalse{printpublisher}}
+ {\toggletrue{printpublisher}}}
\DeclareBibliographyOption{publisher}[true]{\settoggle{printpublisher}{#1}}%
\DeclareBibliographyOption{filmruntime}[true]{\settoggle{filmruntime}{#1}}%
\DeclareBibliographyOption{citeprefix}[true]{\settoggle{citeprefix}{#1}}
@@ -219,28 +223,28 @@
{\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
{\renewbibmacro*{bbx:savehash}{}}}
\DeclareBibliographyOption{yearatbeginning}[true]{%
-\ifstrequal{#1}{true}
-{\RequireBibliographyStyle{fiwi-yearbeginning}}{}}
-\DeclareBibliographyOption{origyearwithyear}[true]{
-\ifstrequal{#1}{true}
-{\settoggle{origyearwithyear}{#1}}{}
-\ifstrequal{#1}{brackets}{\toggletrue{origyearwithyear}
-\toggletrue{origyearbrackets}{}}}
+ \ifstrequal{#1}{true}
+ {\RequireBibliographyStyle{fiwi-yearbeginning}}{}}
+ \DeclareBibliographyOption{origyearwithyear}[true]{
+ \ifstrequal{#1}{true}
+ {\settoggle{origyearwithyear}{#1}}{}
+ \ifstrequal{#1}{brackets}{\toggletrue{origyearwithyear}
+ \toggletrue{origyearbrackets}{}}}
\DeclareBibliographyOption{origyearsuperscript}[true]{\settoggle{origyearsuperscript}{#1}}
\DeclareBibliographyOption{pages}[true]{%
-\ifstrequal{#1}{true}
-{\toggletrue{bibpages}\toggletrue{citepages}}
-{\togglefalse{bibpages}\togglefalse{citepages}}
-\ifstrequal{#1}{both}
-{\toggletrue{bibpages}\toggletrue{citepages}}
-{}
-\ifstrequal{#1}{bib}
-{\toggletrue{bibpages}}
-{}
-\ifstrequal{#1}{cite}
-{\toggletrue{citepages}}
-{}
-}%
+ \ifstrequal{#1}{true}
+ {\toggletrue{bibpages}\toggletrue{citepages}}
+ {\togglefalse{bibpages}\togglefalse{citepages}}
+ \ifstrequal{#1}{both}
+ {\toggletrue{bibpages}\toggletrue{citepages}}
+ {}
+ \ifstrequal{#1}{bib}
+ {\toggletrue{bibpages}}
+ {}
+ \ifstrequal{#1}{cite}
+ {\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}
@@ -278,25 +282,30 @@
% format definitions
\DeclareFieldFormat{pages}{%
-\iftoggle{bibpages}
-{\addspace\mkpageprefix[pagination]{#1}}
-{\addspace #1}}
+ \iftoggle{bibpages}
+ {\addspace\mkpageprefix[pagination]{#1}}
+ {\addspace #1}
+ }
\DeclareFieldFormat{postnote}{%
-\iftoggle{citepages}
-{\mkpageprefix[pagination]{#1}}
-{#1}}
+ \iftoggle{citepages}
+ {\mkpageprefix[pagination]{#1}}
+ {#1}
+ }
\DeclareFieldFormat{volcitepages}{%
-\iftoggle{citepages}
-{\mkpageprefix[pagination]{#1}}
-{#1}}
+ \iftoggle{citepages}
+ {\mkpageprefix[pagination]{#1}}
+ {#1}
+ }
\DeclareFieldFormat{multipostnote}{%
-\iftoggle{citepages}
-{\mkpageprefix[pagination]{#1}}
-{#1}}
+ \iftoggle{citepages}
+ {\mkpageprefix[pagination]{#1}}
+ {#1}
+ }
+\DeclareFieldFormat{isan}{\mkbibacro{ISAN}\addcolon\space #1}
\DeclareFieldFormat{tvmaintitle}{\film{#1}\addcolon\addspace}
%\DeclareFieldFormat{labelyear}{\mknumalph{#1}}
\DeclareFieldFormat{film}{\film{#1}}
@@ -309,8 +318,8 @@
\DeclareIndexFieldAlias[movie]{indextitle}[misc]{indextitle}
\DeclareIndexFieldAlias[video]{indextitle}[misc]{indextitle}
-\DeclareBibliographyAlias{movie}{misc}
-\DeclareBibliographyAlias{video}{misc}
+\DeclareBibliographyAlias{misc}{movie}
+\DeclareBibliographyAlias{video}{movie}
%\DeclareFieldFormat{related}{\addspace\mkbibparens{#1}}
\DeclareFieldFormat[review]{title}{\mkbibquote{#1}}
@@ -318,13 +327,13 @@
\DeclareFieldFormat{parttitle}{\mkbibemph{#1}}
\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
\DeclareFieldFormat[phdthesis]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat{subtitle}{#1}
+\DeclareFieldFormat{subtitle}{\mkbibemph{#1}}
\DeclareFieldFormat[movie,misc,video]{subtitle}{\mkbibparens{#1}\addperiod}
%\DeclareFieldFormat{booksubtitle}{\mkbibemph{#1}}
\DeclareFieldFormat{shorthandwidth}{#1}
\DeclareFieldFormat{film}{\film{#1}}
-\DeclareFieldFormat{plain}{\mkbibparens{#1}.}
+\DeclareFieldFormat{plain}{#1}
\DeclareFieldFormat{part}{\iffieldundef{parttitle}{.#1}{#1}}% physical part of a logical volume
\DeclareFieldFormat[misc]{note}{\mkbibparens{#1}}
\DeclareFieldFormat{addendum}{\mkbibparens{#1}}
@@ -556,14 +565,7 @@
\nosort{type_title}{\regexp{\AL'\s+}}
\nosort{type_title}{\regexp{\AO\s+}}
}
-\DeclareStyleSourcemap{
- \maps{
- \map{
- \step[fieldset=abstract, null]
- \step[fieldset=annote, null]
- \step[fieldset=annotation, null]
-} }
-}}
+}
{}
\DeclareSortExclusion{book,incollection}{maintitle}
\DeclareSortExclusion{collection}{maintitle,author,editor}
@@ -599,11 +601,19 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{airdate}
\NewBibliographyString{undated}
+\NewBibliographyString{directedby}
+\NewBibliographyString{writtenby}
+\NewBibliographyString{writtendirectedby}
%\NewBibliographyString{citepage}
%\NewBibliographyString{citepages}
+
+
\DefineBibliographyStrings{german}{%
andothers = {et al\adddot},
+directedby = {Regie\addcolon\addspace},
+writtenby = {Buch\addcolon\addspace},
+writtendirectedby = {Buch und Regie\addcolon\addspace},
fromhebrew = {aus dem Hebr\"aischen},
fromjapanese = {aus dem Japanischen},
frompolish = {aus dem Polnischen},
@@ -1220,8 +1230,21 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
{\printlist{organization}}
}
-\newbibmacro*{directors}{%
-\ifpunct{\unspace}{}\printnames{director}
+\newbibmacro*{movie:creators}{%
+\iftoggle{bbx:scriptwriter}
+ {\usebibmacro{movie:directorsscriptwriters}}
+ {\usebibmacro{movie:directors}}
+}
+
+\newbibmacro*{movie:directors}{%
+ \ifpunct{\unspace}{}\printnames{director}
+}
+
+\newbibmacro*{movie:directorsscriptwriters}{%
+ \ifnamesequal{scriptwriter}{director}
+ {\bibstring{writtendirectedby}\printnames{director}}
+ {\ifpunct{\unspace}{}\bibstring{directedby}\printnames{director}
+ \newunit\bibstring{writtenby}\printnames{scriptwriter}}
}
\newbibmacro*{mtitle+vol+btitle+bstitle}{%
@@ -1406,56 +1429,63 @@ and (test {\iffieldundef{origyear}}%
\addspace\mkbibparens{\printfield{year}}}
\DeclareBibliographyDriver{review}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{author/translator}%
-\newblock\toggletrue{isreview}
-\usebibmacro{review}{\thefield{related}}%
-\togglefalse{isreview}\newunit\newblock
-\usebibmacro{bytranslator}%
-\newunit\newblock
-\usebibmacro{in:}%
-%\newblock%
-\usebibmacro{journal+issuetitle}%
-\printfield{pages}
-\newblock
-\bibsentence\printfield{note}%
-%\setunit{.}\newblock
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator}%
+ \newblock\toggletrue{isreview}
+ \usebibmacro{review}{\thefield{related}}%
+ \togglefalse{isreview}\newunit\newblock
+ \usebibmacro{bytranslator}%
+ \newunit\newblock
+ \usebibmacro{in:}%
+ %\newblock%
+ \usebibmacro{journal+issuetitle}%
+ \printfield{pages}
+ \newblock
+ \bibsentence\printfield{note}%
+ %\setunit{.}\newblock
\usebibmacro{addendum+pubstate}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{issn}}
+ {}%
\newunit\newblock%
-\ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}}%
-{}
-{\usebibmacro{doi+eprint+url}}%
+ \ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}}%
+ {}
+ {\usebibmacro{doi+eprint+url}}%
\newunit\newblock
\usebibmacro{pageref}%
- \usebibmacro{finentry}
- }
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{article}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{author/translator}%
-\newblock
-\usebibmacro{title}%
-\newunit\newblock
-\usebibmacro{bytranslator}%
-\newunit\newblock
-\usebibmacro{in:}%
-%\newblock%
-\usebibmacro{journal+issuetitle}%
-\newunit\usebibmacro{chap+pag}%
-\newblock
-\iffieldundef{note}
-{}
-{\bibsentence\printfield{note}}%
-%\setunit{.}\newblock
-\usebibmacro{related}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator}%
+ \newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \usebibmacro{bytranslator}%
+ \newunit\newblock
+ \usebibmacro{in:}%
+ %\newblock%
+ \usebibmacro{journal+issuetitle}%
+ \newunit\usebibmacro{chap+pag}%
+ \newblock
+ \iffieldundef{note}
+ {}
+ {\bibsentence\printfield{note}}%
+ %\setunit{.}\newblock
+ \usebibmacro{related}%
\newblock
\usebibmacro{addendum+pubstate}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{issn}}
+ {}%
\newunit\newblock%
-\ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}}%
-{}
-{\usebibmacro{doi+eprint+url}}%
+ \ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}}%
+ {}
+ {\usebibmacro{doi+eprint+url}}%
\newunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -1465,7 +1495,7 @@ and (test {\iffieldundef{origyear}}%
\usebibmacro{begentry}%
\usebibmacro{test:partofcited}%
\iftoggle{dontprintorig}{}{\usebibmacro{author/translator}}%
-%\newunit\newblock
+ %\newunit\newblock
\usebibmacro{title}%
\newunit\newblock
\ifnamesequal{author}{bookauthor}{% Verhindern, dass Übersetzer zweimal ausgegeben wird
@@ -1520,6 +1550,10 @@ and (test {\iffieldundef{origyear}}%
%\usebibmacro{doi+eprint+url}%
%\newunit\newblock
\addspace\usebibmacro{related}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
\newblock
\usebibmacro{addendum+pubstate}%
\newblock}
@@ -1533,12 +1567,12 @@ and (test {\iffieldundef{origyear}}%
\usebibmacro{begentry}%
\iftoggle{dontprintorig}{}{%
\ifnameundef{author}%
- {\ifnameundef{editor}%
- {}%
- {\usebibmacro{editor}\addspace}}%
-{\usebibmacro{author/translator+others}}}%
-\newblock
-\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ {\ifnameundef{editor}%
+ {}%
+ {\usebibmacro{editor}\addspace}}%
+ {\usebibmacro{author/translator+others}}}%
+ \newblock
+ \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
\newunit\newblock
\ifnameundef{author}
{\usebibmacro{bytranslator+others}}
@@ -1552,36 +1586,40 @@ and (test {\iffieldundef{origyear}}%
\newunit\newblock%
\printfield{edition}%
\newunit\newblock%
-\usebibmacro{publ+loc+year}%
-\usebibmacro{chap+pag}%
-\newblock
-\ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}}
-{}
-{\addperiod\addspace\usebibmacro{doi+eprint+url}}%
-\addspace\usebibmacro{related}%
-\newblock
-\usebibmacro{addendum+pubstate}%
-\newunit\newblock
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}
+ \usebibmacro{publ+loc+year}%
+ \usebibmacro{chap+pag}%
+ \newblock
+ \ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}}
+ {}
+ {\addperiod\addspace\usebibmacro{doi+eprint+url}}%
+ \addspace\usebibmacro{related}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newblock
+ \usebibmacro{addendum+pubstate}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{collection}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-%\usebibmacro{mtitle+vol+title+stitle}%
-\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-\newunit\newblock%
-\usebibmacro{collby}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ %\usebibmacro{mtitle+vol+title+stitle}%
+ \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ \newunit\newblock%
+ \usebibmacro{collby}%
\newunit\newblock
\usebibmacro{bytranslator}%
\newunit\newblock%
\iffieldundef{edition}%
- {}%
- {\printfield{edition}}%
+ {}%
+ {\printfield{edition}}%
\iffieldundef{note}%
- {}%
- {\printfield{note}}%
+ {}%
+ {\printfield{note}}%
%\newunit
%\iffieldundef{maintitle}
%{\printfield{volume}}
@@ -1591,10 +1629,14 @@ and (test {\iffieldundef{origyear}}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
- \usebibmacro{publ+loc+year}%
-\addspace\usebibmacro{related}
+ \usebibmacro{publ+loc+year}%
+ \addspace\usebibmacro{related}
\newunit\newblock
\usebibmacro{chap+pag}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
%\setunit{\par}\newblock
\usebibmacro{doi+eprint+url}%
\newblock
@@ -1610,18 +1652,27 @@ and (test {\iffieldundef{origyear}}%
\newblock%
\usebibmacro{filmtitle}%
\newunit\newblock%
- \usebibmacro{directors}%
-\iffieldundef{entrysubtype}
-{\usebibmacro{movie:regular}}%
-{\iffieldequalstr{entrysubtype}{serial}%
-{\usebibmacro{movie:serials}}%
-{\iffieldequalstr{entrysubtype}{tv}%
-{\usebibmacro{movie:tv}}%
-{\usebibmacro{movie:regular}}}}%
-\iffieldundef{pagetotal}
- {}{
- \iftoggle{filmruntime}{\addcomma\addspace\printfield{pagetotal}}{}}
- \iffieldundef{note}{}{\printfield{note}}%
+ \usebibmacro{movie:creators}%
+ \iffieldundef{entrysubtype}
+ {\usebibmacro{movie:regular}}%
+ {\iffieldequalstr{entrysubtype}{serial}%
+ {\usebibmacro{movie:serials}}%
+ {\iffieldequalstr{entrysubtype}{tv}%
+ {\usebibmacro{movie:tv}}%
+ {\usebibmacro{movie:regular}}}}%
+ \iffieldundef{pagetotal}
+ {}
+ {%
+ \iftoggle{filmruntime}%
+ {\addcomma\addspace\printfield{pagetotal}}%
+ {}}
+ \iffieldundef{note}%
+ {}
+ {\printfield{note}}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isan}}
+ {}%
\newunit\newblock
%\usebibmacro{doi+eprint+url}
\usebibmacro{pageref}
@@ -1666,6 +1717,10 @@ and (test {\iffieldundef{origyear}}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newblock
\usebibmacro{addendum+pubstate}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index 185f5e0ebe8..e072bfa5d8e 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.2b 2012/12/09 Simon Spiegel
+% $Id: fiwi.cbx,v 1.2c 2013/03/29 Simon Spiegel
\ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.2b 2012/12/09 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx,v 1.2c 2013/03/29 spiegel $]
\ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true}
@@ -198,7 +198,7 @@ and test {\iftoggle{citecompletefilm}}}
\newbibmacro*{cite:film:directorcountrytranstitle}{% Film mit Regisseur, Land und dt. Titel
\printtext[bibhyperref]{\printfield[film]{title}}%
\addspace\printtext[citeyear]%
- {\printfield{subtitle}\setunit*{\addcomma\addspace}%
+ {\printfield[plain]{subtitle}\setunit*{\addcomma\addspace}%
\printnames[director]{director}\addcomma\addthinspace\printlist{location}%
\addspace\printfield{year}}
}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
index 0273f1a8aa4..2896a0cab3f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
@@ -1,4 +1,4 @@
-%% Copyright 2012 Simon Spiegel
+%% Copyright 2013 Simon Spiegel
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -16,7 +16,7 @@
%%
-\ProvidesFile{fiwi.dbx}[2012/12/09 1.2b film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2013/03/29 1.2c 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 c82eed72454..5d4da62dc27 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.2b 2012/12/09 Simon Spiegel
+% $Id: fiwi2.bbx, v 1.2c 2013/03/29 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi2.bbx}[v 1.2b 2012/12/09 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.2c 2013/03/29 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 293483440c0..1a3a4bf5234 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.2b 2012/12/09 Simon Spiegel
+% $Id: fiwi2.cbx,v 1.2c 2013/03/29 Simon Spiegel
\ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.2b 2012/12/09 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx,v 1.2c 2013/03/29 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 b1301d693de..15fbb186961 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
@@ -1,4 +1,4 @@
-%% Copyright 2012 Simon Spiegel
+%% Copyright 2013 Simon Spiegel
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -16,7 +16,7 @@
%%
-\ProvidesFile{fiwi.dbx}[2012/12/09 1.2b film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2013/03/29 1.2c film studies bibliography style data model]
\RequireBiber[3]