summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-fiwi
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2011-11-22 23:43:49 +0000
committerNorbert Preining <preining@logic.at>2011-11-22 23:43:49 +0000
commitca940dd037b5664e9bce7b84dfd84a108d0aeafc (patch)
tree37a10eede31f8a91eefbe05a3567ed42a4072973 /Master/texmf-dist/tex/latex/biblatex-fiwi
parentbf1100bc0559d7736900cd939457223bba155f96 (diff)
biblatex-fiwi 2011/11/22 v1.1b
git-svn-id: svn://tug.org/texlive/trunk@24635 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-fiwi')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx399
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx56
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx392
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx9
5 files changed, 455 insertions, 405 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
new file mode 100644
index 00000000000..bd6153241a9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
@@ -0,0 +1,399 @@
+% $Id: fiwi-yearbeginning.bbx, v 1.1b 2011/11/22 Simon Spiegel
+% Stil mit Jahrestahl nach Autor
+
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.1b 2011/11/22 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}{%
+ \iffieldundef{year}
+ {}
+ {\printtext[yearparens]{%
+ \iffieldundef{endyear}
+ {\printfield{labelyear}}
+ {\printfield{year}\iffieldsequal{year}{endyear}{}{\printfield{endyear}}}%
+ \printfield{extrayear}%
+ \ifboolexpr{ ( not test {\iffieldundef{origyear}}
+ and test {\iftoggle{origyearwithyear}}
+ and test {\iffieldundef{origtitle}} ) }%
+ {\addslash\printfield{origyear}}%
+ {}%
+ }}}
+
+\renewbibmacro*{author}{%
+ \ifnameundef{author}
+ {\let\bbx@lasthash\@undefined}
+ \iftoggle{bibliographydash}
+ {\iffieldequals{namehash}{\bbx@lasthash}
+ {\bibnamedash}%
+ {\printnames{author}\iffieldundef{nameaddon}
+ {}{\printfield{nameaddon}}}%
+ \addspace%
+ \savefield{namehash}{\bbx@lasthash}}
+ {\printnames{author}\iffieldundef{nameaddon}
+ {}{\printfield{nameaddon}}%
+ \isdot\addspace%
+ \savefield{namehash}{\bbx@lasthash}}}%}
+
+\renewbibmacro*{editor}{%
+ \ifnameundef{editor}
+ {\let\bbx@lasthash\@undefined}
+ {{\ifnamesequal{author}{editor}{%
+ \ifthenelse{\value{author}>1}%
+ {\bibstring{idempp}}%
+ {\bibstring{idem\thefield{gender}}}}{%
+ \printnames{editor}}\addspace
+ \savefield{namehash}{\bbx@lasthash}}%
+ \iffieldequalstr{entrytype}{book}{}{\usebibmacro{editorstrg}}}}
+
+\renewbibmacro*{editorstrg}{%
+ \printtext{\mkbibparens{\unspace
+ \ifnum\theeditor>1
+ \bibstring{editors}%
+ \else
+ \bibstring{editor}%
+ \fi}}%
+ \ifthenelse{\(
+ \iffieldequalstr{entrytype}{book}%
+ \and \ifnameundef{author}%
+ \and \not \ifnameundef{editor}%
+ \)%
+ }%
+ {\addspace}%
+ {\addcolon}}
+
+
+\renewbibmacro*{issue+date}{%
+ \iffieldundef{pages}{}{\ifterm{}{\setunit{\addcomma\addspace}}}\iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{%
+ \iffieldundef{issue}%
+ {\iffieldundef{month}%
+ {}%
+ {\iffieldundef{day}%
+ {\ifpunctmark{*}{\addspace}{}\printfield{month}\iffieldundef{endmonth}{}{\printtext[endyear]{\mkbibmonth{\thefield{endmonth}}}}%
+ \setunit{\addspace}}%
+ {\ifpunctmark{*}{\addspace}{}\printdate}}}%
+ {\printfield{issue}}}}%
+
+ \renewbibmacro*{journal+issuetitle}{%
+ \usebibmacro{journal}\addperiod%
+ \setunit*{\addspace}%
+ \iffieldundef{series}
+ {}
+ {\newunit
+ \printfield{series}%
+ \setunit{\addspace}}%
+\iffieldundef{volume}{}{\printfield{volume}\iffieldundef{number}{\iffieldundef{pages}{\addperiod}{\addcomma}}{\addcomma}}%
+ \setunit*{\adddot}%
+\iffieldundef{number}{}{\printtext{\addspace\printfield{number}}\addspace}%
+\ifnameundef{editor}{}{\addperiod\addspace\usebibmacro{byeditor}\setunit{\addcomma\space}}%
+\printfield{eid}%%
+\usebibmacro{issue+date}%
+\iffieldundef{issuetitle}{}{\addcolon\addspace\printtext{\usebibmacro{issue}}}%
+}
+
+\renewbibmacro*{org+publ+loc+year}{%
+ \iffieldundef{organization}
+ {}
+ {\printfield{organization}%
+ \newunit}%
+ \iflistundef{publisher}
+ {\iflistundef{location}
+ {}
+ {\printlist{location}%
+ \setunit{\addspace}}}
+ {\iflistundef{location}
+ {}
+ {\printlist{location}}%
+ \iftoggle{printpublisher}
+ {\setunit{\isdot\addcolon\addspace}\printlist{publisher}\setunit{\addcomma\space}}%
+ {}
+ }}
+
+\newbibmacro*{publ+loc+origyear}{%
+\printlist{location}%
+ \iftoggle{printpublisher}%
+ {\iflistundef{publisher}%
+ {\setunit*{\space}}%
+ {\setunit{\isdot\addcolon\space}\printlist{publisher}}}%
+ {\setunit*{\space}}%
+\usebibmacro{origyear}%
+}%
+
+\newbibmacro*{inst+loc}{%
+ \iflistundef{institution}
+ {\iflistundef{location}
+ {}
+ {\printlist{location}%
+ \setunit{\addspace}}}
+ {\iflistundef{location}
+ {}
+ {\printlist{location}%
+ \setunit{\isdot\addcolon\space}}%
+ \printlist{institution}}}
+
+
+\DeclareBibliographyDriver{review}{%
+\usebibmacro{bibindex}%
+\usebibmacro{begentry}%
+\usebibmacro{author/translator}%
+\usebibmacro{labelyear+extrayear}%
+\newblock
+\usebibmacro{review}{\thefield{usera}}%
+\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}
+
+\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}{\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{decidetranslatedversion}%
+ \newblock
+\usebibmacro{addendum+pubstate}%
+\newunit\newblock
+\usebibmacro{pageref}%
+\finentry}
+
+\DeclareBibliographyDriver{incollection}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator}%
+ \usebibmacro{labelyear+extrayear}%
+%\newunit\newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \usebibmacro{bytranslator}%
+ \newunit\newblock
+ \usebibmacro{in:}%
+ %\newunit%
+ \newblock%
+ \ifnameundef{bookauthor}%
+ {\ifnameundef{editor}
+ {}
+ {\usebibmacro{editor}}}
+ {\usebibmacro{bybookauthor}}
+ %\newunit
+ \newblock%
+ \usebibmacro{mtitle+vol+btitle+bstitle}%
+ \ifnamesequal{author}{editor}
+ {\ifnameundef{bookauthor}
+ {}
+ {\usebibmacro{byeditor}}}
+ {}
+ \ifnamesequal{author}{bookauthor}
+ {\ifnameundef{editor}
+ {}
+ {\usebibmacro{byeditor}\newunit}%
+ {}
+ }%
+ \newunit\newblock
+ \iffieldundef{maintitle}
+ {\printfield{volume}}
+ {}%
+ \newunit
+ \printfield{volumes}%
+ \newunit\newblock
+ \usebibmacro{ser+num}%
+ \newunit\newblock
+ \printfield{edition}%
+ \printfield{note}%
+ \newunit
+ \usebibmacro{org+publ+loc+year}
+ \newunit\newblock%
+ \usebibmacro{chap+pag}%
+ %\setunit{\par}\newblock
+ %\usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \addspace\usebibmacro{decidetranslatedversion}%
+ \newblock
+ \usebibmacro{addendum+pubstate}%
+ \newblock
+ \usebibmacro{pageref}%
+ \finentry}
+
+ \DeclareBibliographyDriver{book}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \ifnameundef{author}%
+ {\ifnameundef{editor}%
+ {}
+ {\usebibmacro{editor}\addspace}%
+ \usebibmacro{editorstrg}\addspace}%
+{\usebibmacro{author/translator+others}}%
+\usebibmacro{labelyear+extrayear}%
+\newblock
+\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ \newunit\newblock
+ \ifnameundef{author}
+ {}
+ {\usebibmacro{byeditor+others}}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit
+ \printfield{volumes}%
+ \newunit\newblock
+ \usebibmacro{ser+num}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock%
+\usebibmacro{publ+loc+origyear}%
+\usebibmacro{chap+pag}%
+\newblock
+\usebibmacro{doi+eprint+url}%
+\addspace\usebibmacro{decidetranslatedversion}%
+\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}%
+ \newunit\newblock
+ \usebibmacro{bytranslator}%
+ \newunit\newblock%
+ \iffieldundef{edition}%
+ {}%
+ {\printfield{edition}}%
+ \iffieldundef{note}%
+ {}%
+ {\printfield{note}}%
+ %\newunit
+ %\iffieldundef{maintitle}
+ %{\printfield{volume}}
+ %{}%
+ %\newunit
+ %\printfield{volumes}%
+ \newunit\newblock
+ \usebibmacro{ser+num}%
+ \newunit\newblock
+ \usebibmacro{publ+loc+year}%
+ \newblock
+\addspace\usebibmacro{decidetranslatedversion}%
+ \newunit\newblock
+ \usebibmacro{chap+pag}%
+ %\setunit{\par}\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newblock
+ \usebibmacro{addendum+pubstate}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \finentry}
+
+\DeclareBibliographyDriver{online}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor/translator}%
+ \usebibmacro{labelyear+extrayear}%
+ \newunit\newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \usebibmacro{bytranslator}%
+ \newunit\newblock
+ \printlist{organization}%
+ \newunit\newblock
+ \iffieldundef{month}{}{\usebibmacro{date}}%
+ \newunit\newblock
+ \addspace\usebibmacro{decidetranslatedversion}%
+ \newblock
+\printfield{note}%
+ %\newunit\newblock
+ \addspace\usebibmacro{doi+eprint+url}%
+ \newblock
+ \usebibmacro{addendum+pubstate}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \finentry}
+
+\DeclareBibliographyDriver{thesis}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator}%
+ \usebibmacro{labelyear+extrayear}%
+ \newunit\newblock
+ \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ \newunit\newblock
+ \printfield{type}%
+ \newunit
+ \usebibmacro{inst+loc}%
+ \newunit\newblock
+ \usebibmacro{chap+pag}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newblock
+ \usebibmacro{addendum+pubstate}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
+
+ \DeclareBibliographyDriver{unpublished}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator}%
+ \usebibmacro{labelyear+extrayear}%
+ \newunit\newblock
+ \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ \newunit\newblock
+ \printfield{type}%
+ \iffieldundef{issue}
+ {}{\newunit\printfield{issue}}
+ \newunit\newblock
+ \printfield{howpublished}%
+ \newunit\newblock
+ \usebibmacro{inst+loc}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}
+ \newunit\newblock
+ \printfield{note}%
+ \newblock
+ \usebibmacro{addendum+pubstate}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index 09d2e173696..31da9091322 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.1a 2011/11/18 Simon Spiegel
+% $Id: fiwi.bbx, v1.1b 2011/11/22 Simon Spiegel
-\ProvidesFile{fimi.bbx}[v1.1a 2011/11/18 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.1b 2011/11/22 film studies bibliography style]
\@ifpackagelater{biblatex}{2011/11/12}
{}
@@ -27,21 +27,35 @@
\providetoggle{dontprintorig}
\providetoggle{dontprintextrayear}
\togglefalse{dontprintextrayear}
+\providetoggle{yearatbeginning}
+\togglefalse{yearatbeginning}
+\providetoggle{origyearwithyear}
+\togglefalse{origyearwithyear}
+\providetoggle{origyearsuperscript}
+\togglefalse{origyearsuperscript}
\DeclareBibliographyOption{germ}[true]{\settoggle{germfassung}{#1}}
-\DeclareBibliographyOption{noseries}[true]{\togglefalse{printseriesflag}}%
+\DeclareBibliographyOption{noseries}[true]{%
+\ifstrequal{#1}{true}
+{\togglefalse{printseriesflag}}
+{\toggletrue{printseriesflag}}}%
\DeclareBibliographyOption{series}[true]{\settoggle{printseriesflag}{#1}}%
-\DeclareBibliographyOption{nopublisher}[false]{\settoggle{printpublisher}{#1}}%
+\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}}
-
-
- \DeclareBibliographyOption{dashed}[true]{%
+\DeclareBibliographyOption{dashed}[true]{%
\ifstrequal{#1}{true}
{\toggletrue{bibliographydash}%
\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
{\renewbibmacro*{bbx:savehash}{}}}
+\DeclareBibliographyOption{yearatbeginning}[true]{%
+\ifstrequal{#1}{true}
+{\RequireBibliographyStyle{fiwi-yearbeginning}}{}}
+\DeclareBibliographyOption{origyearwithyear}[true]{\settoggle{origyearwithyear}{#1}}
+\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}
@@ -90,10 +104,15 @@
\DeclareFieldFormat{ser+num}{\mkbibparens{#1}}
\DeclareFieldFormat[article,review]{volume}{\bibstring{jourvol}\addnbthinspace{#1}}
\DeclareFieldFormat[article,review]{number}{\bibstring{number}\addnbthinspace{#1}}
-\DeclareFieldFormat{origyearbook}{\addspace\mkbibparens{\textsuperscript{1}#1}}
+\DeclareFieldFormat{origyearbook}{\iftoggle{origyearsuperscript}
+{\addspace\mkbibparens{#1}}
+{\addspace\mkbibparens{\textsuperscript{1}#1}}}
\DeclareFieldFormat{origyearart}{\mkbibparens{#1}}
\DeclareFieldFormat{origtit}{\mkbibparens{Original\addcolon\addspace #1}}
\DeclareFieldFormat{germfassung}{\mkbibbrackets{\bibstring{translatedto}\adddot\addcolon\addspace#1}}
+\DeclareFieldFormat{origyear}{\iftoggle{origyearsuperscript}
+{\textsuperscript{1}#1}
+{#1}}
\DeclareListFormat{default}{%
\usebibmacro{list:delim}{#1}%
@@ -230,7 +249,7 @@
{\usebibmacro{title}}\bibstring{reviewof}\addspace\fullcite{##1}}}}%
\@tempa\togglefalse{dontprintextrayear}}
-\newbibmacro*{url+urldate}{%
+\renewbibmacro*{url+urldate}{%
\printfield{url}%
\iffieldundef{urlyear}
{}
@@ -497,7 +516,12 @@ or test {\iffieldequalstr{entrytype}{set}}}
{}
{\printtext{%
\iffieldundef{endyear}%
- {\printfield{year}}%
+ {\printfield{year}%
+ \ifboolexpr{(
+ test {\iftoggle{origyearwithyear}}
+ and not test {\iffieldundef{origyear}}
+ and test {\iffieldundef{origtitle}} )}
+ {\addslash\printfield{origyear}}{}}%
{\printfield{year}\iffieldsequal{year}{endyear}%
{}{\printfield{endyear}}}%
\iftoggle{dontprintextrayear}%
@@ -542,7 +566,9 @@ or test {\iffieldequalstr{entrytype}{set}}}
\printfield[noformat]{title}%
\newunit\printfield[noformat]{subtitle}}}%
\printfield{titleaddon}
- \iffieldundef{origyear}
+ \ifboolexpr{ test {\iffieldundef{origyear}}
+ or (not test {\iffieldundef{origyear}} and test {\iftoggle{origyearwithyear}}
+ and test {\iffieldundef{origtitle}} )}
{}
{\iffieldundef{origtitle}
{\setunit{\addspace}\printtext[origyearart]{\printfield{origyear}%
@@ -654,7 +680,7 @@ or test {\iffieldequalstr{entrytype}{set}}}
\iffieldundef{maintitle}%
{}%
{\addcolon\addspace\printfield[film]{title}}%
-\ifpunctmark{!}{\unspace .}{\adddot}}%
+\ifpunctmark{!}{\unspace .\newunit}{\adddot}}%
\newbibmacro*{filmloc}
{\iflistundef{location}%
@@ -741,7 +767,9 @@ or test {\iffieldequalstr{entrytype}{set}}}
\newbibmacro*{origyear}{%
\iffieldundef{origyear}%
{}%
- {\iffieldundef{origtitle}%
+ {\ifboolexpr{ (test {\iffieldundef{origtitle}}
+ and not test {\iftoggle{origyearwithyear}} )}
+ %
{\printtext[origyearbook]{\printfield{origyear}%
\iffieldundef{origendyear}{}{\printfield{origendyear}}}}%
{}}%
@@ -943,7 +971,7 @@ or test {\iffieldequalstr{entrytype}{set}}}
\newblock
\ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}}
{}
-{\usebibmacro{doi+eprint+url}}%
+{\addperiod\addspace\usebibmacro{doi+eprint+url}}%
\addspace\usebibmacro{decidetranslatedversion}%
\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 422b6f12587..cf8805adc29 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.1 2011/11/15 13:23:00 Simon Spiegel
+% $Id: fiwi.cbx,v 1.1b 2011/11/22 Simon Spiegel
\ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.1 2011/11/15 13:23:00 spiegel beta $]
+[\abx@cbxid $Id: fiwi.cbx,v 1.1b 2011/11/22 spiegel $]
\ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index ce0464ce640..aa6e04eaa5e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
@@ -1,395 +1,9 @@
-% $Id: fiwi2.bbx, v 1.1a 2011/11/18Simon Spiegel
+% $Id: fiwi2.bbx, v 1.1b 2011/11/22 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi2.bbx}[v 1.1a 2011/11/18 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.1b 2011/11/22 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}
-
-\renewcommand{\ppspace}{}
-
-\renewbibmacro*{labelyear+extrayear}{%
- \iffieldundef{year}
- {}
- {\printtext[yearparens]{%
- \iffieldundef{endyear}{\printfield{labelyear}}{\printfield{year}\iffieldsequal{year}{endyear}{}{\printfield{endyear}}}%
- \printfield{extrayear}}}}
-
-\renewbibmacro*{author}{%
- \ifnameundef{author}
- {\let\bbx@lasthash\@undefined}
- \iftoggle{bibliographydash}
- {\iffieldequals{namehash}{\bbx@lasthash}
- {\bibnamedash}%
- {\printnames{author}\iffieldundef{nameaddon}
- {}{\printfield{nameaddon}}}%
- \addspace%
- \savefield{namehash}{\bbx@lasthash}}
- {\printnames{author}\iffieldundef{nameaddon}
- {}{\printfield{nameaddon}}%
- \isdot\addspace%
- \savefield{namehash}{\bbx@lasthash}}}%}
-
-\renewbibmacro*{editor}{%
- \ifnameundef{editor}
- {\let\bbx@lasthash\@undefined}
- {{\ifnamesequal{author}{editor}{%
- \ifthenelse{\value{author}>1}%
- {\bibstring{idempp}}%
- {\bibstring{idem\thefield{gender}}}}{%
- \printnames{editor}}\addspace
- \savefield{namehash}{\bbx@lasthash}}%
- \iffieldequalstr{entrytype}{book}{}{\usebibmacro{editorstrg}}}}
-
-\renewbibmacro*{editorstrg}{%
- \printtext{\mkbibparens{\unspace
- \ifnum\theeditor>1
- \bibstring{editors}%
- \else
- \bibstring{editor}%
- \fi}}%
- \ifthenelse{\(
- \iffieldequalstr{entrytype}{book}%
- \and \ifnameundef{author}%
- \and \not \ifnameundef{editor}%
- \)%
- }%
- {\addspace}%
- {\addcolon}}
-
-
-\renewbibmacro*{issue+date}{%
- \iffieldundef{pages}{}{\ifterm{}{\setunit{\addcomma\addspace}}}\iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{%
- \iffieldundef{issue}%
- {\iffieldundef{month}%
- {}%
- {\iffieldundef{day}%
- {\ifpunctmark{*}{\addspace}{}\printfield{month}\iffieldundef{endmonth}{}{\printtext[endyear]{\mkbibmonth{\thefield{endmonth}}}}%
- \setunit{\addspace}}%
- {\ifpunctmark{*}{\addspace}{}\printdate}}}%
- {\printfield{issue}}}}%
-
- \renewbibmacro*{journal+issuetitle}{%
- \usebibmacro{journal}\addperiod%
- \setunit*{\addspace}%
- \iffieldundef{series}
- {}
- {\newunit
- \printfield{series}%
- \setunit{\addspace}}%
-\iffieldundef{volume}{}{\printfield{volume}\iffieldundef{number}{\iffieldundef{pages}{\addperiod}{\addcomma}}{\addcomma}}%
- \setunit*{\adddot}%
-\iffieldundef{number}{}{\printtext{\addspace\printfield{number}}\addspace}%
-\ifnameundef{editor}{}{\addperiod\addspace\usebibmacro{byeditor}\setunit{\addcomma\space}}%
-\printfield{eid}%%
-\usebibmacro{issue+date}%
-\iffieldundef{issuetitle}{}{\addcolon\addspace\printtext{\usebibmacro{issue}}}%
-}
-
-\renewbibmacro*{org+publ+loc+year}{%
- \iffieldundef{organization}
- {}
- {\printfield{organization}%
- \newunit}%
- \iflistundef{publisher}
- {\iflistundef{location}
- {}
- {\printlist{location}%
- \setunit{\addspace}}}
- {\iflistundef{location}
- {}
- {\printlist{location}}%
- \iftoggle{printpublisher}
- {\setunit{\isdot\addcolon\addspace}\printlist{publisher}\setunit{\addcomma\space}}%
- {}
- }}
-
-\newbibmacro*{publ+loc+origyear}{%
-\printlist{location}%
- \iftoggle{printpublisher}%
- {\iflistundef{publisher}%
- {\setunit*{\space}}%
- {\setunit{\isdot\addcolon\space}\printlist{publisher}}}%
- {\setunit*{\space}}%
-\usebibmacro{origyear}%
-}%
-
-\newbibmacro*{inst+loc}{%
- \iflistundef{institution}
- {\iflistundef{location}
- {}
- {\printlist{location}%
- \setunit{\addspace}}}
- {\iflistundef{location}
- {}
- {\printlist{location}%
- \setunit{\isdot\addcolon\space}}%
- \printlist{institution}}}
-
-
-\DeclareBibliographyDriver{review}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{author/translator}%
-\usebibmacro{labelyear+extrayear}%
-\newblock
-\usebibmacro{review}{\thefield{usera}}%
-\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}
-
-\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}{\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{decidetranslatedversion}%
- \newblock
-\usebibmacro{addendum+pubstate}%
-\newunit\newblock
-\usebibmacro{pageref}%
-\finentry}
-
-\DeclareBibliographyDriver{incollection}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/translator}%
- \usebibmacro{labelyear+extrayear}%
-%\newunit\newblock
- \usebibmacro{title}%
- \newunit\newblock
- \usebibmacro{bytranslator}%
- \newunit\newblock
- \usebibmacro{in:}%
- %\newunit%
- \newblock%
- \ifnameundef{bookauthor}%
- {\ifnameundef{editor}
- {}
- {\usebibmacro{editor}}}
- {\usebibmacro{bybookauthor}}
- %\newunit
- \newblock%
- \usebibmacro{mtitle+vol+btitle+bstitle}%
- \ifnamesequal{author}{editor}
- {\ifnameundef{bookauthor}
- {}
- {\usebibmacro{byeditor}}}
- {}
- \ifnamesequal{author}{bookauthor}
- {\ifnameundef{editor}
- {}
- {\usebibmacro{byeditor}\newunit}%
- {}
- }%
- \newunit\newblock
- \iffieldundef{maintitle}
- {\printfield{volume}}
- {}%
- \newunit
- \printfield{volumes}%
- \newunit\newblock
- \usebibmacro{ser+num}%
- \newunit\newblock
- \printfield{edition}%
- \printfield{note}%
- \newunit
- \usebibmacro{org+publ+loc+year}
- \newunit\newblock%
- \usebibmacro{chap+pag}%
- %\setunit{\par}\newblock
- %\usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \addspace\usebibmacro{decidetranslatedversion}%
- \newblock
- \usebibmacro{addendum+pubstate}%
- \newblock
- \usebibmacro{pageref}%
- \finentry}
-
- \DeclareBibliographyDriver{book}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \ifnameundef{author}%
- {\ifnameundef{editor}%
- {}
- {\usebibmacro{editor}\addspace}%
- \usebibmacro{editorstrg}\addspace}%
-{\usebibmacro{author/translator+others}}%
-\usebibmacro{labelyear+extrayear}%
-\newblock
-\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
- \newunit\newblock
- \ifnameundef{author}
- {}
- {\usebibmacro{byeditor+others}}%
- \newunit\newblock
- \printfield{note}%
- \newunit
- \printfield{volumes}%
- \newunit\newblock
- \usebibmacro{ser+num}%
- \newunit\newblock
- \printfield{edition}%
- \newunit\newblock%
-\usebibmacro{publ+loc+origyear}%
-\usebibmacro{chap+pag}%
-\newblock
-\usebibmacro{doi+eprint+url}%
-\addspace\usebibmacro{decidetranslatedversion}%
-\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}%
- \newunit\newblock
- \usebibmacro{bytranslator}%
- \newunit\newblock%
- \iffieldundef{edition}%
- {}%
- {\printfield{edition}}%
- \iffieldundef{note}%
- {}%
- {\printfield{note}}%
- %\newunit
- %\iffieldundef{maintitle}
- %{\printfield{volume}}
- %{}%
- %\newunit
- %\printfield{volumes}%
- \newunit\newblock
- \usebibmacro{ser+num}%
- \newunit\newblock
- \usebibmacro{publ+loc+year}%
- \newblock
-\addspace\usebibmacro{decidetranslatedversion}%
- \newunit\newblock
- \usebibmacro{chap+pag}%
- %\setunit{\par}\newblock
- \usebibmacro{doi+eprint+url}%
- \newblock
- \usebibmacro{addendum+pubstate}%
- \newunit\newblock
- \usebibmacro{pageref}%
- \finentry}
-
-\DeclareBibliographyDriver{online}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor/translator}%
- \usebibmacro{labelyear+extrayear}%
- \newunit\newblock
- \usebibmacro{title}%
- \newunit\newblock
- \usebibmacro{bytranslator}%
- \newunit\newblock
- \printlist{organization}%
- \newunit\newblock
- \iffieldundef{month}{}{\usebibmacro{date}}%
- \newunit\newblock
- \addspace\usebibmacro{decidetranslatedversion}%
- \newblock
-\printfield{note}%
- %\newunit\newblock
- \addspace\usebibmacro{doi+eprint+url}%
- \newblock
- \usebibmacro{addendum+pubstate}%
- \newunit\newblock
- \usebibmacro{pageref}%
- \finentry}
-
-\DeclareBibliographyDriver{thesis}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/translator}%
- \usebibmacro{labelyear+extrayear}%
- \newunit\newblock
- \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
- \newunit\newblock
- \printfield{type}%
- \newunit
- \usebibmacro{inst+loc}%
- \newunit\newblock
- \usebibmacro{chap+pag}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newblock
- \usebibmacro{addendum+pubstate}%
- \newunit\newblock
- \usebibmacro{pageref}%
- \usebibmacro{finentry}}
-
- \DeclareBibliographyDriver{unpublished}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/translator}%
- \usebibmacro{labelyear+extrayear}%
- \newunit\newblock
- \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
- \newunit\newblock
- \printfield{type}%
- \iffieldundef{issue}
- {}{\newunit\printfield{issue}}
- \newunit\newblock
- \printfield{howpublished}%
- \newunit\newblock
- \usebibmacro{inst+loc}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}
- \newunit\newblock
- \printfield{note}%
- \newblock
- \usebibmacro{addendum+pubstate}%
- \newunit\newblock
- \usebibmacro{pageref}%
- \usebibmacro{finentry}}
-
-
+\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
new file mode 100644
index 00000000000..ab4d220b87b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx
@@ -0,0 +1,9 @@
+% $Id: fiwi2.cbx,v 1.1b 2011/11/22 Simon Spiegel
+
+\ProvidesFile{fiwi2.cbx}
+[\abx@cbxid $Id: fiwi2.cbx,v 1.1b 2011/11/22 spiegel $]
+
+
+\RequireCitationStyle{fiwi}
+
+\endinput