summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-17 23:33:56 +0000
committerKarl Berry <karl@freefriends.org>2012-02-17 23:33:56 +0000
commitc94e6d2a1e2cacd088b3b20469474a895f8cf41c (patch)
treef494b13cd4e43abc4b69dfac683a73d93764122c /Master/texmf-dist/tex
parent4adc343d387e50a8d0c103e680325456af1e0242 (diff)
biblatex-fiwi 1.1e (17feb12)
git-svn-id: svn://tug.org/texlive/trunk@25415 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx73
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx158
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx108
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx4
5 files changed, 237 insertions, 111 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 727584961a8..83b5943b645 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
@@ -1,12 +1,14 @@
-% $Id: fiwi-yearbeginning.bbx, v 1.1e 2011/12/21 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v 1.1e 2012/02/16 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.1d 2011/12/21 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.1e 2012/02/16 film studies bibliography style Author (Year)]
+
+\RequireBibliographyStyle{fiwi}
\ExecuteBibliographyOptions{indexing=cite,maxnames=4,minnames=4,maxitems=9,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labelyear=true}
\DeclareFieldFormat{yearparens}{\mkbibparens{#1}\iffieldequalstr{entrytype}{collection}{}{\addcolon\addspace}}
-\DeclareFieldFormat{pages}{#1}
+%\DeclareFieldFormat{pages}{#1}
\renewcommand{\ppspace}{}
@@ -22,19 +24,20 @@
\ifboolexpr{ ( not test {\iffieldundef{origyear}}
and test {\iftoggle{origyearwithyear}}
and test {\iffieldundef{origtitle}} ) }%
- {\addslash\printfield{origyear}}%
+ {\iftoggle{origyearbrackets}
+ {\addthinspace\mkbibbrackets{\printfield{origyear}}}
+ {\addslash\printfield{origyear}}}%
{}%
}}}
\renewbibmacro*{incollectioneditor}{%
\ifnameundef{editor}
- {\let\bbx@lasthash\@undefined}
+ {}
{{\ifnamesequal{author}{editor}{%
\ifthenelse{\value{author}>1}%
{\bibstring{idempp}}%
{\bibstring{idem\thefield{gender}}}}{%
- \printnames{editor}}\addspace
- \global\undef\bbx@lasthash}%
+ \printnames{editor}}\addspace}%
\iffieldequalstr{entrytype}{book}{}{\usebibmacro{editorstrg}}}}
\renewbibmacro*{editorstrg}{%
@@ -55,7 +58,10 @@
\renewbibmacro*{issue+date}{%
- \iffieldundef{pages}{}{\ifterm{}{\setunit{\addcomma\addspace}}}\iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{%
+ \iffieldundef{pages}
+ {}
+ {\ifterm{}{\setunit{\addcomma\addspace}}}
+ \iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{%
\iffieldundef{issue}%
{\iffieldundef{month}%
{}%
@@ -66,20 +72,26 @@
{\printfield{issue}}}}%
\renewbibmacro*{journal+issuetitle}{%
- \usebibmacro{journal}\addperiod%
+ \iffieldequalstr{entrytype}{periodical}
+ {\usebibmacro{periodical}}
+ {\usebibmacro{journal}}%
\setunit*{\addspace}%
\iffieldundef{series}
{}
{\newunit
\printfield{series}%
\setunit{\addspace}}%
-\iffieldundef{volume}{}{\printfield{volume}\iffieldundef{number}{\iffieldundef{pages}{\addperiod}{\addcomma}}{\addcomma}}%
- \setunit*{\addperiod\addspace}%
-\iffieldundef{number}{}{\printtext{\addspace\printfield{number}}\addspace}%
-\ifnameundef{editor}{}{\addperiod\addspace\usebibmacro{byeditor}\setunit{\addcomma\space}}%
+\iffieldundef{volume}{}{\newunit\printfield{volume}%
+\iffieldundef{number}%
+ {\iffieldundef{pages}{\addperiod}{\addcomma}}
+ {\addcomma}}%
+\iffieldundef{number}
+ {}{\printtext{\addspace\printfield{number}}\addspace}%
+\iffieldequalstr{entrytype}{periodical}{\usebibmacro{labelyear+extrayear}}{}
\printfield{eid}%%
\usebibmacro{issue+date}%
-\iffieldundef{issuetitle}{}{\addcolon\addspace\printtext{\usebibmacro{issue}}}%
+\iffieldundef{issuetitle}{}{\addcolon\addspace\printtext{\usebibmacro{issue}}}
+\ifnameundef{editor}{}{\addperiod\addspace\usebibmacro{byeditor}\setunit{\addcomma\space}}%%
}
\renewbibmacro*{org+publ+loc+year}{%
@@ -130,8 +142,10 @@
}
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
- {\usebibmacro{bbx:savehash}%
+ {\iftoggle{isreview}{}{\usebibmacro{bbx:savehash}}%
\printnames{author}%
+ \iffieldundef{nameaddon}{}
+ {\printfield{nameaddon}}%
\iffieldundef{authortype}
{\setunit{\addspace}}
{\setunit{\addcomma\space}}}%
@@ -149,16 +163,24 @@
\def\do##1{\toggletrue{dontprintextrayear}\printtext[germfassung]{%
\fullcite{##1}}}%
\@tempa\toggletrue{dontprintorig}%
- \togglefalse{dontprintextrayear}\togglefalse{intransdecision}}
+ \togglefalse{dontprintextrayear}\togglefalse{intransdecision}}
+
+\renewbibmacro*{labeltitle}{%
+ \iffieldundef{label}
+ {\iffieldundef{shorttitle}
+ {\printfield{title}%
+ \clearfield{title}}
+ {\printfield[title]{shorttitle}}}
+ {\printfield{label}}}
\DeclareBibliographyDriver{review}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator}%
\usebibmacro{labelyear+extrayear}%
-\newblock
+\newblock\toggletrue{isreview}
\usebibmacro{review}{\thefield{usera}}%
-\newunit\newblock
+\togglefalse{isreview}\newunit\newblock
\usebibmacro{bytranslator}%
\newunit\newblock
\usebibmacro{in:}%
@@ -190,14 +212,16 @@
\usebibmacro{in:}%
%\newblock%
\usebibmacro{journal+issuetitle}%
-\iffieldundef{pages}{\setunit{\addperiod}}{\addcomma\addspace\printfield{pages}}%
+\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
+%\newblock
\addspace\usebibmacro{decidetranslatedversion}%
\newblock
\usebibmacro{addendum+pubstate}%
@@ -222,7 +246,8 @@
\iftoggle{partofcited}
{\iffieldundef{xref}
{\mancite\textcite{\thefield{crossref}}}
- {\mancite\textcite{\thefield{xref}}}}
+ {\mancite\textcite{\thefield{xref}}}
+ \usebibmacro{chap+pag}}
{\newblock%
\ifnameundef{bookauthor}%
{\ifnameundef{editor}
@@ -259,10 +284,10 @@
\newunit\newblock%
\usebibmacro{chap+pag}%
%\setunit{\par}\newblock
- %\usebibmacro{doi+eprint+url}%
- \newblock
\addspace\usebibmacro{decidetranslatedversion}%
\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newblock
\usebibmacro{addendum+pubstate}%
\newblock}
\usebibmacro{pageref}%
@@ -296,7 +321,7 @@
\newunit\newblock%
\usebibmacro{publ+loc+origyear}%
\usebibmacro{chap+pag}%
-\newblock
+\newblock\newunit
\usebibmacro{doi+eprint+url}%
\addspace\usebibmacro{decidetranslatedversion}%
\newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index 96475501b9b..0ba480046f3 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.1d 2011/12/21 Simon Spiegel
+% $Id: fiwi.bbx, v1.1d 2012/02/16 Simon Spiegel
-\ProvidesFile{fiwi.bbx}[v1.1d 2011/12/21 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.1d 2012/02/16 film studies bibliography style]
\@ifpackagelater{biblatex}{2011/11/12}
{}
@@ -38,12 +38,21 @@
\togglefalse{yearatbeginning}
\providetoggle{origyearwithyear}
\togglefalse{origyearwithyear}
+\providetoggle{origyearbrackets}
+\togglefalse{origyearbrackets}
\providetoggle{origyearsuperscript}
\togglefalse{origyearsuperscript}
\providetoggle{partofcitedflag}
\togglefalse{partofcitedflag}
\providetoggle{partofcited}
\togglefalse{partofcited}
+\providetoggle{citepages}
+\togglefalse{citepages}
+\providetoggle{bibpages}
+\togglefalse{bibpages}
+\providetoggle{isreview}
+\togglefalse{isreview}
+
\DeclareBibliographyOption{partofcited}[true]{\settoggle{partofcitedflag}{#1}}
\DeclareBibliographyOption{germ}[true]{\settoggle{germfassung}{#1}}
@@ -66,16 +75,36 @@
\DeclareBibliographyOption{yearatbeginning}[true]{%
\ifstrequal{#1}{true}
{\RequireBibliographyStyle{fiwi-yearbeginning}}{}}
-\DeclareBibliographyOption{origyearwithyear}[true]{\settoggle{origyearwithyear}{#1}}
-\DeclareBibliographyOption{origyearsuperscript}[true]{\settoggle{origyearsuperscript}{#1}}
+\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}}
+{}
+}%
+
\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{%
\let\bbx@lasthash\undefined}
+
% Schalter als Befehle
\newcommand*{\filmruntime}{\toggletrue{filmruntime}}% Schaltet Filmlaufzeit in Filmographie ein
\newcommand*{\nopublisher}{\togglefalse{printpublisher}}% Verlag ein oder aus, standardmässig ein
@@ -90,6 +119,23 @@
% format definitions
+\DeclareFieldFormat{pages}{%
+\iftoggle{bibpages}
+{\addspace\mkpageprefix[pagination]{#1}}
+{\addspace #1}}
+\DeclareFieldFormat{postnote}{%
+\iftoggle{citepages}
+{\mkpageprefix[pagination]{#1}}
+{#1}}
+\DeclareFieldFormat{volcitepages}{%
+\iftoggle{citepages}
+{\mkpageprefix[pagination]{#1}}
+{#1}}
+\DeclareFieldFormat{multipostnote}{%
+\iftoggle{citepages}
+{\mkpageprefix[pagination]{#1}}
+{#1}}
+
\DeclareFieldFormat[review]{title}{#1}
\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}}
\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
@@ -101,7 +147,7 @@
\DeclareFieldFormat{plain}{\mkbibparens{#1}.}
\DeclareFieldFormat[misc]{note}{\mkbibparens{#1}}
\DeclareFieldFormat{addendum}{\mkbibparens{#1}}
-\DeclareFieldFormat{nameaddon}{\addspace\mkbibparens{=#1}}
+\DeclareFieldFormat{nameaddon}{\addspace\mkbibbrackets{=#1}}
\DeclareFieldFormat{season}{\bibstring{tvseason} #1}
\DeclareFieldFormat{episode}{\bibstring{tvepisode} #1}
\DeclareFieldFormat{urldate}{\addthinspace --\addnbspace\bibstring{urlseen}\space#1}
@@ -114,7 +160,7 @@
{}}
\DeclareFieldFormat{ser+num}{\mkbibparens{#1}}
\DeclareFieldFormat[article,review]{volume}{\bibstring{jourvol}\addnbthinspace{#1}}
-\DeclareFieldFormat[article,review]{number}{\bibstring{number}\addnbthinspace{#1}}
+\DeclareFieldFormat[article,review,periodical]{number}{\bibstring{number}\addnbthinspace{#1}}
\DeclareFieldFormat{origyearbook}{\iftoggle{origyearsuperscript}
{\addspace\mkbibparens{#1}}
{\addspace\mkbibparens{\textsuperscript{1}#1}}}
@@ -164,8 +210,6 @@
% name format definitions
-
-
\DeclareNameFormat{sortname}{%
\ifnumequal{\value{listcount}}{1}
{\iffirstinits
@@ -303,6 +347,7 @@
}
\sort{
\field[padside=left,padwidth=4,padchar=0]{volume}
+ \field[padside=left,padwidth=4,padchar=0]{number}
\literal{0000}
}
}
@@ -332,7 +377,7 @@
}
}
-\DeclareSortExclusion{misc,movie,video,reference,collection}{sortname,author,editor,translator}
+\DeclareSortExclusion{misc,movie,video,reference,collection,periodical}{sortname,author,editor,translator}
\DeclareSortExclusion{book,incollection,collection}{maintitle}
% Data inheritance
@@ -351,6 +396,7 @@
% Bibliography strings
+
\NewBibliographyString{fromjapanese}
\NewBibliographyString{fromhebrew}
\NewBibliographyString{frompolish}
@@ -360,6 +406,8 @@
\NewBibliographyString{translatedto}
\NewBibliographyString{prepublished}
\NewBibliographyString{reviewof}
+\NewBibliographyString{citepage}
+\NewBibliographyString{citepages}
\DefineBibliographyStrings{german}{%
andothers = {et al\adddot},
@@ -380,8 +428,8 @@ tvepisode = {Folge},
translatedto = {dt\adddot},
reviewof = {Rezension von},
prepublished = {Online-Vorver\"offentlichung},
-page = {{}{}},
-pages = {{}{}},
+page = {S\adddot\addnbspace},
+pages = {S\adddot\addnbspace},
january = {Januar},
february = {Februar},
march = {M\"arz},
@@ -481,8 +529,10 @@ january = {Januar},
}
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
- {\usebibmacro{bbx:savehash}%
+ {\iftoggle{isreview}{}{\usebibmacro{bbx:savehash}}%
\printnames{author}%
+ \iffieldundef{nameaddon}{}
+ {\printfield{nameaddon}}%
\iffieldundef{authortype}
{\setunit{\addspace}\addcolon\addspace}
{\setunit{\addcomma\space}}}%
@@ -509,8 +559,10 @@ january = {Januar},
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{editor}%
+ \iffieldundef{nameaddon}{}
+ {\printfield{nameaddon}}%
\addspace%
- \usebibmacro{bbx:savehash}}%
+ \iftoggle{isreview}{}{\usebibmacro{bbx:savehash}}}%
\usebibmacro{#1}%
\clearname{editor}%
\setunit{\addspace}}%
@@ -540,6 +592,14 @@ january = {Januar},
{\bibstring{byeditor}\addspace%
\printnames[bytranslator]{editor}}}%
+\newbibmacro*{labeltitle}{%
+ \iffieldundef{label}
+ {\iffieldundef{shorttitle}
+ {\printfield{title}%
+ \clearfield{title}}
+ {\printfield[title]{shorttitle}}}
+ {\printfield{label}}}
+
\renewbibmacro*{date}{%
\iffieldundef{year}%
{\iffieldundef{urlyear}%
@@ -566,7 +626,9 @@ or test {\iffieldequalstr{entrytype}{set}}}
test {\iftoggle{origyearwithyear}}
and not test {\iffieldundef{origyear}}
and test {\iffieldundef{origtitle}} )}
- {\addslash\printfield{origyear}}{}}%
+ {\iftoggle{origyearbrackets}
+ {\addthinspace\mkbibbrackets{\printfield{origyear}}}
+ {\addslash\printfield{origyear}}}{}}%
{\printfield{year}\iffieldsequal{year}{endyear}%
{}{\printfield{endyear}}}%
\iftoggle{dontprintextrayear}%
@@ -758,25 +820,35 @@ or test {\iffieldequalstr{entrytype}{set}}}
{\usebibmacro{byeditor+others}}
}
+\renewbibmacro*{title+issuetitle}{%
+ \setunit{\addspace}%
+ \setunit*{\addcomma\addspace}\usebibmacro{issue+date}
+ \iffieldundef{issuetitle}
+ {}
+ {\addcolon\addspace\printtext{\usebibmacro{issue}}}%
+ \usebibmacro{byeditor}\setunit{\addcomma\space}%
+\iffieldundef{pages}
+ {}
+ {\setunit*{\addcomma}}}
+
\renewbibmacro*{journal+issuetitle}{%
- \usebibmacro{journal}\addperiod%
+ \iffieldequalstr{entrytype}{periodical}
+ {\usebibmacro{periodical}}
+ {\usebibmacro{journal}}
\setunit*{\addspace}%
\iffieldundef{series}
{}
{\newunit
\printfield{series}%
\setunit{\addspace}}%
-\iffieldundef{volume}{}{\printfield{volume}\iffieldundef{number}{\addcomma}{\addcomma}}%
- \setunit*{\adddot}%
-\iffieldundef{number}{}{\printtext{\addspace\printfield{number}}\addspace}%
+ \iffieldundef{volume}
+ {}
+ {\addcomma\addspace\printfield{volume}{\addcomma}}%
+ \iffieldundef{number}
+ {}
+ {\printtext{\addspace\printfield{number}}\addspace}%
\printfield{eid}%
- \setunit{\addspace}%
- \setunit*{\addcomma\addspace}\usebibmacro{issue+date}
- \iffieldundef{issuetitle}
- {}
- {\addcolon\addspace\printtext{\usebibmacro{issue}}}%
- \usebibmacro{byeditor}\setunit{\addcomma\space}%
-\iffieldundef{pages}{}{\setunit*{\addcomma}}%
+ \usebibmacro{title+issuetitle}
}
\renewbibmacro*{issue+date}{%
@@ -855,7 +927,7 @@ or test {\iffieldequalstr{entrytype}{set}}}
\iffieldundef{chapter}
{\iffieldundef{pages}%
{}%
- {\addcomma\printfield{pages}}}%
+ {\addcomma\addspace\printfield{pages}}}%
{\printfield{chapter}%
\iffieldundef{pages}%
{}%
@@ -902,9 +974,9 @@ or test {\iffieldequalstr{entrytype}{set}}}
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator}%
-\newblock
+\newblock\toggletrue{isreview}
\usebibmacro{review}{\thefield{usera}}%
-\newunit\newblock
+\togglefalse{isreview}\newunit\newblock
\usebibmacro{bytranslator}%
\newunit\newblock
\usebibmacro{in:}%
@@ -921,7 +993,8 @@ or test {\iffieldequalstr{entrytype}{set}}}
{\usebibmacro{doi+eprint+url}}%
\newunit\newblock
\usebibmacro{pageref}%
- \usebibmacro{finentry}}
+ \usebibmacro{finentry}
+ }
\DeclareBibliographyDriver{article}{%
\usebibmacro{bibindex}%
@@ -935,7 +1008,7 @@ or test {\iffieldequalstr{entrytype}{set}}}
\usebibmacro{in:}%
%\newblock%
\usebibmacro{journal+issuetitle}%
-\printfield{pages}
+\newunit\usebibmacro{chap+pag}%
\newblock
\bibsentence\printfield{note}%
%\setunit{.}\newblock
@@ -968,7 +1041,8 @@ or test {\iffieldequalstr{entrytype}{set}}}
\iftoggle{partofcited}%
{\iffieldundef{xref}%
{\mancite\textcite{\thefield{crossref}}}%
- {\mancite\textcite{\thefield{xref}}}}%
+ {\mancite\textcite{\thefield{xref}}}
+ \usebibmacro{chap+pag}}%
{\newunit\newblock%
\ifnameundef{bookauthor}%
{\ifnameundef{editor}
@@ -1171,6 +1245,28 @@ or test {\iffieldequalstr{entrytype}{set}}}
\usebibmacro{pageref}%
\usebibmacro{finentry}}
+\DeclareBibliographyDriver{periodical}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ %\usebibmacro{editor}%
+ %\setunit{\labelnamepunct}\newblock
+ \usebibmacro{journal+issuetitle}%
+ \newunit
+ \printlist{language}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{issn}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
+
\DeclareBibliographyDriver{unpublished}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index 60027c4224c..0113e900f62 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
@@ -1,11 +1,13 @@
-% $Id: fiwi.cbx,v 1.1d 2011/12/21 Simon Spiegel
+% $Id: fiwi.cbx,v 1.1e 2012/02/16 Simon Spiegel
\ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.1d 2011/12/21 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx,v 1.1e 2012/02/16 spiegel $]
\ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true}
+
+
\newbool{cbx@bool}
\providetoggle{citefullfilm}
\newcommand*{\fullcitefilm}{\settoggle{citefullfilm}{true}}
@@ -15,6 +17,18 @@
\providetoggle{citecompletefilm}
\newcommand*{\completecitefilm}{\settoggle{citecompletefilm}{true}}
+\DeclareBibliographyOption{citefilm}[normal]{%
+\ifstrequal{#1}{normal}
+{}
+{}
+\ifstrequal{#1}{full}
+{\settoggle{citefullfilm}{true}}
+{}
+\ifstrequal{#1}{complete}
+{\settoggle{citecompletefilm}{true}}
+{}
+}%
+
\renewcommand*{\nameyeardelim}{\addspace}
\renewcommand*{\bibindexnamedelimi}{\,}
@@ -127,47 +141,37 @@
\printlist{location}\iflistundef{organization}{}{\addcomma\addspace\printlist{organization}}\addspace\printfield[]{year}\addcomma\addspace%
\printnames[director]{author}\unspace}}}%
-\newbibmacro*{citef}{%
- \ifciteseen
- {\iffieldundef{shorttitle}
- {\printtext[bibhyperref]{\printfield[film]{title}}}
- {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}}
- {\printtext[bibhyperref]{\printfield[film]{title}}%
- \addspace\printfield[citeyear]{year}}}
+\newbibmacro*{cite:film}{%
+\iftoggle{citefullfilm}%
+ {\usebibmacro{cite:film:directorcountry}}
+ {\iftoggle{citecompletefilm}%
+ {\usebibmacro{cite:film:directorcountrytranstitle}}
+ {\printtext[bibhyperref]{\printfield[film]{title}}%
+ \addspace\printfield[citeyear]{year}}}}
+
+\newbibmacro*{cite:film:seen}{%
+ \iffieldundef{shorttitle}
+ {\printtext[bibhyperref]{\printfield[film]{title}}}
+ {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}}
-\newbibmacro*{citecf}{%
+\newbibmacro*{cite:film:countryear}{%
\printtext[bibhyperref]{\printfield[film]{title}
\addspace\mkbibparens{\printlist{location}\addspace\printfield{year}}}}
-\newbibmacro*{citefilmcomplete}{% Film bei erster Nennung mit Regisseur, Land und dt. Titel
- \ifciteseen
- {\iffieldundef{shorttitle}
- {\printtext[bibhyperref]{\printfield[film]{title}}}
- {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}}
- {\printtext[bibhyperref]{\printfield[film]{title}}%
- \addspace\printtext[citeyear]{\printfield{subtitle}\setunit*{\addcomma\addspace}\printnames[director]{author}\addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}}
-
-\newbibmacro*{citeff}{% Film bei erster nennung mit Regisseur
- \ifciteseen
- {\iffieldundef{shorttitle}
- {\printtext[bibhyperref]{\printfield[film]{title}}}
- {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}}
- {\printtext[bibhyperref]{\printfield[film]{title}}%
- \addspace\mkbibparens{\printnames[director]{author}\addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}}
-
- \newbibmacro*{citeffs}{% volle zweitnennung ohne land und jahr
+\newbibmacro*{cite:film:directorcountrytranstitle}{% Film mit Regisseur, Land und dt. Titel
\printtext[bibhyperref]{\printfield[film]{title}}%
- \addspace\mkbibparens{\printfield[]{year}}}
-
-\newbibmacro*{citefff}{% volle zweitnennung mit land und jahr
- \printtext[bibhyperref]{\printfield[film]{title}}%
- \addspace\mkbibparens{\printnames[director]{author}\addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}
+ \addspace\printtext[citeyear]%
+ {\printfield{subtitle}\setunit*{\addcomma\addspace}%
+ \printnames[director]{author}\addcomma\addthinspace\printlist{location}%
+ \addspace\printfield{year}}
+ }
-\newbibmacro*{citefilm2complete}{% volle zweitnennung mit Regisseur, Land und dt. Titel
+\newbibmacro*{cite:film:directorcountry}{% Film mit Regisseur
\printtext[bibhyperref]{\printfield[film]{title}}%
- \addspace\printtext[citeyear]{\printfield{subtitle}\setunit*{\addcomma\addspace}\printnames[director]{author}\addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}
-
-
+ \addspace\mkbibparens{%
+ \printnames[director]{author}%
+ \addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}
+
\newbibmacro*{cite}{%
\iffieldundef{shorthand}
{\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{year}\AND\iffieldundef{urlyear}}%
@@ -287,6 +291,17 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\inparencite}[]
+ {}
+ {\usebibmacro{citeindex}%
+ \printnames{labelname}
+ \bibopenparen%
+ \usebibmacro{prenote}%
+ \usebibmacro{citeyear}}%
+ {\multicitedelim}%
+ {\usebibmacro{postnote}
+ \unspace\bibcloseparen}
+
\DeclareCiteCommand{\citetitle}
{\citetrackerfalse
\pagetrackerfalse
@@ -369,39 +384,30 @@
{\indexfield{indextitle}%
\iffieldequalstr{entrysubtype}{serial}
{\usebibmacro{citeserial}}
- {\iftoggle{citefullfilm}%
- {\usebibmacro{citeff}}
- {\iftoggle{citecompletefilm}%
- {\usebibmacro{citefilmcomplete}}
- {\usebibmacro{citef}}}}}
+ {\ifciteseen{\usebibmacro{cite:film:seen}}
+ {\usebibmacro{cite:film}}}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\citecfilm}
{\usebibmacro{prenote}}
{\indexfield{indextitle}%
- \usebibmacro{citecf}}
+ \usebibmacro{cite:film:countryear}}
{\multicitedelim}
{\usebibmacro{postnote}}
-
- \DeclareCiteCommand{\citefullfilm}
+\DeclareCiteCommand{\citefullfilm}
{\usebibmacro{prenote}}
{\indexfield{indextitle}%
\iffieldequalstr{entrysubtype}{serial}
{\usebibmacro{citeserialfull}}
- {\iftoggle{citefullfilm}%
- {\usebibmacro{citefff}}%
- {\iftoggle{citecompletefilm}
- {\usebibmacro{citefilm2complete}}{\usebibmacro{citeffs}}
- }%
- }}
+ {\usebibmacro{cite:film}}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\citefilmnoindex}
{\usebibmacro{prenote}}
- {\usebibmacro{citef}}
+ {\usebibmacro{cite:film}}
{\multicitedelim}
{\usebibmacro{postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index 7a23fe248c8..8491ae35771 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
@@ -1,9 +1,8 @@
-% $Id: fiwi2.bbx, v 1.1d 2011/12/21 Simon Spiegel
+% $Id: fiwi2.bbx, v 1.1e 2012/02/16 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi2.bbx}[v 1.1d 2011/12/21 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.1e 2012/02/16 film studies bibliography style Author (Year)]
-\RequireBibliographyStyle{fiwi}
\RequireBibliographyStyle{fiwi-yearbeginning}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx
index f293e346210..eeb51e98edd 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.1d 2011/12/21 Simon Spiegel
+% $Id: fiwi2.cbx,v 1.1e 2012/02/16 Simon Spiegel
\ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.1d 2011/12/21 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx,v 1.1e 2012/02/16 spiegel $]
\RequireCitationStyle{fiwi}