From 3cb2271bc67884876da9885429ca597d0f900098 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 2 Apr 2010 12:54:25 +0000 Subject: biblatex-philosophy update git-svn-id: svn://tug.org/texlive/trunk@17655 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/philosophy-classic.bbx | 96 +++++++++- .../biblatex-philosophy/philosophy-classic.cbx | 22 ++- .../biblatex-philosophy/philosophy-modern.bbx | 4 +- .../biblatex-philosophy/philosophy-modern.cbx | 4 +- .../biblatex-philosophy/philosophy-standard.bbx | 201 +++++++++++++++------ .../biblatex-philosophy/philosophy-verbose.bbx | 83 ++++++++- .../biblatex-philosophy/philosophy-verbose.cbx | 15 +- 7 files changed, 344 insertions(+), 81 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy') 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 1bc6244b70f..b5023b6e0e8 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.6 2010/03/023 Valbusa$ +% $Id: philosophy-classic.bbx,v 0.7 2010/03/30 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.6 2010/03/23 valbusa beta$] +\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.7 2010/03/30 valbusa beta$] \RequireBibliographyStyle{authoryear} \RequireBibliographyStyle{philosophy-standard} @@ -43,7 +43,7 @@ square=false} \AtBeginShorthands{% \boolfalse{bbx:annotation} \renewcommand{\labelnamepunct}{\addcomma\space} -\renewbibmacro*{commaloc}{% +\renewbibmacro*{publocyear}{% \iflistundef{publisher}{} {\printlist{publisher}} \setunit*{\addcomma\space}% @@ -51,7 +51,7 @@ square=false} \setunit*{\space}% \printtext{\printfield{labelyear}}% \newunit} -\renewbibmacro*{colonloc}{% +\renewbibmacro*{loccolonpub}{% \printlist{location}% \iflistundef{publisher} {\setunit*{\addspace}} @@ -60,7 +60,16 @@ square=false} \setunit*{\addcomma\space}% \printtext{\printfield{labelyear}}% \newunit} -\renewbibmacro*{date+extrayear}{}} +\renewbibmacro*{locpubyear}{% + \printlist{location}% + \iflistundef{publisher} + {\setunit*{\addspace}} + {\setunit*{\addcomma\space}}% + \printlist{publisher}% + \setunit*{\addcomma\space}% + \printtext{\printfield{labelyear}}% + \newunit} + \renewbibmacro*{date+extrayear}{}} %*********************************************************************************************************** % @@ -88,6 +97,18 @@ square=false} {}% {\printtext[parens]{\printfield{labelyear}\printfield{extrayear}}}} +\renewbibmacro*{issue+date}{% +\ifdefstring{\bbx@volnumformat}{volnumparens} +{\printtext{% + \iffieldundef{issue} + {\printfield{month}}% + {\printfield{issue}}}}% + {\printtext[parens]{% + \iffieldundef{issue} + {\printfield{month}} + {\printfield{issue}}}} + \newunit} + % changed \renewbibmacro*{bbx:editor}[1]{% \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}} @@ -109,7 +130,9 @@ square=false} }% } -\newbibmacro*{commaloc}{% +% Macro per la forma ``Publisher, Location Year''. +%*********************************************************************************************************** +\newbibmacro*{publocyear}{% \iflistundef{publisher}% {} {\printlist{publisher}} @@ -117,14 +140,73 @@ square=false} \printlist{location}% \newunit} -\newbibmacro*{colonloc}{% +\newbibmacro*{inpublocyear}{% + \iflistundef{institution}% + {} + {\printlist{institution}} + \setunit*{\addcomma\space}% + \printlist{location}% + \newunit} + +\newbibmacro*{orgpublocyear}{% + \iflistundef{organization}% + {} + {\printlist{organization}} + \setunit*{\addcomma\space}% + \printlist{location}% + \newunit} + +% Macro per la forma ``Location: Publisher, Year'' +%*********************************************************************************************************** +\newbibmacro*{loccolonpub}{% \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} + +\newbibmacro*{orgloccolonpub}{% + \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} + +\newbibmacro*{inlocpubyear}{% + \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} %********************************************************************* %% 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 59c38d371b9..8b73823b7c7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx @@ -1,11 +1,11 @@ -% $Id: philosophy-classic.cbx,v 0.6 2010/03/23 Valbusa$ +% $Id: philosophy-classic.cbx,v 0.7 2010/03/30 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.6 2010/03/23 valbusa beta$] +\ProvidesFile{philosophy-classic.cbx}[philosophy-classic.cbx,v 0.7 2010/03/230 valbusa beta$] \RequireCitationStyle{authoryear-comp} \DeclareLanguageMapping{italian}{italian-philosophy} @@ -26,7 +26,9 @@ scauthorscite=false %*********************************************************************************************************** \AtEveryCite{% \ifbool{cbx:scauthorscite}% - {\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}} + {\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}% + \renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}% + \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}% {}% } @@ -74,6 +76,18 @@ scauthorscite=false {\printtext[bibhyperref]{\printfield{year}}} {\multicitedelim} {\usebibmacro{postnote}} -%*********************************************** + +\DeclareCiteCommand{\sdcite} + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\indexnames{labelname}% + \printtext[bibhyperref]{\printnames{labelname}}% + \setunit{\addcomma\space}% + \indexfield{indextitle}% + \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} + {\multicitedelim} + {\usebibmacro{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 37d743565c0..49457d82eb8 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.6 2010/03/23 Valbusa$ +% $Id: philosophy-modern.bbx,v 0.7 2010/03/30 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.6 2010/03/23 valbusa beta$] +\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.7 2010/03/30 valbusa beta$] \RequireBibliographyStyle{philosophy-classic} 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 fdfdd670409..eae220e7011 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.6 2010/03/23 Valbusa$ +% $Id: philosophy-modern.cbx,v 0.7 2010/03/30 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.6 2010/03/23 valbusa beta$] +\ProvidesFile{philosophy-modern.cbx}[philosophy-modern.cbx,v 0.7 2010/03/30 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 ae9598d288b..d4a2254e576 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -1,11 +1,11 @@ -% $Id: philosophy-standard.bbx,v 0.6 2010/03/23 Valbusa$ +% $Id: philosophy-standard.bbx,v 0.7 2010/03/30 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-standard.bbx}[$Id: philosophy-standard.bbx,v 0.6 2010/03/23 valbsua beta $] +\ProvidesFile{philosophy-standard.bbx}[$Id: philosophy-standard.bbx,v 0.7 2010/03/30 valbsua beta $] \DeclareLanguageMapping{italian}{italian-philosophy} \DeclareLanguageMapping{english}{english-philosophy} @@ -16,17 +16,16 @@ % %*********************************************************************************************************** -\newbool{bbx:locpubyear} \newbool{bbx:annotation} \newbool{bbx:library} \newbool{bbx:scauthors} \newbool{bbx:scauthorsbib} \newbool{bbx:origparens} \newbool{bbx:origbrackets} +\newbool{bbx:inbeforejournal} +\newbool{bbx:romanvol} -\DeclareBibliographyOption{locpubyear}[true]{% - \csuse{bool#1}{bbx:locpubyear}} \DeclareBibliographyOption{annotation}[true]{% \csuse{bool#1}{bbx:annotation}} \DeclareBibliographyOption{library}[true]{% @@ -35,21 +34,40 @@ \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]{% +\DeclareBibliographyOption{origbrackets}[true]{% \csuse{bool#1}{bbx:origbrackets}} +\DeclareBibliographyOption{inbeforejournal}[true]{% + \csuse{bool#1}{bbx:inbeforejournal}} + +\newcommand{\bbx@publocformat}{} +\newcommand{\bbx@volnumformat}{} +\newcommand{\bbx@origfieldsformat}{} + +\DeclareBibliographyOption{publocformat}[publocyear]{% + \renewcommand{\bbx@publocformat}{#1}} +\DeclareBibliographyOption{volnumformat}[volnumdefault]{% + \renewcommand{\bbx@volnumformat}{#1}} +\DeclareBibliographyOption{origfieldsformat}[semicolon]{% + \renewcommand{\bbx@origfieldsformat}{#1}} + \ExecuteBibliographyOptions{% -locpubyear=false, +publocformat=publocyear, annotation=false, library=true, scauthors=false, scauthorsbib=false, -origparens=false, -origbrackets=false} +origfieldsformat=false, +publocformat=false, +inbeforejournal=false, +volnumformat=false, +origfieldsformat=semicolon, +} %*********************************************************************************************************** % @@ -119,29 +137,34 @@ origbrackets=false} % Definisco ora alcuni comandi che servono per il formato dei campi. \newcommand{\annotationfont}{\sffamily} \newcommand{\libraryfont}{} -\newcommand{\backrefleftparen}{(} -\newcommand{\backrefrightparen}{)} -\newcommand{\backrefparens}[1]{\backrefleftparen#1\backrefrightparen} % Nuovi comandi per avere la traduzione tra parentesi -\newcommand{\origleftparen}{\bibleftparen} -\newcommand{\origrightparen}{\bibrightparen} +\newcommand{\origleftparen}{\pureleftparen} +\newcommand{\origrightparen}{\purerightparen} +\newcommand{\origleftbracket}{\bibleftbracket} +\newcommand{\origrightbracket}{\bibrightbracket} +\newcommand{\backrefleftparen}{\pureleftparen} +\newcommand{\backrefrightparen}{\purerightparen} +\newcommand{\backrefparens}[1]{\backrefleftparen#1\backrefrightparen} \renewcommand*{\newunitpunct}{\addcomma\space} \renewcommand*{\subtitlepunct}{\addperiod\space} \renewcommand*{\intitlepunct}{\addspace} - +\newcommand*{\volnumpunct}{\addcomma\space} \appto\biburlsetup{\Urlmuskip=0mu\relax} + %--------------------------------------------------------------------- % fields format %--------------------------------------------------------------------- % TITLE \DeclareFieldFormat[inbook]{title}{\mkbibemph{#1}} +\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}} % CITETITLE \DeclareFieldFormat[inbook]{citetitle}{\mkbibemph{#1}} +\DeclareFieldFormat[thesis]{citetitle}{\mkbibemph{#1}} % ORIGTITLE \DeclareFieldFormat{origtitle}{\mkbibemph{#1}} @@ -164,7 +187,9 @@ origbrackets=false} % PARENS \DeclareFieldFormat{backrefparens}{\mkpureparens{#1}} -\DeclareFieldFormat[article]{volume}{\textsc{\RN{#1}}} +\DeclareFieldFormat{pureparens}{\mkpureparens{#1}} +\DeclareFieldFormat{volume}{\ifbool{bbx:romanvol}{\textsc{\RN{#1}}}{#1}} +\DeclareFieldFormat[article]{volume}{\ifbool{bbx:romanvol}{\textsc{\RN{#1}}}{#1}} %*********************************************************************************************************** % @@ -172,7 +197,6 @@ origbrackets=false} % %*********************************************************************************************************** - \renewbibmacro*{pageref}{% \iflistundef{pageref} {} @@ -183,21 +207,39 @@ origbrackets=false} {\bibstring{backrefpage}\ppspace}% \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct}} - %*********************************************************************************************************** + \renewbibmacro*{publisher+location+date}{% - \ifbool{bbx:locpubyear}% - {\usebibmacro{colonloc}} - {\usebibmacro{commaloc}}} +\ifdefstring{\bbx@publocformat}{loccolonpub} +{\usebibmacro{loccolonpub}}{\ifdefstring{\bbx@publocformat}{locpubyear} + {\usebibmacro{locpubyear}} + {\usebibmacro{publocyear}}}} + +\renewbibmacro*{institution+location+date}{% +\ifdefstring{\bbx@publocformat}{loccolonpub} +{\usebibmacro{inloccolonpub}}{\ifdefstring{\bbx@publocformat}{locpubyear} + {\usebibmacro{inlocpubyear}} + {\usebibmacro{inpublocyear}}}} + +\renewbibmacro*{organization+location+date}{% +\ifdefstring{\bbx@publocformat}{loccolonpub} +{\usebibmacro{orgloccolonpub}}{\ifdefstring{\bbx@publocformat}{locpubyear} + {\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-. %*********************************************************************************************************** +%\ifdefstring{\bbx@origfieldsformat}{parens} +% {\setunit{\addspace\origleftparen}}% +% {\ifdefstring{\bbx@origfieldsformat}{brackets}{\setunit{\addspace\origleftbracket}}{\setunit{\addsemicolon\space}}} + \newbibmacro*{origfields}{% \iflistundef{origlocation}% {}% - {\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% + {\ifdefstring{\bbx@origfieldsformat}{parens} + {\setunit{\addspace\origleftparen}}% + {\ifdefstring{\bbx@origfieldsformat}{brackets}{\setunit{\addspace\origleftbracket}}{\setunit{\addsemicolon\space}}}% \iffieldundef{reprinttitle}% {\printtext{\bibstring{transtolang}}\nopunct} {\printtext{\bibstring{reprint}}\nopunct} @@ -207,21 +249,24 @@ origbrackets=false} {\usebibmacro{reprinttitle}}% \newunit\newblock \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}} +\ifdefstring{\bbx@origfieldsformat}{parens} + {\origrightparen}% + {\ifdefstring{\bbx@origfieldsformat}{brackets}{\origrightbracket}{}}}} + \newbibmacro*{origpublisher+origlocation+origdate}{% - \ifbool{bbx:locpubyear}% - {\usebibmacro{origcolonloc}% - \setunit{\bibpagespunct}% +\ifdefstring{\bbx@publocformat}{loccolonpub} +{\usebibmacro{origloccolonpub}\setunit{\bibpagespunct}% + \printfield{userc}}{\ifdefstring{\bbx@publocformat}{locpubyear} + {\usebibmacro{origlocpubyear}\setunit{\bibpagespunct}% \printfield{userc}} - {\usebibmacro{origcommaloc}% - \setunit{\bibpagespunct}% - \printfield{userc}}} + {\usebibmacro{origpublocyear}\setunit{\bibpagespunct}% + \printfield{userc}}}} + % Questa macro gestisce la forma: ``Publisher, Location Year'', relativamente alla traduzione %*********************************************************************************************************** -\newbibmacro*{origcommaloc}{% +\newbibmacro*{origpublocyear}{% \iflistundef{origpublisher}% {\printlist{origlocation}% \setunit*{\addspace}% @@ -235,7 +280,7 @@ origbrackets=false} % Questa macro gestisce la forma: ``Location: Publisher, Year'', relativamente alla traduzione %*********************************************************************************************************** -\newbibmacro*{origcolonloc}{% +\newbibmacro*{origloccolonpub}{% \iflistundef{origlocation}{}% {\printlist{origlocation}}% \iflistundef{origpublisher}% @@ -246,6 +291,20 @@ origbrackets=false} \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) %*********************************************************************************************************** @@ -272,8 +331,9 @@ origbrackets=false} %*********************************************************************************************************** \newbibmacro*{origtitle:incollection}{% \iflistundef{origlocation}{}{% -\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% +\ifdefstring{\bbx@origfieldsformat}{parens} + {\setunit{\addspace\origleftparen}}% + {\ifdefstring{\bbx@origfieldsformat}{brackets}{\setunit{\addspace\origleftbracket}}{\setunit{\addsemicolon\space}}}% \printtext{\bibstring{transtolang}% \iffieldundef{usera}% {\setunit{\addspace}}% @@ -290,16 +350,18 @@ origbrackets=false} \printfield{userb}% \newunit} \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}}} +\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}{}{% -\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% - \printtext{\bibstring{transtolang}% +\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}% @@ -315,14 +377,16 @@ origbrackets=false} \printfield{userb}% \newunit}% \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}}} +\ifdefstring{\bbx@origfieldsformat}{parens} + {\origrightparen}% + {\ifdefstring{\bbx@origfieldsformat}{brackets}{\origrightbracket}{}}}}} \newbibmacro*{articletranslated}{% \iflistundef{origlocation}{}{% -\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% - \printtext{\bibstring{transtolang}% +\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} @@ -337,8 +401,9 @@ origbrackets=false} \printfield{userb} \newunit} \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}}} +\ifdefstring{\bbx@origfieldsformat}{parens} + {\origrightparen}% + {\ifdefstring{\bbx@origfieldsformat}{brackets}{\origrightbracket}{}}}}} @@ -414,7 +479,28 @@ origbrackets=false} %*********************************************************************************************************** %*********************************************************************************************************** -\renewbibmacro*{journal+issuetitle}{% + +\newbibmacro*{volnumdefault}{% +\printfield{volume}% + \setunit*{\volnumpunct}% + \printfield{number}} + +\newbibmacro*{volnumparens}{% +\nopunct% +\printtext[pureparens]{% +\printfield{volume}% + \setunit*{\volnumpunct}% + \printfield{number}}\addcomma\space} + +\newbibmacro*{volnumstrings}{% +\iffieldundef{volume}{}{% +\bibstring{volume}\setunit*{\addnbspace}\printfield{volume}}% +\setunit*{\volnumpunct}% +\iffieldundef{number}{}{% +\bibstring{number}\setunit*{\addnbspace}\printfield{number}}} + + + \renewbibmacro*{journal+issuetitle}{% \usebibmacro{journal}% \setunit*{\addspace}% \iffieldundef{series} @@ -423,17 +509,17 @@ origbrackets=false} \printfield{series}% \setunit{\addspace}}% \newunit - \printfield{volume}% - \setunit*{\addcomma\space}% - \printfield{number}% - \setunit{\addcomma\space}% + \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*{title+issuetitle}{% \usebibmacro{periodical}% \setunit*{\addspace}% @@ -443,9 +529,9 @@ origbrackets=false} \printfield{series}% \setunit{\addspace}}% \newunit - \printfield{volume}% - \setunit*{\addcomma\space}% - \printfield{number}% + \ifdefstring{\bbx@volnumformat}{volnumstrings}{\usebibmacro{volnumstrings}}% + {\ifdefstring{\bbx@volnumformat}{volnumparens}{\usebibmacro{volnumparens}}% + {\usebibmacro{volnumdefault}}}% \setunit{\addcomma\space}% \printfield{eid}% \setunit{\addspace}% @@ -470,6 +556,7 @@ origbrackets=false} \newunit\newblock \printfield{version}% \newunit\newblock + \ifbool{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 50ee2f9e98f..d6a2e74b8d8 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.6 2010/03/23 Valbusa$ + % $Id: philosophy-verbose.bbx,v 0.7 2010/03/30 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.6 2010/03/23 valbsua beta $] +\ProvidesFile{philosophy-verbose.bbx}[$Id: philosophy-verbose.bbx,v 0.7 2010/03/30 valbsua beta $] \RequireBibliographyStyle{authortitle} \RequireBibliographyStyle{philosophy-standard} @@ -24,7 +24,7 @@ % Macro per la forma ``Publisher, Location Year''. %*********************************************************************************************************** -\newbibmacro*{commaloc}{% +\newbibmacro*{publocyear}{% \iflistundef{publisher}% {}% {\printlist{publisher}} @@ -34,9 +34,31 @@ \usebibmacro{date}% \newunit} +\newbibmacro*{inpublocyear}{% + \iflistundef{institution}% + {}% + {\printlist{institution}} + \setunit*{\addcomma\space}% + \printlist{location}% + \setunit*{\addspace}% + \usebibmacro{date}% + \newunit} + +\newbibmacro*{orgpublocyear}{% + \iflistundef{organization}% + {}% + {\printlist{organization}} + \setunit*{\addcomma\space}% + \printlist{location}% + \setunit*{\addspace}% + \usebibmacro{date}% + \newunit} + + + % Macro per la forma ``Location: Publisher, Year'' %*********************************************************************************************************** -\newbibmacro*{colonloc}{% +\newbibmacro*{loccolonpub}{% \printlist{location}% \iflistundef{publisher}% {\setunit*{\addspace}} @@ -46,6 +68,59 @@ \usebibmacro{date}% \newunit} +\newbibmacro*{inloccolonpub}{% + \printlist{location}% + \iflistundef{institution} + {\setunit*{\addspace}} + {\setunit*{\addcolon\space}}% + \printlist{institution}% + \setunit*{\addcomma\space}% + \usebibmacro{date}% + \newunit} + +\newbibmacro*{orgloccolonpub}{% + \printlist{location}% + \iflistundef{organization} + {\setunit*{\addspace}} + {\setunit*{\addcolon\space}}% + \printlist{organization}% + \setunit*{\addcomma\space}% + \usebibmacro{date}% + \newunit} + + +% Macro per la forma ``Location, Publisher, Year'' +%*********************************************************************************************************** +\newbibmacro*{locpubyear}{% + \printlist{location}% + \iflistundef{publisher}% + {\setunit*{\addspace}} + {\setunit*{\addcomma\space}}% + \printlist{publisher}% + \setunit*{\addcomma\space}% + \usebibmacro{date}% +\newunit} + +\newbibmacro*{inlocpubyear}{% + \printlist{location}% + \iflistundef{institution} + {\setunit*{\addspace}} + {\setunit*{\addcomma\space}}% + \printlist{institution}% + \setunit*{\addcomma\space}% + \usebibmacro{date}% + \newunit} + +\newbibmacro*{orglocpubyear}{% + \printlist{location}% + \iflistundef{organization} + {\setunit*{\addspace}} + {\setunit*{\addcomma\space}}% + \printlist{organization}% + \setunit*{\addcomma\space}% + \usebibmacro{date}% + \newunit} + %*********************************************************************************************************** %*********************************************************************************************************** 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 19942ef0ea6..2bce606803f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx @@ -1,22 +1,25 @@ -% $Id: philosophy-verbose.cbx,v 0.6 2010/03/23 17:00:00 15:42:33 valbusa beta $ +% $Id: philosophy-verbose.cbx,v 0.7 2010/03/30 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.6 2010/03/23 17:00:00 15:42:33 valbusa beta $] +[$Id: philosophy-verbose.cbx,v 0.7 2010/03/30 17:00:00 15:42:33 valbusa beta $] \RequireCitationStyle{verbose-trad2} \DeclareLanguageMapping{italian}{italian-philosophy} \newbool{cbx:scauthorscite} \newbool{cbx:latinemph} +\newbool{cbx:commacit} \DeclareBibliographyOption{scauthorscite}[true]{% \csuse{bool#1}{cbx:scauthorscite}} \DeclareBibliographyOption{latinemph}[true]{% \csuse{bool#1}{cbx:latinemph}} +\DeclareBibliographyOption{commacit}[true]{% + \csuse{bool#1}{cbx:commacit}} \ExecuteBibliographyOptions{% @@ -24,7 +27,8 @@ idemtracker=false, loccittracker=strict, citetracker=true, scauthorscite=false, -latinemph=false} +latinemph=false, +commacit=false} \newbibmacro*{cite:loccit}{% \printtext{% @@ -44,8 +48,9 @@ latinemph=false} \renewbibmacro*{cite:title}{% \printtext[bibhyperlink]{% \printfield[citetitle]{labeltitle}% - \setunit{\addspace\midsentence}% - \bibstring{opcit}}} + \ifbool{cbx:commacit}{\setunit{\addcomma\space}} + {\setunit{\addspace\midsentence}}}% + \bibstring{opcit}} \AtEveryCite{\boolfalse{bbx:annotation}} -- cgit v1.2.3