From 95d9d2df283904b61337341a945feb3d0e200f37 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 31 Jan 2018 22:00:13 +0000 Subject: biblatex-oxref (31jan18) git-svn-id: svn://tug.org/texlive/trunk@46504 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx | 2 +- Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx | 2 +- Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx | 2 +- Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx | 2 +- Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx | 2 +- Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx | 2 +- Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx | 2 +- Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx | 2 +- Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx | 2 +- Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx | 13 +++++++++++-- Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx | 7 +++++-- Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx | 14 +++++++------- Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx | 2 +- 16 files changed, 36 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-oxref') diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx index 9408fcea9e2..7bdf73e7cec 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{american-oxref.lbx} [\Version\space American English conventions required by the biblatex-oxref styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx index 6fd36885470..cf43552b704 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{british-oxref.lbx} [\Version\space British English conventions required by the biblatex-oxref styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx index b73d7810166..32415a59e35 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{english-oxref.lbx} [\Version\space Generic English conventions required by the biblatex-oxref styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx index 9f182735ae1..3e1feddc396 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.bbx} [\Version\space Alphabetic bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx index cb23eb80132..29bb01a37f3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.cbx} [\Version\space Alphabetic citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx index a8f19784348..b8ae5364f86 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx index ae151f79568..df37ead52ce 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx index 0a13bc4bd67..263cbcdf983 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx index ef1cab9689e..4ca833abb31 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx index 2987df4376a..2d2e3c0d4b9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.bbx} [\Version\space Numeric bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx index 2d6d27b3b2d..c7738a1ac7a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.cbx} [\Version\space Numeric citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx index e969d4db03a..04cfbec464c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx index 35c5595b6ec..4a4a2d6e3ce 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxref.bbx} [\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style] @@ -781,9 +781,18 @@ \DeclareFieldFormat{howpublished}{\mkbibbrackets{#1}} \DeclareFieldFormat[misc,unpublished]{howpublished}{#1} \DeclareFieldFormat[article,periodical,review]{entrysubtype}{\mkbibbrackets{#1}} +\newcommand*{\blx@ox@abbrevstring}{% + A\^{A}BCDEFG\u{G}HI\.{I}\^{I}JKLMNO\"{O}\^{O}PQRSTU\"{U}\^{U}VWXYZ.}% +\AtBeginDocument{ + \ifdefstring{\encodingdefault}{OT1}{}{% + \renewcommand*{\blx@ox@abbrevstring}{% + A\^{A}BC\c{C}DEFG\u{G}HI\.{I}\^{I}JKLMNO\"{O}\^{O}PQRS\c{S}TU\"{U}\^{U}VWXYZ.}% + }% +} \newcommand*{\ifabbrev}[3]{% \StrRight{#1}{1}[\blx@ox@lastchar]% - \IfSubStr{AÂBCÇDEFGĞHIİÎJKLMNOÖÔPQRSŞTUÜÛVWXYZ.}{\blx@ox@lastchar}{#2}{#3}} + \IfSubStr{\blx@ox@abbrevstring}{\blx@ox@lastchar}{#2}{#3} +} \renewbibmacro*{journal+issuetitle}{% \ifboolexpr{ test {\iffieldundef{title}} diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx index d6e4943c695..072df72a7df 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.bbx} [\Version\space Author-year bibliography style inspired by the Oxford Guide to Style] @@ -48,7 +48,10 @@ \ifboolexpr{% togl {blx@labeldateparts} and not test {\iffieldundef{labeldatesource}} - and not test {\iffieldundef{\thefield{labeldatesource}year}}}} + and ( + test {\iffieldequalstr{labeldatesource}{year}} + or not test {\iffieldundef{\thefield{labeldatesource}year}} + )}} \def\iflabeldateispubstate{% \ifboolexpr{% not test {\iffieldundef{labeldatesource}} diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx index 2e6ae495923..f2b150c8763 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.cbx} [\Version\space Author-year citation style inspired by the Oxford Guide to Style] @@ -45,13 +45,13 @@ }% }{}{} \DeclareDelimFormat{nameyeardelim}{% - \iffieldundef{\thefield{labeldatesource}year}% - {\addcomma\space}% - {\addspace}} + \iflabeldateisanydate + {\addspace}% + {\addcomma\space}} \DeclareDelimFormat{nonameyeardelim}{% - \iffieldundef{\thefield{labeldatesource}year}% - {\addcomma\space}% - {\addspace}} + \iflabeldateisanydate + {\addspace}% + {\addcomma\space}} \renewcommand*{\compcitedelim}{\addsemicolon\space} \renewcommand*{\postnotedelim}{\addcolon\space} \xpatchbibmacro{textcite}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx index 9a3fe00ddad..de72d9b12b3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.dbx} [\Version\space Data model for the Oxref family of styles] -- cgit v1.2.3