summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-02 20:57:13 +0000
committerKarl Berry <karl@freefriends.org>2019-09-02 20:57:13 +0000
commitdc3d664b996915ebf8a1409711fb346af9f6247a (patch)
tree9dbcf4321793bcb85db4c2dd3d148f4cd9f830d5 /Master/texmf-dist/source/latex
parent7205e2553993eb17bbd8dd5ae9c185cd4653de90 (diff)
biblatex-oxref (2sep19)
git-svn-id: svn://tug.org/texlive/trunk@52015 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx78
1 files changed, 36 insertions, 42 deletions
diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx
index b762e178c25..2db1e18a32d 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{2019/02/19 v1.1}
+\def\Version{2019/09/02 v1.2}
%</internal|bbx|cbx|dbx|lbx|doc>
%<*internal>
\iffalse
@@ -1533,7 +1533,7 @@ If the contribution of the translators or revisers is so great they could be joi
%<*n>
\begin{egcite*}{}
-\cite{kuehner.blass1890ef}
+\textcite{kuehner.blass1890ef}
\end{egcite*}
%</n>
%<*m|a>
@@ -7112,7 +7112,7 @@ will trigger the use of parentheses.
%
% \begin{macrocode}
\newtoggle{blx@ox@scnames}
-\DeclareBibliographyOption[boolean]{scnames}[true]{%
+\DeclareBibliographyOption{scnames}[true]{%
\settoggle{blx@ox@scnames}{#1}
}
% \end{macrocode}
@@ -7124,11 +7124,11 @@ will trigger the use of parentheses.
%
% \begin{macrocode}
\newtoggle{blx@ox@nametitle}\toggletrue{blx@ox@nametitle}%
-\DeclareBibliographyOption[boolean]{usenametitles}[true]{%
+\DeclareBibliographyOption{usenametitles}[true]{%
\settoggle{blx@ox@nametitle}{#1}}
-\DeclareTypeOption[boolean]{usenametitles}[true]{%
+\DeclareTypeOption{usenametitles}[true]{%
\settoggle{blx@ox@nametitle}{#1}}
-\DeclareEntryOption[boolean]{usenametitles}[true]{%
+\DeclareEntryOption{usenametitles}[true]{%
\settoggle{blx@ox@nametitle}{#1}}
% \end{macrocode}
%
@@ -7715,7 +7715,8 @@ will trigger the use of parentheses.
{}{\wlog{WARNING: biblatex-oxref failed to patch translatorstrg}}%
\xpatchbibmacro{translator+othersstrg}%
{\bibstring}%
- {\bibstring[\mkbibparens]}{}{}%
+ {\bibstring[\mkbibparens]}%
+{}{\wlog{WARNING: biblatex-oxref failed to patch translator+othersstrg}}%
% \end{macrocode}
%
% When referencing one work from a collection by the same author,
@@ -7875,28 +7876,28 @@ will trigger the use of parentheses.
\iffieldundef{#2endmonth}%
{\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}%
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangefull}}
\patchcmd{\mkdaterangefullextra}{%
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
}{%
\iffieldundef{#2endmonth}%
{\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}%
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
-}{}{}
-\patchcmd{\mkdaterangetrunc}{%
+}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangefullextra}}
+\patchcmd{\mkdaterangetrunc@i}{%
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
}{%
\iffieldundef{#2endmonth}%
{\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}%
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
-}{}{}
-\patchcmd{\mkdaterangetruncextra}{%
+}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangetrunc@i}}
+\patchcmd{\mkdaterangetruncextra@i}{%
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
}{%
\iffieldundef{#2endmonth}%
{\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}%
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangetruncextra@i}}
% \end{macrocode}
%
% We provide a way of prefacing dates (and times) with a type. This is mainly
@@ -8297,7 +8298,7 @@ will trigger the use of parentheses.
% by |issue+date| instead (see below).
%
% \begin{macrocode}
-\DeclareBibliographyOption{issuestyle}[slash]{%
+\DeclareBibliographyOption[string]{issuestyle}[slash]{%
\ifcsdef{blx@ox@issuestyle@#1}{%
\csuse{blx@ox@issuestyle@#1}%
}{%
@@ -8349,17 +8350,17 @@ will trigger the use of parentheses.
%
% \begin{macrocode}
\newtoggle{blx@ox@varissuedate}
-\DeclareBibliographyOption[boolean]{varissuedate}[true]{%
+\DeclareBibliographyOption{varissuedate}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareTypeOption[boolean]{varissuedate}[true]{%
+\DeclareTypeOption{varissuedate}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareEntryOption[boolean]{varissuedate}[true]{%
+\DeclareEntryOption{varissuedate}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareBibliographyOption[boolean]{issuedate-plain}[true]{%
+\DeclareBibliographyOption{issuedate-plain}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareTypeOption[boolean]{issuedate-plain}[true]{%
+\DeclareTypeOption{issuedate-plain}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareEntryOption[boolean]{issuedate-plain}[true]{%
+\DeclareEntryOption{issuedate-plain}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
\renewbibmacro*{issue+date}{%
\ifboolexpr{
@@ -9710,7 +9711,7 @@ reference,mvreference,inreference]{volume}{%
\newtoggle{blx@ox@plainthesis}
\DeclareFieldAlias{thesis:publication}{publication}
\DeclareFieldFormat{plain}{#1}
-\DeclareBibliographyOption[boolean]{altthesis}[true]{%
+\DeclareBibliographyOption{altthesis}[true]{%
\settoggle{blx@ox@altthesis}{#1}
}
\DeclareBibliographyOption[string]{thesis}[out]{%
@@ -10133,7 +10134,7 @@ reference,mvreference,inreference]{volume}{%
%
% \begin{macrocode}
\newtoggle{blx@ox@endeditor}
-\DeclareEntryOption[boolean]{endeditor}[true]{%
+\DeclareEntryOption{endeditor}[true]{%
\settoggle{blx@ox@endeditor}{#1}}
\newbibmacro*{pre-byeditor+others}{%
\iftoggle{blx@ox@endeditor}{}{%
@@ -10601,7 +10602,7 @@ reference,mvreference,inreference]{volume}{%
\settoggle{bbx:altcourt}{#1}}
\newtoggle{bbx@ecliuse}
\newtoggle{bbx@eclionly}
-\DeclareBibliographyOption{ecli}[yes]{%
+\DeclareBibliographyOption[string]{ecli}[yes]{%
\ifstrequal{#1}{no}{%
\global\togglefalse{bbx@ecliuse}%
\global\togglefalse{bbx@eclionly}%
@@ -11842,7 +11843,7 @@ reference,mvreference,inreference]{volume}{%
% We provide an option for setting the relatedtype punctuation.
%
% \begin{macrocode}
-\DeclareBibliographyOption{relationpunct}[semicolon]{%
+\DeclareBibliographyOption[string]{relationpunct}[semicolon]{%
\ifcsdef{add#1}{%
\ifstrequal{#1}{space}{%
\renewcommand*{\relatedtypepunct}{\addspace}%
@@ -11854,7 +11855,7 @@ reference,mvreference,inreference]{volume}{%
}{%
Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
'period', 'exclam', 'question', and 'space'.}}}
-\DeclareTypeOption{relationpunct}[semicolon]{%
+\DeclareTypeOption[string]{relationpunct}[semicolon]{%
\ifcsdef{add#1}{%
\ifstrequal{#1}{space}{%
\renewcommand*{\relatedtypepunct}{\addspace}%
@@ -11867,7 +11868,7 @@ reference,mvreference,inreference]{volume}{%
Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
'period', 'exclam', 'question', and 'space'.}}}
\newtoggle{blx@ox@relpunctset}
-\DeclareEntryOption{relationpunct}[semicolon]{%
+\DeclareEntryOption[string]{relationpunct}[semicolon]{%
\ifcsdef{add#1}{%
\ifstrequal{#1}{space}{%
\renewcommand*{\relatedtypepunct}{\addspace}%
@@ -12760,7 +12761,7 @@ reference,mvreference,inreference]{volume}{%
\providebool{bbx:subentry}
-\DeclareBibliographyOption[boolean]{subentry}[true]{%
+\DeclareBibliographyOption{subentry}[true]{%
\setbool{bbx:subentry}{#1}}
\DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}}
@@ -12844,14 +12845,7 @@ reference,mvreference,inreference]{volume}{%
% this is implemented as the |year| value.
%
% \begin{macrocode}
-\DeclareBibliographyOption{mergedate}[true]{%
- \ifcsdef{bbx@opt@mergedate@#1}
- {\csuse{bbx@opt@mergedate@#1}}
- {\PackageError{biblatex-oxref}
- {Invalid option 'mergedate=#1'}
- {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
- 'year', 'true' (=year), and 'false'.}}}
-\DeclareTypeOption{mergedate}[true]{%
+\DeclareBiblatexOption{global,type,entry}{mergedate}[true]{%
\ifcsdef{bbx@opt@mergedate@#1}
{\csuse{bbx@opt@mergedate@#1}}
{\PackageError{biblatex-oxref}
@@ -12930,11 +12924,11 @@ reference,mvreference,inreference]{volume}{%
%
% \begin{macrocode}
\newtoggle{blx@ox@nonodate}
-\DeclareBibliographyOption[boolean]{nonodate}[true]{%
+\DeclareBibliographyOption{nonodate}[true]{%
\settoggle{blx@ox@nonodate}{#1}}
-\DeclareTypeOption[boolean]{nonodate}[true]{%
+\DeclareTypeOption{nonodate}[true]{%
\settoggle{blx@ox@nonodate}{#1}}
-\DeclareEntryOption[boolean]{nonodate}[true]{%
+\DeclareEntryOption{nonodate}[true]{%
\settoggle{blx@ox@nonodate}{#1}}
\newbibmacro*{labeldate}{%
\ifboolexpr{
@@ -13200,21 +13194,21 @@ reference,mvreference,inreference]{volume}{%
}{%
\iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefull}}
-\xpatchcmd{\mkdaterangetrunc}{%
+\xpatchcmd{\mkdaterangetrunc@i}{%
\iffieldundef{#2year} {\blx@nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
-}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc}}
+}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc@i}}
\xpatchcmd{\mkdaterangefullextra}{%
\iffieldundef{#2year} {\blx@nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefullextra}}
-\xpatchcmd{\mkdaterangetruncextra}{%
+\xpatchcmd{\mkdaterangetruncextra@i}{%
\iffieldundef{#2year} {\blx@nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
-}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra}}
+}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra@i}}
% \end{macrocode}
%