From de8e68502f2756ea9ec69667d4ceb3da26cea84d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Jan 2015 22:23:55 +0000 Subject: biblatex-philosophy (13jan15) git-svn-id: svn://tug.org/texlive/trunk@36056 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/english-philosophy.lbx | 2 +- .../biblatex-philosophy/italian-philosophy.lbx | 2 +- .../biblatex-philosophy/philosophy-classic.bbx | 2 +- .../biblatex-philosophy/philosophy-classic.cbx | 11 +++-- .../biblatex-philosophy/philosophy-modern.bbx | 2 +- .../biblatex-philosophy/philosophy-modern.cbx | 2 +- .../biblatex-philosophy/philosophy-standard.bbx | 35 +++++++++------ .../biblatex-philosophy/philosophy-verbose.bbx | 51 +++++++++++++++++++--- .../biblatex-philosophy/philosophy-verbose.cbx | 34 ++++++++++----- 9 files changed, 102 insertions(+), 39 deletions(-) (limited to 'Master/texmf-dist/tex') 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 b24b32816b2..5232288350f 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} - [2014/03/28 v0.9f valbusa beta] + [2015/01/14 v0.9h valbusa beta] \InheritBibliographyExtras{english} 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 7288e8fcffb..be4dbe02372 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} - [2014/03/28 v0.9f valbusa beta] + [2015/01/14 v0.9h valbusa beta] \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 5c268d5ca85..02c53fea583 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} - [2014/03/28 v0.9f valbusa beta] + [2015/01/14 v0.9h valbusa beta] \RequireBibliographyStyle{authoryear} \RequireBibliographyStyle{philosophy-standard} 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 f66c97ebd0a..39f15044c92 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} - [2014/03/28 v0.9f valbusa beta] + [2015/01/14 v0.9h valbusa beta] \RequireCitationStyle{authoryear-comp} @@ -32,11 +32,10 @@ \AtEveryCite{% \iftoggle{cbx:scauthorscite}% - {% - \renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}% - \renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}% - \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}% - \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}% + {\let\mkbibnamelast\mkbibsc% + \let\mkbibnamefirst\mkbibsc% + \let\mkbibnameprefix\mkbibsc% + \let\mkbibnameaffix\mkbibsc} {}}% \DeclareNameFormat{labelname}{% \bibhyperref{% 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 7d26e9c0521..7bd7ac62e65 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} - [2014/03/28 v0.9f valbusa beta] + [2015/01/14 v0.9h valbusa beta] \RequireBibliographyStyle{philosophy-classic} \newtoggle{bbx:yearleft} 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 fb4722e240e..298198d2910 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-modern.cbx} - [2014/03/28 v0.9f valbusa beta] + [2015/01/14 v0.9h valbusa beta] \RequireCitationStyle{philosophy-classic} \DeclareCiteCommand{\fullcite}% 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 5e9dbd373cc..0e1a001a44e 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} - [2014/03/28 v0.9f valbusa beta] + [2015/01/14 v0.9h valbusa beta] \RequireBiber[2] \RequireBibliographyStyle{standard} @@ -26,6 +26,7 @@ \newtoggle{bbx:scauthorsbib} \newtoggle{bbx:inbeforejournal} \newtoggle{bbx:classical} +\newtoggle{bbx:lowscauthors} \DeclareBibliographyOption{annotation}[true]{% \settoggle{bbx:annotation}{#1}} @@ -39,6 +40,8 @@ \settoggle{bbx:inbeforejournal}{#1}} \DeclareBibliographyOption{classical}[true]{% \settoggle{bbx:classical}{#1}} +\DeclareBibliographyOption{lowscauthors}[true]{% + \settoggle{bbx:lowscauthors}{#1}} \newcommand{\bbx@publocformat}{} \newcommand{\bbx@volnumformat}{} @@ -66,6 +69,7 @@ \renewcommand{\bbx@origfields}{origed}} \ExecuteBibliographyOptions{% + lowscauthors = false, publocformat = publocyear, annotation = false, library = true, @@ -87,13 +91,21 @@ \setcounter{biburllcpenalty}{9000} \newcounter{maxnamesincross} \newcounter{minnamesincross} +\AtBeginDocument{% +\iftoggle{bbx:lowscauthors}% + {\newrobustcmd*{\mkbibsc}[1]{\textsc{\MakeLowercase{#1}}}}% + {\newrobustcmd*{\mkbibsc}[1]{\textsc{#1}}}% +\iftoggle{bbx:scauthors}{% + \toggletrue{bbx:scauthorsbib}% + \toggletrue{cbx:scauthorscite}}% +{}} \AtBeginBibliography{% \iftoggle{bbx:scauthorsbib}{% \DeclareNameFormat{sortname}{% -\renewcommand{\mkbibnamefirst}{\textsc}% -\renewcommand{\mkbibnamelast}{\textsc}% -\renewcommand{\mkbibnameprefix}{\textsc}% -\renewcommand{\mkbibnameaffix}{\textsc}% + \let\mkbibnamelast\mkbibsc% + \let\mkbibnamefirst\mkbibsc% + \let\mkbibnameprefix\mkbibsc% + \let\mkbibnameaffix\mkbibsc \ifnumequal{\value{listcount}}{1} {\iffirstinits {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}% @@ -106,17 +118,11 @@ {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}}% \usebibmacro{name:andothers}}}% {}}% - -\AtBeginDocument{% -\iftoggle{bbx:scauthors}{% - \toggletrue{bbx:scauthorsbib}% - \toggletrue{cbx:scauthorscite}}% -{}} \renewcommand*{\newunitpunct}{\addcomma\space} \renewcommand*{\subtitlepunct}{\addperiod\space} \renewcommand*{\intitlepunct}{\nopunct\addspace} \newcommand*{\volnumpunct}{\addcomma\space} -\newrobustcmd{\mkpureparens}[1]{% +\newrobustcmd*{\mkpureparens}[1]{% \begingroup \blx@blxinit \blx@setsfcodes @@ -605,7 +611,7 @@ \iffieldundef{relatedstring}% {\bibstring{translationas}\space}% {\setunit{\bibstring{translationas}\space}}% - \renewcommand{\mkpureparens}{}% + \renewcommand*{\mkpureparens}{}% \renewcommand*{\mkbibbrackets}{}% \relatedcite{\thefield{related}}} \DeclareBibliographyDriver{article}{% @@ -778,6 +784,7 @@ \usebibmacro{finentry}} \DeclareBibliographyDriver{inbook}{% +\togglefalse{cbx:scauthorscite}% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% @@ -839,6 +846,7 @@ \usebibmacro{finentry}} \DeclareBibliographyDriver{incollection}{% +\togglefalse{cbx:scauthorscite}% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% @@ -898,6 +906,7 @@ \usebibmacro{finentry}} \DeclareBibliographyDriver{inproceedings}{% +\togglefalse{cbx:scauthorscite}% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% 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 f474e04e40b..efa8e47bdb9 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} - [2014/03/28 v0.9f valbusa beta] + [2015/01/14 v0.9h valbusa beta] \RequireBibliographyStyle{authortitle} \RequireBibliographyStyle{philosophy-standard} @@ -69,11 +69,53 @@ \usebibmacro{#1}% \clearname{editor}}% {\global\undef\bbx@lasthash}}% +\newbibmacro*{nodash:author}{% + \ifboolexpr{% + test \ifuseauthor + and + not test {\ifnameundef{author}} + }% + {\printnames{author}% + \iffieldundef{nameaddon}{}% + {\setunit{\addspace}% + \printtext[brackets]{\printfield{nameaddon}}}% +\setunit{\addcomma\space}% + \usebibmacro{authorstrg}}% + {\global\undef\bbx@lasthash}} + +\newbibmacro*{nodash:editor+others}{% + \usebibmacro{nodash:bbx:editor}{editor+othersstrg}}% +\newbibmacro*{nodash:bbx:editor}[1]{% + \ifboolexpr{% + test \ifuseeditor + and + not test {\ifnameundef{editor}} + }% + {\printnames{editor}% +\setunit{\addspace}% + \usebibmacro{#1}% + \clearname{editor}}% + {\global\undef\bbx@lasthash}} + +\newbibmacro*{nodash:author/editor+others/translator+others}{% + \ifboolexpr{ + test \ifuseauthor + and + not test {\ifnameundef{author}} + } + {\usebibmacro{nodash:author}} + {\ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\usebibmacro{nodash:editor+others}} + {\usebibmacro{translator+others}}}} + \newbibmacro*{usedriver:book}{% -\renewbibmacro*{bbx:savehash}{}% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \usebibmacro{author/editor+others/translator+others}% + \usebibmacro{nodash:author/editor+others/translator+others}% \setunit{\labelnamepunct}\newblock \usebibmacro{maintitle+title}% \newunit @@ -118,10 +160,9 @@ \usebibmacro{pageref}% } \newbibmacro*{usedriver:collection}{% -\renewbibmacro*{bbx:savehash}{}% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \usebibmacro{editor+others}% + \usebibmacro{nodash:editor+others}% \setunit{\labelnamepunct}\newblock \usebibmacro{maintitle+title}% \newunit 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 9d103a3e880..208ef681943 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} - [2014/03/28 v0.9f valbusa beta] + [2015/01/14 v0.9h valbusa beta] \RequireCitationStyle{verbose-trad2} @@ -62,10 +62,10 @@ {}}% \iftoggle{cbx:scauthorscite}{% \DeclareNameFormat{labelname}{% -\renewcommand{\mkbibnamefirst}{\textsc}% -\renewcommand{\mkbibnamelast}{\textsc}% -\renewcommand{\mkbibnameprefix}{\textsc}% -\renewcommand{\mkbibnameaffix}{\textsc}% + \let\mkbibnamelast\mkbibsc% + \let\mkbibnamefirst\mkbibsc% + \let\mkbibnameprefix\mkbibsc% + \let\mkbibnameaffix\mkbibsc \ifcase\value{uniquename}% \usebibmacro{name:last}{#1}{#3}{#5}{#7}% \or @@ -78,10 +78,10 @@ \usebibmacro{name:andothers}}}{}}% \DeclareNameFormat{scdefault}{% -\renewcommand{\mkbibnamefirst}{\textsc}% -\renewcommand{\mkbibnamelast}{\textsc}% -\renewcommand{\mkbibnameprefix}{\textsc}% -\renewcommand{\mkbibnameaffix}{\textsc}% + \let\mkbibnamelast\mkbibsc% + \let\mkbibnamefirst\mkbibsc% + \let\mkbibnameprefix\mkbibsc% + \let\mkbibnameaffix\mkbibsc \iffirstinits {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}% {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}% @@ -121,6 +121,12 @@ {\thefield{entrytype}}}% \usebibmacro{shorthandintro}} +\renewbibmacro*{cite:idem}{% +\iftoggle{cbx:scauthorscite}{% + \bibstring[\mkbibsc]{idem\thefield{gender}}}{% + \bibstring[\mkibid]{idem\thefield{gender}}}% + \setunit{\nametitledelim}} + \newbibmacro*{ccite:cite}{% \usebibmacro{related:clearauthors}% \usebibmacro{cite:citepages}% @@ -140,7 +146,15 @@ \usebibmacro{ccite:cite}} {\multicitedelim} {\usebibmacro{cite:postnote}} - +\DeclareCiteCommand{\fullcite} + {\usebibmacro{prenote}} + {\usedriver + {\iftoggle{cbx:scauthorscite}% + {\DeclareNameAlias{sortname}{scdefault}}% + {\DeclareNameAlias{sortname}{default}}}% + {\thefield{entrytype}}} + {\multicitedelim} + {\usebibmacro{postnote}} %% %% Copyright 2009-2014 by Ivan Valbusa %% -- cgit v1.2.3