From 23ceffcff36fa84c87cb45cd5cba0851311b99fd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 10 Mar 2016 23:21:45 +0000 Subject: biblatex-philosophy (10mar16) git-svn-id: svn://tug.org/texlive/trunk@39987 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/biblatex-philosophy.dtx | 222 +++++++++++++++++---- 1 file changed, 181 insertions(+), 41 deletions(-) (limited to 'Master/texmf-dist/source/latex/biblatex-philosophy') diff --git a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx index 1c542e21ebe..3070f50d7dc 100644 --- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx +++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx @@ -98,7 +98,7 @@ %\ProvidesFile{english-philosophy.lbx} %\ProvidesFile{spanish-philosophy.lbx} %<*standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx> - [2015/10/09 v1.3 valbusa beta] + [2016/03/10 v1.4 valbusa beta] % %<*driver> \documentclass[10pt]{ltxdoc} @@ -127,7 +127,6 @@ % layout \setcounter{tocdepth}{3} \usepackage{geometry} -% \geometry{hmarginratio=1:1,a4paper,margin=2cm,headheight=15pt} \geometry{paperwidth=17cm,paperheight=24cm,margin=1.4cm,top=2cm,bottom=2cm,headheight=15pt,ignoreall,heightrounded} \usepackage{sectsty} @@ -262,7 +261,7 @@ % % \fi % -% \CheckSum{3932} +% \CheckSum{4100} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -280,6 +279,7 @@ % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % +% \changes{v1.4}{2016/03/10}{Maintenance release. Updated style for working with \sty{biblatex} v.3.4.} % \changes{v1.3}{2015/10/09}{Maintenance release. Corrected a spurious space in article entries.} % \changes{v1.2}{2015/09/19}{Maintenance release. New value \opt{superscript} for \opt{editionformat} option.} % \changes{v1.1}{2015/06/13}{Maintenance release. Updated documentation.} @@ -1203,22 +1203,59 @@ {}} \AtBeginBibliography{% \iftoggle{bbx:scauthorsbib}{% -\DeclareNameFormat{sortname}{% - \let\mkbibnamelast\mkbibsc% - \let\mkbibnamefirst\mkbibsc% +\ifblx@load@version@legacy +\DeclareNameFormat{family-given/given-family}{% + \let\mkbibnamefamily\mkbibsc% + \let\mkbibnamegiven\mkbibsc% \let\mkbibnameprefix\mkbibsc% - \let\mkbibnameaffix\mkbibsc + \let\mkbibnameaffix\mkbibsc% \ifnumequal{\value{listcount}}{1} {\iffirstinits - {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}% - {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}% + {\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:first-last}{#1}{#4}{#5}{#7}} - {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}}% - \usebibmacro{name:andothers}}}% + {\usebibmacro{name:given-family}{#1}{#4}{#5}{#7}} + {\usebibmacro{name:given-family}{#1}{#3}{#5}{#7}}}% + \usebibmacro{name:andothers}}% +\else +\DeclareNameFormat{sortname}{% + \let\mkbibnamefamily\mkbibsc% + \let\mkbibnamegiven\mkbibsc% + \let\mkbibnameprefix\mkbibsc% + \let\mkbibnameaffix\mkbibsc% + \nameparts{#1}% + \ifnumequal{\value{listcount}}{1} + {\ifgiveninits + {\usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffix}} + {\usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}}% + \ifempty{\namepartgiven\namepartprefix} + {} + {\usebibmacro{name:revsdelim}}} + {\ifgiveninits + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffix}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}}}% + \usebibmacro{name:andothers}} +\fi + }% {}}% % \end{macrocode} % \subsubsection{New internal commands} @@ -1452,7 +1489,7 @@ \newbibmacro*{origtitle:article-inbook-incoll}{% \iffieldundef{origtitle}{}{% \printfield[origtitle]{origtitle}% -\setunit{\addcomma\space}} +\setunit{\addcomma\space}}% \iffieldundef{usera}{}{% \usebibmacro{in:}% \printfield{usera}% @@ -2749,7 +2786,7 @@ % Define new fields for \bibtype{jurisdiction} entry types and % \opt{orig-} fields mechanism: % \begin{macrocode} -\ifblx@load@version@one +\ifblx@load@version@legacy \else \DeclareStyleSourcemap{ \maps[datatype=bibtex]{ @@ -2770,8 +2807,8 @@ } } } -\fi \DeclareDataInheritance{*}{*}{\noinherit{annotation}} +\fi \DeclareFieldAlias[jurisdiction]{usera}[jurisdiction]{notacomm} \DeclareFieldAlias[jurisdiction]{nameadddon}[jurisdiction]{section} @@ -2868,7 +2905,17 @@ {\printtext[parens]{\printdateextra}}% \endgroup}% \newbibmacro*{date+extrayear}{}% -}% +% for article entries: +\renewbibmacro*{date}{\printdate}% +\renewbibmacro*{issue+date}{% + \printtext[pureparens]{% + \iffieldundef{issue} + {\usebibmacro{date}} + {\printfield{issue}% + \setunit*{\addspace}% + \usebibmacro{date}}}% + \newunit} + }% \AtBeginDocument{% \iftoggle{bbx:square} @@ -3064,7 +3111,7 @@ \renewcommand{\labelnamepunct}{} \AtBeginShorthands{% -\renewcommand{\postsep}{}% +\renewcommand{\postsep}{\addspace}% \renewcommand{\labelnamepunct}{\newunitpunct}} % \end{macrocode} % \subsubsection{New macros} @@ -3399,10 +3446,10 @@ {\usebibmacro{nodash:editor+others}} {\usebibmacro{translator+others}}}} -\newbibmacro*{relateddate}{% +\renewbibmacro*{relateddate}{% \setunit*{\addspace}% \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}} -\newbibmacro*{commarelateddate}{% +\renewbibmacro*{commarelateddate}{% \setunit*{\addcomma\space}% \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}} @@ -3508,7 +3555,7 @@ \usebibmacro{pageref}% \usebibmacro{finentry}} -\newbibmacro*{inbook:full}{% +\renewbibmacro*{inbook:full}{% \usebibmacro{bybookauthor}% \newunit\newblock \usebibmacro{maintitle+booktitle}% @@ -3552,7 +3599,7 @@ \usebibmacro{pageref}% \usebibmacro{finentry}} - \newbibmacro*{incollection:full}{% + \renewbibmacro*{incollection:full}{% \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -3806,23 +3853,55 @@ \AtEveryCite{% \iftoggle{cbx:scauthorscite}% - {\let\mkbibnamelast\mkbibsc% - \let\mkbibnamefirst\mkbibsc% + {\let\mkbibnamefamily\mkbibsc% + \let\mkbibnamegiven\mkbibsc% \let\mkbibnameprefix\mkbibsc% - \let\mkbibnameaffix\mkbibsc} + \let\mkbibnameaffix\mkbibsc}% {}}% + +\ifblx@load@version@legacy \DeclareNameFormat{labelname}{% \bibhyperref{% \ifcase\value{uniquename}% - \usebibmacro{name:last}{#1}{#3}{#5}{#7}% + \usebibmacro{name:family}{#1}{#3}{#5}{#7}% \or \ifuseprefix - {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}% - {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}% + {\usebibmacro{name:given-family}{#1}{#4}{#5}{#8}}% + {\usebibmacro{name:given-family}{#1}{#4}{#6}{#8}}% \or - \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% + \usebibmacro{name:given-family}{#1}{#3}{#5}{#7}% \fi \usebibmacro{name:andothers}}} + \else +\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}}} + \fi %%%% \newcommand{\switchclass}[2]{% @@ -4235,31 +4314,92 @@ \andmoredelim\bibstring[\mkibid]{andmore}}% {}}% \iftoggle{cbx:scauthorscite}{% +\ifblx@load@version@legacy +\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}}% +\else \DeclareNameFormat{labelname}{% - \let\mkbibnamelast\mkbibsc% - \let\mkbibnamefirst\mkbibsc% +\iffootnote{% + \let\mkbibnamefamily\mkbibsc% + \let\mkbibnamegiven\mkbibsc% \let\mkbibnameprefix\mkbibsc% - \let\mkbibnameaffix\mkbibsc + \let\mkbibnameaffix\mkbibsc}{}% + \nameparts{#1}% \ifcase\value{uniquename}% - \usebibmacro{name:last}{#1}{#3}{#5}{#7}% + \usebibmacro{name:family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% \or \ifuseprefix - {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}% - {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}% + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\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}} \fi - \usebibmacro{name:andothers}}}{}}% + }{}}% +\ifblx@load@version@legacy \DeclareNameFormat{scdefault}{% - \let\mkbibnamelast\mkbibsc% - \let\mkbibnamefirst\mkbibsc% +\iffootnote{% + \let\mkbibnamefamily\mkbibsc% + \let\mkbibnamegiven\mkbibsc% \let\mkbibnameprefix\mkbibsc% - \let\mkbibnameaffix\mkbibsc + \let\mkbibnameaffix\mkbibsc}{}% \iffirstinits - {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}% - {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}% + {\usebibmacro{name:given-family}{#1}{#4}{#5}{#7}}% + {\usebibmacro{name:given-family}{#1}{#3}{#5}{#7}}% + \usebibmacro{name:andothers}} +\else +\DeclareNameFormat{scdefault}{% +\iffootnote{% + \let\mkbibnamefamily\mkbibsc% + \let\mkbibnamegiven\mkbibsc% + \let\mkbibnameprefix\mkbibsc% + \let\mkbibnameaffix\mkbibsc}{}% + \nameparts{#1}% + \ifgiveninits + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffix}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}}% \usebibmacro{name:andothers}} +\fi % \end{macrocode} % \subsubsection{New macros} % \begin{macrocode} -- cgit v1.2.3