summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-30 21:26:28 +0000
committerKarl Berry <karl@freefriends.org>2015-06-30 21:26:28 +0000
commit3de37f70674efe52ad1d2eb884f0c8af271dddd5 (patch)
treeccce7dd4df18bb018fa6269eb343575cb04b3549 /Master/texmf-dist/tex/latex
parentaaec8ff3cf7236ae9429a6d9238b1838af2441d6 (diff)
biblatex-fiwi (30jun15)
git-svn-id: svn://tug.org/texlive/trunk@37721 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.bbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx104
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx19
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx7
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx2
7 files changed, 120 insertions, 34 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 37a32d12111..936edcf1a72 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.2e 2014/01/10 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v 1.3 2015/06/30 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.2e 2014/01/10 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.3 2015/06/30 film studies bibliography style Author (Year)]
\RequireBibliographyStyle{fiwi}
@@ -286,7 +286,9 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\printlist{location}%
\iftoggle{printpublisher}%
{\iflistundef{publisher}%
- {}%
+ {\iftoggle{markmissingpublisher}
+ {\addcolon\addspace\textbf{???}\setunit{\addcomma\space}}
+ {\setunit*{\space}}}%
{\setunit{\isdot\addcolon\space}\printlist{publisher}}}%
{\setunit*{\space}}%
\iftoggle{dontprintorig}
@@ -555,8 +557,10 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\newunit\newblock%
\usebibmacro{publ+loc+origyear}%
\usebibmacro{chap+pag}%
- \newblock%\newunit
- \usebibmacro{doi+eprint+url}%
+ \newblock%
+ \ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}}
+ {}
+ {\newunit\usebibmacro{doi+eprint+url}}%
\addspace\usebibmacro{related}%
\newunit\newblock
\iftoggle{bbx:isbn}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index b27b970db44..2473a816a90 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.2e 2014/01/10 Simon Spiegel
+% $Id: fiwi.bbx, v1.3 2015/06/30 Simon Spiegel
-\ProvidesFile{fiwi.bbx}[v1.2e 2014/01/10 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.3 2015/06/30 film studies bibliography style]
\@ifpackagelater{biblatex}{2013/05/01}
{}
@@ -40,6 +40,12 @@
\pertype{video}
\step[fieldsource=editor, fieldtarget=scriptwriter, final]
}
+\map{
+ \pertype{movie}
+ \pertype{misc}
+ \pertype{video}
+ \step[fieldsource=pagetotal, fieldtarget=duration, final]
+}
\map{
\pertype{movie}
\pertype{misc}
@@ -62,6 +68,8 @@
\providetoggle{bbx:scriptwriter}
\togglefalse{bbx:scriptwriter}
+\providetoggle{bbx:actor}
+\togglefalse{bbx:actor}
\providetoggle{bbx:volumeinparens}
\togglefalse{bbx:volumeinparens}
\providetoggle{filmruntime}
@@ -113,6 +121,8 @@
\togglefalse{ignoreaddendum}
\providetoggle{ignoreaddendumcit}
\togglefalse{ignoreaddendumcit}
+\providetoggle{markmissingpublisher}
+\togglefalse{markmissingpublisher}
% BibliographyOptions
@@ -203,8 +213,25 @@
{}
}%
+
+
+\DeclareBibliographyOption{publisher}[true]{%
+\ifstrequal{#1}{true}
+ {\toggletrue{printpublisher}}
+ {}
+\ifstrequal{#1}{missing}
+ {\toggletrue{printpublisher}
+ \toggletrue{markmissingpublisher}}
+{}
+\ifstrequal{#1}{false}
+ {\togglefalse{printpublisher}}
+{}
+}
+
+
\DeclareBibliographyOption{parensvolume}[true]{\settoggle{bbx:volumeinparens}{#1}}
\DeclareBibliographyOption{script}[true]{\settoggle{bbx:scriptwriter}{#1}}
+\DeclareBibliographyOption{actor}[true]{\settoggle{bbx:actor}{#1}}
\DeclareBibliographyOption{ignorearticle}[true]{\settoggle{ignorearticle}{#1}}
\DeclareBibliographyOption{partofcited}[true]{\settoggle{partofcitedflag}{#1}}
\DeclareBibliographyOption{germ}[true]{\settoggle{germfassung}{#1}}
@@ -218,7 +245,6 @@
\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}}
\newbibmacro*{bbx:savehash}{}
@@ -250,8 +276,8 @@
{}
}%
-\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=1,maxitems=9,useprefix=true,sorting=nyt,date=long,datelabel=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labeldate=true,isbn=false,babel=hyphen,}
-\ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labeldate=false,labeltitle=true}
+\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=1,maxitems=9,useprefix=true,sorting=nyt,date=long,datelabel=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labeldate=true,isbn=false,autolang=hyphen}
+\ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labeltitle=true}
\InitializeBibliographyStyle{%
\let\bbx@lasthash\undefined}
@@ -319,11 +345,13 @@
\DeclareFieldAlias[misc]{title}[movie]{title}
\DeclareFieldAlias[video]{title}[movie]{title}
+
\DeclareIndexFieldAlias[movie]{indextitle}[misc]{indextitle}
\DeclareIndexFieldAlias[video]{indextitle}[misc]{indextitle}
\DeclareBibliographyAlias{misc}{movie}
\DeclareBibliographyAlias{video}{movie}
+\DeclareBibliographyAlias{inbook}{incollection}
%\DeclareFieldFormat{related}{\addspace\mkbibparens{#1}}
\DeclareFieldFormat[review]{title}{\mkbibquote{#1}}
@@ -346,7 +374,9 @@
\DeclareFieldFormat{episode}{\bibstring{tvepisode} #1}
\DeclareFieldFormat{urldate}{\addthinspace --\addnbspace\bibstring{urlseen}\space#1}
\DeclareFieldFormat{url}{$\langle$\url{#1}$\rangle$}
-\DeclareFieldFormat[misc,movie,video]{pagetotal}{#1\bibstring{minutes}}
+\DeclareFieldFormat[misc,movie,video]{duration}{#1%
+ \iffieldequalstr{durationtype}{meter}%
+ {\bibstring{meters}}{\bibstring{minutes}}}
\DeclareFieldFormat[online]{note}{#1~\adddot}
\DeclareFieldFormat{origendyear}{\bibdatedash#1}
\DeclareFieldFormat{endyear}{\bibdatedash#1\iffieldequalstr{endyear}{}
@@ -427,6 +457,18 @@
{\usebibmacro{name:last-first}{#1}{#3}{\bibsentence#5}{#7}}}%
\usebibmacro{name:andothers}}
+\DeclareNameFormat{name:commas}{%
+ \renewcommand*{\multinamedelim}{\addcomma\addspace}%
+ \renewcommand*{\finalnamedelim}{\addcomma\addspace}%
+ \iffirstinits
+ {\usebibmacro{actor:first-last}{#1}{#4}{#5}{#7}}
+ {\usebibmacro{actor:first-last}{#1}{#3}{#5}{#7}}%
+ \ifblank{#3#5}
+ {}
+ {\usebibmacro{name:revsdelim}}
+ \renewcommand*{\multinamedelim}{\addslash}%
+ \renewcommand*{\finalnamedelim}{\addslash}}
+
\DeclareNameFormat{bytranslator}{%
\iffirstinits
@@ -436,6 +478,15 @@
{}
{\usebibmacro{name:revsdelim}}%
\usebibmacro{name:andothers}}
+
+\DeclareNameFormat{actor}{%
+ \iffirstinits
+ {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}
+ {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}%
+ \ifblank{#3#5}
+ {}
+ {\usebibmacro{name:revsdelim}}%
+ \usebibmacro{name:andothers}}
\DeclareNameFormat{director}{%
\usebibmacro{director:first-last}{#1}{#3}{#5}{#7}
@@ -490,6 +541,18 @@
\mkbibnamelast{#1}\isdot
\ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+\newbibmacro*{actor:first-last}[4]{%
+ \usebibmacro{name:delim}{#2#3#1}%
+ \usebibmacro{name:hook}{#2#3#1}%
+ \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
+ \ifblank{#3}{}{%
+ \mkbibnameprefix{#3}\isdot
+ \ifpunctmark{'}
+ {}
+ {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
+\mkbibnamelast{#1}\isdot
+ \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+
\newbibmacro*{name:delimfirst}[1]{%
\ifthenelse{\value{listcount}>\value{liststart}}
{\ifthenelse{\value{listcount}<\value{liststop}\OR
@@ -599,25 +662,25 @@
\NewBibliographyString{fromjapanese}
\NewBibliographyString{fromhebrew}
-\NewBibliographyString{frompolish}
\NewBibliographyString{minutes}
+\NewBibliographyString{meters}
\NewBibliographyString{tvseason}
\NewBibliographyString{tvepisode}
\NewBibliographyString{translatedto}
\NewBibliographyString{prepublished}
\NewBibliographyString{reviewof}
\NewBibliographyString{airdate}
-\NewBibliographyString{undated}
\NewBibliographyString{directedby}
\NewBibliographyString{writtenby}
\NewBibliographyString{writtendirectedby}
+\NewBibliographyString{actors}
%\NewBibliographyString{citepage}
%\NewBibliographyString{citepages}
\DefineBibliographyStrings{german}{%
-andothers = {et al\adddot},
+andothers = {et al\adddot\addspace},
directedby = {Regie\addcolon\addspace},
writtenby = {Buch\addcolon\addspace},
writtendirectedby = {Buch und Regie\addcolon\addspace},
@@ -629,17 +692,18 @@ bypublisher = {bei},
ibidem = {ebd\adddot},
url = {},
urlseen = {Zugriff am},
+actors = {Darsteller\addcolon\addspace},
in = {In\addcolon},
editor = {Hg\adddot},
editors = {Hgg\adddot},
phdthesis ={Unver\"offentlichte Dissertation},
-minutes = {min},
+minutes = {{\addnbthinspace}min},
+meters = {{\addnbthinspace}m},
tvseason = {Staffel},
tvepisode = {Folge},
airdate = {},
astitle = {als},
part = {Teil},
-undated = {undatiert},
translatedto = {dt\adddot},
reviewof = {Rezension von},
prepublished = {Online-Vorver\"offentlichung},
@@ -895,7 +959,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
or test {\ifentrytype{set}}}
{\usebibmacro{labelyear}}
{\iffieldundef{year}
- {\bibstring[\mkbibbrackets]{undated}\addcolon\addspace}
+ {\bibstring[\mkbibbrackets]{nodate}\addcolon\addspace}
{\printtext{%
\iffieldundef{endyear}%
{\iftoggle{dontprintextrayear}%
@@ -1252,6 +1316,10 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
\ifnameundef{scriptwriter}{}{\newunit\bibstring{writtenby}\printnames{scriptwriter}}}
}
+\newbibmacro*{movie:actor}{%
+ \bibstring{actors}\printnames[name:commas][-\value{listtotal}]{actor}
+}
+
\newbibmacro*{mtitle+vol+btitle+bstitle}{%
\iffieldundef{maintitle}%
{}%
@@ -1322,7 +1390,9 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
\printlist{location}%
\iftoggle{printpublisher}%
{\iflistundef{publisher}%
- {\setunit*{\space}}%
+ {\iftoggle{markmissingpublisher}
+ {\addcolon\addspace\textbf{???}\setunit{\addcomma\space}}
+ {\setunit*{\space}}}%
{\iflistundef{location}
{\adddot\addspace}
{\setunit{\isdot\addcolon\addspace}}
@@ -1712,11 +1782,15 @@ and (test {\iffieldundef{origyear}}%
{\iffieldequalstr{entrysubtype}{tv}%
{\usebibmacro{movie:tv}}%
{\usebibmacro{movie:regular}}}}%
- \iffieldundef{pagetotal}
+ \newunit\newblock%
+ \iftoggle{bbx:actor}
+ {\usebibmacro{movie:actor}}%
+ {}
+ \iffieldundef{duration}
{}
{%
\iftoggle{filmruntime}%
- {\addcomma\addspace\printfield{pagetotal}}%
+ {\addcomma\addspace\printfield{duration}}%
{}}
\iffieldundef{note}%
{}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index d8baafaee69..74617b6dd20 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.2e 2014/01/10 Simon Spiegel
+% $Id: fiwi.cbx,v 1.3 2015/06/30 Simon Spiegel
\ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.2e 2014/01/09 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx,v 1.3 2015/06/30 spiegel $]
\ExecuteBibliographyOptions{labeldate=true,autocite=inline,firstinits=false,uniquename=full,uniquelist=true,ibidtracker=constrict}
@@ -283,17 +283,22 @@ and test {\iftoggle{citecompletefilm}}}
\newbibmacro*{cite:shorthand}{%
\printtext[bibhyperref]{\printfield{shorthand}}}
+%\newbibmacro*{cite:label}{%
+% \ifnameundef{labelname}
+% {\BibliographyWarning{Missing author/editor+year or label}}
+% {\printtext[bibhyperref]{\printnames{labelname}}}}
+
\newbibmacro*{cite:label}{%
- \ifnameundef{labelname}
- {\BibliographyWarning{Missing author/editor+year or label}}
- {\printtext[bibhyperref]{\printnames{labelname}}}}
+ \iffieldundef{label}
+ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
+ {\printtext[bibhyperref]{\printfield{label}}}}
\newbibmacro*{cite:labelyear+extrayear}{%
\printtext[bibhyperref]{%
\iffieldundef{year}%
- {\bibstring[\mkbibbrackets]{undated}\printfield{extrayear}}%
+ {\bibstring[\mkbibbrackets]{nodate}\printfield{extrayear}}%
{\printfield{labelyear}}%
- \printfield{extrayear}}}
+ \printfield{extrayear}}}
\newbibmacro*{xindy:name}[5]{%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
index f2e5ac49dab..eb03c4f5b16 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 2013 Simon Spiegel
+%% Copyright 2015 Simon Spiegel
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -16,15 +16,18 @@
%%
-\ProvidesFile{fiwi.dbx}[2014/01/10 1.2e film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2015/06/30 1.3 film studies bibliography style data model]
\RequireBiber[3]
\DeclareDatamodelFields[type=field, datatype=literal]{parttitle}
+\DeclareDatamodelFields[type=field, datatype=literal]{duration}
+\DeclareDatamodelFields[type=field, datatype=literal]{durationtype}
\DeclareDatamodelFields[type=list, datatype=name]{director}
\DeclareDatamodelFields[type=list, datatype=name]{scriptwriter}
\DeclareDatamodelFields[type=list, datatype=name]{actor}
+\DeclareDatamodelEntryfields[movie,misc,video]{duration,durationtype}
\DeclareDatamodelEntryfields[movie,misc,video]{director}
\DeclareDatamodelEntryfields[movie,misc,video]{scriptwriter}
\DeclareDatamodelEntryfields[movie,misc,video]{actor}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index faf34c1ca91..879915e0285 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.2e 2014/01/10 Simon Spiegel
+% $Id: fiwi2.bbx, v 1.3 2014/06/30 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi2.bbx}[v 1.2e 2014/01/10 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.3 2015/06/30 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 526a96b5974..866ac7df16f 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.2e 2014/01/09 Simon Spiegel
+% $Id: fiwi2.cbx,v 1.3 2015/06/30 Simon Spiegel
\ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.2e 2014/01/09 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx,v 1.3 2015/06/30 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 c0bac6b0095..f61bb688766 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
@@ -16,7 +16,7 @@
%%
-\ProvidesFile{fiwi.dbx}[2014/05/10 1.2e film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2015/06/30 1.3 film studies bibliography style data model]
\RequireBiber[3]