diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx | 110 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx | 315 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx | 4 |
4 files changed, 330 insertions, 103 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx index 4f6a3f3fa93..963d841e9e5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx @@ -1,18 +1,14 @@ -% $Id: fiwi.bbx, v1.6 2016/09/09 Simon Spiegel -% Ragged2e -% Alternatetitle -% Uniquetitle - -\ProvidesFile{fiwi.bbx}[v1.6 2016/09/09 film studies bibliography style] - -%\@ifpackagelater{biblatex}{2016/08/01} -% {} -% {\PackageError{biblatex} -% {Outdated 'biblatex' package} -% {The 'fiwi' style requires biblatex v3.5 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.6a 2017/01/20 Simon Spiegel +\ProvidesFile{fiwi.bbx}[v1.6a 2017/01/20 film studies bibliography style] + +\@ifpackagelater{biblatex}{2016/08/01} + {} + {\PackageError{biblatex} + {Outdated 'biblatex' package} + {The 'fiwi' style requires biblatex v3.5 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] @@ -69,6 +65,8 @@ % Diverse Schalter +\providetoggle{bbx:directoreplace} +\togglefalse{bbx:directoreplace} \providetoggle{bbx:scriptwriter} \togglefalse{bbx:scriptwriter} \providetoggle{bbx:actor} @@ -129,7 +127,6 @@ \newtoggle{cbx:orgigyearcite} \newtoggle{cbx:superscriptcite} - % BibliographyOptions \DeclareBibliographyOption{ignoreaddendum}[true]{% @@ -233,13 +230,13 @@ } \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}} \DeclareBibliographyOption{translatedas}[true]{\settoggle{germfassung}{#1}} +\DeclareBibliographyOption{directoreplace}[true]{\settoggle{bbx:directoreplace}{#1}} \DeclareBibliographyOption{noseries}[true]{% \ifstrequal{#1}{true} @@ -523,25 +520,29 @@ {\namepartgiveni} {\namepartprefix} {\namepartsuffix} - \ifpseudo% + \iftoggle{index:inindex} + {} + {\ifpseudo% {\usebibmacro{name:true:family-given} {\nameparttruefamily} {\nameparttruegiveni} {\nameparttrueprefix} {\nameparttruesuffix}} {} - } + }} {\usebibmacro{name:family-given} {\namepartfamily} {\namepartgiven}% {\namepartprefix}% {\namepartsuffix}% - \ifpseudo% + \iftoggle{index:inindex} + {} + {\ifpseudo% {\usebibmacro{name:true:family-given}% {\nameparttruefamily}% {\nameparttruegiven}% {\nameparttrueprefix}% - {\nameparttruesuffix}}% + {\nameparttruesuffix}}}% {}}% \usebibmacro{name:andothers}} @@ -554,14 +555,16 @@ {\namepartgiveni} {\namepartprefix} {\namepartsuffix} - \ifpseudo% + \iftoggle{index:inindex} + {} + {\ifpseudo% {\addthinspace\bibopenbracket{=}\usebibmacro{actor:given-family} {\nameparttruefamily} {\nameparttruegiveni} {\nameparttrueprefix} {\nameparttruesuffix} \bibclosebracket} - {}} + {}}} {\usebibmacro{actor:given-family} {\namepartfamily} {\namepartgiven} @@ -570,13 +573,15 @@ \ifblank{\namepartgiven\namepartprefix} {} {\usebibmacro{name:revsdelim} - \ifpseudo% + \iftoggle{index:inindex} + {} + {\ifpseudo% {\addthinspace\bibopenbracket{=}\usebibmacro{actor:given-family} {\nameparttruefamily} {\nameparttruegiven} {\nameparttrueprefix} {\nameparttruesuffix}\bibclosebracket} - {}} + {}}} \renewcommand*{\multinamedelim}{\addslash}% \renewcommand*{\finalnamedelim}{\addslash}} @@ -587,13 +592,15 @@ {\namepartgiveni} {\namepartprefix} {\namepartsuffix} - \ifpseudo% + \iftoggle{index:inindex} + {} + {\ifpseudo% {\addthinspace\bibopenbracket{=}\usebibmacro{name:given-family} {\nameparttruefamily} {\nameparttruegiveni} {\nameparttrueprefix} {\nameparttruesuffix}\bibclosebracket} - {}} + {}}} {\usebibmacro{name:given-family} {\namepartfamily} {\namepartgiven} @@ -602,12 +609,14 @@ \ifblank{\namepartgiven\namepartprefix} {} {\usebibmacro{name:revsdelim}% - \ifpseudo% + \iftoggle{index:inindex} + {} + {\ifpseudo% {\addthinspace\bibopenbracket{=}\usebibmacro{name:given-family} {\nameparttruefamily} {\nameparttruegiven} {\nameparttrueprefix} - {\nameparttruesuffix}\bibclosebracket} + {\nameparttruesuffix}\bibclosebracket}} {}}% \usebibmacro{name:andothers}} @@ -662,6 +671,15 @@ \mkbibnamefamily{#1}\isdot \ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}} +\renewbibmacro*{pageref}{% + \iflistundef{pageref} + {} + {\printtext[]{% + \ifnumgreater{\value{pageref}}{1} + {} + {}% + \printlist[pageref][-\value{listtotal}]{pageref}}}} + \renewbibmacro*{name:family-given}[4]{% \ifuseprefix% {\usebibmacro{name:delim}{#3#1}% @@ -839,8 +857,7 @@ } % Bibliography strings - - +\NewBibliographyString{notavailable} \NewBibliographyString{fromjapanese} \NewBibliographyString{fromhebrew} \NewBibliographyString{minutes} @@ -862,6 +879,7 @@ \protected\def\bibdateeraprefix{-}} \DefineBibliographyStrings{german}{% +notavailable = {\brackettext{K\adddot\addnbthinspace{A}\adddot}}, andothers = {et al\adddot\addspace}, directedby = {Regie\addcolon\addspace}, writtenby = {Buch\addcolon\addspace}, @@ -907,7 +925,11 @@ january = {Januar}, % commands -\renewbibmacro*{finentry}{\iftoggle{intransdecision}% +\renewbibmacro*{finentry}{% +\ifboolexpr{% +( not test {\ifbibliography}) or +( test {\iftoggle{intransdecision}} ) +}% {\unspace}{\addperiod}} % unklar, warum \finentry nicht geht @@ -923,7 +945,7 @@ january = {Januar}, %\appto{\bibsetup}{\setlength{\emergencystretch}{8em}} \newcommand*{\mkibid}[1]{#1} -\newrobustcmd{\film}{\textsc} +\newrobustcmd*{\film}[1]{\textsc{#1}} \renewbibmacro*{byeditor+othersstrg}{% \ifboolexpr{% @@ -1489,13 +1511,24 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}} \newbibmacro*{movie:creators}{% \iftoggle{bbx:scriptwriter} - {\usebibmacro{movie:directorsscriptwriters}} - {\usebibmacro{movie:directors}} + {\usebibmacro{movie:directorsscriptwriters}}% + {\usebibmacro{movie:directors}}% } \newbibmacro*{movie:directors}{% - \ifpunct{\unspace}{}\printnames{director} -} + \ifpunct{\unspace}{}% + \ifnameundef{director}{% +\iftoggle{bbx:directoreplace} +{\iflistundef{production}{\bibstring{notavailable}}{\printlist{production}}} +{\iffieldequalstr{entrysubtype}{tv} +{}{\bibstring{notavailable}}}} +{\printnames[director]{director}% +\iffieldundef{filmmakertype}% +{}% +{\addspace\mkbibbrackets{\printfield{filmmakertype}}}% +}} + + \newbibmacro*{movie:directorsscriptwriters}{% \ifnamesequal{scriptwriter}{director} @@ -1956,7 +1989,8 @@ and (test {\iffieldundef{origyear}}% \newblock% \usebibmacro{filmtitle}% \newunit\newblock% - \usebibmacro{movie:creators}% + \usebibmacro{movie:creators} + \newunit\newblock% \iffieldundef{entrysubtype} {\usebibmacro{movie:regular}}% {\iffieldequalstr{entrysubtype}{serial}% diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx index d7f851f0bb6..d25f5585eb1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx @@ -1,18 +1,54 @@ -% $Id: fiwi.cbx,v v1.5 2016/09/09 Simon Spiegel +% $Id: fiwi.cbx,v v1.6a 2016/12/15 Simon Spiegel \ProvidesFile{fiwi.cbx} -[\abx@cbxid $Id: fiwi.cbx,v 1.6 2016/09/09 spiegel $] +[\abx@cbxid $Id: fiwi.cbx,v 1.6a 2016/12/15 spiegel $] \ExecuteBibliographyOptions{autocite=inline,uniquename=allfull,uniquelist=true,ibidtracker=constrict} \RequireBibliographyStyle{fiwi} +\providetoggle{cbx:filmindex} +\providetoggle{cbx:filmindex-complete} +\providetoggle{index:title:author} +\togglefalse{index:title:author} +\providetoggle{index:title} +\togglefalse{index:title} +\providetoggle{index:title:both} +\togglefalse{index:title:both} +\providetoggle{index:inindex} + +\DeclareBibliographyOption{filmindex}[true]{% Indexieren von Filmen + \ifstrequal{#1}{true} + {\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{titleindex}[true]{% Indexieren von Buchtiteln + \ifstrequal{#1}{true} + {\toggletrue{index:title}} + {\togglefalse{index:title}} + \ifstrequal{#1}{subitem} + {\toggletrue{index:title:author}} + {\togglefalse{index:title:author}} + \ifstrequal{#1}{both} + {\toggletrue{index:title:both} + \toggletrue{index:title:author}} + {\togglefalse{index:title:both}} +} + +\providetoggle{cbx:compactcite} +\togglefalse{cbx:compactcite} \newbool{cbx@bool} \newbool{cbx:parens} \newbool{cbx:loccit} \providetoggle{citefullfilm} +\providetoggle{cbx:citefilmcountry} \newcommand*{\fullcitefilm}{\settoggle{citefullfilm}{true}} \DeclareBibliographyOption{fullcitefilm}[false]{\settoggle{citefullfilm}{#1}} +\DeclareBibliographyOption{compactcite}[true]{\settoggle{cbx:compactcite}{#1}} \providetoggle{citecompletefilm} \newcommand*{\completecitefilm}{\settoggle{citecompletefilm}{true}} @@ -24,6 +60,9 @@ \ifstrequal{#1}{full} {\settoggle{citefullfilm}{true}} {} +\ifstrequal{#1}{country} +{\settoggle{cbx:citefilmcountry}{true}} +{} \ifstrequal{#1}{complete} {\settoggle{citecompletefilm}{true}} {} @@ -42,25 +81,34 @@ {\ExecuteBibliographyOptions{loccittracker=constrict}} {\ExecuteBibliographyOptions{loccittracker=false}}} +%\def\sortentry#1{} +%\newcommand{\sortentry}[1]{#1} +\newrobustcmd{\sortentry}[1]{#1} + %\the\numexpr\value{parenlevel} \DeclareFieldFormat{citeyear}{\ifnumcomp{\value{parenlevel}}{>}{0}{#1}{\mkbibparens{#1}}} \DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot} \DeclareFieldFormat[misc,video,movie]{citetitle}{\film{#1}} \DeclareIndexFieldFormat[movie,misc,video]{indextitle}{% - \usebibmacro{index:movietitle}{\index}{#1}} - -\DeclareIndexNameFormat{default}{% - \iftoggle{xindy} - {\usebibmacro{xindy:name}{\index} - {\namepartfamily} - {\namepartgiven} - {\namepartprefix} - {\namepartsuffix}} - {\usebibmacro{index:name}{\index} - {\namepartfamily} - {\namepartgiven} - {\namepartprefix} - {\namepartsuffix}}} + \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}}}} + +\DeclareIndexNameFormat{name:title}{% + \iffieldundef{title} + {\usebibmacro{index:name}{\index} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}} + {\usebibmacro{index:name:title}{\index} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}}} \DeclareNameFormat{labelname}{% \ifcase\value{uniquename}% @@ -118,17 +166,50 @@ \usebibmacro{name:hook}{#1}}}% \mkbibnamefamily{#1}}% +% Index resp. xindy \newcommand*{\xindy}{\toggletrue{xindy}}% Indizierung für xindy ohne actual-Teil +% {<family name>}{<given name>}{<given initials>}{<family name prefix>} +\renewcommand*{\mkbibindexname}[4]{% Variante für xindy ohne actual + \ifuseprefix + {\ifdefvoid{#3}{}{#3 }% + \@firstofone #1% remove spurious braces + \ifdefvoid{#4}{}{ #4}% + \ifdefvoid{#2}{}{, #2}% + \iftoggle{xindy} + {} + {\actualoperator + \ifdefvoid{#3}{}{\MakeCapital{#3}\addspace}% + #1% + \ifdefvoid{#4}{}{ #4}% + \ifdefvoid{#2}{}{, #2}}% + } + {\@firstofone #1% remove spurious braces + \ifdefvoid{#4}{}{ #4}% + \ifboolexpe{% + test {\ifdefvoid{#2}} + and + test {\ifdefvoid{#3}}} + {} + {,}% + \ifdefvoid{#2}{}{ #2}% + \ifdefvoid{#3}{}{ #3}}} + +% {<control sequence>}{<control sequence>} +\renewcommand*{\mkbibindexsubentry}[2]{% Variante für xindy ohne actual + \ifblank{#1}{}{\subentryoperator% + \iftoggle{xindy}{#2}{#1\actualoperator#2}}} + \newbibmacro*{index:movietitle}[2]{% \iftoggle{xindy} - {\usebibmacro{xindy:field}} - {\usebibmacro{index:field}} - {#1}{\thefield{indexsorttitle}} - {\ifuniquetitle{\film{#2}} - {\film{#2} (\thefield{year})}}} + {\usebibmacro{xindy:field}} + {\usebibmacro{index:field}} + {#1}{\thefield{indexsorttitle}\ifuniquetitle{}{ (\thefield{year})}} + {\iftoggle{cbx:filmindex}{#2} + {\ifuniquetitle{#2} + {#2 (\thefield{year})}}}} -\renewbibmacro*{index:title}[2]{% +\renewbibmacro*{index:title}[2]{% Variante für xindy ohne actual \iftoggle{xindy} {\usebibmacro{xindy:field}} {\usebibmacro{index:field}}{#1}{\thefield{indexsorttitle}} @@ -137,7 +218,6 @@ \renewcommand{\postnotedelim}{\addcolon\addspace} \renewcommand{\sqspace}{\addnbthinspace} -%\newrobustcmd*{\Textcites}{\bibsentence\textcites} \newcommand{\citets}{\textcites} \newrobustcmd*{\Citets}{\Textcites} \newcommand{\citealts}{\cites} @@ -151,9 +231,81 @@ \renewbibmacro*{citeindex}{% \ifciteindex{% - \indexnames[indexname]{labelname}} + \indexnames[default]{labelname}} {}}% +\newbibmacro*{cbx:index-name-title}{% + \ifciteindex% + {\iftoggle{index:title:both}% + {\indexnames[name:title]{labelname}% + \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}% + \togglefalse{index:inindex}}}} + {\indexnames[name:title]{labelname}}} + {}} + +\DeclareIndexNameFormat{default}{% + \ifpseudo% + {\usebibmacro{index:name:true} + {\index} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix} + {\nameparttruefamily} + {\nameparttruegiven} + {\nameparttrueprefix} + {\nameparttruesuffix}}% + {\usebibmacro{index:name}% + {\index} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}}% + } + +\newbibmacro*{index:name:true}[9]{% + \usebibmacro{index:entry}{#1}% + {\mkbibindexname{#6}{#7}{#8}{#9}|see{\mkbibindextruename{#2}{#3}{#4}{#5}}}% + \usebibmacro{index:entry}{#1}% + {\mkbibindexname{#2}{#3}{#4}{#5}}% + } + +\newcommand*{\mkbibindextruename}[4]{% + \ifuseprefix + {\ifdefvoid{#3}{}{#3 }% + \@firstofone #1% remove spurious braces + \ifdefvoid{#4}{}{ #4}% + \ifdefvoid{#2}{}{, #2}}% + {\@firstofone #1% remove spurious braces + \ifdefvoid{#4}{}{ #4}% + \ifboolexpe{% + test {\ifdefvoid{#2}} + and + test {\ifdefvoid{#3}}} + {} + {,}% + \ifdefvoid{#2}{}{ #2}% + \ifdefvoid{#3}{}{ #3}}} + +% Kompaktes Zitieren + +\renewcommand*{\compcitedelim}{\addthinspace\bibstring{and}\addthinspace}% + +\newbibmacro*{cite:init}{% + \global\boolfalse{cbx:loccit}% + \ifnumless{\value{multicitecount}}{2} + {\global\boolfalse{cbx:parens}% + \global\undef\cbx@lasthash}% + {\iffieldundef{prenote}% + {} + {\global\undef\cbx@lasthash}}} + +\newbibmacro*{cite:reinit}{% + \global\undef\cbx@lasthash} + % Zitierbefehle für Filme und Serien \newbibmacro*{cite:tv}{% @@ -210,18 +362,23 @@ and test {\iffieldundef{maintitle}}} {\usebibmacro{cbx:cite-film-directorcountrytranstitle}}% {\usebibmacro{cbx:cite-filmtitle}% \addspace% - \usebibmacro{cbx:filmdate}}}} + \usebibmacro{cbx:country-filmdate}}}} -\newbibmacro*{cbx:filmdate} +\newbibmacro*{cbx:country-filmdate} {\printtext[citeyear]{% - \datecircaprint% +\iftoggle{cbx:citefilmcountry}{\printlist{location}\addspace}% +{}% +\usebibmacro{cbx:filmdate}}} + +\newbibmacro*{cbx:filmdate} +{\datecircaprint% \printfield[]{year}% \iffieldundef{labelendyear} {} {%\bibdatedash% \enddatecircaprint% \printfield{endyear}}% - \dateuncertainprint}} + \dateuncertainprint} \newbibmacro*{cbx:citeepisode} {\ifboolexpr{not test {\iffieldequalstr{entrysubtype}{tv}} @@ -254,7 +411,7 @@ and test {\iftoggle{citecompletefilm}}} {\usebibmacro{cbx:cite-filmtitle}} {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}} {\printtext[bibhyperref]{\printfield[film]{title}% - \addspace\usebibmacro{cbx:filmdate}}}} + \addspace\mkbibparens{\usebibmacro{cbx:filmdate}}}}} \newbibmacro*{cite:film:countryear}{% \printtext[bibhyperref]{\printfield[film]{title} @@ -266,9 +423,11 @@ and test {\iftoggle{citecompletefilm}}} \iffieldundef{alternatetitle} {}{\usebibmacro{bbx:cite-alternatetitle}} \addspace\usebibmacro{cbx:filmdate}% - {\printfield[plain]{subtitle}\setunit*{\addcomma\addspace}% - \printnames[director]{director}\addcomma\addthinspace\printlist{location}% - \addspace\usebibmacro{cbx:filmdate}} + {\addspace\bibopenparen\printfield[plain]{subtitle}% + \setunit*{\addcomma\addspace}% + \usebibmacro{movie:directors}% + \addcomma\addthinspace\printlist{location}% + \addspace\usebibmacro{cbx:filmdate}\bibcloseparen} } \newbibmacro*{cite:film:directorcountry}{% Film mit Regisseur @@ -276,13 +435,27 @@ and test {\iftoggle{citecompletefilm}}} \iffieldundef{alternatetitle} {}{\usebibmacro{bbx:cite-alternatetitle}} \addspace\mkbibparens{% - \printnames{director}% + \usebibmacro{movie:directors}% \addcomma\addthinspace\printlist{location}% \addspace\usebibmacro{cbx:filmdate}}} - \newbibmacro*{cite}{% - \global\boolfalse{cbx:loccit}% +\iftoggle{cbx:compactcite}% +{\iffieldundef{shorthand}% + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}% + {\usebibmacro{cite:ibid}}% + {\iffieldequals{namehash}{\cbx@lasthash} + {\setunit{\compcitedelim}}% + {\ifnameundef{labelname}% + {}% + {\printnames{labelname}% + \setunit{\nameyeardelim}}% + \savefield{namehash}{\cbx@lasthash}}% + \usebibmacro{cite:labelyear+extrayear}}}% + {\usebibmacro{cite:shorthand}% + \usebibmacro{cite:reinit}}% + \setunit{\multicitedelim}} + {\global\boolfalse{cbx:loccit}% \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} @@ -292,8 +465,8 @@ and test {\iftoggle{citecompletefilm}}} {\printtext[bibhyperref]{\printnames{labelname}}% \setunit{\nameyeardelim}}% \usebibmacro{cite:labelyear+extrayear}}} - {\usebibmacro{cite:shorthand}}} - + {\usebibmacro{cite:shorthand}}% + \setunit{\multicitedelim}}} \newbibmacro*{textcite:footcite}{% \global\boolfalse{cbx:loccit}% @@ -468,32 +641,36 @@ and test {\iftoggle{citecompletefilm}}} {\usebibmacro{cite:postnote}} -\DeclareCiteCommand{\cite} - {\usebibmacro{prenote}} +\DeclareCiteCommand{\cite}% + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{cite}} - {\multicitedelim} + {} {\usebibmacro{cite:postnote}} \DeclareCiteCommand*{\cite} - {\usebibmacro{prenote}} + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{citeyear}} - {\multicitedelim} + {} {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\parencite}[\mkbibparens] - {\usebibmacro{prenote}} + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{cite}} - {\multicitedelim} + {} {\usebibmacro{cite:postnote}} \DeclareCiteCommand*{\parencite}[\mkbibparens] - {\usebibmacro{prenote}} + {\usebibmacro{cite:init} + \usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{citeyear}} - {\multicitedelim} + {} {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\inparencite}[] @@ -503,43 +680,48 @@ and test {\iftoggle{citecompletefilm}}} \bibopenparen% \usebibmacro{prenote}% \mancite\usebibmacro{citeyear}}% - {\multicitedelim}% + {}% {\usebibmacro{cite:postnote} \unspace\bibcloseparen} \DeclareCiteCommand{\citetitle} - {\citetrackerfalse - \pagetrackerfalse - \usebibmacro{prenote}} - {\indexfield{indextitle}% - \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} - {\multicitedelim} + {\citetrackerfalse% + \pagetrackerfalse% + \usebibmacro{prenote}} + {\iftoggle{index:title} + {\indexfield{indextitle}}% + {}% + \iftoggle{index:title:author}% + {\usebibmacro{cbx:index-name-title}}% + {}% + \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}% + {}% {\usebibmacro{cite:postnote}} - + \DeclareCiteCommand{\citeyear} {\usebibmacro{prenote}} {\usebibmacro{citeyear}} - {\multicitedelim} + {} {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\citeurl} {\usebibmacro{prenote}} {\printfield[citeurl]{url}} - {\multicitedelim} + {} {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\citealtnoibidem} {\usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{cite}} - {\multicitedelim} + {} {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\citetnoibidem} {\usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} - {\multicitedelim} + {} {\iffieldundef{postnote} {\ifbool{cbx@bool} {\bibcloseparen} @@ -554,7 +736,7 @@ and test {\iftoggle{citecompletefilm}}} \usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{textcite:footcite}} - {\multicitedelim} + {} {\iffieldundef{postnote} {\ifbool{cbx@bool} {\bibcloseparen} @@ -588,14 +770,25 @@ 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}% |see{\textsc{\thefield{indextitle}}}}} {\index{% \ifbibmacroundef{altscript:\strfield{alternatetitlescript}-font} {\textsc{\thefield{alternatetitle}}}% {\usebibmacro*{altscript:\strfield{alternatetitlescript}-font}% - {{\thefield{alternatetitle}}}}% - |see{\textsc{\thefield{indextitle}}}}}} + {{\thefield{alternatetitle}}}\rmfamily}% + |see{\textsc{\thefield{indextitle}}}}}}} \DeclareCiteCommand{\citefilm} {\usebibmacro{prenote}} diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx index af17293838c..f9f1e792c5d 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.6 2016/09/09 Simon Spiegel +% $Id: fiwi2.bbx, v v1.6a 2017/01/21 Simon Spiegel % Stil mit Jahrestahl nach Autor -\ProvidesFile{fiwi2.bbx}[v 1.6 2016/09/09 film studies bibliography style Author (Year)] +\ProvidesFile{fiwi2.bbx}[v 1.6a 2017/01/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 34d1596c8c0..f7cf5daab30 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.6 2016/09/09 Simon Spiegel +% $Id: fiwi2.cbx,v v1.6a 2017/01/21 Simon Spiegel \ProvidesFile{fiwi2.cbx} -[\abx@cbxid $Id: fiwi2.cbx,v 1.6 2016/09/09 spiegel $] +[\abx@cbxid $Id: fiwi2.cbx,v 1.6a 2017/01/21 spiegel $] \RequireCitationStyle{fiwi} |