diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx | 96 |
1 files changed, 78 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx index 74617b6dd20..ec8a1bbe8a5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx @@ -1,10 +1,10 @@ -% $Id: fiwi.cbx,v 1.3 2015/06/30 Simon Spiegel +% $Id: fiwi.cbx,v 1.4 2016/03/09 Simon Spiegel \ProvidesFile{fiwi.cbx} -[\abx@cbxid $Id: fiwi.cbx,v 1.3 2015/06/30 spiegel $] +[\abx@cbxid $Id: fiwi.cbx,v 1.4 2016/03/09 spiegel $] -\ExecuteBibliographyOptions{labeldate=true,autocite=inline,firstinits=false,uniquename=full,uniquelist=true,ibidtracker=constrict} +\ExecuteBibliographyOptions{labeldate=true,autocite=inline,giveninits=false,uniquename=full,uniquelist=true,ibidtracker=constrict} \RequireBibliographyStyle{fiwi} @@ -53,18 +53,48 @@ \DeclareIndexFieldFormat[movie,misc,video]{indextitle}{% \usebibmacro{index:filmtitle}{\index}{#1}} \DeclareIndexNameFormat{default}{% - \iftoggle{xindy}{\usebibmacro{xindy:name}{\index}{#1}{#3}{#5}{#7}} - {\usebibmacro{index:name}{\index}{#1}{#3}{#5}{#7}}} + \nameparts{#1}% + \iftoggle{xindy} + {\usebibmacro{xindy:name}{\index} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}} + {\usebibmacro{index:name}{\index} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}}} + + + \DeclareNameFormat{labelname}{% - \ifcase\value{uniquename}% - \usebibmacro{name:last}{#1}{#3}{#5}{#7}% - \or + \nameparts{#1}% + \ifcase\value{uniquename}% + \usebibmacro{name:family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \or \iftoggle{citeprefix} - {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}} - {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}% + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffix}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}% \or - \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% + \usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% \fi \usebibmacro{name:andothers}} @@ -73,11 +103,11 @@ {} {\usebibmacro{postnote}}} -\renewbibmacro*{name:last}[4]{% +\renewbibmacro*{name:family}[4]{% \iftoggle{citeprefix} {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% - \ifblank{#3} + \ifempty{#3} {} {\ifcapital {\mkbibnameprefix{\MakeCapital{#3\isdot}}} @@ -86,7 +116,7 @@ {\ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% - \ifblank{#3} + \ifempty{#3} {} {\ifcapital {\mkbibnameprefix{\MakeCapital{#3\isdot}}} @@ -94,7 +124,7 @@ \ifpunctmark{'}{}{\bibnamedelimc}}} {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}}}% - \mkbibnamelast{#1}}% + \mkbibnamefamily{#1}}% @@ -241,6 +271,36 @@ and test {\iftoggle{citecompletefilm}}} \usebibmacro{cite:labelyear+extrayear}}} {\usebibmacro{cite:shorthand}}} + +\newbibmacro*{textcite:footcite}{% + \global\boolfalse{cbx:loccit}% + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\boolfalse{cbx:parens}% + \addspace}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:labelyear+extrayear}} + {\usebibmacro{cite:shorthand}}} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {} + {\printnames{labelname}}% + \setunit{% + \global\boolfalse{cbx:parens}% + \addspace}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\usebibmacro{cite:ibid}} + {\iffieldundef{labelyear} + {\usebibmacro{cite:label}} + {\usebibmacro{cite:labelyear+extrayear}}}} + {\usebibmacro{cite:shorthand}}}} \newbibmacro*{textcite}{% \global\boolfalse{cbx:loccit}% @@ -432,7 +492,7 @@ and test {\iftoggle{citecompletefilm}}} {\bibsentence \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{textcite}} + \usebibmacro{textcite:footcite}} {\multicitedelim} {\iffieldundef{postnote} {\ifbool{cbx@bool} @@ -440,8 +500,8 @@ and test {\iftoggle{citecompletefilm}}} {}} {\ifbool{cbx@bool} {\postnotedelim} - {\addspace\bibopenparen}% - \printfield{postnote}\bibcloseparen}} + {\addspace}% + \printfield{postnote}}} \DeclareCiteCommand{\textcite} {\boolfalse{cbx:parens}} |