diff options
author | Karl Berry <karl@freefriends.org> | 2015-09-19 20:45:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-09-19 20:45:29 +0000 |
commit | 1323aebc4e196f543ee2fa83f28b1aaa6f1b4d2b (patch) | |
tree | 1ab020db7d4fa63bd50d7c75c8d85e9987854191 /Master | |
parent | be9467b2d5a4aa70891c03ed63922abe06edc5dd (diff) |
biblatex-philosophy (19sep15)
git-svn-id: svn://tug.org/texlive/trunk@38407 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
14 files changed, 612 insertions, 76 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf Binary files differindex e13c8a784eb..61c990cd88e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip Binary files differindex afa70737b51..fc6ad77f6cc 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-classic.tex b/Master/texmf-dist/doc/latex/biblatex-philosophy/test-classic.tex deleted file mode 100644 index 048d1a861e0..00000000000 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/test-classic.tex +++ /dev/null @@ -1,32 +0,0 @@ -% !TEX encoding = UTF-8 Unicode -% !TEX TS-program = pdflatex -% !BIB TS-program = biber -\documentclass{article} -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} - -%\usepackage{polyglossia} -%\setmainlanguage{italian} -%\setotherlanguage{french} - - -\usepackage[autostyle]{csquotes} -\usepackage[english,italian]{babel} -%\frenchbsetup{AutoSpacePunctuation=false,StandardLayout=false,GlobalLayoutFrench=false} - - -\usepackage[% -defaultrangedash=true, -backend=biber,style=philosophy-verbose, -autolang=other]{biblatex} -\addbibresource{philosophy-examples.bib} - -%\usepackage{hyperref} - - -\begin{document} - -\cite{Agati1991} -\end{document} - - diff --git a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx index d4bca3ad097..eff131fbab0 100644 --- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx +++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx @@ -98,7 +98,7 @@ %<english-lbx>\ProvidesFile{english-philosophy.lbx} %<spanish-lbx>\ProvidesFile{spanish-philosophy.lbx} %<*standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx> - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %</standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx> %<*driver> \documentclass[10pt]{ltxdoc} @@ -262,7 +262,7 @@ %</driver> % \fi % -% \CheckSum{3553} +% \CheckSum{3932} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -280,7 +280,8 @@ % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % -% \changes{v1.1}{2015/06/13}{Maintenance release.Updated documentation.} +% \changes{v1.2}{2015/09/19}{Maintenance release. New value \opt{superscript} for \opt{editionformat} option.} +% \changes{v1.1}{2015/06/13}{Maintenance release. Updated documentation.} % \changes{v1.0}{2015/03/31}{Corrected a bug in \opt{volumeformat} and \opt{volnumformat} options. Change value \opt{romanupp} to \opt{Roman} in \opt{volume format} and \opt{edition format}. Corrected bug in \opt{related format} options: now the related block is not preceded by semicolon when using values \opt{parens} and \opt{brackets} styles. §updated documentation} % \changes{v0.9i}{2015/03/14}{Corrected a bug with \opt{shorthandintro} option.} % \changes{v0.9h}{2015/01/14}{New option \opt{lowscauthors}. Corrected some bugs. Updated documentation.} @@ -760,7 +761,7 @@ %\end{latexcode} %you can restore the default format for all but \bibtype{article} entries. % -%\optitem[arabic]{editionformat}{\opt{arabic}, \opt{roman}, \opt{romansc}, \opt{Roman}} +%\optitem[arabic]{editionformat}{\opt{arabic}, \opt{roman}, \opt{romansc}, \opt{Roman}, \opt{superscript}} %This option provides three styles for typesetting the \bibfield{edition} field: % \begin{valuelist} % \item[arabic] @@ -771,6 +772,8 @@ % \ldots \emph{Book Title}, \textsc{iii} ed., \ldots % \item[Roman] % \ldots \emph{Book Title}, III ed., \ldots +% \item[superscript] +% \ldots \emph{Book Title}, Publisher, Location 2010\textsuperscript{3}. Available only for \sty{philosophy-verbose} style. % \end{valuelist} % %\boolitem[false]{inbeforejournal} @@ -1332,8 +1335,13 @@ {\textsc{\Rn{#1}}~\bibstring{edition}}% {\ifdefstring{\bbx@editionformat}{roman}% {\Rn{#1}~\bibstring{edition}} - {\optionerror{editionformat}}}}}} - {#1}}%\isdot?? + {\ifdefstring{\bbx@editionformat}{superscript}% + {\ClassError{biblatex-philosophy} + {\MessageBreak**** Option 'editionformat=superscript' + available only for philosophy-verbose style} + {\MessageBreak**** Option 'editionformat=superscript' + available only for philosophy-verbose style} +}{}}}}}}{#1}}%\isdot?? \DeclareFieldFormat{related}{% \ifdefstring{\bbx@relatedformat}{parens}% {\mkpureparens{#1}}% @@ -1776,14 +1784,22 @@ \togglefalse{bbx:annotation}% \iffieldundef{relatedstring}% {\bibstring{translationas}\space}% - {\setunit{\bibstring{translationas}\space}}% - \renewcommand*{\mkpureparens}{\unspace\addsemicolon\space}%horrible trick - \renewcommand*{\mkbibbrackets}{\unspace\addsemicolon\space}%horrible trick + {\printtext{\addspace}}% + \ifentrytype{article}{}{%horrible trick + \renewcommand*{\mkpureparens}{\unspace\addsemicolon\space}% + \renewcommand*{\mkbibbrackets}{\unspace\addsemicolon\space}}% \relatedcite{\thefield{related}}} % \end{macrocode} % \subsubsection{Bibliography drivers} % \begin{macrocode} \DeclareBibliographyDriver{article}{% +\renewbibmacro*{related:default}[1]{% + \togglefalse{cbx:scauthorscite}% + \togglefalse{bbx:annotation}% +\iffieldundef{relatedstring}% + {\bibstring{translationas}\space}% + {\setunit{\bibstring{translationas}\space}}% + \relatedcite{\thefield{related}}} \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% @@ -2576,10 +2592,13 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate:article-inbook-incoll}% - \setunit{\bibpagerefpunct}\newblock + \newblock \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% {}% \newunit\newblock \usebibmacro{pageref}% @@ -2598,10 +2617,13 @@ {}% \newunit\newblock \usebibmacro{doi+eprint+url}% - \setunit{\bibpagerefpunct}\newblock + \newblock \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% {}% \newunit\newblock \usebibmacro{pageref}% @@ -3253,6 +3275,21 @@ % \begin{macrocode} \RequireBibliographyStyle{authortitle} \RequireBibliographyStyle{philosophy-standard} + +\DeclareFieldFormat{edition}{% + \ifinteger{#1}{% + \ifdefstring{\bbx@editionformat}{arabic} + {\mkbibordedition{#1}~\bibstring{edition}} + {\ifdefstring{\bbx@editionformat}{Roman}% + {\RN{#1}~\bibstring{edition}}% + {\ifdefstring{\bbx@editionformat}{romansc}% + {\textsc{\Rn{#1}}~\bibstring{edition}}% + {\ifdefstring{\bbx@editionformat}{roman}% + {\Rn{#1}~\bibstring{edition}} + {\ifdefstring{\bbx@editionformat}{superscript}% + {\mkbibsuperscript{#1}}% + {\optionerror{editionformat}}}}}}}{#1}}%\isdot?? + \AtBeginShorthands{% % \end{macrocode} % The annotation field is omitted in the list of shorthands: @@ -3360,7 +3397,254 @@ } {\usebibmacro{nodash:editor+others}} {\usebibmacro{translator+others}}}} + +\newbibmacro*{relateddate}{% + \setunit*{\addspace}% + \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}} +\newbibmacro*{commarelateddate}{% + \setunit*{\addcomma\space}% + \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}} +\DeclareBibliographyDriver{book}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor+others/translator+others}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{maintitle+title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit}% + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit + \printfield{pagetotal}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \newblock + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% + {}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{collection}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{editor+others}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{maintitle+title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\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 + \printfield{pagetotal}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \newblock + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% + {}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\newbibmacro*{inbook:full}{% + \usebibmacro{bybookauthor}% + \newunit\newblock + \usebibmacro{maintitle+booktitle}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit}% + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate:article-inbook-incoll}% + \newblock + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% + {}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + + \newbibmacro*{incollection:full}{% + \usebibmacro{maintitle+booktitle}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit}% + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate:article-inbook-incoll}% + \newblock + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% + {}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + + +\DeclareBibliographyDriver{manual}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{byeditor}% + \newunit\newblock + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit\newblock}% + \usebibmacro{series+number}% + \newunit\newblock + \printfield{type}% + \newunit + \printfield{version}% + \newunit + \printfield{note}% + \newunit\newblock + \printlist{organization}% + \newunit + \usebibmacro{publisher+location+date}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit + \printfield{pagetotal}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \newblock + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% + {}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + \newbibmacro*{usedriver:book}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -3374,8 +3658,9 @@ \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock - \printfield{edition}% - \newunit + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit}% \printfield{volumes}% \newunit\newblock \usebibmacro{series+number}% @@ -3422,8 +3707,9 @@ \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock - \printfield{edition}% - \newunit + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit}% \iffieldundef{maintitle} {\printfield{volume}% \printfield{part}} diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx index 6d563c3763d..609145d8d33 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{english-philosophy.lbx} - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 5756ef35122..a9da2300793 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{italian-philosophy.lbx} - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 e3023932330..9ace7e36108 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-classic.bbx} - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 fb179e5e75f..f335b3789e0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-classic.cbx} - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 7a545ba8ff8..8f5a6d473af 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-modern.bbx} - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 bbbff417261..79512f71417 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-modern.cbx} - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: 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 43b5d067f50..91128b6f55b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-standard.bbx} - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -227,8 +227,13 @@ {\textsc{\Rn{#1}}~\bibstring{edition}}% {\ifdefstring{\bbx@editionformat}{roman}% {\Rn{#1}~\bibstring{edition}} - {\optionerror{editionformat}}}}}} - {#1}}%\isdot?? + {\ifdefstring{\bbx@editionformat}{superscript}% + {\ClassError{biblatex-philosophy} + {\MessageBreak**** Option 'editionformat=superscript' + available only for philosophy-verbose style} + {\MessageBreak**** Option 'editionformat=superscript' + available only for philosophy-verbose style} +}{}}}}}}{#1}}%\isdot?? \DeclareFieldFormat{related}{% \ifdefstring{\bbx@relatedformat}{parens}% {\mkpureparens{#1}}% @@ -651,11 +656,19 @@ \togglefalse{bbx:annotation}% \iffieldundef{relatedstring}% {\bibstring{translationas}\space}% - {\setunit{\bibstring{translationas}\space}}% - \renewcommand*{\mkpureparens}{\unspace\addsemicolon\space}%horrible trick - \renewcommand*{\mkbibbrackets}{\unspace\addsemicolon\space}%horrible trick + {\printtext{\addspace}}% + \ifentrytype{article}{}{%horrible trick + \renewcommand*{\mkpureparens}{\unspace\addsemicolon\space}% + \renewcommand*{\mkbibbrackets}{\unspace\addsemicolon\space}}% \relatedcite{\thefield{related}}} \DeclareBibliographyDriver{article}{% +\renewbibmacro*{related:default}[1]{% + \togglefalse{cbx:scauthorscite}% + \togglefalse{bbx:annotation}% +\iffieldundef{relatedstring}% + {\bibstring{translationas}\space}% + {\setunit{\bibstring{translationas}\space}}% + \relatedcite{\thefield{related}}} \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% @@ -1442,10 +1455,13 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate:article-inbook-incoll}% - \setunit{\bibpagerefpunct}\newblock + \newblock \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% {}% \newunit\newblock \usebibmacro{pageref}% @@ -1464,10 +1480,13 @@ {}% \newunit\newblock \usebibmacro{doi+eprint+url}% - \setunit{\bibpagerefpunct}\newblock + \newblock \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% {}% \newunit\newblock \usebibmacro{pageref}% 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 d2ca918c756..ddd32ddc133 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.bbx} - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: @@ -21,6 +21,21 @@ \RequireBibliographyStyle{authortitle} \RequireBibliographyStyle{philosophy-standard} + +\DeclareFieldFormat{edition}{% + \ifinteger{#1}{% + \ifdefstring{\bbx@editionformat}{arabic} + {\mkbibordedition{#1}~\bibstring{edition}} + {\ifdefstring{\bbx@editionformat}{Roman}% + {\RN{#1}~\bibstring{edition}}% + {\ifdefstring{\bbx@editionformat}{romansc}% + {\textsc{\Rn{#1}}~\bibstring{edition}}% + {\ifdefstring{\bbx@editionformat}{roman}% + {\Rn{#1}~\bibstring{edition}} + {\ifdefstring{\bbx@editionformat}{superscript}% + {\mkbibsuperscript{#1}}% + {\optionerror{editionformat}}}}}}}{#1}}%\isdot?? + \AtBeginShorthands{% \togglefalse{bbx:annotation}% \DeclareCiteCommand{\bbx@crossref@inbook}% @@ -116,6 +131,252 @@ {\usebibmacro{nodash:editor+others}} {\usebibmacro{translator+others}}}} +\newbibmacro*{relateddate}{% + \setunit*{\addspace}% + \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}} +\newbibmacro*{commarelateddate}{% + \setunit*{\addcomma\space}% + \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}} + +\DeclareBibliographyDriver{book}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor+others/translator+others}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{maintitle+title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit}% + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit + \printfield{pagetotal}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \newblock + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% + {}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{collection}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{editor+others}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{maintitle+title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\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 + \printfield{pagetotal}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \newblock + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% + {}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\newbibmacro*{inbook:full}{% + \usebibmacro{bybookauthor}% + \newunit\newblock + \usebibmacro{maintitle+booktitle}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit}% + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate:article-inbook-incoll}% + \newblock + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% + {}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + + \newbibmacro*{incollection:full}{% + \usebibmacro{maintitle+booktitle}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit}% + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate:article-inbook-incoll}% + \newblock + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% + {}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{manual}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{byeditor}% + \newunit\newblock + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit\newblock}% + \usebibmacro{series+number}% + \newunit\newblock + \printfield{type}% + \newunit + \printfield{version}% + \newunit + \printfield{note}% + \newunit\newblock + \printlist{organization}% + \newunit + \usebibmacro{publisher+location+date}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit + \printfield{pagetotal}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \newblock + \iftoggle{bbx:related} + {\ifdefstring{\bbx@relatedformat}{semicolon}% + {\setunit{\addsemicolon\space}}% + {\setunit{\unspace\space}}%horrible trick + \usebibmacro{related:init}% + \usebibmacro{related}}% + {}% + \newunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + \newbibmacro*{usedriver:book}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -129,8 +390,9 @@ \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock - \printfield{edition}% - \newunit + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit}% \printfield{volumes}% \newunit\newblock \usebibmacro{series+number}% @@ -177,8 +439,9 @@ \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock - \printfield{edition}% - \newunit + \ifdefstring{\bbx@editionformat}{superscript}{}% + {\printfield{edition}% + \newunit}% \iffieldundef{maintitle} {\printfield{volume}% \printfield{part}} 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 6a9a87028d2..6fc286c6827 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.cbx} - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx index c0df3112e47..fd96590a0ed 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{spanish-philosophy.lbx} - [2015/06/13 v1.1 valbusa beta] + [2015/09/19 v1.2 valbusa beta] %% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code: |