summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-fiwi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-18 21:57:41 +0000
committerKarl Berry <karl@freefriends.org>2016-05-18 21:57:41 +0000
commit2e8400bc38c68786ce9ee092191ae7360954edee (patch)
tree3a4d806527d710a1687c86473aa0e15708dcc304 /Master/texmf-dist/tex/latex/biblatex-fiwi
parent218d2dbac55aeda0805fba814e4bf8faed08bb4d (diff)
biblatex-fiwi (18may16)
git-svn-id: svn://tug.org/texlive/trunk@41240 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.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx208
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx114
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx16
-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, 191 insertions, 163 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 13281304f10..60949eebea6 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.4 2016/03/09 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v v1.5 2016/05/17 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.4 2016/03/09 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.5 2016/05/17 film studies bibliography style Author (Year)]
\RequireBibliographyStyle{fiwi}
@@ -189,7 +189,7 @@
\renewbibmacro*{editorstrg}{%
\printtext{\mkbibparens{\unspace
- \ifnum\theeditor>1
+ \ifnum\value{editor}>1
\bibstring{editors}%
\else
\bibstring{editor}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index 40b328af249..b63981cd98c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
@@ -1,15 +1,18 @@
-% $Id: fiwi.bbx, v1.4 2016/03/09 Simon Spiegel
-
-\ProvidesFile{fiwi.bbx}[v1.4 2016/03/09 film studies bibliography style]
-
-\@ifpackagelater{biblatex}{2016/03/01}
- {}
- {\PackageError{biblatex}
- {Outdated 'biblatex' package}
- {The 'fiwi' style requires biblatex v3.4 or later.\MessageBreak
- You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
- This is a fatal error. I'm aborting now.}%
- \endinput}
+% $Id: fiwi.bbx, v1.5 2016/05/17 Simon Spiegel
+% Ragged2e
+% Alternatetitle
+% Uniquetitle
+
+\ProvidesFile{fiwi.bbx}[v1.5 2016/05/17 film studies bibliography style]
+
+%\@ifpackagelater{biblatex}{2016/04/01}
+% {}
+% {\PackageError{biblatex}
+% {Outdated 'biblatex' package}
+% {The 'fiwi' style requires biblatex v3.4 or later.\MessageBreak
+% You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
+% This is a fatal error. I'm aborting now.}%
+% \endinput}
\RequireBibliographyStyle{standard}
%\RequireBiber[2]
@@ -277,7 +280,7 @@
}%
\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=context,labeldate=true,isbn=false,autolang=hyphen}
-\ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labeltitle=true}
+\ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labeltitle=true,uniquetitle=true}
\InitializeBibliographyStyle{%
\let\bbx@lasthash\undefined}
@@ -339,6 +342,18 @@
\DeclareFieldFormat{tvmaintitle}{\film{#1}\addcolon\addspace}
%\DeclareFieldFormat{labelyear}{\mknumalph{#1}}
\DeclareFieldFormat{film}{\film{#1}}
+\DeclareFieldFormat{altfilm}{\film{#1}}
+
+\newbibmacro*{bbx:cite-alternatetitle}{
+\iffieldundef{alternatetitlescript}
+ {\addslash\printfield[film]{alternatetitle}}
+ {\addslash%
+ \ifbibmacroundef{altscript:\strfield{alternatetitlescript}-font}
+ {\printfield[film]{alternatetitle}}
+ {\usebibmacro*{altscript:\strfield{alternatetitlescript}-font}%
+ {\thefield{alternatetitle}}}}}
+
+
\DeclareFieldFormat{title}{\mkbibemph{#1}}
\DeclareFieldFormat{noformat}{#1}
\DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot}
@@ -446,37 +461,32 @@
% name format definitions
\DeclareNameFormat{sortname}{%
- \nameparts{#1}%
\ifnumequal{\value{listcount}}{1}
{\ifgiveninits
{\usebibmacro{name:family-given}
{\namepartfamily}
{\namepartgiveni}
- {\bibsentence\namepartprefix}
+ {\namepartprefix}
{\namepartsuffix}}
{\usebibmacro{name:family-given}
{\namepartfamily}%
{\namepartgiven}%
- {\bibsentence\namepartprefix}
- {\namepartsuffix}}%
- \ifblank{\namepartgiven\namepartprefix}
- {}
- {\usebibmacro{name:revsdelim}}}
+ {\namepartprefix}
+ {\namepartsuffix}}}%
{\ifgiveninits
{\usebibmacro{name:family-given}
{\namepartfamily}
{\namepartgiveni}
- {\bibsentence\namepartprefix}
+ {\namepartprefix}
{\namepartsuffix}}
{\usebibmacro{name:family-given}
{\namepartfamily}
{\namepartgiven}
- {\bibsentence\namepartprefix}
+ {\namepartprefix}
{\namepartsuffix}}}%
\usebibmacro{name:andothers}}
\DeclareNameFormat{name:commas}{%
- \nameparts{#1}%
\renewcommand*{\multinamedelim}{\addcomma\addspace}%
\renewcommand*{\finalnamedelim}{\addcomma\addspace}%
\ifgiveninits
@@ -498,7 +508,6 @@
\DeclareNameFormat{bytranslator}{%
- \nameparts{#1}%
\ifgiveninits
{\usebibmacro{name:given-family}
{\namepartfamily}
@@ -516,7 +525,6 @@
\usebibmacro{name:andothers}}
\DeclareNameFormat{actor}{%
- \nameparts{#1}%
\ifgiveninits
{\usebibmacro{name:given-family}
{\namepartfamily}
@@ -534,7 +542,6 @@
\usebibmacro{name:andothers}}
\DeclareNameFormat{director}{%
- \nameparts{#1}%
\usebibmacro{director:given-family}
{\namepartfamily}
{\namepartgiven}
@@ -548,60 +555,60 @@
\newbibmacro*{director:given-family}[4]{%
\usebibmacro{name:delim}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
- \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\addlowpenspace}%
- \ifempty{#3}{}{%
+ \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot\addlowpenspace}%
+ \ifdefvoid{#3}{}{%
\mkbibnameprefix{#3}\isdot
\ifpunctmark{'}
{}
{\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
\mkbibnamefamily{#1}\isdot
- \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+ \ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}}
\renewbibmacro*{name:family-given}[4]{%
\ifuseprefix%
{\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
- \ifempty{#3}{}{%
+ \ifdefvoid{#3}{}{%
\ifcapital
{\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
- {\mkbibnameprefix{#3}\isdot}%
+ {\mkbibnameprefix{#3}\isdot}%
}%\ifpunctmark{'}{}{\addhighpenspace}}%
\mkbibnamefamily{#1}\isdot
- \ifempty{#2}{}{\addcomma\addlowpenspace\mkbibnamegiven{#2}\isdot}
- \ifempty{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}%
+ \ifdefvoid{#2}{}{\addcomma\addlowpenspace\mkbibnamegiven{#2}\isdot}
+ \ifdefvoid{#4}{}{\addcomma\addlowpenspace\mkbibnamesuffix{#4}\isdot}}%
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
- \mkbibnamefamily{#1}\isdot
- \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
- \ifempty{#2#3}{}{\addcomma}%
- \ifempty{#2}{}{\addlowpenspace\mkbibnamegiven{#2}\isdot}%
- \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
- \ifempty{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}}}
+ \mkbibnamefamily{#1}\addspace\isdot
+ \ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}%
+ \addcomma\ifdefvoid{#3}{}{\addcomma}%
+ \ifdefvoid{#2}{}{\addlowpenspace\mkbibnamegiven{#2}\isdot}%
+ \ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}%
+ \addspace\ifdefvoid{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}}}
\renewbibmacro*{name:given-family}[4]{%
\usebibmacro{name:delimfirst}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
- \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\addlowpenspace}%
- \ifempty{#3}{}{%
+ \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot\addlowpenspace}%
+ \ifdefvoid{#3}{}{%
\mkbibnameprefix{#3}\isdot
\ifpunctmark{'}
{}
{\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
\mkbibnamefamily{#1}\isdot
- \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+ \ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}}
\newbibmacro*{actor:given-family}[4]{%
\usebibmacro{name:delim}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
- \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\addlowpenspace}%
- \ifempty{#3}{}{%
+ \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot\addlowpenspace}%
+ \ifdefvoid{#3}{}{%
\mkbibnameprefix{#3}\isdot
\ifpunctmark{'}
{}
{\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
\mkbibnamefamily{#1}\isdot
- \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+ \ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}}
\newbibmacro*{name:delimfirst}[1]{%
\ifthenelse{\value{listcount}>\value{liststart}}
@@ -625,10 +632,8 @@
\renewbibmacro*{url+urldate}{%
\printfield{url}%
- \iffieldundef{urlyear}
- {}
- {\setunit*{\addspace}%
- \printtext[]{\printurldate}}}
+ \setunit*{\addspace}%
+ \printtext[]{\printurldate}}
% Sorting definitions
@@ -665,25 +670,25 @@
\AtEndPreamble{%
\iftoggle{ignorearticle}
{\DeclareNosort{
-\nosort{type_title}{\regexp{\A.*\/}}
-\nosort{type_title}{\regexp{\AThe\s+}}
-\nosort{type_title}{\regexp{\ADie\s+}}
-\nosort{type_title}{\regexp{\ADer\s+}}
-\nosort{type_title}{\regexp{\ADas\s+}}
-\nosort{type_title}{\regexp{\AEin\s+}}
-\nosort{type_title}{\regexp{\AEine\s+}}
-\nosort{type_title}{\regexp{\AA\s+}}
-\nosort{type_title}{\regexp{\AUne\s+}}
-\nosort{type_title}{\regexp{\AUn\s+}}
-\nosort{type_title}{\regexp{\ALe\s+}}
-\nosort{type_title}{\regexp{\ALa\s+}}
-\nosort{type_title}{\regexp{\AGli\s+}}
-\nosort{type_title}{\regexp{\AIl\s+}}
-\nosort{type_title}{\regexp{\AEl\s+}}
-\nosort{type_title}{\regexp{\ALes\s+}}
-\nosort{type_title}{\regexp{\ALos\s+}}
-\nosort{type_title}{\regexp{\AL'\s+}}
-\nosort{type_title}{\regexp{\AO\s+}}
+\nosort{settitles}{\regexp{\A.*\/}}
+\nosort{settitles}{\regexp{\AThe\s+}}
+\nosort{settitles}{\regexp{\ADie\s+}}
+\nosort{settitles}{\regexp{\ADer\s+}}
+\nosort{settitles}{\regexp{\ADas\s+}}
+\nosort{settitles}{\regexp{\AEin\s+}}
+\nosort{settitles}{\regexp{\AEine\s+}}
+\nosort{settitles}{\regexp{\AA\s+}}
+\nosort{settitles}{\regexp{\AUne\s+}}
+\nosort{settitles}{\regexp{\AUn\s+}}
+\nosort{settitles}{\regexp{\ALe\s+}}
+\nosort{settitles}{\regexp{\ALa\s+}}
+\nosort{settitles}{\regexp{\AGli\s+}}
+\nosort{settitles}{\regexp{\AIl\s+}}
+\nosort{settitles}{\regexp{\AEl\s+}}
+\nosort{settitles}{\regexp{\ALes\s+}}
+\nosort{settitles}{\regexp{\ALos\s+}}
+\nosort{settitles}{\regexp{\AL'\s+}}
+\nosort{settitles}{\regexp{\AO\s+}}
}
}
{}
@@ -779,7 +784,16 @@ january = {Januar},
\renewbibmacro*{finentry}{\iftoggle{intransdecision}%
{\unspace}{\addperiod}} % unklar, warum \finentry nicht geht
-\appto{\bibsetup}{\RaggedRight}
+
+\AtBeginDocument{%
+ \IfFileExists{ragged2e.sty}{%
+ \RequirePackage{ragged2e}%
+ \appto{\bibsetup}{\RaggedRight}
+ }{%
+ \appto{\bibsetup}{\raggedright}
+ }%
+}
+
%\appto{\bibsetup}{\setlength{\emergencystretch}{8em}}
\newcommand*{\mkibid}[1]{#1}
@@ -1089,8 +1103,7 @@ or test {\ifentrytype{set}}}
{}{\printfield{endyear}}}}
{\ifboolexpr{ (test{\iffieldundef{origtitle}} and not test {\ifentrytype{bookinbook}})}
{\setunit{\addspace}\printtext[origyearart]{\printfield{origyear}%
- \iffieldundef{origendyear}%
- {}{\printfield{origendyear}}}}
+ \printfield{origendyear}}}
{}}
}}
@@ -1321,34 +1334,32 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
\newbibmacro*{filmtitle}
{\iffieldundef{maintitle}
{\printtext{\printfield[film]{title}}}
-{\printfield[film]{maintitle}\newunit}%
-\iffieldundef{subtitle}%
-{}%
-{\setunit{}%
-\printtext{\addspace\printfield{subtitle}}}%
-\iffieldundef{volume}%
-{}%
-{\printfield[season]{volume}}%
-\iffieldundef{number}%
-{}%
-{\addcomma\addspace\printfield[episode]{number}}%
+{\printtext{\printfield[film]{maintitle}\newunit}}%
+\iffieldundef{alternatetitle}
+{}
+{\usebibmacro{bbx:cite-alternatetitle}}
+\setunit{}%
+\printtext{\addspace\printfield{subtitle}}%
+\iffieldundef{volume}
+{}
+{\printtext{\addperiod\addspace\printfield[season]{volume}}}%
+\iffieldundef{number}
+{}
+{\printtext{\addcomma\addspace\printfield[episode]{number}}}%
\iffieldundef{maintitle}%
{}%
{\addcolon\addspace\printfield[film]{title}}%
\ifpunctmark{!}{\unspace .\newunit}{\adddot}}%
+%\newbibmacro*{bbx:cite-alternatetitle}
+%{\addslash\printfield[altfilm]{alternatetitle}}
+
\newbibmacro*{filmloc}
-{\iflistundef{location}%
-{}
{\printlist{location}}%
-}
+
\newbibmacro*{filmorg}
-{
-\iflistundef{organization}
-{}
{\printlist{organization}}
-}
\newbibmacro*{movie:creators}{%
\iftoggle{bbx:scriptwriter}
@@ -1418,9 +1429,7 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}}
}
{\addcolon}%
{\addcomma}}}%
- \iffieldundef{number}
- {}
- {\printtext{\addspace\printfield{number}}\addspace}%
+ \printtext{\addspace\printfield{number}}\addspace%
\printfield{eid}%
\usebibmacro{title+issuetitle}
}
@@ -1476,18 +1485,13 @@ and (test {\iffieldundef{origyear}}%
\newbibmacro*{org+publ+loc+year}{%
\iftoggle{printaddress}{}{\clearlist{location}}
-\iffieldundef{organization}%
-{}%
-{\printfield{organization}%
-\newunit}%
+\printfield{organization}\newunit%
\iflistundef{publisher}%
{\iflistundef{location}%
{}%
{\printlist{location}%
\setunit{\addspace}}}%
-{\iflistundef{location}%
-{}%
-{\printlist{location}}%
+{\printlist{location}%
\iftoggle{printpublisher}
{\setunit{\isdot\addcolon\space}%
\printlist{publisher}\setunit{\addcomma\space}}%
@@ -1515,9 +1519,7 @@ and (test {\iffieldundef{origyear}}%
{}%
{\addcomma\addspace\printfield{pages}}}%
{\printfield{chapter}%
- \iffieldundef{pages}%
- {}%
- {\newunit\printfield{pages}}}%
+ \newunit\printfield{pages}}%
}
\newbibmacro*{ser+num}{%
@@ -1909,7 +1911,7 @@ and (test {\iffieldundef{origyear}}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
%\usebibmacro{editor}%
- %\setunit{\labelnamepunct}\newblock
+ %\setunit{\nametitledelim}\newblock
\usebibmacro{journal+issuetitle}%
\newunit
\printlist{language}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index ec8a1bbe8a5..9a5283cba4e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
@@ -1,15 +1,11 @@
-% $Id: fiwi.cbx,v 1.4 2016/03/09 Simon Spiegel
+% $Id: fiwi.cbx,v v1.5 2016/05/17 Simon Spiegel
\ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.4 2016/03/09 spiegel $]
-
+[\abx@cbxid $Id: fiwi.cbx,v 1.5 2016/05/17 spiegel $]
\ExecuteBibliographyOptions{labeldate=true,autocite=inline,giveninits=false,uniquename=full,uniquelist=true,ibidtracker=constrict}
-
\RequireBibliographyStyle{fiwi}
-
-
\newbool{cbx@bool}
\newbool{cbx:parens}
@@ -33,10 +29,10 @@
{}
}%
-
\renewcommand*{\nameyeardelim}{\addspace}
\renewcommand*{\bibindexnamedelimi}{\,}
\renewcommand*{\bibindexinitdelim}{\,}
+\renewcommand*{\multicitedelim}{\addcomma\addspace}
\providetoggle{xindy}
\DeclareBibliographyOption{xindy}[true]{\settoggle{xindy}{#1}}
@@ -46,14 +42,13 @@
{\ExecuteBibliographyOptions{loccittracker=constrict}}
{\ExecuteBibliographyOptions{loccittracker=false}}}
-
\DeclareFieldFormat{citeyear}{\mkbibparens{#1}}
\DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot}
\DeclareFieldFormat[misc,video,movie]{citetitle}{\film{#1}}
\DeclareIndexFieldFormat[movie,misc,video]{indextitle}{%
- \usebibmacro{index:filmtitle}{\index}{#1}}
+ \usebibmacro{index:movietitle}{\index}{#1}}
+
\DeclareIndexNameFormat{default}{%
- \nameparts{#1}%
\iftoggle{xindy}
{\usebibmacro{xindy:name}{\index}
{\namepartfamily}
@@ -66,11 +61,7 @@
{\namepartprefix}
{\namepartsuffix}}}
-
-
-
\DeclareNameFormat{labelname}{%
- \nameparts{#1}%
\ifcase\value{uniquename}%
\usebibmacro{name:family}
{\namepartfamily}
@@ -107,7 +98,7 @@
\iftoggle{citeprefix}
{\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
- \ifempty{#3}
+ \ifdefvoid{#3}
{}
{\ifcapital
{\mkbibnameprefix{\MakeCapital{#3\isdot}}}
@@ -116,7 +107,7 @@
{\ifuseprefix
{\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
- \ifempty{#3}
+ \ifdefvoid{#3}
{}
{\ifcapital
{\mkbibnameprefix{\MakeCapital{#3\isdot}}}
@@ -125,17 +116,22 @@
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}}}%
\mkbibnamefamily{#1}}%
-
-
-
\newcommand*{\xindy}{\toggletrue{xindy}}% Indizierung für xindy ohne actual-Teil
-\newbibmacro*{index:filmtitle}[2]{%
- \iftoggle{xindy}{\usebibmacro{xindy:field}}{\usebibmacro{index:field}}{#1}{\thefield{indexsorttitle}}{\film{#2}}}
+\newbibmacro*{index:movietitle}[2]{%
+ \iftoggle{xindy}
+ {\usebibmacro{xindy:field}}
+ {\usebibmacro{index:field}}
+ {#1}{\thefield{indexsorttitle}}
+ {\ifuniquetitle{\film{#2}}
+ {\film{#2} (\thefield{year})}}}
\renewbibmacro*{index:title}[2]{%
- \iftoggle{xindy}{\usebibmacro{xindy:field}}{\usebibmacro{index:field}}{#1}{\thefield{indexsorttitle}}{\emph{#2}}}
+ \iftoggle{xindy}
+ {\usebibmacro{xindy:field}}
+ {\usebibmacro{index:field}}{#1}{\thefield{indexsorttitle}}
+ {\emph{#2}}}
\renewcommand{\postnotedelim}{\addcolon\addspace}
\renewcommand{\sqspace}{\addnbthinspace}
@@ -163,10 +159,10 @@
\ifciteseen{\ifboolexpr{ test {\ifnameundef{director}}
and test {\iffieldundef{maintitle}}}
{\iffieldundef{extratitle}
-{\usebibmacro{cite:filmtitle}}
-{\usebibmacro{cite:filmtitle}\addspace\mkbibparens{\printdate}}}
-{\usebibmacro{cite:filmtitle}}}
-{\usebibmacro{cite:filmtitle}
+{\usebibmacro{cbx:cite-filmtitle}}
+{\usebibmacro{cbx:cite-filmtitle}\addspace\mkbibparens{\printdate}}}
+{\usebibmacro{cbx:cite-filmtitle}}}
+{\usebibmacro{cbx:cite-filmtitle}
\addspace\mkbibparens{%
\iflistundef{organization}
{\printlist{location}}
@@ -188,9 +184,13 @@ and test {\iffieldundef{maintitle}}}
\printfield{year}}}}%
}
-\newbibmacro*{cite:filmtitle}
+\newbibmacro*{cbx:cite-filmtitle}
{\iffieldundef{maintitle}
-{\printtext[bibhyperref]{\printfield[film]{title}}}%
+{\printtext[bibhyperref]{\printfield[film]{title}%
+\ifthenelse{\NOT\iffieldundef{alternatetitle}\AND\NOT\ifciteseen}
+{\usebibmacro{bbx:cite-alternatetitle}}%
+{}%
+}}%
{\printtext[bibhyperref]{\printfield[tvmaintitle]{maintitle}%
\printfield[film]{title}}}%
}
@@ -203,10 +203,10 @@ and test {\iffieldundef{maintitle}}}
\newbibmacro*{cite:film}{%
\iftoggle{citefullfilm}%
- {\usebibmacro{cite:film:directorcountry}}
+ {\usebibmacro{cite:film:directorcountry}}%
{\iftoggle{citecompletefilm}%
- {\usebibmacro{cite:film:directorcountrytranstitle}}
- {\usebibmacro{cite:filmtitle}%
+ {\usebibmacro{cbx:cite-film-directorcountrytranstitle}}%
+ {\usebibmacro{cbx:cite-filmtitle}%
\addspace\printfield[citeyear]{year}}}}
\newbibmacro*{cite:episode}
@@ -217,7 +217,7 @@ and test {\iftoggle{citefullfilm}}}
{\ifboolexpr{not test {\iffieldequalstr{entrysubtype}{tv}}
and not test {\ifciteseen}
and test {\iftoggle{citecompletefilm}}}
-{\usebibmacro{cite:film:directorcountrytranstitle}}
+{\usebibmacro{cbx:cite-film-directorcountrytranstitle}}
{\printtext[bibhyperref]{\printfield[film]{title}}%
\ifciteseen{}{%
\iffieldequalstr{entrysubtype}{tv}
@@ -234,17 +234,21 @@ and test {\iftoggle{citecompletefilm}}}
}%
}
-\newbibmacro*{cite:film:seen}{%
- \iffieldundef{shorttitle}
- {\usebibmacro{cite:filmtitle}}
- {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}}
+\newbibmacro*{cbx:cite-film-seen}{%
+ \ifuniquetitle
+ {\iffieldundef{shorttitle}
+ {\usebibmacro{cbx:cite-filmtitle}}
+ {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}}
+ {\printtext[bibhyperref]{\printfield[film]{title} (\printfield{year})}}}
\newbibmacro*{cite:film:countryear}{%
\printtext[bibhyperref]{\printfield[film]{title}
\addspace\mkbibparens{\printlist{location}\addspace\printfield{year}}}}
-\newbibmacro*{cite:film:directorcountrytranstitle}{% Film mit Regisseur, Land und dt. Titel
+\newbibmacro*{cbx:cite-film-directorcountrytranstitle}{% Film mit Regisseur, Land und dt. Titel
\printtext[bibhyperref]{\printfield[film]{title}}%
+ \iffieldundef{alternatetitle}
+ {}{\usebibmacro{bbx:cite-alternatetitle}}
\addspace\printtext[citeyear]%
{\printfield[plain]{subtitle}\setunit*{\addcomma\addspace}%
\printnames[director]{director}\addcomma\addthinspace\printlist{location}%
@@ -253,6 +257,8 @@ and test {\iftoggle{citecompletefilm}}}
\newbibmacro*{cite:film:directorcountry}{% Film mit Regisseur
\printtext[bibhyperref]{\printfield[film]{title}}%
+ \iffieldundef{alternatetitle}
+ {}{\usebibmacro{bbx:cite-alternatetitle}}
\addspace\mkbibparens{%
\printnames{director}%
\addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}
@@ -365,17 +371,17 @@ and test {\iftoggle{citecompletefilm}}}
\ifuseprefix
{\edef\theindexentry{%
\unexpanded{#1}{%
- \ifblank{#4}{}{\unexpanded{#4} }%
+ \ifdefvoid{#4}{}{\unexpanded{#4} }%
\unexpanded{#2}%
- \ifblank{#5}{}{ \unexpanded{#5}}%
- \ifblank{#3}{}{, \unexpanded{#3}}}}}
+ \ifdefvoid{#5}{}{ \unexpanded{#5}}%
+ \ifdefvoid{#3}{}{, \unexpanded{#3}}}}}
{\edef\theindexentry{%
\unexpanded{#1}{%
\unexpanded{#2}%
- \ifblank{#5}{}{ \unexpanded{#5}}%
- \ifblank{#3#4}{}{,}%
- \ifblank{#3}{}{ \unexpanded{#3}}%
- \ifblank{#4}{}{ \unexpanded{#4}}}}}%
+ \ifdefvoid{#5}{}{ \unexpanded{#5}}%
+ \ifdefvoid{#3#4}{}{,}%
+ \ifdefvoid{#3}{}{ \unexpanded{#3}}%
+ \ifdefvoid{#4}{}{ \unexpanded{#4}}}}}%
\theindexentry
\endgroup}
@@ -524,15 +530,29 @@ and test {\iftoggle{citecompletefilm}}}
\usebibmacro{cite:episode}}
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+
+\newbibmacro*{index:alternatetitle}[1]
+{\iffieldundef{alternatetitlescript}
+ {\index{\textsc{\thefield{alternatetitle}}%
+ |see{\textsc{\thefield{indextitle}}}}}
+ {\index{%
+ \ifbibmacroundef{altscript:\strfield{alternatetitlescript}-font}
+ {\textsc{\thefield{alternatetitle}}}%
+ {\usebibmacro*{altscript:\strfield{alternatetitlescript}-font}%
+ {{\thefield{alternatetitle}}}}%
+ |see{\textsc{\thefield{indextitle}}}}}}
\DeclareCiteCommand{\citefilm}
{\usebibmacro{prenote}}
{\indexfield{indextitle}%
+ \iffieldundef{alternatetitle}
+ {}
+ {\usebibmacro*{index:alternatetitle}{\thefield{alternatetitlescript}}}%
\iffieldequalstr{entrysubtype}{serial}%
{\usebibmacro{cite:serial}}%
{\iffieldequalstr{entrysubtype}{tv}%
- {\usebibmacro{cite:tv}}{\ifciteseen{\usebibmacro{cite:film:seen}}
- {\usebibmacro{cite:film}}}}}
+ {\usebibmacro{cite:tv}}{\ifciteseen{\usebibmacro{cbx:cite-film-seen}}%
+ {\usebibmacro{cite:film}}}}}
{\multicitedelim}
{\usebibmacro{cite:postnote}}
@@ -558,4 +578,4 @@ and test {\iftoggle{citecompletefilm}}}
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\endinput
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
index 875eca2095a..e6c3797e100 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
@@ -15,20 +15,26 @@
%%
-\ProvidesFile{fiwi.dbx}[2016/03/09 1.4 film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2016/05/17 1.5 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=field, datatype=literal]{alternatetitle}
+\DeclareDatamodelFields[type=field, datatype=literal]{alternatetitlescript}
\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}
+\DeclareDatamodelEntryfields[movie,misc,video]{
+ duration,
+ durationtype,
+ alternatetitle,
+ alternatetitlescript,
+ director,
+ scriptwriter,
+ actor}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index 13f07f72b3c..489cc528551 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.4 2016/03/09 Simon Spiegel
+% $Id: fiwi2.bbx, v v1.5 2016/04/08 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi2.bbx}[v 1.4 2016/03/09 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.5 2016/04/08 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 74525ca4d96..612273517de 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.4 2016/03/09 Simon Spiegel
+% $Id: fiwi2.cbx,v v1.5 2016/05/17 Simon Spiegel
\ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.4 2016/03/09 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx,v 1.5 2016/05/17 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 8f6f9081f3e..ee397383f20 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
@@ -14,7 +14,7 @@
%%
-\ProvidesFile{fiwi.dbx}[2016/03/09 1.4 film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2016/05/17 1.5 film studies bibliography style data model]
\RequireBiber[3]