summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-17 21:35:52 +0000
committerKarl Berry <karl@freefriends.org>2017-03-17 21:35:52 +0000
commit9931cd650cfa196a601649b18c7651f109ca33bd (patch)
tree3890b0d6349d5974817e3758a6153af43377d579 /Master/texmf-dist/tex
parented8e46e860bca3acafba4475ee050d009cbef8c7 (diff)
biblatex-philosophy (17may17)
git-svn-id: svn://tug.org/texlive/trunk@43528 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx30
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx31
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx71
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx2
10 files changed, 103 insertions, 54 deletions
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 9aa2223d203..8aa221f3a38 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/03/14 v1.9.2 A set of styles for biblatex]
+[2017/03/17 v1.9.3 A set of styles for biblatex]
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 d1c5ef76899..9ba6c7c1a25 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/03/14 v1.9.2 A set of styles for biblatex]
+[2017/03/17 v1.9.3 A set of styles for biblatex]
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 01e7040ccfe..6d9a7f58922 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/03/14 v1.9.2 A set of styles for biblatex]
+[2017/03/17 v1.9.3 A set of styles for biblatex]
@@ -107,6 +107,34 @@
\setcounter{maxnamesincross}{\value{maxnames}}%
\setcounter{minnamesincross}{\value{minnames}}%
}%
+\DeclareNameFormat{labelname}{%
+\nameparts{#1}%
+\bibhyperref{\ifcase\value{uniquename}%
+\usebibmacro{name:family}
+{\namepartfamily}
+{\namepartgiven}
+{\namepartprefix}
+{\namepartsuffix}%
+\or
+\ifuseprefix
+{\usebibmacro{name:given-family}
+{\namepartfamily}
+{\namepartgiveni}
+{\namepartprefix}
+{\namepartsuffixi}}
+{\usebibmacro{name:given-family}
+{\namepartfamily}
+{\namepartgiveni}
+{\namepartprefixi}
+{\namepartsuffixi}}%
+\or
+\usebibmacro{name:given-family}
+{\namepartfamily}
+{\namepartgiven}
+{\namepartprefix}
+{\namepartsuffix}%
+\fi
+\usebibmacro{name:andothers}}}
\AtEveryBibitem{%
\iffieldequalstr{entrysubtype}{classic}{%
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 315c6ff5310..75009eec87a 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/03/14 v1.9.2 A set of styles for biblatex]
+[2017/03/17 v1.9.3 A set of styles for biblatex]
@@ -24,11 +24,12 @@
}
\AtEveryCite{%
-\renewcommand*{\mkbibnamefamily}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
-\renewcommand*{\mkbibnamegiven}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
-\renewcommand*{\mkbibnameprefix}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
-\renewcommand*{\mkbibnamesuffix}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
-}
+ \iftoggle{cbx:scauthorscite}%
+ {\let\mkbibnamefamily\mkbibsc%
+ \let\mkbibnamegiven\mkbibsc%
+ \let\mkbibnameprefix\mkbibsc%
+ \let\mkbibnamesuffix\mkbibsc}%
+ {}}%
\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 440dc436894..f7a53316ea6 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/03/14 v1.9.2 A set of styles for biblatex]
+[2017/03/17 v1.9.3 A set of styles for biblatex]
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 11f2f7618a6..612d3cb548e 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}
-[2017/03/14 v1.9.2 A set of styles for biblatex]
+[2017/03/17 v1.9.3 A set of styles for biblatex]
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 73f2df0c4e6..d5efb9e8d09 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,12 @@
%% License information appended
%%
\ProvidesFile{philosophy-standard.bbx}
-[2017/03/14 v1.9.2 A set of styles for biblatex]
+[2017/03/17 v1.9.3 A set of styles for biblatex]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
-
\def\optionerror#1{%
\ClassError{biblatex-philosophy}
{\MessageBreak**** Unknown value for '#1' option}
@@ -183,34 +182,6 @@
{\namepartprefix}
{\namepartsuffix}}}%
\usebibmacro{name:andothers}}%
-\DeclareNameFormat{labelname}{%
- \nameparts{#1}%
- \bibhyperref{\ifcase\value{uniquename}%
- \usebibmacro{name:family}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}%
- \or
- \ifuseprefix
- {\usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefix}
- {\namepartsuffixi}}
- {\usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefixi}
- {\namepartsuffixi}}%
- \or
- \usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiven}
- {\namepartprefix}
- {\namepartsuffix}%
- \fi
- \usebibmacro{name:andothers}}}
\DeclareFieldFormat[bookinbook,thesis]{title}{\mkbibemph{#1}}
\DeclareFieldFormat[review]{title}{\bibcplstring{reviewof}\addspace#1}
\DeclareFieldFormat[review]{citetitle}{\bibcplstring{reviewof}\addspace#1}
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 3eb3c9daa66..7ace25d7f70 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/03/14 v1.9.2 A set of styles for biblatex]
+[2017/03/17 v1.9.3 A set of styles for biblatex]
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 c0ec21ec6b6..8613af82194 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/03/14 v1.9.2 A set of styles for biblatex]
+[2017/03/17 v1.9.3 A set of styles for biblatex]
@@ -35,14 +35,6 @@
\renewcommand*{\mkibid}{\iftoggle{cbx:latinemph}{\emph}{}}
\AtEveryCite{%
\togglefalse{bbx:annotation}%
- \renewcommand*{\mkbibnamefamily}[1]{%
- \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
- \renewcommand*{\mkbibnamegiven}[1]{%
- \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
- \renewcommand*{\mkbibnameprefix}[1]{%
- \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
- \renewcommand*{\mkbibnamesuffix}[1]{%
- \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
\renewbibmacro*{name:andothers}{%
\ifboolexpr{%
test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
@@ -65,7 +57,60 @@
{}%
\andmoredelim\bibstring[\mkibid]{andmore}}%
{}}%
+\DeclareNameFormat{labelname}{%
+\iftoggle{cbx:scauthorscite}{%
+ \iffootnote{%
+ \let\mkbibnamefamily\mkbibsc%
+ \let\mkbibnamegiven\mkbibsc%
+ \let\mkbibnameprefix\mkbibsc%
+ \let\mkbibnamesuffix\mkbibsc}{}}{}%
+ \nameparts{#1}%
+ \bibhyperref{\ifcase\value{uniquename}%
+ \usebibmacro{name:family}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartprefix}%
+ {\namepartsuffix}%
+ \or
+ \ifuseprefix
+ {\usebibmacro{name:given-family}%
+ {\namepartfamily}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffixi}}%
+ {\usebibmacro{name:given-family}%
+ {\namepartfamily}%
+ {\namepartgiveni}%
+ {\namepartprefixi}%
+ {\namepartsuffixi}}%
+ \or
+ \usebibmacro{name:given-family}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartprefix}%
+ {\namepartsuffix}%
+ \fi
+ \usebibmacro{name:andothers}}}%
}%
+\DeclareNameFormat{scdefault}{%
+\iffootnote{%
+ \let\mkbibnamefamily\mkbibsc%
+ \let\mkbibnamegiven\mkbibsc%
+ \let\mkbibnameprefix\mkbibsc%
+ \let\mkbibnamesuffix\mkbibsc}{}%
+ \nameparts{#1}%
+ \ifgiveninits
+ {\usebibmacro{name:given-family}%
+ {\namepartfamily}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}}%
+ {\usebibmacro{name:given-family}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartprefix}%
+ {\namepartsuffix}}%
+ \usebibmacro{name:andothers}}%
\newbibmacro*{cite:opcit}{%
\printtext[bibhyperlink]{\bibstring[\mkibid]{opcited}}}
@@ -96,7 +141,9 @@
\global\toggletrue{cbx:fullcite}%
\printtext[bibhypertarget]{%
\usedriver
- {\DeclareNameAlias{sortname}{default}}%
+ {\iftoggle{cbx:scauthorscite}{%
+ \DeclareNameAlias{sortname}{scdefault}}%
+ {\DeclareNameAlias{sortname}{default}}}%
{\thefield{entrytype}}}%
\usebibmacro{shorthandintro}}%
{\usebibmacro{cite:shorthand}}}
@@ -129,7 +176,9 @@
\DeclareCiteCommand{\fullcite}
{\usebibmacro{prenote}}
{\usedriver
- {\DeclareNameAlias{sortname}{default}}%
+ {\iftoggle{cbx:scauthorscite}%
+ {\DeclareNameAlias{sortname}{scdefault}}%
+ {\DeclareNameAlias{sortname}{default}}}%
{\thefield{entrytype}}}
{\multicitedelim}
{\usebibmacro{postnote}}
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 12463853e5e..0b1afef96fc 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/03/14 v1.9.2 A set of styles for biblatex]
+[2017/03/17 v1.9.3 A set of styles for biblatex]