summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-21 22:15:15 +0000
committerKarl Berry <karl@freefriends.org>2017-11-21 22:15:15 +0000
commit420f99fea3510c7f655a3b3e14020cb4825bd210 (patch)
treeb4dd8a2ce028e48af82df4912f9535a100a7b32c /Master/texmf-dist/tex
parent40a2270630df0c63ac34e92350bbf810d1d8cdf9 (diff)
biblatex-fiwi (21nov17)
git-svn-id: svn://tug.org/texlive/trunk@45876 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx108
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx140
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx35
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx10
-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.dbx11
7 files changed, 232 insertions, 80 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 fb0789424ab..b6567f29f1b 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, v1.6c 2017/01/27 Simon Spiegel
-% Stil mit Jahrestahl nach Autor
+% $Id: fiwi-yearbeginning.bbx, v1.7 2017/11/21 Simon Spiegel
+% Stil mit Jahreszahl nach Autor
-\ProvidesFile{fiwi-yearbeginning.bbx}[v1.6c 2017/01/28 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v1.7 2017/11/21 film studies bibliography style Author (Year)]
\RequireBibliographyStyle{fiwi}
@@ -47,7 +47,7 @@
\iffieldsequal{year}{\thefield{labeldatesource}year}
{\printlabeldateextra}%
{\printfield{labelyear}%
- \printfield{extrayear}}%
+ \printfield{extradate}}%
\usebibmacro{date:origyear}}%
}}}%
\renewbibmacro*{date}{}%
@@ -61,7 +61,7 @@
\iftoggle{isreview}{\printfield{year}}%
{\iffieldundef{day}
{\printlabeldateextra}
- {\printfield{year}\printfield{extrayear}}}%
+ {\printfield{year}\printfield{extradate}}}%
\usebibmacro{date:origyear}}%
\renewbibmacro*{date}{}%
\renewbibmacro*{issue+date}{%
@@ -87,7 +87,7 @@
{\iffieldsequal{year}{\thefield{labeldatesource}year}
{\printlabeldateextra}%
{\printfield{labelyear}%
- \printfield{extrayear}}%
+ \printfield{extradate}}%
\usebibmacro{date:origyear}}}}%
\renewbibmacro*{date}{%
\iffieldundef{month}
@@ -117,13 +117,13 @@
\printtext[yearparens]{%
\iftoggle{isreview}{\printfield{year}}%
{\printfield{labelyear}%
- \printfield{extrayear}%
+ \printfield{extradate}%
\usebibmacro{date:origyear}}}}}%
\renewbibmacro*{date}{%
\ifboolexpr{
test {\iffieldundef{month}}
and
- test {\iffieldundef{extrayear}}
+ test {\iffieldundef{extradate}}
}
{}
{\printdate}}%
@@ -150,7 +150,7 @@
\printtext[yearparens]{%
\iftoggle{isreview}{\printfield{year}}%
{\printfield{labelyear}%
- \printfield{extrayear}%
+ \printfield{extradate}%
\usebibmacro{date:origyear}}}}%
\renewbibmacro*{date}{\printdate}%
\renewbibmacro*{issue+date}{%
@@ -216,9 +216,10 @@
{\addthinspace\bibopenbracket}{\addthinspace\bibopenparen}%
\iftoggle{origyearsuperscript}%
{\textsuperscript{1}\printorigdate}%
- {\iffieldundef{origyear}{}
- {\iffieldequalstr{origdateunspecified}{yearincentury}
- {\number\numexpr\thefield{origyear}/100+1\relax \adddot\addnbthinspace{Jhdt\adddot}}
+ {\iffieldundef{origyear}{}%
+ {\iffieldequalstr{origdateunspecified}{yearincentury}%
+ {\number\numexpr\thefield{origyear}/100+1\relax\adddot%
+ \addnbthinspace{Jhdt\adddot}}%
{\printorigdate}}}%
\iftoggle{origyearbrackets}
{\bibclosebracket}{\bibcloseparen}}
@@ -231,23 +232,28 @@
{\bibstring{idempp}}%
{\bibstring{idem\thefield{gender}}}}{%
\printnames{editor}}\addspace}%
- \ifentrytype{book}{}{\usebibmacro{editorstrg}}}}
+ \ifentrytype{book}{}{\usebibmacro{editorstrg}}}\addcolon}
-\renewbibmacro*{editorstrg}{%
- \printtext{\mkbibparens{\unspace
- \ifnum\value{editor}>1
- \bibstring{editors}%
- \else
- \bibstring{editor}%
- \fi}}%
- \ifthenelse{\(
- \ifentrytype{book}%
- \and \ifnameundef{author}%
- \and \not \ifnameundef{editor}%
- \)%
- }%
- {\addspace}%
- {\addcolon}}
+ \renewbibmacro*{editorstrg}{%
+ \printtext[editortype]{%
+ \mkbibparens{\iffieldundef{editortype}
+ {\ifboolexpr{
+ test {\ifnumgreater{\value{editor}}{1}}
+ or
+ test {\ifandothers{editor}}
+ }
+ {\bibstring{editors}}
+ {\bibstring{editor}}}
+ {\ifbibxstring{\thefield{editortype}}
+ {\ifboolexpr{
+ test {\ifnumgreater{\value{editor}}{1}}
+ or
+ test {\ifandothers{editor}}
+ }
+ {\bibstring{\thefield{editortype}s}}
+ {\bibstring{\thefield{editortype}}}}
+ {\thefield{editortype}}}}}}
+
\renewbibmacro*{chap+pag}{%
\iffieldundef{chapter}
@@ -258,7 +264,7 @@
{\printfield{chapter}%
\iffieldundef{pages}%
{}%
- {AA\newunit\printfield{pages}}}%
+ {\newunit\printfield{pages}}}%
}
@@ -358,7 +364,8 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
{\printfield{year}}
{\printfield{labelyear}}}
{\usebibmacro{date}}%
- \usebibmacro{origyear}%
+ \iftoggle{bbx:origyearafter}{}%
+ {\usebibmacro{origyear}}%
}%
@@ -414,7 +421,9 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\newblock\toggletrue{isreview}%
\usebibmacro{review}{\thefield{related}}%
\togglefalse{isreview}\newunit\newblock
- \usebibmacro{bytranslator}%
+ \ifnamesequal{translator}{editor}
+ {}
+ {\usebibmacro{bytranslator}}%
\newunit\newblock
\usebibmacro{in:}%
%\newblock%
@@ -529,7 +538,9 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
%\newunit\newblock
\usebibmacro{title}%
\newunit\newblock
- \usebibmacro{bytranslator}%
+ \ifnamesequal{translator}{editor}
+ {}
+ {\usebibmacro{bytranslator}}%
\newunit\newblock
\usebibmacro{in:}%
%\newunit%
@@ -742,6 +753,8 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\newunit\newblock
\usebibmacro{inst+loc}%
\newunit\newblock
+ \iffieldundef{month}{}{\printdate}
+ \newunit\newblock
\usebibmacro{doi+eprint+url}
\newunit\newblock
\printfield{note}%
@@ -751,4 +764,35 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\usebibmacro{pageref}%
\usebibmacro{finentry}}
+\DeclareBibliographyDriver{archival}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator}%
+ \ifnameundef{author}{}{%
+ \iffieldundef{year}
+ {}{\usebibmacro{date+extrayear}}\addcolon}%
+ \newunit\newblock
+ \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ \newunit\newblock
+ \ifnameundef{author}{\iffieldundef{year}
+ {\bibstring[\mkbibbrackets]{nodate}}
+ {\iftoggle{dontprintextrayear}%
+ {\printfield{year}}{\printdateextra}}}%
+ {\iffieldundef{day}
+ {}{\usebibmacro{date}}}%
+\newunit\newblock
+\printfield{library}
+\printfield{librarylocation}
+ \newunit\newblock
+ %\usebibmacro{inst+loc+year}%
+ \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 f77a4255fae..695603a6882 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
@@ -1,11 +1,11 @@
-% $Id: fiwi.bbx, v1.6c 2017/01/28 Simon Spiegel
-\ProvidesFile{fiwi.bbx}[v1.6c 2017/01/28 film studies bibliography style]
+% $Id: fiwi.bbx, v1.7 2017/11/21 Simon Spiegel
+\ProvidesFile{fiwi.bbx}[v1.7 2017/11/21 film studies bibliography style]
-\@ifpackagelater{biblatex}{2016/08/01}
+\@ifpackagelater{biblatex}{2017/11/01}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
- {The 'fiwi' style requires biblatex v3.5 or later.\MessageBreak
+ {The 'fiwi' style requires biblatex v3.8 or later.\MessageBreak
You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
@@ -65,8 +65,8 @@
% Diverse Schalter
-\providetoggle{bbx:directoreplace}
-\togglefalse{bbx:directoreplace}
+\providetoggle{bbx:directorreplace}
+\togglefalse{bbx:directorreplace}
\providetoggle{bbx:scriptwriter}
\togglefalse{bbx:scriptwriter}
\providetoggle{bbx:actor}
@@ -92,6 +92,8 @@
\togglefalse{origyearwithyear}
\providetoggle{origyearbrackets}
\togglefalse{origyearbrackets}
+\providetoggle{bbx:origyearafter}
+\togglefalse{bbx:origyearafter}
\providetoggle{origyearsuperscript}
\togglefalse{origyearsuperscript}
\providetoggle{partofcitedflag}
@@ -126,6 +128,8 @@
\togglefalse{markmissingpublisher}
\newtoggle{cbx:orgigyearcite}
\newtoggle{cbx:superscriptcite}
+\newtoggle{bbx:parensfilmnote}
+\togglefalse{bbx:parensfilmnote}
% BibliographyOptions
@@ -236,7 +240,7 @@
\DeclareBibliographyOption{partofcited}[true]{\settoggle{partofcitedflag}{#1}}
\DeclareBibliographyOption{germ}[true]{\settoggle{germfassung}{#1}}
\DeclareBibliographyOption{translatedas}[true]{\settoggle{germfassung}{#1}}
-\DeclareBibliographyOption{directoreplace}[true]{\settoggle{bbx:directoreplace}{#1}}
+\DeclareBibliographyOption{directorreplace}[true]{\settoggle{bbx:directorreplace}{#1}}
\DeclareBibliographyOption{noseries}[true]{%
\ifstrequal{#1}{true}
@@ -249,6 +253,7 @@
{\togglefalse{printpublisher}}
{\toggletrue{printpublisher}}}
+\DeclareBibliographyOption{parensfilmnote}[true]{\settoggle{bbx:parensfilmnote}{#1}}%
\DeclareBibliographyOption{filmruntime}[true]{\settoggle{filmruntime}{#1}}%
\DeclareBibliographyOption{citeprefix}[true]{\settoggle{citeprefix}{#1}}
\newbibmacro*{bbx:savehash}{}
@@ -257,14 +262,20 @@
\ifstrequal{#1}{true}
{\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
{\renewbibmacro*{bbx:savehash}{}}}
+
\DeclareBibliographyOption{yearatbeginning}[true]{%
\ifstrequal{#1}{true}
{\RequireBibliographyStyle{fiwi-yearbeginning}}{}}
- \DeclareBibliographyOption{origyearwithyear}[true]{
+
+\DeclareBibliographyOption{origyearwithyear}[true]{
\ifstrequal{#1}{true}
{\settoggle{origyearwithyear}{#1}}{}
- \ifstrequal{#1}{brackets}{\toggletrue{origyearwithyear}
- \toggletrue{origyearbrackets}{}}}
+ \ifstrequal{#1}{brackets}{\toggletrue{origyearwithyear}
+ \toggletrue{origyearbrackets}}{}
+ \ifstrequal{#1}{after}
+ {\toggletrue{bbx:origyearafter}}{}%
+ }
+
\DeclareBibliographyOption{origyearsuperscript}[true]{\settoggle{origyearsuperscript}{#1}}
\DeclareBibliographyOption{pages}[true]{%
@@ -384,6 +395,7 @@
%\DeclareFieldFormat{labelyear}{\mknumalph{#1}}
\DeclareFieldFormat{film}{\film{#1}}
\DeclareFieldFormat{altfilm}{\film{#1}}
+\DeclareFieldFormat[misc,video,movie]{note}{\iftoggle{bbx:parensfilmnote}{\mkbibparens{#1}}{#1}}
\newbibmacro*{bbx:cite-alternatetitle}{
\iffieldundef{alternatetitlescript}
@@ -396,6 +408,7 @@
\DeclareFieldFormat{title}{\mkbibemph{#1}}
+\DeclareFieldFormat{origtitle}{#1}
\DeclareFieldFormat{noformat}{#1}
\DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot}
\DeclareFieldFormat[movie]{citetitle}{\film{#1}}
@@ -446,9 +459,16 @@
}
\DeclareFieldFormat[article,review,periodical]{number}{\bibstring{number}\addnbthinspace{#1}}
-\DeclareFieldFormat{origyear}{\iftoggle{origyearsuperscript}
- {\textsuperscript{1}#1}
+\DeclareFieldFormat{origdate}{%
+\ifboolexpr{%
+ ( test {\iftoggle{bbx:origyearafter}})%
+ and ( test {\iffieldundef{origtitle}})}%
+ {\unspace}{}%
+ {\iffieldundef{shortoriglang}{}{\printfield{shortoriglang}\addspace}#1}}%
+\DeclareFieldFormat{origyear}{\iftoggle{origyearsuperscript}%
+ {\textsuperscript{1}#1}%
{#1}}
+
\DeclareFieldFormat{origyearbook}{%
\iftoggle{origyearbrackets}%
{\addthinspace\bibopenbracket}{\addslash}%
@@ -781,7 +801,7 @@
% Sorting definitions
-\DeclareSortingScheme{title}{
+\DeclareSortingTemplate{title}{
\sort{
\field{presort}
}
@@ -809,6 +829,26 @@
+\DeclareSortingTemplate{archiv}{
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort{
+ \field{author}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{year}
+ }
+}
+
+
+
% biber sorting
\AtEndPreamble{%
@@ -872,6 +912,7 @@
\NewBibliographyString{writtenby}
\NewBibliographyString{writtendirectedby}
\NewBibliographyString{actors}
+\NewBibliographyString{idea}
%\NewBibliographyString{citepage}
%\NewBibliographyString{citepages}
@@ -879,6 +920,7 @@
\protected\def\bibdateeraprefix{-}}
\DefineBibliographyStrings{german}{%
+idea = {Idee\addcolon\addspace},
notavailable = {\brackettext{K\adddot\addnbthinspace{A}\adddot}},
andothers = {et al\adddot\addspace},
directedby = {Regie\addcolon\addspace},
@@ -893,6 +935,7 @@ url = {},
urlseen = {Zugriff am},
actors = {Darsteller\addcolon\addspace},
in = {In\addcolon},
+redactor = {Red\adddot},
editor = {Hg\adddot},
editors = {Hgg\adddot},
phdthesis ={Unver\"offentlichte Dissertation},
@@ -1104,6 +1147,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\renewbibmacro*{editor}{%
\usebibmacro{bbx:editor}{editorstrg}}%
+
\renewbibmacro*{editor+others}{%
\usebibmacro{bbx:editor}{editor+othersstrg}}%
\newbibmacro*{bbx:editor}[1]{%
@@ -1192,8 +1236,8 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
{\textsuperscript{1}\printorigdate}%
{\iffieldundef{origyear}{}%
{\iffieldequalstr{origdateunspecified}{yearincentury}
- {\number\numexpr\thefield{origyear}/100+1\relax
- \adddot\addnbthinspace{Jhdt\adddot}}
+ {\number\numexpr\thefield{origyear}/100+1\relax%
+ \adddot\addnbthinspace{Jhdt\adddot}}%
{\printorigdate}}}%
\iftoggle{origyearbrackets}
{\bibclosebracket}{}}
@@ -1247,7 +1291,9 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\iffieldundef{endyear}%
{}{\printfield{endyear}}}}
{\ifboolexpr{ (test{\iffieldundef{origtitle}} and not test {\ifentrytype{bookinbook}})}
- {\setunit{\addspace}\printtext[origyear]{\mkbibparens{\printorigdate}}}
+ {\setunit{\addspace}\printtext[origyear]{\iftoggle{bbx:origyearafter}
+ {\mkbibbrackets{\printorigdate}}
+ {\mkbibparens{\printorigdate}}}}
{}}
}}
@@ -1278,7 +1324,11 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\printtext{\bibstring{part}%
\addspace\printfield{part}%
\addcolon\addspace\printfield{parttitle}}}%
- }
+ \setunit{}\iffieldundef{origyear}{}
+ {\ifboolexpr{%
+ ( test {\iftoggle{bbx:origyearafter}}) and
+ ( test {\iffieldundef{origtitle}} )}
+{\addspace\mkbibbrackets{\printorigdate}}{}}}
\newbool{bbx@inset}
@@ -1434,7 +1484,7 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
{}{\printfield{endyear}}%
}}}
{}}
-{\setunit{}\newblock\printtext[origtit]{\printfield{origtitle}%
+{\setunit{}\newblock\printtext[origtit]{\printfield[noformat]{origtitle}%
\iftoggle{printaddress}{}{\clearlist{location}}%
\iflistundef{origlocation}{}%
{\adddot\addspace\printlist{origlocation}%
@@ -1518,18 +1568,18 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
\newbibmacro*{movie:directors}{%
\ifpunct{\unspace}{}%
\ifnameundef{director}{%
-\iftoggle{bbx:directoreplace}
+\iftoggle{bbx:directorreplace}
{\iflistundef{production}{\bibstring{notavailable}}{\printlist{production}}}
{\iffieldequalstr{entrysubtype}{tv}
{}{\bibstring{notavailable}}}}
-{\printnames[director]{director}%
+{\iffieldundef{creatortype}{}%
+{\bibstring{\thefield{creatortype}}}%
+\printnames[director]{director}%
\iffieldundef{filmmakertype}%
{}%
{\addspace\mkbibbrackets{\printfield{filmmakertype}}}%
}}
-
-
\newbibmacro*{movie:directorsscriptwriters}{%
\ifnamesequal{scriptwriter}{director}
{\bibstring{writtendirectedby}\printnames{director}}
@@ -1989,23 +2039,20 @@ and (test {\iffieldundef{origyear}}%
\newblock%
\usebibmacro{filmtitle}%
\newunit\newblock%
- \usebibmacro{movie:creators}
- \newunit\newblock%
- \iffieldundef{entrysubtype}
+ \usebibmacro{movie:creators}%
+ \iffieldundef{entrysubtype}%
{\usebibmacro{movie:regular}}%
{\iffieldequalstr{entrysubtype}{serial}%
{\usebibmacro{movie:serials}}%
{\iffieldequalstr{entrysubtype}{tv}%
{\usebibmacro{movie:tv}}%
{\usebibmacro{movie:regular}}}}%
- \newunit\newblock%
- \iftoggle{bbx:actor}
- {\usebibmacro{movie:actor}}%
- {}
- \iffieldundef{duration}
+ \iftoggle{bbx:actor}%
+ {\newunit\newblock\usebibmacro{movie:actor}}%
+ {}%
+ \iffieldundef{duration}%
{}
- {%
- \iftoggle{filmruntime}%
+ {\iftoggle{filmruntime}%
{\addcomma\addspace\printfield{duration}}%
{}}
\iffieldundef{note}%
@@ -2114,4 +2161,33 @@ and (test {\iffieldundef{origyear}}%
\usebibmacro{pageref}%
\usebibmacro{finentry}}
+
+ \DeclareBibliographyDriver{archival}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator}%
+ \newunit\newblock
+ \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ \newunit\newblock
+ \ifnameundef{author}{\iffieldundef{year}
+ {\bibstring[\mkbibbrackets]{nodate}}
+ {\iftoggle{dontprintextrayear}%
+ {\printfield{year}}{\printdateextra}}}%
+ {\iffieldundef{day}
+ {}{\usebibmacro{date}}}%
+\newunit\newblock
+\printfield{library}
+\printfield{librarylocation}
+ \newunit\newblock
+ %\usebibmacro{inst+loc+year}%
+ \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.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index 3c93701d868..fe075876ec6 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, v1.6c 2017/01/28 Simon Spiegel
+% $Id: fiwi.cbx, v1.7 2017/11/21 Simon Spiegel
\ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx, v1.6c 2017/01/28 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx, v1.7 2017/11/21 spiegel $]
\ExecuteBibliographyOptions{autocite=inline,uniquename=allfull,uniquelist=true,ibidtracker=constrict}
@@ -99,6 +99,7 @@
\DeclareFieldFormat{citeyear}{\ifnumcomp{\value{parenlevel}}{>}{0}{#1}{\mkbibparens{#1}}}
\DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot}
\DeclareFieldFormat[misc,video,movie]{citetitle}{\film{#1}}
+\DeclareFieldFormat[thesis,phdthesis]{citetitle}{\emph{#1}\isdot}
\DeclareIndexFieldFormat[movie,misc,video]{indextitle}{%
\iftoggle{cbx:filmindex}
{\iftoggle{cbx:filmindex-complete}
@@ -268,7 +269,9 @@
\index{\emph{\thefield{indexsorttitle}}@\emph{\thefield{indextitle}}%
|see{\AtNextCite{\defcounter{maxnames}{1}\defcounter{minnames}{1}%
\renewbibmacro*{name:andothers}{}}%
- \toggletrue{index:inindex}\citename{\thefield{entrykey}}[]{author}%
+ \toggletrue{index:inindex}\citename{\thefield{entrykey}}[]\ifnameundef{author}
+ {{editor}}
+ {{author}}%
\togglefalse{index:inindex}}}}
{\indexnames[name:title]{labelname}}}
{}}
@@ -449,7 +452,7 @@ and test {\iftoggle{citecompletefilm}}}
\printtext[bibhyperref]{\printfield[film]{title}}%
\iffieldundef{alternatetitle}
{}{\usebibmacro{bbx:cite-alternatetitle}}
- \addspace\usebibmacro{cbx:filmdate}%
+ %\addspace\usebibmacro{cbx:filmdate}%
{\addspace\bibopenparen\printfield[plain]{subtitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{movie:directors}%
@@ -467,6 +470,21 @@ and test {\iftoggle{citecompletefilm}}}
\addspace\usebibmacro{cbx:filmdate}}}
\newbibmacro*{cite}{%
+\ifentrytype{archival}
+{\usebibmacro{cite:archival}}
+{\usebibmacro{cite:normal}}}
+
+\newbibmacro*{cite:archival}{%
+\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+ {\usebibmacro{cite:ibid}}%
+ {\ifnameundef{author}%
+ {\printfield{title}%\addcomma\addspace\usebibmacro{cite:labelyear+extrayear}
+ }%
+ {\printnames{labelname}\setunit{\nameyeardelim}%
+ \usebibmacro{cite:labelyear+extrayear}}%
+}}
+
+\newbibmacro*{cite:normal}{%
\iftoggle{cbx:compactcite}%
{\iffieldundef{shorthand}%
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
@@ -475,7 +493,7 @@ and test {\iftoggle{citecompletefilm}}}
{\setunit{\compcitedelim}}%
{\ifnameundef{labelname}%
{}%
- {\printnames{labelname}%
+ {\printtext[bibhyperref]{\printnames{labelname}}%
\setunit{\nameyeardelim}}%
\savefield{namehash}{\cbx@lasthash}}%
\usebibmacro{cite:labelyear+extrayear}}}%
@@ -580,12 +598,13 @@ and test {\iftoggle{citecompletefilm}}}
\iffieldundef{labelyear}
{}
{\printtext[bibhyperref]{%
- \ifdefstring\blx@dateformat@labeldate{edtf}
+ \iffieldundef{year}{\bibstring[\mkbibbrackets]{nodate}}
+ {\ifdefstring\blx@dateformat@labeldate{edtf}
{}
{\datecircaprint}%
\dateeraprintpre{labelyear}%
\mkyearzeros{\thefield{labelyear}}%
- \printfield{extrayear}%
+ \printfield{extradate}%
\iffieldsequal{labeldateera}{labelenddateera}{}
{\dateeraprint{labelyear}}%
\dateuncertainprint%
@@ -608,7 +627,7 @@ and test {\iftoggle{citecompletefilm}}}
{}%
\dateeraprint{labelendyear}}}%
\iftoggle{cbx:orgigyearcite}%
- {\usebibmacro{cite:origyerar}}{}}}}
+ {\usebibmacro{cite:origyerar}}{}}}}}
\newbibmacro*{cite:origyerar}{%
\iffieldundef{origyear}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
index 7b2b0231f22..f7d7d9d1fa5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
@@ -15,9 +15,12 @@
%%
-\ProvidesFile{fiwi.dbx}[2017/01/28 1.6c film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2017/11/21 1.7 film studies bibliography style data model]
\RequireBiber[3]
+\DeclareDatamodelEntrytypes{archival}
+
+\DeclareDatamodelFields[type=field, datatype=literal]{librarylocation}
\DeclareDatamodelFields[type=field, datatype=literal]{parttitle}
\DeclareDatamodelFields[type=field, datatype=literal]{duration}
\DeclareDatamodelFields[type=field, datatype=literal]{durationtype}
@@ -26,6 +29,9 @@
\DeclareDatamodelFields[type=list, datatype=name]{director}
\DeclareDatamodelFields[type=list, datatype=name]{scriptwriter}
\DeclareDatamodelFields[type=list, datatype=name]{actor}
+\DeclareDatamodelFields[type=list, datatype=literal]{production}
+
+\DeclareDatamodelEntryfields[archival]{librarylocation}
\DeclareDatamodelEntryfields[movie,misc,video]{
duration,
@@ -36,4 +42,4 @@
scriptwriter,
actor}
-\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,trueprefix,truefamily,truesuffix,truegiven}
+\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,trueprefix,truefamily,truesuffix,truegiven} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index bc672a72bea..c05838e79af 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, v1.6c 2017/01/28 Simon Spiegel
+% $Id: fiwi2.bbx, v1.7 2017/11/21 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi2.bbx}[v1.6c 2017/01/28 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v1.7 2017/11/21 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 03742dde5b8..9a58d780b03 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, v1.6c 2017/01/28 Simon Spiegel
+% $Id: fiwi2.cbx, v1.7 2017/11/21 Simon Spiegel
\ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx, v1.6c 2017/01/28 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx, v1.7 2017/11/21 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 298b23541ed..c6dee8e3744 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
@@ -12,11 +12,15 @@
%%
%% The Current Maintainer of this work is Simon Spiegel
%%
+%%
-\ProvidesFile{fiwi.dbx}[2017/01/28 1.6c film studies bibliography style data model]
+\ProvidesFile{fiwi2.dbx}[2017/11/21 1.7 film studies bibliography style data model]
\RequireBiber[3]
+\DeclareDatamodelEntrytypes{archival}
+
+\DeclareDatamodelFields[type=field, datatype=literal]{librarylocation}
\DeclareDatamodelFields[type=field, datatype=literal]{parttitle}
\DeclareDatamodelFields[type=field, datatype=literal]{duration}
\DeclareDatamodelFields[type=field, datatype=literal]{durationtype}
@@ -25,6 +29,9 @@
\DeclareDatamodelFields[type=list, datatype=name]{director}
\DeclareDatamodelFields[type=list, datatype=name]{scriptwriter}
\DeclareDatamodelFields[type=list, datatype=name]{actor}
+\DeclareDatamodelFields[type=list, datatype=literal]{production}
+
+\DeclareDatamodelEntryfields[archival]{librarylocation}
\DeclareDatamodelEntryfields[movie,misc,video]{
duration,
@@ -35,4 +42,4 @@
scriptwriter,
actor}
-\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,trueprefix,truefamily,truesuffix,truegiven}
+\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,trueprefix,truefamily,truesuffix,truegiven} \ No newline at end of file