diff options
Diffstat (limited to 'Master')
15 files changed, 440 insertions, 335 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 24762558bda..5a3bd114306 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 854d40b4098..c20ac37113e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/philosophy-examples.bib +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/philosophy-examples.bib @@ -2,7 +2,7 @@ %% http://bibdesk.sourceforge.net/ -%% Created for Ivan Valbusa at 2013-04-04 17:00:25 +0200 +%% Created for Ivan Valbusa at 2013-05-02 17:05:00 +0200 %% Saved with string encoding Unicode (UTF-8) 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 609f5afb44c..91a21418ec7 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-classic.tex +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-classic.tex @@ -10,7 +10,7 @@ style=philosophy-classic, annotation=true, hyperref, backref]{biblatex} -\addbibresource{philosophy-examples.bib}% +\addbibresource{philosophy-examples.bib} \usepackage{hyperref} 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 0112b1027a3..244f31da7dd 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-verbose.tex +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-verbose.tex @@ -1,4 +1,3 @@ -% !TEX encoding = UTF-8 Unicode \documentclass{article} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} @@ -15,8 +14,7 @@ backref]{biblatex} \usepackage{hyperref} \begin{document} - -\textbf{N.B.} For other examples see \texttt{philosophy-examples.bib} and \texttt{biblatex-examples.bib} files. +\nocite{*} \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 101683970a8..b34f906cf7a 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/04/13 v0.8e valbusa beta] + [2013/06/20 v0.8f valbusa beta] %<*driver> \documentclass{ltxdoc} @@ -182,7 +182,7 @@ %</driver> % \fi % -% \CheckSum{3040} +% \CheckSum{3074} % % \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.8f}{2013/06/20}{New option \opt{nodate} for \cmd{printbibliography} command} % \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} @@ -255,7 +256,7 @@ % \thispagestyle{empty} % %\begin{abstract} -% This package provides a small collection of bibliography and citation styles for use with Philipp Lehman’s \sty{biblatex} package. The styles follow the most popular conventions of the Italian publications but can be used in other languages too. They offer some useful features to compose detailed bibliographic entries including the translation data of foreign texts, annotations etc. Many options allow you to change the style defaults. +% This package provides a small collection of bibliography and citation styles for use with Philipp Lehman's \sty{biblatex} package. The styles follow the most popular conventions of the Italian publications but can be used in other languages too. They offer some useful features to compose detailed bibliographic entries including the translation data of foreign texts, annotations etc. Many options allow you to change the style defaults. % \end{abstract} % % \null\vfill @@ -274,7 +275,7 @@ % %Copyright \copyright\ 2009-2010 Ivan Valbusa. This package is author-maintained. %Permission is granted to copy, distribute and/or modify this software under the -%terms of the LaTeX Project Public License, version 1.3c.\footnote{\url{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.}} This software is provided “as is”, without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. +%terms of the LaTeX Project Public License, version 1.3c.\footnote{\url{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.}} This software is provided ''as is'', without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. % %\subsection{Acknowledgments} % @@ -309,7 +310,7 @@ %\begin{description} %\setlength{\itemsep}{-1mm} %\item[\mdseries Donald E. Knuth] -%(1984–1986), \emph{Computers \& Typesetting}, 5 vols., Addison-Wesley, Reading, Mass. +%(1984ǃÏ1986), \emph{Computers \& Typesetting}, 5 vols., Addison-Wesley, Reading, Mass. %\item[---] %(1984) \emph{Computers \& Typesetting}, vol. A: \emph{The \TeX book}, Addison-Wesley, Reading, Mass. %\item[---] @@ -341,7 +342,7 @@ %\setlength{\leftmargin}{2.3cm} %\setlength{\labelsep}{3mm}} %\item[Donald E. Knuth] -%\item[1984–1986] +%\item[1984ǃÏ1986] % \emph{Computers \& Typesetting}, 5 vols., Addison-Wesley, Reading, Mass. %\item[1984] % \emph{Computers \& Typesetting}, vol. A: \emph{The \TeX book}, Addison-Wesley, Reading, Mass. @@ -369,8 +370,8 @@ % Milano 2002, p. 43.\\ % \textsuperscript{2} Ivi, p. 26. \\ % \textsuperscript{3} Ibidem. \\ -% \textsuperscript{4} Settimo Termini, «Vita morte e miracoli di Alan -% Mathison Turing», in \emph{Vite matematiche. Protagonisti del '900 da +% \textsuperscript{4} Settimo Termini, ¨¥Vita morte e miracoli di Alan +% Mathison Turing¨™, in \emph{Vite matematiche. Protagonisti del '900 da % Hilbert a Wiles}, a cura di Claudio Bartocci \emph{et al.}, Springer-Verlag Italia, % Milano 2007, pp. 59-61.\\ % \textsuperscript{5} Cartesio, \emph{Discorso sul metodo} cit., p. 35. @@ -796,10 +797,10 @@ % %In order to use the styles with different languages, you have to define all the string not defined in the language used in the preamble of your document. This is a sample code for using the styles in german documents: %\begin{verbatim} -%\NewBibliographyString{transtolang,edorig,cit,reviewof,nodate} +%\NewBibliographyString{edorig,cit,reviewof,nodate} %\DefineBibliographyStrings{german}{% % inherit={german}, -% transtolang = {deut\adddotspace \"Ubers\adddot}, +% translationas = {deut\adddotspace \"Ubers\adddot}, % edorig = {...}, % cit = {...}, % reviewof {...}, @@ -857,7 +858,7 @@ %The title of the \bibtype{collection} 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: % % \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. +% 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} % %\fielditem{userb}{literal}\mbox{}\\[-9ex] @@ -866,7 +867,7 @@ % %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. +% 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} % %\fielditem{userc}{literal}\mbox{}\\[-9ex] @@ -1036,24 +1037,22 @@ \AtBeginBibliography{% \iftoggle{bbx:scauthorsbib}{% \DeclareNameFormat{sortname}{% +\renewcommand{\mkbibnamefirst}{\textsc}% +\renewcommand{\mkbibnamelast}{\textsc}% +\renewcommand{\mkbibnameprefix}{\textsc}% +\renewcommand{\mkbibnameaffix}{\textsc}% \ifnumequal{\value{listcount}}{1} {\iffirstinits - {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}% - {\textsc{#7}}}%MOD - {\ifblank{#3}{\usebibmacro{name:last-first}{\textsc{#1}\nopunct}% - {\textsc{#3}}{\textsc{#5}}{\textsc{#7}}} - {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}% - {\textsc{#7}}}}% + {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} + {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}% \ifblank{#3#5} {} {\usebibmacro{name:revsdelim}}} {\iffirstinits - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}% - {\textsc{#7}}} - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}% - {\textsc{#7}}}}% + {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}} + {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}}% \usebibmacro{name:andothers}}}% -{}}% + {}}% \AtBeginDocument{% \iftoggle{bbx:scauthors}{% @@ -1222,7 +1221,7 @@ \iffieldundef{reprinttitle}% {\printtext{\ifdefstring{\bbx@origfields}{origed} {\bibstring{origed}}% -{\bibstring{transtolang}}}\nopunct}% +{\bibstring{translationas}}}\nopunct}% {\printtext{\bibstring{reprint}}}\nopunct} \newbibmacro*{origtitle:book}{% @@ -1241,7 +1240,7 @@ \usebibmacro{origpublisher+origlocation+origdate}} \newbibmacro*{origdata:book}{% - \ifboolexpr{ + \ifboolexpr{% test {\iffieldundef{origtitle}} and test {\iffieldundef{origlocation}} @@ -1399,11 +1398,11 @@ \renewbibmacro*{event+venue+date}{%v0.8 \printfield{eventtitle}% - \ifboolexpr{ + \ifboolexpr{% test {\iffieldundef{venue}} and test {\iffieldundef{eventyear}} - } + }% {} {\setunit*{\addspace}% \printtext{% @@ -1783,11 +1782,6 @@ \newunit\newblock \printfield{edition}% \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit \printfield{volumes}% \newunit\newblock \usebibmacro{series+number}% @@ -1795,6 +1789,11 @@ \printfield{note}% \newunit\newblock \usebibmacro{publisher+location+date}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{chapter+pages}% \newunit\newblock @@ -1839,11 +1838,6 @@ \newunit\newblock \printfield{edition}% \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit \printfield{volumes}% \newunit\newblock \usebibmacro{series+number}% @@ -1853,6 +1847,11 @@ \usebibmacro{publisher+location+date}% \newunit\newblock \usebibmacro{chapter+pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \iftoggle{bbx:isbn} {\printfield{isbn}} @@ -1894,11 +1893,6 @@ \usebibmacro{event+venue+date}% \newunit\newblock \usebibmacro{byeditor+others}% - \newunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% \newunit \printfield{volumes}% \newunit\newblock @@ -1910,6 +1904,11 @@ \newunit \usebibmacro{publisher+location+date}% \newunit\newblock + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit\newblock \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} @@ -2247,6 +2246,12 @@ 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 +\renewbibmacro*{bybookauthor}{% + \ifnamesequal{author}{bookauthor}% + {}% + {\printnames[default]{bookauthor}}} \newbibmacro*{cross:maintitle+booktitle}{% \iffieldundef{volume} @@ -2320,10 +2325,11 @@ \DeclareFieldFormat[jurisdiction]{number}{\bibsstring{number}~{#1}} \DeclareFieldFormat[jurisdiction]{nameaddon}{% \ifinteger{#1}{\bibcpsstring{section}~\RN{#1}}{#1}} -\DeclareFieldFormat[jurisdiction]{pages}{#1} +\DeclareFieldFormat[jurisdiction]{pages}{% + \iffieldundef{bookpagination}{#1}{\mkpageprefix[bookpagination]{#1}}} \DeclareFieldFormat[jurisdiction]{title}{% \iffieldequalstr{entrysubtype}{international}{\emph{#1}}{#1}} -% \end{macrocode} +\DeclareFieldFormat[jurisdiction]{notacomm}{nt\adddotspace#1} % \end{macrocode} % A new macro to manage authors of \bibtype{jurisdiction} entries. % \begin{macrocode} \newbibmacro*{juris:author}{% @@ -2331,11 +2337,11 @@ % Use the default name format: ``name surname'' % \begin{macrocode} \DeclareNameAlias{sortname}{default}% - \ifboolexpr{ + \ifboolexpr{% test \ifuseauthor and not test {\ifnameundef{author}} - } + }% {% \iffieldequalstr{type}{conclusions}{% \printtext{Conclusioni dell'Avv\adddotspace generale}% @@ -2357,6 +2363,18 @@ \setunit{\addcomma\space}}}% }% \printeventdate} + +\newbibmacro*{addendum+pubstate:juris}{% + \printfield{usera}%notacomm + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \printfield{pubstate}% + \ifdefstring{\bbx@origfields}{none}{}{% + \newunit\newblock + \usebibmacro{origdata:article-inbook}}% + \newunit\newblock + \usebibmacro{library}} \DeclareBibliographyDriver{jurisdiction}{% \usebibmacro{bibindex}% @@ -2370,6 +2388,7 @@ \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock + \iffieldundef{booktitle}{}{% \usebibmacro{in:}% \usebibmacro{maintitle+booktitle}% \newunit\newblock @@ -2396,10 +2415,10 @@ \iftoggle{bbx:isbn} {\printfield{isbn}} {}% - \newunit\newblock + \newunit\newblock} \usebibmacro{doi+eprint+url}% \newunit\newblock - \usebibmacro{addendum+pubstate:article-inbook-incoll}% + \usebibmacro{addendum+pubstate:juris}% \setunit{\addsemicolon\space}\newblock \usebibmacro{related}% \newunit\newblock @@ -2410,9 +2429,10 @@ % \opt{orig-} fields mechanism: % \begin{macrocode} \DeclareStyleSourcemap{ -\maps{ +\maps[datatype=bibtex]{ \map{ \step[fieldsource=court , fieldtarget=author] + \step[fieldsource=notacomm , fieldtarget=usera] \step[fieldsource=section , fieldtarget=nameaddon] \step[fieldsource=transtitle , fieldtarget=origtitle] \step[fieldsource=tranpublisher , fieldtarget=origpublisher] @@ -2427,6 +2447,11 @@ } } \DeclareDataInheritance{*}{*}{\noinherit{annotation}} + +\DeclareFieldAlias[jurisdiction]{usera}[jurisdiction]{notacomm} +\DeclareFieldAlias[jurisdiction]{nameadddon}[jurisdiction]{section} +\DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court} + % \end{macrocode} % \iffalse %</standard-bbx> @@ -2472,10 +2497,10 @@ \renewcommand{\labelnamepunct}{\addcomma\space}% \renewbibmacro*{relateddate}{% \setunit*{\addspace}% - \printdate} + \printdate}% \renewbibmacro*{commarelateddate}{% \setunit*{\addcomma\space}% - \printdate} + \printdate}% \DeclareCiteCommand{\bbx@crossref@inbook} {}% {\iffieldundef{shorthand}{% @@ -2490,7 +2515,7 @@ {\usebibmacro{cite:shorthand}}}% {}% {}% -\DeclareCiteCommand{\bbx@crossref@incollection} +\DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\iffieldundef{shorthand}{% \usebibmacro{citeindex}% @@ -2507,30 +2532,31 @@ \newbibmacro*{date+extrayear:crossref}{% \begingroup% \clearfield{month}% - \ifboolexpr{ + \clearfield{day}% + \ifboolexpr{% test {\iffieldundef{date}} and test {\iffieldundef{year}} }% {\iftoggle{bbx:nodate}{\printtext[parens]{% - \midsentence\bibstring{nodate}}}{}} + \midsentence\bibstring{nodate}}}{}}% {\printtext[parens]{\printdateextra}}% \endgroup}% \newbibmacro*{date+extrayear}{}% -} +}% \AtBeginDocument{% \iftoggle{bbx:square} {\renewcommand{\bibopenparen}{\bibopenbracket}% \renewcommand{\bibcloseparen}{\bibclosebracket}}% - {} + {}% \setcounter{maxnamesincross}{\value{maxnames}}% \setcounter{minnamesincross}{\value{minnames}}% -} +}% \AtEveryBibitem{% \iffieldequalstr{entrysubtype}{classic}{% - \togglefalse{bbx:nodate}}} + \togglefalse{bbx:nodate}}}% % \end{macrocode} % \subsubsection{New macros} @@ -2544,13 +2570,13 @@ % \paragraph{Dates} % \begin{macrocode} \renewbibmacro*{issue+date}{% - \ifboolexpr{ + \ifboolexpr{% test {\iffieldundef{issue}} and test {\iffieldundef{month}} - } + }% {}% - {\ifdefstring{\bbx@volnumformat}{parens} + {\ifdefstring{\bbx@volnumformat}{parens}% {\printtext{% \printfield{issue}\setunit*{\addspace}% \printdate}}% @@ -2565,69 +2591,70 @@ \renewbibmacro*{date+extrayear}{% \begingroup% \clearfield{month}% - \ifboolexpr{ + \clearfield{day}% + \ifboolexpr{% test {\iffieldundef{date}} and test {\iffieldundef{year}} }% {\iftoggle{bbx:nodate}{\printtext[parens]{% - \midsentence\bibstring{nodate}}}{}} + \midsentence\bibstring{nodate}}}{}}% {\printtext[parens]{\printdateextra}}% \endgroup}% % \end{macrocode} % \paragraph{Authors and editors} % \begin{macrocode} \renewbibmacro*{author}{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseauthor and not test {\ifnameundef{author}} }% - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\usebibmacro{bbx:savehash}% \printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% \printtext[brackets]{\printfield{nameaddon}}}% -\iffieldundef{authortype} - {\setunit{\addspace}} +\iffieldundef{authortype}% + {\setunit{\addspace}}% {\setunit{\addcomma\space}}}% - \iffieldundef{authortype} + \iffieldundef{authortype}% {}% {\usebibmacro{authorstrg}% \setunit{\addspace}}}% - {\global\undef\bbx@lasthash + {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% \renewbibmacro*{editor}{% - \usebibmacro{bbx:editor}{editorstrg}} + \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% - \usebibmacro{bbx:editor}{editor+othersstrg}} + \usebibmacro{bbx:editor}{editor+othersstrg}}% \renewbibmacro*{bbx:editor}[1]{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseeditor and not test {\ifnameundef{editor}} }% - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\printnames{editor}% \setunit{\addspace}% \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \clearname{editor}% \setunit{\addspace}}% - {\global\undef\bbx@lasthash + {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% % \end{macrocode} % \subsubsection{Internal commands for crossreferences} % \begin{macrocode} -\DeclareCiteCommand{\bbx@crossref@inbook} +\DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\usebibmacro{citeindex}% \ifuseeditor{% @@ -2640,7 +2667,7 @@ {}% {}% -\DeclareCiteCommand{\bbx@crossref@incollection} +\DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\usebibmacro{citeindex}% \ifuseeditor{% @@ -2660,6 +2687,14 @@ \define@key{blx@bib1}{restoreclassic}[]{} \define@key{blx@bib2}{restoreclassic}[true]{} % \end{macrocode} +% \subsubsection{The \opt{nodate} option for \cmd{printbibliography}} +% \begin{macrocode} +\define@key{blx@bib1}{nodate}[]{}% +\define@key{blx@bib2}{nodate}[true]{% + \ifstrequal{#1}{false}{% + \togglefalse{bbx:nodate}% +}{}}% +% \end{macrocode} % \iffalse %</classic-bbx> % \fi @@ -2686,15 +2721,15 @@ % \begin{macrocode} \newlength{\yeartitle} \newlength{\postnamesep} -\setlength{\yeartitle}{0.8em}% +\setlength{\yeartitle}{0.8em} \setlength{\postnamesep}{0.5ex plus 2pt minus 1pt} \setlength{\bibitemsep}{\postnamesep} \setlength{\bibnamesep}{1.5ex plus 2pt minus 1pt} \setlength{\bibhang}{4\parindent} -\AtBeginBibliography{ +\AtBeginBibliography{% \iftoggle{bbx:yearleft}{% -\setlength{\yeartitle}{\fill}} +\setlength{\yeartitle}{\fill}}% {}} % \end{macrocode} % \subsubsection{New commands} @@ -2713,8 +2748,9 @@ \renewbibmacro*{date+extrayear}{% \begingroup% \clearfield{month}% + \clearfield{day}% \makebox[\bibhang][r]{\printtext{% - \ifboolexpr{ + \ifboolexpr{% test {\iffieldundef{date}} and test {\iffieldundef{year}} @@ -2727,7 +2763,7 @@ \renewbibmacro*{labeltitle}{% \iffieldundef{label}% - {\iffieldundef{shorttitle} + {\iffieldundef{shorttitle}% {\printfield{title}\clearfield{title}}% {\printfield[title]{shorttitle}}}% {\printtext{\printfield{label}}% @@ -2736,34 +2772,34 @@ % \paragraph{Authors and editors} % \begin{macrocode} \renewbibmacro*{author}{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseauthor and not test {\ifnameundef{author}} - } - {\usebibmacro{bbx:dashcheck} + }% + {\usebibmacro{bbx:dashcheck}% {}% {\usebibmacro{bbx:savehash}% \printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% \printtext[brackets]{\printfield{nameaddon}}}% - \iffieldundef{authortype} + \iffieldundef{authortype}% {}% {\setunit{\addcomma\space}}% \usebibmacro{authorstrg}% \postsep}}% - {\global\undef\bbx@lasthash + {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% \renewbibmacro*{editor}{% - \usebibmacro{bbx:editor}{editorstrg}} + \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% - \usebibmacro{bbx:editor}{editor+othersstrg}} + \usebibmacro{bbx:editor}{editor+othersstrg}}% \renewbibmacro*{bbx:editor}[1]{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseeditor and not test {\ifnameundef{editor}} @@ -2783,7 +2819,7 @@ % \end{macrocode} % \subsubsection{Internal commands for crossreferences} % \begin{macrocode} -\DeclareCiteCommand{\bbx@crossref@inbook} +\DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\usebibmacro{citeindex}% \ifuseeditor{% @@ -2796,14 +2832,14 @@ {}% {}% -\DeclareCiteCommand{\bbx@crossref@incollection} +\DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\usebibmacro{citeindex}% \ifuseeditor{% \ifthenelse{\value{listtotal}=2}% {\printnames[][-\value{maxnamesincross}]{labelname}}% {\printnames[][-\value{minnamesincross}]{labelname}}}% - {\usebibmacro{labeltitle}} + {\usebibmacro{labeltitle}}% \setunit*{\addspace}% \usebibmacro{classic:date+extrayear}}% {}% @@ -2812,7 +2848,8 @@ \newbibmacro*{classic:date+extrayear}{% \begingroup% \clearfield{month}% - \ifboolexpr{ + \clearfield{day}% + \ifboolexpr{% test {\iffieldundef{date}} and test {\iffieldundef{year}} @@ -2830,11 +2867,12 @@ \define@key{blx@bib2}{restoreclassic}[true]{% \ifstrequal{#1}{true}{% \setlength{\bibhang}{\parindent}% - \renewcommand{\labelnamepunct}{\newunitpunct} + \renewcommand{\labelnamepunct}{\newunitpunct}% \renewbibmacro*{date+extrayear}{% \begingroup% \clearfield{month}% - \ifboolexpr{ + \clearfield{day}% + \ifboolexpr{% test {\iffieldundef{date}} and test {\iffieldundef{year}} @@ -2844,53 +2882,51 @@ {\printtext[parens]{\printdateextra}}% \endgroup}% \renewbibmacro*{author}{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseauthor and not test {\ifnameundef{author}} }% - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\usebibmacro{bbx:savehash}% \printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% \printtext[brackets]{\printfield{nameaddon}}}% -\iffieldundef{authortype} - {\setunit{\addspace}} +\iffieldundef{authortype}% + {\setunit{\addspace}}% {\setunit{\addcomma\space}}}% - \iffieldundef{authortype} + \iffieldundef{authortype}% {}% {\usebibmacro{authorstrg}% \setunit{\addspace}}}% - {\global\undef\bbx@lasthash + {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% - \renewbibmacro*{editor}{% - \usebibmacro{bbx:editor}{editorstrg}} + \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% - \usebibmacro{bbx:editor}{editor+othersstrg}} + \usebibmacro{bbx:editor}{editor+othersstrg}}% \renewbibmacro*{bbx:editor}[1]{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseeditor and not test {\ifnameundef{editor}} }% - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\printnames{editor}% \setunit{\addspace}% \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \clearname{editor}% \setunit{\addspace}}% - {\global\undef\bbx@lasthash + {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% - \renewbibmacro*{labeltitle}{% \iffieldundef{label}% {\iffieldundef{shorttitle}% @@ -2915,23 +2951,23 @@ % \begin{macrocode} \RequireBibliographyStyle{authortitle} \RequireBibliographyStyle{philosophy-standard} -\AtBeginShorthands{ +\AtBeginShorthands{% % \end{macrocode} % The annotation field is omitted in the list of shorthands: % \begin{macrocode} - \togglefalse{bbx:annotation} + \togglefalse{bbx:annotation}% % \end{macrocode} % In the list of shorthands we always use the shorthand % for the cross-referenced entries: % \begin{macrocode} - \DeclareCiteCommand{\bbx@crossref@inbook} + \DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\iffieldundef{shorthand}% {\usebibmacro{inbook:full}}% {\usebibmacro{cite:shorthand}}}% {}% {}% -\DeclareCiteCommand{\bbx@crossref@incollection} +\DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\iffieldundef{shorthand}% {\usebibmacro{incollection:full}}% @@ -2943,44 +2979,44 @@ % \paragraph{Authors and editors} % \begin{macrocode} \renewbibmacro*{author}{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseauthor and not test {\ifnameundef{author}} - } - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + }% + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% \printtext[brackets]{\printfield{nameaddon}}}% \setunit{\addcomma\space}% \usebibmacro{bbx:savehash}}% - \usebibmacro{authorstrg}} - {\global\undef\bbx@lasthash}} + \usebibmacro{authorstrg}}% + {\global\undef\bbx@lasthash}}% \renewbibmacro*{editor}{% - \usebibmacro{bbx:editor}{editorstrg}} + \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% - \usebibmacro{bbx:editor}{editor+othersstrg}} + \usebibmacro{bbx:editor}{editor+othersstrg}}% \renewbibmacro*{bbx:editor}[1]{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseeditor and not test {\ifnameundef{editor}} - } - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + }% + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\printnames{editor}% \setunit{\addspace}% #MOD# \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% - \clearname{editor}} - {\global\undef\bbx@lasthash}} + \clearname{editor}}% + {\global\undef\bbx@lasthash}}% % \end{macrocode} % \subsubsection{Internal commands for crossreferences} % \begin{macrocode} -\DeclareCiteCommand{\bbx@crossref@inbook} +\DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\ifciteseen{% \ifthenelse{\value{listtotal}=2}% @@ -2996,7 +3032,7 @@ {\thefield{entrytype}}}}% {}% {}% -\DeclareCiteCommand{\bbx@crossref@incollection} +\DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\ifciteseen{% \ifthenelse{\value{listtotal}=2}% @@ -3045,10 +3081,12 @@ \AtEveryCite{% \iftoggle{cbx:scauthorscite}% - {\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}% -\renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}% -\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}% -{}} + {% + \renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}% + \renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}% + \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}% + \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}% + {}}% \DeclareNameFormat{labelname}{% \bibhyperref{% \ifcase\value{uniquename}% @@ -3074,9 +3112,9 @@ \newbibmacro*{cite:init:AT}{% \ifnumless{\value{multicitecount}}{2} {\global\boolfalse{cbx:parens}% - \global\undef\cbx@lasthash} - {\iffieldundef{prenote} - {} + \global\undef\cbx@lasthash}% + {\iffieldundef{prenote}% + {}% {\global\undef\cbx@lasthash}}} \newbibmacro*{cite:reinit:AT}{% @@ -3085,9 +3123,9 @@ \newbibmacro*{cite:AT}{% \iffieldundef{shorthand} {\iffieldequals{namehash}{\cbx@lasthash} - {\setunit{\compcitedelim}} + {\setunit{\compcitedelim}}% {\ifnameundef{labelname} - {} + {}% {\printnames{labelname}% \setunit{\nametitledelim}}% \savefield{namehash}{\cbx@lasthash}}% @@ -3098,7 +3136,7 @@ \newbibmacro*{citetitle:AT}{% \iffieldundef{shorthand} - {\usebibmacro{cite:title:AT}} + {\usebibmacro{cite:title:AT}}% {\usebibmacro{cite:shorthand}}% \setunit{\multicitedelim}} @@ -3106,7 +3144,7 @@ \iffieldequals{namehash}{\cbx@lasthash} {\setunit{\compcitedelim}} {\ifnameundef{labelname} - {} + {}% {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% @@ -3293,7 +3331,6 @@ \ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}% {\usebibmacro{cite:label}% \setunit{\addspace}% - \usebibmacro{cite:labelyear+extrayear}% \usebibmacro{cite:reinit}}% {\iffieldequals{namehash}{\cbx@lasthash}% @@ -3308,7 +3345,8 @@ \setunit{\nameyeardelim}% \usebibmacro{cite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}% - \savefield{labelyear}{\cbx@lastyear}}}} + \iffieldundef{postnote}% + {\savefield{labelyear}{\cbx@lastyear}}{}}}} % \end{macrocode} % \subsubsection{Citation commands} % \begin{macrocode} @@ -3390,6 +3428,20 @@ % \begin{macrocode} \RequireCitationStyle{philosophy-classic} % \end{macrocode} +% The \cmd{fullcite} command simply prints the bibliography entry +% supplied by the style used. So we have to redefine this command +% in order to get the same output as that produced in +% the \sty{philosophy-classic} style: +% \begin{macrocode} +\DeclareCiteCommand{\fullcite}% + {\usebibmacro{prenote}}% + {\setkeys{blx@bib2}{restoreclassic}% + \usedriver% + {\DeclareNameAlias{sortname}{default}}% + {\thefield{entrytype}}}% + {\multicitedelim}% + {\usebibmacro{postnote}}% +% \end{macrocode} % % \iffalse %</modern-cbx> @@ -3438,24 +3490,30 @@ % \begin{macrocode} \iftoggle{cbx:scauthorscite}{% \DeclareNameFormat{labelname}{% -\ifcase\value{uniquename}% - \usebibmacro{name:last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}% -\or - \ifuseprefix - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#8}}}% - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#6}}{\textsc{#8}}}% -\or - \usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}% -\fi -\usebibmacro{name:andothers}}}{}} +\renewcommand{\mkbibnamefirst}{\textsc}% +\renewcommand{\mkbibnamelast}{\textsc}% +\renewcommand{\mkbibnameprefix}{\textsc}% +\renewcommand{\mkbibnameaffix}{\textsc}% + \ifcase\value{uniquename}% + \usebibmacro{name:last}{#1}{#3}{#5}{#7}% + \or + \ifuseprefix + {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}% + {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}% + \or + \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% + \fi + \usebibmacro{name:andothers}}}{}}% \DeclareNameFormat{scdefault}{% -\iffirstinits - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}} - {\ifblank{#3}% - {\usebibmacro{name:first-last}{\textsc{#1}}{#3}{#5}{\textsc{#7}}}% - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}% -\usebibmacro{name:andothers}} +\renewcommand{\mkbibnamefirst}{\textsc}% +\renewcommand{\mkbibnamelast}{\textsc}% +\renewcommand{\mkbibnameprefix}{\textsc}% +\renewcommand{\mkbibnameaffix}{\textsc}% + \iffirstinits + {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}% + {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}% + \usebibmacro{name:andothers}} % \end{macrocode} % \subsubsection{New macros} % \begin{macrocode} @@ -3534,7 +3592,7 @@ -\penalty\hyphenpenalty}% breakable dash \protected\def\bibdatedash{\textendash}}% -\NewBibliographyString{transtolang,origed,cited,reviewof,nodate,section} +\NewBibliographyString{origed,cited,reviewof,nodate,section} \DeclareBibliographyStrings{% inherit = {italian}, @@ -3545,8 +3603,6 @@ loccit = {{ibidem}{ibidem}}, origed = {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}}, langitalian = {{italiano}{it\adddot}}, - transtolang = {{traduzione\addspace italiana} - {\bibsstring{translator}\adddotspace \bibsstring{langitalian}}}, editor = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, editors = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, andothers = {{\mkbibemph{et\addabbrvspace al\adddot}} @@ -3573,7 +3629,9 @@ % origpubin = {{}{}}, % FIXME: missing % astitle = {{}{}}, % FIXME: missing % bypublisher = {{}{}}, % FIXME: missing -section = {{sezione}{sez\adddot}}} +section = {{sezione}{sez\adddot}}, +sections = {{sezioni}{\iftoggle{bbx:classical}{sezz\adddot}{sez\adddot}}}, +} % \end{macrocode} % \iffalse %</italian-lbx> @@ -3592,7 +3650,7 @@ section = {{sezione}{sez\adddot}}} -\penalty\hyphenpenalty}% breakable dash \protected\def\bibdatedash{\textendash}}% -\NewBibliographyString{transtolang,cited,reviewof,origed,nodate} +\NewBibliographyString{cited,reviewof,origed,nodate} \DeclareBibliographyStrings{% inherit = {english}, @@ -3601,12 +3659,12 @@ section = {{sezione}{sez\adddot}}} ibidem = {{ivi}{ivi}}, loccit = {{ibidem}{ibidem}}, origed = {{orig\adddotspace ed\adddot}{orig\adddotspace ed\adddot}}, - transtolang = {{trans\adddot}{trans\adddot}}, editor = {{\mkpureparens{ed\adddot}}{\mkpureparens{ed\adddot}}}, editors = {{\mkpureparens{eds\adddot}}{\mkpureparens{eds\adddot}}}, andothers = {{\mkbibemph{et\addabbrvspace al\adddot}} {\mkbibemph{et\addabbrvspace al\adddot}}}, reviewof = {{Review of}{Review of}}, + translationas = {{trans\adddot}{trans\adddot}}, backrefpage = {{cited on page}{cited on p\adddot}}, backrefpages = {{cited on pages}{cited on pp\adddot}}} % \end{macrocode} 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 f35bbc99fd0..783a59bf6de 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/04/13 v0.8e valbusa beta] + [2013/06/20 v0.8f valbusa beta] \InheritBibliographyExtras{english} @@ -23,7 +23,7 @@ -\penalty\hyphenpenalty}% breakable dash \protected\def\bibdatedash{\textendash}}% -\NewBibliographyString{transtolang,cited,reviewof,origed,nodate} +\NewBibliographyString{cited,reviewof,origed,nodate} \DeclareBibliographyStrings{% inherit = {english}, @@ -32,12 +32,12 @@ ibidem = {{ivi}{ivi}}, loccit = {{ibidem}{ibidem}}, origed = {{orig\adddotspace ed\adddot}{orig\adddotspace ed\adddot}}, - transtolang = {{trans\adddot}{trans\adddot}}, editor = {{\mkpureparens{ed\adddot}}{\mkpureparens{ed\adddot}}}, editors = {{\mkpureparens{eds\adddot}}{\mkpureparens{eds\adddot}}}, andothers = {{\mkbibemph{et\addabbrvspace al\adddot}} {\mkbibemph{et\addabbrvspace al\adddot}}}, reviewof = {{Review of}{Review of}}, + translationas = {{trans\adddot}{trans\adddot}}, backrefpage = {{cited on page}{cited on p\adddot}}, backrefpages = {{cited on pages}{cited on pp\adddot}}} %% 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 c61ae87d84d..401d45bf7d7 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/04/13 v0.8e valbusa beta] + [2013/06/20 v0.8f valbusa beta] \InheritBibliographyExtras{italian} @@ -22,7 +22,7 @@ -\penalty\hyphenpenalty}% breakable dash \protected\def\bibdatedash{\textendash}}% -\NewBibliographyString{transtolang,origed,cited,reviewof,nodate,section} +\NewBibliographyString{origed,cited,reviewof,nodate,section} \DeclareBibliographyStrings{% inherit = {italian}, @@ -33,8 +33,6 @@ loccit = {{ibidem}{ibidem}}, origed = {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}}, langitalian = {{italiano}{it\adddot}}, - transtolang = {{traduzione\addspace italiana} - {\bibsstring{translator}\adddotspace \bibsstring{langitalian}}}, editor = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, editors = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, andothers = {{\mkbibemph{et\addabbrvspace al\adddot}} @@ -55,7 +53,9 @@ translationof = {{traduzione di}{trad\adddotspace di}}, translationas = {{traduzione italiana}{trad\adddotspace it\adddot}}, reviewof = {{Recensione di}{Recensione di}}, -section = {{sezione}{sez\adddot}}} +section = {{sezione}{sez\adddot}}, +sections = {{sezioni}{\iftoggle{bbx:classical}{sezz\adddot}{sez\adddot}}}, +} %% %% Copyright 2009-2013 by Ivan Valbusa %% 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 d2ce3f8b2ad..e88d2f76c29 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-classic.bbx} - [2013/04/13 v0.8e valbusa beta] + [2013/06/20 v0.8f valbusa beta] \RequireBibliographyStyle{authoryear} @@ -41,10 +41,10 @@ \renewcommand{\labelnamepunct}{\addcomma\space}% \renewbibmacro*{relateddate}{% \setunit*{\addspace}% - \printdate} + \printdate}% \renewbibmacro*{commarelateddate}{% \setunit*{\addcomma\space}% - \printdate} + \printdate}% \DeclareCiteCommand{\bbx@crossref@inbook} {}% {\iffieldundef{shorthand}{% @@ -59,7 +59,7 @@ {\usebibmacro{cite:shorthand}}}% {}% {}% -\DeclareCiteCommand{\bbx@crossref@incollection} +\DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\iffieldundef{shorthand}{% \usebibmacro{citeindex}% @@ -76,41 +76,42 @@ \newbibmacro*{date+extrayear:crossref}{% \begingroup% \clearfield{month}% - \ifboolexpr{ + \clearfield{day}% + \ifboolexpr{% test {\iffieldundef{date}} and test {\iffieldundef{year}} }% {\iftoggle{bbx:nodate}{\printtext[parens]{% - \midsentence\bibstring{nodate}}}{}} + \midsentence\bibstring{nodate}}}{}}% {\printtext[parens]{\printdateextra}}% \endgroup}% \newbibmacro*{date+extrayear}{}% -} +}% \AtBeginDocument{% \iftoggle{bbx:square} {\renewcommand{\bibopenparen}{\bibopenbracket}% \renewcommand{\bibcloseparen}{\bibclosebracket}}% - {} + {}% \setcounter{maxnamesincross}{\value{maxnames}}% \setcounter{minnamesincross}{\value{minnames}}% -} +}% \AtEveryBibitem{% \iffieldequalstr{entrysubtype}{classic}{% - \togglefalse{bbx:nodate}}} + \togglefalse{bbx:nodate}}}% \renewbibmacro*{relateddate}{} \renewbibmacro*{commarelateddate}{} \renewbibmacro*{issue+date}{% - \ifboolexpr{ + \ifboolexpr{% test {\iffieldundef{issue}} and test {\iffieldundef{month}} - } + }% {}% - {\ifdefstring{\bbx@volnumformat}{parens} + {\ifdefstring{\bbx@volnumformat}{parens}% {\printtext{% \printfield{issue}\setunit*{\addspace}% \printdate}}% @@ -121,63 +122,64 @@ \renewbibmacro*{date+extrayear}{% \begingroup% \clearfield{month}% - \ifboolexpr{ + \clearfield{day}% + \ifboolexpr{% test {\iffieldundef{date}} and test {\iffieldundef{year}} }% {\iftoggle{bbx:nodate}{\printtext[parens]{% - \midsentence\bibstring{nodate}}}{}} + \midsentence\bibstring{nodate}}}{}}% {\printtext[parens]{\printdateextra}}% \endgroup}% \renewbibmacro*{author}{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseauthor and not test {\ifnameundef{author}} }% - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\usebibmacro{bbx:savehash}% \printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% \printtext[brackets]{\printfield{nameaddon}}}% -\iffieldundef{authortype} - {\setunit{\addspace}} +\iffieldundef{authortype}% + {\setunit{\addspace}}% {\setunit{\addcomma\space}}}% - \iffieldundef{authortype} + \iffieldundef{authortype}% {}% {\usebibmacro{authorstrg}% \setunit{\addspace}}}% - {\global\undef\bbx@lasthash + {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% \renewbibmacro*{editor}{% - \usebibmacro{bbx:editor}{editorstrg}} + \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% - \usebibmacro{bbx:editor}{editor+othersstrg}} + \usebibmacro{bbx:editor}{editor+othersstrg}}% \renewbibmacro*{bbx:editor}[1]{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseeditor and not test {\ifnameundef{editor}} }% - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\printnames{editor}% \setunit{\addspace}% \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \clearname{editor}% \setunit{\addspace}}% - {\global\undef\bbx@lasthash + {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% -\DeclareCiteCommand{\bbx@crossref@inbook} +\DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\usebibmacro{citeindex}% \ifuseeditor{% @@ -190,7 +192,7 @@ {}% {}% -\DeclareCiteCommand{\bbx@crossref@incollection} +\DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\usebibmacro{citeindex}% \ifuseeditor{% @@ -204,6 +206,11 @@ {}% \define@key{blx@bib1}{restoreclassic}[]{} \define@key{blx@bib2}{restoreclassic}[true]{} +\define@key{blx@bib1}{nodate}[]{}% +\define@key{blx@bib2}{nodate}[true]{% + \ifstrequal{#1}{false}{% + \togglefalse{bbx:nodate}% +}{}}% %% %% Copyright 2009-2013 by Ivan Valbusa %% 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 20e4296b976..d094a7c432f 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/04/13 v0.8e valbusa beta] + [2013/06/20 v0.8f valbusa beta] \RequireCitationStyle{authoryear-comp} @@ -33,10 +33,12 @@ \AtEveryCite{% \iftoggle{cbx:scauthorscite}% - {\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}% -\renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}% -\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}% -{}} + {% + \renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}% + \renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}% + \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}% + \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}% + {}}% \DeclareNameFormat{labelname}{% \bibhyperref{% \ifcase\value{uniquename}% @@ -58,9 +60,9 @@ \newbibmacro*{cite:init:AT}{% \ifnumless{\value{multicitecount}}{2} {\global\boolfalse{cbx:parens}% - \global\undef\cbx@lasthash} - {\iffieldundef{prenote} - {} + \global\undef\cbx@lasthash}% + {\iffieldundef{prenote}% + {}% {\global\undef\cbx@lasthash}}} \newbibmacro*{cite:reinit:AT}{% @@ -69,9 +71,9 @@ \newbibmacro*{cite:AT}{% \iffieldundef{shorthand} {\iffieldequals{namehash}{\cbx@lasthash} - {\setunit{\compcitedelim}} + {\setunit{\compcitedelim}}% {\ifnameundef{labelname} - {} + {}% {\printnames{labelname}% \setunit{\nametitledelim}}% \savefield{namehash}{\cbx@lasthash}}% @@ -82,7 +84,7 @@ \newbibmacro*{citetitle:AT}{% \iffieldundef{shorthand} - {\usebibmacro{cite:title:AT}} + {\usebibmacro{cite:title:AT}}% {\usebibmacro{cite:shorthand}}% \setunit{\multicitedelim}} @@ -90,7 +92,7 @@ \iffieldequals{namehash}{\cbx@lasthash} {\setunit{\compcitedelim}} {\ifnameundef{labelname} - {} + {}% {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% @@ -266,7 +268,6 @@ \ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}% {\usebibmacro{cite:label}% \setunit{\addspace}% - \usebibmacro{cite:labelyear+extrayear}% \usebibmacro{cite:reinit}}% {\iffieldequals{namehash}{\cbx@lasthash}% @@ -281,7 +282,8 @@ \setunit{\nameyeardelim}% \usebibmacro{cite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}% - \savefield{labelyear}{\cbx@lastyear}}}} + \iffieldundef{postnote}% + {\savefield{labelyear}{\cbx@lastyear}}{}}}} \DeclareCiteCommand*{\cite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} 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 54327309a79..61768258367 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/04/13 v0.8e valbusa beta] + [2013/06/20 v0.8f valbusa beta] \RequireBibliographyStyle{philosophy-classic} @@ -24,15 +24,15 @@ yearleft=false} \newlength{\yeartitle} \newlength{\postnamesep} -\setlength{\yeartitle}{0.8em}% +\setlength{\yeartitle}{0.8em} \setlength{\postnamesep}{0.5ex plus 2pt minus 1pt} \setlength{\bibitemsep}{\postnamesep} \setlength{\bibnamesep}{1.5ex plus 2pt minus 1pt} \setlength{\bibhang}{4\parindent} -\AtBeginBibliography{ +\AtBeginBibliography{% \iftoggle{bbx:yearleft}{% -\setlength{\yeartitle}{\fill}} +\setlength{\yeartitle}{\fill}}% {}} \newcommand{\postsep}{\par\nobreak\vskip\postnamesep% \hskip-\bibhang\ignorespaces} @@ -44,8 +44,9 @@ \renewbibmacro*{date+extrayear}{% \begingroup% \clearfield{month}% + \clearfield{day}% \makebox[\bibhang][r]{\printtext{% - \ifboolexpr{ + \ifboolexpr{% test {\iffieldundef{date}} and test {\iffieldundef{year}} @@ -58,40 +59,40 @@ \renewbibmacro*{labeltitle}{% \iffieldundef{label}% - {\iffieldundef{shorttitle} + {\iffieldundef{shorttitle}% {\printfield{title}\clearfield{title}}% {\printfield[title]{shorttitle}}}% {\printtext{\printfield{label}}% \postsep}} \renewbibmacro*{author}{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseauthor and not test {\ifnameundef{author}} - } - {\usebibmacro{bbx:dashcheck} + }% + {\usebibmacro{bbx:dashcheck}% {}% {\usebibmacro{bbx:savehash}% \printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% \printtext[brackets]{\printfield{nameaddon}}}% - \iffieldundef{authortype} + \iffieldundef{authortype}% {}% {\setunit{\addcomma\space}}% \usebibmacro{authorstrg}% \postsep}}% - {\global\undef\bbx@lasthash + {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% \renewbibmacro*{editor}{% - \usebibmacro{bbx:editor}{editorstrg}} + \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% - \usebibmacro{bbx:editor}{editor+othersstrg}} + \usebibmacro{bbx:editor}{editor+othersstrg}}% \renewbibmacro*{bbx:editor}[1]{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseeditor and not test {\ifnameundef{editor}} @@ -108,7 +109,7 @@ {\usebibmacro{#1}% \clearname{editor}% \printtext{\addcomma\space}}{}}% -\DeclareCiteCommand{\bbx@crossref@inbook} +\DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\usebibmacro{citeindex}% \ifuseeditor{% @@ -121,14 +122,14 @@ {}% {}% -\DeclareCiteCommand{\bbx@crossref@incollection} +\DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\usebibmacro{citeindex}% \ifuseeditor{% \ifthenelse{\value{listtotal}=2}% {\printnames[][-\value{maxnamesincross}]{labelname}}% {\printnames[][-\value{minnamesincross}]{labelname}}}% - {\usebibmacro{labeltitle}} + {\usebibmacro{labeltitle}}% \setunit*{\addspace}% \usebibmacro{classic:date+extrayear}}% {}% @@ -137,7 +138,8 @@ \newbibmacro*{classic:date+extrayear}{% \begingroup% \clearfield{month}% - \ifboolexpr{ + \clearfield{day}% + \ifboolexpr{% test {\iffieldundef{date}} and test {\iffieldundef{year}} @@ -152,11 +154,12 @@ \define@key{blx@bib2}{restoreclassic}[true]{% \ifstrequal{#1}{true}{% \setlength{\bibhang}{\parindent}% - \renewcommand{\labelnamepunct}{\newunitpunct} + \renewcommand{\labelnamepunct}{\newunitpunct}% \renewbibmacro*{date+extrayear}{% \begingroup% \clearfield{month}% - \ifboolexpr{ + \clearfield{day}% + \ifboolexpr{% test {\iffieldundef{date}} and test {\iffieldundef{year}} @@ -166,53 +169,51 @@ {\printtext[parens]{\printdateextra}}% \endgroup}% \renewbibmacro*{author}{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseauthor and not test {\ifnameundef{author}} }% - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\usebibmacro{bbx:savehash}% \printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% \printtext[brackets]{\printfield{nameaddon}}}% -\iffieldundef{authortype} - {\setunit{\addspace}} +\iffieldundef{authortype}% + {\setunit{\addspace}}% {\setunit{\addcomma\space}}}% - \iffieldundef{authortype} + \iffieldundef{authortype}% {}% {\usebibmacro{authorstrg}% \setunit{\addspace}}}% - {\global\undef\bbx@lasthash + {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% - \renewbibmacro*{editor}{% - \usebibmacro{bbx:editor}{editorstrg}} + \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% - \usebibmacro{bbx:editor}{editor+othersstrg}} + \usebibmacro{bbx:editor}{editor+othersstrg}}% \renewbibmacro*{bbx:editor}[1]{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseeditor and not test {\ifnameundef{editor}} }% - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\printnames{editor}% \setunit{\addspace}% \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \clearname{editor}% \setunit{\addspace}}% - {\global\undef\bbx@lasthash + {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% - \renewbibmacro*{labeltitle}{% \iffieldundef{label}% {\iffieldundef{shorttitle}% 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 c2da698bd2c..db88593a73b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx @@ -13,10 +13,18 @@ %% License information appended %% \ProvidesFile{philosophy-modern.cbx} - [2013/04/13 v0.8e valbusa beta] + [2013/06/20 v0.8f valbusa beta] \RequireCitationStyle{philosophy-classic} +\DeclareCiteCommand{\fullcite}% + {\usebibmacro{prenote}}% + {\setkeys{blx@bib2}{restoreclassic}% + \usedriver% + {\DeclareNameAlias{sortname}{default}}% + {\thefield{entrytype}}}% + {\multicitedelim}% + {\usebibmacro{postnote}}% %% %% Copyright 2009-2013 by Ivan Valbusa %% 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 4b77e146a71..c68f0a0ec4f 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/04/13 v0.8e valbusa beta] + [2013/06/20 v0.8f valbusa beta] \RequireBiber[2] @@ -90,24 +90,22 @@ \AtBeginBibliography{% \iftoggle{bbx:scauthorsbib}{% \DeclareNameFormat{sortname}{% +\renewcommand{\mkbibnamefirst}{\textsc}% +\renewcommand{\mkbibnamelast}{\textsc}% +\renewcommand{\mkbibnameprefix}{\textsc}% +\renewcommand{\mkbibnameaffix}{\textsc}% \ifnumequal{\value{listcount}}{1} {\iffirstinits - {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}% - {\textsc{#7}}}%MOD - {\ifblank{#3}{\usebibmacro{name:last-first}{\textsc{#1}\nopunct}% - {\textsc{#3}}{\textsc{#5}}{\textsc{#7}}} - {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}% - {\textsc{#7}}}}% + {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} + {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}% \ifblank{#3#5} {} {\usebibmacro{name:revsdelim}}} {\iffirstinits - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}% - {\textsc{#7}}} - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}% - {\textsc{#7}}}}% + {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}} + {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}}% \usebibmacro{name:andothers}}}% -{}}% + {}}% \AtBeginDocument{% \iftoggle{bbx:scauthors}{% @@ -253,7 +251,7 @@ \iffieldundef{reprinttitle}% {\printtext{\ifdefstring{\bbx@origfields}{origed} {\bibstring{origed}}% -{\bibstring{transtolang}}}\nopunct}% +{\bibstring{translationas}}}\nopunct}% {\printtext{\bibstring{reprint}}}\nopunct} \newbibmacro*{origtitle:book}{% @@ -272,7 +270,7 @@ \usebibmacro{origpublisher+origlocation+origdate}} \newbibmacro*{origdata:book}{% - \ifboolexpr{ + \ifboolexpr{% test {\iffieldundef{origtitle}} and test {\iffieldundef{origlocation}} @@ -427,11 +425,11 @@ \renewbibmacro*{event+venue+date}{%v0.8 \printfield{eventtitle}% - \ifboolexpr{ + \ifboolexpr{% test {\iffieldundef{venue}} and test {\iffieldundef{eventyear}} - } + }% {} {\setunit*{\addspace}% \printtext{% @@ -797,11 +795,6 @@ \newunit\newblock \printfield{edition}% \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit \printfield{volumes}% \newunit\newblock \usebibmacro{series+number}% @@ -809,6 +802,11 @@ \printfield{note}% \newunit\newblock \usebibmacro{publisher+location+date}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{chapter+pages}% \newunit\newblock @@ -853,11 +851,6 @@ \newunit\newblock \printfield{edition}% \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit \printfield{volumes}% \newunit\newblock \usebibmacro{series+number}% @@ -867,6 +860,11 @@ \usebibmacro{publisher+location+date}% \newunit\newblock \usebibmacro{chapter+pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \iftoggle{bbx:isbn} {\printfield{isbn}} @@ -908,11 +906,6 @@ \usebibmacro{event+venue+date}% \newunit\newblock \usebibmacro{byeditor+others}% - \newunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% \newunit \printfield{volumes}% \newunit\newblock @@ -924,6 +917,11 @@ \newunit \usebibmacro{publisher+location+date}% \newunit\newblock + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit\newblock \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} @@ -1262,6 +1260,11 @@ by the 'biblatex-philosophy' styles.\MessageBreak All the @set entries will be ignored}} +\renewbibmacro*{bybookauthor}{% + \ifnamesequal{author}{bookauthor}% + {}% + {\printnames[default]{bookauthor}}} + \newbibmacro*{cross:maintitle+booktitle}{% \iffieldundef{volume} {}% @@ -1322,16 +1325,18 @@ \DeclareFieldFormat[jurisdiction]{number}{\bibsstring{number}~{#1}} \DeclareFieldFormat[jurisdiction]{nameaddon}{% \ifinteger{#1}{\bibcpsstring{section}~\RN{#1}}{#1}} -\DeclareFieldFormat[jurisdiction]{pages}{#1} +\DeclareFieldFormat[jurisdiction]{pages}{% + \iffieldundef{bookpagination}{#1}{\mkpageprefix[bookpagination]{#1}}} \DeclareFieldFormat[jurisdiction]{title}{% \iffieldequalstr{entrysubtype}{international}{\emph{#1}}{#1}} +\DeclareFieldFormat[jurisdiction]{notacomm}{nt\adddotspace#1} % \end{macrocode} \newbibmacro*{juris:author}{% \DeclareNameAlias{sortname}{default}% - \ifboolexpr{ + \ifboolexpr{% test \ifuseauthor and not test {\ifnameundef{author}} - } + }% {% \iffieldequalstr{type}{conclusions}{% \printtext{Conclusioni dell'Avv\adddotspace generale}% @@ -1354,6 +1359,18 @@ }% \printeventdate} +\newbibmacro*{addendum+pubstate:juris}{% + \printfield{usera}%notacomm + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \printfield{pubstate}% + \ifdefstring{\bbx@origfields}{none}{}{% + \newunit\newblock + \usebibmacro{origdata:article-inbook}}% + \newunit\newblock + \usebibmacro{library}} + \DeclareBibliographyDriver{jurisdiction}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -1366,6 +1383,7 @@ \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock + \iffieldundef{booktitle}{}{% \usebibmacro{in:}% \usebibmacro{maintitle+booktitle}% \newunit\newblock @@ -1391,19 +1409,20 @@ \iftoggle{bbx:isbn} {\printfield{isbn}} {}% - \newunit\newblock + \newunit\newblock} \usebibmacro{doi+eprint+url}% \newunit\newblock - \usebibmacro{addendum+pubstate:article-inbook-incoll}% + \usebibmacro{addendum+pubstate:juris}% \setunit{\addsemicolon\space}\newblock \usebibmacro{related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareStyleSourcemap{ -\maps{ +\maps[datatype=bibtex]{ \map{ \step[fieldsource=court , fieldtarget=author] + \step[fieldsource=notacomm , fieldtarget=usera] \step[fieldsource=section , fieldtarget=nameaddon] \step[fieldsource=transtitle , fieldtarget=origtitle] \step[fieldsource=tranpublisher , fieldtarget=origpublisher] @@ -1418,6 +1437,11 @@ } } \DeclareDataInheritance{*}{*}{\noinherit{annotation}} + +\DeclareFieldAlias[jurisdiction]{usera}[jurisdiction]{notacomm} +\DeclareFieldAlias[jurisdiction]{nameadddon}[jurisdiction]{section} +\DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court} + %% %% Copyright 2009-2013 by Ivan Valbusa %% 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 888a4c14c95..582b192f9b0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx @@ -13,21 +13,21 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.bbx} - [2013/04/13 v0.8e valbusa beta] + [2013/06/20 v0.8f valbusa beta] \RequireBibliographyStyle{authortitle} \RequireBibliographyStyle{philosophy-standard} -\AtBeginShorthands{ - \togglefalse{bbx:annotation} - \DeclareCiteCommand{\bbx@crossref@inbook} +\AtBeginShorthands{% + \togglefalse{bbx:annotation}% + \DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\iffieldundef{shorthand}% {\usebibmacro{inbook:full}}% {\usebibmacro{cite:shorthand}}}% {}% {}% -\DeclareCiteCommand{\bbx@crossref@incollection} +\DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\iffieldundef{shorthand}% {\usebibmacro{incollection:full}}% @@ -36,41 +36,41 @@ {}% } \renewbibmacro*{author}{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseauthor and not test {\ifnameundef{author}} - } - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + }% + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\printnames{author}% \iffieldundef{nameaddon}{}% {\setunit{\addspace}% \printtext[brackets]{\printfield{nameaddon}}}% \setunit{\addcomma\space}% \usebibmacro{bbx:savehash}}% - \usebibmacro{authorstrg}} - {\global\undef\bbx@lasthash}} + \usebibmacro{authorstrg}}% + {\global\undef\bbx@lasthash}}% \renewbibmacro*{editor}{% - \usebibmacro{bbx:editor}{editorstrg}} + \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% - \usebibmacro{bbx:editor}{editor+othersstrg}} + \usebibmacro{bbx:editor}{editor+othersstrg}}% \renewbibmacro*{bbx:editor}[1]{% - \ifboolexpr{ + \ifboolexpr{% test \ifuseeditor and not test {\ifnameundef{editor}} - } - {\usebibmacro{bbx:dashcheck} - {\bibnamedash} + }% + {\usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\printnames{editor}% \setunit{\addspace}% #MOD# \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% - \clearname{editor}} - {\global\undef\bbx@lasthash}} -\DeclareCiteCommand{\bbx@crossref@inbook} + \clearname{editor}}% + {\global\undef\bbx@lasthash}}% +\DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\ifciteseen{% \ifthenelse{\value{listtotal}=2}% @@ -86,7 +86,7 @@ {\thefield{entrytype}}}}% {}% {}% -\DeclareCiteCommand{\bbx@crossref@incollection} +\DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\ifciteseen{% \ifthenelse{\value{listtotal}=2}% 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 daa7fe87b6e..409a242bef3 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/04/13 v0.8e valbusa beta] + [2013/06/20 v0.8f valbusa beta] \RequireCitationStyle{verbose-trad2} @@ -41,24 +41,30 @@ \iftoggle{cbx:latinemph}{\renewcommand*{\mkibid}{\emph}}{}% \iftoggle{cbx:scauthorscite}{% \DeclareNameFormat{labelname}{% -\ifcase\value{uniquename}% - \usebibmacro{name:last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}% -\or - \ifuseprefix - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#8}}}% - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#6}}{\textsc{#8}}}% -\or - \usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}% -\fi -\usebibmacro{name:andothers}}}{}} +\renewcommand{\mkbibnamefirst}{\textsc}% +\renewcommand{\mkbibnamelast}{\textsc}% +\renewcommand{\mkbibnameprefix}{\textsc}% +\renewcommand{\mkbibnameaffix}{\textsc}% + \ifcase\value{uniquename}% + \usebibmacro{name:last}{#1}{#3}{#5}{#7}% + \or + \ifuseprefix + {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}% + {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}% + \or + \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% + \fi + \usebibmacro{name:andothers}}}{}}% \DeclareNameFormat{scdefault}{% -\iffirstinits - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}} - {\ifblank{#3}% - {\usebibmacro{name:first-last}{\textsc{#1}}{#3}{#5}{\textsc{#7}}}% - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}% -\usebibmacro{name:andothers}} +\renewcommand{\mkbibnamefirst}{\textsc}% +\renewcommand{\mkbibnamelast}{\textsc}% +\renewcommand{\mkbibnameprefix}{\textsc}% +\renewcommand{\mkbibnameaffix}{\textsc}% + \iffirstinits + {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}% + {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}% + \usebibmacro{name:andothers}} \newbibmacro*{cite:opcit}{% \printtext[bibhyperlink]{\bibstring[\mkibid]{opcit}}} diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index ccae7c8cb7c..70c631f88f7 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -646,6 +646,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'messagebubbles', "die 'skipping, no license stated'", 'metalogo', "&MAKEflatten", 'metaobj', "&MAKEflatten", + 'metapost', "die 'skipping, core binary'", 'metauml', "&MAKEmetauml", 'mflogo', "die 'skipping, TL conflates distinct mflogo pkgs on CTAN'", 'mff', "die 'skipping, noinfo license'", |