summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-21 00:26:41 +0000
committerKarl Berry <karl@freefriends.org>2017-02-21 00:26:41 +0000
commit44062de51dd65a536fc28548bf1f399c89fe6780 (patch)
treeb3c4b3a244841aad1f8b5b7bb41dcd9a29e1f94e
parent72b4234f231197493e28472f59ce76b0c8847a7b (diff)
biblatex-philosophy (20feb17)
git-svn-id: svn://tug.org/texlive/trunk@43274 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdfbin775076 -> 766904 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zipbin11369 -> 11384 bytes
-rw-r--r--Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.bib5
-rw-r--r--Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx518
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx17
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx29
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx7
-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.bbx7
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx7
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx255
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx65
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx35
14 files changed, 295 insertions, 671 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
index dfcd0c044fe..97cc5307d32 100644
--- a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
index d7a10ce8695..997dbac4fb6 100644
--- a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
+++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
Binary files differ
diff --git a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.bib b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.bib
index 6876be04eec..18a75ec4655 100644
--- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.bib
+++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.bib
@@ -7,7 +7,7 @@
%% biblatex-philosophy.dtx (with options: `bib')
%% ______________________________________________________
%% The biblatex-philosophy package
-%% Copyright (C) 2009-2016 Ivan Valbusa
+%% Copyright (C) 2009-2017 Ivan Valbusa
%% All rights reserved
%%
%% License information appended
@@ -17,6 +17,7 @@
+
@INCOLLECTION{corrocher:2009,
author = {Roberto Corrocher},
title = {Riflessioni sull'uomo di fronte a nuove sfide},
@@ -884,7 +885,7 @@ for the citations.},
urldate = {2012-01-15}
}
%%
-%% 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/source/latex/biblatex-philosophy/biblatex-philosophy.dtx b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
index 864f8232cd2..cf29288073b 100644
--- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
+++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
@@ -6,7 +6,7 @@
\preamble
______________________________________________________
The biblatex-philosophy package
- Copyright (C) 2009-2016 Ivan Valbusa
+ Copyright (C) 2009-2017 Ivan Valbusa
All rights reserved
License information appended
@@ -14,7 +14,7 @@
\endpreamble
\postamble
- 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
@@ -69,7 +69,7 @@
\endgroup
%</internal>
%
-% Copyright (C) 2009-2016 by Ivan Valbusa
+% Copyright (C) 2009-2017 by Ivan Valbusa
% <ivan dot valbusa at univr dot it>
% -------------------------------------------------------
%
@@ -98,7 +98,7 @@
%<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>
- [2016/11/26 v1.9 A set of styles for biblatex]
+ [2017/02/16 v1.9.1 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}
@@ -121,14 +121,12 @@
\usepackage{btxdockit}
% bibliography
\usepackage{csquotes}
-\usepackage[style=philosophy-modern,
- backend=biber,annotation=true]{biblatex}
+\usepackage[style=philosophy-modern,annotation=true]{biblatex}
\addbibresource{biblatex-philosophy.bib}
% layout
\setcounter{tocdepth}{3}
\usepackage{geometry}
\geometry{paperwidth=17cm,paperheight=24cm,margin=1.4cm,top=2cm,bottom=2cm,headheight=15pt,ignoreall,heightrounded}
-
\usepackage{sectsty}
\allsectionsfont{\sffamily}
\usepackage{fancyhdr}
@@ -231,13 +229,11 @@
\setlength{\columnsep}{1cm}
{\centering
\section*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}%
- }
+ \@mkboth{\contentsname}{\contentsname}}
\thispagestyle{empty}
\begin{multicols}{2}
\@starttoc{toc}%
- \end{multicols}
- }
+ \end{multicols}}
\makeatother
\usepackage{hyperref}
@@ -260,7 +256,7 @@
%</driver>
% \fi
%
-% \CheckSum{4091}
+% \CheckSum{3738}
%
% \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
@@ -278,6 +274,7 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
+% \changes{v1.9.1}{2017/02/16}{Redefined macros for the related mechanism. 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.}
% \changes{v1.8}{2016/06/16}{Maintenance release. Corrected an incompatibility with \opt{scauthors} option.}
% \changes{v1.7}{2016/06/10}{Maintenance release. Updated documentation.}
@@ -410,18 +407,19 @@
%\begin{ttquote}
%\cmd{usepackage}\oar{italian}\ar{babel}\\
%\cmd{usepackage}\oar{style=italian}\ar{csquotes}\\
-%\cmd{usepackage}\oar{style=philosophy-\meta{style},backend=biber}\ar{biblatex}\\
+%\cmd{usepackage}\oar{style=philosophy-\meta{style}}\ar{biblatex}\\
%\mbox{}\quad \cmd{addbibresource}\ar{\meta{bibfile}.bib}
%\end{ttquote}
%Replace \meta{style} with \sty{classic}, \sty{modern} or \sty{verbose}, and \meta{bibfile} with the name of your bibliography file (``.bib'' must be declared). See the example files in the \texttt{texmf-dist/doc/latex/ biblatex-philosophy/examples.zip} folder.
+
+%\textbf{Warning!} Since version 1.6 these styles \emph{require} Biber as
+% backend bibliography processor \parencite[see][]{kime:biber}.
%
%To uniform the style of quotation marks in multilingual bibliographies typeset using the \opt{babel=other} package option, you can use the \cmd{DeclareQuoteAlias} command:
%\begin{verbatim}
%\DeclareQuoteAlias{italian}{german}
%\end{verbatim}
%
-%\paragraph{Warning!} Since version 1.6 the package requires Biber \parencite[see][]{kime:biber} as backend bibliography processor so you have to set it properly in the preferences of the editor.
-%
%
%\section{The styles}\label{sec:introduction}
%
@@ -716,7 +714,7 @@
% \end{valuelist}
%
%\boolitem[false]{scauthors}
-%Prints the names (author, editor, etc.) at the beginning of the entry in small caps shape, both in citations and in bibliography:
+%Prints the names (author, editor, etc.) at the beginning of the entry in small caps shape, both in citations and in bibliography.
%
%If you want \emph{all} the names (translator, commentator, etc.) in small caps, you have to redefine the \cmd{mkbibname...} commands (see \sty{biblatex} documentation for details).
%
@@ -992,22 +990,22 @@
%\begin{fieldlist}
%
%\fielditem{origtitle}{literal}\mbox{}\\[-9ex]
-%\fielditem{transtitle}{literal \file{biber} only}
+%\fielditem{transtitle}{literal}
%
%The title of the translation/original edition.
%
%\fielditem{origpublisher}{list}\mbox{}\\[-9ex]
-%\fielditem{transpublisher}{list \file{biber} only}
+%\fielditem{transpublisher}{list}
%
%The publisher of the translation/original edition.
%
%\fielditem{origlocation}{list}\mbox{}\\[-9ex]
-%\fielditem{translocation}{list \file{biber} only}
+%\fielditem{translocation}{list}
%
%The location of the translation/original edition.
%
%\fielditem{origdate}{range}\mbox{}\\[-9ex]
-%\fielditem{transdate}{range \file{biber} only}
+%\fielditem{transdate}{range}
%
%The publication date of the translation/original edition.
@@ -1018,8 +1016,8 @@
%^^A \fielditem{reprinttitle}{literal (Bib\TeX only) -- Deprecated --}
%
%\fielditem{usera}{literal}\mbox{}\\[-9ex]
-%\fielditem{origbooktitle}{literal \file{biber} only}\mbox{}\\[-9ex]
-%\fielditem{transbooktitle}{literal \file{biber} only}
+%\fielditem{origbooktitle}{literal}\mbox{}\\[-9ex]
+%\fielditem{transbooktitle}{literal}
%
%The title of the \bibtype{collection}/\bibtype{book}/\bibtype{mvbook} in which the translation/original edition of an \bibtype{article} (\bibtype{inbook} or \bibtype{incollection}) is published.
%
@@ -1030,8 +1028,8 @@
%^^A \end{bibexample}}
%
%\fielditem{userb}{literal}\mbox{}\\[-9ex]
-%\fielditem{orignote}{literal \file{biber} only}\mbox{}\\[-9ex]
-%\fielditem{transnote}{literal \file{biber} only}
+%\fielditem{orignote}{literal}\mbox{}\\[-9ex]
+%\fielditem{transnote}{literal}
%
%This field is printed after the \bibfield{origtitle/transtitle}. It is meat for secondary informations about the translation/original edition, such as the name of editors, translators, etc.:
%^^A \begin{bibexample}
@@ -1039,8 +1037,8 @@
%^^A \end{bibexample}
%
%\fielditem{userc}{literal}\mbox{}\\[-9ex]
-%\fielditem{origpages}{literal \file{biber} only}\mbox{}\\[-9ex]
-%\fielditem{transpages}{literal \file{biber} only}
+%\fielditem{origpages}{literal}\mbox{}\\[-9ex]
+%\fielditem{transpages}{literal}
%
%This field is printed at the end of the entry, after the \bibfield{origdate/transdate} field. It is meant for the page range of the translation/original edition or other useful informations.
%In the first case string ``p.'' is omitted.
@@ -1099,6 +1097,12 @@
% \fi
%
% \begin{macrocode}
+\def\optionerror#1{%
+ \ClassError{biblatex-philosophy}
+ {\MessageBreak**** Unknown value for '#1' option}
+ {\MessageBreak**** Unknown value for '#1' option}
+}
+
\RequireBiber[3]
\RequireBibliographyStyle{standard}
% \end{macrocode}
@@ -1117,7 +1121,6 @@
\newtoggle{bbx:inbeforejournal}
\newtoggle{bbx:classical}
\newtoggle{bbx:lowscauthors}
-
\newtoggle{cbx:shorthandintro}
\DeclareBibliographyOption{annotation}[true]{%
@@ -1134,10 +1137,8 @@
\settoggle{bbx:classical}{#1}}
\DeclareBibliographyOption{lowscauthors}[true]{%
\settoggle{bbx:lowscauthors}{#1}}
-
\DeclareBibliographyOption{shorthandintro}[true]{%
\settoggle{cbx:shorthandintro}{#1}}
-
\newcommand{\bbx@publocformat}{}
\newcommand{\bbx@volnumformat}{}
@@ -1209,22 +1210,6 @@
{}}
\AtBeginBibliography{%
\iftoggle{bbx:scauthorsbib}{%
-%\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}{%
\let\mkbibnamefamily\mkbibsc%
\let\mkbibnamegiven\mkbibsc%
@@ -1268,6 +1253,7 @@
\renewcommand*{\newunitpunct}{\addcomma\space}
\renewcommand*{\subtitlepunct}{\addperiod\space}
\renewcommand*{\intitlepunct}{\nopunct\addspace}
+\renewcommand*{\relatedpunct}{\addsemicolon\space}
\newcommand*{\volnumpunct}{\addcomma\space}
% \end{macrocode}
% We have to define a new internal command
@@ -1280,6 +1266,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}
% \end{macrocode}
% \paragraph{Indexing}
% \begin{macrocode}
@@ -1313,8 +1305,8 @@
% \subsubsection{Fields formats}
% \begin{macrocode}
\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}}
@@ -1326,15 +1318,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}{%
@@ -1346,7 +1332,6 @@
{\textsc{\Rn{#1}}}%
{\ifdefstring{\bbx@volumeformat}{roman}%
{\Rn{#1}}{\optionerror{volumeformat}}}}}}{#1}}
-
\DeclareFieldFormat[article]{volume}{%
\ifdefstring{\bbx@volnumformat}{strings}
{\bibstring{volume}~}%
@@ -1360,7 +1345,6 @@
{\textsc{\Rn{#1}}}%
{\ifdefstring{\bbx@volumeformat}{roman}%
{\Rn{#1}}{\optionerror{volumeformat}}}}}}{#1}}
-
\DeclareFieldFormat*{number}{%
\ifdefstring{\bbx@volnumformat}{strings}{%
\bibstring{number}~#1}{#1}}
@@ -1383,15 +1367,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}
% \end{macrocode}
% \subsubsection{The \opt{orig-} macros (deprecated)}
% These macros are provided for backward compatibility.
@@ -1566,7 +1552,7 @@
{}
{\printtext[journaltitle]{%
\printfield[titlecase]{journaltitle}%
- \midsentence%MOD############
+ \midsentence%
\setunit{\subtitlepunct}%
\printfield[titlecase]{journalsubtitle}}}}
@@ -1575,7 +1561,7 @@
{}
{\printtext[title]{%
\printfield[titlecase]{title}%
- \midsentence%MOD#############
+ \midsentence%
\setunit{\subtitlepunct}%
\printfield[titlecase]{subtitle}}}}
@@ -1809,7 +1795,6 @@
\renewbibmacro*{author}{\usebibmacro{bbx:savehash}}%
\renewbibmacro*{editor}{\usebibmacro{bbx:savehash}}%
\renewcommand*{\labelnamepunct}{}}%
-
\DeclareCiteCommand{\relatedcite}
{}%
{\usedriver
@@ -1822,28 +1807,37 @@
{\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}}}
+% \end{macrocode}
+% We redefine the \texttt{begrelatedloop} macro to avoid nested parentheses in cascading related entries:
+% \begin{macrocode}
+\renewbibmacro*{begrelatedloop}{%
+ \renewrobustcmd*{\mkpureparens}{\relatedpunct}%
+ \renewrobustcmd*{\mkpurebrackets}{\relatedpunct}}
+% \end{macrocode}
+% This macro tests the value of the \opt{relatedformat} option. If it sets to \opt{semicolon} the macro adds \cmd{relatedpunct} (i.e. a semicolon plus a space). Otherwise it adds a simple space.
+% \begin{macrocode}
+\newbibmacro*{phil:related}{%
+ \iftoggle{bbx:related}
+ {\ifdefstring{\bbx@relatedformat}{semicolon}%
+ {\setunit{\relatedpunct}}%
+ {\setunit{\addspace}}%
+ \usebibmacro{related:init}%
+ \usebibmacro{related}}{}}
% \end{macrocode}
% \subsubsection{Bibliography drivers}
% \begin{macrocode}
\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}%
@@ -1871,14 +1865,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}}
@@ -1923,17 +1912,11 @@
\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{booklet}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -1963,13 +1946,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}}
@@ -2012,13 +1989,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}}
@@ -2077,13 +2048,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}}
@@ -2110,7 +2075,7 @@
\newunit\newblock
\usebibmacro{xrefdata}}}
- \newbibmacro*{incollection:full}{%
+\newbibmacro*{incollection:full}{%
\usebibmacro{maintitle+booktitle}%
\newunit\newblock
\usebibmacro{byeditor+others}%
@@ -2140,13 +2105,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}}
@@ -2205,13 +2164,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}}
@@ -2255,13 +2208,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}}
@@ -2293,13 +2240,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}}
@@ -2333,13 +2274,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}}
@@ -2374,13 +2309,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}}
@@ -2406,13 +2335,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}}
@@ -2457,13 +2380,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}}
@@ -2501,13 +2418,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}}
@@ -2541,13 +2452,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}}
@@ -2575,25 +2480,21 @@
\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}}
-
-% ripristina ordine nome cognome nelle voci inbook:full
+ \savefield{annotation}{\@phil@nnote}%
+ \clearfield{annotation}%
+ \entryset{}{}%
+ \newunit\newblock
+ \restorefield{annotation}{\@phil@nnote}%
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
+
+% reset order name/surname in the inbook:full entries
\renewbibmacro*{bybookauthor}{%
\ifnamesequal{author}{bookauthor}%
{}%
@@ -2613,11 +2514,6 @@
\usebibmacro{byeditor+others}%
\newunit\newblock
\printfield{edition}%
-% \newunit
-% \iffieldundef{maintitle}
-% {\printfield{volume}%
-% \printfield{part}}
-% {}%
\newunit
\printfield{volumes}%
\newunit\newblock
@@ -2637,13 +2533,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}}
@@ -2662,13 +2552,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}}
@@ -2778,13 +2662,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}}
@@ -3398,7 +3276,7 @@
{\usebibmacro{bbx:dashcheck}%
{\bibnamedash}%
{\printnames{editor}%
-\setunit{\addspace}% #MOD#
+\setunit{\addspace}%
\usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
\clearname{editor}}%
@@ -3497,13 +3375,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}}
@@ -3547,13 +3419,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}}
@@ -3591,13 +3457,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}}
@@ -3633,13 +3493,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}}
@@ -3685,13 +3539,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}}
@@ -3737,13 +3585,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}%
}
@@ -3786,13 +3628,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}%
}
@@ -3862,18 +3698,6 @@
\let\mkbibnameaffix\mkbibsc}%
{}}%
-%\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}{%
\nameparts{#1}%
\bibhyperref{\ifcase\value{uniquename}%
@@ -4010,11 +3834,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}}
@@ -4313,22 +4135,6 @@
\andmoredelim\bibstring[\mkibid]{andmore}}%
{}}%
\iftoggle{cbx:scauthorscite}{%
-%\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}{%
\iffootnote{%
\let\mkbibnamefamily\mkbibsc%
@@ -4363,16 +4169,6 @@
\fi
\usebibmacro{name:andothers}}%
}{}}%
-%\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}{%
\iffootnote{%
\let\mkbibnamefamily\mkbibsc%
@@ -4419,17 +4215,6 @@
{\setunit{\addspace\midsentence}}}%
\bibstring{cited}}}
-% \renewbibmacro*{cite:full}{%OK
-% \usebibmacro{cite:full:citepages}%
-% \global\toggletrue{cbx:fullcite}%
-% \printtext[bibhypertarget]{%
-% \usedriver
-% {\iftoggle{cbx:scauthorscite}{%
-% \DeclareNameAlias{sortname}{scdefault}}%
-% {\DeclareNameAlias{sortname}{default}}}%
-% {\thefield{entrytype}}}%
-% \usebibmacro{shorthandintro}}
-
\renewbibmacro*{cite:full}{%OK
\iftoggle{cbx:shorthandintro}{%
\usebibmacro{cite:full:citepages}%
@@ -4444,7 +4229,6 @@
{\usebibmacro{cite:shorthand}}}
-
\renewbibmacro*{cite:idem}{%
\iftoggle{cbx:scauthorscite}{%
\bibstring[\mkbibsc]{idem\thefield{gender}}}{%
@@ -4504,17 +4288,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}}},
@@ -4523,22 +4308,13 @@
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}},
-% reprintfrom = {{}{}}, % FIXME: missing
translationof = {{traduzione di}{trad\adddotspace di}},
- translationas = {{traduzione italiana}{trad\adddotspace it\adddot}},
-% translationfrom = {{}{}}, % FIXME: missing
- reviewof = {{Recensione di}{Recensione di}},
-% origpubas = {{}{}}, % FIXME: missing
-% origpubin = {{}{}}, % FIXME: missing
-% astitle = {{}{}}, % FIXME: missing
-% bypublisher = {{}{}}, % FIXME: missing
- byreviser = {{revisione di}{revisione di}}
+ translationas = {{traduzione italiana}{trad\adddotspace it\adddot}}
}
% \end{macrocode}
% \iffalse
@@ -4562,15 +4338,15 @@
\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}}
}
@@ -4584,9 +4360,9 @@
%<*spanish-lbx>
% \fi
% \begin{macrocode}
-%
-%^^A Thanks to Eduardo Villegas for these translations.
-%
+%
+% Thanks to Eduardo Villegas for these translations.
+%
\InheritBibliographyExtras{spanish}
\DeclareBibliographyExtras{%
@@ -4598,38 +4374,32 @@
\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}}}
}
% \end{macrocode}
% \iffalse
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