From c33f8322a322e3985d91ec6e03b4b5a7136add0b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 16 Sep 2017 20:47:06 +0000 Subject: biblatex-philosophy (16sep17) git-svn-id: svn://tug.org/texlive/trunk@45321 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/english-philosophy.lbx | 2 +- .../biblatex-philosophy/french-philosophy.lbx | 2 +- .../biblatex-philosophy/italian-philosophy.lbx | 2 +- .../biblatex-philosophy/philosophy-classic.bbx | 4 +- .../biblatex-philosophy/philosophy-classic.cbx | 11 +++- .../biblatex-philosophy/philosophy-modern.bbx | 6 +-- .../biblatex-philosophy/philosophy-modern.cbx | 12 ++++- .../biblatex-philosophy/philosophy-standard.bbx | 63 ++++++++-------------- .../biblatex-philosophy/philosophy-verbose.bbx | 6 +-- .../biblatex-philosophy/philosophy-verbose.cbx | 11 +++- .../biblatex-philosophy/spanish-philosophy.lbx | 2 +- 11 files changed, 64 insertions(+), 57 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy') diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx index dcf52ebc806..9c8be1093f1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{english-philosophy.lbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \InheritBibliographyExtras{english} diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx index 25a7a72da55..6c105632cda 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{french-philosophy.lbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \InheritBibliographyExtras{french} diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx index 32f5c27a36e..f9d499b8a51 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{italian-philosophy.lbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \InheritBibliographyExtras{italian} diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx index 8bf0089640b..8c03c904b71 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-classic.bbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \RequireBibliographyStyle{authoryear} @@ -252,7 +252,7 @@ \printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% - \printtext[brackets]{\printfield{nameaddon}}}%* + \printfield{nameaddon}}%* \iffieldundef{authortype} {\setunit{\printdelim{nameyeardelim}}} {\setunit{\printdelim{editorstrgdelim}}}}%* diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx index 6d339f95292..369b699de1f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-classic.cbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \RequireCitationStyle{authoryear-comp} @@ -296,6 +296,15 @@ {\printtext[bibhyperref]{\printdateextra}} {\multicitedelim} {\usebibmacro{postnote}} +\DeclareCiteCommand{\fullcite} + {\usebibmacro{prenote}} + {\usedriver + {\iftoggle{cbx:scauthorscite}% + {\DeclareNameAlias{sortname}{scdefault}}% + {\DeclareNameAlias{sortname}{default}}}% + {\thefield{entrytype}}} + {\multicitedelim} + {\usebibmacro{postnote}} \DeclareCiteCommand{\footcitet}[\mkbibfootnote] {\usebibmacro{cite:init}} {\usebibmacro{citeindex}% diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx index 03b1c1bc8d1..4e16639e662 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-modern.bbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \RequireBibliographyStyle{philosophy-classic} @@ -40,7 +40,7 @@ \printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% - \printtext[brackets]{\printfield{nameaddon}}}%* + \printfield{nameaddon}}%* \iffieldundef{authortype} {\setunit{\printdelim{nameyeardelim}}}% {\setunit{\printdelim{editorstrgdelim}}}}%* @@ -126,7 +126,7 @@ \printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% - \printtext[brackets]{\printfield{nameaddon}}}%* + \printfield{nameaddon}}%* \postsep}% \usebibmacro{date+extrayear}% \iffieldundef{authortype} diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx index d14da742054..e0c6152c165 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx @@ -13,10 +13,20 @@ %% License information appended %% \ProvidesFile{philosophy-modern.cbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \RequireCitationStyle{philosophy-classic} +\DeclareCiteCommand{\fullcite} + {\usebibmacro{prenote}} + {\setkeys{blx@bib2}{restoreclassic}% + \usedriver + {\iftoggle{cbx:scauthorscite}% + {\DeclareNameAlias{sortname}{scdefault}}% + {\DeclareNameAlias{sortname}{default}}}% + {\thefield{entrytype}}} + {\multicitedelim} + {\usebibmacro{postnote}} %% %% Copyright 2009-2017 by Ivan Valbusa %% diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx index 97b5324528b..5339a78c723 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-standard.bbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \RequireBiber[3] @@ -113,37 +113,25 @@ \newcounter{minnamesincross} \AtBeginDocument{% \ifdefstring{\bbx@scauthors}{bibcite} -{% - \toggletrue{bbx:scauthorsbib}% - \toggletrue{cbx:scauthorscite}% -}% -{}% + {\toggletrue{bbx:scauthorsbib}% + \toggletrue{cbx:scauthorscite}% + }{}% \ifdefstring{\bbx@scauthors}{bib} -{% - \toggletrue{bbx:scauthorsbib}% -}% -{}% + {\toggletrue{bbx:scauthorsbib}% + }{}% \ifdefstring{\bbx@scauthors}{cite} -{% - \toggletrue{cbx:scauthorscite}% -}% -{}% + {\toggletrue{cbx:scauthorscite}% + }{}% \ifdefstring{\bbx@scauthors}{citefn} -{% - \toggletrue{cbx:scauthorscitefn}% -}% -{}% + {\toggletrue{cbx:scauthorscitefn}% + }{}% \ifdefstring{\bbx@scauthors}{bibcitefn} -{% - \toggletrue{bbx:scauthorsbib}% - \toggletrue{cbx:scauthorscitefn}% -}% -{}% + {\toggletrue{bbx:scauthorsbib}% + \toggletrue{cbx:scauthorscitefn}% + }{}% \ifdefstring{\bbx@scauthors}{all} -{% - \usebibmacro{scswitch} -}% -{}% + {\usebibmacro{bbx:scswitch}% + }{}% } \AtBeginBibliography{% \togglefalse{cbx:scauthorscite}% @@ -192,13 +180,13 @@ \iftoggle{bbx:lowscauthors}{% \textsc{\MakeLowercase{#1}}}% {\textsc{#1}}} -\newbibmacro*{scswitch}{% +\newbibmacro*{bbx:scswitch}{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% \let\mkbibnameprefix\mkbibsc% \let\mkbibnamesuffix\mkbibsc} \DeclareNameFormat{sortname}{% - \iftoggle{bbx:scauthorsbib}{\usebibmacro{scswitch}}{}% + \iftoggle{bbx:scauthorsbib}{\usebibmacro{bbx:scswitch}}{}% \nameparts{#1}% \ifnumequal{\value{listcount}}{1} {\ifgiveninits @@ -231,8 +219,8 @@ {\namepartsuffix}}}% \usebibmacro{name:andothers}}% \DeclareNameFormat{labelname}{% - \iftoggle{cbx:scauthorscite}{\usebibmacro{scswitch}}{}% - \iftoggle{cbx:scauthorscitefn}{\iffootnote{\usebibmacro{scswitch}}{}}{}% + \iftoggle{cbx:scauthorscite}{\usebibmacro{bbx:scswitch}}{}% + \iftoggle{cbx:scauthorscitefn}{\iffootnote{\usebibmacro{bbx:scswitch}}{}}{}% \bibhyperref{\nameparts{#1}% \ifcase\value{uniquename}% \usebibmacro{name:family}% @@ -261,7 +249,7 @@ \fi \usebibmacro{name:andothers}}}% \DeclareNameFormat{scdefault}{% -\usebibmacro{scswitch}% +\usebibmacro{bbx:scswitch}% \nameparts{#1}% \ifgiveninits {\usebibmacro{name:given-family}% @@ -275,16 +263,6 @@ {\namepartprefix}% {\namepartsuffix}}% \usebibmacro{name:andothers}}% -\DeclareCiteCommand{\fullcite} - {\usebibmacro{prenote}} - {\setkeys{blx@bib2}{restoreclassic}% - \usedriver - {\iftoggle{cbx:scauthorscite}% - {\DeclareNameAlias{sortname}{scdefault}}% - {\DeclareNameAlias{sortname}{default}}}% - {\thefield{entrytype}}} - {\multicitedelim} - {\usebibmacro{postnote}} \DeclareFieldFormat[bookinbook,thesis]{title}{\mkbibemph{#1}} \DeclareFieldFormat[review]{title}{\bibcplstring{reviewof}\addspace#1} \DeclareFieldFormat[review]{citetitle}{\bibcplstring{reviewof}\addspace#1} @@ -301,6 +279,7 @@ \DeclareFieldFormat{library}{\libraryfont #1} \DeclareFieldFormat{pureparens}{\mkpureparens{#1}} \DeclareFieldFormat{editortype}{\mkpureparens{#1}} +\DeclareFieldFormat{nameaddon}{\mkpurebrackets{#1}} \DeclareFieldAlias{authortype}{editortype} \DeclareFieldFormat{backrefparens}{\mkpureparens{#1}} \DeclareFieldFormat*{number}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx index 4bd07a9e026..32a9f858787 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.bbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \RequireBibliographyStyle{authortitle} @@ -45,7 +45,7 @@ {\printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% - \printtext[brackets]{\printfield{nameaddon}}}%MOD + \printfield{nameaddon}}%MOD \setunit{\printdelim{editorstrgdelim}}% \usebibmacro{bbx:savehash}}% \usebibmacro{authorstrg}}% @@ -90,7 +90,7 @@ {\printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% - \printtext[brackets]{\printfield{nameaddon}}}% + \printfield{nameaddon}}% \setunit{\addcomma\space}% \usebibmacro{authorstrg}}% {\global\undef\bbx@lasthash}} diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx index c1c46b87a3f..04a56917012 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.cbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \RequireCitationStyle{verbose-trad2} @@ -86,6 +86,15 @@ {\usebibmacro{cite:shorthand}}} {\usebibmacro{cite:full}% \usebibmacro{cite:save}}}} +\DeclareCiteCommand{\fullcite} + {\usebibmacro{prenote}} + {\usedriver + {\iftoggle{cbx:scauthorscite}% + {\DeclareNameAlias{sortname}{scdefault}}% + {\DeclareNameAlias{sortname}{default}}}% + {\thefield{entrytype}}} + {\multicitedelim} + {\usebibmacro{postnote}} \DeclareCiteCommand{\ccite} {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx index 7c3eb5b760b..4d0778b38b0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{spanish-philosophy.lbx} -[2017/04/13 v1.9.5 A set of styles for biblatex] +[2017/09/14 v1.9.6 A set of styles for biblatex] \InheritBibliographyExtras{spanish} -- cgit v1.2.3