diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-17 21:35:52 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-17 21:35:52 +0000 |
commit | 9931cd650cfa196a601649b18c7651f109ca33bd (patch) | |
tree | 3890b0d6349d5974817e3758a6153af43377d579 /Master/texmf-dist | |
parent | ed8e46e860bca3acafba4475ee050d009cbef8c7 (diff) |
biblatex-philosophy (17may17)
git-svn-id: svn://tug.org/texlive/trunk@43528 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
13 files changed, 267 insertions, 186 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf Binary files differindex ccdcce74ebf..866ff3733ac 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip Binary files differindex 8ec4faea99b..5aa343692d7 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip 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 2b84286ce32..8b0fed14b56 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 @@ This work has the LPPL maintenance status "author-maintained". %<english-lbx>\ProvidesFile{english-philosophy.lbx} %<spanish-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> -[2017/03/14 v1.9.2 A set of styles for biblatex] +[2017/03/17 v1.9.3 A set of styles for biblatex] %</standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx> %<*driver> \documentclass[10pt]{ltxdoc} @@ -261,7 +261,7 @@ This work has the LPPL maintenance status "author-maintained". %</driver> % \fi % -% \CheckSum{3848} +% \CheckSum{3847} % % \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 @@ -279,6 +279,7 @@ This work has the LPPL maintenance status "author-maintained". % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % +% \changes{v1.9.3}{2017/03/17}{Maintenance release. Reset \file{philosophy-verbose.cbx} to version 1.9. Moved \texttt{labelname} format from \file{philosophy-standard.bbx} to \file{philosophy-classic.cbx}.} % \changes{v1.9.2}{2017/03/14}{Support for \texttt{multivolume} related type. The \texttt{origed} string is substituted with \texttt{origpubas} (redefined for Italiana and Spanish). New string \texttt{opcited}. Deleted \texttt{cited} string. New multi-value option \opt{scauthors} substitutes \opt{scauthorcite} and \opt{scauthorbib} options. Updated documentation.} % \changes{v1.9.1}{2017/02/16}{Redefined macros for the eechanism. Support for the \bibtype{set} entries. Support for the \opt{origpubin} and \opt{origpubas} default related types. Improved \texttt{.lbx} files. Updated documentation.} % \changes{v1.9}{2016/11/26}{Redefined \opt{ibidem} and \opt{loccit} strings in file \file{english-philosophy.lbx} according to the Chicago Manual of Style.} @@ -1246,31 +1247,48 @@ This work has the LPPL maintenance status "author-maintained". % % \StopEventually{\PrintChanges\PrintIndex} % -% \section{The Code} -% -% \subsection{\file{philosophy-standard.bbx}} -% \subsubsection{Initial settings} % % \iffalse %<*standard-bbx> % \fi % +% \section{The Code} +% +% \subsection{\file{philosophy-standard.bbx}} +% \subsubsection{Initial settings} +% +% Biber is the default bibliography processor for \sty{biblatex} since version. +% The \sty{philosophy} styles could work without Biber but it is required because +% it offers many intersting functionalities. The \opt{backend=bibtex} or \opt{backend=bibtex8} +% produce an error message. % \begin{macrocode} \RequireBiber[3] +% \end{macrocode} +% The styles are base on \sty{standard} \sty{biblatex} default style. +% \begin{macrocode} \RequireBibliographyStyle{standard} - +% \end{macrocode} +% A command to get an error message if you use an unknown value +% for an option. +% \begin{macrocode} \def\optionerror#1{% \ClassError{biblatex-philosophy} {\MessageBreak**** Unknown value for '#1' option} {\MessageBreak**** Unknown value for '#1' option}} % \end{macrocode} -% Load the localization modules: +% The \sty{philosophy} styles +% redefine some localized strings in special \file{.lbx} files +% called localization modules. So we first declare and map them +% to the associated languages. % \begin{macrocode} \DeclareLanguageMapping{italian}{italian-philosophy} \DeclareLanguageMapping{english}{english-philosophy} \DeclareLanguageMapping{spanish}{spanish-philosophy} % \end{macrocode} % \paragraph{Boolean options} +% The boolean options can have two value: true or false. +% Giving the options without the value is just like giving +% \opt{<option>=true.} % \begin{macrocode} \newtoggle{bbx:annotation} \newtoggle{bbx:library} @@ -1291,10 +1309,12 @@ This work has the LPPL maintenance status "author-maintained". \DeclareBibliographyOption{shorthandintro}[true]{% \settoggle{cbx:shorthandintro}{#1}} % \end{macrocode} -% \paragraph{Multi-value options} -% The new \opt{scauthors} option is now multi-value and defaults to \opt{all}. +% \paragraph{Multi-value options} +% Also the multi-value options have a default value, which is declare +% in the optional argumento of the commands below, between brackets. +% For example, the new \opt{scauthors} option is now multi-value and defaults to \opt{all}. % So \opt{scauthors=all} is the same of \opt{scauthors}. In this way this option -% works exactly like the old \opt{scauthors} boolean option. +% works exactly like the old \opt{scauthors} boolean option that has been erased. % \begin{macrocode} \newcommand{\bbx@publocformat}{} \newcommand{\bbx@volnumformat}{} @@ -1331,7 +1351,8 @@ This work has the LPPL maintenance status "author-maintained". \DeclareBibliographyOption{scauthorscite}[true]{% \settoggle{cbx:scauthorscite}{#1}} % \end{macrocode} -% Execute default options. +% Execute default options. Some options do not need to be executed. +% At the moment I do no why. % \begin{macrocode} \ExecuteBibliographyOptions{% % lowscauthors = false, @@ -1365,6 +1386,10 @@ This work has the LPPL maintenance status "author-maintained". % \begin{macrocode} \newcounter{maxnamesincross} \newcounter{minnamesincross} +% \end{macrocode} +% The \opt{scauthors} and \opt{lowscauthors} options need to be executed +% at the beginning of the document. +% \begin{macrocode} \AtBeginDocument{% \ifdefstring{\bbx@scauthors}{all} {% @@ -1390,6 +1415,10 @@ This work has the LPPL maintenance status "author-maintained". % \toggletrue{cbx:scauthorscite}}% %{} } +% \end{macrocode} +% With the \opt{scauthors=cite} option all the citations are printed in small caps. +% Anyway we do not like small caps inside the bibliography so we deactivate this option at the beginning of the bibliography. +% \begin{macrocode} \AtBeginBibliography{\togglefalse{cbx:scauthorscite}}% % \renewcommand*{\mkbibnamefamily}[1]{\iftoggle{bbx:scauthorsbib}{\mkbibsc{#1}}{#1}}% % \renewcommand*{\mkbibnamegiven}[1]{\iftoggle{bbx:scauthorsbib}{\mkbibsc{#1}}{#1}}% @@ -1399,8 +1428,8 @@ This work has the LPPL maintenance status "author-maintained". % % \subsubsection{New commands} % -% We redefine some internal commands and define the new \cmd{volnumpunct} command to separate -% volume and number in \bibtype{article} entries. +% We redefine some internal commands. The new \cmd{volnumpunct} command is provided +% to separate volume and number in \bibtype{article} entries. % \begin{macrocode} \renewcommand*{\newunitpunct}{\addcomma\space} \renewcommand*{\subtitlepunct}{\addperiod\space} @@ -1424,6 +1453,9 @@ This work has the LPPL maintenance status "author-maintained". \blx@setsfcodes \blx@postpunct[#1\blx@postpunct]\midsentence% \endgroup} +% \end{macrocode} +% The font of the \bibfield{annotation}, \bibfield{library} and \bibfield{edition} fields. +% \begin{macrocode} \newcommand*{\annotationfont}{\footnotesize} \newcommand*{\libraryfont}{} \newcommand*{\editionfont}{% @@ -1441,7 +1473,7 @@ This work has the LPPL maintenance status "author-maintained". % % \subsubsection{Names format} % -% The \cmd{renewcommands*}s are declared inside \texttt{sortname} +% The font switching is declared inside \texttt{sortname} % because the \opt{scauthors=bib} option has to be active only for the % names at the beginning of the entry. % \begin{macrocode} @@ -1483,39 +1515,6 @@ This work has the LPPL maintenance status "author-maintained". {\namepartsuffix}}}% \usebibmacro{name:andothers}}% % \end{macrocode} -% The \texttt{labelname} format is redefined in order to have also the name hyperlinked -% through the \cmd{bibhyperref} command. This should be omitted for \sty{philosophy-verbose} but -% it is introduced for consistency. -% \begin{macrocode} -\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}}} -% \end{macrocode} % \subsubsection{Fields format} % \begin{macrocode} \DeclareFieldFormat[bookinbook,thesis]{title}{\mkbibemph{#1}} @@ -3034,6 +3033,38 @@ This work has the LPPL maintenance status "author-maintained". \setcounter{maxnamesincross}{\value{maxnames}}% \setcounter{minnamesincross}{\value{minnames}}% }% +% \end{macrocode} +% The \texttt{labelname} format is redefined in order to have also the name hyperlinked +% through the \cmd{bibhyperref} command. +% \begin{macrocode} +\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}{% @@ -3720,7 +3751,6 @@ This work has the LPPL maintenance status "author-maintained". \usebibmacro{pageref}% \usebibmacro{finentry}} - \DeclareBibliographyDriver{manual}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -3928,14 +3958,14 @@ This work has the LPPL maintenance status "author-maintained". % \end{macrocode} % \paragraph{Name formats} % \begin{macrocode} - \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}}% +% \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}}}% @@ -3958,61 +3988,66 @@ This work has the LPPL maintenance status "author-maintained". {}% \andmoredelim\bibstring[\mkibid]{andmore}}% {}}% -%\iftoggle{cbx:scauthorscite}{% -%\DeclareNameFormat{labelname}{% -%\iffootnote{% -% \let\mkbibnamefamily\mkbibsc% -% \let\mkbibnamegiven\mkbibsc% -% \let\mkbibnameprefix\mkbibsc% -% \let\mkbibnamesuffix\mkbibsc}{}% -% \nameparts{#1}% -% \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}}% -% }{} +% \end{macrocode} +% The \texttt{labelname} format is redefined only if \opt{scauthors=cite} or \opt{scauthors=all} is given. +% \begin{macrocode} +\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}}% +% \end{macrocode} +% The \texttt{scdefauld} name format is used in the \texttt{cite:full} macro below to controll the small caps in the first citation of an antry (full citation). +% \begin{macrocode} +\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}}% % \end{macrocode} % \subsubsection{New macros} % \begin{macrocode} @@ -4046,15 +4081,13 @@ This work has the LPPL maintenance status "author-maintained". \global\toggletrue{cbx:fullcite}% \printtext[bibhypertarget]{% \usedriver -% {\iftoggle{cbx:scauthorscite}{% -% \DeclareNameAlias{sortname}{scdefault}}% -% {\DeclareNameAlias{sortname}{default}}}% - {\DeclareNameAlias{sortname}{default}}% + {\iftoggle{cbx:scauthorscite}{% + \DeclareNameAlias{sortname}{scdefault}}% + {\DeclareNameAlias{sortname}{default}}}% {\thefield{entrytype}}}% \usebibmacro{shorthandintro}}% {\usebibmacro{cite:shorthand}}} - \renewbibmacro*{cite:idem}{% \iftoggle{cbx:scauthorscite}{% \bibstring[\mkbibsc]{idem\thefield{gender}}}{% @@ -4086,10 +4119,9 @@ This work has the LPPL maintenance status "author-maintained". \DeclareCiteCommand{\fullcite} {\usebibmacro{prenote}} {\usedriver -% {\iftoggle{cbx:scauthorscite}% -% {\DeclareNameAlias{sortname}{scdefault}}% -% {\DeclareNameAlias{sortname}{default}}}% - {\DeclareNameAlias{sortname}{default}}% + {\iftoggle{cbx:scauthorscite}% + {\DeclareNameAlias{sortname}{scdefault}}% + {\DeclareNameAlias{sortname}{default}}}% {\thefield{entrytype}}} {\multicitedelim} {\usebibmacro{postnote}} @@ -4114,19 +4146,19 @@ This work has the LPPL maintenance status "author-maintained". citetracker = true, } -\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}}% -} %\AtEveryCite{% -% \iftoggle{cbx:scauthorscite}% -% {\let\mkbibnamefamily\mkbibsc% -% \let\mkbibnamegiven\mkbibsc% -% \let\mkbibnameprefix\mkbibsc% -% \let\mkbibnamesuffix\mkbibsc}% -% {}}% +%\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}}% +%} +\AtEveryCite{% + \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/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] |