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 --- .../doc/latex/biblatex-oxref/oxalph-doc.pdf | Bin 403333 -> 403355 bytes .../doc/latex/biblatex-oxref/oxalph-doc.tex | 2 +- .../doc/latex/biblatex-oxref/oxnotes-doc.pdf | Bin 410550 -> 410551 bytes .../doc/latex/biblatex-oxref/oxnotes-doc.tex | 2 +- .../doc/latex/biblatex-oxref/oxnum-doc.pdf | Bin 405634 -> 405639 bytes .../doc/latex/biblatex-oxref/oxnum-doc.tex | 2 +- .../texmf-dist/doc/latex/biblatex-oxref/oxref.pdf | Bin 482258 -> 482785 bytes .../doc/latex/biblatex-oxref/oxyear-doc.pdf | Bin 406632 -> 406927 bytes .../doc/latex/biblatex-oxref/oxyear-doc.tex | 14 +++++-- .../source/latex/biblatex-oxref/oxref.dtx | 46 +++++++++++++++------ .../tex/latex/biblatex-oxref/american-oxref.lbx | 2 +- .../tex/latex/biblatex-oxref/british-oxref.lbx | 2 +- .../tex/latex/biblatex-oxref/english-oxref.lbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes.bbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes.cbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes.dbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxref.bbx | 13 +++++- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx | 7 +++- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx | 14 +++---- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx | 2 +- 26 files changed, 84 insertions(+), 42 deletions(-) diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf index e487607d542..baa0a58df41 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex index df6fd928ce6..a6a64dfc644 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex @@ -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} \ProvidesFile{oxalph-doc.tex} [\Version\space Alphabetic biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxalph,varissuedate,anon}{biblatex} diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf index 54c481c4e4f..284df76fcde 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex index 1a46c7c7f9d..c80eef7e567 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex @@ -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} \ProvidesFile{oxnotes-doc.tex} [\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex} diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf index 20c67f7e886..f45d484d668 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex index 2d32a8da319..cfe7e664b3e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex @@ -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} \ProvidesFile{oxnum-doc.tex} [\Version\space Numeric biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon}{biblatex} diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf index 6497ee9d9e7..fe5f0f0b109 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf index b104649d96d..02b9ea70b68 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex index 46071a4e221..6be72c4a419 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex @@ -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} \ProvidesFile{oxyear-doc.tex} [\Version\space Author-year biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxyear,varissuedate,anon}{biblatex} @@ -505,7 +505,16 @@ and indeed loads a tweaked version of a standard \textsf{biblatex} one. \section{Test citations} -The \emph{Oxford Guide to Style} consistently promotes an author–date citation scheme which uses parentheses, within which there is only a space between the name and date. Pages are set off with a colon, and multiple works are separated with a semicolon. +The \emph{Oxford Guide to Style} consistently promotes an author–date citation scheme which uses parentheses, within which there is only a space between the name and date. +If there is no date, the replacement text is separated from the name by a comma. + +\begin{egcite}{(Anon.\@ 1956), (Marx 1867), (Clarke, n.d.).} +\parencite{anon1956lu}, +\parencite{marx1867ccp}, +\parencite{clarkeNDeci}. +\end{egcite} + +Pages are set off with a colon, and multiple works are separated with a semicolon. \begin{egcite}{Hankinson (1988: 93, 96; 1989: 72)} \textcites% @@ -521,7 +530,6 @@ Up to two author names are given, after which ‘et al.’ is used. \end{egcite} If different authors have the same surname, they are distiguished by their initial. -If there is no date, the replacement text is separated from the name by a comma. \nocite{smithFCct} \begin{egcite}{(P. Smith, forthcoming \emph{a}; T. Smith 1988)} diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx index 485c428f584..1ca48f8aa19 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx +++ b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx @@ -1,6 +1,6 @@ % \iffalse %<*internal|bbx|cbx|dbx|lbx|doc> -\def\Version{2018/01/26 v0.11.1} +\def\Version{2018/01/31 v0.11.2} % %<*internal> \iffalse @@ -1146,7 +1146,16 @@ Test \parencites% \end{egcite} % %<*y> -The \emph{Oxford Guide to Style} consistently promotes an author–date citation scheme which uses parentheses, within which there is only a space between the name and date. Pages are set off with a colon, and multiple works are separated with a semicolon. +The \emph{Oxford Guide to Style} consistently promotes an author–date citation scheme which uses parentheses, within which there is only a space between the name and date. +If there is no date, the replacement text is separated from the name by a comma. + +\begin{egcite}{(Anon.\@ 1956), (Marx 1867), (Clarke, n.d.).} +\parencite{anon1956lu}, +\parencite{marx1867ccp}, +\parencite{clarkeNDeci}. +\end{egcite} + +Pages are set off with a colon, and multiple works are separated with a semicolon. \begin{egcite}{Hankinson (1988: 93, 96; 1989: 72)} \textcites% @@ -1162,7 +1171,6 @@ Up to two author names are given, after which ‘et al.’ is used. \end{egcite} If different authors have the same surname, they are distiguished by their initial. -If there is no date, the replacement text is separated from the name by a comma. % % @@ -7541,12 +7549,23 @@ The second uses the dedicated \code{manuscript} entry type from \textsf{biblatex \DeclareFieldFormat[article,periodical,review]{entrysubtype}{\mkbibbrackets{#1}} % \end{macrocode} % -% We provide a command for testing if a title is abbreviated. +% We provide a command for testing if a title is abbreviated. We use the +% traditional \LaTeX\ accent commands in case a non-Unicode input encoding is +% being used. Testing for \c{C} and \c{S} causes errors when using OT1 encoding. % % \begin{macrocode} +\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} +} % \end{macrocode} % % We renew the |journal+issuetitle| macro so that if a work takes up a @@ -11807,7 +11826,10 @@ reference,mvreference,inreference]{volume}{% \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}} @@ -12649,13 +12671,13 @@ reference,mvreference,inreference]{volume}{% % % \begin{macrocode} \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}} % \end{macrocode} % % Compressed citations are delimited with a semicolon, just like 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