From ee4d4b6b1cf68644ba1368bd6cdf3f7c19b83c81 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Sun, 6 Jul 2014 23:15:03 +0200 Subject: 2014-07-06 22:52:00 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4433 -> 4431 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/publ-imp-author.mkvi | 4 +++- tex/context/base/status-files.pdf | Bin 24903 -> 24897 bytes tex/context/base/status-lua.pdf | Bin 249609 -> 249610 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 7 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index c9d8a19e0..f0977ee79 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2014.07.06 21:17} +\newcontextversion{2014.07.06 22:50} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 3fddcdb4c..7e082ed9e 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 468493ce1..60e0f18c5 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.07.06 21:17} +\edef\contextversion{2014.07.06 22:50} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/publ-imp-author.mkvi b/tex/context/base/publ-imp-author.mkvi index 6326ac3d8..29714ec03 100644 --- a/tex/context/base/publ-imp-author.mkvi +++ b/tex/context/base/publ-imp-author.mkvi @@ -159,7 +159,9 @@ \stopsetups \startsetups \s!btx:\s!list:\s!author:etaltext - \btxcitevariantparameter\c!etaltext + \ifcase\currentbtxoverflow \else + \btxlistvariantparameter\c!etaltext + \fi \stopsetups \startsetups \s!btx:\s!list:\s!author:normal diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 233518f5c..85d00dfa0 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 85f8ab47a..b0160abbc 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 22dd8c32b..2f26be70e 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 07/06/14 21:17:47 +-- merge date : 07/06/14 22:50:12 do -- begin closure to overcome local limits and interference -- cgit v1.2.3