8 files changed, 38 insertions, 8 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index c8893eb1e..8bad7dd12 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.10.08 20:05}
+\newcontextversion{2021.10.10 23:40}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 89e04f878..3924c7104 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2021.10.08 20:05}
+\edef\contextversion{2021.10.10 23:40}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/lang-def.mkiv b/tex/context/base/mkiv/lang-def.mkiv
index 603935097..441d328c8 100644
--- a/tex/context/base/mkiv/lang-def.mkiv
+++ b/tex/context/base/mkiv/lang-def.mkiv
@@ -554,7 +554,7 @@
 % Artificial Languages: Esperanto
 
 \installlanguage
-  [\s!esperanto]
+  [\s!eo]
   [\c!spacing=\v!packed,
    \c!leftsentence=\endash,
    \c!rightsentence=\endash,
@@ -569,7 +569,7 @@
    \s!lefthyphenmin=2,
    \s!righthyphenmin=2]
 
-\installlanguage[\s!eo][\c!default=\s!esperanto]
+\installlanguage[\s!esperanto][\c!default=\s!eo]
 
 % Baltic Languages: Lettish/Latvian, Lietuvių/Lithuanian
 
diff --git a/tex/context/base/mkiv/mtx-context-compare.tex b/tex/context/base/mkiv/mtx-context-compare.tex
index c940270c8..163ea5747 100644
--- a/tex/context/base/mkiv/mtx-context-compare.tex
+++ b/tex/context/base/mkiv/mtx-context-compare.tex
@@ -38,7 +38,6 @@
     \stopTEXpage
 \stoptexdefinition
 
-
 \startluacode
 
 local report = logs.reporter("compare")
diff --git a/tex/context/base/mkiv/publ-ini.lua b/tex/context/base/mkiv/publ-ini.lua
index 83f0ff9ac..584b23dbf 100644
--- a/tex/context/base/mkiv/publ-ini.lua
+++ b/tex/context/base/mkiv/publ-ini.lua
@@ -2168,18 +2168,18 @@ do
 
     function lists.combiinlist(dataset,tag)
         local rendering = renderings[dataset]
-        local list      = rendering.list
+     -- local list      = rendering.list
         local toindex   = rendering.tagtolistindex
         return toindex and toindex[tag]
     end
 
     function lists.flushcombi(dataset,tag)
         local rendering = renderings[dataset]
-        local list      = rendering.list
         local toindex   = rendering.tagtolistindex
         local listindex = toindex and toindex[tag]
         if listindex then
-            local li = list[listindex]
+            local list = rendering.list
+            local li   = list[listindex]
             if li then
                 local data      = datasets[dataset]
                 local luadata   = data.luadata
@@ -3507,3 +3507,30 @@ do
     end
 
 end
+
+do
+
+    -- no caching for now
+
+    interfaces.implement { -- shared with mkiv so no public
+        name      = "btxdoifelsecitedone",
+        protected = true,
+     -- public    = true,
+     -- arguments = "2 arguments",
+        arguments = "2 strings",
+        actions   = function(dataset,tag)
+            -- dataset ignored
+            local list = structures.lists.tobesaved
+            local done = false
+            for i=1,#list do
+                local u = list[i].userdata
+                if u.btxref == tag then
+                    done = true
+                    break
+                end
+            end
+            ctx_doifelse(done)
+        end
+    }
+
+end
diff --git a/tex/context/base/mkiv/publ-ini.mkiv b/tex/context/base/mkiv/publ-ini.mkiv
index dfed53c73..6e34d3ab5 100644
--- a/tex/context/base/mkiv/publ-ini.mkiv
+++ b/tex/context/base/mkiv/publ-ini.mkiv
@@ -799,9 +799,13 @@
 \unexpanded\def\btxdoifelsecombiinlist#1#2%
   {\clf_btxdoifelsecombiinlist{#1}{#2}}
 
+\unexpanded\def\btxdoifelsecitedone#1#2%
+  {\clf_btxdoifelsecitedone{#1}{#2}}
+
 \let\btxdoifsameaspreviouscheckedelse\btxdoifelsesameaspreviouschecked
 \let\btxdoifsameaspreviouselse       \btxdoifelsesameasprevious
 \let\btxdoifcombiinlistelse          \btxdoifelsecombiinlist
+\let\btxdoifcitedoneelse             \btxdoifelsecitedone
 
 \def\publ_place_list_indeed#1#2[#3][#4]%
   {\begingroup
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index c251ad6c1..ff8592826 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 50cc0ad29..389d9cfd0 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf