From 44062de51dd65a536fc28548bf1f399c89fe6780 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 21 Feb 2017 00:26:41 +0000 Subject: biblatex-philosophy (20feb17) git-svn-id: svn://tug.org/texlive/trunk@43274 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/english-philosophy.lbx | 17 +- .../biblatex-philosophy/italian-philosophy.lbx | 29 ++- .../biblatex-philosophy/philosophy-classic.bbx | 7 +- .../biblatex-philosophy/philosophy-classic.cbx | 13 +- .../biblatex-philosophy/philosophy-modern.bbx | 7 +- .../biblatex-philosophy/philosophy-modern.cbx | 7 +- .../biblatex-philosophy/philosophy-standard.bbx | 255 ++++++--------------- .../biblatex-philosophy/philosophy-verbose.bbx | 65 +----- .../biblatex-philosophy/philosophy-verbose.cbx | 8 +- .../biblatex-philosophy/spanish-philosophy.lbx | 35 ++- 10 files changed, 148 insertions(+), 295 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 6743c1f9150..81de9dc9c19 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx @@ -7,13 +7,14 @@ %% biblatex-philosophy.dtx (with options: `english-lbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2016 Ivan Valbusa +%% Copyright (C) 2009-2017 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{english-philosophy.lbx} - [2016/11/26 v1.9 A set of styles for biblatex] + [2017/02/16 v1.9.1 A set of styles for biblatex] + @@ -29,20 +30,20 @@ \DeclareBibliographyStrings{% inherit = {english}, - nodate = {{no date}{n\adddot d\adddot}}, + origed = {{orig\adddotspace ed\adddot}{orig\adddotspace ed\adddot}}, cited = {{cit\adddot}{cit\adddot}}, + nodate = {{no date}{n\adddot d\adddot}}, ibidem = {{ibid\adddot}{ibid\adddot}}, loccit = {{ibid\adddot}{ibid\adddot}}, - origed = {{orig\adddotspace ed\adddot}{orig\adddotspace ed\adddot}}, - editor = {{\mkpureparens{ed\adddot}}{\mkpureparens{ed\adddot}}}, - editors = {{\mkpureparens{eds\adddot}}{\mkpureparens{eds\adddot}}}, + editor = {{ed\adddot}{ed\adddot}}, + editors = {{eds\adddot}{eds\adddot}}, reviewof = {{Review of}{Review of}}, - translationas = {{trans\adddot}{trans\adddot}}, + translationas = {{trans\adddot}{trans\adddot}}, backrefpage = {{cited on page}{cited on p\adddot}}, backrefpages = {{cited on pages}{cited on pp\adddot}} } %% -%% Copyright 2009-2016 by Ivan Valbusa +%% Copyright 2009-2017 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN 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 fa5650414b8..2214e7b2370 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx @@ -7,13 +7,14 @@ %% biblatex-philosophy.dtx (with options: `italian-lbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2016 Ivan Valbusa +%% Copyright (C) 2009-2017 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{italian-philosophy.lbx} - [2016/11/26 v1.9 A set of styles for biblatex] + [2017/02/16 v1.9.1 A set of styles for biblatex] + @@ -29,17 +30,18 @@ \DeclareBibliographyStrings{% inherit = {italian}, - nodate = {{senza data}{s\adddotspace d\adddot}}, cited = {{cit\adddot}{cit\adddot}}, + origed = {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}}, + nodate = {{senza data}{s\adddotspace d\adddot}}, opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}}, ibidem = {{ivi}{ivi}}, loccit = {{ibidem}{ibidem}}, - origed = {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}}, - langitalian = {{italiano}{it\adddot}}, - editor = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, - editors = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, - backrefpage = {{Citato a pagina}{Citato a \bibstring{page}\adddot}}, - backrefpages = {{Citato alle pagine}{Citato alle \bibstring{pages}\adddot}}, + editor = {{a cura di}{a cura di}}, + editors = {{a cura di}{a cura di}}, + reviewof = {{recensione di}{recensione di}}, + byreviser = {{revisione di}{revisione di}}, + backrefpage = {{Citato a pagina}{Citato a \bibsstring{page}\adddot}}, + backrefpages = {{Citato alle pagine}{Citato alle \bibsstring{pages}\adddot}}, pages = {{pagine}{\iftoggle{bbx:classical}{pp\adddot}{p\adddot}}}, columns = {{colonne}{\iftoggle{bbx:classical}{coll\adddot}{col\adddot}}}, lines = {{righe}{\iftoggle{bbx:classical}{rr\adddot}{r\adddot}}}, @@ -48,19 +50,16 @@ sections = {{sezioni}{\iftoggle{bbx:classical}{sezz\adddot}{sez\adddot}}}, paragraphs = {{paragrafi}{\iftoggle{bbx:classical}{parr\adddot}{par\adddot}}}, volumes = {{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol\adddot}}}, - withcommentator = {{con commenti di}{con comm\adddot\addabbrvspace di}}, + withcommentator = {{commenti di}{commenti di}}, withannotator = {{annotazioni di}{annotazioni di}}, withintroduction = {{introduzione di}{introduzione di}}, withforeword = {{prefazione di}{prefazione di}}, withafterword = {{postfazione di}{postfazione di}}, - reprintas = {{ristampato}{rist\adddot}}, translationof = {{traduzione di}{trad\adddotspace di}}, - translationas = {{traduzione italiana}{trad\adddotspace it\adddot}}, - reviewof = {{Recensione di}{Recensione di}}, - byreviser = {{revisione di}{revisione di}} + translationas = {{traduzione italiana}{trad\adddotspace it\adddot}} } %% -%% Copyright 2009-2016 by Ivan Valbusa +%% Copyright 2009-2017 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN 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 e38ca80464a..1e366e88c42 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx @@ -7,13 +7,14 @@ %% biblatex-philosophy.dtx (with options: `classic-bbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2016 Ivan Valbusa +%% Copyright (C) 2009-2017 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-classic.bbx} - [2016/11/26 v1.9 A set of styles for biblatex] + [2017/02/16 v1.9.1 A set of styles for biblatex] + @@ -223,7 +224,7 @@ \togglefalse{bbx:nodate}% }{}}% %% -%% Copyright 2009-2016 by Ivan Valbusa +%% Copyright 2009-2017 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN 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 50ab53f5595..ee35ebba936 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx @@ -7,13 +7,14 @@ %% biblatex-philosophy.dtx (with options: `classic-cbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2016 Ivan Valbusa +%% Copyright (C) 2009-2017 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-classic.cbx} - [2016/11/26 v1.9 A set of styles for biblatex] + [2017/02/16 v1.9.1 A set of styles for biblatex] + @@ -167,11 +168,9 @@ \iffieldundef{shorthand}% {\usebibmacro{cite:noshorthand}}% {\iftoggle{cbx:shorthandintro}% - {% - \ifciteseen{\usebibmacro{cite:shorthand}}% + {\ifciteseen{\usebibmacro{cite:shorthand}}% {\usebibmacro{cite:noshorthand}% - \usebibmacro{shorthandintro}}% - }% + \usebibmacro{shorthandintro}}}% {\usebibmacro{cite:shorthand}}% \usebibmacro{cite:reinit:AY}}% \setunit{\multicitedelim}} @@ -358,7 +357,7 @@ {\multicitedelim} {\usebibmacro{postnote}} %% -%% Copyright 2009-2016 by Ivan Valbusa +%% Copyright 2009-2017 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN 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 b65be62c1c7..1b7ab9d5345 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx @@ -7,13 +7,14 @@ %% biblatex-philosophy.dtx (with options: `modern-bbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2016 Ivan Valbusa +%% Copyright (C) 2009-2017 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-modern.bbx} - [2016/11/26 v1.9 A set of styles for biblatex] + [2017/02/16 v1.9.1 A set of styles for biblatex] + @@ -225,7 +226,7 @@ {\printfield{label}}}% }{}}% %% -%% Copyright 2009-2016 by Ivan Valbusa +%% Copyright 2009-2017 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN 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 c004652ae19..4399ae80aee 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx @@ -7,13 +7,14 @@ %% biblatex-philosophy.dtx (with options: `modern-cbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2016 Ivan Valbusa +%% Copyright (C) 2009-2017 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-modern.cbx} - [2016/11/26 v1.9 A set of styles for biblatex] + [2017/02/16 v1.9.1 A set of styles for biblatex] + @@ -28,7 +29,7 @@ {\multicitedelim}% {\usebibmacro{postnote}}% %% -%% Copyright 2009-2016 by Ivan Valbusa +%% Copyright 2009-2017 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN 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 f6251f95946..e81084caa64 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -7,17 +7,24 @@ %% biblatex-philosophy.dtx (with options: `standard-bbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2016 Ivan Valbusa +%% Copyright (C) 2009-2017 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-standard.bbx} - [2016/11/26 v1.9 A set of styles for biblatex] + [2017/02/16 v1.9.1 A set of styles for biblatex] + +\def\optionerror#1{% +\ClassError{biblatex-philosophy} +{\MessageBreak**** Unknown value for '#1' option} +{\MessageBreak**** Unknown value for '#1' option} +} + \RequireBiber[3] \RequireBibliographyStyle{standard} \DeclareLanguageMapping{italian}{italian-philosophy} @@ -30,7 +37,6 @@ \newtoggle{bbx:inbeforejournal} \newtoggle{bbx:classical} \newtoggle{bbx:lowscauthors} - \newtoggle{cbx:shorthandintro} \DeclareBibliographyOption{annotation}[true]{% @@ -47,7 +53,6 @@ \settoggle{bbx:classical}{#1}} \DeclareBibliographyOption{lowscauthors}[true]{% \settoggle{bbx:lowscauthors}{#1}} - \DeclareBibliographyOption{shorthandintro}[true]{% \settoggle{cbx:shorthandintro}{#1}} @@ -150,6 +155,7 @@ \renewcommand*{\newunitpunct}{\addcomma\space} \renewcommand*{\subtitlepunct}{\addperiod\space} \renewcommand*{\intitlepunct}{\nopunct\addspace} +\renewcommand*{\relatedpunct}{\addsemicolon\space} \newcommand*{\volnumpunct}{\addcomma\space} \newrobustcmd*{\mkpureparens}[1]{% \begingroup @@ -157,6 +163,12 @@ \blx@setsfcodes \blx@postpunct(#1\blx@postpunct)\midsentence% \endgroup} +\newrobustcmd*{\mkpurebrackets}[1]{% +\begingroup +\blx@blxinit +\blx@setsfcodes +\blx@postpunct[#1\blx@postpunct]\midsentence% +\endgroup} \renewbibmacro*{citeindex}{% \ifciteindex{\indexnames{labelname}}{}}% \renewbibmacro*{bibindex}{% @@ -181,8 +193,8 @@ \expandafter{\romannumeral#1}% \endgroup} \DeclareFieldFormat[bookinbook,thesis]{title}{\mkbibemph{#1}} -\DeclareFieldFormat[review]{title}{\bibstring{reviewof}\addspace#1} -\DeclareFieldFormat[review]{citetitle}{\bibstring{reviewof}\addspace#1} +\DeclareFieldFormat[review]{title}{\bibcpstring{reviewof}\addspace#1} +\DeclareFieldFormat[review]{citetitle}{\bibcpstring{reviewof}\addspace#1} \DeclareFieldFormat[inreference,article]{title}{\mkbibquote{#1}} \DeclareFieldFormat[bookinbook,thesis]{citetitle}{\mkbibemph{#1}} \DeclareFieldFormat{origtitle}{\mkbibemph{#1}} @@ -194,15 +206,9 @@ \DeclareFieldFormat{url}{\url{#1}} \DeclareFieldFormat{annotation}{\annotationfont #1} \DeclareFieldFormat{library}{\libraryfont #1} -\DeclareFieldFormat{backrefparens}{\mkpureparens{#1}} \DeclareFieldFormat{pureparens}{\mkpureparens{#1}} - -\def\optionerror#1{% -\ClassError{biblatex-philosophy} - {\MessageBreak**** Unknown value for '#1' option} - {\MessageBreak**** Unknown value for '#1' option} -} - +\DeclareFieldFormat{editortype}{\mkpureparens{#1}} +\DeclareFieldFormat{backrefparens}{\mkpureparens{#1}} \DeclareFieldFormat{volume}{% \bibstring{volume}~% \ifinteger{#1}{% @@ -214,7 +220,6 @@ {\textsc{\Rn{#1}}}% {\ifdefstring{\bbx@volumeformat}{roman}% {\Rn{#1}}{\optionerror{volumeformat}}}}}}{#1}} - \DeclareFieldFormat[article]{volume}{% \ifdefstring{\bbx@volnumformat}{strings} {\bibstring{volume}~}% @@ -228,7 +233,6 @@ {\textsc{\Rn{#1}}}% {\ifdefstring{\bbx@volumeformat}{roman}% {\Rn{#1}}{\optionerror{volumeformat}}}}}}{#1}} - \DeclareFieldFormat*{number}{% \ifdefstring{\bbx@volnumformat}{strings}{% \bibstring{number}~#1}{#1}} @@ -251,15 +255,17 @@ {\MessageBreak**** Option 'editionformat=superscript' available only for philosophy-verbose style} {\MessageBreak**** Option 'editionformat=superscript' - available only for philosophy-verbose style} -}{}}}}}}{#1}}%\isdot?? + available only for philosophy-verbose style}}{}}}}}}{#1}}%\isdot?? \DeclareFieldFormat{related}{% \ifdefstring{\bbx@relatedformat}{parens}% {\mkpureparens{#1}}% {\ifdefstring{\bbx@relatedformat}{brackets}% - {\mkbibbrackets{#1}}% + {\mkpurebrackets{#1}}% {\ifdefstring{\bbx@relatedformat}{semicolon}% {#1}{\optionerror{relatedformat}}}}}% +\DeclareFieldAlias{related:origpubin}{related} +\DeclareFieldAlias{related:origpubas}{related} +\DeclareFieldFormat{relatedstring:default}{#1\addspace} \newbibmacro*{origpublisher+origlocation+origdate}{% \ifdefstring{\bbx@publocformat}{loccolonpub} {\usebibmacro{origloccolonpub}\setunit{\bibpagespunct}% @@ -425,7 +431,7 @@ {} {\printtext[journaltitle]{% \printfield[titlecase]{journaltitle}% - \midsentence%MOD############ + \midsentence% \setunit{\subtitlepunct}% \printfield[titlecase]{journalsubtitle}}}} @@ -434,7 +440,7 @@ {} {\printtext[title]{% \printfield[titlecase]{title}% - \midsentence%MOD############# + \midsentence% \setunit{\subtitlepunct}% \printfield[titlecase]{subtitle}}}} @@ -657,7 +663,6 @@ \renewbibmacro*{author}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{editor}{\usebibmacro{bbx:savehash}}% \renewcommand*{\labelnamepunct}{}}% - \DeclareCiteCommand{\relatedcite} {}% {\usedriver @@ -670,25 +675,28 @@ {\thefield{entrytype}}}% {}% {}% - \renewbibmacro*{related:default}[1]{% - \togglefalse{cbx:scauthorscite}% - \togglefalse{bbx:annotation}% -\iffieldundef{relatedstring}% - {\bibstring{translationas}\space}% - {\printtext{\addspace}}% - \ifentrytype{article}{}{%horrible trick - \renewcommand*{\mkpureparens}{\unspace\addsemicolon\space}% - \renewcommand*{\mkbibbrackets}{\unspace\addsemicolon\space}}% - \relatedcite{\thefield{related}}} +\togglefalse{cbx:scauthorscite}% +\togglefalse{bbx:annotation}% +\ifboolexpr{ +test {\iffieldundef{relatedtype}} +and +test {\iffieldundef{relatedstring}} +} +{\printtext{\bibstring{translationas}}}{}% +\printtext{\addspace}% +\relatedcite{\thefield{related}}} +\renewbibmacro*{begrelatedloop}{% + \renewrobustcmd*{\mkpureparens}{\relatedpunct}% + \renewrobustcmd*{\mkpurebrackets}{\relatedpunct}} +\newbibmacro*{phil:related}{% + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\relatedpunct}}% + {\setunit{\addspace}}% + \usebibmacro{related:init}% + \usebibmacro{related}}{}} \DeclareBibliographyDriver{article}{% -\renewbibmacro*{related:default}[1]{% - \togglefalse{cbx:scauthorscite}% - \togglefalse{bbx:annotation}% -\iffieldundef{relatedstring}% - {\bibstring{translationas}\space}% - {\setunit{\bibstring{translationas}\space}}% - \relatedcite{\thefield{related}}}% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% @@ -716,14 +724,9 @@ \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock - \usebibmacro{addendum+pubstate:article-inbook-incoll}%MOD + \usebibmacro{addendum+pubstate:article-inbook-incoll}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}{\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -768,13 +771,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -808,13 +805,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -857,13 +848,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -922,13 +907,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate:article-inbook-incoll}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -955,7 +934,7 @@ \newunit\newblock \usebibmacro{xrefdata}}} - \newbibmacro*{incollection:full}{% +\newbibmacro*{incollection:full}{% \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -985,13 +964,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate:article-inbook-incoll}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1050,13 +1023,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate:article-inbook-incoll}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1100,13 +1067,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1138,13 +1099,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1178,13 +1133,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1219,13 +1168,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1251,13 +1194,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1302,13 +1239,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1346,13 +1277,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1386,13 +1311,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1420,23 +1339,19 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareBibliographyDriver{set}{% - \protect\PackageWarningNoLine{biblatex-philosophy}{% - \MessageBreak - Entry type @set is not supported\MessageBreak - by the 'biblatex-philosophy' styles.\MessageBreak - All the @set entries will be ignored}} +\savefield{annotation}{\@phil@nnote}% +\clearfield{annotation}% +\entryset{}{}% +\newunit\newblock +\restorefield{annotation}{\@phil@nnote}% +\usebibmacro{pageref}% +\usebibmacro{finentry}} \renewbibmacro*{bybookauthor}{% \ifnamesequal{author}{bookauthor}% @@ -1476,13 +1391,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate:article-inbook-incoll}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1501,13 +1410,7 @@ \newunit\newblock \usebibmacro{doi+eprint+url}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1604,13 +1507,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate:juris}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1640,7 +1537,7 @@ \DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court} %% -%% Copyright 2009-2016 by Ivan Valbusa +%% Copyright 2009-2017 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN 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 172f11c16ae..a08676efcb2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx @@ -7,13 +7,14 @@ %% biblatex-philosophy.dtx (with options: `verbose-bbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2016 Ivan Valbusa +%% Copyright (C) 2009-2017 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-verbose.bbx} - [2016/11/26 v1.9 A set of styles for biblatex] + [2017/02/16 v1.9.1 A set of styles for biblatex] + @@ -82,7 +83,7 @@ {\usebibmacro{bbx:dashcheck}% {\bibnamedash}% {\printnames{editor}% -\setunit{\addspace}% #MOD# +\setunit{\addspace}% \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \clearname{editor}}% @@ -178,13 +179,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -228,13 +223,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -272,13 +261,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate:article-inbook-incoll}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -314,13 +297,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate:article-inbook-incoll}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -365,13 +342,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -417,13 +388,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% } @@ -466,13 +431,7 @@ \newunit\newblock \usebibmacro{addendum+pubstate}% \newblock - \iftoggle{bbx:related} - {\ifdefstring{\bbx@relatedformat}{semicolon}% - {\setunit{\addsemicolon\space}}% - {\setunit{\unspace\space}}%horrible trick - \usebibmacro{related:init}% - \usebibmacro{related}}% - {}% + \usebibmacro{phil:related}% \newunit\newblock \usebibmacro{pageref}% } @@ -509,7 +468,7 @@ {}% {}% %% -%% Copyright 2009-2016 by Ivan Valbusa +%% Copyright 2009-2017 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN 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 7291b887066..080b30fd8d5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx @@ -7,13 +7,14 @@ %% biblatex-philosophy.dtx (with options: `verbose-cbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2016 Ivan Valbusa +%% Copyright (C) 2009-2017 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-verbose.cbx} - [2016/11/26 v1.9 A set of styles for biblatex] + [2017/02/16 v1.9.1 A set of styles for biblatex] + @@ -141,7 +142,6 @@ {\setunit{\addspace\midsentence}}}% \bibstring{cited}}} - \renewbibmacro*{cite:full}{%OK \iftoggle{cbx:shorthandintro}{% \usebibmacro{cite:full:citepages}% @@ -190,7 +190,7 @@ {\multicitedelim} {\usebibmacro{postnote}} %% -%% Copyright 2009-2016 by Ivan Valbusa +%% Copyright 2009-2017 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN 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 c054d24e333..99af7c1e057 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx @@ -7,13 +7,14 @@ %% biblatex-philosophy.dtx (with options: `spanish-lbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2016 Ivan Valbusa +%% Copyright (C) 2009-2017 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{spanish-philosophy.lbx} - [2016/11/26 v1.9 A set of styles for biblatex] + [2017/02/16 v1.9.1 A set of styles for biblatex] + @@ -29,41 +30,35 @@ \DeclareBibliographyStrings{% inherit = {spanish}, + origed = {{edici\'{o}n original}{ed\adddot orig\adddot}}, cited = {{cit\adddot}{cit\adddot}}, opcit = {{op\adddot cit\adddot}{op\adddot cit\adddot}}, ibidem = {{ivi}{ivi}}, loccit = {{ibidem}{ibidem}}, - origed = {{edici\'{o}n original}{ed\adddot orig\adddot}}, langspanish = {{espa\~{n}ol}{es\adddot}}, - editor = {{\mkpureparens{ed\adddot}}{\mkpureparens{ed\adddot}}}, - editors = {{\mkpureparens{ed\adddot}}{\mkpureparens{eds\adddot}}}, - backrefpage = {{Citado en la p\'{a}gina} - {Citado en la \bibstring{page}\adddot}}, %%FIXME: Maiuscola iniziale? - backrefpages = {{Citado en las p\'{a}ginas} - {Citado en las \bibstring{pages}\adddot}}, %%FIXME: Maiuscola iniziale? - pages = {{p\'aginas}{\iftoggle{bbx:classical} - {p\'ags\adddot}{p\'ag\adddot}}}, + editor = {{ed\adddot}{ed\adddot}}, + editors = {{ed\adddot}{eds\adddot}}, + byreviser = {{revisi\'{o}n de}{rev\adddotspace de}}, + reviewof = {{Rese\~{n}a de}{Rese\~{n}a de}},%%FIXME: Maiuscola iniziale? + backrefpage = {{Citado en la p\'{a}gina}{Citado en la \bibstring{page}\adddot}},%%FIXME: Maiuscola iniziale? + backrefpages = {{Citado en las p\'{a}ginas}{Citado en las \bibstring{pages}\adddot}},%%FIXME: Maiuscola iniziale? + pages = {{p\'aginas}{\iftoggle{bbx:classical}{p\'ags\adddot}{p\'ag\adddot}}}, columns = {{columnas}{\iftoggle{bbx:classical}{cols\adddot}{col\adddot}}}, lines = {{l\'ineas}{\iftoggle{bbx:classical}{ll\adddot}{l\adddot}}}, verses = {{versos}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}}, - volumes = {{vol\'uumenes} - {\iftoggle{bbx:classical}{vols\adddot}{vol\adddot}}}, - withcommentator = {{comentarios de}{com\adddot\addabbrvspace de}}, + volumes = {{vol\'uumenes}{\iftoggle{bbx:classical}{vols\adddot}{vol\adddot}}}, + withcommentator = {{comentarios de}{com\adddotspace de}}, withannotator = {{notas de}{notas de}}, withintroduction = {{introducci\'{o}n de}{intr\adddotspace de}}, withforeword = {{prefacio de}{pref\adddotspace de}}, withafterword = {{postfacio de}{postfacio de}}, - reprintas = {{reimpresi\'{o}n}{reimp\adddot}}, translationof = {{traducci\'{o}n al espa\~{n}ol de}{trad\adddotspace de}}, translationas = {{traducido al espa\~{n}ol como}{trad\adddotspace es\adddot}}, - reviewof = {{Rese\~{n}a de}{Rese\~{n}a de}}, %%FIXME: Maiuscola iniziale? section = {{secci\'{o}n}{sec\adddot}}, - sections = {{secciones}{\iftoggle{bbx:classical} - {secs\adddot}{sec\adddot}}}, - byreviser = {{revisi\'{o}n de}{rev\adddotspace de}} + sections = {{secciones}{\iftoggle{bbx:classical}{secs\adddot}{sec\adddot}}} } %% -%% Copyright 2009-2016 by Ivan Valbusa +%% Copyright 2009-2017 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN -- cgit v1.2.3