From bf689f9057fa5b4deab72d085b6e483c480aefa7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 13 Apr 2013 22:55:37 +0000 Subject: biblatex-philosophy (13apr13) git-svn-id: svn://tug.org/texlive/trunk@29893 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/english-philosophy.lbx | 2 +- .../biblatex-philosophy/italian-philosophy.lbx | 2 +- .../biblatex-philosophy/philosophy-classic.bbx | 30 ++++++++++++--- .../biblatex-philosophy/philosophy-classic.cbx | 4 +- .../biblatex-philosophy/philosophy-modern.bbx | 29 +++++++++++---- .../biblatex-philosophy/philosophy-modern.cbx | 2 +- .../biblatex-philosophy/philosophy-standard.bbx | 43 ++++++++++++---------- .../biblatex-philosophy/philosophy-verbose.bbx | 14 +++++-- .../biblatex-philosophy/philosophy-verbose.cbx | 16 +++++--- 9 files changed, 97 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy') 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}} -- cgit v1.2.3