diff options
author | Karl Berry <karl@freefriends.org> | 2018-01-31 22:00:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-01-31 22:00:13 +0000 |
commit | 95d9d2df283904b61337341a945feb3d0e200f37 (patch) | |
tree | cb7bef8ac123e1f3958fdac6fcdf2f054251dd37 /Master/texmf-dist/source/latex | |
parent | d96279d607088cd86f3087efe1fc1b37350849b8 (diff) |
biblatex-oxref (31jan18)
git-svn-id: svn://tug.org/texlive/trunk@46504 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx | 46 |
1 files changed, 34 insertions, 12 deletions
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|bbx|cbx|dbx|lbx|doc> %<*internal> \iffalse @@ -1146,7 +1146,16 @@ Test \parencites% \end{egcite} %</m|a> %<*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. %</y> %</n|m|a|y> @@ -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 |