summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx89
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx4
-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.dbx4
7 files changed, 68 insertions, 45 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 0170548b063..83bfc6d040b 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 v1.6 2016/09/09 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v1.6b 2017/01/27 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.6 2016/09/09 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v1.6b 2017/01/27 film studies bibliography style Author (Year)]
\RequireBibliographyStyle{fiwi}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index 963d841e9e5..91ec0986dcd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
@@ -1,5 +1,5 @@
-% $Id: fiwi.bbx, v1.6a 2017/01/20 Simon Spiegel
-\ProvidesFile{fiwi.bbx}[v1.6a 2017/01/20 film studies bibliography style]
+% $Id: fiwi.bbx, v1.6b 2017/01/27 Simon Spiegel
+\ProvidesFile{fiwi.bbx}v1.6b 2017/01/27 film studies bibliography style]
\@ifpackagelater{biblatex}{2016/08/01}
{}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx
index d25f5585eb1..b03d1127619 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 v1.6a 2016/12/15 Simon Spiegel
+% $Id: fiwi.cbx, v1.6b 2017/01/27 Simon Spiegel
\ProvidesFile{fiwi.cbx}
-[\abx@cbxid $Id: fiwi.cbx,v 1.6a 2016/12/15 spiegel $]
+[\abx@cbxid $Id: fiwi.cbx, v1.6b 2017/01/27 spiegel $]
\ExecuteBibliographyOptions{autocite=inline,uniquename=allfull,uniquelist=true,ibidtracker=constrict}
@@ -9,6 +9,8 @@
\providetoggle{cbx:filmindex}
\providetoggle{cbx:filmindex-complete}
+\providetoggle{cbx:filmindex-separated}
+\togglefalse{cbx:filmindex-separated}
\providetoggle{index:title:author}
\togglefalse{index:title:author}
\providetoggle{index:title}
@@ -19,13 +21,21 @@
\DeclareBibliographyOption{filmindex}[true]{% Indexieren von Filmen
\ifstrequal{#1}{true}
- {\toggletrue{cbx:filmindex}\togglefalse{cbx:filmindex-complete}}
+ {\typeout{biblatex-fiwi: Filmtitel werden indexiert}%
+ \toggletrue{cbx:filmindex}\togglefalse{cbx:filmindex-complete}}
{\togglefalse{cbx:filmindex}\togglefalse{cbx:filmindex-complete}}
\ifstrequal{#1}{complete}
{\toggletrue{cbx:filmindex}\toggletrue{cbx:filmindex-complete}}
{}
}%
+\DeclareBibliographyOption{splitfilmindex}[true]{%
+ \ifstrequal{#1}{true}
+ {\typeout{biblatex-fiwi: Filmtitel erscheinen in einem getrennten Index}%
+ \toggletrue{cbx:filmindex-separated}}
+ {\togglefalse{cbx:filmindex-separated}}
+}
+
\DeclareBibliographyOption{titleindex}[true]{% Indexieren von Buchtiteln
\ifstrequal{#1}{true}
{\toggletrue{index:title}}
@@ -83,7 +93,7 @@
%\def\sortentry#1{}
%\newcommand{\sortentry}[1]{#1}
-\newrobustcmd{\sortentry}[1]{#1}
+\newrobustcmd{\sortentry}[1]{}
%\the\numexpr\value{parenlevel}
\DeclareFieldFormat{citeyear}{\ifnumcomp{\value{parenlevel}}{>}{0}{#1}{\mkbibparens{#1}}}
@@ -91,11 +101,18 @@
\DeclareFieldFormat[misc,video,movie]{citetitle}{\film{#1}}
\DeclareIndexFieldFormat[movie,misc,video]{indextitle}{%
\iftoggle{cbx:filmindex}
- {\iftoggle{cbx:filmindex-complete}
- {\usebibmacro{index:movietitle}{\index[film]}}
- {\usebibmacro{index:movietitle}{\index[film]}{\textsc{#1}}}
- {\sortentry{\thefield{title}}\fullcite{\thefield{entrykey}}}}
- {\usebibmacro{index:movietitle}{\index}{\textsc{#1}}}}
+ {\iftoggle{cbx:filmindex-complete}
+ {\usebibmacro{index:movietitle}{\iftoggle{cbx:filmindex-separated}
+ {\index[film]}{\index}}
+ {\iftoggle{xindy}%
+ {\sortentry{\thefield{indextitle}%
+ \ifuniquetitle{}{\thefield{year}}}}
+ {}
+ \fullcite{\thefield{entrykey}}}}
+ {\usebibmacro{index:movietitle}{\iftoggle{cbx:filmindex-separated}
+ {\index[film]}{\index}}{\textsc{#1}}}}
+ {}}
+
\DeclareIndexNameFormat{name:title}{%
\iffieldundef{title}
@@ -201,13 +218,23 @@
\iftoggle{xindy}{#2}{#1\actualoperator#2}}}
\newbibmacro*{index:movietitle}[2]{%
- \iftoggle{xindy}
- {\usebibmacro{xindy:field}}
- {\usebibmacro{index:field}}
- {#1}{\thefield{indexsorttitle}\ifuniquetitle{}{ (\thefield{year})}}
- {\iftoggle{cbx:filmindex}{#2}
- {\ifuniquetitle{#2}
- {#2 (\thefield{year})}}}}
+ \iftoggle{cbx:filmindex}
+ {\iftoggle{cbx:filmindex-complete}
+ {\iftoggle{xindy}
+ {\usebibmacro{xindy:field}}
+ {\usebibmacro{index:field}}
+ {#1}{\iftoggle{xindy}
+ {\thefield{indexsorttitle}}
+ {\thefield{indexsorttitle}\ifuniquetitle{}{\thefield{year}}}
+ }
+ {#2}}
+ {\iftoggle{xindy}
+ {\usebibmacro{xindy:field}}
+ {\usebibmacro{index:field}}
+ {#1}{\thefield{indexsorttitle}\ifuniquetitle{}{ (\thefield{year})}}
+ {\ifuniquetitle{#2}
+ {#2 (\thefield{year})}}}}
+ {}}
\renewbibmacro*{index:title}[2]{% Variante für xindy ohne actual
\iftoggle{xindy}
@@ -770,25 +797,21 @@ and test {\iftoggle{citecompletefilm}}}
\newbibmacro*{index:alternatetitle}[1]
{\iffieldundef{alternatetitlescript}
- {%
- \iftoggle{cbx:filmindex}
- {\index[film]{\textsc{\thefield{alternatetitle}}%
- |see{\textsc{\thefield{indextitle}}}}}
- {\index{\textsc{\thefield{alternatetitle}}%
- |see{\textsc{\thefield{indextitle}}}}}}
{\iftoggle{cbx:filmindex}
- {\index[film]{%
- \ifbibmacroundef{altscript:\strfield{alternatetitlescript}-font}
- {\textsc{\thefield{alternatetitle}}}%
- {\usebibmacro*{altscript:\strfield{alternatetitlescript}-font}%
- {{\thefield{alternatetitle}}}\rmfamily}%
+ {\iftoggle{cbx:filmindex-separated}
+ {\index[film]}{\index}%
+ {\textsc{\thefield{alternatetitle}}%
+ |see{\textsc{\thefield{indextitle}}}}}
+ {}}
+ {\iftoggle{cbx:filmindex}
+ {\iftoggle{cbx:filmindex-separated}
+ {\index[film]}{\index}{%
+ \ifbibmacroundef{altscript:\strfield{alternatetitlescript}-font}
+ {\textsc{\thefield{alternatetitle}}}%
+ {\usebibmacro*{altscript:\strfield{alternatetitlescript}-font}%
+ {{\thefield{alternatetitle}}}\rmfamily}%
|see{\textsc{\thefield{indextitle}}}}}
- {\index{%
- \ifbibmacroundef{altscript:\strfield{alternatetitlescript}-font}
- {\textsc{\thefield{alternatetitle}}}%
- {\usebibmacro*{altscript:\strfield{alternatetitlescript}-font}%
- {{\thefield{alternatetitle}}}\rmfamily}%
- |see{\textsc{\thefield{indextitle}}}}}}}
+ {}}}
\DeclareCiteCommand{\citefilm}
{\usebibmacro{prenote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.dbx
index ea373046c61..1580896cf05 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 2016 Simon Spiegel
+%% Copyright 2017 Simon Spiegel
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -15,7 +15,7 @@
%%
-\ProvidesFile{fiwi.dbx}[2016/09/09 1.6 film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2017/01/27 1.6b film studies bibliography style data model]
\RequireBiber[3]
\DeclareDatamodelFields[type=field, datatype=literal]{parttitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index f9f1e792c5d..bb67741d30e 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 v1.6a 2017/01/21 Simon Spiegel
+% $Id: fiwi2.bbx, v1.6b 2017/01/27 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi2.bbx}[v 1.6a 2017/01/21 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v1.6b 2017/01/27 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 f7cf5daab30..8c954d0da7c 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 v1.6a 2017/01/21 Simon Spiegel
+% $Id: fiwi2.cbx, v1.6b 2017/01/27 Simon Spiegel
\ProvidesFile{fiwi2.cbx}
-[\abx@cbxid $Id: fiwi2.cbx,v 1.6a 2017/01/21 spiegel $]
+[\abx@cbxid $Id: fiwi2.cbx, v1.6b 2017/01/27 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 feba2692ea2..16e0542dbbc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.dbx
@@ -1,4 +1,4 @@
-%% Copyright 2016 Simon Spiegel
+%% Copyright 2017 Simon Spiegel
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,7 +14,7 @@
%%
-\ProvidesFile{fiwi.dbx}[2016/09/09 1.6 film studies bibliography style data model]
+\ProvidesFile{fiwi.dbx}[2017/01/27 1.6b film studies bibliography style data model]
\RequireBiber[3]
\DeclareDatamodelFields[type=field, datatype=literal]{parttitle}