summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-philosophy
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-22 00:35:44 +0000
committerKarl Berry <karl@freefriends.org>2010-11-22 00:35:44 +0000
commit85f7041e0b2f447c48856bffbd4943c0ffc0a94c (patch)
treefc3bf72fedb71b11353c25de929ab51d86404146 /Master/texmf-dist/tex/latex/biblatex-philosophy
parent7e6df8f048b4e07863f71df4d22ed7761ee38913 (diff)
biblatex-philosophy (21nov10)
git-svn-id: svn://tug.org/texlive/trunk@20530 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.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx7
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx105
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx17
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx72
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx266
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx22
9 files changed, 331 insertions, 181 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 d11936fc1fc..65b92e41b41 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
@@ -1,22 +1,23 @@
% english-philosophy.lbx,Ivan Valbusa 2010
-\ProvidesFile{english-philosophy.lbx}[2010/03/23 v 0.6 biblatex localization file for biblatex-philosophy]
+\ProvidesFile{english-philosophy.lbx}[2010/11/20 v 0.7b biblatex localization file for biblatex-philosophy]
\InheritBibliographyExtras{english}
-\NewBibliographyString{transtolang}
+\NewBibliographyString{transtolang,cit,reviewof}
\DeclareBibliographyStrings{%
inherit={english},
- opcit = {{cit\adddot}{cit\adddot}},
+ cit = {{cit\adddot}{cit\adddot}},
+ andothers = {{\mkbibemph{et\addabbrvspace al\adddot}}{\mkbibemph{et\addabbrvspace al\adddot}}},
ibidem = {{ivi}{ivi}},
loccit = {{ibidem}{ibidem}},
transtolang = {{eng\adddotspace trans\adddot}{eng\adddotspace trans\adddot}},
- andothers = {{\mkbibemph{et\addabbrvspace al\adddot}}{\mkbibemph{et\addabbrvspace al\adddot}}},
- editor = {{\mkpureparens{edited by}}{\mkpureparens{ed\adddotspace by}}},
- editors = {{\mkpureparens{edited by}}{\mkpureparens{ed\adddotspace by}}},
+ 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}},
}
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 1b5ef97cd84..489ee7e8860 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
@@ -1,14 +1,14 @@
% italian-philosophy.lbx,Ivan Valbusa 2010
-\ProvidesFile{italian-philosophy.lbx}[2010/03/23 v 0.6 biblatex localization file for biblatex-philosophy]
+\ProvidesFile{italian-philosophy.lbx}[2010/11/20 v 0.7b biblatex localization file for biblatex-philosophy]
\InheritBibliographyExtras{italian}
-\NewBibliographyString{transtolang}
+\NewBibliographyString{transtolang,cit,reviewof}
\DeclareBibliographyStrings{%
inherit={italian},
- opcit = {{cit\adddot}{cit\adddot}},
+ cit = {{cit\adddot}{cit\adddot}},
ibidem = {{ivi}{ivi}},
loccit = {{ibidem}{ibidem}},
backrefpage = {{Citato a pagina}{Citato a p\adddot}},
@@ -20,6 +20,7 @@
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}},
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 97f3104edd1..af0b0a9066c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -1,22 +1,18 @@
-% $Id: philosophy-classic.bbx,v 0.7a 2010/04/03 Valbusa$
+% $Id: philosophy-classic.bbx,v 0.7b 2010/11/20 Valbusa$
% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
% Permission is granted to copy, distribute and/or modify this software under the
% terms of the LaTeX Project Public License, version 1.3c
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.7a 2010/04/03 valbusa beta$]
+\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.7b 2010/11/20 valbusa beta$]
\RequireBibliographyStyle{authoryear}
\RequireBibliographyStyle{philosophy-standard}
-\DeclareLanguageMapping{italian}{italian-philosophy}
-\DeclareLanguageMapping{english}{english-philosophy}
-%***********************************************************************************************************
-%
-% DECLARE AND EXECUTE BIBLIOGRAPHY OPTIONS
-%
-%***********************************************************************************************************
+
+% DECLARE AND EXECUTE BIBLIOGRAPHY OPTIONS
+%*********************************************************************
\newbool{bbx:square}
@@ -35,11 +31,8 @@ square=false}
\newcounter{minnamesincross}
-%***********************************************************************************************************
-%
-% AT BEGIN SHORTHANDS
-%
-%***********************************************************************************************************
+% AT BEGIN SHORTHANDS
+%*****************************************
\AtBeginShorthands{%
\boolfalse{bbx:annotation}
\renewcommand{\labelnamepunct}{\addcomma\space}
@@ -71,11 +64,8 @@ square=false}
\newunit}
\renewbibmacro*{date+extrayear}{}}
-%***********************************************************************************************************
-%
-% AT BEGIN DOCUMENT
-%
-%***********************************************************************************************************
+% AT BEGIN DOCUMENT
+%**************************************************
\AtBeginDocument{%
\setcounter{maxnamesincross}{\value{maxnames}}
\setcounter{minnamesincross}{\value{minnames}}
@@ -85,8 +75,6 @@ square=false}
\renewcommand{\bibcloseparen}{\bibclosebracket}}
{}}
-
-
%*********************************************************************
% NUOVE MACRO
%*********************************************************************
@@ -99,39 +87,38 @@ square=false}
\renewbibmacro*{issue+date}{%
\ifdefstring{\bbx@volnumformat}{volnumparens}
-{\printtext{%
+{\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}}{}{\printtext{%
\iffieldundef{issue}
{\printfield{month}}%
- {\printfield{issue}}}}%
+ {\printfield{issue}}}}}%
{\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}}{}{\printtext[parens]{%
\iffieldundef{issue}
- {\printfield{month}}
- {\printfield{issue}}}}}
+ {\printfield{month}}%
+ {\printfield{issue}}}}}%
\newunit}
% changed
+
\renewbibmacro*{bbx:editor}[1]{%
\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
- \NOT\iffirstonpage}
+ \NOT\iffirstonpage\AND
+ \(\NOT\boolean{bbx@inset}\OR
+ \iffieldequalstr{entrysetcount}{1}\)}
{\bibnamedash}
{\printnames{editor}%
\setunit{\addspace}%
- \usebibmacro{date+extrayear}%
- \setunit*{\addspace}%
- \savefield{fullhash}{\bbx@lasthash}}%
+ \usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
\clearname{editor}%
\setunit{\addspace}}%
{\global\undef\bbx@lasthash
\usebibmacro{labeltitle}%
- \setunit*{\addspace}%
- \usebibmacro{date+extrayear}%
- }%
-}
-
+ \setunit*{\addspace}}%
+ \usebibmacro{date+extrayear}}
+
% Macro per la forma ``Publisher, Location Year''.
-%***********************************************************************************************************
+%****************************************************************
\newbibmacro*{publocyear}{%
\iflistundef{publisher}%
{}
@@ -157,7 +144,7 @@ square=false}
\newunit}
% Macro per la forma ``Location: Publisher, Year''
-%***********************************************************************************************************
+%****************************************************************
\newbibmacro*{loccolonpub}{%
\printlist{location}%
\iflistundef{publisher}%
@@ -183,7 +170,7 @@ square=false}
\newunit}
% Macro per la forma ``Location, Publisher, Year''
-%***********************************************************************************************************
+%**************************************************************
\newbibmacro*{locpubyear}{%
\printlist{location}%
\iflistundef{publisher}%
@@ -215,23 +202,19 @@ square=false}
\newbibmacro*{crossdate+extrayear}{%
\iffieldundef{year}%
{}%
- {\unspace\printtext[parens]{\printdateextra}}}
+ {\printtext[parens]{\printdateextra}}}
-
- \DeclareCiteCommand{\bbx@crossref}
+\DeclareCiteCommand{\bbx@crossref}
+ {}%
+ {\ifuseeditor{%\ifthenelse{\value{listtotal}=2}
+ %{\printnames[][-\value{maxnamesincross}]{labelname}}
+ %{\printnames[][-\value{minnamesincross}]{labelname}}
+ \printnames{labelname}}
+ {\usebibmacro{labeltitle}}
+ \setunit*{\addspace}%
+ \printtext{\usebibmacro{crossdate+extrayear}}}%
+ {}%
{}%
- {\ifsingletitle%
- {\printtext{\ifthenelse{\value{listtotal}=2}
- {\printnames[][-\value{maxnamesincross}]{labelname}}
- {\printnames[][-\value{minnamesincross}]{labelname}}}}%
- {\ifthenelse{\value{listtotal}=2}
- {\printnames[][-\value{maxnamesincross}]{labelname}}
- {\printnames[][-\value{minnamesincross}]{labelname}}
- \setunit{\addspace}%
- \printtext{\usebibmacro{crossdate+extrayear}}}}%
- {\unspace}%
- {\unspace}
-
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
@@ -253,7 +236,13 @@ square=false}
\printfield{userd}%
\newunit\newblock
\usebibmacro{chapter+pages}%
- \newunit\newblock
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
\usebibmacro{incolladdendum+pubstate}%
\newunit\newblock
\usebibmacro{pageref}%
@@ -273,13 +262,19 @@ square=false}
\usebibmacro{in:}%
\iffieldundef{crossref}%
{\usebibmacro{inbook:full}}%
- {\printtext{\setunit{\unspace}}% Thanks to Sander Gliboff
+ {%\printtext{\setunit{\unspace}}% Thanks to Sander Gliboff
\bbx@crossref{\thefield{crossref}}%
\newunit\newblock
\printfield{userd}%
\newunit\newblock
\usebibmacro{chapter+pages}%
- \newunit\newblock
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
\usebibmacro{inbookaddendum+pubstate}%
\newunit\newblock
\usebibmacro{pageref}%
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 31b038b4974..eab5022f01b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
@@ -1,33 +1,28 @@
-% $Id: philosophy-classic.cbx,v 0.7a 2010/04/03 Valbusa$
+% $Id: philosophy-classic.cbx,v 0.7b 2010/11/20 Valbusa$
% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
% Permission is granted to copy, distribute and/or modify this software under the
% terms of the LaTeX Project Public License, version 1.3c
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-classic.cbx}[philosophy-classic.cbx,v 0.7a 2010/04/03 valbusa beta$]
+\ProvidesFile{philosophy-classic.cbx}[philosophy-classic.cbx,v 0.7b 2010/11/20 valbusa beta$]
-\RequireCitationStyle{authoryear-comp}
-\DeclareLanguageMapping{italian}{italian-philosophy}
+\RequireCitationStyle{authoryear-icomp}
\newbool{cbx:scauthorscite}
-\newbool{cbx:hypernames}
\DeclareBibliographyOption{scauthorscite}[true]{%
\csuse{bool#1}{cbx:scauthorscite}}
-\DeclareBibliographyOption{hypernames}[true]{%
- \csuse{bool#1}{cbx:hypernames}}
\ExecuteBibliographyOptions{%
scauthorscite=false,
-hypernames=false
}
-%***********************************************************************************************************
+%***************************************************************************************************
%
% AT EVERY CITE
%
-%***********************************************************************************************************
+%***************************************************************************************************
\AtEveryCite{%
\ifbool{cbx:scauthorscite}%
{\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}%
@@ -35,8 +30,6 @@ hypernames=false
\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}%
{}%
}
-
-
%******************************
% hyperlink for names
%*****************************
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 e2f9fc82d9a..9bb0cdbb994 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.7a 2010/04/03 Valbusa$
+% $Id: philosophy-modern.bbx,v 0.7b 2010/11/20 Valbusa$
% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
% Permission is granted to copy, distribute and/or modify this software under the
% terms of the LaTeX Project Public License, version 1.3c
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.7a 2010/04/03 valbusa beta$]
+\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.7b 2010/11/20 valbusa beta$]
\RequireBibliographyStyle{philosophy-classic}
@@ -49,14 +49,14 @@ yearleft=false}
}
\AtBeginShorthands{%
- \renewcommand{\postsep}{}
+ \renewcommand{\postsep}{}%
\renewcommand{\labelnamepunct}{\addcomma\space}}
%%---------------------------------------------------------------------------------------------
% Macro
%%---------------------------------------------------------------------------------------------
-
+%
\renewbibmacro*{date+extrayear}{%
\iffieldundef{year}%
{}%
@@ -70,13 +70,14 @@ yearleft=false}
\iffieldundef{label}%
{\iffieldundef{shorttitle}
{\printfield{title}%
- \clearfield{title}}
- {\printfield[title]{shorttitle}}}
+ \clearfield{title}}%
+ {\printfield[title]{shorttitle}}}%
{\printtext{\printfield{label}}%
\postsep}}
% macro 'author' OKKKKK
%%----------------------------------------------------
+
\renewbibmacro*{author}{%
\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
@@ -86,14 +87,13 @@ yearleft=false}
{}%MOD
{\usebibmacro{bbx:savehash}%
\printnames{author}%
- \postsep%ADD
\iffieldundef{authortype}
- {\setunit{\addspace}}
- {\setunit{\addcomma\space}}}%
- \iffieldundef{authortype}
- {}
- {\usebibmacro{authorstrg}%
- \setunit{\addspace}}}%
+ {}%
+ {\setunit{\addcomma\space}}%
+ \usebibmacro{authorstrg}%
+ \setunit{\addspace}
+ \postsep%ADD
+ }}%
{\global\undef\bbx@lasthash
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
@@ -124,6 +124,52 @@ yearleft=false}
% BIBLIOGRAPHY DRIVERS
%%---------------------------------------------------------------------------------------------
+\newbibmacro*{crosslabeltitle}{%
+ \iffieldundef{label}%
+ {\iffieldundef{shorttitle}
+ {\printfield{title}%
+ \clearfield{title}}%
+ {\printfield[title]{shorttitle}}}%
+ {\printtext{\printfield{label}}}}
+
+\DeclareCiteCommand{\bbx@crossref}
+ {}%
+ {\ifuseeditor{\ifthenelse{\value{listtotal}=2}
+ {\printnames[][-\value{maxnamesincross}]{labelname}}
+ {\printnames[][-\value{minnamesincross}]{labelname}}}
+ {\usebibmacro{crosslabeltitle}}
+ \setunit*{\addspace}%
+ \printtext{\usebibmacro{crossdate+extrayear}}}%
+ {}%
+ {}%
+
+\DeclareBibliographyDriver{periodical}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{editor}%
+ \ifuseeditor{% trick for entry with ``label'' field
+ \setunit{\addcomma\space}}
+ {}\newblock
+ %\setunit{\labelnamepunct}\newblock
+ \usebibmacro{title+issuetitle}%
+ \newunit
+ \printlist{language}%
+ \newunit\newblock
+ \usebibmacro{byeditor}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{issn}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
+
\DeclareBibliographyDriver{collection}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
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 91699524d1e..8988cda1cfa 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.7a 2010/04/03 Valbusa$
+% $Id: philosophy-modern.cbx,v 0.7b 2010/11/20 Valbusa$
% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
% Permission is granted to copy, distribute and/or modify this software under the
% terms of the LaTeX Project Public License, version 1.3c
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-modern.cbx}[philosophy-modern.cbx,v 0.7a 2010/04/03 valbusa beta$]
+\ProvidesFile{philosophy-modern.cbx}[philosophy-modern.cbx,v 0.7b 2010/11/20 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 13ee37c84d5..f434181d5e9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
@@ -1,10 +1,12 @@
-% $Id: philosophy-standard.bbx,v 0.7a 2010/04/03 Valbusa$
+% $Id: philosophy-standard.bbx,v 0.7b 2010/11/20Valbusa$
% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
% Permission is granted to copy, distribute and/or modify this software under the
% terms of the LaTeX Project Public License, version 1.3c
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-standard.bbx}[$Id: philosophy-standard.bbx,v 0.7a 2010/04/03 valbsua beta $]
+\ProvidesFile{philosophy-standard.bbx}[$Id: philosophy-standard.bbx,v 0.7b 2010/11/20 valbsua beta $]
+
+\RequireBibliographyStyle{standard}
\DeclareLanguageMapping{italian}{italian-philosophy}
\DeclareLanguageMapping{english}{english-philosophy}
@@ -34,8 +36,6 @@
\csuse{bool#1}{bbx:scauthors}}
\DeclareBibliographyOption{scauthorsbib}[true]{%
\csuse{bool#1}{bbx:scauthorsbib}}
- \DeclareBibliographyOption{romanvol}[true]{%
- \csuse{bool#1}{bbx:romanvol}}
\DeclareBibliographyOption{origparens}[true]{%
\csuse{bool#1}{bbx:origparens}}
\DeclareBibliographyOption{origbrackets}[true]{%
@@ -48,6 +48,8 @@
\newcommand{\bbx@publocformat}{}
\newcommand{\bbx@volnumformat}{}
\newcommand{\bbx@origfieldsformat}{}
+\newcommand{\bbx@editionformat}{}
+\newcommand{\bbx@volumeformat}{}
\DeclareBibliographyOption{publocformat}[publocyear]{%
\renewcommand{\bbx@publocformat}{#1}}
@@ -55,6 +57,10 @@
\renewcommand{\bbx@volnumformat}{#1}}
\DeclareBibliographyOption{origfieldsformat}[semicolon]{%
\renewcommand{\bbx@origfieldsformat}{#1}}
+\DeclareBibliographyOption{editionformat}[arabic]{%
+ \renewcommand{\bbx@editionformat}{#1}}
+\DeclareBibliographyOption{volumeformat}[arabic]{%
+ \renewcommand{\bbx@volumeformat}{#1}}
% Execute options
@@ -69,21 +75,17 @@
inbeforejournal=false,
volnumformat=volnumdefault,
origfieldsformat=semicolon,
+ editionformat=arabic,
+ volumeformat=arabic,
}
-%***********************************************************************************************************
-%
-% AT BEGIN SHORTHANDS
-%
-%***********************************************************************************************************
-%
+
+% AT BEGIN SHORTHANDS
+%****************************************
\AtBeginShorthands{\boolfalse{bbx:annotation}}
-%***********************************************************************************************************
-%
-% AT BEGIN BILIOGRAPHY
-%
-%***********************************************************************************************************
+% AT BEGIN BILIOGRAPHY
+%****************************************
\AtBeginBibliography{%
% SMALL CAPS AUTHORS NAME
\ifbool{bbx:scauthorsbib}{%
@@ -102,11 +104,8 @@
}{}%
}
-%***********************************************************************************************************
-%
-% AT BEGIN DOCUMENT
-%
-%***********************************************************************************************************
+% AT BEGIN DOCUMENT
+%****************************************
\AtBeginDocument{%
\ifbool{bbx:origbrackets}{\booltrue{bbx:origparens}
\renewcommand{\origleftparen}{\bibleftbracket}
@@ -117,15 +116,11 @@
{}%
}
-%***********************************************************************************************************
-%
-% FIELDS FORMAT
-%
-%***********************************************************************************************************
+% FIELDS FORMAT
+%*****************************************
-%---------------------------------------------------------------------
% new commands
-%---------------------------------------------------------------------
+%---------------------------------------------
\newcommand*{\pureopenparen}{\blx@postpunct(}
\newcommand*{\purecloseparen}{\blx@postpunct)\midsentence}
@@ -153,24 +148,47 @@
\renewcommand*{\subtitlepunct}{\addperiod\space}
\renewcommand*{\intitlepunct}{\nopunct\addspace}
\newcommand*{\volnumpunct}{\addcomma\space}
-\newcommand*{\volumfont}{\uppercase}
+\newcommand*{\volumfont}{%
+ \ifdefstring{\bbx@volumeformat}{romanupp}
+ {\uppercase}%
+ {\ifdefstring{\bbx@volumeformat}{romansc}
+ {\scshape}%
+ {}}% roman lowercase
+}
+
+\newcommand*{\editionfont}{%
+ \ifdefstring{\bbx@editionformat}{romanupp}
+ {\uppercase}%
+ {\ifdefstring{\bbx@editionformat}{romansc}
+ {\scshape}%
+ {}}% roman lowercase
+ }%
+
+% font for volume
\newrobustcmd*{\volfnt}[1]{%
\begingroup
\expandafter\volumfont
\expandafter{\romannumeral#1}%
\endgroup}
-
+
+% font for edition number
+\newrobustcmd*{\edfnt}[1]{%
+ \begingroup
+ \expandafter\editionfont
+ \expandafter{\romannumeral#1}%
+ \endgroup}
+
\appto\biburlsetup{\Urlmuskip=0mu\relax}% Thanks to Enrico Gregorio
-%---------------------------------------------------------------------
% fields format
-%---------------------------------------------------------------------
+%----------------------------------------------
% TITLE
\DeclareFieldFormat[inbook]{title}{\mkbibemph{#1}}
\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[review]{title}{#1}
% CITETITLE
\DeclareFieldFormat[inbook]{citetitle}{\mkbibemph{#1}}
@@ -191,6 +209,13 @@
% URL
\DeclareFieldFormat{url}{\url{#1}}
+\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}
@@ -199,22 +224,37 @@
\DeclareFieldFormat{backrefparens}{\mkpureparens{#1}}
\DeclareFieldFormat{pureparens}{\mkpureparens{#1}}
-\DeclareFieldFormat{number}{\ifdefstring{\bbx@volnumformat}{volnumstrings}{\bibstring{number}\adddotspace #1}{#1}}% number in a series
-\DeclareFieldFormat[article]{number}{\ifdefstring{\bbx@volnumformat}{volnumstrings}{\bibstring{number}\adddotspace #1}{#1}}% number in a series
+\DeclareFieldFormat{number}{%
+ \ifdefstring{\bbx@volnumformat}{volnumstrings}{%
+ \bibstring{number}\adddotspace #1}{#1}}% number in a series
+\DeclareFieldFormat[article]{number}{%
+ \ifdefstring{\bbx@volnumformat}{volnumstrings}{%
+ \bibstring{number}\adddotspace #1}{#1}}% number in a series
+
+\DeclareFieldFormat{volume}{\bibstring{volume}~\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}% volume of a book
+
+\DeclareFieldFormat[article]{volume}{%
+ \ifdefstring{\bbx@volnumformat}{volnumstrings}{%
+ \bibstring{volume}\addnbspace\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}{\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}}
-\DeclareFieldFormat{volume}{\ifdefstring{\bbx@volnumformat}{volnumstrings}{\bibstring{volume}\addnbspace\ifbool{bbx:romanvol}{\volfnt{#1}}{#1}}{\ifbool{bbx:romanvol}{\volfnt{#1}}{#1}}}
-\DeclareFieldFormat[article]{volume}{\ifdefstring{\bbx@volnumformat}{volnumstrings}{\bibstring{volume}\addnbspace\ifbool{bbx:romanvol}{\volfnt{#1}}{#1}}{\ifbool{bbx:romanvol}{\volfnt{#1}}{#1}}}
\DeclareFieldFormat{series}{%
\ifinteger{#1}
{\mkbibordseries{#1}~\bibstring{jourser}}
{\ifbibstring{#1}{\bibstring{#1}}{#1}}}
-%***********************************************************************************************************
-%
-% NEW MACROS
-%
-%***********************************************************************************************************
+% NEW MACROS
+%***********************************************
+
+\renewbibmacro*{citeindex}{%
+\ifciteindex{\indexnames{labelname}}}
+\renewbibmacro*{bibindex}{%
+\ifbibindex{\indexnames{author}%
+\indexnames{editor}%
+\indexnames{editora}%
+\indexnames{editorb}%
+\indexnames{editorc}}%
+{}}%
\renewbibmacro*{pageref}{%
\iflistundef{pageref}
@@ -245,9 +285,8 @@
{\usebibmacro{orglocpubyear}}
{\usebibmacro{orgpublocyear}}}}
-%***********************************************************************************************************
-% Definisco le macro che verranno utilizzate per stampare le informazioni relative alla traduzione, che sono state inserite all'interno dei record bibliografici nei campi orig-.
-%***********************************************************************************************************
+
+%**************************************************
\newbibmacro*{origfields}{%
\iflistundef{origlocation}%
@@ -356,8 +395,8 @@
\printfield[usera]{usera}%
\setunit{\addcomma\space}%
\usebibmacro{in:}}%
- \setunit{\addspace}%
- \newblock
+ \setunit{\addspace}%
+ \newblock
\iffieldundef{origtitle}{}{%
\printfield[origtitle]{origtitle}%
\setunit{\addcomma\space}}
@@ -383,8 +422,8 @@
\printfield{usera}%
\setunit{\addcomma\space}%
\usebibmacro{in:}}%
- \setunit{\addspace}%
- \newblock
+ \setunit{\addspace}%
+ \newblock
\iffieldundef{origtitle}{}{%
\printfield[origtitle]{origtitle}%
\setunit{\addcomma\space}}%
@@ -404,11 +443,11 @@
\printtext{\bibstring{transtolang}%
\iffieldundef{usera}%
{\setunit{\addspace}}%
- {\setunit{\addspace}
+ {\setunit{\addspace}%
\printfield{usera}%
\setunit{\addcomma\space}%
- \usebibmacro{in:}%
- \setunit{\addspace}}%
+ \usebibmacro{in:}}%
+ \setunit{\addspace}%
\iffieldundef{origtitle}{}{%
\printfield[origtitle]{origtitle}%
\newunit\newblock}
@@ -421,10 +460,7 @@
{\ifdefstring{\bbx@origfieldsformat}{brackets}{\origrightbracket}{}}}}}
-
-%***********************************************************************************************************
-%***********************************************************************************************************
-
+
\renewbibmacro*{annotation}{%
\ifbool{bbx:library}{%
\setunit{\addperiod\space}%
@@ -443,8 +479,6 @@
{\finentry}}
-%***********************************************************************************************************
-
\renewbibmacro*{addendum+pubstate}{%
\printfield{addendum}%
\newunit\newblock
@@ -455,8 +489,6 @@
\usebibmacro{annotation}%
}
-%***********************************************************************************************************
-%***********************************************************************************************************
\newbibmacro*{artaddendum+pubstate}{%
\printfield{addendum}%
\newunit\newblock
@@ -467,7 +499,7 @@
\usebibmacro{annotation}%
}
-% Questa è una nuova macro, analoga alla pecedente, ma per le voci \bibtype{inbook}
+% Questa Ë una nuova macro, analoga alla pecedente, ma per le voci \bibtype{inbook}
%***********************************************************************************************************
\newbibmacro*{inbookaddendum+pubstate}{%
\printfield{addendum}%
@@ -479,7 +511,7 @@
\usebibmacro{annotation}%
}
-% Questa è una nuova macro, analoga alla pecedente, ma per le voci \bibtype{incollection}
+% Questa Ë una nuova macro, analoga alla pecedente, ma per le voci \bibtype{incollection}
%***********************************************************************************************************
\newbibmacro*{incolladdendum+pubstate}{%
\printfield{addendum}%
@@ -491,12 +523,10 @@
\usebibmacro{annotation}%
}
-%***********************************************************************************************************
-%***********************************************************************************************************
\renewbibmacro*{series+number}{%
\printfield{series}%
- \setunit*{\addcomma\space}%
+ \setunit*{\addcomma\space}%
\printfield{number}%
\newunit}
@@ -545,8 +575,8 @@
{}
{\newunit
\printfield{series}%
- \setunit{\addspace}}%
- \newunit
+ \setunit{\addspace}\midsentence}%
+ \newunit%
\ifdefstring{\bbx@volnumformat}{volnumstrings}{\usebibmacro{volnumstrings}}%
{\ifdefstring{\bbx@volnumformat}{volnumparens}{\usebibmacro{volnumparens}}%
{\usebibmacro{volnumdefault}}}%
@@ -566,7 +596,7 @@
{}
{\newunit
\printfield{series}%
- \setunit{\addspace}}%
+ \setunit{\addspace}\midsentence}%
\newunit
\ifdefstring{\bbx@volnumformat}{volnumstrings}{\usebibmacro{volnumstrings}}%
{\ifdefstring{\bbx@volnumformat}{volnumparens}{\usebibmacro{volnumparens}}%
@@ -612,19 +642,98 @@
\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}%
+ \newunit\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
- \newbibmacro*{incollection:full}{%
- \usebibmacro{maintitle+booktitle}%
+\DeclareBibliographyDriver{collection}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{editor+others}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{maintitle+title}%
+ \newunit
+ \printlist{language}%
\newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
\printfield{edition}%
\newunit
- \iffieldundef{maintitle}
+ \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}%
+ \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}%
@@ -633,6 +742,11 @@
\newunit\newblock
\usebibmacro{publisher+location+date}%
\newunit\newblock
+ \iffieldundef{maintitle}
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
+ \newunit
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -646,8 +760,8 @@
\usebibmacro{pageref}%
\usebibmacro{finentry}}
- \newbibmacro*{inbook:full}{%
-\usebibmacro{bybookauthor}%
+\newbibmacro*{inbook:full}{%
+ \usebibmacro{bybookauthor}%
\newunit\newblock
\usebibmacro{maintitle+booktitle}%
\newunit\newblock
@@ -655,11 +769,6 @@
\newunit\newblock
\printfield{edition}%
\newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
\printfield{volumes}%
\newunit\newblock
\usebibmacro{series+number}%
@@ -668,6 +777,11 @@
\newunit\newblock
\usebibmacro{publisher+location+date}%
\newunit\newblock
+ \iffieldundef{maintitle}
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
+ \newunit
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
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 9d1d9c0a24f..1a198961653 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -1,11 +1,11 @@
-% $Id: philosophy-verbose.bbx,v 0.7a 2010/04/03 Valbusa$
+% $Id: philosophy-verbose.bbx,v 0.7b 2010/11/20 Valbusa$
% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
% Permission is granted to copy, distribute and/or modify this software under the
% terms of the LaTeX Project Public License, version 1.3c
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-\ProvidesFile{philosophy-verbose.bbx}[$Id: philosophy-verbose.bbx,v 0.7a 2010/04/03 valbsua beta $]
+\ProvidesFile{philosophy-verbose.bbx}[$Id: philosophy-verbose.bbx,v 0.7b 2010/11/20 valbsua beta $]
\RequireBibliographyStyle{authortitle}
\RequireBibliographyStyle{philosophy-standard}
@@ -17,7 +17,7 @@
%
%***********************************************************************************************************
\AtBeginBibliography{%
-\global\boolfalse{cbx:loccit}%
+%\global\boolfalse{cbx:loccit}%
\citetrackerfalse
}
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 5fe634ab6d9..bb6cd610567 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
@@ -1,18 +1,18 @@
-% $Id: philosophy-verbose.cbx,v 0.7a 2010/04/03 17:00:00 15:42:33 valbusa beta $
+% $Id: philosophy-verbose.cbx,v 0.7b 2010/11/20 17:00:00 15:42:33 valbusa beta $
% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
% Permission is granted to copy, distribute and/or modify this software under the
% terms of the LaTeX Project Public License, version 1.3c
% http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
\ProvidesFile{philosophy-verbose.cbx}
-[$Id: philosophy-verbose.cbx,v 0.7a 2010/04/03 17:00:00 15:42:33 valbusa beta $]
+[$Id: philosophy-verbose.cbx,v 0.7b 2010/11/20 17:00:00 15:42:33 valbusa beta $]
\RequireCitationStyle{verbose-trad2}
-\DeclareLanguageMapping{italian}{italian-philosophy}
\newbool{cbx:scauthorscite}
\newbool{cbx:latinemph}
\newbool{cbx:commacit}
+\newbool{cbx:loccit}
\DeclareBibliographyOption{scauthorscite}[true]{%
\csuse{bool#1}{cbx:scauthorscite}}
@@ -21,7 +21,6 @@
\DeclareBibliographyOption{commacit}[true]{%
\csuse{bool#1}{cbx:commacit}}
-
\ExecuteBibliographyOptions{%
idemtracker=false,
loccittracker=strict,
@@ -44,13 +43,14 @@ commacit=false}
\bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
\bibstring[\mkibid]{ibidem}}}%
}}
-
+
\renewbibmacro*{cite:title}{%
+ \ifsingletitle{\bibstring[\mkibid]{opcit}}{
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}%
\ifbool{cbx:commacit}{\setunit{\addcomma\space}}
{\setunit{\addspace\midsentence}}}%
- \bibstring{opcit}}
+ \bibstring{cit}}}
\AtEveryCite{\boolfalse{bbx:annotation}}
@@ -100,7 +100,7 @@ commacit=false}
{\multicitedelim}
{\usebibmacro{cite:postnote}}
- \AtEveryCite{%
+\AtEveryCite{%
\ifbool{cbx:latinemph}{\renewcommand*{\mkibid}{\emph}}{}%
\ifbool{cbx:scauthorscite}{\DeclareNameFormat{labelname}{%
\ifcase\value{uniquename}%
@@ -121,8 +121,8 @@ commacit=false}
{\ifciteseen{\usebibmacro{editor+others}%
\setunit*{\addcomma\space}\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}%
- \setunit{\addspace}%
- \bibstring{opcit}}}{\usebibmacro{incollection:full}}}%
+ \setunit{\addspace\midsentence}%
+ \bibstring{cit}}}{\usebibmacro{incollection:full}}}%
{}%
{}%
@@ -132,8 +132,8 @@ commacit=false}
{\ifciteseen{\usebibmacro{bybookauthor}%
\setunit*{\addcomma\space}\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}%
- \setunit{\addspace}%
- \bibstring{opcit}}}{\usebibmacro{inbook:full}}}%
+ \setunit{\addspace\midsentence}%
+ \bibstring{cit}\midsentence}}{\usebibmacro{inbook:full}}}%
{}%
{}%