summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-16 22:09:09 +0000
committerKarl Berry <karl@freefriends.org>2011-05-16 22:09:09 +0000
commit974432f9910907645c85a06a8692eff260de45b2 (patch)
treecaaddbfde35d04383fb8786a532608df662516c3 /Master/texmf-dist/tex/latex
parent417e91d078352571aefe2bffd3cc2c1e5cc08f60 (diff)
biblatex-philosophy (16may11)
git-svn-id: svn://tug.org/texlive/trunk@22499 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx7
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx154
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx41
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx80
-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.bbx81
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx53
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx126
9 files changed, 268 insertions, 288 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 65b92e41b41..0e7ff850dcd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
@@ -1,10 +1,10 @@
-% english-philosophy.lbx,Ivan Valbusa 2010
+% english-philosophy.lbx,Ivan Valbusa 2010-2011
-\ProvidesFile{english-philosophy.lbx}[2010/11/20 v 0.7b biblatex localization file for biblatex-philosophy]
+\ProvidesFile{english-philosophy.lbx}[v 0.7c 2011/05/16 biblatex localization file for biblatex-philosophy]
\InheritBibliographyExtras{english}
-\NewBibliographyString{transtolang,cit,reviewof}
+\NewBibliographyString{transtolang,cit,reviewof,edorig,nodate}
\DeclareBibliographyStrings{%
inherit={english},
@@ -12,6 +12,7 @@
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}}},
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 489ee7e8860..7ca6f356a2f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
@@ -1,12 +1,13 @@
-% italian-philosophy.lbx,Ivan Valbusa 2010
+% italian-philosophy.lbx,Ivan Valbusa 2010-2011
-\ProvidesFile{italian-philosophy.lbx}[2010/11/20 v 0.7b biblatex localization file for biblatex-philosophy]
+\ProvidesFile{italian-philosophy.lbx}[v 0.7c 2011/05/16 biblatex localization file for biblatex-philosophy]
\InheritBibliographyExtras{italian}
-\NewBibliographyString{transtolang,cit,reviewof}
+\NewBibliographyString{transtolang,edorig,cit,reviewof,nodate}
\DeclareBibliographyStrings{%
+ nodate={{senza data}{s\adddotspace d\adddotspace}},
inherit={italian},
cit = {{cit\adddot}{cit\adddot}},
ibidem = {{ivi}{ivi}},
@@ -16,6 +17,7 @@
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}}},
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 af0b0a9066c..ba6c2b445a8 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.7b 2010/11/20 Valbusa$
-% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-classic.bbx,v 0.7c 2011/05/16 Valbusa$
+% Copyright 2009-2011 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.7b 2010/11/20 valbusa beta$]
+\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.7c 2011/05/16 valbusa beta$]
\RequireBibliographyStyle{authoryear}
\RequireBibliographyStyle{philosophy-standard}
@@ -13,18 +13,16 @@
% DECLARE AND EXECUTE BIBLIOGRAPHY OPTIONS
%*********************************************************************
-
-\newbool{bbx:square}
-
-
+\newtoggle{bbx:square}
\DeclareBibliographyOption{square}[true]{%
- \csuse{bool#1}{bbx:square}}
+ \settoggle{bbx:square}{#1}}
\ExecuteBibliographyOptions{%
uniquename=false,
pagetracker,
singletitle=false,
-square=false}
+square=false,
+mergedate=basic}
%$$$$$$
\newcounter{maxnamesincross}
@@ -34,7 +32,7 @@ square=false}
% AT BEGIN SHORTHANDS
%*****************************************
\AtBeginShorthands{%
-\boolfalse{bbx:annotation}
+\togglefalse{bbx:annotation}
\renewcommand{\labelnamepunct}{\addcomma\space}
\renewbibmacro*{publocyear}{%
\iflistundef{publisher}{}
@@ -70,7 +68,7 @@ square=false}
\setcounter{maxnamesincross}{\value{maxnames}}
\setcounter{minnamesincross}{\value{minnames}}
- \ifbool{bbx:square}
+ \iftoggle{bbx:square}
{\renewcommand{\bibopenparen}{\bibopenbracket}%
\renewcommand{\bibcloseparen}{\bibclosebracket}}
{}}
@@ -78,33 +76,45 @@ square=false}
%*********************************************************************
% NUOVE MACRO
%*********************************************************************
-
-% per eliminare il mese nelle etichette delle voci article
-\renewbibmacro*{date+extrayear}{%
- \iffieldundef{year}
- {}%
- {\printtext[parens]{\printfield{labelyear}\printfield{extrayear}}}}
-\renewbibmacro*{issue+date}{%
-\ifdefstring{\bbx@volnumformat}{volnumparens}
-{\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}}{}{\printtext{%
- \iffieldundef{issue}
- {\printfield{month}}%
- {\printfield{issue}}}}}%
- {\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}}{}{\printtext[parens]{%
- \iffieldundef{issue}
- {\printfield{month}}%
- {\printfield{issue}}}}}%
- \newunit}
+% 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}}}%
+ \newunit}%
% changed
\renewbibmacro*{bbx:editor}[1]{%
- \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
- {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
- \NOT\iffirstonpage\AND
- \(\NOT\boolean{bbx@inset}\OR
- \iffieldequalstr{entrysetcount}{1}\)}
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{editor}%
\setunit{\addspace}%
@@ -126,7 +136,6 @@ square=false}
\setunit*{\addcomma\space}%
\printlist{location}%
\newunit}
-
\newbibmacro*{inpublocyear}{%
\iflistundef{institution}%
{}
@@ -134,7 +143,6 @@ square=false}
\setunit*{\addcomma\space}%
\printlist{location}%
\newunit}
-
\newbibmacro*{orgpublocyear}{%
\iflistundef{organization}%
{}
@@ -146,54 +154,50 @@ square=false}
% Macro per la forma ``Location: Publisher, Year''
%****************************************************************
\newbibmacro*{loccolonpub}{%
- \printlist{location}%
- \iflistundef{publisher}%
- {\setunit*{\addspace}}
- {\setunit*{\addcolon\space}}%
- \printlist{publisher}%
-\newunit}
-
+ \printlist{location}%
+ \iflistundef{publisher}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcolon\space}}%
+ \printlist{publisher}%
+ \newunit}
\newbibmacro*{inloccolonpub}{%
- \printlist{location}%
- \iflistundef{institution}%
- {\setunit*{\addspace}}
- {\setunit*{\addcolon\space}}%
- \printlist{institution}%
-\newunit}
-
+ \printlist{location}%
+ \iflistundef{institution}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcolon\space}}%
+ \printlist{institution}%
+ \newunit}
\newbibmacro*{orgloccolonpub}{%
- \printlist{location}%
- \iflistundef{organization}%
- {\setunit*{\addspace}}
- {\setunit*{\addcolon\space}}%
- \printlist{organization}%
-\newunit}
+ \printlist{location}%
+ \iflistundef{organization}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcolon\space}}%
+ \printlist{organization}%
+ \newunit}
% Macro per la forma ``Location, Publisher, Year''
%**************************************************************
\newbibmacro*{locpubyear}{%
- \printlist{location}%
- \iflistundef{publisher}%
- {\setunit*{\addspace}}
- {\setunit*{\addcomma\space}}%
- \printlist{publisher}%
-\newunit}
-
+ \printlist{location}%
+ \iflistundef{publisher}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcomma\space}}%
+ \printlist{publisher}%
+ \newunit}
\newbibmacro*{inlocpubyear}{%
- \printlist{location}%
- \iflistundef{institution}%
- {\setunit*{\addspace}}
- {\setunit*{\addcomma\space}}%
- \printlist{institution}%
-\newunit}
-
+ \printlist{location}%
+ \iflistundef{institution}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcomma\space}}%
+ \printlist{institution}%
+ \newunit}
\newbibmacro*{orglocpubyear}{%
- \printlist{location}%
- \iflistundef{organization}%
- {\setunit*{\addspace}}
- {\setunit*{\addcomma\space}}%
- \printlist{organization}%
-\newunit}
+ \printlist{location}%
+ \iflistundef{organization}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcomma\space}}%
+ \printlist{organization}%
+ \newunit}
%*********************************************************************
%% BIBLIOGRAPHY DRIVERS
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 eab5022f01b..dc495a44c8b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
@@ -1,30 +1,26 @@
-% $Id: philosophy-classic.cbx,v 0.7b 2010/11/20 Valbusa$
-% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-classic.cbx,v 0.7c 2011/05/16 Valbusa$
+% Copyright 2009-2011 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.7b 2010/11/20 valbusa beta$]
+\ProvidesFile{philosophy-classic.cbx}[philosophy-classic.cbx,v 0.7c 2011/05/16 valbusa beta$]
-\RequireCitationStyle{authoryear-icomp}
-
-\newbool{cbx:scauthorscite}
+\RequireCitationStyle{authoryear-comp}
+\newtoggle{cbx:scauthorscite}
\DeclareBibliographyOption{scauthorscite}[true]{%
- \csuse{bool#1}{cbx:scauthorscite}}
+ \settoggle{cbx:scauthorscite}{#1}}
\ExecuteBibliographyOptions{%
scauthorscite=false,
}
-%***************************************************************************************************
-%
-% AT EVERY CITE
-%
-%***************************************************************************************************
+% AT EVERY CITE
+%*************************************************************
\AtEveryCite{%
- \ifbool{cbx:scauthorscite}%
+ \iftoggle{cbx:scauthorscite}%
{\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}%
\renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}%
\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}%
@@ -45,12 +41,10 @@ scauthorscite=false,
\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
\fi
\usebibmacro{name:andothers}}}
-
-
-
- \newbibmacro*{textcitet}{%
+
+\newbibmacro*{textcitet}{%
\iffieldequals{namehash}{\cbx@lasthash}
- {\iffieldundef{shorthand}
+ {\iffieldundef{shorthandt}
{\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
\(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
{\setunit{\addcomma}%
@@ -67,12 +61,18 @@ scauthorscite=false,
\setunit{%
\global\booltrue{cbx:parens}%
\addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
\usebibmacro{cite:labelyear+extrayear}}
{\usebibmacro{cite:shorthand}}}
{\printnames{labelname}%
\setunit{%
\global\booltrue{cbx:parens}%
\addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
\iffieldundef{shorthand}
{\iffieldundef{labelyear}
{\usebibmacro{cite:label}}
@@ -82,7 +82,7 @@ scauthorscite=false,
\global\undef\cbx@lastyear}%
\savefield{namehash}{\cbx@lasthash}}}%
\setunit{%
- \ifbool{cbx:parens}
+ \iftoggle{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
\multicitedelim}}
@@ -128,7 +128,6 @@ scauthorscite=false,
{\multicitedelim}
{\usebibmacro{postnote}}
-
\DeclareCiteCommand{\footcitet}[\mkbibfootnote]
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
@@ -140,7 +139,7 @@ scauthorscite=false,
\ifthenelse{\value{multicitecount}=\value{multicitetotal}}
{\setunit{}}
{\setunit{%
- \ifbool{cbx:parens}
+ \iftoggle{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
\multicitedelim}}}
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 9bb0cdbb994..4bc6c1bff6e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
@@ -1,26 +1,23 @@
-% $Id: philosophy-modern.bbx,v 0.7b 2010/11/20 Valbusa$
-% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-modern.bbx,v 0.7c 2011/05/16 Valbusa$
+% Copyright 2009-2011 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.7b 2010/11/20 valbusa beta$]
+\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.7c 2011/05/16 valbusa beta$]
\RequireBibliographyStyle{philosophy-classic}
-\newbool{bbx:yearleft}
+\newtoggle{bbx:yearleft}
\DeclareBibliographyOption{yearleft}[true]{%
- \csuse{bool#1}{bbx:yearleft}}
+ \settoggle{bbx:yearleft}{#1}}
\ExecuteBibliographyOptions{%
yearleft=false}
+%% new lengths
%%---------------------------------------------------------------------------------------------
-%% new lengths
-%%---------------------------------------------------------------------------------------------
-
-
\newlength{\yeartitle}
\newlength{\postnamesep}
\setlength{\yeartitle}{0.8em}%
@@ -29,40 +26,31 @@ yearleft=false}
\setlength{\bibnamesep}{1.5ex plus 2pt minus 1pt}
\setlength{\bibhang}{4\parindent}
-
-%%---------------------------------------------------------------------------------------------
-%% new commands
+%% new commands
%%---------------------------------------------------------------------------------------------
-
\newcommand{\postsep}{\par\nobreak\vskip\postnamesep\hskip-\bibhang\ignorespaces}
-
\renewcommand{\labelnamepunct}{\unspace}
-%%---------------------------------------------------------------------------------------------
-% List of shorthands
-%%---------------------------------------------------------------------------------------------
-
\AtBeginBibliography{
- \ifbool{bbx:yearleft}{%
+ \iftoggle{bbx:yearleft}{%
\setlength{\yeartitle}{\fill}}
{}%
}
-
\AtBeginShorthands{%
\renewcommand{\postsep}{}%
\renewcommand{\labelnamepunct}{\addcomma\space}}
-
%%---------------------------------------------------------------------------------------------
-% Macro
+%% MACROS
%%---------------------------------------------------------------------------------------------
-%
+
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{year}%
- {}%
- {\makebox[\bibhang][r]{%
- \printtext{\printfield{labelyear}\printfield{extrayear}%
- \hskip\yeartitle}}}}
+ \makebox[\bibhang][r]{%
+ \printtext{%
+ \iffieldundef{year}%
+ {\bibstring{nodate}}%
+ {\printfield{labelyear}\printfield{extrayear}}%
+ \hskip\yeartitle}}}
% label for entries without 'editor' and 'author'
%%-------------------------------------------------------------
@@ -75,15 +63,15 @@ yearleft=false}
{\printtext{\printfield{label}}%
\postsep}}
-% macro 'author' OKKKKK
-%%----------------------------------------------------
-
+% macro 'author'
+%%---------------------------------------------------
\renewbibmacro*{author}{%
- \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
- {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
- \NOT\iffirstonpage\AND
- \(\NOT\boolean{bbx@inset}\OR
- \iffieldequalstr{entrysetcount}{1}\)}
+ \ifboolexpr{
+ test \ifuseauthor
+ and
+ not test {\ifnameundef{author}}
+ }
+ {\usebibmacro{bbx:dashcheck}
{}%MOD
{\usebibmacro{bbx:savehash}%
\printnames{author}%
@@ -98,17 +86,15 @@ yearleft=false}
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
\usebibmacro{date+extrayear}}
-
-
-% macro 'editor'
-%%----------------------------------------------------
+
\renewbibmacro*{bbx:editor}[1]{%
- \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
- {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
- \NOT\iffirstonpage\AND
- \(\NOT\boolean{bbx@inset}\OR
- \iffieldequalstr{entrysetcount}{1}\)}
- {}% removed \bibnamedash
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\usebibmacro{bbx:dashcheck}
+ {}% removed \bibnamedash
{\printnames{editor}%
\postsep%ADD
\usebibmacro{bbx:savehash}}%
@@ -120,10 +106,10 @@ yearleft=false}
{\usebibmacro{#1}\setunit{\addcomma\space}}{}%
}
+
%%---------------------------------------------------------------------------------------------
% BIBLIOGRAPHY DRIVERS
%%---------------------------------------------------------------------------------------------
-
\newbibmacro*{crosslabeltitle}{%
\iffieldundef{label}%
{\iffieldundef{shorttitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
index 8988cda1cfa..d5bcdf95044 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.7b 2010/11/20 Valbusa$
-% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-modern.cbx,v 0.7c 2011/05/16 Valbusa$
+% Copyright 2009-2011 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.7b 2010/11/20 valbusa beta$]
+\ProvidesFile{philosophy-modern.cbx}[philosophy-modern.cbx,v 0.7c 2011/05/16 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 f434181d5e9..206a3af52e2 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,10 @@
-% $Id: philosophy-standard.bbx,v 0.7b 2010/11/20Valbusa$
-% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-standard.bbx,v 0.7c 2011/05/16Valbusa$
+% Copyright 2009-2011 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.7b 2010/11/20 valbsua beta $]
+\ProvidesFile{philosophy-standard.bbx}[$Id: philosophy-standard.bbx,v 0.7c 2011/05/16 valbsua beta $]
\RequireBibliographyStyle{standard}
@@ -19,50 +19,53 @@
% boolean options
%---------------------------------
-\newbool{bbx:annotation}
-\newbool{bbx:library}
-\newbool{bbx:scauthors}
-\newbool{bbx:scauthorsbib}
-\newbool{bbx:origparens}
-\newbool{bbx:origbrackets}
-\newbool{bbx:inbeforejournal}
-\newbool{bbx:romanvol}
+\newtoggle{bbx:annotation}
+\newtoggle{bbx:library}
+\newtoggle{bbx:scauthors}
+\newtoggle{bbx:scauthorsbib}
+\newtoggle{bbx:origparens}
+\newtoggle{bbx:origbrackets}
+\newtoggle{bbx:inbeforejournal}
+\newtoggle{bbx:romanvol}
\DeclareBibliographyOption{annotation}[true]{%
- \csuse{bool#1}{bbx:annotation}}
+ \settoggle{bbx:annotation}{#1}}
\DeclareBibliographyOption{library}[true]{%
- \csuse{bool#1}{bbx:library}}
+ \settoggle{bbx:library}{#1}}
\DeclareBibliographyOption{scauthors}[true]{%
- \csuse{bool#1}{bbx:scauthors}}
+ \settoggle{bbx:scauthors}{#1}}
\DeclareBibliographyOption{scauthorsbib}[true]{%
- \csuse{bool#1}{bbx:scauthorsbib}}
+ \settoggle{bbx:scauthorsbib}{#1}}
\DeclareBibliographyOption{origparens}[true]{%
- \csuse{bool#1}{bbx:origparens}}
+ \settoggle{bbx:origparens}{#1}}
\DeclareBibliographyOption{origbrackets}[true]{%
- \csuse{bool#1}{bbx:origbrackets}}
+ \settoggle{bbx:origbrackets}{#1}}
\DeclareBibliographyOption{inbeforejournal}[true]{%
- \csuse{bool#1}{bbx:inbeforejournal}}
+ \settoggle{bbx:inbeforejournal}{#1}}
% multi value options
%---------------------------------
\newcommand{\bbx@publocformat}{}
\newcommand{\bbx@volnumformat}{}
\newcommand{\bbx@origfieldsformat}{}
+\newcommand{\bbx@origfieldstype}{}
\newcommand{\bbx@editionformat}{}
\newcommand{\bbx@volumeformat}{}
+
\DeclareBibliographyOption{publocformat}[publocyear]{%
\renewcommand{\bbx@publocformat}{#1}}
\DeclareBibliographyOption{volnumformat}[volnumdefault]{%
\renewcommand{\bbx@volnumformat}{#1}}
\DeclareBibliographyOption{origfieldsformat}[semicolon]{%
\renewcommand{\bbx@origfieldsformat}{#1}}
+\DeclareBibliographyOption{origfieldstype}[true]{%
+ \renewcommand{\bbx@origfieldstype}{#1}}
\DeclareBibliographyOption{editionformat}[arabic]{%
\renewcommand{\bbx@editionformat}{#1}}
\DeclareBibliographyOption{volumeformat}[arabic]{%
\renewcommand{\bbx@volumeformat}{#1}}
-
% Execute options
%---------------------------------
\ExecuteBibliographyOptions{%
@@ -79,16 +82,14 @@
volumeformat=arabic,
}
-
% AT BEGIN SHORTHANDS
%****************************************
-\AtBeginShorthands{\boolfalse{bbx:annotation}}
-
+\AtBeginShorthands{\togglefalse{bbx:annotation}}
% AT BEGIN BILIOGRAPHY
%****************************************
\AtBeginBibliography{%
% SMALL CAPS AUTHORS NAME
-\ifbool{bbx:scauthorsbib}{%
+\iftoggle{bbx:scauthorsbib}{%
\DeclareNameFormat{sortname}{%
\ifnumequal{\value{listcount}}{1}
{\iffirstinits
@@ -103,16 +104,15 @@
\usebibmacro{name:andothers}}
}{}%
}
-
% AT BEGIN DOCUMENT
%****************************************
\AtBeginDocument{%
-\ifbool{bbx:origbrackets}{\booltrue{bbx:origparens}
+\iftoggle{bbx:origbrackets}{\toggletrue{bbx:origparens}
\renewcommand{\origleftparen}{\bibleftbracket}
\renewcommand{\origrightparen}{\bibrightbracket}}%
{}%
- \ifbool{bbx:scauthors}
- {\booltrue{bbx:scauthorsbib}\booltrue{cbx:scauthorscite}}%
+ \iftoggle{bbx:scauthors}
+ {\toggletrue{bbx:scauthorsbib}\toggletrue{cbx:scauthorscite}}%
{}%
}
@@ -186,9 +186,10 @@
%----------------------------------------------
% TITLE
-\DeclareFieldFormat[inbook]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[bookinbook]{title}{\mkbibemph{#1}}
\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
\DeclareFieldFormat[review]{title}{#1}
+\DeclareFieldFormat[inreference]{title}{\mkbibquote{#1}}
% CITETITLE
\DeclareFieldFormat[inbook]{citetitle}{\mkbibemph{#1}}
@@ -200,6 +201,7 @@
% USERA
\DeclareFieldFormat{usera}{\mkbibemph{#1}}
\DeclareFieldFormat[article]{usera}{\mkbibquote{#1}}
+\DeclareFieldFormat[bookinbook]{usera}{\mkbibemph{#1}}
\DeclareFieldFormat[inbook]{usera}{\mkbibemph{#1}}
\DeclareFieldFormat[incollection]{usera}{\mkbibquote{#1}}
@@ -247,7 +249,7 @@
%***********************************************
\renewbibmacro*{citeindex}{%
-\ifciteindex{\indexnames{labelname}}}
+\ifciteindex{\indexnames{labelname}}{}}
\renewbibmacro*{bibindex}{%
\ifbibindex{\indexnames{author}%
\indexnames{editor}%
@@ -256,6 +258,7 @@
\indexnames{editorc}}%
{}}%
+
\renewbibmacro*{pageref}{%
\iflistundef{pageref}
{}
@@ -296,7 +299,7 @@
{\ifdefstring{\bbx@origfieldsformat}{brackets}{%
\setunit{\addspace\origleftbracket}}{\setunit{\addsemicolon\space}}}%
\iffieldundef{reprinttitle}%
- {\printtext{\bibstring{transtolang}}\nopunct}
+ {\printtext{\ifdefstring{\bbx@origfieldstype}{edorig}{\bibstring{edorig}}{\bibstring{transtolang}}}\nopunct}
{\printtext{\bibstring{reprint}}\nopunct}
\setunit{\addspace}%
\iffieldundef{reprinttitle}%
@@ -462,7 +465,7 @@
\renewbibmacro*{annotation}{%
-\ifbool{bbx:library}{%
+\iftoggle{bbx:library}{%
\setunit{\addperiod\space}%
\iffieldundef{library}
{\printfile[library]{\bibannotationprefix\thefield{entrykey}.tex}}
@@ -471,7 +474,7 @@
}
\renewbibmacro*{finentry}{%
- \ifbool{bbx:annotation}%
+ \iftoggle{bbx:annotation}%
{\iffieldundef{annotation}%
{\finentry}%
{\setunit{\addperiod\par\nobreak}%
@@ -483,8 +486,9 @@
\printfield{addendum}%
\newunit\newblock
\printfield{pubstate}%
+\ifdefstring{\bbx@origfieldstype}{false}{}{%
\newunit\newblock
- \usebibmacro{origfields}%
+ \usebibmacro{origfields}}
\newunit\newblock
\usebibmacro{annotation}%
}
@@ -493,8 +497,9 @@
\printfield{addendum}%
\newunit\newblock
\printfield{pubstate}%
+\ifdefstring{\bbx@origfieldstype}{false}{}{%
\newunit\newblock
- \usebibmacro{articletranslated}%
+ \usebibmacro{articletranslated}}%
\newunit\newblock
\usebibmacro{annotation}%
}
@@ -505,8 +510,9 @@
\printfield{addendum}%
\newunit\newblock
\printfield{pubstate}%
+\ifdefstring{\bbx@origfieldstype}{false}{}{%
\newunit\newblock
- \usebibmacro{origtitle:inbook}%
+ \usebibmacro{origtitle:inbook}}%
\newunit\newblock
\usebibmacro{annotation}%
}
@@ -517,8 +523,9 @@
\printfield{addendum}%
\newunit\newblock
\printfield{pubstate}%
+\ifdefstring{\bbx@origfieldstype}{false}{}{%
\newunit\newblock
- \usebibmacro{origtitle:incollection}%
+ \usebibmacro{origtitle:incollection}}%
\newunit\newblock
\usebibmacro{annotation}%
}
@@ -625,7 +632,7 @@
\newunit\newblock
\printfield{version}%
\newunit\newblock
- \ifbool{bbx:inbeforejournal}{\usebibmacro{in:}}{}%
+ \iftoggle{bbx:inbeforejournal}{\usebibmacro{in:}}{}%
\usebibmacro{journal+issuetitle}%
\newunit\newblock
\usebibmacro{byeditor+others}%
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 1a198961653..e5581d8fbb6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -1,29 +1,19 @@
-% $Id: philosophy-verbose.bbx,v 0.7b 2010/11/20 Valbusa$
-% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-verbose.bbx,v 0.7c 2011/05/16 Valbusa$
+% Copyright 2009-2011 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.7b 2010/11/20 valbsua beta $]
+\ProvidesFile{philosophy-verbose.bbx}[$Id: philosophy-verbose.bbx,v 0.7c 2011/05/16valbsua beta $]
\RequireBibliographyStyle{authortitle}
\RequireBibliographyStyle{philosophy-standard}
-
-%***********************************************************************************************************
-%
-% AT BEGIN BILIOGRAPHY
-%
-%***********************************************************************************************************
-\AtBeginBibliography{%
-%\global\boolfalse{cbx:loccit}%
-\citetrackerfalse
-}
-
+%**************************************************************
% Macro per la forma ``Publisher, Location Year''.
-%***********************************************************************************************************
+%**************************************************************
\newbibmacro*{publocyear}{%
\iflistundef{publisher}%
{}%
@@ -53,11 +43,9 @@
\setunit*{\addspace}%
\usebibmacro{date}%
\newunit}
-
-
-
+%**************************************************************
% Macro per la forma ``Location: Publisher, Year''
-%***********************************************************************************************************
+%**************************************************************
\newbibmacro*{loccolonpub}{%
\printlist{location}%
\iflistundef{publisher}%
@@ -87,10 +75,9 @@
\setunit*{\addcomma\space}%
\usebibmacro{date}%
\newunit}
-
-
+%**************************************************************
% Macro per la forma ``Location, Publisher, Year''
-%***********************************************************************************************************
+%**************************************************************
\newbibmacro*{locpubyear}{%
\printlist{location}%
\iflistundef{publisher}%
@@ -121,16 +108,14 @@
\usebibmacro{date}%
\newunit}
-
-%***********************************************************************************************************
-%***********************************************************************************************************
-
+%********************************************************************
\renewbibmacro*{bbx:editor}[1]{%
- \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
- {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
- \NOT\iffirstonpage\AND
- \(\NOT\boolean{bbx@inset}\OR
- \iffieldequalstr{entrysetcount}{1}\)}
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{editor}%
\setunit{\addspace}% #MOD#
@@ -138,9 +123,11 @@
\usebibmacro{#1}%
\clearname{editor}}
{\global\undef\bbx@lasthash}}
-
+%**************************************************************
+% DRIVERS
+%**************************************************************
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -163,8 +150,6 @@
\usebibmacro{finentry}}}{\usebibmacro{incollection:full}}%
}
-
-
\DeclareBibliographyDriver{inbook}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
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 bb6cd610567..24253e2033a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
@@ -1,76 +1,85 @@
-% $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.
+% $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.
% 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.7b 2010/11/20 17:00:00 15:42:33 valbusa beta $]
+[$Id: philosophy-verbose.cbx,v 0.7c 2011/05/16 valbusa beta $]
\RequireCitationStyle{verbose-trad2}
-\newbool{cbx:scauthorscite}
-\newbool{cbx:latinemph}
-\newbool{cbx:commacit}
-\newbool{cbx:loccit}
-
+\newtoggle{cbx:scauthorscite}
+\newtoggle{cbx:latinemph}
+\newtoggle{cbx:commacit}
\DeclareBibliographyOption{scauthorscite}[true]{%
- \csuse{bool#1}{cbx:scauthorscite}}
+ \settoggle{cbx:scauthorscite}{#1}}
\DeclareBibliographyOption{latinemph}[true]{%
- \csuse{bool#1}{cbx:latinemph}}
+ \settoggle{cbx:latinemph}{#1}}
\DeclareBibliographyOption{commacit}[true]{%
- \csuse{bool#1}{cbx:commacit}}
-
+ \settoggle{cbx:commacit}{#1}}
\ExecuteBibliographyOptions{%
-idemtracker=false,
-loccittracker=strict,
-citetracker=true,
-scauthorscite=false,
-latinemph=false,
-commacit=false}
+ idemtracker=false,
+ loccittracker=strict,
+ scauthorscite=false,
+ latinemph=false,
+ 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}}}{}}
+
+\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}}
+
+% MACROS
+%***********************************
\newbibmacro*{cite:loccit}{%
\printtext{%
\bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
\bibstring[\mkibid]{loccit}}}%
- \global\booltrue{cbx:loccit}}
-
-
+ \global\toggletrue{cbx:loccit}}
+
\renewbibmacro*{cite:ibid}{%
- \ifloccit
- {\usebibmacro{cite:loccit}}
- {\printtext{%
+ \ifloccit
+ {\usebibmacro{cite:loccit}}{%
+ \printtext{%
\bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
- \bibstring[\mkibid]{ibidem}}}%
- }}
+ \bibstring[\mkibid]{ibidem}}}}}%
\renewbibmacro*{cite:title}{%
\ifsingletitle{\bibstring[\mkibid]{opcit}}{
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}%
- \ifbool{cbx:commacit}{\setunit{\addcomma\space}}
+ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}
{\setunit{\addspace\midsentence}}}%
- \bibstring{cit}}}
+ \bibstring{cit}\midsentence}}
-
-\AtEveryCite{\boolfalse{bbx:annotation}}
-
-
-\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}}
-
-\renewbibmacro*{cite:full}{%
+ \renewbibmacro*{cite:full}{%
+ \usebibmacro{cite:full:citepages}%
+ \global\toggletrue{cbx:fullcite}%
\printtext[bibhypertarget]{%
\usedriver
- {\ifbool{cbx:scauthorscite}{\DeclareNameAlias{sortname}{scdefault}}{\DeclareNameAlias{sortname}{default}}}
+ {\iftoggle{cbx:scauthorscite}{\DeclareNameAlias{sortname}{scdefault}}{\DeclareNameAlias{sortname}{default}}}
{\thefield{entrytype}}}%
\usebibmacro{shorthandintro}}
-
- \newbibmacro*{ccite}{%
- \global\boolfalse{cbx:loccit}%
+
+\newbibmacro*{ccite}{%
+ \global\togglefalse{cbx:loccit}%
\bibhypertarget{cite\the\value{instcount}}{%
\ifciteseen
{\iffieldundef{shorthand}
@@ -92,48 +101,35 @@ commacit=false}
{\DeclareNameAlias{sortname}{default}}
{\thefield{entrytype}}}%
\usebibmacro{shorthandintro}}
-
+
+% COMMANDS
+%***********************************
\DeclareCiteCommand{\ccite}
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{ccite}}
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-
-\AtEveryCite{%
- \ifbool{cbx:latinemph}{\renewcommand*{\mkibid}{\emph}}{}%
- \ifbool{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}}}{}}
-
-
\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}%
- \setunit{\addspace\midsentence}%
- \bibstring{cit}}}{\usebibmacro{incollection:full}}}%
+ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+ {\setunit{\addspace\midsentence}}%
+ \bibstring{cit}}}{\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}%
- \setunit{\addspace\midsentence}%
- \bibstring{cit}\midsentence}}{\usebibmacro{inbook:full}}}%
+ \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+ {\setunit{\addspace\midsentence}}%
+ \bibstring{cit}}}{\usebibmacro{inbook:full}}}%
{}%
{}%