diff options
author | Karl Berry <karl@freefriends.org> | 2018-11-23 21:42:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-11-23 21:42:39 +0000 |
commit | 65e275a0bf822d6abaa473b7768030f4f73a833b (patch) | |
tree | 58c3d03b8425f4b7b86aac14bcbae5a153ec4361 /Master/texmf-dist/tex | |
parent | 34d10d7ff2122fc34d1e535106202155ca85b4ff (diff) |
biblatex-ext (23nov18)
git-svn-id: svn://tug.org/texlive/trunk@49232 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
69 files changed, 775 insertions, 148 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty new file mode 100644 index 00000000000..66485c1769a --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty @@ -0,0 +1,107 @@ +\ProvidesPackage{biblatex-ext-oa-doiapi} + [2018/11/23 v0.6 Obtain open access information from DOI via unpaywall.org + and doi.org (MW)] + +\RequirePackage{etoolbox} + +\protected\def\extblx@oa@api@error#1#2{% + \PackageError{biblatex-ext-oa-doiapi}{#1}{#2.}} + +\protected\def\extblx@oa@api@warning@noline#1{% + \PackageWarningNoLine{biblatex-ext-oa-doiapi}{#1}} + +\protected\def\extblx@oa@api@info@noline#1{% + \PackageInfo{biblatex-ext-oa-doiapi}{#1\@gobble}} + +\let\extblx@oa@api@warning\extblx@oa@api@warning@noline +\AtEndOfPackage{% + \protected\def\extblx@oa@api@warning#1{% + \PackageWarning{biblatex-ext-oa-doiapi}{#1}}} + +% LuaLaTeX only! +\ifundef\luatexversion + {\extblx@oa@api@error + {Not running under LuaLaTeX!\MessageBreak + This package needs LuaLaTeX.\MessageBreak + I will stop right here} + {This package can only be run with LuaLaTeX.\MessageBreak + Please see the documentation of biblatex-ext for more information} + \endinput} + {} + +\def\extblx@oa@api@luastring#1{"\luaescapestring{#1}"} +\def\extblx@oa@api@luastringN#1{\extblx@oa@api@luastring{\unexpanded{#1}}} + +% The oai file should contain a Lua table with the relevant OA data +\IfFileExists{\jobname.oai} + {\extblx@oa@api@info@noline{% + Load OA database from\MessageBreak + \jobname.oai}% + \directlua{dofile(\extblx@oa@api@luastring{\jobname.oai})}} + {\extblx@oa@api@info@noline{% + No OA database file present at\MessageBreak + \jobname.oai}} + +\directlua{require("blxextdoiapi")} + +\newcommand*{\SetDOIAPIMail}[1]{% + \cslet{extblx@oa@api@mailset}\@empty + \directlua{ + blxextdoiapi.mail = \extblx@oa@api@luastring{#1}}} + +\newcommand*{\SetDOIAPICacheExpiration}[1]{% + \directlua{ + blxextdoiapi.cache_expire = \extblx@oa@api@luastring{#1}}} + +\newcommand*{\IsOpenaccess}[1]{% + \directlua{ + blxextdoiapi.texify_conditional( + blxextdoiapi.is_openaccess(\extblx@oa@api@luastring{#1}))}} + +\newcommand*{\GetOpenaccessURLWrapped}[1]{% + \directlua{ + blxextdoiapi.get_openaccess_url_tex(\extblx@oa@api@luastring{#1})}} + +\newcommand*{\OpenaccessURLisDOI}[1]{% + \directlua{ + blxextdoiapi.texify_conditional( + blxextdoiapi.openaccess_url_is_doi(\extblx@oa@api@luastring{#1}))}} + +\newcommand*{\extblx@oa@api@getoaurl}[1]{% + \directlua{ + blxextdoiapi.assign_openaccess_url_to + (\extblx@oa@api@luastringN{\extblx@oa@url}, + \extblx@oa@api@luastring{#1}) + }% +} + +\AtBeginDocument{% + \ifcsundef{extblx@oa@api@mailset} + {\extblx@oa@api@warning@noline{% + No mail address declared.\MessageBreak + To access the Unpaywall.org api\MessageBreak + an email address is required.\MessageBreak + It should be given in the preamble\MessageBreak + with '\string\SetDOIAPIMail'.\MessageBreak + The API request will fail with a\MessageBreak + fatal error if no email is provided}} + {}} + +\AtEndDocument{% + \directlua{% + table.tofile(\extblx@oa@api@luastring{\jobname.oai}, oadb, "oadb")}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa-tikzsymbols.sty b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa-tikzsymbols.sty new file mode 100644 index 00000000000..f64efe5b8d0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa-tikzsymbols.sty @@ -0,0 +1,156 @@ +\ProvidesPackage{biblatex-ext-oa-tikzsymbols} + [2018/11/23 v0.6 open access symbols (MW)] + +\RequirePackage{etoolbox} +\RequirePackage{kvoptions} + +\protected\def\extblx@oasymb@error#1#2{% + \PackageError{biblatex-ext-oa-tikzsymbols}{#1}{#2.}} + +\protected\def\extblx@oasymb@warning@noline#1{% + \PackageWarningNoLine{biblatex-ext-oa-tikzsymbols}{#1}} + +\let\extblx@oasymb@warning\extblx@oasymb@warning@noline +\AtEndOfPackage{% + \protected\def\extblx@oasymb@warning#1{% + \PackageWarning{biblatex-ext-oa-tikzsymbols}{#1}}} + +\RequirePackage{tikz} + +% PLoS Open Access symbol based on +% https://commons.wikimedia.org/wiki/File:Open_Access_logo_PLoS_white.svg +% public domain/CC0 by PLoS & Wikipedia users Nina, Beao and JakobVoss +\definecolor{extblx@oasymbol@plos@orange}{HTML}{f68212} +\newcommand*{\extblx@oasymbol@plos@tikz}{% + \begin{tikzpicture}[x=.1pt,y=.1pt] + \begin{scope} + \clip (06,73) rectangle ++(52,26); + \fill[extblx@oasymbol@plos@orange, even odd rule] + (32,73) circle[radius=26] + (32,73) circle[radius=15]; + \end{scope} + \fill[extblx@oasymbol@plos@orange, even odd rule] + (32,32) circle[radius=32] + (32,32) circle[radius=21] + (32,32) circle[radius= 9]; + \fill[extblx@oasymbol@plos@orange] + (47,47) rectangle ++ (11,26); + \end{tikzpicture}% +} + +\newsavebox{\extblx@oasymbol@plos@box} +\sbox{\extblx@oasymbol@plos@box}{\extblx@oasymbol@plos@tikz} +\newcommand*{\extblx@oasymbol@plos}{\usebox{\extblx@oasymbol@plos@box}} + +% PLoS symbols is standard +\newcommand*{\oasymbol}{\extblx@oasymbol@plos} + +% Open-Acess.net Open Acess symbol +% redrawn with TikZ from +% http://open-access.net/fileadmin/logos/oa.svg +% public domain according to +% https://commons.wikimedia.org/wiki/File:Open_access.svg +% might be covered by open-access.net's overall CC-BY 4.0 license +% (https://creativecommons.org/licenses/by/4.0/) +% see https://open-access.net/impressum/ +% the site states no specific conditions for use of the logo +% other than +% "Das Logo der Informationsplattform darf nachgenutzt werden, +% gerne mit einem Link zu open-access.net" +% on https://open-access.net/ueber-uns/ +% see also https://open-access.net/community/materialien/ +% logo by +% Medien + Design +% Center for Digital Systems +% Competence Center for E-Learning and Multimedia +% Freie Universität Berlin +\definecolor{extblx@oasymbol@oanet@green}{HTML}{356031} +\definecolor{extblx@oasymbol@oanet@gold}{HTML}{f9c63a} +\definecolor{extblx@oasymbol@oanet@intersect}{HTML}{89923a} + +\newcommand*{\extblx@oasymbol@oanet@tikz}{% + \begin{tikzpicture}[x=1.1pt,y=1.1pt] + \fill[extblx@oasymbol@oanet@green, even odd rule] + ( 4,4) circle[radius=4.3] + ( 4,4) circle[radius=2.7]; + \begin{scope} + \clip % this is *terrible*, but it was the only way I could stop + % some viewers from adding thin lines that shouldn't be there + (11,4) circle[radius=2.7] + -- +(-4.3,-4.3) -- +(-4.3,+4.3) -- +(+4.3,+4.3) -- +(+4.3,-4.3) + -- +(-4.3,-4.3); + \fill[extblx@oasymbol@oanet@gold, even odd rule] + (11,4) ++ (0:4.3) arc (0:300:4.3) -- (11,4) ++ (300:4.3) -- cycle + (11,4) ++ (0:2.7) arc (0:300:2.7) -- (11,4) ++ (300:2.7) -- cycle; + \end{scope} + \begin{scope} + \clip ( 4,4) circle[radius=4.3]; + \fill[extblx@oasymbol@oanet@intersect] (11,4) circle[radius=4.3]; + \end{scope} + \fill[extblx@oasymbol@oanet@gold] (11,4) ++ (2.7,.1) rectangle ++(1.6,-4.1); + \end{tikzpicture}% +} + +\newsavebox{\extblx@oasymbol@oanet@box} +\sbox{\extblx@oasymbol@oanet@box}{\extblx@oasymbol@oanet@tikz} +\newcommand*{\extblx@oasymbol@oanet}{\usebox{\extblx@oasymbol@oanet@box}} + +\protected\def\extblx@oasymbol@opt@symbol@process#1{% + \begingroup + \edef\extblx@oasymb@tempa{\endgroup + \noexpand\extblx@oasymbol@opt@symbol@process@i{#1}} + \extblx@oasymb@tempa} + +\def\extblx@oasymbol@opt@symbol@process@i#1{% + \ifcsundef{extblx@oasymbol@#1} + {\extblx@oasymb@error + {Unknown value\MessageBreak + \space\space'#1'\MessageBreak + for option 'symbol'} + {The symbol '#1' does not exist.\MessageBreak + Please consult the documentation for a list of valid options}} + {\edef\oasymbol{\expandonce{\csname extblx@oasymbol@#1\endcsname}}}} + + +\newrobustcmd*{\DefineTikZOASymbol}[1][plos]{% + \begingroup + \edef\extblx@oasymb@tempa{\endgroup + \noexpand\extblx@oasymbol@DefineTikZOASymbol@i{#1}} + \extblx@oasymb@tempa} + +\protected\def\extblx@oasymbol@DefineTikZOASymbol@i#1{% + \ifcsundef{extblx@oasymbol@#1} + {\extblx@oasymb@error + {Unknown symbol option\MessageBreak + \space\space'#1'} + {The symbol '#1' does not exist.\MessageBreak + Please consult the documentation for a list of valid options}} + {\edef\oasymbol{\expandonce{\csname extblx@oasymbol@#1\endcsname}}}} + +\SetupKeyvalOptions{ + family=extblx@oasymb@opt, + prefix=extblx@oasymb@opt@, +} + +\DeclareStringOption[plos]{symbol} +\DeclareVoidOption{plos}{\csdef{extblx@oasymb@opt@symbol}{plos}} +\DeclareVoidOption{oanet}{\csdef{extblx@oasymb@opt@symbol}{oanet}} + +\ProcessKeyvalOptions* + +\extblx@oasymbol@opt@symbol@process{\csuse{extblx@oasymb@opt@symbol}} + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa.sty b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa.sty new file mode 100644 index 00000000000..930a3d1db3d --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-oa.sty @@ -0,0 +1,331 @@ +\ProvidesPackage{biblatex-ext-oa} + [2018/11/23 v0.6 mark open access in biblatex bibliographies (MW)] + +\protected\def\extblx@oa@error#1#2{% + \PackageError{biblatex-ext-oa}{#1}{#2.}} + +\protected\def\extblx@oa@warning@noline#1{% + \PackageWarningNoLine{biblatex-ext-oa}{#1}} + +\let\extblx@oa@warning\extblx@oa@warning@noline +\AtEndOfPackage{% + \protected\def\extblx@oa@warning#1{% + \PackageWarning{biblatex-ext-oa}{#1}}} + +\@ifpackageloaded{biblatex} + {} + {\extblx@oa@error + {biblatex not loaded!\MessageBreak + This package must be loaded after biblatex.\MessageBreak + This is a fatal error, the package will not\MessageBreak be loaded} + {Load biblatex with \string\usepackage{biblatex} before + you load 'biblatex-ext-oa'.\MessageBreak + Please see the documentation of biblatex-ext for more information}% + \endinput} + +\newtoggle{extblx@oa@opt@forcedoiapi} +\DeclareBibliographyOption[string]{openaccess}[true]{% + \ifstrequal{#1}{forcedoiapi} + {\@firstoftwo} + {\ifstrequal{#1}{forceonlydoiapi} + {\@firstoftwo} + {\@secondoftwo}} + {\toggletrue{extblx@oa@opt@forcedoiapi}} + {}% + \extblx@oa@blxopt@openaccess{#1}} +\DeclareTypeOption[string]{openaccess}[true]{% + \ifstrequal{#1}{forcedoiapi} + {\toggletrue{extblx@oa@opt@forcedoiapi}% + \csletcs{extblx@oa@url@from}{extblx@oa@url@from@forcedoiapi}} + {}% + \ifstrequal{#1}{forcedoiapi} + {\toggletrue{extblx@oa@opt@forceonlydoiapi}% + \csletcs{extblx@oa@url@from}{extblx@oa@url@from@forceonlydoiapi}} + {}% + \iftoggle{extblx@oa@opt@forcedoiapi} + {} + {\extblx@oa@blxopt@openaccess{#1}}} +\DeclareEntryOption[string]{openaccess}[true]{% + \iftoggle{extblx@oa@opt@forcedoiapi} + {} + {\extblx@oa@blxopt@openaccess{#1}}} + +\def\extblx@oa@blxopt@openaccess#1{% + \ifcsundef{extblx@oa@url@from@#1} + {\ifcsundef{extblx@oa@warn@field@\abx@field@entrykey @#1} + {\extblx@oa@warning@noline{% + Field '#1' not set up for\MessageBreak + open access detection.\MessageBreak + Ignoring the option\MessageBreak + 'openaccess=#1'\MessageBreak + for entry '\abx@field@entrykey'}% + \global\cslet{extblx@oa@warn@field@\abx@field@entrykey @#1}\@empty} + {}} + {\csletcs{extblx@oa@url@from}{extblx@oa@url@from@#1}}% + \ifcsequal{extblx@oa@url@from}{extblx@oa@url@from@onlydoiapi} + {\@firstoftwo} + {\ifcsequal{extblx@oa@url@from}{extblx@oa@url@from@doiapi} + {\@firstoftwo} + {\@secondoftwo}} + {\ifextblx@oa@opt@doiapi + \else + \extblx@oa@error + {'openaccess=#1' requires 'doiapi=true'\MessageBreak + and LuaLaTeX} + {If you want to use 'openaccess=#1', you must load the + 'biblatex-ext-oa'\MessageBreak + package with the option 'doiapi=true'. + That option also requires LuaLaTeX.\MessageBreak + Please see the documentation of biblatex-ext for more information} + \fi} + {} +} + +% define special detection settings +% auto, all (=:true), none (=:false), +% doiapi, forcedoiapi (=doiapi, but overrides more specific options) +% onlydoiapi, forceonlydoiapi +\csdef{extblx@oa@url@from@auto}{auto} +\csdef{extblx@oa@url@from@all}{all} +\csletcs{extblx@oa@url@from@true}{extblx@oa@url@from@all} +\csdef{extblx@oa@url@from@none}{none} +\csletcs{extblx@oa@url@from@false}{extblx@oa@url@from@none} +\csdef{extblx@oa@url@from@doiapi}{doiapi} +\csdef{extblx@oa@url@from@onlydoiapi}{onlydoiapi} +\csletcs{extblx@oa@url@from@forcedoiapi}{extblx@oa@url@from@doiapi} +\csletcs{extblx@oa@url@from@forceonlydoiapi}{extblx@oa@url@from@onlydoiapi} + +% {<field_1,...,field_n>} +\newrobustcmd*{\DeclareOpenAccessUrlFieldPriority}{% + \let\extblx@oa@url@autofields\@empty + \forcsvlist{\listadd\extblx@oa@url@autofields}} + +% {<macroname>}{<field>}{<url spec>}{<openness>} +\def\extblx@oa@url@definefieldurl#1#2#3#4{% + \csdef{extblx@oa@url@from@#2}{#2}% + \ifstrequal{#4}{always} + {\csdef{extblx@oa@url@getfromfield@#1}{% + \iffieldannotation[#2]{closedaccess} + {} + {\def\extblx@oa@url{#3}}}} + {\csdef{extblx@oa@url@getfromfield@#1}{% + \iffieldannotation[#2]{closedaccess} + {\@secondoftwo} + {\iffieldannotation[#2]{openaccess} + {\@firstoftwo} + {\ifcsequal{extblx@oa@url@from}{extblx@oa@url@from@#2} + {\@firstoftwo} + {\ifcsequal{extblx@oa@url@from}{extblx@oa@url@from@all} + {\@firstoftwo} + {\@secondoftwo}}}} + {\def\extblx@oa@url{#3}} + {}}}} + +% [<openness>]{<field>}{<url spec>} +\newrobustcmd*{\DeclareOpenAccessFieldUrl}[3][conditional]{% + \extblx@oa@url@definefieldurl{#2}{#2}{#3}{#1}} +% [<openness>]{<eprint type>}{<url spec>} +\newrobustcmd*{\DeclareOpenAccessEprintUrl}[3][conditional]{% + \extblx@oa@url@definefieldurl{eprint@#2}{eprint}{#3}{#1}} + +\newrobustcmd*{\DeclareOpenAccessEprintAlias}[2]{% + \csdef{extblx@oa@url@getfromfield@eprint@#1}{% + \csuse{extblx@oa@url@getfromfield@eprint@#2}}} + +\def\extblx@oa@url@undefinefieldurl#1#2{ + \csundef{extblx@oa@url@from@#2} + \csundef{extblx@oa@url@getfromfield@#1}} + +\newrobustcmd*{\UndeclareOpenAccessFieldUrl}[1]{% + \extblx@oa@url@undefinefieldurl{#1}{#1}} +\newrobustcmd*{\UndeclareOpenAccessEprintUrl}[1]{% + \extblx@oa@url@undefinefieldurl{eprint@#1}{eprint}} + + +\def\extblx@oa@url@processfield@@generic#1{% + \csuse{extblx@oa@url@getfromfield@#1}} + +\def\extblx@oa@url@processfield@eprint#1{% + \iffieldundef{eprinttype} + {\csuse{extblx@oa@url@getfromfield@#1}} + {\csuse{extblx@oa@url@getfromfield@eprint@\thefield{eprinttype}}}} + +\def\extblx@oa@url@processfield#1{% + \iffieldundef{#1} + {} + {\ifcsundef{extblx@oa@url@processfield@#1} + {\extblx@oa@url@processfield@@generic{#1}} + {\csuse{extblx@oa@url@processfield@#1}{#1}}}} + +\newcommand*{\extblx@oa@url@getoaurl}{% + \ifcsequal{extblx@oa@url@from}{extblx@oa@url@from@onlydoiapi} + {\iffieldundef{doi} + {} + {\extblx@oa@api@getoaurl{\thefield{doi}}}} + {\ifcsequal{extblx@oa@url@from}{extblx@oa@url@from@doiapi} + {\iffieldundef{doi} + {\forlistloop{\extblx@oa@url@processfield}{\extblx@oa@url@autofields}} + {\extblx@oa@api@getoaurl{\thefield{doi}}}} + {\ifcsequal{extblx@oa@url@from}{extblx@oa@url@from@none} + {} + {\ifcsequal{extblx@oa@url@from}{extblx@oa@url@from@all} + {\@firstoftwo} + {\ifcsequal{extblx@oa@url@from}{extblx@oa@url@from@auto} + {\@firstoftwo} + {\@secondoftwo}} + {\forlistloop{\extblx@oa@url@processfield}{\extblx@oa@url@autofields}} + {\extblx@oa@url@processfield{\csuse{extblx@oa@url@from}}}}}}} + + +\newrobustcmd*{\LoadTikZOASymbol}[1][plos]{% + \@ifpackageloaded{biblatex-ext-oa-tikzsymbols} + {\extblx@oa@warning{% + TikZ open access symbols already loaded.\MessageBreak + Redefining the symbol with\MessageBreak\string\DefineTikZOASymbol}% + \DefineTikZOASymbol[#1]} + {\RequirePackage[symbol=#1]{biblatex-ext-oa-tikzsymbols}}% + \gdef\LoadTikZOASymbol{% + \extblx@oa@warning{% + TikZ open access symbols can not be\MessageBreak + loaded more than once.\MessageBreak + I'll now behave like \string\DefineTikZOASymbol\MessageBreak}% + \DefineTikZOASymbol}} +\@onlypreamble\LoadTikZOASymbol + +\def\extblx@oa@opt@tikzsymbol@val@false{} +\def\extblx@oa@opt@tikzsymbol@val@true{\LoadTikZOASymbol[plos]} + +\def\extblx@oa@opt@tikzsymbol@process#1{% + \begingroup + \edef\extblx@oa@tempa{\endgroup + \noexpand\extblx@oa@opt@tikzsymbol@process@i{#1}} + \extblx@oa@tempa} + +\def\extblx@oa@opt@tikzsymbol@process@i#1{% + \ifcsundef{extblx@oa@opt@tikzsymbol@val@#1} + {\LoadTikZOASymbol[#1]} + {\csuse{extblx@oa@opt@tikzsymbol@val@#1}}} + +\SetupKeyvalOptions{ + family=extblx@oa@opt, + prefix=extblx@oa@opt@, +} + +\DeclareBoolOption[true]{enable} +\DeclareBoolOption[false]{doiapi} +\DeclareStringOption[false]{tikzsymbol}[true] + + +\ProcessKeyvalOptions* + +\extblx@oa@opt@tikzsymbol@process{\csuse{extblx@oa@opt@tikzsymbol}} + +\ifbool{extblx@oa@opt@doiapi} + {\RequirePackage{biblatex-ext-oa-doiapi}} + {} + +\def\extbl@oa@bbl@fielddef@bestoaurl#1{% + \blx@bbl@fielddef{bestoaurl}{#1}} + +\AtDataInput{% + \undef\extblx@oa@url + \extblx@oa@url@getoaurl + \ifundef\extblx@oa@url + {} + {\expandafter\extbl@oa@bbl@fielddef@bestoaurl\expandafter{\extblx@oa@url}}} + + + +% based on egreg's (https://tex.stackexchange.com/users/4427/egreg) +% answer to https://tex.stackexchange.com/a/123451/35864 +% originally CC BY-SA 3.0, but dual-licensed under LPPL +% see https://tex.meta.stackexchange.com/a/3333/35864 +\newcommand{\extblx@oa@marginmark}{\strut\vadjust{\extblx@oa@marginmark@do}} +\newcommand{\extblx@oa@marginmark@do}{% + \vbox to 0pt{% + \kern-3\dp\strutbox + \strut + \hfill + \rlap{\kern1em + \ifhyperref + {\href{\thefield{bestoaurl}}} + {\@firstofone}% + {\oasymbol}} + \vss + }% +} + + +\ifbool{extblx@oa@opt@enable} + {\csletcs{extblx@oa@url@from}{extblx@oa@url@from@auto} + \DeclareOpenAccessFieldUrl{url}{\thefield{url}} + \DeclareOpenAccessFieldUrl{doi}{https://doi.org/\thefield{doi}} + + \DeclareOpenAccessEprintUrl{jstor}{% + http://www.jstor.org/stable/\thefield{eprint}} + \DeclareOpenAccessEprintAlias{JSTOR}{jstor} + \DeclareOpenAccessEprintUrl{hdl}{% + http://hdl.handle.net/\thefield{eprint}} + \DeclareOpenAccessEprintAlias{HDL}{hdl} + \DeclareOpenAccessEprintUrl{pubmed}{% + http://www.ncbi.nlm.nih.gov/pubmed/\thefield{eprint}} + \DeclareOpenAccessEprintAlias{PubMed}{pubmed} + \DeclareOpenAccessEprintUrl[always]{arxiv}{% + https://arxiv.org/\abx@arxivpath/\thefield{eprint}} + \DeclareOpenAccessEprintAlias{arXiv}{arxiv} + + \DeclareOpenAccessUrlFieldPriority{url,eprint,doi} + + \DeclareFieldFormat{bestoaurl}{\url{#1}} + + \newbibmacro*{oamark}{% + \iffieldundef{bestoaurl} + {} + {\extblx@oa@marginmark}} + + \renewbibmacro*{begentry}{% + \usebibmacro{oamark}} + + \ifbool{extblx@oa@opt@doiapi} + {\NewBibliographyString{openaccessat} + \DefineBibliographyStrings{english}{ + openaccessat = {open access version at}, + } + \newbibmacro{api:bestoaurl}{% + \ifcsequal{extblx@oa@url@from}{extblx@oa@url@from@doiapi} + {\iffieldundef{doi} + {\@secondoftwo} + {\iffieldundef{bestoaurl} + {\@secondoftwo} + {\OpenaccessURLisDOI{\thefield{doi}} + {\@secondoftwo} + {\@firstoftwo}}}} + {\@secondoftwo} + {\bibstring{openaccessat}% + \setunit{\addspace}% + \printfield{bestoaurl}% + \newunit\newblock} + {}} + + \letbibmacro*{bbxorig:doi+eprint+url}{doi+eprint+url} + \renewbibmacro*{doi+eprint+url}{% + \usebibmacro{bbxorig:doi+eprint+url}% + \newunit\newblock + \usebibmacro{api:bestoaurl}}}} + {\csletcs{extblx@oa@url@from}{extblx@oa@url@from@none}} + + +\endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-tabular.sty b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-tabular.sty index b031428bbf0..90760b0e672 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-tabular.sty +++ b/Master/texmf-dist/tex/latex/biblatex-ext/biblatex-ext-tabular.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-tabular} - [2018/10/09 v0.5a tabular bibliographies for biblatex (MW)] + [2018/11/23 v0.6 tabular bibliographies for biblatex (MW)] % Code based on Audrey's (https://tex.stackexchange.com/users/4483/audrey) % answer https://tex.stackexchange.com/a/71454/35864 on TeX.SX @@ -241,3 +241,16 @@ {\clearname{\thefield{labelnamesource}}}} \endinput +% +% This file is part of the biblatex-ext bundle. +% biblatex-ext is released under the LaTeX Project Public License v1.3c +% or later. +% +% A complete list of files included in that package can be found in README.md +% or - failing that - in ext-standard.bbx. +% +% Official releases of this package are on CTAN +% https://www.ctan.org/pkg/biblatex-ext +% development takes place on GitHub +% https://github.com/moewew/biblatex-ext +% diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx index 851b795c00b..3d2ddb6e1c6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic-verb.bbx} - [2018/10/09 v0.5a extended biblatex alphabetic-verb + [2018/11/23 v0.6 extended biblatex alphabetic-verb bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx index 79d30966920..cd81fd8ac98 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic-verb.cbx} - [2018/10/09 v0.5a extended biblatex alphabetic-verb citation style (MW)] + [2018/11/23 v0.6 extended biblatex alphabetic-verb citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx index cdb169dc6f6..b8ec148ec66 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic.bbx} - [2018/10/09 v0.5a extended biblatex alphabetic bibliography style (MW)] + [2018/11/23 v0.6 extended biblatex alphabetic bibliography style (MW)] \RequireBibliographyStyle{ext-standard} \RequireBibliographyStyle{alphabetic} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx index 177a1a68954..73c11fa8c55 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-alphabetic.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic.cbx} - [2018/10/09 v0.5a extended biblatex alphabetic citation style (MW)] + [2018/11/23 v0.6 extended biblatex alphabetic citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx index a24181fd597..d469b07ac9a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-common.bbx} - [2018/10/09 v0.5a common files for extended biblatex + [2018/11/23 v0.6 common files for extended biblatex authortitle bibliography styles (MW)] \RequireBibliographyStyle{ext-dashed-common} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx index 30b3f53b3b6..749238b3806 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-comp.bbx} - [2018/10/09 v0.5a extended biblatex authortitle-comp + [2018/11/23 v0.6 extended biblatex authortitle-comp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx index ab1df67aa72..e4fd43a4648 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-comp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-comp.cbx} - [2018/10/09 v0.5a extended biblatex authortitle-comp + [2018/11/23 v0.6 extended biblatex authortitle-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx index 21231c01552..b02b8ac0a72 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ibid.bbx} - [2018/10/09 v0.5a extended biblatex authortitle-ibid + [2018/11/23 v0.6 extended biblatex authortitle-ibid bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx index f32aa6622fe..9dbc4a9069a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ibid.cbx} - [2018/10/09 v0.5a extended biblatex authortitle-ibid + [2018/11/23 v0.6 extended biblatex authortitle-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx index dd32941aafa..0ccb6510d01 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-icomp.bbx} - [2018/10/09 v0.5a extended biblatex authortitle-icomp + [2018/11/23 v0.6 extended biblatex authortitle-icomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx index c8108714cdc..b3bc6b624fd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-icomp.cbx} - [2018/10/09 v0.5a extended biblatex authortitle-icomp + [2018/11/23 v0.6 extended biblatex authortitle-icomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx index dc11288cb8d..fc2ee88fbe6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-tcomp.bbx} - [2018/10/09 v0.5a extended biblatex authortitle-tcomp + [2018/11/23 v0.6 extended biblatex authortitle-tcomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx index 7dcaa23c14e..0a744f0fea5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-tcomp.cbx} - [2018/10/09 v0.5a extended biblatex authortitle-tcomp + [2018/11/23 v0.6 extended biblatex authortitle-tcomp citation style (MW)] \RequireCitationStyle{ext-authortitle-comp} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx index a861b0d3370..222aca46217 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-terse.bbx} - [2018/10/09 v0.5a extended biblatex authortitle-terse + [2018/11/23 v0.6 extended biblatex authortitle-terse bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx index b2508ad5772..67cffd32723 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-terse.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-terse.cbx} - [2018/10/09 v0.5a extended biblatex authortitle-terse + [2018/11/23 v0.6 extended biblatex authortitle-terse citation style (MW)] \RequireCitationStyle{ext-authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx index bff9555ffbd..5e85f75c438 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ticomp.bbx} - [2018/10/09 v0.5a extended biblatex authortitle-ticomp + [2018/11/23 v0.6 extended biblatex authortitle-ticomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx index eb770ba2bc6..dda450191c5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ticomp.cbx} - [2018/10/09 v0.5a extended biblatex authortitle-ticomp citation style (MW)] + [2018/11/23 v0.6 extended biblatex authortitle-ticomp citation style (MW)] \RequireCitationStyle{ext-authortitle-icomp} \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx index c603b80464c..b602e7c7051 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle.bbx} - [2018/10/09 v0.5a extended biblatex authortitle + [2018/11/23 v0.6 extended biblatex authortitle bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx index c1544b78259..6a9e1526d5f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authortitle.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle.cbx} - [2018/10/09 v0.5a extended biblatex authortitle citation style (MW)] + [2018/11/23 v0.6 extended biblatex authortitle citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx index 49f5fd093a1..146c0f6cf96 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-common.bbx} - [2018/10/09 v0.5a common files for extended biblatex + [2018/11/23 v0.6 common files for extended biblatex authoryear bibliography styles (MW)] \RequireBibliographyStyle{ext-dashed-common} @@ -7,6 +7,13 @@ \DeclareFieldFormat{biblabeldate}{\mkbibparens{#1}} \DeclareFieldAlias{biblistlabeldate}{biblabeldate} +\providebibmacro*{bbx:ifmergeddate}{\@secondoftwo} + +\renewbibmacro*{date}{% + \usebibmacro{bbx:ifmergeddate} + {} + {\printdate}} + % merge date/issue with date label \def\bbx@opt@mergedate@maximum{% \renewbibmacro*{date+extradate}{% @@ -18,12 +25,9 @@ \setunit*{\addspace}% \printdateextra} {\printlabeldateextra}}}}% - \renewbibmacro*{date}{% - \iflabeldateisdate - {} - {\printdate}}% + \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}% \renewbibmacro*{issue+date}{% - \iflabeldateisdate + \usebibmacro{bbx:ifmergeddate} {} {\printtext[issuedate]{% \printfield{issue}% @@ -39,20 +43,18 @@ \iflabeldateisdate {\printdateextra} {\printlabeldateextra}}}}% - \renewbibmacro*{date}{% - \iflabeldateisdate - {} - {\printdate}}% + \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}% \renewbibmacro*{issue+date}{% - \ifboolexpr{not test {\iffieldundef{issue}} - or not test {\iflabeldateisdate}} + \ifboolexpr{test {\usebibmacro{bbx:ifmergeddate}} + and + test {\iffieldundef{issue}}} + {} {\printtext[issuedate]{% \printfield{issue}% \setunit*{\addspace}% - \iflabeldateisdate + \usebibmacro{bbx:ifmergeddate} {} - {\printdate}}} - {}% + {\printdate}}}% \newunit}} % merge year-only date with date label @@ -61,19 +63,16 @@ \iffieldundef{labelyear} {} {\printtext[\blx@delimcontext labeldate]{\printlabeldateextra}}}% - \renewbibmacro*{date}{% + \renewbibmacro*{bbx:ifmergeddate}{% \ifboolexpr{ test {\iflabeldateisdate} and not test {\ifdateshavedifferentprecision{label}{}} - } - {} - {\printdate}}% + }% + }% \renewbibmacro*{issue+date}{% \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} + test {\usebibmacro{bbx:ifmergeddate}} and test {\iffieldundef{issue}} } @@ -90,23 +89,18 @@ \iffieldundef{labelyear} {} {\printtext[\blx@delimcontext labeldate]{\printlabeldateextra}}}% - \renewbibmacro*{date}{% + \renewbibmacro*{bbx:ifmergeddate}{% \ifboolexpr{ test {\iflabeldateisdate} and not test {\ifdateshavedifferentprecision{label}{}} and test {\iffieldundef{extradate}} - } - {} - {\printdate}}% + }% + }% \renewbibmacro*{issue+date}{% \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} - and - test {\iffieldundef{extradate}} + test {\usebibmacro{bbx:ifmergeddate}} and test {\iffieldundef{issue}} } @@ -123,7 +117,7 @@ \iffieldundef{labelyear} {} {\printtext[\blx@delimcontext labeldate]{\printlabeldateextra}}}% - \renewbibmacro*{date}{\printdate}% + \renewbibmacro*{bbx:ifmergeddate}{\@secondoftwo}% \renewbibmacro*{issue+date}{% \printtext[issuedate]{% \printfield{issue}% diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx index 43fe34019df..4229edd602d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-comp.bbx} - [2018/10/09 v0.5a extended biblatex authoryear-comp + [2018/11/23 v0.6 extended biblatex authoryear-comp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx index 92561d67dc0..8003efe3111 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-comp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-comp.cbx} - [2018/10/09 v0.5a extended biblatex authoryear-comp + [2018/11/23 v0.6 extended biblatex authoryear-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx index e71bfad5f55..45771009cf0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ecomp.bbx} - [2018/10/09 v0.5a biblatex authoryear-ecomp + [2018/11/23 v0.6 biblatex authoryear-ecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx index ea6b4cebf69..82aa45087fc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ecomp.cbx} - [2018/10/09 v0.5a biblatex authoryear-ecomp + [2018/11/23 v0.6 biblatex authoryear-ecomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx index a2eba738443..2ab39341266 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ibid.bbx} - [2018/10/09 v0.5a extended biblatex authoryear-ibid + [2018/11/23 v0.6 extended biblatex authoryear-ibid bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx index f981d2b6ce7..182d798ce66 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ibid.cbx} - [2018/10/09 v0.5a extended biblatex authoryear-ibid + [2018/11/23 v0.6 extended biblatex authoryear-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx index 26ca3f53348..5fcc2e3370a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-icomp.bbx} - [2018/10/09 v0.5a extended biblatex authoryear-icomp + [2018/11/23 v0.6 extended biblatex authoryear-icomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx index e42eb9ad792..3eca63077fe 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-icomp.cbx} - [2018/10/09 v0.5a extended biblatex authoryear-icomp + [2018/11/23 v0.6 extended biblatex authoryear-icomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx index 44e2bf6faae..c490a0116e0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-iecomp.bbx} - [2018/10/09 v0.5a biblatex authoryear-iecomp + [2018/11/23 v0.6 biblatex authoryear-iecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx index 60a56995eb0..f7f22805aa4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-iecomp.cbx} - [2018/10/09 v0.5a biblatex authoryear-iecomp + [2018/11/23 v0.6 biblatex authoryear-iecomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx index cf98c85e45b..0173c82366e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tcomp.bbx} - [2018/10/09 v0.5a extended biblatex authoryear-tcomp + [2018/11/23 v0.6 extended biblatex authoryear-tcomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx index efc4a59fd14..17dc65d41a7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tcomp.cbx} - [2018/10/09 v0.5a extended biblatex authoryear-tcomp + [2018/11/23 v0.6 extended biblatex authoryear-tcomp citation style (MW)] \RequireCitationStyle{ext-authoryear-comp} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx index 783fb6ca8ce..481cf7424ce 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tecomp.bbx} - [2018/10/09 v0.5a extended biblatex authoryear-tecomp + [2018/11/23 v0.6 extended biblatex authoryear-tecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx index 7ce007eb4a8..3d77ca9c2dc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tecomp.cbx} - [2018/10/09 v0.5a extended biblatex authoryear-tecomp + [2018/11/23 v0.6 extended biblatex authoryear-tecomp citation style (MW)] \RequireCitationStyle{ext-authoryear-ecomp} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx index 20c22d1f081..0beb7fa3e25 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-terse.bbx} - [2018/10/09 v0.5a extended biblatex authoryear-terse + [2018/11/23 v0.6 extended biblatex authoryear-terse bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx index 903c0de5f18..42d2ae1da5d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-terse.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-terse.cbx} - [2018/10/09 v0.5a extended biblatex authoryear-terse + [2018/11/23 v0.6 extended biblatex authoryear-terse citation style (MW)] \RequireCitationStyle{ext-authoryear} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx index e65009f5231..1d4b9b5809e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ticomp.bbx} - [2018/10/09 v0.5a extended biblatex authoryear-ticomp + [2018/11/23 v0.6 extended biblatex authoryear-ticomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx index 31943362dde..83731c204b8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ticomp.cbx} - [2018/10/09 v0.5a extended biblatex authoryear-ticomp citation style (MW)] + [2018/11/23 v0.6 extended biblatex authoryear-ticomp citation style (MW)] \RequireCitationStyle{ext-authoryear-icomp} \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx index cc673597c9f..4bbbabbe509 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tiecomp.bbx} - [2018/10/09 v0.5a extended biblatex authoryear-tiecomp + [2018/11/23 v0.6 extended biblatex authoryear-tiecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx index 7aad752946f..5b445d15350 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tiecomp.cbx} - [2018/10/09 v0.5a extended biblatex authoryear-tiecomp citation style (MW)] + [2018/11/23 v0.6 extended biblatex authoryear-tiecomp citation style (MW)] \RequireCitationStyle{ext-authoryear-icomp} \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx index e0aa22bc161..1488b392080 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear.bbx} - [2018/10/09 v0.5a extended biblatex authoryear bibliography style (MW)] + [2018/11/23 v0.6 extended biblatex authoryear bibliography style (MW)] \RequireBibliographyStyle{ext-standard} \RequireBibliographyStyle{authoryear} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx index 6d5c5555a1d..7925d85c53f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear.cbx} - [2018/10/09 v0.5a extended biblatex authoryear citation style (MW)] + [2018/11/23 v0.6 extended biblatex authoryear citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def b/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def index d286869e459..d967f262c21 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-biblatex-aux.def @@ -1,8 +1,8 @@ \ProvidesFile{ext-biblatex-aux.def} - [2018/10/09 v0.5a auxiliaries for extended biblatex citation style (MW)] + [2018/11/23 v0.6 auxiliaries for extended biblatex citation style (MW)] -\def\extblx@requiredbiblatexversion{3.11} -\def\extblx@requiredbiblatexdate{2018/02/20} +\def\extblx@requiredbiblatexversion{3.12} +\def\extblx@requiredbiblatexdate{2018/11/02} \newrobustcmd*{\extblx@info}[1]{\PackageInfo{biblatex-ext}{#1}} \newrobustcmd*{\extblx@warning}[1]{\PackageWarning{biblatex-ext}{#1}} @@ -18,6 +18,16 @@ (\extblx@requiredbiblatexdate) or later.\MessageBreak I found '\csuse{abx@version} (\csuse{abx@date})'}} +\newrobustcmd*{\extblx@DeclareBTEOption}[2][boolean]{% + \@ifnextchar[%] + {\extblx@DeclareBTEOption@i[#1]{#2}} + {\extblx@DeclareBTEOption@i[#1]{#2}[]}} + +\def\extblx@DeclareBTEOption@i[#1]#2[#3]#4{% + \DeclareBibliographyOption[#1]{#2}[#3]{#4}% + \DeclareTypeOption[#1]{#2}[#3]{#4} + \DeclareEntryOption[#1]{#2}[#3]{#4}} + %{<context>}{<opening delim>}{<closing delim>} \newrobustcmd*{\DeclareOuterCiteDelims}{% \extblx@declareciteddelims{outer}} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx index 0e378a896cd..d68fe252e9d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-dashed-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-dashed-common.bbx} - [2018/10/09 v0.5a common files for extended biblatex + [2018/11/23 v0.6 common files for extended biblatex dashed bibliography styles (MW)] % \DeclareBibliographyOption checks if an option is already defined. @@ -14,7 +14,7 @@ Please update 'etoolbox' to v2.4 (2017-01-02)\MessageBreak or later}} {\listcsremove{blx@globalopts@boolean}{dashed}} -\DeclareBibliographyOption[string]{dashed}[true]{% +\extblx@DeclareBTEOption[string]{dashed}[true]{% \ifcsdef{extblx@opt@dashed@#1} {\csuse{extblx@opt@dashed@#1}} {\PackageWarningNoLine{biblatex-ext}{% @@ -65,7 +65,7 @@ \renewbibmacro*{bbx:savehash}{}% \renewbibmacro*{bbx:dashcheck}[2]{##2}} -% We need to execute the option that were already executed +% We need to execute the options that were already executed % by the standard styles again, because we changed the % underlying definitions. \ExecuteBibliographyOptions{dashed=true}% diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx index 29295951b9c..154d77e7426 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-comp.bbx} - [2018/10/09 v0.5a extended biblatex numeric-comp + [2018/11/23 v0.6 extended biblatex numeric-comp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx index 5424d949f95..00138afb7f0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-comp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-comp.cbx} - [2018/10/09 v0.5a extended biblatex numeric-comp citation style (MW)] + [2018/11/23 v0.6 extended biblatex numeric-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx index 088fba8ddbe..a99731197be 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-verb.bbx} - [2018/10/09 v0.5a extended biblatex numeric-verb + [2018/11/23 v0.6 extended biblatex numeric-verb bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx index 9c6602a55e5..987d6ba2575 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric-verb.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-verb.cbx} - [2018/10/09 v0.5a extended biblatex numeric-verb citation style (MW)] + [2018/11/23 v0.6 extended biblatex numeric-verb citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx index e27261d4206..943cc52b457 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric.bbx} - [2018/10/09 v0.5a extended biblatex numeric bibliography style (MW)] + [2018/11/23 v0.6 extended biblatex numeric bibliography style (MW)] \RequireBibliographyStyle{ext-standard} \RequireBibliographyStyle{numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx index 9508b93efeb..49d9c87554a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-numeric.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric.cbx} - [2018/10/09 v0.5a extended biblatex numeric citation style (MW)] + [2018/11/23 v0.6 extended biblatex numeric citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx index 3ce5d0da90b..f9c4765a7f1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx @@ -1,9 +1,9 @@ -% biblatex-ext v0.5a (2018-10-09) +% biblatex-ext v0.6 (2018-11-23) % Maintainer: Moritz Wemheuer % Licence: LaTeX Project Public License v1.3c or later % \ProvidesFile{ext-standard.bbx} - [2018/10/09 v0.5a extended biblatex standard style (MW)] + [2018/11/23 v0.6 extended biblatex standard style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} @@ -18,22 +18,27 @@ \newtoggle{bbx:maintitleaftertitle} \newtoggle{bbx:introcite:plain:keeprelated} -\DeclareBibliographyOption[boolean]{citexref}[true]{% +\extblx@DeclareBTEOption[boolean]{citexref}[true]{% \settoggle{bbx:citexref}{#1}} -\DeclareBibliographyOption[boolean]{citeinxref}[true]{% +\extblx@DeclareBTEOption[boolean]{citeinxref}[true]{% \blx@warning{The option 'citeinxref' is deprecated.\MessageBreak Use 'citexref' (without in) instead.\MessageBreak Setting 'citexref' now}% \settoggle{bbx:citexref}{#1}} -\DeclareBibliographyOption[boolean]{innamebeforetitle}[true]{% +\extblx@DeclareBTEOption[boolean]{innamebeforetitle}[true]{% \settoggle{bbx:innamebeforetitle}{#1}} -\DeclareBibliographyOption[boolean]{innameidem}[true]{% +\extblx@DeclareBTEOption[boolean]{innameidem}[true]{% \settoggle{bbx:innameidem}{#1}} -\DeclareBibliographyOption[boolean]{articlein}[true]{% +\extblx@DeclareBTEOption[boolean]{articlein}[true]{% \settoggle{bbx:articlein}{#1}} -\DeclareBibliographyOption[boolean]{maintitleaftertitle}[true]{% +\extblx@DeclareBTEOption[boolean]{maintitleaftertitle}[true]{% \settoggle{bbx:maintitleaftertitle}{#1}} -\DeclareBibliographyOption[string]{introcite}[label]{% + +\def\extblx@opt@introcite@false{0} +\def\extblx@opt@introcite@label{1} +\def\extblx@opt@introcite@plain{2} + +\def\extblx@opthandler@introcite#1{% \ifcsdef{extblx@opt@introcite@#1} {\letcs\extblx@introcite{extblx@opt@introcite@#1}} {\PackageWarningNoLine{biblatex-ext}{% @@ -41,9 +46,30 @@ Possible values are 'false', 'label', 'plain'.\MessageBreak Falling back to 'introcite=false'}% \letcs\extblx@introcite{extblx@opt@introcite@false}}} -\def\extblx@opt@introcite@false{0} -\def\extblx@opt@introcite@label{1} -\def\extblx@opt@introcite@plain{2} + +% {<per-...>}{<option value>} +\protected\def\extblx@specialopthandler@introcite#1#2{% + \ifstrequal{#2}{label} + {\ifcsundef{extblx@warn@introcitelabel@#1} + {\PackageWarningNoLine{biblatex-ext}{% + Value 'introcite=label' not officially supported\MessageBreak + on per-#1 level.\MessageBreak + It requires setup changes for a complete\MessageBreak + bibliography environment, which can only happen\MessageBreak + globally or per bibliography.\MessageBreak + Using 'introcite=label' anyway, the result might\MessageBreak + be off. You have been warned}% + \global\cslet{extblx@warn@introcitelabel@#1}\@empty} + {}}} + +\DeclareBibliographyOption[string]{introcite}[label]{% + \extblx@opthandler@introcite{#1}} +\DeclareTypeOption[string]{introcite}[label]{% + \extblx@opthandler@introcite{#1}% + \extblx@specialopthandler@introcite{type}{#1}} +\DeclareEntryOption[string]{introcite}[label]{% + \extblx@opthandler@introcite{#1}% + \extblx@specialopthandler@introcite{entry}{#1}} \ExecuteBibliographyOptions{% citexref = false, @@ -55,38 +81,6 @@ % maxbibnames = 999, } -\DeclareTypeOption[boolean]{citexref}[true]{% - \settoggle{bbx:citexref}{#1}} -\DeclareTypeOption[boolean]{citeinxref}[true]{% - \blx@warning{The option 'citeinxref' is deprecated.\MessageBreak - Use 'citexref' (without in) instead.\MessageBreak - Setting 'citexref' now}% - \settoggle{bbx:citexref}{#1}} -\DeclareTypeOption[boolean]{innamebeforetitle}[true]{% - \settoggle{bbx:innamebeforetitle}{#1}} -\DeclareTypeOption[boolean]{innameidem}[true]{% - \settoggle{bbx:innameidem}{#1}} -\DeclareTypeOption[boolean]{articlein}[true]{% - \settoggle{bbx:articlein}{#1}} -\DeclareTypeOption[boolean]{maintitleaftertitle}[true]{% - \settoggle{bbx:maintitleaftertitle}{#1}} - -\DeclareEntryOption[boolean]{citexref}[true]{% - \settoggle{bbx:citexref}{#1}} -\DeclareEntryOption[boolean]{citeinxref}[true]{% - \blx@warning{The option 'citeinxref' is deprecated.\MessageBreak - Use 'citexref' (without in) instead.\MessageBreak - Setting 'citexref' now}% - \settoggle{bbx:citexref}{#1}} -\DeclareEntryOption[boolean]{innamebeforetitle}[true]{% - \settoggle{bbx:innamebeforetitle}{#1}} -\DeclareEntryOption[boolean]{innameidem}[true]{% - \settoggle{bbx:innameidem}{#1}} -\DeclareEntryOption[boolean]{articlein}[true]{% - \settoggle{bbx:articlein}{#1}} -\DeclareEntryOption[boolean]{maintitleaftertitle}[true]{% - \settoggle{bbx:maintitleaftertitle}{#1}} - \newbibmacro*{bbx:introcite}{\usebibmacro{cite}} @@ -116,6 +110,7 @@ \undef\cbx@lastyear \citetrackerfalse\pagetrackerfalse\backtrackerfalse \defcounter{maxnames}{\blx@maxcitenames}% + \defcounter{minnames}{\blx@mincitenames}% \printtext[bbx@introcite]{\usebibmacro{bbx:introcite}}% \endgroup } @@ -163,6 +158,7 @@ \DeclareDelimAlias{innametitledelim}{nametitledelim} \DeclareDelimAlias*[bib,biblist]{innametitledelim}{nametitledelim} +\newcommand*{\titleaddonpunct}{\newunitpunct} \DeclareBibliographyDriver{article}{% \usebibmacro{introcite:plain}% @@ -844,7 +840,7 @@ \printfield[titlecase:title]{title}% \setunit{\subtitlepunct}% \printfield[titlecase:title]{subtitle}}% - \newunit}% + \setunit{\titleaddonpunct}}% \printfield{titleaddon}} \DeclareFieldAlias{titlecase:booktitle}{titlecase} @@ -859,7 +855,7 @@ \printfield[titlecase:booktitle]{booktitle}% \setunit{\subtitlepunct}% \printfield[titlecase:booktitle]{booksubtitle}}% - \newunit}% + \setunit{\titleaddonpunct}}% \printfield{booktitleaddon}} \DeclareFieldAlias{titlecase:maintitle}{titlecase} @@ -874,7 +870,7 @@ \printfield[titlecase:maintitle]{maintitle}% \setunit{\subtitlepunct}% \printfield[titlecase:maintitle]{mainsubtitle}}% - \newunit}% + \setunit{\titleaddonpunct}}% \printfield{maintitleaddon}} \DeclareFieldAlias{titlecase:journaltitle}{titlecase} @@ -983,6 +979,22 @@ {}% \newunit} +\renewbibmacro*{event+venue+date}{% + \printfield{eventtitle}% + \setunit{\titleaddonpunct}% + \printfield{eventtitleaddon}% + \ifboolexpr{ + test {\iffieldundef{venue}} + and + test {\iffieldundef{eventyear}} + } + {} + {\setunit{\addspace}% + \printtext[parens]{% + \printfield{venue}% + \setunit*{\addcomma\space}% + \printeventdate}}% + \newunit} \renewbibmacro*{bybookauthor}{% \ifnamesequal{author}{bookauthor} @@ -1196,7 +1208,7 @@ % Copyright 2017-2018 Moritz Wemheuer % -% This work consists of the `.bbx`, `.cbx`, `.def` and `.sty` files +% This work consists of the `.bbx`, `.cbx`, `.def`, `.sty` and `.lua` files % ext-standard.bbx % ext-biblatex-aux.def % ext-dashed-common.bbx @@ -1233,6 +1245,10 @@ % ext-verbose-trad2.bbx ext-verbose-trad2.cbx % ext-verbose-trad3.bbx ext-verbose-trad3.cbx % biblatex-ext-tabular.sty +% biblatex-ext-oa.sty +% biblatex-ext-oa-doiapi.sty +% blxextdoiapi.lua +% biblatex-ext-oa-tikzsymbols.sty % % Refer also to README.md. % diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx index 4cdc62efb50..aeadd660c4c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-ibid.bbx} - [2018/10/09 v0.5a extended biblatex verbose-ibid + [2018/11/23 v0.6 extended biblatex verbose-ibid bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx index 8918d551931..7ec2f33826d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-ibid.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-ibid.cbx} - [2018/10/09 v0.5a extended biblatex verbose-ibid citation style (MW)] + [2018/11/23 v0.6 extended biblatex verbose-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx index adb38836bc4..adc731ae5d2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-inote.bbx} - [2018/10/09 v0.5a extended biblatex verbose-inote + [2018/11/23 v0.6 extended biblatex verbose-inote bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx index b30c14ca348..98fbdcb456a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-inote.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-inote.cbx} - [2018/10/09 v0.5a extended biblatex verbose-inote citation style (MW)] + [2018/11/23 v0.6 extended biblatex verbose-inote citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx index 233bc0fb7b4..74e2b2a3b95 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-note.bbx} - [2018/10/09 v0.5a extended biblatex verbose-note + [2018/11/23 v0.6 extended biblatex verbose-note bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx index 14a3b96c97d..164e5572b4a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-note.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-note.cbx} - [2018/10/09 v0.5a extended biblatex verbose-note citation style (MW)] + [2018/11/23 v0.6 extended biblatex verbose-note citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx index 49906c7f7e9..bea4cbc56d3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad1.bbx} - [2018/10/09 v0.5a extended biblatex verbose-trad1 + [2018/11/23 v0.6 extended biblatex verbose-trad1 bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx index a509d460419..a3a13b572bc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad1.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad1.cbx} - [2018/10/09 v0.5a extended biblatex verbose-trad1 citation style (MW)] + [2018/11/23 v0.6 extended biblatex verbose-trad1 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx index 8081e0ca638..16cd191f590 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad2.bbx} - [2018/10/09 v0.5a extended biblatex verbose-trad2 + [2018/11/23 v0.6 extended biblatex verbose-trad2 bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx index c5b372b2de3..8c786655741 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad2.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad2.cbx} - [2018/10/09 v0.5a extended biblatex verbose-trad2 citation style (MW)] + [2018/11/23 v0.6 extended biblatex verbose-trad2 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx index e6000b84c9c..fb2e9469481 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad3.bbx} - [2018/10/09 v0.5a extended biblatex verbose-trad3 + [2018/11/23 v0.6 extended biblatex verbose-trad3 bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx index ca566da83b3..bd86df38a00 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose-trad3.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad3.cbx} - [2018/10/09 v0.5a extended biblatex verbose-trad3 citation style (MW)] + [2018/11/23 v0.6 extended biblatex verbose-trad3 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx index 4d4dfe68da5..e2b0d32b4a3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose.bbx} - [2018/10/09 v0.5a extended biblatex verbose + [2018/11/23 v0.6 extended biblatex verbose bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx index a08f6b97f98..6de445b032e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-verbose.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose.cbx} - [2018/10/09 v0.5a extended biblatex verbose citation style (MW)] + [2018/11/23 v0.6 extended biblatex verbose citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{} |