From 2cd41c75a2ebe18504b8ffbdaf0b7ed4fa279b30 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 27 Mar 2013 21:41:56 +0000 Subject: biblatex-philosophy (27mar13) git-svn-id: svn://tug.org/texlive/trunk@29528 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/english-philosophy.lbx | 3 +- .../biblatex-philosophy/italian-philosophy.lbx | 5 ++- .../biblatex-philosophy/philosophy-classic.bbx | 3 +- .../biblatex-philosophy/philosophy-classic.cbx | 3 +- .../biblatex-philosophy/philosophy-modern.bbx | 3 +- .../biblatex-philosophy/philosophy-modern.cbx | 3 +- .../biblatex-philosophy/philosophy-standard.bbx | 48 ++++++++++++++-------- .../biblatex-philosophy/philosophy-verbose.bbx | 18 +++++--- .../biblatex-philosophy/philosophy-verbose.cbx | 25 +++++++---- 9 files changed, 74 insertions(+), 37 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 f56e0b02c19..0a3b644d8bd 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,8 @@ %% License information appended %% \ProvidesFile{english-philosophy.lbx} - [2013/03/15 v0.8c valbusa beta] + [2013/03/27 v0.8c 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 6321e49ccf3..df1eb3efe81 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,8 @@ %% License information appended %% \ProvidesFile{italian-philosophy.lbx} - [2013/03/15 v0.8c valbusa beta] + [2013/03/27 v0.8c valbusa beta] + \InheritBibliographyExtras{italian} \DeclareBibliographyExtras{% @@ -38,7 +39,6 @@ editors = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, andothers = {{\mkbibemph{et\addabbrvspace al\adddot}} {\mkbibemph{et\addabbrvspace al\adddot}}}, - reviewof = {{Recensione di}{Recensione di}}, backrefpage = {{Citato a pagina}{Citato a \bibstring{page}\adddot}}, backrefpages = {{Citato alle pagine}{Citato alle \bibstring{pages}\adddot}}, pages = {{pagine}{\iftoggle{bbx:classical}{pp\adddot}{p\adddot}}}, @@ -54,6 +54,7 @@ reprintas = {{ristampato}{rist\adddot}}, translationof = {{traduzione di}{trad\adddotspace di}}, translationas = {{traduzione italiana}{trad\adddotspace it\adddot}}, + reviewof = {{Recensione di}{Recensione di}}, section = {{sezione}{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 20b53123e53..5d5a3d51e52 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,8 @@ %% License information appended %% \ProvidesFile{philosophy-classic.bbx} - [2013/03/15 v0.8c valbusa beta] + [2013/03/27 v0.8c valbusa beta] + \RequireBibliographyStyle{authoryear} \RequireBibliographyStyle{philosophy-standard} 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 5a64962dae1..d39a65b7e6a 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,8 @@ %% License information appended %% \ProvidesFile{philosophy-classic.cbx} - [2013/03/15 v0.8c valbusa beta] + [2013/03/27 v0.8c valbusa beta] + \RequireCitationStyle{authoryear-comp} 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 bf678627f0c..fa3f50f0ca1 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,8 @@ %% License information appended %% \ProvidesFile{philosophy-modern.bbx} - [2013/03/15 v0.8c valbusa beta] + [2013/03/27 v0.8c valbusa beta] + \RequireBibliographyStyle{philosophy-classic} \newtoggle{bbx:yearleft} 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 00b8dc52d9e..02009f6dd01 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,8 @@ %% License information appended %% \ProvidesFile{philosophy-modern.cbx} - [2013/03/15 v0.8c valbusa beta] + [2013/03/27 v0.8c 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 7214d5a1d06..54a622be04d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -13,8 +13,10 @@ %% License information appended %% \ProvidesFile{philosophy-standard.bbx} - [2013/03/15 v0.8c valbusa beta] + [2013/03/27 v0.8c valbusa beta] + +\RequireBiber[2] \RequireBibliographyStyle{standard} \DeclareLanguageMapping{italian}{italian-philosophy} \DeclareLanguageMapping{english}{english-philosophy} @@ -80,6 +82,9 @@ mincitenames = 1, maxbibnames = 999, minbibnames = 999} +\setcounter{biburlnumpenalty}{9000} +\setcounter{biburlucpenalty}{9000} +\setcounter{biburllcpenalty}{9000} \newcounter{maxnamesincross} \newcounter{minnamesincross} @@ -1265,23 +1270,21 @@ by the 'biblatex-philosophy' styles.\MessageBreak All the @set entries will be ignored}} -\newbibmacro*{xcross:maintitle+booktitle}{% +\newbibmacro*{cross:maintitle+booktitle}{% \iffieldundef{volume} {}% {\printfield{volume}% \printfield{part}% - \setunit{\addcolon\space}}% - \usebibmacro{booktitle}% - \newunit} + \setunit{\addcolon\space}% + \printfield{booktitle}}}% \newbibmacro*{xrefdata}{% - \usebibmacro{xcross:maintitle+booktitle}% + \usebibmacro{cross:maintitle+booktitle}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock \printfield{edition}% \newunit - \newunit \printfield{volumes}% \newunit\newblock \usebibmacro{series+number}% @@ -1311,15 +1314,22 @@ \printfield{part}} {}% \newunit\newblock + \printfield{note}% + \newunit\newblock \usebibmacro{chapter+pages}% \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock \usebibmacro{addendum+pubstate:article-inbook-incoll}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{related}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} - \DeclareFieldFormat[jurisdiction]{volume}{\RN{#1}} \DeclareFieldFormat[jurisdiction]{number}{\bibsstring{number}~{#1}} \DeclareFieldFormat[jurisdiction]{nameaddon}{% @@ -1402,16 +1412,22 @@ \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} -\AtBeginDocument{% -\DeclareSourcemap{ - \maps[datatype=bibtex]{ +\DeclareDriverSourcemap[datatype=bibtex]{ \map{ - \pertype{jurisdiction} - \step[fieldsource=court , fieldtarget=author] - \step[fieldsource=section, fieldtarget=nameaddon] + \step[fieldsource=court , fieldtarget=author] + \step[fieldsource=section , fieldtarget=nameaddon] + \step[fieldsource=transtitle , fieldtarget=origtitle] + \step[fieldsource=tranpublisher , fieldtarget=origpublisher] + \step[fieldsource=translocation , fieldtarget=origlocation] + \step[fieldsource=transbooktitle, fieldtarget=usera] + \step[fieldsource=transnote , fieldtarget=userb] + \step[fieldsource=transpages , fieldtarget=userc] + \step[fieldsource=origbooktitle , fieldtarget=usera] + \step[fieldsource=orignote , fieldtarget=userb] + \step[fieldsource=origpages , fieldtarget=userc] + } } - } -}} +\DeclareDataInheritance{*}{*}{\noinherit{annotation}} %% %% 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 ca1ff81589e..e7a4788a6b5 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,8 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.bbx} - [2013/03/15 v0.8c valbusa beta] + [2013/03/27 v0.8c valbusa beta] + \RequireBibliographyStyle{authortitle} \RequireBibliographyStyle{philosophy-standard} @@ -54,23 +55,28 @@ {\global\undef\bbx@lasthash}} \DeclareCiteCommand{\bbx@crossref@inbook} {}% - {\ifciteseen{\usebibmacro{bybookauthor}% + {\ifthenelse{\value{listtotal}=2}% + {\printnames[][-\value{maxnamesincross}]{labelname}}% + {\printnames[][-\value{minnamesincross}]{labelname}}% \setunit*{\addcomma\space}\printtext[bibhyperlink]{% \printfield[citetitle]{labeltitle}% \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}% {\setunit{\addspace\midsentence}}% - \bibstring{cited}}}{\usebibmacro{inbook:full}}}% + \bibstring{cited}}}% {}% {}% - \DeclareCiteCommand{\bbx@crossref@incollection} {}% - {\ifciteseen{\usebibmacro{editor+others}% + {\ifthenelse{\value{listtotal}=2}% + {\printnames[][-\value{maxnamesincross}]{labelname}}% + {\printnames[][-\value{minnamesincross}]{labelname}}% + \setunit{\addspace}% + \usebibmacro{editorstrg}% \setunit*{\addcomma\space}\printtext[bibhyperlink]{% \printfield[citetitle]{labeltitle}% \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}% {\setunit{\addspace\midsentence}}% - \bibstring{cited}}}{\usebibmacro{incollection:full}}}% + \bibstring{cited}}}% {}% {}% %% 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 8bdc3830958..bef005baec4 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,8 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.cbx} - [2013/03/15 v0.8c valbusa beta] + [2013/03/27 v0.8c valbusa beta] + \RequireCitationStyle{verbose-trad2} @@ -29,11 +30,11 @@ \settoggle{cbx:commacit}{#1}} \ExecuteBibliographyOptions{% -idemtracker=false, -loccittracker=strict, -scauthorscite=false, -latinemph=false, -commacit=false} + idemtracker=false, + loccittracker=strict, + scauthorscite=false, + latinemph=false, + commacit=false} \AtEveryCite{% \togglefalse{bbx:annotation}% @@ -80,7 +81,7 @@ commacit=false} \printfield[citetitle]{labeltitle}% \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}% {\setunit{\addspace\midsentence}}}% - \bibstring{cited}\midsentence}} + \bibstring{cited}}} \renewbibmacro*{cite:full}{%OK \usebibmacro{cite:full:citepages}% @@ -94,7 +95,15 @@ commacit=false} \usebibmacro{shorthandintro}} \DeclareNameFormat{noname}{} \DeclareCiteCommand{\ccite} -{\usebibmacro{prenote}\unspace\addspace}% +{\usebibmacro{prenote}% + \renewbibmacro*{author/translator+others}{}% + \renewbibmacro*{author/editor+others/translator+others}{}% + \renewbibmacro*{editor+others}{}% + \renewbibmacro*{author/translator+others}{}% + \renewbibmacro*{author/editor}{}% + \renewbibmacro*{author}{}% + \renewbibmacro*{editor}{}% + }% {\global\togglefalse{cbx:loccit}% \usedriver{\DeclareNameAlias{sortname}{noname}} {\thefield{entrytype}}} -- cgit v1.2.3