diff options
16 files changed, 357 insertions, 98 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf Binary files differindex c91ddea96b8..24762558bda 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/philosophy-examples.bib b/Master/texmf-dist/doc/latex/biblatex-philosophy/philosophy-examples.bib index 8fd3481c3c7..854d40b4098 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/philosophy-examples.bib +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/philosophy-examples.bib @@ -2,12 +2,158 @@ %% http://bibdesk.sourceforge.net/ -%% Created for Ivan Valbusa at 2013-03-15 19:27:38 +0100 +%% Created for Ivan Valbusa at 2013-04-04 17:00:25 +0200 %% Saved with string encoding Unicode (UTF-8) + +@book{Hobbes:works:elements-of-philosophy:maintitle, + Author = {Thomas Hobbes}, + Booksubtitle = {The First Section, Concerning Body}, + Date = {1994}, + Date-Added = {2013-04-04 16:56:05 +0200}, + Date-Modified = {2013-04-04 17:00:25 +0200}, + Location = {London}, + Maintitle = {The Collected Works of Thomas Hobbes}, + Publisher = {Routledge and Thoemmes Press}, + Subtitle = {Elements of Philosophy}, + Title = {Elements of Philosophy}, + Volume = {1}} + +@incollection{bohm:in-christische-philosophie:full, + Author = {Irmingard Böhm}, + Booktitle = {Modern Strömungen im 20. Jahrhundert}, + Date = {1990}, + Date-Added = {2013-04-04 16:48:27 +0200}, + Date-Modified = {2013-04-04 16:50:35 +0200}, + Editor = {Emerich Coreth SJ and Walter M. Neidl and georg Pfligersdorffer}, + Location = {Graz and Wien Köln}, + Maintitle = {Christische Philosophie im katolischen Denken del 19. und 20. Jahrhunderts}, + Pages = {364-374}, + Publisher = {Styria}, + Title = {Lucien Laberthonnièere (1860--1932)}, + Volume = {3}} + +@incollection{braun:in-christische-philosophie:full, + Author = {Bernhard Braun}, + Booktitle = {Neue Ansätze im 19. Jahrhundert}, + Date = {1987}, + Date-Added = {2013-04-04 16:39:28 +0200}, + Date-Modified = {2013-04-04 16:42:59 +0200}, + Editor = {Emerich Coreth SJ and Walter M. Neidl and georg Pfligersdorffer}, + Location = {Graz and Wien Köln}, + Maintitle = {Christische Philosophie im katolischen Denken del 19. und 20. Jahrhunderts}, + Pages = {285-305}, + Publisher = {Styria}, + Title = {Martin Deutiger (1815--1864)}, + Volume = {1}} + +@mvcollection{christische-philosophie, + Date = {1987}, + Date-Modified = {2013-04-04 16:47:22 +0200}, + Editor = {Emerich {Coreth SJ} and Walter M. Neidl and Georg Pfligersdorffer}, + Location = {Graz and Wien and Köln}, + Publisher = {Styria}, + Title = {Christische Philosophie im katolischen Denken del 19. und 20. Jahrhunderts}, + Volumes = {3}} + +@mvbook{wolff:gesammelte-werke, + Author = {Christian Wolff}, + Date = {1965/}, + Date-Added = {2013-04-04 16:20:39 +0200}, + Date-Modified = {2013-04-04 16:24:12 +0200}, + Editor = {J. Ecole and H.W. Arndt, J.E. Hofmann and M. Thomann and C.A. Corr}, + Location = {Hildesheim and New York}, + Note = {edizione fototipica}, + Publisher = {Olms}, + Title = {Gesammelte Werke}, + Volumes = {59}} + +@mvbook{hobbes:works, + Author = {Thomas Hobbes}, + Date = {1994}, + Date-Added = {2013-04-04 16:14:28 +0200}, + Date-Modified = {2013-04-04 16:14:28 +0200}, + Editor = {Sir William Molesworth}, + Location = {London}, + Note = {with a new introduction by Dr G.A.J. Rogers}, + Publisher = {Routledge and Thoemmes Press}, + Title = {The Collected Works of Thomas Hobbes}, + Volumes = {12}} + +@bookinbook{Hobbes:works:elements-of-philosophy, + Author = {Thomas Hobbes}, + Booktitle = {The Collected Works of Thomas Hobbes}, + Date = {1994}, + Date-Added = {2013-04-04 16:14:13 +0200}, + Date-Modified = {2013-04-04 16:14:13 +0200}, + Location = {London}, + Publisher = {Routledge and Thoemmes Press}, + Subtitle = {The First Section, Concerning Body}, + Title = {Elements of Philosophy}, + Volume = {1}} + +@bookinbook{rosmini:opere:idee, + Author = {Antonio Rosmini}, + Booktitle = {Ideologia e logica}, + Date = {2003}, + Date-Added = {2013-04-04 16:14:02 +0200}, + Date-Modified = {2013-04-04 16:14:02 +0200}, + Editor = {Istituto di Studi Filosofici -- Roma and Centro Internazionale di Studi Rosminiani -- Stresa}, + Location = {Roma}, + Maintitle = {Opere edite e inedite di Antonio Rosmini}, + Note = {a cura di Gaetano Messina}, + Number = {tomo I}, + Publisher = {Città Nuova Editrice}, + Title = {Nuovo saggio sull'origine delle idee}, + Volume = {3}} + +@inproceedings{Agati1991, + Author = {Agati, Maria Luisa}, + Crossref = {Harlfinger1991}, + Date-Added = {2013-03-31 22:38:46 +0200}, + Date-Modified = {2013-03-31 22:39:40 +0200}, + Keywords = {esempio}, + Location = {Alessandria}, + Owner = {domenico}, + Pages = {47--66}, + Timestamp = {08.09.2012}, + Title = {Problemi di tratteggio e ductus nella minuscola libraria più antica}, + Year = {1991}} + +@inproceedings{Alpers1991, + Author = {Alpers, Klaus}, + Crossref = {Harlfinger1991}, + Date-Added = {2013-03-31 22:38:28 +0200}, + Date-Modified = {2013-03-31 22:39:35 +0200}, + Keywords = {esempio}, + Location = {Alessandria}, + Owner = {domenico}, + Pages = {523--541}, + Timestamp = {08.09.2012}, + Title = {Marginalien zur Überlieferung der griechischen Etymologika}, + Year = {1991}} + +@proceedings{Harlfinger1991, + Date = {1991}, + Date-Added = {2013-03-31 22:38:28 +0200}, + Date-Modified = {2013-03-31 22:38:28 +0200}, + Editor = {Harlfinger, D. and Prato, G.}, + Eventdate = {1983-10-17/1983-10-23}, + Keywords = {sigle, atti}, + Location = {Alessandria}, + Number = {3}, + Owner = {domenico}, + Series = {Biblioteca di Scrittura e Civiltà}, + Shorthand = {\textit{PCG}}, + Sortshorthand = {PCG}, + Timestamp = {20.07.2011}, + Title = {Paleografia e codicologia greca}, + Titleaddon = {Atti del II Colloquio internazionale}, + Venue = {Berlino -- Wolfenbüttel}} + @book{aristotle:physics, Annotation = {A \texttt{book} entry with a \texttt{translator} field}, Author = {Aristotle}, @@ -350,12 +496,11 @@ Addendum = {Con los auspicios del Centro internacional de Investigacíones para el Desarrollo de Canada}, Author = {Guzmán de Rojas, Iván}, Date-Added = {2012-04-17 23:48:05 +0200}, - Date-Modified = {2013-03-15 16:40:38 +0100}, + Date-Modified = {2013-04-01 00:43:20 +0200}, Keywords = {esempio}, Note = {mimeo}, Shorttitle = {Problemática}, Title = {Problemática logico-lingüística de la comunicacíon social con el pueblo Aymara}, - Year = {s.d.}, Annote = {A work without a pubblication date. The string \texttt{nodate} (localized) is automatically printed}} @book{heidegger:sz, diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-classic.tex b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-classic.tex index 067f6b2be86..609f5afb44c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-classic.tex +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-classic.tex @@ -1,3 +1,4 @@ +% !TEX encoding = UTF-8 Unicode \documentclass{article} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} @@ -16,7 +17,7 @@ backref]{biblatex} \newcommand{\cmd}[1]{\texttt{\textbackslash #1}} \begin{document} -\textbf{N.B.} For other examples see \texttt{biblatex-philosophy.bib} and \texttt{biblatex-examples.bib} files. +\textbf{N.B.} For other examples see \texttt{philosophy-examples.bib} and \texttt{biblatex-examples.bib} files. \section{Standard commands} @@ -43,7 +44,7 @@ Typeset a footnote using the same style of \cmd{textcite}.\footcitet[12-13]{eco: \section{Some miscellaneous citations} -\textcite{Mori:2008,comenio:oo,eco:2004,heidegger:sz,pantieri:artelatex,Poincare:1968-ORIG,popper-logik,descartes:discours,kant:kpv:xref,kant:ku:xref,Spencer:1891vol2,guzman:sd,Berti:1977,Spencer:1891b,berto:sep-impossible-worlds,corrocher:2009,federspil:2009,Valbusa:2007,britannica,ctan,guit:sito,SEP} +\textcite{Agati1991,Alpers1991,Mori:2008,comenio:oo,eco:2004,heidegger:sz,pantieri:artelatex,Poincare:1968-ORIG,popper-logik,descartes:discours,kant:kpv:xref,kant:ku:xref,Spencer:1891vol2,guzman:sd,Berti:1977,Spencer:1891b,berto:sep-impossible-worlds,corrocher:2009,federspil:2009,Valbusa:2007,britannica,ctan,guit:sito,SEP} \printbibliography 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 cfca99a3e11..9f9849f784a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-modern.tex +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-modern.tex @@ -1,3 +1,4 @@ +% !TEX encoding = UTF-8 Unicode \documentclass{article} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} @@ -16,7 +17,7 @@ backref]{biblatex} \newcommand{\cmd}[1]{\texttt{\textbackslash #1}} \begin{document} -\textbf{N.B.} For other examples see \texttt{biblatex-philosophy.bib} and \texttt{biblatex-examples.bib} files. +\textbf{N.B.} For other examples see \texttt{philosophy-examples.bib} and \texttt{biblatex-examples.bib} files. \section{Standard commands} 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 73cb38f0cb3..0112b1027a3 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-verbose.tex +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-verbose.tex @@ -1,3 +1,4 @@ +% !TEX encoding = UTF-8 Unicode \documentclass{article} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} @@ -10,12 +11,12 @@ annotation=true, hyperref, backref]{biblatex} \addbibresource{philosophy-examples.bib}% -\addbibresource{test.bib}% \usepackage{hyperref} \begin{document} -\cite{Sydenham1848} + +\textbf{N.B.} For other examples see \texttt{philosophy-examples.bib} and \texttt{biblatex-examples.bib} files. \section{Test file for \texttt{philosophy-verbose}} 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 1284c6900ec..101683970a8 100644 --- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx +++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx @@ -93,7 +93,7 @@ %<verbose-cbx>\ProvidesFile{philosophy-verbose.cbx} %<italian-lbx>\ProvidesFile{italian-philosophy.lbx} %<english-lbx>\ProvidesFile{english-philosophy.lbx} - [2013/03/30 v0.8d valbusa beta] + [2013/04/13 v0.8e valbusa beta] %<*driver> \documentclass{ltxdoc} @@ -182,7 +182,7 @@ %</driver> % \fi % -% \CheckSum{2994} +% \CheckSum{3040} % % \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 @@ -200,6 +200,7 @@ % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % +% \changes{v0.8e}{2013/04/13}{Improved \opt{relatedformat} option for cascading entries. Implemented cross-referencing mechanism for \bibtype{inproceedings} entries. Improved \cmd{ccite} command. Changed the values for the \bibfield{entrysubtype} from \bibfield{classical} to \bibfield{classic}. Added \opt{nodate} package option.} % \changes{v0.8d}{2013/03/30}{Fixed some bugs related to \cmd{DeclareDriverSourcemap}, \cmd{ccite}, and \bibtype{review} entry type} % \changes{v0.8c}{2013/03/27}{Removed \sty{biber.conf} configuration file. Added internal \file{biber} settings with \cmd{DeclareDriverSourcemap} command. Added \bibfield{trans-} field alias} % \changes{v0.8b}{2013/03/22}{Added \sty{biber.conf} configuration file} @@ -483,11 +484,11 @@ % % \fielditem{entrysubtype}{literal} % This feature is active only for the \sty{classic} and \sty{modern} styles. -% With the \opt{classical} value the citation commands will produce an +% With the \opt{classic} value the citation commands will produce an % author-title label. This is useful for citing works from classical antiquity, such as \cite[\lefthand][]{aristotle:physics}: %\begin{verbatim} %@book{aristotle:physics, -% entrysubtype = {classical}, +% entrysubtype = {classic}, % author = {Aristotle}, % title = {Physics}, % ... @@ -636,6 +637,7 @@ %\printbibliography[restoreclassic] %\end{verbatim} %It restores the \sty{classic} style in a document typeset using the \sty{modern} style. It is useful to compose a ``Web List'' like that at the end of this document (active only for the \sty{philosophy-modern}). +%\boolitem[true]{nodate} Prints the \texttt{nodate} string when \bibfield{year} or \bibfield{date} is missing. % %\subsubsection{\sty{philosophy-verbose}}\label{sec:options-verbose} % @@ -765,7 +767,7 @@ %The treatment of the classical works and other writings with uncertain or omitted date is particularly difficult and inevitably imposes some choices. % %If there is a critical edition you should cite it directly, such as \lefthand\textcite{heidegger:sz}. If you do not like this anachronistic label you may use the \bibfield{shorthand} field, such as \lefthand\textcite{kant:kpv}. -% Note that a ``shorthand intro'' is automatically printed when the entry is cited for the first time and omitted afterwards. To turn off this capability load the option \opt{shorthandintro=false}. In this case you will need a list of shorthands (\cmd{printshorthands} command). If you do not like these solutions you can use the \bibfield{entrysubtype} field with \texttt{classical} value (see section \ref{sec:specific-fields}) or the \cmd{sdcite} command (section \ref{sec:commands:citations}). +% Note that a ``shorthand intro'' is automatically printed when the entry is cited for the first time and omitted afterwards. To turn off this capability load the option \opt{shorthandintro=false}. In this case you will need a list of shorthands (\cmd{printshorthands} command). If you do not like these solutions you can use the \bibfield{entrysubtype} field with \texttt{classic} value (see section \ref{sec:specific-fields}) or the \cmd{sdcite} command (section \ref{sec:commands:citations}). % % % @@ -1151,7 +1153,7 @@ {\textsc{\Rn{#1}}~\bibstring{edition}}% {\mkbibordedition{#1}~\bibstring{edition}}}}} {#1}}%\isdot?? -\DeclareFieldFormat{related:translatedas}{% +\DeclareFieldFormat{related}{% \ifdefstring{\bbx@relatedformat}{parens}% {\mkpureparens{#1}}% {\ifdefstring{\bbx@relatedformat}{brackets}% @@ -1555,13 +1557,11 @@ \newbibmacro*{commarelateddate}{% \setunit*{\addcomma\space}% \printdate} - -\DeclareCiteCommand{\relatedcite} - {}% - {\usedriver - {\DeclareNameAlias{sortname}{default}% - % trucco per modificare due righe in ogni driver - % e togliere l'autore/curatore nelle voci 'related' +% \end{macrocode} +% A trick to delete the author/editor list for related +% entries and \cmd{ccite} command: +% \begin{macrocode} +\newbibmacro*{related:clearauthors}{% \renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{author/editor+others/translator+others}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{editor+others}{\usebibmacro{bbx:savehash}}% @@ -1569,7 +1569,13 @@ \renewbibmacro*{author/editor}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{author}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{editor}{\usebibmacro{bbx:savehash}}% - \renewcommand*{\labelnamepunct}{}% + \renewcommand*{\labelnamepunct}{}} + +\DeclareCiteCommand{\relatedcite} + {}% + {\usedriver + {\DeclareNameAlias{sortname}{default}% + \usebibmacro{related:clearauthors}% \renewbibmacro*{relateddate}{% \setunit*{\addspace}\printdate}% \renewbibmacro*{commarelateddate}{% @@ -1578,16 +1584,15 @@ {}% {}% -\newbibmacro*{related:translatedas}[1]{% +\renewbibmacro*{related:default}[1]{% \togglefalse{cbx:scauthorscite}% \togglefalse{bbx:annotation}% \iffieldundef{relatedstring}% {\bibstring{translationas}\space}% {\setunit{\bibstring{translationas}\space}}% + \renewcommand{\mkpureparens}{}% + \renewcommand*{\mkbibbrackets}{}% \relatedcite{\thefield{related}}} - -\renewbibmacro*{related:default}{% - \usebibmacro{related:translatedas}} % \end{macrocode} % \subsubsection{Bibliography drivers} % \begin{macrocode} @@ -1874,6 +1879,16 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{in:}% + \iffieldundef{xref}% + {\iffieldundef{crossref}{\usebibmacro{inproceedings:full}}% + {\bbx@crossref@incollection{\thefield{crossref}}% + \newunit\newblock + \usebibmacro{crossrefdata}}}% + {\bbx@crossref@incollection{\thefield{xref}}% + \newunit\newblock + \usebibmacro{xrefdata}}} + +\newbibmacro*{inproceedings:full}{% \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{event+venue+date}% @@ -1903,7 +1918,7 @@ \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock - \usebibmacro{addendum+pubstate}% + \usebibmacro{addendum+pubstate:article-inbook-incoll}% \setunit{\addsemicolon\space}\newblock \usebibmacro{related}% \newunit\newblock @@ -2247,12 +2262,12 @@ \usebibmacro{byeditor+others}% \newunit\newblock \printfield{edition}% - \newunit +% \newunit % \iffieldundef{maintitle} % {\printfield{volume}% % \printfield{part}} % {}% -% \newunit + \newunit \printfield{volumes}% \newunit\newblock \usebibmacro{series+number}% @@ -2282,8 +2297,6 @@ \printfield{part}} {}% \newunit\newblock - \printfield{note}% - \newunit\newblock \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} @@ -2291,8 +2304,6 @@ {}% \newunit\newblock \usebibmacro{doi+eprint+url}% - \newunit\newblock - \usebibmacro{addendum+pubstate:article-inbook-incoll}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{related}% \newunit\newblock @@ -2432,11 +2443,15 @@ \RequireBibliographyStyle{philosophy-standard} \newtoggle{bbx:square} +\newtoggle{bbx:nodate} \DeclareBibliographyOption{square}[true]{% \settoggle{bbx:square}{#1}} +\DeclareBibliographyOption{nodate}[true]{% + \settoggle{bbx:nodate}{#1}} \ExecuteBibliographyOptions{% + nodate = true, uniquename = false, pagetracker = true, singletitle = false, @@ -2492,10 +2507,16 @@ \newbibmacro*{date+extrayear:crossref}{% \begingroup% \clearfield{month}% - \iffieldundef{labelyear} - {\printtext[parens]{\midsentence\bibstring{nodate}}} + \ifboolexpr{ + test {\iffieldundef{date}} + and + test {\iffieldundef{year}} + }% + {\iftoggle{bbx:nodate}{\printtext[parens]{% + \midsentence\bibstring{nodate}}}{}} {\printtext[parens]{\printdateextra}}% \endgroup}% +\newbibmacro*{date+extrayear}{}% } \AtBeginDocument{% @@ -2506,6 +2527,11 @@ \setcounter{maxnamesincross}{\value{maxnames}}% \setcounter{minnamesincross}{\value{minnames}}% } + +\AtEveryBibitem{% +\iffieldequalstr{entrysubtype}{classic}{% + \togglefalse{bbx:nodate}}} + % \end{macrocode} % \subsubsection{New macros} % @@ -2539,8 +2565,13 @@ \renewbibmacro*{date+extrayear}{% \begingroup% \clearfield{month}% - \iffieldundef{labelyear} - {\printtext[parens]{\midsentence\bibstring{nodate}}} + \ifboolexpr{ + test {\iffieldundef{date}} + and + test {\iffieldundef{year}} + }% + {\iftoggle{bbx:nodate}{\printtext[parens]{% + \midsentence\bibstring{nodate}}}{}} {\printtext[parens]{\printdateextra}}% \endgroup}% % \end{macrocode} @@ -2683,8 +2714,13 @@ \begingroup% \clearfield{month}% \makebox[\bibhang][r]{\printtext{% - \iffieldundef{labelyear}% - {\printtext{\midsentence\bibstring{nodate}}}% + \ifboolexpr{ + test {\iffieldundef{date}} + and + test {\iffieldundef{year}} + }% + {\iftoggle{bbx:nodate}{\printtext{% + \midsentence\bibstring{nodate}}}{}}% {\printtext{\printdateextra}}% \hskip\yeartitle}}% \endgroup}% @@ -2776,8 +2812,13 @@ \newbibmacro*{classic:date+extrayear}{% \begingroup% \clearfield{month}% - \iffieldundef{labelyear} - {\printtext[parens]{\midsentence\bibstring{nodate}}}% + \ifboolexpr{ + test {\iffieldundef{date}} + and + test {\iffieldundef{year}} + }% + {\iftoggle{bbx:nodate}{\printtext[parens]{% + \midsentence\bibstring{nodate}}}{}}% {\printtext[parens]{% \printfield{labelyear}% \printfield{extrayear}}}% @@ -2793,8 +2834,13 @@ \renewbibmacro*{date+extrayear}{% \begingroup% \clearfield{month}% - \iffieldundef{labelyear} - {\printtext[parens]{\midsentence\bibstring{nodate}}}% + \ifboolexpr{ + test {\iffieldundef{date}} + and + test {\iffieldundef{year}} + }% + {\iftoggle{bbx:nodate}{\printtext[parens]{% + \midsentence\bibstring{nodate}}}{}}% {\printtext[parens]{\printdateextra}}% \endgroup}% \renewbibmacro*{author}{% @@ -2936,7 +2982,8 @@ % \begin{macrocode} \DeclareCiteCommand{\bbx@crossref@inbook} {}% - {\ifthenelse{\value{listtotal}=2}% + {\ifciteseen{% + \ifthenelse{\value{listtotal}=2}% {\printnames[][-\value{maxnamesincross}]{labelname}}% {\printnames[][-\value{minnamesincross}]{labelname}}% \setunit*{\addcomma\space}\printtext[bibhyperlink]{% @@ -2944,11 +2991,15 @@ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}% {\setunit{\addspace\midsentence}}% \bibstring{cited}}}% + {\usedriver{% + \DeclareNameAlias{sortname}{default}}% + {\thefield{entrytype}}}}% {}% {}% \DeclareCiteCommand{\bbx@crossref@incollection} {}% - {\ifthenelse{\value{listtotal}=2}% + {\ifciteseen{% +\ifthenelse{\value{listtotal}=2}% {\printnames[][-\value{maxnamesincross}]{labelname}}% {\printnames[][-\value{minnamesincross}]{labelname}}% \setunit{\addspace}% @@ -2958,6 +3009,9 @@ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}% {\setunit{\addspace\midsentence}}% \bibstring{cited}}}% + {\usedriver{% + \DeclareNameAlias{sortname}{default}}% + {\thefield{entrytype}}}}% {}% {}% % \end{macrocode} @@ -3010,7 +3064,7 @@ %%%% \newcommand{\switchclass}[2]{% - \iffieldequalstr{entrysubtype}{classical}% + \iffieldequalstr{entrysubtype}{classic}% {\usebibmacro{#1}}% {\usebibmacro{#2}}} % \end{macrocode} @@ -3221,7 +3275,7 @@ \renewbibmacro*{cite:shorthand}{% \printtext[bibhyperref]{\printfield{shorthand}}} % \end{macrocode} -% If the field \bibfield{entrysubtype} equals to \texttt{classical} +% If the field \bibfield{entrysubtype} equals to \texttt{classic} % the citation commands will use the author-title macros: % \begin{macrocode} \renewbibmacro*{cite:init}{% @@ -3308,7 +3362,7 @@ {\usebibmacro{textcite:postnote}} % \end{macrocode} % This command is now deprecated because it is substituted by -% the \bibfield{entrysubtype=classical} mechanism: +% the \bibfield{entrysubtype=classic} mechanism: % \begin{macrocode} \DeclareCiteCommand{\sdcite} {\boolfalse{citetracker}% @@ -3440,22 +3494,26 @@ {\thefield{entrytype}}}% \usebibmacro{shorthandintro}} -\newbibmacro*{cite:ccite}{% +\newbibmacro*{ccite:cite}{% +\usebibmacro{related:clearauthors}% \usebibmacro{cite:citepages}% \global\togglefalse{cbx:fullcite}% \global\togglefalse{cbx:loccit}% \bibhypertarget{cite\the\value{instcount}}{% - \iffieldundef{shorthand} + \ifciteseen + {\iffieldundef{shorthand} {\usebibmacro{cite:title}% - \usebibmacro{cite:save}}% - {\usebibmacro{cite:shorthand}}}} + \usebibmacro{cite:save}} + {\usebibmacro{cite:shorthand}}} + {\usebibmacro{cite:full}% + \usebibmacro{cite:save}}}} % \end{macrocode} % \subsubsection{Citation commands} % \begin{macrocode} \DeclareCiteCommand{\ccite} {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% - \usebibmacro{cite:ccite}} + \usebibmacro{ccite:cite}} {\multicitedelim} {\usebibmacro{cite:postnote}} 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 2ef0738f7e9..f35bbc99fd0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{english-philosophy.lbx} - [2013/03/30 v0.8d valbusa beta] + [2013/04/13 v0.8e valbusa beta] \InheritBibliographyExtras{english} 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 2f1aad3c49b..c61ae87d84d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{italian-philosophy.lbx} - [2013/03/30 v0.8d valbusa beta] + [2013/04/13 v0.8e valbusa beta] \InheritBibliographyExtras{italian} 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 686b37ca9a5..d2ce3f8b2ad 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx @@ -13,18 +13,22 @@ %% License information appended %% \ProvidesFile{philosophy-classic.bbx} - [2013/03/30 v0.8d valbusa beta] + [2013/04/13 v0.8e valbusa beta] \RequireBibliographyStyle{authoryear} \RequireBibliographyStyle{philosophy-standard} \newtoggle{bbx:square} +\newtoggle{bbx:nodate} \DeclareBibliographyOption{square}[true]{% \settoggle{bbx:square}{#1}} +\DeclareBibliographyOption{nodate}[true]{% + \settoggle{bbx:nodate}{#1}} \ExecuteBibliographyOptions{% + nodate = true, uniquename = false, pagetracker = true, singletitle = false, @@ -72,10 +76,16 @@ \newbibmacro*{date+extrayear:crossref}{% \begingroup% \clearfield{month}% - \iffieldundef{labelyear} - {\printtext[parens]{\midsentence\bibstring{nodate}}} + \ifboolexpr{ + test {\iffieldundef{date}} + and + test {\iffieldundef{year}} + }% + {\iftoggle{bbx:nodate}{\printtext[parens]{% + \midsentence\bibstring{nodate}}}{}} {\printtext[parens]{\printdateextra}}% \endgroup}% +\newbibmacro*{date+extrayear}{}% } \AtBeginDocument{% @@ -86,6 +96,11 @@ \setcounter{maxnamesincross}{\value{maxnames}}% \setcounter{minnamesincross}{\value{minnames}}% } + +\AtEveryBibitem{% +\iffieldequalstr{entrysubtype}{classic}{% + \togglefalse{bbx:nodate}}} + \renewbibmacro*{relateddate}{} \renewbibmacro*{commarelateddate}{} \renewbibmacro*{issue+date}{% @@ -106,8 +121,13 @@ \renewbibmacro*{date+extrayear}{% \begingroup% \clearfield{month}% - \iffieldundef{labelyear} - {\printtext[parens]{\midsentence\bibstring{nodate}}} + \ifboolexpr{ + test {\iffieldundef{date}} + and + test {\iffieldundef{year}} + }% + {\iftoggle{bbx:nodate}{\printtext[parens]{% + \midsentence\bibstring{nodate}}}{}} {\printtext[parens]{\printdateextra}}% \endgroup}% \renewbibmacro*{author}{% 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 d0f93e83ad1..20e4296b976 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-classic.cbx} - [2013/03/30 v0.8d valbusa beta] + [2013/04/13 v0.8e valbusa beta] \RequireCitationStyle{authoryear-comp} @@ -52,7 +52,7 @@ %%%% \newcommand{\switchclass}[2]{% - \iffieldequalstr{entrysubtype}{classical}% + \iffieldequalstr{entrysubtype}{classic}% {\usebibmacro{#1}}% {\usebibmacro{#2}}} \newbibmacro*{cite:init:AT}{% 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 2b08fd82a90..54327309a79 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-modern.bbx} - [2013/03/30 v0.8d valbusa beta] + [2013/04/13 v0.8e valbusa beta] \RequireBibliographyStyle{philosophy-classic} @@ -45,8 +45,13 @@ \begingroup% \clearfield{month}% \makebox[\bibhang][r]{\printtext{% - \iffieldundef{labelyear}% - {\printtext{\midsentence\bibstring{nodate}}}% + \ifboolexpr{ + test {\iffieldundef{date}} + and + test {\iffieldundef{year}} + }% + {\iftoggle{bbx:nodate}{\printtext{% + \midsentence\bibstring{nodate}}}{}}% {\printtext{\printdateextra}}% \hskip\yeartitle}}% \endgroup}% @@ -132,8 +137,13 @@ \newbibmacro*{classic:date+extrayear}{% \begingroup% \clearfield{month}% - \iffieldundef{labelyear} - {\printtext[parens]{\midsentence\bibstring{nodate}}}% + \ifboolexpr{ + test {\iffieldundef{date}} + and + test {\iffieldundef{year}} + }% + {\iftoggle{bbx:nodate}{\printtext[parens]{% + \midsentence\bibstring{nodate}}}{}}% {\printtext[parens]{% \printfield{labelyear}% \printfield{extrayear}}}% @@ -146,8 +156,13 @@ \renewbibmacro*{date+extrayear}{% \begingroup% \clearfield{month}% - \iffieldundef{labelyear} - {\printtext[parens]{\midsentence\bibstring{nodate}}}% + \ifboolexpr{ + test {\iffieldundef{date}} + and + test {\iffieldundef{year}} + }% + {\iftoggle{bbx:nodate}{\printtext[parens]{% + \midsentence\bibstring{nodate}}}{}}% {\printtext[parens]{\printdateextra}}% \endgroup}% \renewbibmacro*{author}{% 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 680af62f0fc..c2da698bd2c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-modern.cbx} - [2013/03/30 v0.8d valbusa beta] + [2013/04/13 v0.8e valbusa beta] \RequireCitationStyle{philosophy-classic} 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 327acc05fef..4b77e146a71 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-standard.bbx} - [2013/03/30 v0.8d valbusa beta] + [2013/04/13 v0.8e valbusa beta] \RequireBiber[2] @@ -190,7 +190,7 @@ {\textsc{\Rn{#1}}~\bibstring{edition}}% {\mkbibordedition{#1}~\bibstring{edition}}}}} {#1}}%\isdot?? -\DeclareFieldFormat{related:translatedas}{% +\DeclareFieldFormat{related}{% \ifdefstring{\bbx@relatedformat}{parens}% {\mkpureparens{#1}}% {\ifdefstring{\bbx@relatedformat}{brackets}% @@ -578,13 +578,7 @@ \newbibmacro*{commarelateddate}{% \setunit*{\addcomma\space}% \printdate} - -\DeclareCiteCommand{\relatedcite} - {}% - {\usedriver - {\DeclareNameAlias{sortname}{default}% - % trucco per modificare due righe in ogni driver - % e togliere l'autore/curatore nelle voci 'related' +\newbibmacro*{related:clearauthors}{% \renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{author/editor+others/translator+others}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{editor+others}{\usebibmacro{bbx:savehash}}% @@ -592,7 +586,13 @@ \renewbibmacro*{author/editor}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{author}{\usebibmacro{bbx:savehash}}% \renewbibmacro*{editor}{\usebibmacro{bbx:savehash}}% - \renewcommand*{\labelnamepunct}{}% + \renewcommand*{\labelnamepunct}{}} + +\DeclareCiteCommand{\relatedcite} + {}% + {\usedriver + {\DeclareNameAlias{sortname}{default}% + \usebibmacro{related:clearauthors}% \renewbibmacro*{relateddate}{% \setunit*{\addspace}\printdate}% \renewbibmacro*{commarelateddate}{% @@ -601,16 +601,15 @@ {}% {}% -\newbibmacro*{related:translatedas}[1]{% +\renewbibmacro*{related:default}[1]{% \togglefalse{cbx:scauthorscite}% \togglefalse{bbx:annotation}% \iffieldundef{relatedstring}% {\bibstring{translationas}\space}% {\setunit{\bibstring{translationas}\space}}% + \renewcommand{\mkpureparens}{}% + \renewcommand*{\mkbibbrackets}{}% \relatedcite{\thefield{related}}} - -\renewbibmacro*{related:default}{% - \usebibmacro{related:translatedas}} \DeclareBibliographyDriver{article}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -894,6 +893,16 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{in:}% + \iffieldundef{xref}% + {\iffieldundef{crossref}{\usebibmacro{inproceedings:full}}% + {\bbx@crossref@incollection{\thefield{crossref}}% + \newunit\newblock + \usebibmacro{crossrefdata}}}% + {\bbx@crossref@incollection{\thefield{xref}}% + \newunit\newblock + \usebibmacro{xrefdata}}} + +\newbibmacro*{inproceedings:full}{% \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{event+venue+date}% @@ -923,7 +932,7 @@ \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock - \usebibmacro{addendum+pubstate}% + \usebibmacro{addendum+pubstate:article-inbook-incoll}% \setunit{\addsemicolon\space}\newblock \usebibmacro{related}% \newunit\newblock @@ -1297,8 +1306,6 @@ \printfield{part}} {}% \newunit\newblock - \printfield{note}% - \newunit\newblock \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} @@ -1306,8 +1313,6 @@ {}% \newunit\newblock \usebibmacro{doi+eprint+url}% - \newunit\newblock - \usebibmacro{addendum+pubstate:article-inbook-incoll}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{related}% \newunit\newblock 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 37bb11457ad..888a4c14c95 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.bbx} - [2013/03/30 v0.8d valbusa beta] + [2013/04/13 v0.8e valbusa beta] \RequireBibliographyStyle{authortitle} @@ -72,7 +72,8 @@ {\global\undef\bbx@lasthash}} \DeclareCiteCommand{\bbx@crossref@inbook} {}% - {\ifthenelse{\value{listtotal}=2}% + {\ifciteseen{% + \ifthenelse{\value{listtotal}=2}% {\printnames[][-\value{maxnamesincross}]{labelname}}% {\printnames[][-\value{minnamesincross}]{labelname}}% \setunit*{\addcomma\space}\printtext[bibhyperlink]{% @@ -80,11 +81,15 @@ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}% {\setunit{\addspace\midsentence}}% \bibstring{cited}}}% + {\usedriver{% + \DeclareNameAlias{sortname}{default}}% + {\thefield{entrytype}}}}% {}% {}% \DeclareCiteCommand{\bbx@crossref@incollection} {}% - {\ifthenelse{\value{listtotal}=2}% + {\ifciteseen{% +\ifthenelse{\value{listtotal}=2}% {\printnames[][-\value{maxnamesincross}]{labelname}}% {\printnames[][-\value{minnamesincross}]{labelname}}% \setunit{\addspace}% @@ -94,6 +99,9 @@ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}% {\setunit{\addspace\midsentence}}% \bibstring{cited}}}% + {\usedriver{% + \DeclareNameAlias{sortname}{default}}% + {\thefield{entrytype}}}}% {}% {}% %% 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 cc62ca31ae1..daa7fe87b6e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.cbx} - [2013/03/30 v0.8d valbusa beta] + [2013/04/13 v0.8e valbusa beta] \RequireCitationStyle{verbose-trad2} @@ -94,19 +94,23 @@ {\thefield{entrytype}}}% \usebibmacro{shorthandintro}} -\newbibmacro*{cite:ccite}{% +\newbibmacro*{ccite:cite}{% +\usebibmacro{related:clearauthors}% \usebibmacro{cite:citepages}% \global\togglefalse{cbx:fullcite}% \global\togglefalse{cbx:loccit}% \bibhypertarget{cite\the\value{instcount}}{% - \iffieldundef{shorthand} + \ifciteseen + {\iffieldundef{shorthand} {\usebibmacro{cite:title}% - \usebibmacro{cite:save}}% - {\usebibmacro{cite:shorthand}}}} + \usebibmacro{cite:save}} + {\usebibmacro{cite:shorthand}}} + {\usebibmacro{cite:full}% + \usebibmacro{cite:save}}}} \DeclareCiteCommand{\ccite} {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% - \usebibmacro{cite:ccite}} + \usebibmacro{ccite:cite}} {\multicitedelim} {\usebibmacro{cite:postnote}} diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index bcc8a8ceb2d..7313d50cb7f 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -4947,6 +4947,7 @@ sub POSTcontext { my @exec = (); for my $exec (qw(context ctxtools luatools mtxrun pstopdf texexec texmfstart)) { + &SYSTEM ("chmod a+x $exec"); &bindirs_symlink ($exec); &build_scripts_copy ($exec, $pkg_subdir); &SYSTEM ("$CP ../mswin/$exec.exe $w32_bindir/"); |