From 3ff2c88a53d7c22678a85a322184b262b8456d66 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Jun 2016 21:44:45 +0000 Subject: biblatex-philosophy (10jun16) git-svn-id: svn://tug.org/texlive/trunk@41339 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 | 24 ++--------- .../biblatex-philosophy/philosophy-modern.bbx | 2 +- .../biblatex-philosophy/philosophy-modern.cbx | 2 +- .../biblatex-philosophy/philosophy-standard.bbx | 38 +++--------------- .../biblatex-philosophy/philosophy-verbose.bbx | 2 +- .../biblatex-philosophy/philosophy-verbose.cbx | 46 +++------------------- .../biblatex-philosophy/spanish-philosophy.lbx | 2 +- 10 files changed, 20 insertions(+), 102 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 007148bc477..587a604b682 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} - [2016/05/18 v1.5 A set of styles for biblatex] + [2016/06/10 v1.7 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 aeb1de1fa22..bf410dfa5c7 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} - [2016/05/18 v1.5 A set of styles for biblatex] + [2016/06/10 v1.7 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 bdc2de30586..646b2299ec2 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} - [2016/05/18 v1.5 A set of styles for biblatex] + [2016/06/10 v1.7 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 c711671463d..dcce371d214 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} - [2016/05/18 v1.5 A set of styles for biblatex] + [2016/06/10 v1.7 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -39,24 +39,7 @@ \let\mkbibnameaffix\mkbibsc}% {}}% -\ifblx@load@version@legacy - \expandafter\@firstoftwo -\else - \expandafter\@secondoftwo -\fi -{\DeclareNameFormat{labelname}{% -\bibhyperref{% - \ifcase\value{uniquename}% - \usebibmacro{name:family}{#1}{#3}{#5}{#7}% - \or - \ifuseprefix - {\usebibmacro{name:given-family}{#1}{#4}{#5}{#8}}% - {\usebibmacro{name:given-family}{#1}{#4}{#6}{#8}}% - \or - \usebibmacro{name:given-family}{#1}{#3}{#5}{#7}% - \fi - \usebibmacro{name:andothers}}}} -{\DeclareNameFormat{labelname}{% +\DeclareNameFormat{labelname}{% \nameparts{#1}% \bibhyperref{\ifcase\value{uniquename}% \usebibmacro{name:family} @@ -83,8 +66,7 @@ {\namepartprefix} {\namepartsuffix}% \fi - \usebibmacro{name:andothers}}}} - %%%% + \usebibmacro{name:andothers}}} \newcommand{\switchclass}[2]{% \iffieldequalstr{entrysubtype}{classic}% 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 60a47cb4d56..e498d6bbccd 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} - [2016/05/18 v1.5 A set of styles for biblatex] + [2016/06/10 v1.7 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 042f1eba51b..a1a254895f9 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} - [2016/05/18 v1.5 A set of styles for biblatex] + [2016/06/10 v1.7 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 0a1b8da309b..378a01ad767 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -13,13 +13,13 @@ %% License information appended %% \ProvidesFile{philosophy-standard.bbx} - [2016/05/18 v1.5 A set of styles for biblatex] + [2016/06/10 v1.7 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: -\RequireBiber[2] +\RequireBiber[3] \RequireBibliographyStyle{standard} \DeclareLanguageMapping{italian}{italian-philosophy} \DeclareLanguageMapping{english}{english-philosophy} @@ -111,28 +111,7 @@ {}} \AtBeginBibliography{% \iftoggle{bbx:scauthorsbib}{% -\ifblx@load@version@legacy - \expandafter\@firstoftwo -\else - \expandafter\@secondoftwo -\fi -{\DeclareNameFormat{family-given/given-family}{% - \let\mkbibnamefamily\mkbibsc% - \let\mkbibnamegiven\mkbibsc% - \let\mkbibnameprefix\mkbibsc% - \let\mkbibnameaffix\mkbibsc% - \ifnumequal{\value{listcount}}{1} - {\iffirstinits - {\usebibmacro{name:family-given}{#1}{#4}{#5}{#7}}% - {\usebibmacro{name:family-given}{#1}{#3}{#5}{#7}}% - \ifblank{#3#5} - {} - {\usebibmacro{name:revsdelim}}} - {\iffirstinits - {\usebibmacro{name:given-family}{#1}{#4}{#5}{#7}} - {\usebibmacro{name:given-family}{#1}{#3}{#5}{#7}}}% - \usebibmacro{name:andothers}}}% -{\DeclareNameFormat{sortname}{% +\DeclareNameFormat{sortname}{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% \let\mkbibnameprefix\mkbibsc% @@ -165,7 +144,6 @@ {\namepartprefix} {\namepartsuffix}}}% \usebibmacro{name:andothers}}}% - }% {}}% \renewcommand*{\newunitpunct}{\addcomma\space} \renewcommand*{\subtitlepunct}{\addperiod\space} @@ -1634,13 +1612,7 @@ \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} -\ifblx@load@version@legacy - \expandafter\@firstoftwo -\else - \expandafter\@secondoftwo -\fi -{\relax} -{\DeclareStyleSourcemap{ +\DeclareStyleSourcemap{ \maps[datatype=bibtex]{ \map{ \step[fieldsource=court , fieldtarget=author] @@ -1660,7 +1632,7 @@ } } \DeclareDataInheritance{*}{*}{\noinherit{annotation}} -} + \DeclareFieldAlias[jurisdiction]{usera}[jurisdiction]{notacomm} \DeclareFieldAlias[jurisdiction]{nameadddon}[jurisdiction]{section} \DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court} 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 aca64f46895..a765e869066 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} - [2016/05/18 v1.5 A set of styles for biblatex] + [2016/06/10 v1.7 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 01de1e8b75b..995b321d742 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} - [2016/05/18 v1.5 A set of styles for biblatex] + [2016/06/10 v1.7 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -65,28 +65,7 @@ \andmoredelim\bibstring[\mkibid]{andmore}}% {}}% \iftoggle{cbx:scauthorscite}{% -\ifblx@load@version@legacy - \expandafter\@firstoftwo -\else - \expandafter\@secondoftwo -\fi -{\DeclareNameFormat{labelname}{% -\iffootnote{% - \let\mkbibnamefamily\mkbibsc% - \let\mkbibnamegiven\mkbibsc% - \let\mkbibnameprefix\mkbibsc% - \let\mkbibnameaffix\mkbibsc}{}% - \ifcase\value{uniquename}% - \usebibmacro{name:family}{#1}{#3}{#5}{#7}% - \or - \ifuseprefix - {\usebibmacro{name:given-family}{#1}{#4}{#5}{#8}}% - {\usebibmacro{name:given-family}{#1}{#4}{#6}{#8}}% - \or - \usebibmacro{name:given-family}{#1}{#3}{#5}{#7}% - \fi - \usebibmacro{name:andothers}}}% -{\DeclareNameFormat{labelname}{% +\DeclareNameFormat{labelname}{% \iffootnote{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% @@ -118,24 +97,9 @@ {\namepartprefix} {\namepartsuffix}% \fi - \usebibmacro{name:andothers}}} + \usebibmacro{name:andothers}} }{}}% -\ifblx@load@version@legacy - \expandafter\@firstoftwo -\else - \expandafter\@secondoftwo -\fi -{\DeclareNameFormat{scdefault}{% -\iffootnote{% - \let\mkbibnamefamily\mkbibsc% - \let\mkbibnamegiven\mkbibsc% - \let\mkbibnameprefix\mkbibsc% - \let\mkbibnameaffix\mkbibsc}{}% - \iffirstinits - {\usebibmacro{name:given-family}{#1}{#4}{#5}{#7}}% - {\usebibmacro{name:given-family}{#1}{#3}{#5}{#7}}% - \usebibmacro{name:andothers}}} -{\DeclareNameFormat{scdefault}{% +\DeclareNameFormat{scdefault}{% \iffootnote{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% @@ -153,7 +117,7 @@ {\namepartgiven} {\namepartprefix} {\namepartsuffix}}% - \usebibmacro{name:andothers}}} + \usebibmacro{name:andothers}} \newbibmacro*{cite:opcit}{% \printtext[bibhyperlink]{\bibstring[\mkibid]{opcit}}} 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 1c7e0c904b7..a62200774fa 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} - [2016/05/18 v1.5 A set of styles for biblatex] + [2016/06/10 v1.7 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: -- cgit v1.2.3