summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-philosophy
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-05 22:02:18 +0000
committerKarl Berry <karl@freefriends.org>2012-05-05 22:02:18 +0000
commit657c5892770a6a90aa8626c27e61a87586e5565c (patch)
tree03670a95290f09f179812afe300da8a993fa8104 /Master/texmf-dist/tex/latex/biblatex-philosophy
parent4c56a7f771b8c9fabb57b8def881a6c6785e5699 (diff)
biblatex-philosophy (5may12)
git-svn-id: svn://tug.org/texlive/trunk@26219 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx36
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx63
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx173
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx163
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx89
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx770
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx82
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx121
9 files changed, 780 insertions, 723 deletions
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 0e7ff850dcd..edc5bfdb229 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
@@ -1,24 +1,30 @@
-% english-philosophy.lbx,Ivan Valbusa 2010-2011
+% $Id: english-philosophy.lbx,v 0.8b 2012/05/06 Valbusa$
+% Copyright 2009-2012 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
+% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{english-philosophy.lbx}[v 0.7c 2011/05/16 biblatex localization file for biblatex-philosophy]
+\ProvidesFile{english-philosophy.lbx}[v 0.8b 2012/05/06 biblatex localization file for biblatex-philosophy]
\InheritBibliographyExtras{english}
-\NewBibliographyString{transtolang,cit,reviewof,edorig,nodate}
+\NewBibliographyString{transtolang,cited,reviewof,origed,nodate}
\DeclareBibliographyStrings{%
- inherit={english},
- cit = {{cit\adddot}{cit\adddot}},
- andothers = {{\mkbibemph{et\addabbrvspace al\adddot}}{\mkbibemph{et\addabbrvspace al\adddot}}},
- ibidem = {{ivi}{ivi}},
- loccit = {{ibidem}{ibidem}},
- edorig = {{orig\adddotspace ed\adddot}{orig\adddotspace ed\adddot}},
- transtolang = {{eng\adddotspace trans\adddot}{eng\adddotspace trans\adddot}},
- editor = {{\mkpureparens{ed\adddot}}{\mkpureparens{ed\adddot}}},
- editors = {{\mkpureparens{eds.\adddot}}{\mkpureparens{eds\adddot}}},
- backrefpage = {{cited on page\adddot}{cited on p\adddot}},
- backrefpages = {{cited on pages\adddot}{cited on pp\adddot}},
- reviewof = {{Review of}{Review of}},
+ inherit = {english},
+ nodate = {{no date}{n\adddot d\adddot}},
+ cited = {{cit\adddot}{cit\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}},
+ backrefpage = {{cited on page\adddot}{cited on p\adddot}},
+ backrefpages = {{cited on pages\adddot}{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 7ca6f356a2f..a07186af4b0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
@@ -1,33 +1,48 @@
-% italian-philosophy.lbx,Ivan Valbusa 2010-2011
+% $Id: italian-philosophy.lbx,v 0.8b 2012/05/06 Valbusa$
+% Copyright 2009-2012 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
+% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{italian-philosophy.lbx}[v 0.7c 2011/05/16 biblatex localization file for biblatex-philosophy]
+\ProvidesFile{italian-philosophy.lbx}[v 0.8b 2012/05/06 biblatex localization file for biblatex-philosophy]
\InheritBibliographyExtras{italian}
+\DeclareBibliographyExtras{%
+ \protected\def\bibrangedash{%
+ -\penalty\hyphenpenalty}% breakable dash
+}
-\NewBibliographyString{transtolang,edorig,cit,reviewof,nodate}
+\NewBibliographyString{transtolang,origed,cited,reviewof,nodate}
\DeclareBibliographyStrings{%
- nodate={{senza data}{s\adddotspace d\adddotspace}},
- inherit={italian},
- cit = {{cit\adddot}{cit\adddot}},
- ibidem = {{ivi}{ivi}},
- loccit = {{ibidem}{ibidem}},
- backrefpage = {{Citato a pagina}{Citato a p\adddot}},
- backrefpages = {{Citato alle pagine}{Citato alle pp\adddot}},
- sequentes = {{ss\adddot}{ss\adddot}},
- sequens = {{s\adddot}{s\adddot}},
- reprint = {{rist\adddot}{rist\adddot}},
- edorig = {{ed\adddotspace orig\adddot}{ed\adddotspace orig.\adddot}},
- transtolang = {{trad\adddotspace it\adddot}{trad\adddotspace it\adddot}},
- andothers = {{\mkbibemph{et\addabbrvspace al\adddot}}{\mkbibemph{et\addabbrvspace al\adddot}}},
- editor = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}},
- editors = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}},
- reviewof = {{Recensione a}{Recensione a}},
- withcommentator = {{{con commenti di}{con comm\adddot\addabbrvspace di}}},
- withannotator = {{annotazioni di}{annotazioni di}},
- withintroduction = {{introduzione di}{introduzione di}},
- withforeword = {{prefazione di}{prefazione di}},
- withafterword = {{postfazione di}{postfazione di}}}
+ inherit = {italian},
+ nodate = {{senza data}{s\adddotspace d\adddot}},
+ cited = {{cit\adddot}{cit\adddot}},
+ opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+ ibidem = {{ivi}{ivi}},
+ 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}}%
+ {\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}}},
+ columns = {{colonne}{\iftoggle{bbx:classical}{coll\adddot}{col\adddot}}},
+ lines = {{righe}{\iftoggle{bbx:classical}{rr\adddot}{r\adddot}}},
+ verses = {{versi}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}},
+ volumes = {{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol.\adddot}}},
+ withcommentator = {{con commenti di}{con comm\adddot\addabbrvspace di}},
+ withannotator = {{annotazioni di}{annotazioni di}},
+ withintroduction = {{introduzione di}{introduzione di}},
+ withforeword = {{prefazione di}{prefazione di}},
+ withafterword = {{postfazione di}{postfazione di}}
+ }
\endinput
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 ba6c2b445a8..e73a0c88271 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -1,11 +1,11 @@
-% $Id: philosophy-classic.bbx,v 0.7c 2011/05/16 Valbusa$
-% Copyright 2009-2011 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-classic.bbx,v 0.8b 2012/05/06 Valbusa$
+% Copyright 2009-2012 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
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.7c 2011/05/16 valbusa beta$]
+\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.8b 2012/05/06 valbusa beta$]
\RequireBibliographyStyle{authoryear}
\RequireBibliographyStyle{philosophy-standard}
@@ -18,11 +18,13 @@
\settoggle{bbx:square}{#1}}
\ExecuteBibliographyOptions{%
-uniquename=false,
-pagetracker,
-singletitle=false,
-square=false,
-mergedate=basic}
+uniquename =false,
+pagetracker =true,
+singletitle =false,
+square =false,
+mergedate =basic,
+dashed=false,
+}
%$$$$$$
\newcounter{maxnamesincross}
@@ -32,34 +34,34 @@ mergedate=basic}
% AT BEGIN SHORTHANDS
%*****************************************
\AtBeginShorthands{%
-\togglefalse{bbx:annotation}
-\renewcommand{\labelnamepunct}{\addcomma\space}
+\togglefalse{bbx:annotation}%
+\renewcommand{\labelnamepunct}{\addcomma\space}%
\renewbibmacro*{publocyear}{%
- \iflistundef{publisher}{}
- {\printlist{publisher}}
+ \iflistundef{publisher}{}%
+ {\printlist{publisher}}%
\setunit*{\addcomma\space}%
\printlist{location}%
\setunit*{\space}%
\printtext{\printfield{labelyear}}%
- \newunit}
+ \newunit}%
\renewbibmacro*{loccolonpub}{%
\printlist{location}%
- \iflistundef{publisher}
- {\setunit*{\addspace}}
+ \iflistundef{publisher}%
+ {\setunit*{\addspace}}%
{\setunit*{\addcolon\space}}%
\printlist{publisher}%
\setunit*{\addcomma\space}%
\printtext{\printfield{labelyear}}%
- \newunit}
+ \newunit}%
\renewbibmacro*{locpubyear}{%
\printlist{location}%
- \iflistundef{publisher}
- {\setunit*{\addspace}}
+ \iflistundef{publisher}%
+ {\setunit*{\addspace}}%
{\setunit*{\addcomma\space}}%
\printlist{publisher}%
\setunit*{\addcomma\space}%
\printtext{\printfield{labelyear}}%
- \newunit}
+ \newunit}%
\renewbibmacro*{date+extrayear}{}}
% AT BEGIN DOCUMENT
@@ -76,44 +78,58 @@ mergedate=basic}
%*********************************************************************
% NUOVE MACRO
%*********************************************************************
-
-% mergedate=basic
-%\renewbibmacro*{date+extrayear}{%
-% \iffieldundef{labelyear}
-% {}
-% {\printtext[parens]{%
-% \printfield{labelyear}%
-% \printfield{extrayear}}}}%
-% \renewbibmacro*{date}{%
-% \iffieldundef{month}
-% {}
-% {\printdate}}%
\renewbibmacro*{issue+date}{%
\ifboolexpr{
test {\iffieldundef{issue}}
and
test {\iffieldundef{month}}
}
- {}
+ {}%
{\ifdefstring{\bbx@volnumformat}{volnumparens}
{\printtext{%
- \printfield{issue}%
- \setunit*{\addspace}%
- \printdate}}%
- {\printtext[parens]{%
- \printfield{issue}%
- \setunit*{\addspace}%
- \printdate}}}%
+ \printfield{issue}% \setunit*{\addspace}%
+ \printdate
+ }}{\printtext[parens]{%
+ \printfield{issue}% \setunit*{\addspace}%
+ \printdate
+ }}}%
\newunit}%
% changed
+\renewbibmacro*{author}{%
+ \ifboolexpr{
+ test \ifuseauthor
+ and
+ not test {\ifnameundef{author}}
+ }%
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}
+ {\usebibmacro{bbx:savehash}%
+ \printnames{author}%
+ \iffieldundef{nameaddon}{}%
+ {\setunit{\addspace}%
+ \printtext[brackets]{\printfield{nameaddon}}}%
+ \iffieldundef{authortype}
+ {\setunit{\addspace}}
+ {\setunit{\addcomma\space}}}%
+ \iffieldundef{authortype}
+ {}%
+ {\usebibmacro{authorstrg}%
+ \setunit{\addspace}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\addspace}}%
+ \usebibmacro{date+extrayear}}
+
+\renewbibmacro*{editor+others}{%
+ \usebibmacro{bbx:editor}{editorstrg}}
\renewbibmacro*{bbx:editor}[1]{%
\ifboolexpr{
test \ifuseeditor
and
not test {\ifnameundef{editor}}
- }
+ }%
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{editor}%
@@ -126,32 +142,33 @@ mergedate=basic}
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
\usebibmacro{date+extrayear}}
-
-% Macro per la forma ``Publisher, Location Year''.
+
+%**************************************************************
+%``Publisher, Location Year''.
%****************************************************************
\newbibmacro*{publocyear}{%
\iflistundef{publisher}%
- {}
+ {}%
{\printlist{publisher}}
\setunit*{\addcomma\space}%
\printlist{location}%
\newunit}
\newbibmacro*{inpublocyear}{%
\iflistundef{institution}%
- {}
+ {}%
{\printlist{institution}}
\setunit*{\addcomma\space}%
\printlist{location}%
- \newunit}
+ \newunit}
\newbibmacro*{orgpublocyear}{%
\iflistundef{organization}%
- {}
+ {}%
{\printlist{organization}}
\setunit*{\addcomma\space}%
\printlist{location}%
\newunit}
-
-% Macro per la forma ``Location: Publisher, Year''
+%**************************************************************
+%``Location: Publisher, Year''
%****************************************************************
\newbibmacro*{loccolonpub}{%
\printlist{location}%
@@ -173,9 +190,9 @@ mergedate=basic}
{\setunit*{\addspace}}
{\setunit*{\addcolon\space}}%
\printlist{organization}%
- \newunit}
-
-% Macro per la forma ``Location, Publisher, Year''
+ \newunit}
+%**************************************************************
+%``Location, Publisher, Year''
%**************************************************************
\newbibmacro*{locpubyear}{%
\printlist{location}%
@@ -198,10 +215,6 @@ mergedate=basic}
{\setunit*{\addcomma\space}}%
\printlist{organization}%
\newunit}
-
-%*********************************************************************
-%% BIBLIOGRAPHY DRIVERS
-%*********************************************************************
\newbibmacro*{crossdate+extrayear}{%
\iffieldundef{year}%
@@ -210,16 +223,21 @@ mergedate=basic}
\DeclareCiteCommand{\bbx@crossref}
{}%
- {\ifuseeditor{%\ifthenelse{\value{listtotal}=2}
- %{\printnames[][-\value{maxnamesincross}]{labelname}}
- %{\printnames[][-\value{minnamesincross}]{labelname}}
- \printnames{labelname}}
+ {\ifuseeditor{\ifthenelse{\value{listtotal}=2}%
+ {\printnames[][-\value{maxnamesincross}]{labelname}}%
+ {\printnames[][-\value{minnamesincross}]{labelname}}}%
{\usebibmacro{labeltitle}}
\setunit*{\addspace}%
\printtext{\usebibmacro{crossdate+extrayear}}}%
{}%
{}%
+%-----------------------------------------------------------------
+%
+% DRIVERS
+%
+%-----------------------------------------------------------------
+
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -234,11 +252,16 @@ mergedate=basic}
\usebibmacro{in:}%
\iffieldundef{crossref}%
{\usebibmacro{incollection:full}}%
- {\printtext{\setunit{\unspace}}% Thanks to Sander Gliboff
- \bbx@crossref{\thefield{crossref}}%
- \newunit\newblock
- \printfield{userd}%
- \newunit\newblock
+ {\bbx@crossref{\thefield{crossref}}%
+% \newunit\newblock
+% \printfield{userd}%
+% \newunit\newblock
+ \newunit\newblock
+ \iffieldundef{maintitle}
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
+ \newunit
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -247,7 +270,7 @@ mergedate=basic}
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{incolladdendum+pubstate}%
+ \usebibmacro{addendum+pubstate:article-book-incoll}%
\newunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}}
@@ -266,11 +289,16 @@ mergedate=basic}
\usebibmacro{in:}%
\iffieldundef{crossref}%
{\usebibmacro{inbook:full}}%
- {%\printtext{\setunit{\unspace}}% Thanks to Sander Gliboff
- \bbx@crossref{\thefield{crossref}}%
- \newunit\newblock
- \printfield{userd}%
- \newunit\newblock
+ {\bbx@crossref{\thefield{crossref}}%
+% \newunit\newblock
+% \printfield{userd}%
+% \newunit\newblock
+ \newunit\newblock
+ \iffieldundef{maintitle}
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
+ \newunit
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -279,10 +307,9 @@ mergedate=basic}
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{inbookaddendum+pubstate}%
+ \usebibmacro{addendum+pubstate:article-book-incoll}%
\newunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}}
-
-
+
\endinput \ No newline at end of file
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 dc495a44c8b..a2ce4572079 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
@@ -1,21 +1,25 @@
-% $Id: philosophy-classic.cbx,v 0.7c 2011/05/16 Valbusa$
-% Copyright 2009-2011 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-classic.cbx,v 0.8b 2012/05/06 Valbusa$
+% Copyright 2009-2012 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
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-classic.cbx}[philosophy-classic.cbx,v 0.7c 2011/05/16 valbusa beta$]
+\ProvidesFile{philosophy-classic.cbx}[philosophy-classic.cbx,v 0.8b 2012/05/06 valbusa beta$]
\RequireCitationStyle{authoryear-comp}
\newtoggle{cbx:scauthorscite}
+\newtoggle{cbx:shorthandintro}
\DeclareBibliographyOption{scauthorscite}[true]{%
\settoggle{cbx:scauthorscite}{#1}}
+\DeclareBibliographyOption{shorthandintro}[true]{%
+ \settoggle{cbx:shorthandintro}{#1}}
\ExecuteBibliographyOptions{%
-scauthorscite=false,
-}
+scauthorscite = false,
+citetracker = true,
+shorthandintro = true}
% AT EVERY CITE
%*************************************************************
@@ -26,6 +30,7 @@ scauthorscite=false,
\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}%
{}%
}
+
%******************************
% hyperlink for names
%*****************************
@@ -41,55 +46,126 @@ scauthorscite=false,
\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
\fi
\usebibmacro{name:andothers}}}
-
-\newbibmacro*{textcitet}{%
- \iffieldequals{namehash}{\cbx@lasthash}
- {\iffieldundef{shorthandt}
+
+% ''shorthand intro'' implementation
+%---------------------
+
+\newbibmacro*{cite:noshorthand}{%
+\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+ {\usebibmacro{cite:label}%
+ \setunit{\addspace}%
+ \usebibmacro{cite:labelyear+extrayear}%
+ \usebibmacro{cite:reinit}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+ \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+ {\setunit{\addcomma}%
+ \usebibmacro{cite:extrayear}}
+ {\setunit{\compcitedelim}%
+ \usebibmacro{cite:labelyear+extrayear}%
+ \savefield{labelyear}{\cbx@lastyear}}}
+ {\printnames{labelname}%
+ \setunit{\nameyeardelim}%
+ \usebibmacro{cite:labelyear+extrayear}%
+ \savefield{namehash}{\cbx@lasthash}%
+ \savefield{labelyear}{\cbx@lastyear}}}}
+
+\renewbibmacro*{cite}{%
+ \iffieldundef{shorthand}
+ {\usebibmacro{cite:noshorthand}}
+ {\iftoggle{cbx:shorthandintro}%
+ {%
+ \ifciteseen{\usebibmacro{cite:shorthand}}%
+ {\usebibmacro{cite:noshorthand}%
+ \usebibmacro{shorthandintro}}%
+ }%
+ {\usebibmacro{cite:shorthand}}%
+ \usebibmacro{cite:reinit}}%
+ \setunit{\multicitedelim}}
+
+\renewbibmacro*{textcite}{%
+ \iffieldequals{namehash}{\cbx@lasthash}%
+ {\iffieldundef{shorthand}%noshorthand
{\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
- \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+ \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
{\setunit{\addcomma}%
- \usebibmacro{cite:extrayear}}
+ \usebibmacro{cite:extrayear}}%
{\setunit{\compcitedelim}%
\usebibmacro{cite:labelyear+extrayear}%
- \savefield{labelyear}{\cbx@lastyear}}}
- {\setunit{\compcitedelim}%
- \usebibmacro{cite:shorthand}%
- \global\undef\cbx@lastyear}}
- {\ifnameundef{labelname}
- {\iffieldundef{shorthand}
+ \savefield{labelyear}{\cbx@lastyear}}}%
+ {\setunit{\compcitedelim}%shorthand
+ \iftoggle{cbx:shorthandintro}%
+ {\ifciteseen
+ {\usebibmacro{cite:shorthand}}%
+ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+ \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
+ {\setunit{\addcomma}%
+ \usebibmacro{cite:extrayear}}%
+ {\setunit{\compcitedelim}%
+ \usebibmacro{cite:labelyear+extrayear}%
+ \savefield{labelyear}{\cbx@lastyear}}%
+ \usebibmacro{shorthandintro}}}%
+ {\usebibmacro{cite:shorthand}}%
+ \global\undef\cbx@lastyear}}%
+ {\ifnameundef{labelname}%
+ {\iffieldundef{shorthand}%shorthand
{\usebibmacro{cite:label}%
\setunit{%
\global\booltrue{cbx:parens}%
\addspace\bibopenparen}%
- \ifnumequal{\value{citecount}}{1}
- {\usebibmacro{prenote}}
- {}%
- \usebibmacro{cite:labelyear+extrayear}}
- {\usebibmacro{cite:shorthand}}}
+ \ifnumequal{\value{citecount}}{1}%
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{cite:shorthand}}%
+ \usebibmacro{cite:labelyear+extrayear}}%
+ {\iftoggle{cbx:shorthandintro}%
+ {\ifciteseen%shorthand
+ {\usebibmacro{cite:shorthand}}%
+ {\usebibmacro{cite:label}%
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}%
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{cite:shorthand}}%
+ \usebibmacro{cite:labelyear+extrayear}%
+ \usebibmacro{shorthandintro}}}}%
+ {\usebibmacro{cite:shorthand}}}%
{\printnames{labelname}%
\setunit{%
\global\booltrue{cbx:parens}%
\addspace\bibopenparen}%
- \ifnumequal{\value{citecount}}{1}
- {\usebibmacro{prenote}}
+ \ifnumequal{\value{citecount}}{1}%
+ {\usebibmacro{prenote}}%
{}%
- \iffieldundef{shorthand}
- {\iffieldundef{labelyear}
- {\usebibmacro{cite:label}}
+ \iffieldundef{shorthand}%noshorthand
+ {\iffieldundef{labelyear}%
+ {\usebibmacro{cite:label}}%
{\usebibmacro{cite:labelyear+extrayear}}%
- \savefield{labelyear}{\cbx@lastyear}}
- {\usebibmacro{cite:shorthand}%
+ \savefield{labelyear}{\cbx@lastyear}}%
+ {\iftoggle{cbx:shorthandintro}%
+ {\ifciteseen%
+ {\usebibmacro{cite:shorthand}}%
+ {\iffieldundef{labelyear}%
+ {\usebibmacro{cite:label}}%
+ {\usebibmacro{cite:labelyear+extrayear}}%
+ \savefield{labelyear}{\cbx@lastyear}%
+ \usebibmacro{shorthandintro}}%
\global\undef\cbx@lastyear}%
+ {\usebibmacro{cite:shorthand}}}%
\savefield{namehash}{\cbx@lasthash}}}%
\setunit{%
- \iftoggle{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
+ \ifbool{cbx:parens}%
+ {\bibcloseparen\global\boolfalse{cbx:parens}}%
{}%
- \multicitedelim}}
+ \multicitedelim}}%
+
+\renewbibmacro*{cite:shorthand}{%
+ \printtext[bibhyperref]{\printfield{shorthand}}}
%********************************************************************
-% hypelink for \citetitle and \citeyear commands
+% hyperlinks for \citetitle and \citeyear commands
%*******************************************************************
+
\DeclareCiteCommand{\citetitle}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
@@ -127,22 +203,13 @@ scauthorscite=false,
\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
{\multicitedelim}
{\usebibmacro{postnote}}
-
+
\DeclareCiteCommand{\footcitet}[\mkbibfootnote]
- {\usebibmacro{cite:init}%
- \usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{textcitet}}
- {}
- {\bibcloseparen\setunit{\postnotedelim}%
- \printfield{postnote}%
- \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
- {\setunit{}}
- {\setunit{%
- \iftoggle{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}}}
+ {\usebibmacro{cite:init}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{textcite}}
+ {}%
+ {\usebibmacro{textcite:postnote}}
\endinput
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 4bc6c1bff6e..907555b7dd8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
@@ -1,11 +1,11 @@
-% $Id: philosophy-modern.bbx,v 0.7c 2011/05/16 Valbusa$
-% Copyright 2009-2011 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-modern.bbx,v 0.8b 2012/05/06 Valbusa$
+% Copyright 2009-2012 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
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.7c 2011/05/16 valbusa beta$]
+\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.8b 2012/05/06 valbusa beta$]
\RequireBibliographyStyle{philosophy-classic}
@@ -14,6 +14,7 @@
\settoggle{bbx:yearleft}{#1}}
\ExecuteBibliographyOptions{%
+dashed=true,
yearleft=false}
%% new lengths
@@ -48,7 +49,7 @@ yearleft=false}
\makebox[\bibhang][r]{%
\printtext{%
\iffieldundef{year}%
- {\bibstring{nodate}}%
+ {}%
{\printfield{labelyear}\printfield{extrayear}}%
\hskip\yeartitle}}}
@@ -75,11 +76,14 @@ yearleft=false}
{}%MOD
{\usebibmacro{bbx:savehash}%
\printnames{author}%
- \iffieldundef{authortype}
+ \iffieldundef{nameaddon}{}%
+ {\setunit{\addspace}%
+ \printtext[brackets]{\printfield{nameaddon}}}%
+ \iffieldundef{authortype}
{}%
{\setunit{\addcomma\space}}%
\usebibmacro{authorstrg}%
- \setunit{\addspace}
+% \setunit{\addspace}% ?
\postsep%ADD
}}%
{\global\undef\bbx@lasthash
@@ -92,7 +96,7 @@ yearleft=false}
test \ifuseeditor
and
not test {\ifnameundef{editor}}
- }
+ }%
{\usebibmacro{bbx:dashcheck}
{}% removed \bibnamedash
{\printnames{editor}%
@@ -106,7 +110,77 @@ yearleft=false}
{\usebibmacro{#1}\setunit{\addcomma\space}}{}%
}
+
+ % restoreclassic
+%%---------------------------------------------------
+\define@key{blx@bib}{restoreclassic}[true]{%
+ \ifstrequal{#1}{true}
+ {
+\setlength{\bibhang}{\parindent}
+\renewcommand{\labelnamepunct}{\addcomma\space}
+ \renewbibmacro*{date+extrayear}{%mergedate=basic
+ \iffieldundef{labelyear}
+ {}
+ {\printtext[parens]{%
+ \printfield{labelyear}%
+ \printfield{extrayear}}}}%
+
+\renewbibmacro*{author}{%
+ \ifboolexpr{
+ test \ifuseauthor
+ and
+ not test {\ifnameundef{author}}
+ }%
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}
+ {\usebibmacro{bbx:savehash}%
+ \printnames{author}%
+ \iffieldundef{nameaddon}{}%
+ {\setunit{\addspace}%
+ \printtext[brackets]{\printfield{nameaddon}}}%
+ \iffieldundef{authortype}
+ {\setunit{\addspace}}
+ {\setunit{\addcomma\space}}}%
+ \iffieldundef{authortype}
+ {}%
+ {\usebibmacro{authorstrg}%
+ \setunit{\addspace}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\addspace}}%
+ \usebibmacro{date+extrayear}}
+
+\renewbibmacro*{bbx:editor}[1]{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }%
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}
+ {\printnames{editor}%
+ \setunit{\addspace}%
+ \usebibmacro{bbx:savehash}}%
+ \usebibmacro{#1}%
+ \clearname{editor}%
+ \setunit{\addspace}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\addspace}}%
+ \usebibmacro{date+extrayear}}
+
+\renewbibmacro*{labeltitle}{%
+ \iffieldundef{label}
+ {\iffieldundef{shorttitle}
+ {\printfield{title}%
+ \clearfield{title}}
+ {\printfield[title]{shorttitle}}}
+ {\printfield{label}}}
+}
+ {}}
+
+
%%---------------------------------------------------------------------------------------------
% BIBLIOGRAPHY DRIVERS
%%---------------------------------------------------------------------------------------------
@@ -199,4 +273,5 @@ yearleft=false}
\usebibmacro{pageref}%
\usebibmacro{finentry}}
+
\endinput \ No newline at end of file
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 d5bcdf95044..ccac27098ac 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
@@ -1,10 +1,10 @@
-% $Id: philosophy-modern.cbx,v 0.7c 2011/05/16 Valbusa$
-% Copyright 2009-2011 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-modern.cbx,v 0.8b 2012/05/06 Valbusa$
+% Copyright 2009-2012 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
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-modern.cbx}[philosophy-modern.cbx,v 0.7c 2011/05/16 valbusa beta$]
+\ProvidesFile{philosophy-modern.cbx}[philosophy-modern.cbx,v 0.8b 2012/05/06 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 206a3af52e2..df1ffb96318 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
@@ -1,24 +1,18 @@
-% $Id: philosophy-standard.bbx,v 0.7c 2011/05/16Valbusa$
-% Copyright 2009-2011 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-standard.bbx,v 0.8b 2012/05/06 Valbusa$
+% Copyright 2009-2012 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
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-standard.bbx}[$Id: philosophy-standard.bbx,v 0.7c 2011/05/16 valbsua beta $]
+\ProvidesFile{philosophy-standard.bbx}[$Id: philosophy-standard.bbx,v 0.8b 2012/05/06 valbsua beta $]
\RequireBibliographyStyle{standard}
\DeclareLanguageMapping{italian}{italian-philosophy}
\DeclareLanguageMapping{english}{english-philosophy}
-%***********************************************************************************************************
-%
-% DECLARE AND EXECUTE BIBLIOGRAPHY OPTIONS
-%
-%***********************************************************************************************************
-
% boolean options
-%---------------------------------
+
\newtoggle{bbx:annotation}
\newtoggle{bbx:library}
\newtoggle{bbx:scauthors}
@@ -27,6 +21,7 @@
\newtoggle{bbx:origbrackets}
\newtoggle{bbx:inbeforejournal}
\newtoggle{bbx:romanvol}
+\newtoggle{bbx:classical}
\DeclareBibliographyOption{annotation}[true]{%
\settoggle{bbx:annotation}{#1}}
@@ -42,46 +37,53 @@
\settoggle{bbx:origbrackets}{#1}}
\DeclareBibliographyOption{inbeforejournal}[true]{%
\settoggle{bbx:inbeforejournal}{#1}}
+\DeclareBibliographyOption{classical}[true]{%
+ \settoggle{bbx:classical}{#1}}
% multi value options
-%---------------------------------
+
\newcommand{\bbx@publocformat}{}
\newcommand{\bbx@volnumformat}{}
\newcommand{\bbx@origfieldsformat}{}
-\newcommand{\bbx@origfieldstype}{}
+\newcommand{\bbx@origfields}{}
\newcommand{\bbx@editionformat}{}
\newcommand{\bbx@volumeformat}{}
-
\DeclareBibliographyOption{publocformat}[publocyear]{%
\renewcommand{\bbx@publocformat}{#1}}
-\DeclareBibliographyOption{volnumformat}[volnumdefault]{%
+\DeclareBibliographyOption{volnumformat}[plain]{%
\renewcommand{\bbx@volnumformat}{#1}}
\DeclareBibliographyOption{origfieldsformat}[semicolon]{%
\renewcommand{\bbx@origfieldsformat}{#1}}
-\DeclareBibliographyOption{origfieldstype}[true]{%
- \renewcommand{\bbx@origfieldstype}{#1}}
+\DeclareBibliographyOption{origfields}[true]{%
+ \renewcommand{\bbx@origfields}{#1}}
\DeclareBibliographyOption{editionformat}[arabic]{%
\renewcommand{\bbx@editionformat}{#1}}
\DeclareBibliographyOption{volumeformat}[arabic]{%
\renewcommand{\bbx@volumeformat}{#1}}
+\DeclareEntryOption{origed}[true]{%
+ \renewcommand{\bbx@origfields}{origed}}
+
% Execute options
-%---------------------------------
-\ExecuteBibliographyOptions{%
- publocformat=publocyear,
- annotation=false,
- library=true,
- scauthors=false,
- scauthorsbib=false,
- origfieldsformat=semicolon,
- inbeforejournal=false,
- volnumformat=volnumdefault,
- origfieldsformat=semicolon,
- editionformat=arabic,
- volumeformat=arabic,
-}
+\ExecuteBibliographyOptions{%
+ publocformat = publocyear,
+ annotation = false,
+ library = true,
+ scauthors = false,
+ scauthorsbib = false,
+ origfieldsformat= semicolon,
+ inbeforejournal = false,
+ volnumformat = plain,
+ editionformat = arabic,
+ volumeformat = arabic,
+ maxcitenames = 2,
+ mincitenames = 1,
+ maxbibnames = 999,
+ minbibnames = 999,
+ classical = false,
+ }
% AT BEGIN SHORTHANDS
%****************************************
\AtBeginShorthands{\togglefalse{bbx:annotation}}
@@ -93,7 +95,7 @@
\DeclareNameFormat{sortname}{%
\ifnumequal{\value{listcount}}{1}
{\iffirstinits
- {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+ {\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}}}}%
\ifblank{#3#5}
{}
@@ -132,12 +134,12 @@
\endgroup}
% Definisco ora alcuni comandi che servono per il formato dei campi.
-\newcommand{\annotationfont}{\sffamily}
+\newcommand{\annotationfont}{\footnotesize}
\newcommand{\libraryfont}{}
% Nuovi comandi per avere la traduzione tra parentesi
\newcommand{\origleftparen}{\pureopenparen}
-\newcommand{\origrightparen}{\purecoseparen}
+\newcommand{\origrightparen}{\purecloseparen}
\newcommand{\origleftbracket}{\bibleftbracket}
\newcommand{\origrightbracket}{\bibrightbracket}
\newcommand{\backrefleftparen}{\pureopenparen}
@@ -178,68 +180,60 @@
\expandafter\editionfont
\expandafter{\romannumeral#1}%
\endgroup}
-
-\appto\biburlsetup{\Urlmuskip=0mu\relax}% Thanks to Enrico Gregorio
-
+
% fields format
%----------------------------------------------
-
% TITLE
\DeclareFieldFormat[bookinbook]{title}{\mkbibemph{#1}}
\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat[review]{title}{#1}
+\DeclareFieldFormat[review]{title}{\bibstring{reviewof}\addspace{#1}}
+\DeclareFieldFormat[review]{volume}{%
+ \ifdefstring{\bbx@volnumformat}{strings}{%
+ \bibstring{volume}\addnbspace\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}{\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}}
\DeclareFieldFormat[inreference]{title}{\mkbibquote{#1}}
-
% CITETITLE
-\DeclareFieldFormat[inbook]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[bookinbook]{citetitle}{\mkbibemph{#1}}
\DeclareFieldFormat[thesis]{citetitle}{\mkbibemph{#1}}
-
% ORIGTITLE
\DeclareFieldFormat{origtitle}{\mkbibemph{#1}}
-
+\DeclareFieldFormat[article]{origtitle}{\mkbibquote{#1}}
% USERA
\DeclareFieldFormat{usera}{\mkbibemph{#1}}
-\DeclareFieldFormat[article]{usera}{\mkbibquote{#1}}
+%\DeclareFieldFormat[article]{usera}{\mkbibquote{#1}}
\DeclareFieldFormat[bookinbook]{usera}{\mkbibemph{#1}}
\DeclareFieldFormat[inbook]{usera}{\mkbibemph{#1}}
\DeclareFieldFormat[incollection]{usera}{\mkbibquote{#1}}
-
% USERC
\DeclareFieldFormat{userc}{\mkpageprefix[bookpagination]{#1}}
-
% URL
\DeclareFieldFormat{url}{\url{#1}}
-
+% EDITION
\DeclareFieldFormat{edition}{%
\ifinteger{#1}
{\ifdefstring{\bbx@editionformat}{arabic}
{\mkbibordedition{#1}~\bibstring{edition}}
{\edfnt{#1}~\bibstring{edition}}}%
{#1\isdot}}
-
% ANNOTATION LIBRARY
\DeclareFieldFormat{annotation}{\annotationfont #1}
\DeclareFieldFormat{library}{\libraryfont #1}
-
% PARENS
\DeclareFieldFormat{backrefparens}{\mkpureparens{#1}}
\DeclareFieldFormat{pureparens}{\mkpureparens{#1}}
-
+% NUMBER
\DeclareFieldFormat{number}{%
- \ifdefstring{\bbx@volnumformat}{volnumstrings}{%
+ \ifdefstring{\bbx@volnumformat}{strings}{%
\bibstring{number}\adddotspace #1}{#1}}% number in a series
\DeclareFieldFormat[article]{number}{%
- \ifdefstring{\bbx@volnumformat}{volnumstrings}{%
+ \ifdefstring{\bbx@volnumformat}{strings}{%
\bibstring{number}\adddotspace #1}{#1}}% number in a series
-
+% VOLUME
\DeclareFieldFormat{volume}{\bibstring{volume}~\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}% volume of a book
-
\DeclareFieldFormat[article]{volume}{%
- \ifdefstring{\bbx@volnumformat}{volnumstrings}{%
+ \ifdefstring{\bbx@volnumformat}{strings}{%
\bibstring{volume}\addnbspace\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}{\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}}
-
-
+% SERIES
\DeclareFieldFormat{series}{%
\ifinteger{#1}
{\mkbibordseries{#1}~\bibstring{jourser}}
@@ -247,7 +241,6 @@
% NEW MACROS
%***********************************************
-
\renewbibmacro*{citeindex}{%
\ifciteindex{\indexnames{labelname}}{}}
\renewbibmacro*{bibindex}{%
@@ -258,7 +251,6 @@
\indexnames{editorc}}%
{}}%
-
\renewbibmacro*{pageref}{%
\iflistundef{pageref}
{}
@@ -289,27 +281,29 @@
{\usebibmacro{orgpublocyear}}}}
-%**************************************************
-
-\newbibmacro*{origfields}{%
- \iflistundef{origlocation}%
- {}%
- {\ifdefstring{\bbx@origfieldsformat}{parens}
- {\setunit{\addspace\origleftparen}}%
- {\ifdefstring{\bbx@origfieldsformat}{brackets}{%
- \setunit{\addspace\origleftbracket}}{\setunit{\addsemicolon\space}}}%
- \iffieldundef{reprinttitle}%
- {\printtext{\ifdefstring{\bbx@origfieldstype}{edorig}{\bibstring{edorig}}{\bibstring{transtolang}}}\nopunct}
- {\printtext{\bibstring{reprint}}\nopunct}
- \setunit{\addspace}%
- \iffieldundef{reprinttitle}%
- {\usebibmacro{origtitle}}%
- {\usebibmacro{reprinttitle}}%
- \newunit\newblock
- \usebibmacro{origpublisher+origlocation+origdate}%
- \ifdefstring{\bbx@origfieldsformat}{parens}
- {\origrightparen}%
- {\ifdefstring{\bbx@origfieldsformat}{brackets}{\origrightbracket}{}}}}
+\renewbibmacro*{annotation}{%
+\iftoggle{bbx:library}{%
+\setunit{\addperiod\space}%
+ \iffieldundef{library}%
+ {\printfield[library]{\bibannotationprefix\thefield{entrykey}.tex}}
+ {\printfield{library}}}%
+ {}}%
+
+
+\renewbibmacro*{finentry}{%
+ \iftoggle{bbx:annotation}%
+ {\iffieldundef{annotation}%
+ {\finentry}%
+ {\setunit{\addperiod\par\nobreak\vspace*{.5ex}}%
+ \printtext[annotation]{\printfield{annotation}\finentry\par}}}%
+ {\finentry}}
+
+
+
+% ORIGFIELDS
+
+
+% origpublisher+origlocation+origdate
\newbibmacro*{origpublisher+origlocation+origdate}{%
\ifdefstring{\bbx@publocformat}{loccolonpub}
@@ -319,303 +313,257 @@
\printfield{userc}}
{\usebibmacro{origpublocyear}\setunit{\bibpagespunct}%
\printfield{userc}}}}
+\newbibmacro*{origpublocyear}{%% ``Publisher, Location Year''
+ \iflistundef{origpublisher}%
+ {\printlist{origlocation}%
+ \setunit*{\addspace}%
+ \printorigdate}%
+ {\printlist{origpublisher}%
+ \setunit*{\addcomma\space}%
+ \printlist{origlocation}%
+ \setunit*{\addspace}%
+ \printorigdate}%
+ \newunit}
+\newbibmacro*{origloccolonpub}{%% ``Location: Publisher, Year''
+ \iflistundef{origlocation}{}%
+ {\printlist{origlocation}}%
+ \iflistundef{origpublisher}%
+ {\setunit*{\addspace}%
+ \printorigdate}%
+ {\setunit*{\addcolon\space}%
+ \printlist{origpublisher}%
+ \setunit*{\addcomma\space}%
+ \printorigdate}%
+ \newunit}
+\newbibmacro*{origlocpubyear}{%% ``Location, Publisher, Year''
+ \iflistundef{origlocation}{}%
+ {\printlist{origlocation}}%
+ \iflistundef{origpublisher}%
+ {\setunit*{\addspace}%
+ \printorigdate}%
+ {\setunit*{\addcomma\space}%
+ \printlist{origpublisher}%
+ \setunit*{\addcomma\space}%
+ \printorigdate}%
+ \newunit}
+
+% reprinttitle
+\newbibmacro*{reprinttitle}{%
+ \iffieldundef{reprinttitle}{}{%
+ \iffieldsequal{reprinttitle}{title}{}{%
+ \printfield[title]{reprinttitle}%
+ \setunit{\addcomma\space}}}%
+ \iffieldundef{userb}{}{%
+ \printfield{userb}}}%
-% Questa macro gestisce la forma: ``Publisher, Location Year'', relativamente alla traduzione
-%***********************************************************************************************************
-\newbibmacro*{origpublocyear}{%
-\iflistundef{origpublisher}%
- {\printlist{origlocation}%
- \setunit*{\addspace}%
- \printorigdate}%
- {\printlist{origpublisher}%
- \setunit*{\addcomma\space}%
- \printlist{origlocation}%
- \setunit*{\addspace}%
- \printorigdate}%
- \newunit}
-
-% Questa macro gestisce la forma: ``Location: Publisher, Year'', relativamente alla traduzione
-%***********************************************************************************************************
-\newbibmacro*{origloccolonpub}{%
-\iflistundef{origlocation}{}%
- {\printlist{origlocation}}%
- \iflistundef{origpublisher}%
- {\setunit*{\addspace}%
- \printorigdate}%
- {\setunit*{\addcolon\space}%
- \printlist{origpublisher}%
- \setunit*{\addcomma\space}%
- \printorigdate}%
- \newunit}
-
- % Questa macro gestisce la forma: ``Location, Publisher, Year'', relativamente alla traduzione
-%***********************************************************************************************************
-\newbibmacro*{origlocpubyear}{%
-\iflistundef{origlocation}{}%
- {\printlist{origlocation}}%
- \iflistundef{origpublisher}%
- {\setunit*{\addspace}%
- \printorigdate}%
- {\setunit*{\addcomma\space}%
- \printlist{origpublisher}%
- \setunit*{\addcomma\space}%
- \printorigdate}%
- \newunit}
-
-% La macro che gestisce il titolo della traduzione (origtitle)
-%***********************************************************************************************************
-\newbibmacro*{origtitle}{%
+% transorigstring
+
+\newbibmacro*{transorigstring}{%
+ \iffieldundef{reprinttitle}%
+ {\printtext{\ifdefstring{\bbx@origfields}{origed}
+ {\bibstring{origed}}%
+ {\bibstring{transtolang}}}\nopunct}%
+ {\printtext{\bibstring{reprint}}}\nopunct}
+ %nopunct
+ %serve se si ha solo ``origlocation + origdate''
+
+% origtitle:book
+
+\newbibmacro*{origtitle:book}{%
\iffieldundef{origtitle}{}{
\printfield[origtitle]{origtitle}%
\setunit{\addcomma\space}}
\iffieldundef{userb}{}{%
- \printfield{userb}%
- }}
-
-% La macro che gestisce il titolo della ristampa (reprinttitle)
-%***********************************************************************************************************
-\newbibmacro*{reprinttitle}{%
- \iffieldundef{reprinttitle}{}{%
- \iffieldsequal{reprinttitle}{title}{}{%
- \printfield[title]{reprinttitle}%
- \setunit{\addcomma\space}}}
- \iffieldundef{userb}{}{%
- \printfield{userb}%
- }}
-
-% La macro che gestisce il titolo della traduzione (origtitle) nelle voci incollection
-%***********************************************************************************************************
-\newbibmacro*{origtitle:incollection}{%
- \iflistundef{origlocation}{}{%
-\ifdefstring{\bbx@origfieldsformat}{parens}
- {\setunit{\addspace\origleftparen}}%
- {\ifdefstring{\bbx@origfieldsformat}{brackets}{\setunit{\addspace\origleftbracket}}{\setunit{\addsemicolon\space}}}%
- \printtext{\bibstring{transtolang}%
- \iffieldundef{usera}%
- {\setunit{\addspace}}%
- {\setunit{\addspace}%
- \printfield[usera]{usera}%
- \setunit{\addcomma\space}%
- \usebibmacro{in:}}%
- \setunit{\addspace}%
- \newblock
- \iffieldundef{origtitle}{}{%
- \printfield[origtitle]{origtitle}%
- \setunit{\addcomma\space}}
- \iffieldundef{userb}{}{%
- \printfield{userb}%
- \newunit}
- \usebibmacro{origpublisher+origlocation+origdate}%
-\ifdefstring{\bbx@origfieldsformat}{parens}
- {\origrightparen}%
- {\ifdefstring{\bbx@origfieldsformat}{brackets}{\origrightbracket}{}}}}}
-
-% La macro che gestisce il titolo della traduzione (origtitle) nelle voci inbook
-%***********************************************************************************************************
-\newbibmacro*{origtitle:inbook}{%
- \iflistundef{origlocation}{}{%
-\ifdefstring{\bbx@origfieldsformat}{parens}
- {\setunit{\addspace\origleftparen}}%
- {\ifdefstring{\bbx@origfieldsformat}{brackets}{\setunit{\addspace\origleftbracket}}{\setunit{\addsemicolon\space}}}%
- \printtext{\bibstring{transtolang}%
- \iffieldundef{usera}%
- {\setunit{\addspace}}%
- {\setunit{\addspace}%
- \printfield{usera}%
- \setunit{\addcomma\space}%
- \usebibmacro{in:}}%
- \setunit{\addspace}%
- \newblock
- \iffieldundef{origtitle}{}{%
- \printfield[origtitle]{origtitle}%
- \setunit{\addcomma\space}}%
- \iffieldundef{userb}{}{%
- \printfield{userb}%
- \newunit}%
- \usebibmacro{origpublisher+origlocation+origdate}%
-\ifdefstring{\bbx@origfieldsformat}{parens}
- {\origrightparen}%
- {\ifdefstring{\bbx@origfieldsformat}{brackets}{\origrightbracket}{}}}}}
-
-\newbibmacro*{articletranslated}{%
- \iflistundef{origlocation}{}{%
-\ifdefstring{\bbx@origfieldsformat}{parens}
- {\setunit{\addspace\origleftparen}}%
- {\ifdefstring{\bbx@origfieldsformat}{brackets}{\setunit{\addspace\origleftbracket}}{\setunit{\addsemicolon\space}}}%
- \printtext{\bibstring{transtolang}%
- \iffieldundef{usera}%
- {\setunit{\addspace}}%
- {\setunit{\addspace}%
- \printfield{usera}%
- \setunit{\addcomma\space}%
- \usebibmacro{in:}}%
- \setunit{\addspace}%
- \iffieldundef{origtitle}{}{%
- \printfield[origtitle]{origtitle}%
- \newunit\newblock}
- \iffieldundef{userb}{}{%
- \printfield{userb}
- \newunit}
- \usebibmacro{origpublisher+origlocation+origdate}%
-\ifdefstring{\bbx@origfieldsformat}{parens}
- {\origrightparen}%
- {\ifdefstring{\bbx@origfieldsformat}{brackets}{\origrightbracket}{}}}}}
+ \printfield{userb}}}%
+% origtitledata:book
-
- \renewbibmacro*{annotation}{%
-\iftoggle{bbx:library}{%
-\setunit{\addperiod\space}%
- \iffieldundef{library}
- {\printfile[library]{\bibannotationprefix\thefield{entrykey}.tex}}
- {\printfield{library}}}
- {}
- }
-
-\renewbibmacro*{finentry}{%
- \iftoggle{bbx:annotation}%
- {\iffieldundef{annotation}%
- {\finentry}%
- {\setunit{\addperiod\par\nobreak}%
- \printtext[annotation]{\printfield{annotation}\finentry\par}}}%
- {\finentry}}
+\newbibmacro*{origtitledata:book}{%
+ \usebibmacro{transorigstring}%
+ \iffieldundef{reprinttitle}%
+ {\usebibmacro{origtitle:book}}%
+ {\usebibmacro{reprinttitle}}%
+ \newunit\newblock
+ \usebibmacro{origpublisher+origlocation+origdate}}
+% origdata:book
- \renewbibmacro*{addendum+pubstate}{%
- \printfield{addendum}%
- \newunit\newblock
- \printfield{pubstate}%
-\ifdefstring{\bbx@origfieldstype}{false}{}{%
- \newunit\newblock
- \usebibmacro{origfields}}
- \newunit\newblock
- \usebibmacro{annotation}%
-}
-
- \newbibmacro*{artaddendum+pubstate}{%
- \printfield{addendum}%
- \newunit\newblock
- \printfield{pubstate}%
-\ifdefstring{\bbx@origfieldstype}{false}{}{%
- \newunit\newblock
- \usebibmacro{articletranslated}}%
- \newunit\newblock
- \usebibmacro{annotation}%
-}
+\newbibmacro*{origdata:book}{%
+ \iffieldundef{origyear}%
+ {}%
+ {\ifdefstring{\bbx@origfieldsformat}{parens}
+ {\printtext[pureparens]{\usebibmacro{origtitledata:book}}}
+ {\ifdefstring{\bbx@origfieldsformat}{brackets}
+ {\printtext[brackets]{\usebibmacro{origtitledata:book}}}
+ {\setunit{\addsemicolon\space}%
+ \printtext{\usebibmacro{origtitledata:book}}}}}}
-% Questa Ë una nuova macro, analoga alla pecedente, ma per le voci \bibtype{inbook}
-%***********************************************************************************************************
- \newbibmacro*{inbookaddendum+pubstate}{%
- \printfield{addendum}%
- \newunit\newblock
- \printfield{pubstate}%
-\ifdefstring{\bbx@origfieldstype}{false}{}{%
- \newunit\newblock
- \usebibmacro{origtitle:inbook}}%
- \newunit\newblock
- \usebibmacro{annotation}%
-}
-
-% Questa Ë una nuova macro, analoga alla pecedente, ma per le voci \bibtype{incollection}
-%***********************************************************************************************************
- \newbibmacro*{incolladdendum+pubstate}{%
- \printfield{addendum}%
- \newunit\newblock
- \printfield{pubstate}%
-\ifdefstring{\bbx@origfieldstype}{false}{}{%
- \newunit\newblock
- \usebibmacro{origtitle:incollection}}%
- \newunit\newblock
- \usebibmacro{annotation}%
-}
+% origtitle:article-inbook-incoll
+\newbibmacro*{origtitle:article-inbook-incoll}{%
+ \iffieldundef{origtitle}{}{%
+ \printfield[origtitle]{origtitle}%
+ \setunit{\addcomma\space}}
+\iffieldundef{usera}{}{%
+ \usebibmacro{in:}%
+ \printfield{usera}%
+ \setunit{\addcomma\space}}%
+ \iffieldundef{userb}{}{%
+ \printfield{userb}%
+ \newunit}}
+
+% origtitledata:article-inbook-incoll
+
+\newbibmacro*{origtitledata:article-inbook-incoll}{%
+ \usebibmacro{transorigstring}%
+ \setunit{\addspace}%
+ \usebibmacro{origtitle:article-inbook-incoll}%
+ \usebibmacro{origpublisher+origlocation+origdate}}
+
+% origdata:article-inbook
+
+\newbibmacro*{origdata:article-inbook}{%
+ \iflistundef{origlocation}{}{%
+ \ifdefstring{\bbx@origfieldsformat}{parens}
+ {\printtext[pureparens]{\usebibmacro{origtitledata:article-inbook-incoll}}}
+ {\ifdefstring{\bbx@origfieldsformat}{brackets}
+ {\printtext[brackets]{\usebibmacro{origtitledata:article-inbook-incoll}}}
+ {\setunit{\addsemicolon\space}%
+ \printtext{\usebibmacro{origtitledata:article-inbook-incoll}}}}}}
+
+% addendum+pubstate
+
+\renewbibmacro*{addendum+pubstate}{%
+ \printfield{addendum}%
+ \newunit\newblock
+ \printfield{pubstate}%
+ \ifdefstring{\bbx@origfields}{none}{}{%
+ \newunit\newblock
+ \usebibmacro{origdata:book}}
+ \newunit\newblock
+ \usebibmacro{annotation}}
+
+\newbibmacro*{addendum+pubstate:article-book-incoll}{%
+ \printfield{addendum}%
+ \newunit\newblock
+ \printfield{pubstate}%
+ \ifdefstring{\bbx@origfields}{none}{}{%
+ \newunit\newblock
+ \usebibmacro{origdata:article-inbook}}%
+ \newunit\newblock
+ \usebibmacro{annotation}}
+
+\renewbibmacro*{series+number}{%
+ \printfield{series}%
+ \setunit*{\addcomma\space}%
+ \printfield{number}%
+ \newunit}
- \renewbibmacro*{series+number}{%
- \printfield{series}%
- \setunit*{\addcomma\space}%
- \printfield{number}%
- \newunit}
-
+% volnum option
\newbibmacro*{volnumdefault}{%
-\printfield{volume}%
- \setunit*{\volnumpunct}%
- \printfield{number}}
+ \printfield{volume}%
+ \setunit*{\volnumpunct}%
+ \printfield{number}}
\newbibmacro*{volnumparens}{%
-\nopunct%
-\printtext[pureparens]{%
-\printfield{volume}%
- \setunit*{\volnumpunct}%
- \printfield{number}}\addcomma\space}
+ \nopunct%
+ \printtext[pureparens]{%
+ \printfield{volume}%
+ \setunit*{\volnumpunct}%
+ \printfield{number}}\addcomma\space}
\newbibmacro*{volnumstrings}{%
-\iffieldundef{volume}{}{%
-\printfield{volume}%
-\setunit*{\volnumpunct}}%
-\iffieldundef{number}{}{%
-\printfield{number}}}
+ \iffieldundef{volume}{}{%
+ \printfield{volume}%
+ \setunit*{\volnumpunct}}%
+ \iffieldundef{number}{}{%
+ \printfield{number}}}
\renewbibmacro*{journal}{%
- \iffieldundef{journaltitle}
- {}
- {\printtext[journaltitle]{%
- \printfield[titlecase]{journaltitle}%
- \midsentence%MOD############
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{journalsubtitle}}}}
+ \iffieldundef{journaltitle}
+ {}
+ {\printtext[journaltitle]{%
+ \printfield[titlecase]{journaltitle}%
+ \midsentence%MOD############
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{journalsubtitle}}}}
\renewbibmacro*{periodical}{%
- \iffieldundef{title}
- {}
- {\printtext[title]{%
- \printfield[titlecase]{title}%
- \midsentence%MOD#############
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{subtitle}}}}
+ \iffieldundef{title}
+ {}
+ {\printtext[title]{%
+ \printfield[titlecase]{title}%
+ \midsentence%MOD#############
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{subtitle}}}}
- \renewbibmacro*{journal+issuetitle}{%
- \usebibmacro{journal}%
- \setunit*{\addspace}%
- \iffieldundef{series}
- {}
- {\newunit
- \printfield{series}%
- \setunit{\addspace}\midsentence}%
- \newunit%
- \ifdefstring{\bbx@volnumformat}{volnumstrings}{\usebibmacro{volnumstrings}}%
- {\ifdefstring{\bbx@volnumformat}{volnumparens}{\usebibmacro{volnumparens}}%
- {\usebibmacro{volnumdefault}}}%
- \setunit{\addcomma\space}%
- \printfield{eid}%
- \setunit{\addspace}%
- \usebibmacro{issue+date}%
- \setunit{\addcolon\space}%
- \usebibmacro{issue}%
- \newunit}
+\renewbibmacro*{journal+issuetitle}{%
+ \usebibmacro{journal}%
+ \setunit*{\addspace}%
+ \iffieldundef{series}
+ {}
+ {\newunit
+ \printfield{series}%
+ \setunit{\addspace}\midsentence}%
+ \newunit%
+ \ifdefstring{\bbx@volnumformat}{strings}
+ {\usebibmacro{volnumstrings}}%
+ {\ifdefstring{\bbx@volnumformat}{parens}
+ {\usebibmacro{volnumparens}}%
+ {\usebibmacro{volnumdefault}}}%
+ \setunit{\addcomma\space}%
+ \printfield{eid}%
+ \setunit{\addspace}%
+ \usebibmacro{issue+date}%
+ \setunit{\addcolon\space}%
+ \usebibmacro{issue}%
+ \newunit}
-
\renewbibmacro*{title+issuetitle}{%
- \usebibmacro{periodical}%
- \setunit*{\addspace}%
- \iffieldundef{series}
- {}
- {\newunit
- \printfield{series}%
- \setunit{\addspace}\midsentence}%
- \newunit
- \ifdefstring{\bbx@volnumformat}{volnumstrings}{\usebibmacro{volnumstrings}}%
- {\ifdefstring{\bbx@volnumformat}{volnumparens}{\usebibmacro{volnumparens}}%
- {\usebibmacro{volnumdefault}}}%
- \setunit{\addcomma\space}%
- \printfield{eid}%
- \setunit{\addspace}%
- \usebibmacro{issue+date}%
- \setunit{\addcolon\space}%
- \usebibmacro{issue}%
- \newunit}
-
+ \usebibmacro{periodical}%
+ \setunit*{\addspace}%
+ \iffieldundef{series}
+ {}
+ {\newunit
+ \printfield{series}%
+ \setunit{\addspace}\midsentence}%
+ \newunit
+ \ifdefstring{\bbx@volnumformat}{strings}%
+ {\usebibmacro{volnumstrings}}%
+ {\ifdefstring{\bbx@volnumformat}{parens}%
+ {\usebibmacro{volnumparens}}%
+ {\usebibmacro{volnumdefault}}}%
+ \setunit{\addcomma\space}%
+ \printfield{eid}%
+ \setunit{\addspace}%
+ \usebibmacro{issue+date}%
+ \setunit{\addcolon\space}%
+ \usebibmacro{issue}%
+ \newunit}
+
+\renewbibmacro*{event+venue+date}{%v0.8
+ \printfield{eventtitle}%
+ \ifboolexpr{
+ test {\iffieldundef{venue}}
+ and
+ test {\iffieldundef{eventyear}}
+ }
+ {}
+ {\setunit*{\addspace}%
+ \printtext{%\printtext[parens]{%IVAN
+ \printfield{venue}%
+ \setunit*{\addcomma\space}%
+ \printeventdate}}%
+ \newunit}
+
+
+%-----------------------------------------------------------------
+%
+% DRIVERS
+%
+%-----------------------------------------------------------------
\DeclareBibliographyDriver{article}{%
\usebibmacro{bibindex}%
@@ -645,102 +593,24 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{artaddendum+pubstate}%
- \newunit\newblock
- \usebibmacro{pageref}%
- \usebibmacro{finentry}}
-
- \DeclareBibliographyDriver{book}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor+others/translator+others}%
- \setunit{\labelnamepunct}\newblock
- \usebibmacro{maintitle+title}%
- \newunit
- \printlist{language}%
- \newunit\newblock
- \usebibmacro{byauthor}%
- \newunit\newblock
- \usebibmacro{byeditor+others}%
- \newunit\newblock
- \printfield{edition}%
- \newunit
- \printfield{volumes}%
- \newunit\newblock
- \usebibmacro{series+number}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \usebibmacro{publisher+location+date}%
- \newunit\newblock
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \usebibmacro{chapter+pages}%
- \newunit
- \printfield{pagetotal}%
- \newunit\newblock
- \iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \usebibmacro{addendum+pubstate:article-book-incoll}%
\newunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{collection}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{editor+others}%
- \setunit{\labelnamepunct}\newblock
- \usebibmacro{maintitle+title}%
- \newunit
- \printlist{language}%
+%v0.8b nuova versione
+ \newbibmacro*{incollection:full}{%
+ \usebibmacro{maintitle+booktitle}%
\newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
\printfield{edition}%
\newunit
- \printfield{volumes}%
- \newunit\newblock
- \usebibmacro{series+number}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \usebibmacro{publisher+location+date}%
- \newunit\newblock
- \iffieldundef{maintitle}
+ \iffieldundef{maintitle}
{\printfield{volume}%
\printfield{part}}
{}%
\newunit
-\usebibmacro{chapter+pages}%
- \newunit
- \printfield{pagetotal}%
- \newunit\newblock
- \iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \usebibmacro{addendum+pubstate}%
- \newunit\newblock
- \usebibmacro{pageref}%
- \usebibmacro{finentry}}
-
- \newbibmacro*{incollection:full}{%
- \usebibmacro{maintitle+booktitle}%
- \newunit\newblock
- \usebibmacro{byeditor+others}%
- \newunit\newblock
- \printfield{edition}%
- \newunit
\printfield{volumes}%
\newunit\newblock
\usebibmacro{series+number}%
@@ -749,11 +619,6 @@
\newunit\newblock
\usebibmacro{publisher+location+date}%
\newunit\newblock
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -762,13 +627,14 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{incolladdendum+pubstate}%
- \newunit\newblock
+ \usebibmacro{addendum+pubstate:article-book-incoll}%
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
-
+
+% v0.8b NUOVA VERSIONE
\newbibmacro*{inbook:full}{%
- \usebibmacro{bybookauthor}%
+ \usebibmacro{bybookauthor}%
\newunit\newblock
\usebibmacro{maintitle+booktitle}%
\newunit\newblock
@@ -776,6 +642,11 @@
\newunit\newblock
\printfield{edition}%
\newunit
+ \iffieldundef{maintitle}
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
+ \newunit
\printfield{volumes}%
\newunit\newblock
\usebibmacro{series+number}%
@@ -784,11 +655,6 @@
\newunit\newblock
\usebibmacro{publisher+location+date}%
\newunit\newblock
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -797,9 +663,15 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{inbookaddendum+pubstate}%
- \newunit\newblock
+ \usebibmacro{addendum+pubstate:article-book-incoll}%
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
+
+
+
+
+
+
\endinput \ No newline at end of file
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 e5581d8fbb6..8e1e4a698c8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -1,18 +1,49 @@
-% $Id: philosophy-verbose.bbx,v 0.7c 2011/05/16 Valbusa$
-% Copyright 2009-2011 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-verbose.bbx,v 0.8b 2012/05/06 Valbusa$
+% Copyright 2009-2012 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
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-verbose.bbx}[$Id: philosophy-verbose.bbx,v 0.7c 2011/05/16valbsua beta $]
+\ProvidesFile{philosophy-verbose.bbx}[$Id: philosophy-verbose.bbx,v 0.8b 2012/05/06 valbsua beta $]
\RequireBibliographyStyle{authortitle}
\RequireBibliographyStyle{philosophy-standard}
+\renewbibmacro*{bbx:editor}[1]{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}
+ {\printnames{editor}%
+ \setunit{\addspace}% #MOD#
+ \usebibmacro{bbx:savehash}}%
+ \usebibmacro{#1}%
+ \clearname{editor}}
+ {\global\undef\bbx@lasthash}}
+
+\renewbibmacro*{author}{%
+ \ifboolexpr{
+ test \ifuseauthor
+ and
+ not test {\ifnameundef{author}}
+ }
+ {\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}}
%**************************************************************
-% Macro per la forma ``Publisher, Location Year''.
+%``Publisher, Location Year''.
%**************************************************************
\newbibmacro*{publocyear}{%
\iflistundef{publisher}%
@@ -23,7 +54,6 @@
\setunit*{\addspace}%
\usebibmacro{date}%
\newunit}
-
\newbibmacro*{inpublocyear}{%
\iflistundef{institution}%
{}%
@@ -33,7 +63,6 @@
\setunit*{\addspace}%
\usebibmacro{date}%
\newunit}
-
\newbibmacro*{orgpublocyear}{%
\iflistundef{organization}%
{}%
@@ -44,7 +73,7 @@
\usebibmacro{date}%
\newunit}
%**************************************************************
-% Macro per la forma ``Location: Publisher, Year''
+%``Location: Publisher, Year''
%**************************************************************
\newbibmacro*{loccolonpub}{%
\printlist{location}%
@@ -55,7 +84,6 @@
\setunit*{\addcomma\space}%
\usebibmacro{date}%
\newunit}
-
\newbibmacro*{inloccolonpub}{%
\printlist{location}%
\iflistundef{institution}
@@ -65,7 +93,6 @@
\setunit*{\addcomma\space}%
\usebibmacro{date}%
\newunit}
-
\newbibmacro*{orgloccolonpub}{%
\printlist{location}%
\iflistundef{organization}
@@ -76,7 +103,7 @@
\usebibmacro{date}%
\newunit}
%**************************************************************
-% Macro per la forma ``Location, Publisher, Year''
+%``Location, Publisher, Year''
%**************************************************************
\newbibmacro*{locpubyear}{%
\printlist{location}%
@@ -87,7 +114,6 @@
\setunit*{\addcomma\space}%
\usebibmacro{date}%
\newunit}
-
\newbibmacro*{inlocpubyear}{%
\printlist{location}%
\iflistundef{institution}
@@ -97,7 +123,6 @@
\setunit*{\addcomma\space}%
\usebibmacro{date}%
\newunit}
-
\newbibmacro*{orglocpubyear}{%
\printlist{location}%
\iflistundef{organization}
@@ -108,31 +133,18 @@
\usebibmacro{date}%
\newunit}
-%********************************************************************
-\renewbibmacro*{bbx:editor}[1]{%
- \ifboolexpr{
- test \ifuseeditor
- and
- not test {\ifnameundef{editor}}
- }
- {\usebibmacro{bbx:dashcheck}
- {\bibnamedash}
- {\printnames{editor}%
- \setunit{\addspace}% #MOD#
- \usebibmacro{bbx:savehash}}%
- \usebibmacro{#1}%
- \clearname{editor}}
- {\global\undef\bbx@lasthash}}
-
+%-----------------------------------------------------------------
+%
+% DRIVERS
+%
+%-----------------------------------------------------------------
-%**************************************************************
-% DRIVERS
-%**************************************************************
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator+others}%
- \setunit{\labelnamepunct}\newblock
+ \setunit{\labelnamepunct}
+ \newblock
\usebibmacro{title}%
\newunit
\printlist{language}%
@@ -143,8 +155,7 @@
\iffootnote{%
\iffieldundef{crossref}%
{\usebibmacro{incollection:full}}%
- {\printtext{\setunit{\unspace}}% Thanks to Sander Gliboff
- \cbx@crossref{\thefield{crossref}}%
+ {\cbx@crossref{\thefield{crossref}}%
\newunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}}{\usebibmacro{incollection:full}}%
@@ -165,8 +176,7 @@
\iffootnote{%
\iffieldundef{crossref}%
{\usebibmacro{inbook:full}}%
- {\printtext{\setunit{\unspace}}% Thanks to Sander Gliboff
- \cbx@inbookcrossref{\thefield{crossref}}%
+ {\cbx@inbookcrossref{\thefield{crossref}}%
\newunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}}{\usebibmacro{inbook:full}}%
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 24253e2033a..52bca74dca4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
@@ -1,11 +1,11 @@
-% $Id: philosophy-verbose.cbx,v 0.7c 2011/05/16 17:00:00 15:42:33 valbusa beta $
-% Copyright 2009-2011 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-verbose.cbx,v 0.8b 2012/05/06 valbusa beta $
+% Copyright 2009-2012 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
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
\ProvidesFile{philosophy-verbose.cbx}
-[$Id: philosophy-verbose.cbx,v 0.7c 2011/05/16 valbusa beta $]
+[$Id: philosophy-verbose.cbx,v 0.8b 2012/05/06 Valbusa$]
\RequireCitationStyle{verbose-trad2}
@@ -26,28 +26,32 @@
commacit=false}
\AtEveryCite{%
- \togglefalse{bbx:annotation}
- \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}}}{}}
+ \togglefalse{bbx:annotation}%
+ \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}}}{}}
\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}}
+ \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}}
-% MACROS
-%***********************************
+
+\newbibmacro*{cite:opcit}{%
+ \printtext[bibhyperlink]{\bibstring[\mkibid]{opcit}}}
+
\newbibmacro*{cite:loccit}{%
\printtext{%
\bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
@@ -61,75 +65,56 @@
\bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
\bibstring[\mkibid]{ibidem}}}}}%
- \renewbibmacro*{cite:title}{%
- \ifsingletitle{\bibstring[\mkibid]{opcit}}{
+\renewbibmacro*{cite:title}{%OK
+ \ifsingletitle{\usebibmacro{cite:opcit}}{%
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}%
- \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}
+ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
{\setunit{\addspace\midsentence}}}%
- \bibstring{cit}\midsentence}}
+ \bibstring{cited}\midsentence}}
- \renewbibmacro*{cite:full}{%
+ \renewbibmacro*{cite:full}{%OK
\usebibmacro{cite:full:citepages}%
\global\toggletrue{cbx:fullcite}%
\printtext[bibhypertarget]{%
\usedriver
- {\iftoggle{cbx:scauthorscite}{\DeclareNameAlias{sortname}{scdefault}}{\DeclareNameAlias{sortname}{default}}}
+ {\iftoggle{cbx:scauthorscite}{%
+ \DeclareNameAlias{sortname}{scdefault}}%
+ {\DeclareNameAlias{sortname}{default}}}%
{\thefield{entrytype}}}%
\usebibmacro{shorthandintro}}
-\newbibmacro*{ccite}{%
- \global\togglefalse{cbx:loccit}%
- \bibhypertarget{cite\the\value{instcount}}{%
- \ifciteseen
- {\iffieldundef{shorthand}
- {\ifciteibid
- {\usebibmacro{cite:ibid}}
- {\usebibmacro{cite:title}}%
- \usebibmacro{cite:save}}
- {\usebibmacro{cite:shorthand}}}
- {\usebibmacro{ccite:full}%
- \usebibmacro{cite:save}}}}
-
-\newbibmacro*{ccite:full}{%
- \renewbibmacro*{author}{}%
- \renewbibmacro*{editor}{}%
- \renewbibmacro*{translator}{}%
- \renewbibmacro*{editor+others}{}%
- \printtext[bibhypertarget]{%
- \usedriver
- {\DeclareNameAlias{sortname}{default}}
- {\thefield{entrytype}}}%
- \usebibmacro{shorthandintro}}
+\DeclareNameFormat{noname}{}
-% COMMANDS
-%***********************************
-\DeclareCiteCommand{\ccite}
- {\usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{ccite}}
- {\multicitedelim}
- {\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\ccite}
+ {\usebibmacro{prenote}\unspace\addspace}%
+ {\global\togglefalse{cbx:loccit}%
+ \usedriver{\DeclareNameAlias{sortname}{noname}}
+ {\thefield{entrytype}}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\cbx@crossref}
- {\let\scshape\normalfont}% per evitare il maiuscoletto all'interno della voce
+ {}%
{\ifciteseen{\usebibmacro{editor+others}%
\setunit*{\addcomma\space}\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}%
\iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
{\setunit{\addspace\midsentence}}%
- \bibstring{cit}}}{\usebibmacro{incollection:full}}}%
+ \bibstring{cited}}}{\usebibmacro{incollection:full}}}%
{}%
{}%
\DeclareCiteCommand{\cbx@inbookcrossref}
- {\let\scshape\normalfont}% per evitare il maiuscoletto all'interno della voce
- {\ifciteseen{\usebibmacro{bybookauthor}%
- \setunit*{\addcomma\space}\printtext[bibhyperlink]{%
- \printfield[citetitle]{labeltitle}%
- \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
- {\setunit{\addspace\midsentence}}%
- \bibstring{cit}}}{\usebibmacro{inbook:full}}}%
+ {}%
+ {\ifciteseen
+ {\usebibmacro{bybookauthor}\setunit*{\addcomma\space}%
+ \printtext[bibhyperlink]{%
+ \printfield[citetitle]{labeltitle}%
+ \iftoggle{cbx:commacit}
+ {\setunit{\addcomma\space}}%
+ {\setunit{\addspace\midsentence}}%
+ \bibstring{cited}}}{\usebibmacro{inbook:full}}}%
{}%
{}%