From 41074cff20eaf18087a15710845c1dfb225d241b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 23 Mar 2010 22:57:41 +0000 Subject: biblatex-philosophy update (23mar10) git-svn-id: svn://tug.org/texlive/trunk@17540 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/english-philosophy.lbx | 23 + .../biblatex-philosophy/italian-philosophy.lbx | 15 +- .../biblatex-philosophy/philosophy-classic.bbx | 565 +-------------------- .../biblatex-philosophy/philosophy-classic.cbx | 7 +- .../biblatex-philosophy/philosophy-modern.bbx | 34 +- .../biblatex-philosophy/philosophy-modern.cbx | 4 +- .../biblatex-philosophy/philosophy-standard.bbx | 558 ++++++++++++++++++++ .../biblatex-philosophy/philosophy-verbose.bbx | 550 +------------------- .../biblatex-philosophy/philosophy-verbose.cbx | 40 +- 9 files changed, 654 insertions(+), 1142 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy') diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx new file mode 100644 index 00000000000..1b946b03fe8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx @@ -0,0 +1,23 @@ +% english-philosophy.lbx,Ivan Valbusa 2010 + +\ProvidesFile{english-philosophy.lbx}[2010/03/23 v 0.6 biblatex localization file for biblatex-philosophy] + +\InheritBibliographyExtras{english} + +\NewBibliographyString{transtolang} + +\DeclareBibliographyStrings{% + inherit={english}, + opcit = {{cit\adddot}{cit\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}}}, + backrefpage = {{cited on p\adddot}{cited on p\adddot}}, + backrefpages = {{cited on pp\adddot}{cited on pp\adddot}}, +} + + +\endinput 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 716a0e0d8cf..8df109626aa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx @@ -1,22 +1,25 @@ % italian-philosophy.lbx,Ivan Valbusa 2010 -\ProvidesFile{italian-philosophy.lbx}[2010/03/07 v 0.5 biblatex localization file for biblatex-philosophy] +\ProvidesFile{italian-philosophy.lbx}[2010/03/23 v 0.6 biblatex localization file for biblatex-philosophy] \InheritBibliographyExtras{italian} +\NewBibliographyString{transtolang} + \DeclareBibliographyStrings{% - inherit = {italian}, + inherit={italian}, opcit = {{cit\adddot}{cit\adddot}}, ibidem = {{ivi}{ivi}}, loccit = {{ibidem}{ibidem}}, + backrefpage = {{Citato a p\adddot}{Citato a p\adddot}}, + backrefpages = {{Citato alle pp\adddot}{Citato alle pp\adddot}}, sequentes = {{ss\adddot}{ss\adddot}}, sequens = {{s\adddot}{s\adddot}}, reprint = {{rist\adddot}{rist\adddot}}, - reprintas = {{trad\adddotspace it\adddot}{trad\adddotspace it\adddot}}, - see = {{vedi}{vedi}}, + transtolang = {{trad\adddotspace it\adddot}{trad\adddotspace it\adddot}}, andothers = {{\mkbibemph{et\addabbrvspace al\adddot}}{\mkbibemph{et\addabbrvspace al\adddot}}}, - editor = {{(a cura di)}{(a cura di)}}, - editors = {{(a cura di)}{(a cura di)}}, + editor = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, + editors = {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}}, 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 c4c2cddcd36..1bc6244b70f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx @@ -1,74 +1,34 @@ -% $Id: philosophy-classic.bbx,v 0.5 2010/03/07 Valbusa$ +% $Id: philosophy-classic.bbx,v 0.6 2010/03/023 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.5 2010/03/07 valbusa beta$] +\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.6 2010/03/23 valbusa beta$] \RequireBibliographyStyle{authoryear} +\RequireBibliographyStyle{philosophy-standard} \DeclareLanguageMapping{italian}{italian-philosophy} +\DeclareLanguageMapping{english}{english-philosophy} %*********************************************************************************************************** % % DECLARE AND EXECUTE BIBLIOGRAPHY OPTIONS % %*********************************************************************************************************** -\newbool{bbx:locpubyear} -\newbool{bbx:annotation} -\newbool{bbx:library} -\newbool{bbx:scauthors} -\newbool{bbx:scauthorsbib} -\newbool{bbx:origparens} -\newbool{bbx:origbrackets} -\newbool{bbx:square} -\newbool{bbx:namelastfirst} -\newbool{bbx:onlyfirstsc} -\newbool{bbx:itbackref} +\newbool{bbx:square} -\DeclareBibliographyOption{locpubyear}[true]{% - \csuse{bool#1}{bbx:locpubyear}} -\DeclareBibliographyOption{annotation}[true]{% - \csuse{bool#1}{bbx:annotation}} -\DeclareBibliographyOption{library}[true]{% - \csuse{bool#1}{bbx:library}} -\DeclareBibliographyOption{scauthors}[true]{% - \csuse{bool#1}{bbx:scauthors}} -\DeclareBibliographyOption{scauthorsbib}[true]{% - \csuse{bool#1}{bbx:scauthorsbib}} -\DeclareBibliographyOption{origparens}[true]{% - \csuse{bool#1}{bbx:origparens}} - \DeclareBibliographyOption{origbrackets}[true]{% - \csuse{bool#1}{bbx:origbrackets}} -\DeclareBibliographyOption{itbackref}[true]{% - \csuse{bool#1}{bbx:itbackref}} \DeclareBibliographyOption{square}[true]{% \csuse{bool#1}{bbx:square}} -\DeclareBibliographyOption{namelastfirst}[true]{% - \csuse{bool#1}{bbx:namelastfirst}} -\DeclareBibliographyOption{onlyfirstsc}[true]{% - \csuse{bool#1}{bbx:onlyfirstsc}} - \ExecuteBibliographyOptions{% uniquename=false, pagetracker, -locpubyear=false, -annotation=false, -library=true, -scauthors=false, -scauthorsbib=false, -origparens=false, -origbrackets=false, singletitle=false, -square=false, -onlyfirstsc=false, -namelastfirst=false, -itbackref=false -} +square=false} %$$$$$$ \newcounter{maxnamesincross} @@ -110,217 +70,18 @@ itbackref=false \AtBeginDocument{% \setcounter{maxnamesincross}{\value{maxnames}} \setcounter{minnamesincross}{\value{minnames}} - -\ifbool{bbx:origbrackets}{\booltrue{bbx:origparens} -\renewcommand{\origleftparen}{\bibleftbracket} -\renewcommand{\origrightparen}{\bibrightbracket}}% -{}% - - \ifbool{bbx:scauthors} - {\booltrue{bbx:scauthorsbib}\booltrue{cbx:scauthorscite}} - {}% + \ifbool{bbx:square} {\renewcommand{\bibleftparen}{\bibleftbracket}% \renewcommand{\bibrightparen}{\bibrightbracket}} {}} -%*********************************************************************************************************** -% -% AT BEGIN BILIOGRAPHY -% -%*********************************************************************************************************** -\AtBeginBibliography{% -% SMALL CAPS AUTHORS NAME -\ifbool{bbx:scauthorsbib}{% -\DeclareNameFormat{sortname}{% - \ifnumequal{\value{listcount}}{1} - {\iffirstinits - {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} - {\ifblank{#3}{\usebibmacro{name:last-first}{\textsc{#1}\nopunct}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}{\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}% - \ifblank{#3#5} - {} - {\usebibmacro{name:revsdelim}}} - {\iffirstinits - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}} - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}% - \usebibmacro{name:andothers}} -}{}% - - \ifbool{bbx:onlyfirstsc} - {\DeclareNameFormat{sortname}{% - \ifnum\value{listcount}=1\relax - \iffirstinits - {\usebibmacro{name:last-first}{\textsc{#1}}{#4}{#5}{#7}} - {\usebibmacro{name:last-first}{\textsc{#1}}{#3}{#5}{#7}}% - \ifblank{#3#5} - {} - {\usebibmacro{name:revsdelim}}% - \else - \iffirstinits - {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}} - {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}% - \fi - \usebibmacro{name:andothers}}} - {}% - -\ifbool{bbx:itbackref} - {\renewbibmacro*{pageref}{% - \iflistundef{pageref} - {}% - {\setunit{\addperiod\space}% - \ifnum\value{pageref}>1\relax - \printtext[backrefparens]{Citato\addspace alle\addspace \bibstring{pages}\ppspace% - \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct - \else - \printtext[backrefparens]{Citato\addspace a\addspace \bibstring{page}\ppspace% - \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct - \fi}}}% - {\renewbibmacro*{pageref}{% - \iflistundef{pageref} - {} - {\setunit{\addperiod\space}% - \ifnum\value{pageref}>1\relax - \printtext[backrefparens]{\bibstring{see}\space% - \bibstring{pages}\ppspace% - \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct - \else - \printtext[backrefparens]{\bibstring{see}\space% - \bibstring{page}\ppspace% - \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct - \fi}}}% -} - - -%*********************************************************************************************************** -% -% FIELDS FORMAT -% -%*********************************************************************************************************** - -%--------------------------------------------------------------------- -% new commands -%--------------------------------------------------------------------- -\newcommand*{\pureleftparen}{\blx@postpunct(} -\newcommand*{\purerightparen}{\blx@postpunct)\midsentence} - -\newrobustcmd{\mkpureparens}[1]{% - \blx@postpunct - \begingroup - \let\mkpureparens\blx@noparens - \pureleftparen#1\blx@postpunct\purerightparen - \endgroup} - -\appto\biburlsetup{\Urlmuskip=0mu\relax} - -\newcommand{\annotationfont}{\sffamily} -\newcommand{\libraryfont}{} -\renewcommand*{\newunitpunct}{\addcomma\space} -\renewcommand*{\subtitlepunct}{\adddot\space} - -% Nuovi comandi per avere la traduzione tra parentesi -\newcommand{\origleftparen}{\bibleftparen} -\newcommand{\origrightparen}{\bibrightparen} - - -%--------------------------------------------------------------------- -% fields format -%--------------------------------------------------------------------- -% TITLE -\DeclareFieldFormat[inbook]{title}{\mkbibemph{#1}} - -% CITETITLE -\DeclareFieldFormat[inbook]{citetitle}{\mkbibemph{#1}} - -% ORIGTITLE -\DeclareFieldFormat{origtitle}{\mkbibemph{#1}} - -% USERA -\DeclareFieldFormat{usera}{\mkbibemph{#1}} -\DeclareFieldFormat[article]{usera}{\mkbibquote{#1}} -\DeclareFieldFormat[inbook]{usera}{\mkbibemph{#1}} -\DeclareFieldFormat[incollection]{usera}{\mkbibquote{#1}} - -% USERC -\DeclareFieldFormat{userc}{\mkpageprefix[bookpagination]{#1}} - -% URL -\DeclareFieldFormat{url}{\url{#1}} - -% ANNOTATION LIBRARY -\DeclareFieldFormat{annotation}{\annotationfont #1} -\DeclareFieldFormat{library}{\libraryfont #1} - -% PARENS -\DeclareFieldFormat{pureparens}{\mkpureparens{#1}} -\DeclareFieldFormat{backrefparens}{\mkpureparens{#1}} - - -%********************************************************************* -% NUOVI AMBIENTI -%********************************************************************* - -\renewenvironment*{thebibliography} - {\list% - {} - {\setlength{\leftmargin}{\bibhang}% - \setlength{\itemindent}{-\leftmargin}% - \setlength{\itemsep}{\bibitemsep}% - \setlength{\parsep}{\bibparsep}}} - {\endlist} - -\renewenvironment*{theshorthands} - {\list - {\printfield[shorthandwidth]{shorthand}} - {\setlength{\labelwidth}{\shorthandwidth}% - \setlength{\leftmargin}{\labelwidth}% - \setlength{\labelsep}{\biblabelsep}% - \addtolength{\leftmargin}{\labelsep}% - \setlength{\itemsep}{\bibitemsep}% - \setlength{\parsep}{\bibparsep}% - \renewcommand*{\makelabel}[1]{##1\hss}}} - {\endlist} - %********************************************************************* % NUOVE MACRO %********************************************************************* -\renewbibmacro*{journal+issuetitle}{% - \usebibmacro{journal}% - \setunit*{\addspace}% - \iffieldundef{series} - {\setunit{\addnbspace}}% - {\newunit% - \printfield{series}% - \setunit{\addnbspace}}% - \printfield{volume}% - \setunit*{\addnbspace}% - \iffieldundef{number}{}{% - \printtext[pureparens]{\printfield{number}}}% - \setunit{\addcomma\space}% - \printfield{eid}% - \setunit{\addspace}% - \usebibmacro{issue+date}% - \newunit\newblock - \usebibmacro{issue}% - \newunit} - -% per avere il numero tra parentesi -\renewbibmacro*{issue+date}{% - \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}} - {}% - {\iffieldundef{issue} - {\iffieldundef{day} - {\printfield{month}% - \setunit{\addspace}% - } - {\printtext{\bibdate}}} - {\printfield{issue}% - \setunit{\addspace}% - }}% - \newunit} - % per eliminare il mese nelle etichette delle voci article \renewbibmacro*{date+extrayear}{% \iffieldundef{year} @@ -348,29 +109,6 @@ itbackref=false }% } - -\renewbibmacro*{annotation}{% -\ifbool{bbx:library}{% -\setunit{\addperiod\space} - \iffieldundef{library} - {\printfile[library]{\bibannotationprefix\thefield{entrykey}.tex}} - {\printfield{library}}} - {} - } - -\renewbibmacro*{finentry}{% - \ifbool{bbx:annotation}% - {\iffieldundef{annotation}% - {\finentry}% - {\setunit{\addperiod\par\nobreak}% - \printtext[annotation]{\printfield{annotation}\finentry\par}}}% - {\finentry}} - -\renewbibmacro*{publisher+location+date}{% - \ifbool{bbx:locpubyear}% - {\usebibmacro{colonloc}} - {\usebibmacro{commaloc}}} - \newbibmacro*{commaloc}{% \iflistundef{publisher}% {} @@ -386,231 +124,13 @@ itbackref=false {\setunit*{\addcolon\space}}% \printlist{publisher}% \newunit} - - -\newbibmacro*{origfields}{% - \iflistundef{origlocation}% - {} - {\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% - \iffieldundef{reprinttitle}% - {\printtext{\bibstring{reprintas}}\nopunct} - {\printtext{\bibstring{reprint}}\nopunct}% - \setunit{\addspace}% - \iffieldundef{reprinttitle}% - {\usebibmacro{origtitle}} - {\usebibmacro{reprinttitle}} - \newunit\newblock - \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}}} - - -\newbibmacro*{origpublisher+origlocation+origdate}{% - \ifbool{bbx:locpubyear}% - {\usebibmacro{origcolonloc}% - \setunit{\bibpagespunct}% - \printfield{userc}} - {\usebibmacro{origcommaloc}% - \setunit{\bibpagespunct}% - \printfield{userc}}} - - - \newbibmacro*{origcommaloc}{% -\iflistundef{origpublisher}% - {\printlist{origlocation} - \setunit*{\addspace}% - \printorigdate}% - {\printlist{origpublisher}% - \setunit*{\addcomma\space}% - \printlist{origlocation}% - \setunit*{\addspace}% - \printorigdate}% - \newunit} - -\newbibmacro*{origcolonloc}{% -\iflistundef{origlocation}{}% - {\printlist{origlocation}}% - \iflistundef{origpublisher}% - {\setunit*{\addspace}% - \printorigdate}% - {\setunit*{\addcolon\space}% - \printlist{origpublisher}% - \setunit*{\addcomma\space}% - \printorigdate}% - \newunit} - -\newbibmacro*{reprinttitle}{% - \iffieldundef{reprinttitle}{}{% - \iffieldsequal{reprinttitle}{title}{}{% - \printfield[title]{reprinttitle} - \setunit{\addcomma\space}}} - \iffieldundef{userb}{}{% - \printfield{userb} - %\newunit - }} - -\newbibmacro*{origtitle}{% - \iffieldundef{origtitle}{}{ - \printfield[origtitle]{origtitle}% - \setunit{\addcomma\space}} - \iffieldundef{userb}{}{% - \printfield{userb}% - }} - -\newbibmacro*{origtitle:incollection}{% - \iflistundef{origlocation}{}{% -\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% - \printtext{\bibstring{reprintas}% - \iffieldundef{usera}% - {\setunit{\addspace}}% - {\setunit{\addspace}% - \printfield[usera]{usera}% - \setunit{\addcomma\space}% - \usebibmacro{in:}}% - \setunit{\addspace}% - \newblock - \iffieldundef{origtitle}{}{% - \printfield[origtitle]{origtitle}% - \setunit{\addcomma\space}} - \iffieldundef{userb}{}{% - \printfield{userb}% - \newunit} - \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}}} - -\newbibmacro*{origtitle:inbook}{% - \iflistundef{origlocation}{}{% -\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% - \printtext{\bibstring{reprintas}% - \iffieldundef{usera}% - {\setunit{\addspace}}% - {\setunit{\addspace}% - \printfield{usera}% - \setunit{\addcomma\space}% - \usebibmacro{in:}}% - \setunit{\addspace} - \newblock - \iffieldundef{origtitle}{}{% - \printfield[origtitle]{origtitle} - \setunit{\addcomma\space}} - \iffieldundef{userb}{}{% - \printfield{userb}% - \newunit} - \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}}} - -\renewbibmacro*{in:}{% - \bibstring{in}\addcolon\setunit{\addspace}} - -\newbibmacro*{articletranslated}{% - \iflistundef{origlocation}{}{% -\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% - \printtext{\bibstring{reprintas}% - \iffieldundef{usera}% - {\setunit{\addspace}}% - {\setunit{\addspace} - \printfield{usera}% - \setunit{\addcomma\space}% - \usebibmacro{in:}% - \setunit{\addspace}}% - \iffieldundef{origtitle}{}{% - \printfield[origtitle]{origtitle}% - \newunit\newblock} - \iffieldundef{userb}{}{% - \printfield{userb} - \newunit} - \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}}} - - + %********************************************************************* %% BIBLIOGRAPHY DRIVERS %********************************************************************* -%*********************************************************************************************************** - \renewbibmacro*{addendum+pubstate}{% - \printfield{addendum}% - \newunit\newblock - \printfield{pubstate}% - \newunit\newblock - \usebibmacro{origfields}% - \newunit\newblock - \usebibmacro{annotation}% -} - -%*********************************************************************************************************** - \newbibmacro*{artaddendum+pubstate}{% - \printfield{addendum}% - \newunit\newblock - \printfield{pubstate}% - \newunit\newblock - \usebibmacro{articletranslated}% - \newunit\newblock - \usebibmacro{annotation}% -} - -%*********************************************************************************************************** - \newbibmacro*{inbookaddendum+pubstate}{% - \printfield{addendum}% - \newunit\newblock - \printfield{pubstate}% - \newunit\newblock - \usebibmacro{origtitle:inbook}% - \newunit\newblock - \usebibmacro{annotation}% -} - -%*********************************************************************************************************** - \newbibmacro*{incolladdendum+pubstate}{% - \printfield{addendum}% - \newunit\newblock - \printfield{pubstate}% - \newunit\newblock - \usebibmacro{origtitle:incollection}% - \newunit\newblock - \usebibmacro{annotation}% -} - -\DeclareBibliographyDriver{article}{% - \usebibmacro{bibindex}% - \usebibmacro{begentry}% - \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock - \usebibmacro{title}% - \newunit - \printlist{language}% - \newunit\newblock - \usebibmacro{byauthor}% - \newunit\newblock - \usebibmacro{bytranslator+others}% - \newunit\newblock - \printfield{version}% - \newunit\newblock - \usebibmacro{journal+issuetitle}% - \newunit\newblock - \usebibmacro{byeditor+others}% - \newunit\newblock - \usebibmacro{note+pages}% - \newunit\newblock - \iftoggle{bbx:isbn} - {\printfield{issn}} - {}% - \newunit\newblock - \usebibmacro{doi+eprint+url}% - \newunit\newblock - \usebibmacro{artaddendum+pubstate}% - \newunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} - - \newbibmacro*{crossdate+extrayear}{% +\newbibmacro*{crossdate+extrayear}{% \iffieldundef{year}% {}% {\unspace\printtext[parens]{\printdateextra}}} @@ -657,39 +177,6 @@ itbackref=false \usebibmacro{pageref}% \usebibmacro{finentry}}} - \newbibmacro*{incollection:full}{% - \usebibmacro{maintitle+booktitle}% - \newunit\newblock - \usebibmacro{byeditor+others}% - \newunit\newblock - \printfield{edition}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% - \newunit\newblock - \usebibmacro{series+number}% - \newunit\newblock - \printfield{note}% - \newunit\newblock - \usebibmacro{publisher+location+date}% - \newunit\newblock - \usebibmacro{chapter+pages}% - \newunit\newblock - \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% - \newunit\newblock - \usebibmacro{doi+eprint+url}% - \newunit\newblock - \usebibmacro{incolladdendum+pubstate}% - \newunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} - \DeclareBibliographyDriver{inbook}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -716,39 +203,5 @@ itbackref=false \usebibmacro{pageref}% \usebibmacro{finentry}}} - \newbibmacro*{inbook:full}{ - \usebibmacro{bybookauthor}% - \newunit\newblock - \usebibmacro{maintitle+booktitle}% - \newunit\newblock - \usebibmacro{byeditor+others}% - \newunit\newblock - \printfield{edition}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% - \newunit\newblock - \usebibmacro{series+number}% - \newunit\newblock - \printfield{note}% - \newunit\newblock - \usebibmacro{publisher+location+date}% - \newunit\newblock - \usebibmacro{chapter+pages}% - \newunit\newblock - \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% - \newunit\newblock - \usebibmacro{doi+eprint+url}% - \newunit\newblock - \usebibmacro{addendum+pubstate}% - \newunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx index 5fb9c298206..59c38d371b9 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.5 2010/03/07 Valbusa$ +% $Id: philosophy-classic.cbx,v 0.6 2010/03/23 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.5 2010/03/07 valbusa beta$] +\ProvidesFile{philosophy-classic.cbx}[philosophy-classic.cbx,v 0.6 2010/03/23 valbusa beta$] \RequireCitationStyle{authoryear-comp} \DeclareLanguageMapping{italian}{italian-philosophy} @@ -25,9 +25,6 @@ scauthorscite=false % %*********************************************************************************************************** \AtEveryCite{% - \ifbool{bbx:onlyfirstsc}% - {\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}}% - {}% \ifbool{cbx:scauthorscite}% {\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}} {}% 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 b42152fe62a..37d743565c0 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.5 2010/03/07 Valbusa$ +% $Id: philosophy-modern.bbx,v 0.6 2010/03/23 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.5 2010/03/07 valbusa beta$] +\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.6 2010/03/23 valbusa beta$] \RequireBibliographyStyle{philosophy-classic} @@ -14,8 +14,7 @@ \csuse{bool#1}{bbx:yearleft}} \ExecuteBibliographyOptions{% -yearleft=false% -} +yearleft=false} %%--------------------------------------------------------------------------------------------- %% new lengths @@ -37,11 +36,6 @@ yearleft=false% \newcommand{\postsep}{\par\nobreak\vskip\postnamesep\hskip-\bibhang\ignorespaces} - -%\renewcommand{\labelnamepunct}{% -% \ifthenelse{\ifnameundef{author}} -% {{\addspace}}{\unspace}} -%\renewcommand{\entrysetpunct}{} \renewcommand{\labelnamepunct}{\unspace} %%--------------------------------------------------------------------------------------------- @@ -70,12 +64,9 @@ yearleft=false% \printtext{\printfield{labelyear}\printfield{extrayear}% \hskip\yeartitle}}}} - - - % label for entries without 'editor' and 'author' %%------------------------------------------------------------- -\renewbibmacro*{labeltitle}{%%---------\renewbibmacro{editorstrg}{}?????? +\renewbibmacro*{labeltitle}{% \iffieldundef{label}% {\iffieldundef{shorttitle} {\printfield{title}% @@ -86,7 +77,6 @@ yearleft=false% % macro 'author' OKKKKK %%---------------------------------------------------- - \renewbibmacro*{author}{% \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}} {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND @@ -110,16 +100,15 @@ yearleft=false% \usebibmacro{date+extrayear}} -% macro 'editor' OKKKKKK +% 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}\)} - {}%MOD + {}% removed \bibnamedash {\printnames{editor}% \postsep%ADD \usebibmacro{bbx:savehash}}% @@ -139,7 +128,9 @@ yearleft=false% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{editor+others}% - \setunit{\addcomma\space}\newblock + \ifuseeditor{% trick for entry with ``label'' field + \setunit{\addcomma\space}} + {}\newblock \usebibmacro{maintitle+title}% \newunit \printlist{language}% @@ -176,11 +167,4 @@ yearleft=false% \usebibmacro{pageref}% \usebibmacro{finentry}} - -\DeclareBibliographyDriver{set}{% - \entryset{}{\addperiod\postsep}% -\nopunct\vskip-2\baselineskip -\finentry} - - \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx index f6f540223d5..fdfdd670409 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.5 2010/03/07 Valbusa$ +% $Id: philosophy-modern.cbx,v 0.6 2010/03/23 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.5 2010/03/07 valbusa beta$] +\ProvidesFile{philosophy-modern.cbx}[philosophy-modern.cbx,v 0.6 2010/03/23 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 new file mode 100644 index 00000000000..ae9598d288b --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -0,0 +1,558 @@ +% $Id: philosophy-standard.bbx,v 0.6 2010/03/23 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 $] + +\DeclareLanguageMapping{italian}{italian-philosophy} +\DeclareLanguageMapping{english}{english-philosophy} + +%*********************************************************************************************************** +% +% DECLARE AND EXECUTE BIBLIOGRAPHY OPTIONS +% +%*********************************************************************************************************** + +\newbool{bbx:locpubyear} +\newbool{bbx:annotation} +\newbool{bbx:library} +\newbool{bbx:scauthors} +\newbool{bbx:scauthorsbib} +\newbool{bbx:origparens} +\newbool{bbx:origbrackets} + + +\DeclareBibliographyOption{locpubyear}[true]{% + \csuse{bool#1}{bbx:locpubyear}} +\DeclareBibliographyOption{annotation}[true]{% + \csuse{bool#1}{bbx:annotation}} +\DeclareBibliographyOption{library}[true]{% + \csuse{bool#1}{bbx:library}} +\DeclareBibliographyOption{scauthors}[true]{% + \csuse{bool#1}{bbx:scauthors}} +\DeclareBibliographyOption{scauthorsbib}[true]{% + \csuse{bool#1}{bbx:scauthorsbib}} + +\DeclareBibliographyOption{origparens}[true]{% + \csuse{bool#1}{bbx:origparens}} + \DeclareBibliographyOption{origbrackets}[true]{% + \csuse{bool#1}{bbx:origbrackets}} + + +\ExecuteBibliographyOptions{% +locpubyear=false, +annotation=false, +library=true, +scauthors=false, +scauthorsbib=false, +origparens=false, +origbrackets=false} + +%*********************************************************************************************************** +% +% AT BEGIN SHORTHANDS +% +%*********************************************************************************************************** +% +\AtBeginShorthands{\boolfalse{bbx:annotation}} + +%*********************************************************************************************************** +% +% AT BEGIN BILIOGRAPHY +% +%*********************************************************************************************************** +\AtBeginBibliography{% +% SMALL CAPS AUTHORS NAME +\ifbool{bbx:scauthorsbib}{% +\DeclareNameFormat{sortname}{% + \ifnumequal{\value{listcount}}{1} + {\iffirstinits + {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} + {\ifblank{#3}{\usebibmacro{name:last-first}{\textsc{#1}\nopunct}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}{\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}% + \ifblank{#3#5} + {} + {\usebibmacro{name:revsdelim}}} + {\iffirstinits + {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}} + {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}% + \usebibmacro{name:andothers}} +}{}% +} + +%*********************************************************************************************************** +% +% AT BEGIN DOCUMENT +% +%*********************************************************************************************************** +\AtBeginDocument{% +\ifbool{bbx:origbrackets}{\booltrue{bbx:origparens} +\renewcommand{\origleftparen}{\bibleftbracket} +\renewcommand{\origrightparen}{\bibrightbracket}}% +{}% + \ifbool{bbx:scauthors} + {\booltrue{bbx:scauthorsbib}\booltrue{cbx:scauthorscite}}% + {}% +} + +%*********************************************************************************************************** +% +% FIELDS FORMAT +% +%*********************************************************************************************************** + +%--------------------------------------------------------------------- +% new commands +%--------------------------------------------------------------------- +\newcommand*{\pureleftparen}{\blx@postpunct(} +\newcommand*{\purerightparen}{\blx@postpunct)\midsentence} + +\newrobustcmd{\mkpureparens}[1]{% + \blx@postpunct + \begingroup + \let\mkpureparens\blx@noparens + \pureleftparen#1\blx@postpunct\purerightparen + \endgroup} + +% 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} + +\renewcommand*{\newunitpunct}{\addcomma\space} +\renewcommand*{\subtitlepunct}{\addperiod\space} +\renewcommand*{\intitlepunct}{\addspace} + + +\appto\biburlsetup{\Urlmuskip=0mu\relax} +%--------------------------------------------------------------------- +% fields format +%--------------------------------------------------------------------- + +% TITLE +\DeclareFieldFormat[inbook]{title}{\mkbibemph{#1}} + +% CITETITLE +\DeclareFieldFormat[inbook]{citetitle}{\mkbibemph{#1}} + +% ORIGTITLE +\DeclareFieldFormat{origtitle}{\mkbibemph{#1}} + +% USERA +\DeclareFieldFormat{usera}{\mkbibemph{#1}} +\DeclareFieldFormat[article]{usera}{\mkbibquote{#1}} +\DeclareFieldFormat[inbook]{usera}{\mkbibemph{#1}} +\DeclareFieldFormat[incollection]{usera}{\mkbibquote{#1}} + +% USERC +\DeclareFieldFormat{userc}{\mkpageprefix[bookpagination]{#1}} + +% URL +\DeclareFieldFormat{url}{\url{#1}} + +% ANNOTATION LIBRARY +\DeclareFieldFormat{annotation}{\annotationfont #1} +\DeclareFieldFormat{library}{\libraryfont #1} + +% PARENS +\DeclareFieldFormat{backrefparens}{\mkpureparens{#1}} +\DeclareFieldFormat[article]{volume}{\textsc{\RN{#1}}} + +%*********************************************************************************************************** +% +% NEW MACROS +% +%*********************************************************************************************************** + + +\renewbibmacro*{pageref}{% + \iflistundef{pageref} + {} + {\setunit{\addperiod\space}% + \printtext[backrefparens]{% + \ifnumgreater{\value{pageref}}{1} + {\bibstring{backrefpages}\ppspace} + {\bibstring{backrefpage}\ppspace}% + \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct}} + + +%*********************************************************************************************************** +\renewbibmacro*{publisher+location+date}{% + \ifbool{bbx:locpubyear}% + {\usebibmacro{colonloc}} + {\usebibmacro{commaloc}}} + +%*********************************************************************************************************** +% 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}% + {}% + {\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% +\setunit{\addsemicolon\space}}% + \iffieldundef{reprinttitle}% + {\printtext{\bibstring{transtolang}}\nopunct} + {\printtext{\bibstring{reprint}}\nopunct} + \setunit{\addspace}% + \iffieldundef{reprinttitle}% + {\usebibmacro{origtitle}}% + {\usebibmacro{reprinttitle}}% + \newunit\newblock + \usebibmacro{origpublisher+origlocation+origdate}% + \ifbool{bbx:origparens}{\origrightparen}{}% +}} + +\newbibmacro*{origpublisher+origlocation+origdate}{% + \ifbool{bbx:locpubyear}% + {\usebibmacro{origcolonloc}% + \setunit{\bibpagespunct}% + \printfield{userc}} + {\usebibmacro{origcommaloc}% + \setunit{\bibpagespunct}% + \printfield{userc}}} + +% Questa macro gestisce la forma: ``Publisher, Location Year'', relativamente alla traduzione +%*********************************************************************************************************** +\newbibmacro*{origcommaloc}{% +\iflistundef{origpublisher}% + {\printlist{origlocation}% + \setunit*{\addspace}% + \printorigdate}% + {\printlist{origpublisher}% + \setunit*{\addcomma\space}% + \printlist{origlocation}% + \setunit*{\addspace}% + \printorigdate}% + \newunit} + +% Questa macro gestisce la forma: ``Location: Publisher, Year'', relativamente alla traduzione +%*********************************************************************************************************** +\newbibmacro*{origcolonloc}{% +\iflistundef{origlocation}{}% + {\printlist{origlocation}}% + \iflistundef{origpublisher}% + {\setunit*{\addspace}% + \printorigdate}% + {\setunit*{\addcolon\space}% + \printlist{origpublisher}% + \setunit*{\addcomma\space}% + \printorigdate}% + \newunit} + +% La macro che gestisce il titolo della traduzione (origtitle) +%*********************************************************************************************************** +\newbibmacro*{origtitle}{% + \iffieldundef{origtitle}{}{ + \printfield[origtitle]{origtitle}% + \setunit{\addcomma\space}} + \iffieldundef{userb}{}{% + \printfield{userb}% + }} + +% La macro che gestisce il titolo della ristampa (reprinttitle) +%*********************************************************************************************************** +\newbibmacro*{reprinttitle}{% + \iffieldundef{reprinttitle}{}{% + \iffieldsequal{reprinttitle}{title}{}{% + \printfield[title]{reprinttitle}% + \setunit{\addcomma\space}}} + \iffieldundef{userb}{}{% + \printfield{userb}% + }} + +% La macro che gestisce il titolo della traduzione (origtitle) nelle voci incollection +%*********************************************************************************************************** +\newbibmacro*{origtitle:incollection}{% + \iflistundef{origlocation}{}{% +\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% +\setunit{\addsemicolon\space}}% + \printtext{\bibstring{transtolang}% + \iffieldundef{usera}% + {\setunit{\addspace}}% + {\setunit{\addspace}% + \printfield[usera]{usera}% + \setunit{\addcomma\space}% + \usebibmacro{in:}}% + \setunit{\addspace}% + \newblock + \iffieldundef{origtitle}{}{% + \printfield[origtitle]{origtitle}% + \setunit{\addcomma\space}} + \iffieldundef{userb}{}{% + \printfield{userb}% + \newunit} + \usebibmacro{origpublisher+origlocation+origdate}% + \ifbool{bbx:origparens}{\origrightparen}{}% +}}} + +% 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}% + \iffieldundef{usera}% + {\setunit{\addspace}}% + {\setunit{\addspace}% + \printfield{usera}% + \setunit{\addcomma\space}% + \usebibmacro{in:}}% + \setunit{\addspace}% + \newblock + \iffieldundef{origtitle}{}{% + \printfield[origtitle]{origtitle}% + \setunit{\addcomma\space}}% + \iffieldundef{userb}{}{% + \printfield{userb}% + \newunit}% + \usebibmacro{origpublisher+origlocation+origdate}% + \ifbool{bbx:origparens}{\origrightparen}{}% +}}} + +\newbibmacro*{articletranslated}{% + \iflistundef{origlocation}{}{% +\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% +\setunit{\addsemicolon\space}}% + \printtext{\bibstring{transtolang}% + \iffieldundef{usera}% + {\setunit{\addspace}}% + {\setunit{\addspace} + \printfield{usera}% + \setunit{\addcomma\space}% + \usebibmacro{in:}% + \setunit{\addspace}}% + \iffieldundef{origtitle}{}{% + \printfield[origtitle]{origtitle}% + \newunit\newblock} + \iffieldundef{userb}{}{% + \printfield{userb} + \newunit} + \usebibmacro{origpublisher+origlocation+origdate}% + \ifbool{bbx:origparens}{\origrightparen}{}% +}}} + + + +%*********************************************************************************************************** +%*********************************************************************************************************** + + \renewbibmacro*{annotation}{% +\ifbool{bbx:library}{% +\setunit{\addperiod\space}% + \iffieldundef{library} + {\printfile[library]{\bibannotationprefix\thefield{entrykey}.tex}} + {\printfield{library}}} + {} + } + +\renewbibmacro*{finentry}{% + \ifbool{bbx:annotation}% + {\iffieldundef{annotation}% + {\finentry}% + {\setunit{\addperiod\par\nobreak}% + \printtext[annotation]{\printfield{annotation}\finentry\par}}}% + {\finentry}} + + +%*********************************************************************************************************** + + \renewbibmacro*{addendum+pubstate}{% + \printfield{addendum}% + \newunit\newblock + \printfield{pubstate}% + \newunit\newblock + \usebibmacro{origfields}% + \newunit\newblock + \usebibmacro{annotation}% +} + +%*********************************************************************************************************** +%*********************************************************************************************************** + \newbibmacro*{artaddendum+pubstate}{% + \printfield{addendum}% + \newunit\newblock + \printfield{pubstate}% + \newunit\newblock + \usebibmacro{articletranslated}% + \newunit\newblock + \usebibmacro{annotation}% +} + +% Questa è una nuova macro, analoga alla pecedente, ma per le voci \bibtype{inbook} +%*********************************************************************************************************** + \newbibmacro*{inbookaddendum+pubstate}{% + \printfield{addendum}% + \newunit\newblock + \printfield{pubstate}% + \newunit\newblock + \usebibmacro{origtitle:inbook}% + \newunit\newblock + \usebibmacro{annotation}% +} + +% Questa è una nuova macro, analoga alla pecedente, ma per le voci \bibtype{incollection} +%*********************************************************************************************************** + \newbibmacro*{incolladdendum+pubstate}{% + \printfield{addendum}% + \newunit\newblock + \printfield{pubstate}% + \newunit\newblock + \usebibmacro{origtitle:incollection}% + \newunit\newblock + \usebibmacro{annotation}% +} + +%*********************************************************************************************************** +%*********************************************************************************************************** + +\renewbibmacro*{journal+issuetitle}{% + \usebibmacro{journal}% + \setunit*{\addspace}% + \iffieldundef{series} + {} + {\newunit + \printfield{series}% + \setunit{\addspace}}% + \newunit + \printfield{volume}% + \setunit*{\addcomma\space}% + \printfield{number}% + \setunit{\addcomma\space}% + \printfield{eid}% + \setunit{\addspace}% + \usebibmacro{issue+date}% + \setunit{\addcolon\space}% + \usebibmacro{issue}% + \newunit} + +\renewbibmacro*{title+issuetitle}{% + \usebibmacro{periodical}% + \setunit*{\addspace}% + \iffieldundef{series} + {} + {\newunit + \printfield{series}% + \setunit{\addspace}}% + \newunit + \printfield{volume}% + \setunit*{\addcomma\space}% + \printfield{number}% + \setunit{\addcomma\space}% + \printfield{eid}% + \setunit{\addspace}% + \usebibmacro{issue+date}% + \setunit{\addcolon\space}% + \usebibmacro{issue}% + \newunit} + + +\DeclareBibliographyDriver{article}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/translator+others}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{bytranslator+others}% + \newunit\newblock + \printfield{version}% + \newunit\newblock + \usebibmacro{journal+issuetitle}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \usebibmacro{note+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{issn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{artaddendum+pubstate}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + + \newbibmacro*{incollection:full}{% + \usebibmacro{maintitle+booktitle}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \printfield{edition}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{incolladdendum+pubstate}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + + \newbibmacro*{inbook:full}{% +\usebibmacro{bybookauthor}% + \newunit\newblock + \usebibmacro{maintitle+booktitle}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \printfield{edition}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{inbookaddendum+pubstate}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx index f424d8643f3..50ee2f9e98f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx @@ -1,82 +1,16 @@ -% $Id: philosophy-verbose.bbx,v 0.5 2010/03/07 Valbusa$ + % $Id: philosophy-verbose.bbx,v 0.6 2010/03/23 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.5 2010/03/07 valbsua beta $] +\ProvidesFile{philosophy-verbose.bbx}[$Id: philosophy-verbose.bbx,v 0.6 2010/03/23 valbsua beta $] \RequireBibliographyStyle{authortitle} -\DeclareLanguageMapping{italian}{italian-philosophy} +\RequireBibliographyStyle{philosophy-standard} -%*********************************************************************************************************** -% -% DECLARE AND EXECUTE BIBLIOGRAPHY OPTIONS -% -%*********************************************************************************************************** - -\newbool{bbx:locpubyear} -\newbool{bbx:annotation} -\newbool{bbx:library} -\newbool{bbx:scauthors} -\newbool{bbx:scauthorsbib} -\newbool{bbx:origparens} -\newbool{bbx:origbrackets} -\newbool{bbx:itbackref} - - -\DeclareBibliographyOption{locpubyear}[true]{% - \csuse{bool#1}{bbx:locpubyear}} -\DeclareBibliographyOption{annotation}[true]{% - \csuse{bool#1}{bbx:annotation}} -\DeclareBibliographyOption{library}[true]{% - \csuse{bool#1}{bbx:library}} -\DeclareBibliographyOption{scauthors}[true]{% - \csuse{bool#1}{bbx:scauthors}} -\DeclareBibliographyOption{scauthorsbib}[true]{% - \csuse{bool#1}{bbx:scauthorsbib}} - -\DeclareBibliographyOption{origparens}[true]{% - \csuse{bool#1}{bbx:origparens}} - \DeclareBibliographyOption{origbrackets}[true]{% - \csuse{bool#1}{bbx:origbrackets}} -\DeclareBibliographyOption{itbackref}[true]{% - \csuse{bool#1}{bbx:itbackref}} - -\ExecuteBibliographyOptions{% -locpubyear=false, -annotation=false, -library=true, -scauthors=false, -scauthorsbib=false, -itbackref=false, -origparens=false, -origbrackets=false} -%*********************************************************************************************************** -% -% AT BEGIN SHORTHANDS -% -%*********************************************************************************************************** -% -\AtBeginShorthands{\boolfalse{bbx:annotation}} - -%*********************************************************************************************************** -% -% AT BEGIN DOCUMENT -% -%*********************************************************************************************************** -\AtBeginDocument{% -\ifbool{bbx:origbrackets}{\booltrue{bbx:origparens} -\renewcommand{\origleftparen}{\bibleftbracket} -\renewcommand{\origrightparen}{\bibrightbracket}}% -{}% - \ifbool{bbx:scauthors} - {\booltrue{bbx:scauthorsbib}\booltrue{cbx:scauthorscite}}% - {}% -} - %*********************************************************************************************************** % % AT BEGIN BILIOGRAPHY @@ -84,147 +18,9 @@ origbrackets=false} %*********************************************************************************************************** \AtBeginBibliography{% \global\boolfalse{cbx:loccit}% -\citetrackertrue -% ITLIAN BACKREF -\ifbool{bbx:itbackref} - {\renewbibmacro*{pageref}{% - \iflistundef{pageref} - {}% - {\setunit{\addperiod\space}% - \ifnum\value{pageref}>1\relax - \printtext[backrefparens]{Citato\addspace alle\addspace \bibstring{pages}\ppspace% - \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct - \else - \printtext[backrefparens]{Citato\addspace a\addspace \bibstring{page}\ppspace% - \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct - \fi}}}% - {\renewbibmacro*{pageref}{% - \iflistundef{pageref} - {} - {\setunit{\addperiod\space}% - \ifnum\value{pageref}>1\relax - \printtext[backrefparens]{\bibstring{see}\space% - \bibstring{pages}\ppspace% - \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct - \else - \printtext[backrefparens]{\bibstring{see}\space% - \bibstring{page}\ppspace% - \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct - \fi}}} -% SMALL CAPS AUTHORS NAME -\ifbool{bbx:scauthorsbib}{\DeclareNameFormat{sortname}{% - \ifnumequal{\value{listcount}}{1} - {\iffirstinits - {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}} - {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}% - \ifblank{#3#5} - {} - {\usebibmacro{name:revsdelim}}} - {\iffirstinits - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}} - {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}% - \usebibmacro{name:andothers}} -}{}} - - -%*********************************************************************************************************** -% -% FIELDS FORMAT -% -%*********************************************************************************************************** - - -%--------------------------------------------------------------------- -% new commands -%--------------------------------------------------------------------- -\newcommand*{\pureleftparen}{\blx@postpunct(} -\newcommand*{\purerightparen}{\blx@postpunct)\midsentence} - -\newrobustcmd{\mkpureparens}[1]{% - \blx@postpunct - \begingroup - \let\mkpureparens\blx@noparens - \pureleftparen#1\blx@postpunct\purerightparen - \endgroup} - -% 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} - -\renewcommand*{\newunitpunct}{\addcomma\space} -\renewcommand*{\subtitlepunct}{\addperiod\space} - -\appto\biburlsetup{\Urlmuskip=0mu\relax} - -%--------------------------------------------------------------------- -% fields format -%--------------------------------------------------------------------- - -% TITLE -\DeclareFieldFormat[inbook]{title}{\mkbibemph{#1}} - -% CITETITLE -\DeclareFieldFormat[inbook]{citetitle}{\mkbibemph{#1}} - -% ORIGTITLE -\DeclareFieldFormat{origtitle}{\mkbibemph{#1}} - -% USERA -\DeclareFieldFormat{usera}{\mkbibemph{#1}} -\DeclareFieldFormat[article]{usera}{\mkbibquote{#1}} -\DeclareFieldFormat[inbook]{usera}{\mkbibemph{#1}} -\DeclareFieldFormat[incollection]{usera}{\mkbibquote{#1}} - -% USERC -\DeclareFieldFormat{userc}{\mkpageprefix[bookpagination]{#1}} - -% URL -\DeclareFieldFormat{url}{\url{#1}} - -% ANNOTATION LIBRARY -\DeclareFieldFormat{annotation}{\annotationfont #1} -\DeclareFieldFormat{library}{\libraryfont #1} - -% PARENS -\DeclareFieldFormat{backrefparens}{\mkpureparens{#1}} - - - - - -%*********************************************************************************************************** -% -% NEW MACROS -% -%*********************************************************************************************************** +\citetrackerfalse +} -%%*********************************************************************************************************** -%\renewbibmacro*{pageref}{% -% \iflistundef{pageref} -% {}% -% {\setunit{\addperiod\space}% -% \ifnum\value{pageref}>1\relax -% \printtext[backrefparens]{\bibstring{see}\space% -% \bibstring{pages}\ppspace% -% \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct%MOD -% \else -% \printtext[backrefparens]{\bibstring{see}\space% -% \bibstring{page}\ppspace% -% \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct%MOD -% \fi}} - -%*********************************************************************************************************** -\renewbibmacro*{publisher+location+date}{% - \ifbool{bbx:locpubyear}% - {\usebibmacro{colonloc}} - {\usebibmacro{commaloc}}} % Macro per la forma ``Publisher, Location Year''. %*********************************************************************************************************** @@ -268,275 +64,7 @@ origbrackets=false} \clearname{editor}} {\global\undef\bbx@lasthash}} - \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}\)} - {\bibnamedash}% - {\printnames{author}% - \setunit{\addcomma\space}% - \usebibmacro{bbx:savehash}}% - \usebibmacro{authorstrg}} - {\global\undef\bbx@lasthash}} - - -%*********************************************************************************************************** -% 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}% - {}% - {\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% - \iffieldundef{reprinttitle}% - {\printtext{\bibstring{reprintas}}\nopunct} - {\printtext{\bibstring{reprint}}\nopunct} - \setunit{\addspace}% - \iffieldundef{reprinttitle}% - {\usebibmacro{origtitle}}% - {\usebibmacro{reprinttitle}}% - \newunit\newblock - \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}} -\newbibmacro*{origpublisher+origlocation+origdate}{% - \ifbool{bbx:locpubyear}% - {\usebibmacro{origcolonloc}% - \setunit{\bibpagespunct}% - \printfield{userc}} - {\usebibmacro{origcommaloc}% - \setunit{\bibpagespunct}% - \printfield{userc}}} - -% Questa macro gestisce la forma: ``Publisher, Location Year'', relativamente alla traduzione -%*********************************************************************************************************** -\newbibmacro*{origcommaloc}{% -\iflistundef{origpublisher}% - {\printlist{origlocation}% - \setunit*{\addspace}% - \printorigdate}% - {\printlist{origpublisher}% - \setunit*{\addcomma\space}% - \printlist{origlocation}% - \setunit*{\addspace}% - \printorigdate}% - \newunit} - -% Questa macro gestisce la forma: ``Location: Publisher, Year'', relativamente alla traduzione -%*********************************************************************************************************** -\newbibmacro*{origcolonloc}{% -\iflistundef{origlocation}{}% - {\printlist{origlocation}}% - \iflistundef{origpublisher}% - {\setunit*{\addspace}% - \printorigdate}% - {\setunit*{\addcolon\space}% - \printlist{origpublisher}% - \setunit*{\addcomma\space}% - \printorigdate}% - \newunit} - -% La macro che gestisce il titolo della traduzione (origtitle) -%*********************************************************************************************************** -\newbibmacro*{origtitle}{% - \iffieldundef{origtitle}{}{ - \printfield[origtitle]{origtitle}% - \setunit{\addcomma\space}} - \iffieldundef{userb}{}{% - \printfield{userb}% - }} - -% La macro che gestisce il titolo della ristampa (reprinttitle) -%*********************************************************************************************************** -\newbibmacro*{reprinttitle}{% - \iffieldundef{reprinttitle}{}{% - \iffieldsequal{reprinttitle}{title}{}{% - \printfield[title]{reprinttitle}% - \setunit{\addcomma\space}}} - \iffieldundef{userb}{}{% - \printfield{userb}% - }} - -% La macro che gestisce il titolo della traduzione (origtitle) nelle voci incollection -%*********************************************************************************************************** -\newbibmacro*{origtitle:incollection}{% - \iflistundef{origlocation}{}{% -\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% - \printtext{\bibstring{reprintas}% - \iffieldundef{usera}% - {\setunit{\addspace}}% - {\setunit{\addspace}% - \printfield[usera]{usera}% - \setunit{\addcomma\space}% - \usebibmacro{in:}}% - \setunit{\addspace}% - \newblock - \iffieldundef{origtitle}{}{% - \printfield[origtitle]{origtitle}% - \setunit{\addcomma\space}} - \iffieldundef{userb}{}{% - \printfield{userb}% - \newunit} - \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}}} - -% 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{reprintas}% - \iffieldundef{usera}% - {\setunit{\addspace}}% - {\setunit{\addspace}% - \printfield{usera}% - \setunit{\addcomma\space}% - \usebibmacro{in:}}% - \setunit{\addspace}% - \newblock - \iffieldundef{origtitle}{}{% - \printfield[origtitle]{origtitle}% - \setunit{\addcomma\space}}% - \iffieldundef{userb}{}{% - \printfield{userb}% - \newunit}% - \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}}} - -\newbibmacro*{articletranslated}{% - \iflistundef{origlocation}{}{% -\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{% -\setunit{\addsemicolon\space}}% - \printtext{\bibstring{reprintas}% - \iffieldundef{usera}% - {\setunit{\addspace}}% - {\setunit{\addspace} - \printfield{usera}% - \setunit{\addcomma\space}% - \usebibmacro{in:}% - \setunit{\addspace}}% - \iffieldundef{origtitle}{}{% - \printfield[origtitle]{origtitle}% - \newunit\newblock} - \iffieldundef{userb}{}{% - \printfield{userb} - \newunit} - \usebibmacro{origpublisher+origlocation+origdate}% - \ifbool{bbx:origparens}{\origrightparen}{}% -}}} - - -%*********************************************************************************************************** -%*********************************************************************************************************** - - \renewbibmacro*{annotation}{% -\ifbool{bbx:library}{% -\setunit{\addperiod\space}% - \iffieldundef{library} - {\printfile[library]{\bibannotationprefix\thefield{entrykey}.tex}} - {\printfield{library}}} - {} - } - -\renewbibmacro*{finentry}{% - \ifbool{bbx:annotation}% - {\iffieldundef{annotation}% - {\finentry}% - {\setunit{\addperiod\par\nobreak}% - \printtext[annotation]{\printfield{annotation}\finentry\par}}}% - {\finentry}} - - -%*********************************************************************************************************** - - \renewbibmacro*{addendum+pubstate}{% - \printfield{addendum}% - \newunit\newblock - \printfield{pubstate}% - \newunit\newblock - \usebibmacro{origfields}% - \newunit\newblock - \usebibmacro{annotation}% -} - -%*********************************************************************************************************** -%*********************************************************************************************************** - \newbibmacro*{artaddendum+pubstate}{% - \printfield{addendum}% - \newunit\newblock - \printfield{pubstate}% - \newunit\newblock - \usebibmacro{articletranslated}% - \newunit\newblock - \usebibmacro{annotation}% -} - -% Questa è una nuova macro, analoga alla pecedente, ma per le voci \bibtype{inbook} -%*********************************************************************************************************** - \newbibmacro*{inbookaddendum+pubstate}{% - \printfield{addendum}% - \newunit\newblock - \printfield{pubstate}% - \newunit\newblock - \usebibmacro{origtitle:inbook}% - \newunit\newblock - \usebibmacro{annotation}% -} - -% Questa è una nuova macro, analoga alla pecedente, ma per le voci \bibtype{incollection} -%*********************************************************************************************************** - \newbibmacro*{incolladdendum+pubstate}{% - \printfield{addendum}% - \newunit\newblock - \printfield{pubstate}% - \newunit\newblock - \usebibmacro{origtitle:incollection}% - \newunit\newblock - \usebibmacro{annotation}% -} - -%*********************************************************************************************************** -%*********************************************************************************************************** - -\DeclareBibliographyDriver{article}{% - \usebibmacro{bibindex}% - \usebibmacro{begentry}% - \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock - \usebibmacro{title}% - \newunit - \printlist{language}% - \newunit\newblock - \usebibmacro{byauthor}% - \newunit\newblock - \usebibmacro{bytranslator+others}% - \newunit\newblock - \printfield{version}% - \newunit\newblock - %\usebibmacro{in:}% - \usebibmacro{journal+issuetitle}% - \newunit\newblock - \usebibmacro{byeditor+others}% - \newunit\newblock - \usebibmacro{note+pages}% - \newunit\newblock - \iftoggle{bbx:isbn} - {\printfield{issn}} - {}% - \newunit\newblock - \usebibmacro{doi+eprint+url}% - \newunit\newblock - \usebibmacro{artaddendum+pubstate}% - \newunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} \DeclareBibliographyDriver{incollection}{% \usebibmacro{bibindex}% @@ -560,38 +88,7 @@ origbrackets=false} \usebibmacro{finentry}}}{\usebibmacro{incollection:full}}% } - \newbibmacro*{incollection:full}{% - \usebibmacro{maintitle+booktitle}% - \newunit\newblock - \usebibmacro{byeditor+others}% - \newunit\newblock - \printfield{edition}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% - \newunit\newblock - \usebibmacro{series+number}% - \newunit\newblock - \printfield{note}% - \newunit\newblock - \usebibmacro{publisher+location+date}% - \newunit\newblock - \usebibmacro{chapter+pages}% - \newunit\newblock - \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% - \newunit\newblock - \usebibmacro{doi+eprint+url}% - \newunit\newblock - \usebibmacro{incolladdendum+pubstate}% - \newunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} + \DeclareBibliographyDriver{inbook}{% \usebibmacro{bibindex}% @@ -615,40 +112,7 @@ origbrackets=false} \usebibmacro{finentry}}}{\usebibmacro{inbook:full}}% } - \newbibmacro*{inbook:full}{% -\usebibmacro{bybookauthor}% - \newunit\newblock - \usebibmacro{maintitle+booktitle}% - \newunit\newblock - \usebibmacro{byeditor+others}% - \newunit\newblock - \printfield{edition}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% - \newunit\newblock - \usebibmacro{series+number}% - \newunit\newblock - \printfield{note}% - \newunit\newblock - \usebibmacro{publisher+location+date}% - \newunit\newblock - \usebibmacro{chapter+pages}% - \newunit\newblock - \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% - \newunit\newblock - \usebibmacro{doi+eprint+url}% - \newunit\newblock - \usebibmacro{inbookaddendum+pubstate}% - \newunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} + \endinput 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 8b115c393df..19942ef0ea6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx @@ -1,11 +1,11 @@ -% $Id: philosophy-verbose.cbx,v 0.5 2010/03/07 17:00:00 15:42:33 valbusa beta $ +% $Id: philosophy-verbose.cbx,v 0.6 2010/03/23 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.5 2010/03/07 17:00:00 15:42:33 valbusa beta $] +[$Id: philosophy-verbose.cbx,v 0.6 2010/03/23 17:00:00 15:42:33 valbusa beta $] \RequireCitationStyle{verbose-trad2} \DeclareLanguageMapping{italian}{italian-philosophy} @@ -44,8 +44,8 @@ latinemph=false} \renewbibmacro*{cite:title}{% \printtext[bibhyperlink]{% \printfield[citetitle]{labeltitle}% - \setunit{\addspace}% - \bibstring{opcit}}} + \setunit{\addspace\midsentence}% + \bibstring{opcit}}} \AtEveryCite{\boolfalse{bbx:annotation}} @@ -63,7 +63,37 @@ latinemph=false} {\ifbool{cbx:scauthorscite}{\DeclareNameAlias{sortname}{scdefault}}{\DeclareNameAlias{sortname}{default}}} {\thefield{entrytype}}}% \usebibmacro{shorthandintro}} - + + \newbibmacro*{ccite}{% + \global\boolfalse{cbx:loccit}% + \bibhypertarget{cite\the\value{instcount}}{% + \ifciteseen + {\iffieldundef{shorthand} + {\ifciteibid + {\usebibmacro{cite:ibid}} + {\usebibmacro{cite:title}}% + \usebibmacro{cite:save}} + {\usebibmacro{cite:shorthand}}} + {\usebibmacro{ccite:full}% + \usebibmacro{cite:save}}}} + +\newbibmacro*{ccite:full}{% + \renewbibmacro*{author}{}% + \renewbibmacro*{editor}{}% + \renewbibmacro*{translator}{}% + \renewbibmacro*{editor+others}{}% + \printtext[bibhypertarget]{% + \usedriver + {\DeclareNameAlias{sortname}{default}} + {\thefield{entrytype}}}% + \usebibmacro{shorthandintro}} + +\DeclareCiteCommand{\ccite} + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{ccite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} \AtEveryCite{% \ifbool{cbx:latinemph}{\renewcommand*{\mkibid}{\emph}}{}% -- cgit v1.2.3