From 05a3ef202ad67cea59168d591f76ec3219e56aae Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 18 May 2016 21:59:03 +0000 Subject: biblatex-philosophy (18may16) git-svn-id: svn://tug.org/texlive/trunk@41245 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/biblatex-philosophy.pdf | Bin 773345 -> 770549 bytes .../doc/latex/biblatex-philosophy/examples.zip | Bin 11369 -> 11711 bytes .../doc/latex/biblatex-philosophy/test-modern.tex | 2 + .../doc/latex/biblatex-philosophy/test-verbose.tex | 39 +++-- .../biblatex-philosophy/biblatex-philosophy.bib | 21 ++- .../biblatex-philosophy/biblatex-philosophy.dtx | 164 +++++++++++---------- .../biblatex-philosophy/english-philosophy.lbx | 6 +- .../biblatex-philosophy/italian-philosophy.lbx | 6 +- .../biblatex-philosophy/philosophy-classic.bbx | 6 +- .../biblatex-philosophy/philosophy-classic.cbx | 22 +-- .../biblatex-philosophy/philosophy-modern.bbx | 6 +- .../biblatex-philosophy/philosophy-modern.cbx | 6 +- .../biblatex-philosophy/philosophy-standard.bbx | 32 ++-- .../biblatex-philosophy/philosophy-verbose.bbx | 6 +- .../biblatex-philosophy/philosophy-verbose.cbx | 35 +++-- .../biblatex-philosophy/spanish-philosophy.lbx | 6 +- 16 files changed, 193 insertions(+), 164 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 df96fd4c96e..2b222bcb006 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf and b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip index 2096a06e2d7..94091becee3 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip and b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip differ diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-modern.tex b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-modern.tex index 46647871145..7408679d20d 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-modern.tex +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-modern.tex @@ -51,4 +51,6 @@ Typeset a footnote using the same style of \cmd{textcite}.\footcitet[12-13]{eco: \printbibliography +\printbibliography[restoreclassic,type=book] + \end{document} diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-verbose.tex b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-verbose.tex index c8e5a97ceed..08c4b04b38a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-verbose.tex +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-verbose.tex @@ -1,26 +1,35 @@ -% !TEX TS-program = LuaLaTeX +% !TEX TS-program = pdfLaTeX % !TEX encoding = UTF-8 Unicode % !BIB TS-program = biber -\documentclass{article} +\documentclass[12pt,a4paper,twoside,openright,titlepage]{book} +\usepackage[norules,swapnames]{frontespizio} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} +\usepackage[english,italian]{babel} +\usepackage[style=italian]{csquotes} +\usepackage[style=philosophy-verbose,scauthors=true,scauthorscite=true,indexing=cite,backend=biber]{biblatex} + \addbibresource{Bibliografia.bib} +\usepackage{indentfirst} +\usepackage[a4paper,top=2.5cm,bottom=2.5cm,left=3cm,right=3cm,bindingoffset=5mm]{geometry} +\usepackage{url} +\usepackage{hyperref} +\usepackage{setspace} +\usepackage{blindtext} +\usepackage{epigraph} +\usepackage{emptypage} +\usepackage{makeidx} +\renewcommand{\textflush}{flushepinormal} +\DeclareIndexFieldFormat{indextitle}{}{}{} + +\defbibheading{primaria}{\subsection*{Bibliografia Primaria}} +\defbibheading{secondaria}{\subsection*{Bibliografia Secondaria}} + +\makeindex +\onehalfspacing -%\usepackage[italian]{babel} -\usepackage[style=italian]{csquotes} -\usepackage[% -%backend=biber, -classical=true, -style=philosophy-verbose, -publocformat=ssloccolonpub, -%commacit, -%annotation=true, -%hyperref, -%backref -]{biblatex} \addbibresource{philosophy-examples.bib}% -\usepackage{hyperref} \begin{document} 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 e0df79dd2e2..f2a01415c33 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-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended @@ -175,7 +175,7 @@ Modern Language Association (MLA)}, volumes = {12} } -@OTHER{descartes:oeuvres, +@mvbook{descartes:oeuvres, annote = {A critical multivolume edition}, author = {René Descartes}, date = {1897/}, @@ -341,7 +341,7 @@ of Judgment} only, not to the entire fifth volume}, xref = {kant:werke} } -@OTHER{kant:werke, +@mvbook{kant:werke, author = {Kant, Immanuel}, booktitle = {Kants Werke. Akademie Textausgabe}, date = {1968}, @@ -357,7 +357,7 @@ of Judgment} only, not to the entire fifth volume}, volumes = {9} } -@OTHER{knuth:ct, +@mvbook{knuth:ct, annotation = {A five-volume book cited as a whole. This is a \texttt{book} entry, note the \texttt{volumes} field}, author = {Knuth, Donald E.}, @@ -472,7 +472,7 @@ and \texttt{sortyear} fields}, volume = {E} } -@OTHER{comenio:oo, +@mvbook{comenio:oo, annote = {This author is known with his Latin name, given in the \texttt{nameaddon} field}, author = {Jan Amos Komensky}, @@ -617,9 +617,7 @@ in the \texttt{related} (biber 1.6 required)}, date-modified = {2013-03-15 16:46:51 +0100}, keywords = {esempio}, location = {Wien}, - owner = {Alex Arcozzi}, related = {popper-logik:ing}, - relatedstring = {trad. ingl.}, timestamp = {2012.04.25} } @@ -634,8 +632,8 @@ in the \texttt{related} (biber 1.6 required)}, date-modified = {2013-03-15 16:48:11 +0100}, keywords = {primaria,popper}, location = {London}, - owner = {Alex Arcozzi}, related = {popper-logik:ita}, + relatedstring={it. trans.}, timestamp = {2012.04.25} } @@ -650,7 +648,6 @@ in the \texttt{related} (biber 1.6 required)}, hyphenation = {italian}, keywords = {primaria,popper}, location = {Torino}, - owner = {Alex Arcozzi}, timestamp = {2012.04.25} } @@ -673,7 +670,7 @@ del concetto greco di filosofia''}, volume = {1} } -@OTHER{Spencer:1891, +@mvbook{Spencer:1891, annote = {A multivolume work}, author = {Herbert Spencer}, date = {1891}, @@ -685,7 +682,7 @@ del concetto greco di filosofia''}, volumes = {3} } -@OTHER{Spencer:1891vol2, +@book{Spencer:1891vol2, author = {Herbert Spencer}, date = {1891}, keywords = {esempio}, @@ -877,7 +874,7 @@ for the citations.}, urldate = {2012-01-15} } %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 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 3070f50d7dc..02e5bdef674 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-2015 Ivan Valbusa + Copyright (C) 2009-2016 Ivan Valbusa All rights reserved License information appended @@ -14,7 +14,7 @@ \endpreamble \postamble - Copyright 2009-2015 by Ivan Valbusa + Copyright 2009-2016 by Ivan Valbusa This program is provided under the terms of the LaTeX Project Public License distributed from CTAN @@ -69,7 +69,7 @@ \endgroup % % -% Copyright (C) 2009-2015 by Ivan Valbusa +% Copyright (C) 2009-2016 by Ivan Valbusa % % ------------------------------------------------------- % @@ -98,7 +98,7 @@ %\ProvidesFile{english-philosophy.lbx} %\ProvidesFile{spanish-philosophy.lbx} %<*standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx> - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] % %<*driver> \documentclass[10pt]{ltxdoc} @@ -247,7 +247,6 @@ users of biblatex}, pdfauthor={Ivan Valbusa}, pdfkeywords={bibliography}, - hidelinks } \EnableCrossrefs @@ -261,7 +260,7 @@ % % \fi % -% \CheckSum{4100} +% \CheckSum{4121} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -279,6 +278,7 @@ % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % +% \changes{v1.5}{2016/05/18}{Improved compatibility with legay Bib\TeX{} backend} % \changes{v1.4}{2016/03/10}{Maintenance release. Updated style for working with \sty{biblatex} v.3.4.} % \changes{v1.3}{2015/10/09}{Maintenance release. Corrected a spurious space in article entries.} % \changes{v1.2}{2015/09/19}{Maintenance release. New value \opt{superscript} for \opt{editionformat} option.} @@ -351,7 +351,7 @@ % \clearpage % % \thispagestyle{empty} -% \vspace*{12cm} +% \vspace*{\fill} % %\noindent Copyright \copyright\ 2009-\the\year{} Ivan Valbusa. % \bigskip @@ -647,7 +647,8 @@ %\cmditem{footcitet}{key} % %\begin{minipage}{.9\textwidth} -%Same as \cmd{footcite},\footcite[12-13]{corrocher:2009} but with the \cmd{textcite} style.\footcitet[12-13]{corrocher:2009} (defined only for the \sty{classic} and \sty{modern} styles). +%Same as \cmd{footcite},\footcite[12-13]{corrocher:2009} but with the \cmd{textcite} style.\footcitet[12-13]{corrocher:2009} (defined only for the \sty{classic}\\ +% and \sty{modern} styles). %\end{minipage} % %\cmditem{ccite}{key} @@ -678,10 +679,25 @@ %\begin{valuelist} %\item[semicolon] %The ``related'' entry is preceded by a semicolon. +% \begin{bibexample}% +% Poincaré, Jules-Henri (1968), \emph{La science et l'hypothèse}, Paris, +% Flammarion\emphasize{; trad. it. \emph{La scienza e l'ipotesi}, Milano, +% Bompiani 2003}. +% \end{bibexample} %\item[parens] %Puts the ``related'' entry in parentheses. +% \begin{bibexample}% +% Poincaré, Jules-Henri (1968), \emph{La science et l'hypothèse}, Paris, +% Flammarion \emphasize{(trad. it. \emph{La scienza e l'ipotesi}, Milano, +% Bompiani 2003)}. +% \end{bibexample} %\item[brackets] %Same as the previous option but with brackets. +% \begin{bibexample}% +% Poincaré, Jules-Henri (1968), \emph{La science et l'hypothèse}, Paris, +% Flammarion \emphasize{[trad. it. \emph{La scienza e l'ipotesi}, Milano, +% Bompiani 2003]}. +% \end{bibexample} %\end{valuelist} % %\boolitem[true]{shorthandintro} @@ -991,9 +1007,9 @@ % %The publication date of the translation/original edition. -%\begin{bibexample} -%Robert Bringhurst (1992), \emph{The Elements of Typographic Style}, Hartley \& Marks Publisher Inc., Vancouver, Canada; trad. it. \emphasize{\emph{Gli elementi dello stile tipografico}, Sylvestre Bonnard, Milano 2009.} -%\end{bibexample} +%^^A\begin{bibexample} +%^^ARobert Bringhurst (1992), \emph{The Elements of Typographic Style}, Hartley \& Marks Publisher Inc., Vancouver, Canada; trad. it. \emphasize{\emph{Gli elementi dello stile tipografico}, Sylvestre Bonnard, Milano 2009.} +%^^A\end{bibexample} % %^^A \fielditem{reprinttitle}{literal (Bib\TeX only) -- Deprecated --} % @@ -1003,20 +1019,20 @@ % %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. % -% The field is printed after the \bibfield{origtitle/transtitle} and the format is the same of the entry:\\ -%\vbox{ -% \begin{bibexample} -% Moore, George Edward (1903), «The refutation of idealism», \emph{Mind}, N.S., 12 (mag. 1903), p. 433-453; trad. it. «La confutazione dell'idealismo», in \emphasize{\emph{Il Neoempirismo}}, a cura di Alberto Pasquinelli, UTET, Torino 1969, p. 35-61. -% \end{bibexample}} +% The field is printed after the \bibfield{origtitle/transtitle}. +%^^A\vbox{ +%^^A \begin{bibexample} +%^^A Moore, George Edward (1903), «The refutation of idealism», \emph{Mind}, N.S., 12 (mag. 1903), p. 433-453; trad. it. «La confutazione dell'idealismo», in \emphasize{\emph{Il Neoempirismo}}, a cura di Alberto Pasquinelli, UTET, Torino 1969, p. 35-61. +%^^A \end{bibexample}} % %\fielditem{userb}{literal}\mbox{}\\[-9ex] %\fielditem{orignote}{literal \file{biber} only}\mbox{}\\[-9ex] %\fielditem{transnote}{literal \file{biber} only} % %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.: -% \begin{bibexample} -% Mach, E. (1883), \emph{Die Mechanik in ihrer Entwickelung historisch-kritisch dargestellt}; trad. it. \emph{La meccanica nel suo sviluppo storico-critico}, \emphasize{traduzione, introduzione e note di Alfonsina D'Elia}, Bollati Boringhieri, Torino 1977. -% \end{bibexample} +%^^A \begin{bibexample} +%^^A Mach, E. (1883), \emph{Die Mechanik in ihrer Entwickelung historisch-kritisch dargestellt}; trad. it. \emph{La meccanica nel suo sviluppo storico-critico}, \emphasize{traduzione, introduzione e note di Alfonsina D'Elia}, Bollati Boringhieri, Torino 1977. +%^^A \end{bibexample} % %\fielditem{userc}{literal}\mbox{}\\[-9ex] %\fielditem{origpages}{literal \file{biber} only}\mbox{}\\[-9ex] @@ -1044,28 +1060,14 @@ %Same as the previous but can be set on a per-entry basis in the \opt{options} field. \parencite[see][]{Lobacevskij:1994}. % %\optitem[semicolon]{origfieldsformat}{\opt{semicolon}, \opt{parens}, \opt{brackets}} +% Deprecated. Use the \opt{relatedformat} option instead. %\begin{valuelist} %\item[semicolon] -%The translation/original publication data are preceded by a semicolon: -% \begin{bibexample}% -% Poincaré, Jules-Henri (1968), \emph{La science et l'hypothèse}, Paris, -% Flammarion\emphasize{; trad. it. \emph{La scienza e l'ipotesi}, Milano, -% Bompiani 2003}. -% \end{bibexample} +%The translation/original publication data are preceded by a semicolon. %\item[parens] -%Puts the translation or the original publication data in parentheses: -% \begin{bibexample}% -% Poincaré, Jules-Henri (1968), \emph{La science et l'hypothèse}, Paris, -% Flammarion \emphasize{(trad. it. \emph{La scienza e l'ipotesi}, Milano, -% Bompiani 2003)}. -% \end{bibexample} +%Puts the translation or the original publication data in parentheses. %\item[brackets] -%Same as the previous option but with brackets instead of parentheses: -% \begin{bibexample}% -% Poincaré, Jules-Henri (1968), \emph{La science et l'hypothèse}, Paris, -% Flammarion \emphasize{[trad. it. \emph{La scienza e l'ipotesi}, Milano, -% Bompiani 2003]}. -% \end{bibexample} +%Same as the previous option but with brackets instead of parentheses. %\end{valuelist} %\end{optionlist} % @@ -1204,7 +1206,11 @@ \AtBeginBibliography{% \iftoggle{bbx:scauthorsbib}{% \ifblx@load@version@legacy -\DeclareNameFormat{family-given/given-family}{% + \expandafter\@firstoftwo +\else + \expandafter\@secondoftwo +\fi +{\DeclareNameFormat{family-given/given-family}{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% \let\mkbibnameprefix\mkbibsc% @@ -1219,9 +1225,8 @@ {\iffirstinits {\usebibmacro{name:given-family}{#1}{#4}{#5}{#7}} {\usebibmacro{name:given-family}{#1}{#3}{#5}{#7}}}% - \usebibmacro{name:andothers}}% -\else -\DeclareNameFormat{sortname}{% + \usebibmacro{name:andothers}}}% +{\DeclareNameFormat{sortname}{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% \let\mkbibnameprefix\mkbibsc% @@ -1253,8 +1258,7 @@ {\namepartgiven} {\namepartprefix} {\namepartsuffix}}}% - \usebibmacro{name:andothers}} -\fi + \usebibmacro{name:andothers}}}% }% {}}% % \end{macrocode} @@ -1796,7 +1800,8 @@ % \begin{macrocode} \newbibmacro*{related:clearauthors}{% \renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}% - \renewbibmacro*{author/editor+others/translator+others}{\usebibmacro{bbx:savehash}}% + \renewbibmacro*{author/editor+others/translator+others}{% + \usebibmacro{bbx:savehash}}% \renewbibmacro*{editor+others}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{author/editor}{\usebibmacro{bbx:savehash}}% @@ -2787,8 +2792,12 @@ % \opt{orig-} fields mechanism: % \begin{macrocode} \ifblx@load@version@legacy + \expandafter\@firstoftwo \else -\DeclareStyleSourcemap{ + \expandafter\@secondoftwo +\fi +{\relax} +{\DeclareStyleSourcemap{ \maps[datatype=bibtex]{ \map{ \step[fieldsource=court , fieldtarget=author] @@ -2808,8 +2817,7 @@ } } \DeclareDataInheritance{*}{*}{\noinherit{annotation}} -\fi - +} \DeclareFieldAlias[jurisdiction]{usera}[jurisdiction]{notacomm} \DeclareFieldAlias[jurisdiction]{nameadddon}[jurisdiction]{section} \DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court} @@ -3860,7 +3868,11 @@ {}}% \ifblx@load@version@legacy -\DeclareNameFormat{labelname}{% + \expandafter\@firstoftwo +\else + \expandafter\@secondoftwo +\fi +{\DeclareNameFormat{labelname}{% \bibhyperref{% \ifcase\value{uniquename}% \usebibmacro{name:family}{#1}{#3}{#5}{#7}% @@ -3871,9 +3883,8 @@ \or \usebibmacro{name:given-family}{#1}{#3}{#5}{#7}% \fi - \usebibmacro{name:andothers}}} - \else -\DeclareNameFormat{labelname}{% + \usebibmacro{name:andothers}}}} +{\DeclareNameFormat{labelname}{% \nameparts{#1}% \bibhyperref{\ifcase\value{uniquename}% \usebibmacro{name:family} @@ -3900,9 +3911,8 @@ {\namepartprefix} {\namepartsuffix}% \fi - \usebibmacro{name:andothers}}} - \fi -%%%% + \usebibmacro{name:andothers}}}} + %%%% \newcommand{\switchclass}[2]{% \iffieldequalstr{entrysubtype}{classic}% @@ -4315,7 +4325,11 @@ {}}% \iftoggle{cbx:scauthorscite}{% \ifblx@load@version@legacy -\DeclareNameFormat{labelname}{% + \expandafter\@firstoftwo +\else + \expandafter\@secondoftwo +\fi +{\DeclareNameFormat{labelname}{% \iffootnote{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% @@ -4330,9 +4344,8 @@ \or \usebibmacro{name:given-family}{#1}{#3}{#5}{#7}% \fi - \usebibmacro{name:andothers}}% -\else -\DeclareNameFormat{labelname}{% + \usebibmacro{name:andothers}}}% +{\DeclareNameFormat{labelname}{% \iffootnote{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% @@ -4364,12 +4377,14 @@ {\namepartprefix} {\namepartsuffix}% \fi - \usebibmacro{name:andothers}} - \fi + \usebibmacro{name:andothers}}} }{}}% - \ifblx@load@version@legacy -\DeclareNameFormat{scdefault}{% + \expandafter\@firstoftwo +\else + \expandafter\@secondoftwo +\fi +{\DeclareNameFormat{scdefault}{% \iffootnote{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% @@ -4378,9 +4393,8 @@ \iffirstinits {\usebibmacro{name:given-family}{#1}{#4}{#5}{#7}}% {\usebibmacro{name:given-family}{#1}{#3}{#5}{#7}}% - \usebibmacro{name:andothers}} -\else -\DeclareNameFormat{scdefault}{% + \usebibmacro{name:andothers}}} +{\DeclareNameFormat{scdefault}{% \iffootnote{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% @@ -4398,8 +4412,7 @@ {\namepartgiven} {\namepartprefix} {\namepartsuffix}}% - \usebibmacro{name:andothers}} -\fi + \usebibmacro{name:andothers}}} % \end{macrocode} % \subsubsection{New macros} % \begin{macrocode} @@ -4803,7 +4816,7 @@ volumes = {12} } -@OTHER{descartes:oeuvres, +@mvbook{descartes:oeuvres, annote = {A critical multivolume edition}, author = {René Descartes}, date = {1897/}, @@ -4969,7 +4982,7 @@ xref = {kant:werke} } -@OTHER{kant:werke, +@mvbook{kant:werke, author = {Kant, Immanuel}, booktitle = {Kants Werke. Akademie Textausgabe}, date = {1968}, @@ -4985,7 +4998,7 @@ volumes = {9} } -@OTHER{knuth:ct, +@mvbook{knuth:ct, annotation = {A five-volume book cited as a whole. This is a \texttt{book} entry, note the \texttt{volumes} field}, author = {Knuth, Donald E.}, @@ -5100,7 +5113,7 @@ volume = {E} } -@OTHER{comenio:oo, +@mvbook{comenio:oo, annote = {This author is known with his Latin name, given in the \texttt{nameaddon} field}, author = {Jan Amos Komensky}, @@ -5245,9 +5258,7 @@ date-modified = {2013-03-15 16:46:51 +0100}, keywords = {esempio}, location = {Wien}, - owner = {Alex Arcozzi}, related = {popper-logik:ing}, - relatedstring = {trad. ingl.}, timestamp = {2012.04.25} } @@ -5262,8 +5273,8 @@ date-modified = {2013-03-15 16:48:11 +0100}, keywords = {primaria,popper}, location = {London}, - owner = {Alex Arcozzi}, related = {popper-logik:ita}, + relatedstring={it. trans.}, timestamp = {2012.04.25} } @@ -5278,7 +5289,6 @@ hyphenation = {italian}, keywords = {primaria,popper}, location = {Torino}, - owner = {Alex Arcozzi}, timestamp = {2012.04.25} } @@ -5301,7 +5311,7 @@ volume = {1} } -@OTHER{Spencer:1891, +@mvbook{Spencer:1891, annote = {A multivolume work}, author = {Herbert Spencer}, date = {1891}, @@ -5313,7 +5323,7 @@ volumes = {3} } -@OTHER{Spencer:1891vol2, +@book{Spencer:1891vol2, author = {Herbert Spencer}, date = {1891}, keywords = {esempio}, 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 b3554d00d6c..007148bc477 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,13 @@ %% biblatex-philosophy.dtx (with options: `english-lbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{english-philosophy.lbx} - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -43,7 +43,7 @@ backrefpages = {{cited on pages}{cited on pp\adddot}} } %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 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 39bc8bd4938..aeb1de1fa22 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,13 @@ %% biblatex-philosophy.dtx (with options: `italian-lbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{italian-philosophy.lbx} - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -61,7 +61,7 @@ byreviser = {{revisione di}{revisione di}} } %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 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 71406637e99..bdc2de30586 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,13 @@ %% biblatex-philosophy.dtx (with options: `classic-bbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-classic.bbx} - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -224,7 +224,7 @@ \togglefalse{bbx:nodate}% }{}}% %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 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 b538ca9bc5b..c711671463d 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,13 @@ %% biblatex-philosophy.dtx (with options: `classic-cbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-classic.cbx} - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -40,7 +40,11 @@ {}}% \ifblx@load@version@legacy -\DeclareNameFormat{labelname}{% + \expandafter\@firstoftwo +\else + \expandafter\@secondoftwo +\fi +{\DeclareNameFormat{labelname}{% \bibhyperref{% \ifcase\value{uniquename}% \usebibmacro{name:family}{#1}{#3}{#5}{#7}% @@ -51,9 +55,8 @@ \or \usebibmacro{name:given-family}{#1}{#3}{#5}{#7}% \fi - \usebibmacro{name:andothers}}} - \else -\DeclareNameFormat{labelname}{% + \usebibmacro{name:andothers}}}} +{\DeclareNameFormat{labelname}{% \nameparts{#1}% \bibhyperref{\ifcase\value{uniquename}% \usebibmacro{name:family} @@ -80,9 +83,8 @@ {\namepartprefix} {\namepartsuffix}% \fi - \usebibmacro{name:andothers}}} - \fi -%%%% + \usebibmacro{name:andothers}}}} + %%%% \newcommand{\switchclass}[2]{% \iffieldequalstr{entrysubtype}{classic}% @@ -375,7 +377,7 @@ {\multicitedelim} {\usebibmacro{postnote}} %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 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 7c5ee4b4368..60a47cb4d56 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,13 @@ %% biblatex-philosophy.dtx (with options: `modern-bbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-modern.bbx} - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -226,7 +226,7 @@ {\printfield{label}}}% }{}}% %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 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 1afd91b739a..042f1eba51b 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,13 @@ %% biblatex-philosophy.dtx (with options: `modern-cbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-modern.cbx} - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -29,7 +29,7 @@ {\multicitedelim}% {\usebibmacro{postnote}}% %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 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 c8e6ccdcd36..0a1b8da309b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -7,13 +7,13 @@ %% biblatex-philosophy.dtx (with options: `standard-bbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-standard.bbx} - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -112,7 +112,11 @@ \AtBeginBibliography{% \iftoggle{bbx:scauthorsbib}{% \ifblx@load@version@legacy -\DeclareNameFormat{family-given/given-family}{% + \expandafter\@firstoftwo +\else + \expandafter\@secondoftwo +\fi +{\DeclareNameFormat{family-given/given-family}{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% \let\mkbibnameprefix\mkbibsc% @@ -127,9 +131,8 @@ {\iffirstinits {\usebibmacro{name:given-family}{#1}{#4}{#5}{#7}} {\usebibmacro{name:given-family}{#1}{#3}{#5}{#7}}}% - \usebibmacro{name:andothers}}% -\else -\DeclareNameFormat{sortname}{% + \usebibmacro{name:andothers}}}% +{\DeclareNameFormat{sortname}{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% \let\mkbibnameprefix\mkbibsc% @@ -161,8 +164,7 @@ {\namepartgiven} {\namepartprefix} {\namepartsuffix}}}% - \usebibmacro{name:andothers}} -\fi + \usebibmacro{name:andothers}}}% }% {}}% \renewcommand*{\newunitpunct}{\addcomma\space} @@ -667,7 +669,8 @@ \printdate} \newbibmacro*{related:clearauthors}{% \renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}% - \renewbibmacro*{author/editor+others/translator+others}{\usebibmacro{bbx:savehash}}% + \renewbibmacro*{author/editor+others/translator+others}{% + \usebibmacro{bbx:savehash}}% \renewbibmacro*{editor+others}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{author/editor}{\usebibmacro{bbx:savehash}}% @@ -1632,8 +1635,12 @@ \usebibmacro{pageref}% \usebibmacro{finentry}} \ifblx@load@version@legacy + \expandafter\@firstoftwo \else -\DeclareStyleSourcemap{ + \expandafter\@secondoftwo +\fi +{\relax} +{\DeclareStyleSourcemap{ \maps[datatype=bibtex]{ \map{ \step[fieldsource=court , fieldtarget=author] @@ -1653,14 +1660,13 @@ } } \DeclareDataInheritance{*}{*}{\noinherit{annotation}} -\fi - +} \DeclareFieldAlias[jurisdiction]{usera}[jurisdiction]{notacomm} \DeclareFieldAlias[jurisdiction]{nameadddon}[jurisdiction]{section} \DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court} %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 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 6df72139061..aca64f46895 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,13 @@ %% biblatex-philosophy.dtx (with options: `verbose-bbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-verbose.bbx} - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -510,7 +510,7 @@ {}% {}% %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 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 c620a1ab60b..01de1e8b75b 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,13 @@ %% biblatex-philosophy.dtx (with options: `verbose-cbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{philosophy-verbose.cbx} - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -66,7 +66,11 @@ {}}% \iftoggle{cbx:scauthorscite}{% \ifblx@load@version@legacy -\DeclareNameFormat{labelname}{% + \expandafter\@firstoftwo +\else + \expandafter\@secondoftwo +\fi +{\DeclareNameFormat{labelname}{% \iffootnote{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% @@ -81,9 +85,8 @@ \or \usebibmacro{name:given-family}{#1}{#3}{#5}{#7}% \fi - \usebibmacro{name:andothers}}% -\else -\DeclareNameFormat{labelname}{% + \usebibmacro{name:andothers}}}% +{\DeclareNameFormat{labelname}{% \iffootnote{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% @@ -115,12 +118,14 @@ {\namepartprefix} {\namepartsuffix}% \fi - \usebibmacro{name:andothers}} - \fi + \usebibmacro{name:andothers}}} }{}}% - \ifblx@load@version@legacy -\DeclareNameFormat{scdefault}{% + \expandafter\@firstoftwo +\else + \expandafter\@secondoftwo +\fi +{\DeclareNameFormat{scdefault}{% \iffootnote{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% @@ -129,9 +134,8 @@ \iffirstinits {\usebibmacro{name:given-family}{#1}{#4}{#5}{#7}}% {\usebibmacro{name:given-family}{#1}{#3}{#5}{#7}}% - \usebibmacro{name:andothers}} -\else -\DeclareNameFormat{scdefault}{% + \usebibmacro{name:andothers}}} +{\DeclareNameFormat{scdefault}{% \iffootnote{% \let\mkbibnamefamily\mkbibsc% \let\mkbibnamegiven\mkbibsc% @@ -149,8 +153,7 @@ {\namepartgiven} {\namepartprefix} {\namepartsuffix}}% - \usebibmacro{name:andothers}} -\fi + \usebibmacro{name:andothers}}} \newbibmacro*{cite:opcit}{% \printtext[bibhyperlink]{\bibstring[\mkibid]{opcit}}} @@ -224,7 +227,7 @@ {\multicitedelim} {\usebibmacro{postnote}} %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 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 ed7c3a02663..1c7e0c904b7 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,13 @@ %% biblatex-philosophy.dtx (with options: `spanish-lbx') %% ______________________________________________________ %% The biblatex-philosophy package -%% Copyright (C) 2009-2015 Ivan Valbusa +%% Copyright (C) 2009-2016 Ivan Valbusa %% All rights reserved %% %% License information appended %% \ProvidesFile{spanish-philosophy.lbx} - [2016/03/10 v1.4 valbusa beta] + [2016/05/18 v1.5 A set of styles for biblatex] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -64,7 +64,7 @@ byreviser = {{revisi\'{o}n de}{rev\adddotspace de}} } %% -%% Copyright 2009-2015 by Ivan Valbusa +%% Copyright 2009-2016 by Ivan Valbusa %% %% This program is provided under the terms of the %% LaTeX Project Public License distributed from CTAN -- cgit v1.2.3