2021-03-09 11:42:00

24 files changed, 427 insertions, 185 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 6fc17adb0..74f787329 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -16196,7 +16196,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true
 
--- original size: 61808, stripped down to: 36227
+-- original size: 61809, stripped down to: 36228
 
 if not modules then modules={} end modules ['lxml-tab']={
  version=1.001,
@@ -17654,7 +17654,7 @@ function xml.kind(e)
     local tg=d.tg
     if tg=="@cd@" then
      return "cdata"
-    elseif tg=="@cm" then
+    elseif tg=="@cm@" then
      return "comment"
     elseif tg=="@pi@" then
      return "instruction"
@@ -25842,7 +25842,7 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1025947
+-- original bytes    : 1025948
 -- stripped bytes    : 405652
 
 -- end library merge
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 6fc17adb0..74f787329 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -16196,7 +16196,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true
 
--- original size: 61808, stripped down to: 36227
+-- original size: 61809, stripped down to: 36228
 
 if not modules then modules={} end modules ['lxml-tab']={
  version=1.001,
@@ -17654,7 +17654,7 @@ function xml.kind(e)
     local tg=d.tg
     if tg=="@cd@" then
      return "cdata"
-    elseif tg=="@cm" then
+    elseif tg=="@cm@" then
      return "comment"
     elseif tg=="@pi@" then
      return "instruction"
@@ -25842,7 +25842,7 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1025947
+-- original bytes    : 1025948
 -- stripped bytes    : 405652
 
 -- end library merge
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 6fc17adb0..74f787329 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -16196,7 +16196,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true
 
--- original size: 61808, stripped down to: 36227
+-- original size: 61809, stripped down to: 36228
 
 if not modules then modules={} end modules ['lxml-tab']={
  version=1.001,
@@ -17654,7 +17654,7 @@ function xml.kind(e)
     local tg=d.tg
     if tg=="@cd@" then
      return "cdata"
-    elseif tg=="@cm" then
+    elseif tg=="@cm@" then
      return "comment"
     elseif tg=="@pi@" then
      return "instruction"
@@ -25842,7 +25842,7 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1025947
+-- original bytes    : 1025948
 -- stripped bytes    : 405652
 
 -- end library merge
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 6fc17adb0..74f787329 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -16196,7 +16196,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true
 
--- original size: 61808, stripped down to: 36227
+-- original size: 61809, stripped down to: 36228
 
 if not modules then modules={} end modules ['lxml-tab']={
  version=1.001,
@@ -17654,7 +17654,7 @@ function xml.kind(e)
     local tg=d.tg
     if tg=="@cd@" then
      return "cdata"
-    elseif tg=="@cm" then
+    elseif tg=="@cm@" then
      return "comment"
     elseif tg=="@pi@" then
      return "instruction"
@@ -25842,7 +25842,7 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1025947
+-- original bytes    : 1025948
 -- stripped bytes    : 405652
 
 -- end library merge
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index ca8b992be..0b809b68c 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2021.03.05 19:11}
+\newcontextversion{2021.03.09 11:39}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index 33f8c3aba..5e34a6801 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2021.03.05 19:11}
+\edef\contextversion{2021.03.09 11:39}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 89ef1e6c3..8dc4e7f9d 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.03.05 19:11}
+\newcontextversion{2021.03.09 11:39}
 
 %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 49eb15049..241224d7b 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.03.05 19:11}
+\edef\contextversion{2021.03.09 11:39}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/lang-def.mkiv b/tex/context/base/mkiv/lang-def.mkiv
index 85c1f3ac7..cc94bf7ae 100644
--- a/tex/context/base/mkiv/lang-def.mkiv
+++ b/tex/context/base/mkiv/lang-def.mkiv
@@ -350,6 +350,21 @@
    \c!rightquotation=\upperrightdoublesixquote,
    \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
+\installlanguage
+  [\s!bg]
+  [\s!lefthyphenmin=2,
+   \s!righthyphenmin=2,
+   \c!spacing=\v!packed,
+   \c!leftsentence=\leftguillemot,
+   \c!rightsentence=\rightguillemot,
+   \c!leftsubsentence=\lowerleftdoubleninequote,
+   \c!rightsubsentence=\upperrightdoubleninequote,
+   \c!leftquote=\lowerleftsingleninequote,
+   \c!rightquote=\upperrightsinglesixquote,
+   \c!leftquotation=\lowerleftdoubleninequote,
+   \c!rightquotation=\upperrightdoublesixquote,
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
+
 \installlanguage [\s!russian]    [\s!ru]
 \installlanguage [\s!ukrainian]  [\s!ua]
 \installlanguage [\s!belarussian][\s!be]
@@ -357,6 +372,7 @@
 \installlanguage [\s!sr-latn]    [\s!sr]
 \installlanguage [\s!sr-cyrl]    [\s!sr]
 \installlanguage [\s!macedonian] [\s!mk]
+\installlanguage [\s!bulgarian]  [\s!bg]
 
 
 % Uralic Languages: Cheremiss, Estonian, Finnish, Karelian, Laap,
@@ -486,7 +502,7 @@
 \installlanguage [\s!arabic] [\s!ar]
 
 \installlanguage
-  [\s!pe]
+  [\s!farsi]
   [\c!spacing=\v!broad,
    \c!leftsentence=\emdash,
    \c!rightsentence=\emdash,
@@ -498,9 +514,9 @@
    \c!rightquotation=\rightguillemot,
    \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
-\installlanguage [\s!persian] [\s!pe]
-\installlanguage [\s!fa]      [\s!pe] % these two are redundant but sometimes might
-\installlanguage [\s!farsi]   [\s!fa] % sound more natural .. best set labels to 'pe'
+\installlanguage [\s!fa]      [\s!farsi]
+\installlanguage [\s!persian] [\s!farsi]
+\installlanguage [\s!pe]      [\s!farsi]
 
 % Just aliases to "ar" for now
 
@@ -539,20 +555,23 @@
 
 \installlanguage
   [\s!esperanto]
-  [%\c!spacing=\v!packed,
-   %\c!leftsentence=\emdash,
-   %\c!rightsentence=\emdash,
-   %\c!leftsubsentence=\emdash,
-   %\c!rightsubsentence=\emdash,
-   %\c!leftquote=\lowerleftdoubleninequote,
-   %\c!rightquote=\upperrightdoublesixquote,
-   %\c!leftquotation=\lowerleftdoubleninequote,
-   %\c!rightquotation=\upperrightdoublesixquote,
-   %\c!date={\v!year,~m.,\space,\v!month,\space,\v!day,~d.},
+  [\c!spacing=\v!packed,
+   \c!leftsentence=\endash,
+   \c!rightsentence=\endash,
+   \c!leftsubsentence=\endash,
+   \c!rightsubsentence=\endash,
+   \c!leftquote=\upperleftsinglesixquote,         %U+2018,
+   \c!rightquote=\upperrightsingleninequote,      %U+2019,
+   \c!leftquotation=\upperleftdoublesixquote,     %U+201C,
+   \c!rightquotation=\upperrightdoubleninequote,  %U+201D,
+   \c!date={\v!year,~m.,\space,\v!month,\space,\v!day,~d.},
+   \c!date={\v!day-a\space de\space \v!month\space \v!year},
    \s!patterns=eo,
    \s!lefthyphenmin=2,
    \s!righthyphenmin=2]
 
+\installlanguage[\s!eo][\c!default=\s!esperanto]
+
 % Baltic Languages: Lettish/Latvian, Lietuvių/Lithuanian
 
 \installlanguage
diff --git a/tex/context/base/mkiv/lang-txt.lua b/tex/context/base/mkiv/lang-txt.lua
index 026abbd0e..faef79625 100644
--- a/tex/context/base/mkiv/lang-txt.lua
+++ b/tex/context/base/mkiv/lang-txt.lua
@@ -16,6 +16,9 @@ if not modules then modules = { } end modules ['lang-txt'] = {
 -- completed by numerous users. The following list is incomplete so feel
 -- free to send me corrections.
 --
+-- In 2020+ Tomas Hala and his students added some more languages and did 
+-- some extensive checking of the entries in this file. 
+--
 -- af    Afrikaans      ...
 -- ar    Arabic         Idris Samawi Hamid, Khaled Hosny
 -- be    Belarussian    Darya Hryshkavets (2019)
@@ -26,6 +29,7 @@ if not modules then modules = { } end modules ['lang-txt'] = {
 -- da    Danish         Arne Jorgensen
 -- de    German         Tobias Burnus, ...
 -- en    English        Hans Hagen, ...
+-- eo    Esperanto      Alain Delmotte (2021)
 -- es    Spanish        Andrés Montoya, ...
 -- et    Estonian       Clyde Johnston (2018)
 -- fi    Finish         ...
@@ -57,6 +61,7 @@ if not modules then modules = { } end modules ['lang-txt'] = {
 -- ua    Ukrainian      Olga Briginets, Alexander Bokovoy, Victor Figurnov, ...
 -- vi    Vietnamese     Han The Thanh
 
+
 -- For the moment we keep this table in memory. In the future we can then
 -- enable labels.
 
@@ -78,10 +83,11 @@ data.labels={
     ["be"]="У",
     ["bg"]="в",
     ["en"]="In",
+    ["eo"]="En",
     ["es"]="En",
+    ["fa"]="در",
     ["fr"]="Dans",
     ["mk"]="во",
-    ["pe"]="در",
     ["sr"]="У",
     ["sr-latn"]="U",
    },
@@ -92,10 +98,11 @@ data.labels={
     ["bg"]="номер",
     ["de"]="Numer",
     ["en"]="Number",
+    ["eo"]="Nombro",
+    ["fa"]="شماره",
     ["fr"]="Numéro",
     ["mk"]="Број",
     ["nl"]="Nummer",
-    ["pe"]="شماره",
     ["sr"]="Број",
     ["sr-latn"]="Broj",
    },
@@ -106,10 +113,11 @@ data.labels={
     ["bg"]="обем",
     ["de"]="Band",
     ["en"]="Volume",
+    ["eo"]="Volumo",
     ["et"]="Köide",
+    ["fa"]="جلد",
     ["mk"]="Том",
     ["nl"]="Deel",
-    ["pe"]="جلد",
     ["sr"]="Том",
     ["sr-latn"]="Tom",
    },
@@ -120,13 +128,14 @@ data.labels={
     ["bg"]="a",
     ["de"]="und",
     ["en"]="and",
+    ["eo"]="kaj",
     ["es"]="y",
     ["et"]="ja",
+    ["fa"]="و",
     ["fr"]="et",
     ["it"]="e",
     ["mk"]="и",
     ["nl"]="en",
-    ["pe"]="و",
     ["sr"]="и",
     ["sr-latn"]="i",
    },
@@ -137,13 +146,14 @@ data.labels={
     ["bg"]="издание",
     ["de"]="Auflage",
     ["en"]="edition",
+    ["eo"]="eldono",
     ["es"]="edición",
     ["et"]="väljaanne",
+    ["fa"]="ویرایش",
     ["fr"]="édition",
     ["it"]="edizione",
     ["mk"]="издание",
     ["nl"]="editie",
-    ["pe"]="ویرایش",
     ["sr"]="издање",
     ["sr-latn"]="izdanje",
    },
@@ -154,11 +164,12 @@ data.labels={
     ["bg"]="редактор",
     ["de"]="Herausgeber",
     ["en"]="editor",
+    ["eo"]="eldonisto",
     ["et"]="toimetaja",
+    ["fa"]="ویراستار",
     ["fr"]="éditeur",
     ["it"]="a cura di",
     ["mk"]="уредник",
-    ["pe"]="ویراستار",
     ["sr"]="уредник",
     ["sr-latn"]="urednik",
    },
@@ -169,6 +180,7 @@ data.labels={
     ["bg"]="редактори",
     ["de"]="Herausgeber",
     ["en"]="editors",
+    ["eo"]="eldonistoj",
     ["es"]="editores",
     ["et"]="toimetajad",
     ["fr"]="éditeurs",
@@ -183,10 +195,11 @@ data.labels={
     ["be"]="у",
     ["bg"]="в",
     ["en"]="in",
+    ["eo"]="en",
     ["es"]="en",
+    ["fa"]="در",
     ["fr"]="dans",
     ["mk"]="во",
-    ["pe"]="در",
     ["sr"]="у",
     ["sr-latn"]="u",
    },
@@ -197,13 +210,14 @@ data.labels={
     ["bg"]="дипломна работа",
     ["de"]="Masterarbeit",
     ["en"]="Master's thesis",
+    ["eo"]="Magistreca disertaĵo",
     ["es"]="Tesis de maestría",
     ["et"]="magistritöö",
+    ["fa"]="پایان‌نامه کارشناسی ارشد",
     ["fr"]="Thèse de master (DEA, DESS, master)",
     ["it"]="Tesi di laurea",
     ["mk"]="Магистерска дисертација",
     ["nl"]="Masterproef",
-    ["pe"]="پایان‌نامه کارشناسی ارشد",
     ["sr"]="Мастер дисертација",
     ["sr-latn"]="Master disertacija",
    },
@@ -214,10 +228,11 @@ data.labels={
     ["bg"]="номер",
     ["de"]="Numer",
     ["en"]="number",
+    ["eo"]="numero",
+    ["fa"]="شماره",
     ["fr"]="numéro",
     ["mk"]="број",
     ["nl"]="nummer",
-    ["pe"]="شماره",
     ["sr"]="број",
     ["sr-latn"]="broj",
    },
@@ -228,6 +243,7 @@ data.labels={
     ["bg"]="на",
     ["de"]="von",
     ["en"]="of",
+    ["eo"]="de",
     ["fr"]="de",
     ["mk"]="од",
     ["nl"]="van",
@@ -238,6 +254,7 @@ data.labels={
   ["others"]={
    ["labels"]={
     ["en"]="et al.",
+    ["eo"]="aliaj",
     ["et"]="jt",
     ["mk"]="и др.",
     ["sr"]="и др.",
@@ -249,9 +266,10 @@ data.labels={
     ["be"]="стар.",
     ["de"]="S.",
     ["en"]="p.",
+    ["eo"]="p.",
     ["et"]="lk",
+    ["fa"]="ص",
     ["mk"]="стр.",
-    ["pe"]="ص",
     ["sr"]="стр.",
     ["sr-latn"]="str.",
    },
@@ -262,10 +280,11 @@ data.labels={
     ["bg"]="страни",
     ["de"]="Seiten",
     ["en"]="pages",
+    ["eo"]="paĝoj",
     ["et"]="leheküljed",
+    ["fa"]="صفحات",
     ["mk"]="страници",
     ["nl"]="paginas",
-    ["pe"]="صفحات",
     ["sr"]="страницa",
     ["sr-latn"]="stranica",
    },
@@ -276,6 +295,7 @@ data.labels={
     ["bg"]="патент",
     ["de"]="Patent",
     ["en"]="Patent",
+    ["eo"]="Patento",
     ["es"]="Patente",
     ["et"]="Patent",
     ["fr"]="Brevet",
@@ -292,13 +312,14 @@ data.labels={
     ["bg"]="дисертачна работа",
     ["de"]="Dissertation",
     ["en"]="PhD thesis",
+    ["eo"]="Doktoriĝa disertaĵo",
     ["es"]="Tesis doctoral",
     ["et"]="doktoritöö",
+    ["fa"]="رساله دکتری",
     ["fr"]="Thèse de doctorat",
     ["it"]="Tesi di dottorato",
     ["mk"]="Докторска дисертација",
     ["nl"]="Proefschrift",
-    ["pe"]="رساله دکتری",
     ["sr"]="Докторска дисертација",
     ["sr-latn"]="Doktorska disertacija",
    },
@@ -307,9 +328,10 @@ data.labels={
    ["labels"]={
     ["de"]="S.",
     ["en"]="pp.",
+    ["eo"]="pp.",
     ["et"]="lk-d",
+    ["fa"]="صص",
     ["mk"]="стр.",
-    ["pe"]="صص",
     ["sr"]="стр.",
     ["sr-latn"]="str.",
    },
@@ -320,13 +342,14 @@ data.labels={
     ["bg"]="технически доклад",
     ["de"]="Technischer Bericht",
     ["en"]="Technical report",
+    ["eo"]="Teknika raporto",
     ["es"]="Informe técnico",
     ["et"]="tehniline raport",
+    ["fa"]="گزارش فنی",
     ["fr"]="Rapport technique",
     ["it"]="Relazione tecnica",
     ["mk"]="Технички извештај",
     ["nl"]="Technisch rapport",
-    ["pe"]="گزارش فنی",
     ["sr"]="Технички извештај",
     ["sr-latn"]="Tehnički izveštaj",
    },
@@ -337,10 +360,11 @@ data.labels={
     ["bg"]="обем",
     ["de"]="Band",
     ["en"]="volume",
+    ["eo"]="volumo",
     ["et"]="köide",
+    ["fa"]="جلد",
     ["mk"]="том",
     ["nl"]="deel",
-    ["pe"]="جلد",
     ["sr"]="том",
     ["sr-latn"]="tom",
    },
@@ -351,6 +375,7 @@ data.labels={
     ["bg"]="със",
     ["de"]="mit",
     ["en"]="with",
+    ["eo"]="kun",
     ["es"]="con",
     ["et"]="koos",
     ["fr"]="avec",
@@ -367,6 +392,7 @@ data.labels={
    ["labels"]={
     ["cs"]="P",
     ["en"]="Pr",
+    ["eo"]="P",
     ["mk"]="P",
     ["sk"]="P",
     ["sr"]="P",
@@ -377,6 +403,7 @@ data.labels={
    ["labels"]={
     ["cs"]="arccos",
     ["en"]="arccos",
+    ["eo"]="arccos",
     ["es"]="arc\\sixperemspace cos",
     ["hr"]="arc\\sixperemspace cos",
     ["mk"]="arccos",
@@ -390,6 +417,7 @@ data.labels={
    ["labels"]={
     ["cs"]="arccosh",
     ["en"]="arccosh",
+    ["eo"]="arccosh",
     ["es"]="arc\\sixperemspace cosh",
     ["hr"]="arc\\sixperemspace cosh",
     ["mk"]="arccosh",
@@ -403,6 +431,7 @@ data.labels={
    ["labels"]={
     ["cs"]="arccotg",
     ["en"]="arccot",
+    ["eo"]="arcctan",
     ["es"]="arc\\sixperemspace cot",
     ["hr"]="arc\\sixperemspace ctg",
     ["mk"]="arccotg",
@@ -416,6 +445,7 @@ data.labels={
    ["labels"]={
     ["cs"]="arcsin",
     ["en"]="arcsin",
+    ["eo"]="arcsin",
     ["es"]="arc\\sixperemspace sen",
     ["hr"]="arc\\sixperemspace sin",
     ["mk"]="arcsin",
@@ -429,6 +459,7 @@ data.labels={
    ["labels"]={
     ["cs"]="arcsinh",
     ["en"]="arcsinh",
+    ["eo"]="arcsinh",
     ["es"]="arc\\sixperemspace senh",
     ["hr"]="arc\\sixperemspace sinh",
     ["mk"]="arcsinh",
@@ -442,6 +473,7 @@ data.labels={
    ["labels"]={
     ["cs"]="arctg",
     ["en"]="arctan",
+    ["eo"]="arctang",
     ["es"]="arc\\sixperemspace tan",
     ["hr"]="arc\\sixperemspace tg",
     ["mk"]="arctg",
@@ -455,6 +487,7 @@ data.labels={
    ["labels"]={
     ["cs"]="arctgh",
     ["en"]="arctanh",
+    ["eo"]="arctanh",
     ["es"]="arc\\sixperemspace tanh",
     ["hr"]="arc\\sixperemspace tgh",
     ["mk"]="arctgh",
@@ -468,6 +501,7 @@ data.labels={
    ["labels"]={
     ["cs"]="arg",
     ["en"]="arg",
+    ["eo"]="arg",
     ["es"]="arg",
     ["mk"]="arg",
     ["sk"]="arg",
@@ -479,6 +513,7 @@ data.labels={
    ["labels"]={
     ["cs"]="cos",
     ["en"]="cos",
+    ["eo"]="cos",
     ["es"]="cos",
     ["mk"]="cos",
     ["sk"]="cos",
@@ -490,6 +525,7 @@ data.labels={
    ["labels"]={
     ["cs"]="cosh",
     ["en"]="cosh",
+    ["eo"]="cosh",
     ["es"]="cosh",
     ["mk"]="cosh",
     ["sk"]="cosh",
@@ -501,6 +537,7 @@ data.labels={
    ["labels"]={
     ["cs"]="cotg",
     ["en"]="cot",
+    ["eo"]="cotan",
     ["es"]="cot",
     ["hr"]="ctg",
     ["mk"]="ctg",
@@ -514,6 +551,7 @@ data.labels={
    ["labels"]={
     ["cs"]="cotgh",
     ["en"]="coth",
+    ["eo"]="cotanh",
     ["es"]="coth",
     ["mk"]="ctgh",
     ["sk"]="cotgh",
@@ -525,6 +563,7 @@ data.labels={
    ["labels"]={
     ["cs"]="cosec",
     ["en"]="csc",
+    ["eo"]="cosec",
     ["es"]="csc",
     ["mk"]="cosec",
     ["sk"]="cosec",
@@ -536,6 +575,7 @@ data.labels={
    ["labels"]={
     ["cs"]="cotg",
     ["en"]="cot",
+    ["eo"]="cotan",
     ["es"]="cot",
     ["hr"]="ctg",
     ["mk"]="ctg",
@@ -549,6 +589,7 @@ data.labels={
    ["labels"]={
     ["cs"]="deg",
     ["en"]="deg",
+    ["eo"]="gr",
     ["es"]="gr",
     ["mk"]="deg",
     ["sk"]="deg",
@@ -560,6 +601,7 @@ data.labels={
    ["labels"]={
     ["cs"]="det",
     ["en"]="det",
+    ["eo"]="det",
     ["es"]="det",
     ["sk"]="det",
     ["sr"]="det",
@@ -569,12 +611,14 @@ data.labels={
   ["diff"]={
    ["labels"]={
     ["en"]="d",
+    ["eo"]="dif",
    },
   },
   ["dim"]={
    ["labels"]={
     ["cs"]="dim",
     ["en"]="dim",
+    ["eo"]="dim",
     ["es"]="dim",
     ["mk"]="dim",
     ["sk"]="dim",
@@ -586,6 +630,7 @@ data.labels={
    ["labels"]={
     ["cs"]="exp",
     ["en"]="exp",
+    ["eo"]="eksp",
     ["es"]="exp",
     ["sk"]="exp",
     ["sr"]="exp",
@@ -596,6 +641,7 @@ data.labels={
    ["labels"]={
     ["cs"]="NSD",
     ["en"]="gcd",
+    ["eo"]="",
     ["es"]="mcd",
     ["hr"]="nzd",
     ["mk"]="НЗД",
@@ -609,6 +655,7 @@ data.labels={
    ["labels"]={
     ["cs"]="Hom",
     ["en"]="hom",
+    ["eo"]="hom",
     ["es"]="hom",
     ["sk"]="Hom",
    },
@@ -617,6 +664,7 @@ data.labels={
    ["labels"]={
     ["cs"]="inf",
     ["en"]="inf",
+    ["eo"]="inf",
     ["es"]="inf",
     ["mk"]="inf",
     ["sk"]="inf",
@@ -628,6 +676,7 @@ data.labels={
    ["labels"]={
     ["cs"]="inj\\sixperemspace lim",
     ["en"]="inj\\sixperemspace lim",
+    ["eo"]="",
     ["es"]="lím\\sixperemspace iny",
     ["sk"]="inj\\sixperemspace lim",
     ["sr"]="inj\\sixperemspace lim",
@@ -638,6 +687,7 @@ data.labels={
    ["labels"]={
     ["cs"]="ker",
     ["en"]="ker",
+    ["eo"]="",
     ["es"]="Ker",
     ["sk"]="ker",
     ["sr"]="ker",
@@ -648,6 +698,7 @@ data.labels={
    ["labels"]={
     ["cs"]="NSN",
     ["en"]="lcm",
+    ["eo"]="",
     ["es"]="MCM",
     ["hr"]="nzv",
     ["mk"]="НЗС",
@@ -661,6 +712,7 @@ data.labels={
    ["labels"]={
     ["cs"]="log",
     ["en"]="lg",
+    ["eo"]="log",
     ["es"]="log",
     ["mk"]="lg",
     ["sk"]="log",
@@ -672,6 +724,7 @@ data.labels={
    ["labels"]={
     ["cs"]="lim",
     ["en"]="lim",
+    ["eo"]="lim",
     ["es"]="lím",
     ["mk"]="lim",
     ["sk"]="lim",
@@ -683,6 +736,7 @@ data.labels={
    ["labels"]={
     ["cs"]="lim\\sixperemspace inf",
     ["en"]="lim\\sixperemspace inf",
+    ["eo"]="subinf",
     ["es"]="lím\\sixperemspace inf",
     ["mk"]="lim\\sixperemspace inf",
     ["sk"]="lim\\sixperemspace inf",
@@ -694,6 +748,7 @@ data.labels={
    ["labels"]={
     ["cs"]="lim\\sixperemspace sup",
     ["en"]="lim\\sixperemspace sup",
+    ["eo"]="suplim",
     ["es"]="lím\\sixperemspace sup",
     ["mk"]="lim\\sixperemspace sup",
     ["sk"]="lim\\sixperemspace sup",
@@ -705,6 +760,7 @@ data.labels={
    ["labels"]={
     ["cs"]="ln",
     ["en"]="ln",
+    ["eo"]="ln",
     ["es"]="ln",
     ["mk"]="ln",
     ["sk"]="ln",
@@ -716,6 +772,7 @@ data.labels={
    ["labels"]={
     ["cs"]="log",
     ["en"]="log",
+    ["eo"]="log",
     ["es"]="log",
     ["mk"]="log",
     ["sk"]="log",
@@ -727,6 +784,7 @@ data.labels={
    ["labels"]={
     ["cs"]="max",
     ["en"]="max",
+    ["eo"]="maks",
     ["es"]="máx",
     ["mk"]="max",
     ["sk"]="max",
@@ -738,6 +796,7 @@ data.labels={
    ["labels"]={
     ["cs"]="\\tilde",
     ["en"]="median",
+    ["eo"]="mediano",
     ["es"]="Mediana",
     ["sk"]="\\tilde",
     ["sr"]="median",
@@ -748,6 +807,7 @@ data.labels={
    ["labels"]={
     ["cs"]="min",
     ["en"]="min",
+    ["eo"]="min",
     ["es"]="mín",
     ["mk"]="min",
     ["sk"]="min",
@@ -759,6 +819,7 @@ data.labels={
    ["labels"]={
     ["cs"]="mod",
     ["en"]="mod",
+    ["eo"]="mod",
     ["es"]="mod",
     ["mk"]="mod",
     ["sk"]="mod",
@@ -770,6 +831,7 @@ data.labels={
    ["labels"]={
     ["cs"]="proj\\sixperemspace lim",
     ["en"]="proj\\sixperemspace lim",
+    ["eo"]="",
     ["es"]="lím\\sixperemspace proy",
     ["sk"]="proj\\sixperemspace lim",
     ["sr"]="proj\\sixperemspace lim",
@@ -780,6 +842,7 @@ data.labels={
    ["labels"]={
     ["cs"]="sec",
     ["en"]="sec",
+    ["eo"]="sek",
     ["es"]="sec",
     ["mk"]="sec",
     ["sk"]="sec",
@@ -791,6 +854,7 @@ data.labels={
    ["labels"]={
     ["cs"]="sin",
     ["en"]="sin",
+    ["eo"]="sin",
     ["es"]="sen",
     ["mk"]="sin",
     ["sk"]="sin",
@@ -802,6 +866,7 @@ data.labels={
    ["labels"]={
     ["cs"]="sinh",
     ["en"]="sinh",
+    ["eo"]="sinh",
     ["es"]="senh",
     ["mk"]="sinh",
     ["sk"]="sinh",
@@ -813,6 +878,7 @@ data.labels={
    ["labels"]={
     ["cs"]="sup",
     ["en"]="sup",
+    ["eo"]="sup",
     ["es"]="sup",
     ["mk"]="sup",
     ["sk"]="sup",
@@ -824,6 +890,7 @@ data.labels={
    ["labels"]={
     ["cs"]="tg",
     ["en"]="tan",
+    ["eo"]="tan",
     ["es"]="tan",
     ["hr"]="tg",
     ["mk"]="tg",
@@ -837,6 +904,7 @@ data.labels={
    ["labels"]={
     ["cs"]="tgh",
     ["en"]="tanh",
+    ["eo"]="tanh",
     ["es"]="tanh",
     ["mk"]="tgh",
     ["sk"]="tgh",
@@ -854,10 +922,12 @@ data.labels={
     ["da"]="",
     ["de"]=" und ",
     ["en"]=" and ",
+    ["eo"]=" kaj ",
     ["es"]=" y ",
     ["et"]=" ja ",
+    ["fa"]=" و ",
     ["fi"]="",
-    ["fr"]="",
+    ["fr"]=" et ",
     ["gr"]="",
     ["hr"]=" i ",
     ["hu"]=" és ",
@@ -868,7 +938,6 @@ data.labels={
     ["nb"]="",
     ["nl"]=" en ",
     ["nn"]="",
-    ["pe"]=" و ",
     ["pl"]=" i ",
     ["pt"]="",
     ["ro"]="",
@@ -895,8 +964,10 @@ data.labels={
     ["da"]="Bilag ",
     ["de"]="Anhang ",
     ["en"]="Appendix ",
+    ["eo"]="Anekso",
     ["es"]="Apéndice ",
     ["et"]="Lisa ",
+    ["fa"]="پیوست ",
     ["fi"]="",
     ["fr"]="Annexe ",
     ["gr"]="Παράρτημα",
@@ -911,7 +982,6 @@ data.labels={
     ["nb"]="Tillegg ",
     ["nl"]="",
     ["nn"]="Tillegg ",
-    ["pe"]="پیوست ",
     ["pl"]="Dodatek ",
     ["pt"]="",
     ["ro"]="",
@@ -941,8 +1011,10 @@ data.labels={
     ["da"]="april",
     ["de"]="April",
     ["en"]="April",
+    ["eo"]="Aprilo",
     ["es"]="abril",
     ["et"]="aprill",
+    ["fa"]="آوریل",
     ["fi"]="huhtikuu",
     ["fr"]="avril",
     ["gr"]="Απρίλιος",
@@ -957,7 +1029,6 @@ data.labels={
     ["nb"]="april",
     ["nl"]="april",
     ["nn"]="april",
-    ["pe"]="آوریل",
     ["pl"]="kwietnia",
     ["pt"]="abril",
     ["ro"]="aprilie",
@@ -982,11 +1053,13 @@ data.labels={
   ["april:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="апр.",
     ["ca"]="",
     ["cs"]="dub.",
     ["da"]="",
     ["de"]="Apr.",
     ["en"]="apr",
+    ["eo"]="Apr.",
     ["es"]="abr.",
     ["et"]="apr",
     ["fi"]="",
@@ -1007,8 +1080,8 @@ data.labels={
     ["ru"]="",
     ["sk"]="apr.",
     ["sl"]="",
-    ["sr"]="апр.",
-    ["sr-latn"]="apr.",
+    ["sr"]="апр",
+    ["sr-latn"]="apr",
     ["sv"]="",
     ["tk"]="",
     ["tr"]="",
@@ -1025,8 +1098,10 @@ data.labels={
     ["da"]="på side ",
     ["de"]="auf Seite ",
     ["en"]="at page ",
+    ["eo"]="je paĝo",
     ["es"]="en la página ",
     ["et"]="leheküljel ",
+    ["fa"]="در صفحه ",
     ["fi"]="",
     ["fr"]="à la page ",
     ["gr"]="",
@@ -1039,7 +1114,6 @@ data.labels={
     ["nb"]="på side ",
     ["nl"]="op pagina ",
     ["nn"]="på side ",
-    ["pe"]="در صفحه ",
     ["pl"]="na stronie ",
     ["pt"]="",
     ["ro"]="",
@@ -1070,8 +1144,10 @@ data.labels={
     ["da"]="august",
     ["de"]="August",
     ["en"]="August",
+    ["eo"]="Aŭgusto",
     ["es"]="agosto",
     ["et"]="august",
+    ["fa"]="اوت",
     ["fi"]="elokuu",
     ["fr"]="août",
     ["gr"]="Αύγουστος",
@@ -1086,7 +1162,6 @@ data.labels={
     ["nb"]="august",
     ["nl"]="augustus",
     ["nn"]="august",
-    ["pe"]="اوت",
     ["pl"]="sierpnia",
     ["pt"]="agosto",
     ["ro"]="august",
@@ -1111,11 +1186,13 @@ data.labels={
   ["august:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="авг.",
     ["ca"]="",
     ["cs"]="srp.",
     ["da"]="",
     ["de"]="Aug.",
     ["en"]="aug",
+    ["eo"]="Aŭg.",
     ["es"]="ago.",
     ["et"]="aug",
     ["fi"]="",
@@ -1136,8 +1213,8 @@ data.labels={
     ["ru"]="",
     ["sk"]="aug.",
     ["sl"]="",
-    ["sr"]="авг.",
-    ["sr-latn"]="avg.",
+    ["sr"]="авг",
+    ["sr-latn"]="avg",
     ["sv"]="",
     ["tk"]="",
     ["tr"]="",
@@ -1158,8 +1235,10 @@ data.labels={
     ["da"]="",
     ["de"]="Kapitel ",
     ["en"]="Chapter ",
+    ["eo"]="Ĉapitro",
     ["es"]="Capítulo ",
     ["et"]="Peatükk ",
+    ["fa"]="فصل ",
     ["fi"]="",
     ["fr"]="Chapitre ",
     ["gr"]="Κεφάλαιο",
@@ -1174,14 +1253,12 @@ data.labels={
     ["nb"]="",
     ["nl"]="",
     ["nn"]="",
-    ["pe"]="فصل ",
     ["pl"]="Rozdział ",
     ["pt"]="",
     ["ro"]="",
     ["ru"]="",
     ["sk"]="Kapitola ",
     ["sl"]="Poglavje ",
-    ["sr"]="Поглавље ",
     ["sr"]="Глава ",
     ["sr-latn"]="Glava ",
     ["sv"]="",
@@ -1201,8 +1278,10 @@ data.labels={
     ["da"]="",
     ["de"]="",
     ["en"]=" (continued)",
+    ["eo"]=" (daŭrigota)",
     ["es"]=" (continúa)",
     ["et"]=" (jätkub)",
+    ["fa"]="(ادامه دارد)",
     ["fi"]="",
     ["fr"]="",
     ["gr"]="",
@@ -1215,14 +1294,12 @@ data.labels={
     ["nb"]="",
     ["nl"]=" (vervolgd)",
     ["nn"]="",
-    ["pe"]="(ادامه دارد)",
     ["pl"]="",
     ["pt"]="",
     ["ro"]="",
     ["ru"]="",
     ["sk"]=" (pokračovanie)",
     ["sl"]="",
-    ["sr"]=" (наставио)",
     ["sr"]=" (наставак)",
     ["sr-latn"]=" (nastavak)",
     ["sv"]="",
@@ -1236,11 +1313,12 @@ data.labels={
    ["labels"]={
     ["bg"]="ден",
     ["en"]="day",
+    ["eo"]="tago",
     ["et"]="päev",
+    ["fa"]="روز",
     ["kr"]="일",
     ["mk"]="ден",
     ["nl"]="dag",
-    ["pe"]="روز",
     ["sr"]="дан",
     ["sr-latn"]="dan",
    },
@@ -1259,8 +1337,10 @@ data.labels={
     ["da"]="december",
     ["de"]="Dezember",
     ["en"]="December",
+    ["eo"]="Decembro",
     ["es"]="diciembre",
     ["et"]="detsember",
+    ["fa"]="دسامبر",
     ["fi"]="joulukuu",
     ["fr"]="décembre",
     ["gr"]="Δεκέμβριος",
@@ -1275,7 +1355,6 @@ data.labels={
     ["nb"]="desember",
     ["nl"]="december",
     ["nn"]="desember",
-    ["pe"]="دسامبر",
     ["pl"]="grudnia",
     ["pt"]="dezembro",
     ["ro"]="decembrie",
@@ -1300,11 +1379,13 @@ data.labels={
   ["december:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="дек.",
     ["ca"]="",
     ["cs"]="pros.",
     ["da"]="",
     ["de"]="Dez.",
     ["en"]="dec",
+    ["eo"]="Dec.",
     ["es"]="dic.",
     ["et"]="dets",
     ["fi"]="",
@@ -1325,8 +1406,8 @@ data.labels={
     ["ru"]="",
     ["sk"]="dec.",
     ["sl"]="",
-    ["sr"]="дец.",
-    ["sr-latn"]="dec.",
+    ["sr"]="дец",
+    ["sr-latn"]="dec",
     ["sv"]="",
     ["tk"]="",
     ["tr"]="",
@@ -1348,8 +1429,10 @@ data.labels={
     ["da"]="februar",
     ["de"]="Februar",
     ["en"]="February",
+    ["eo"]="Februaro",
     ["es"]="febrero",
     ["et"]="veebruar",
+    ["fa"]="فوریه",
     ["fi"]="helmikuu",
     ["fr"]="février",
     ["gr"]="Φεβρουάριος",
@@ -1364,7 +1447,6 @@ data.labels={
     ["nb"]="februar",
     ["nl"]="februari",
     ["nn"]="februar",
-    ["pe"]="فوریه",
     ["pl"]="lutego",
     ["pt"]="fevereiro",
     ["ro"]="februarie",
@@ -1389,11 +1471,13 @@ data.labels={
   ["february:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="февр.",
     ["ca"]="",
     ["cs"]="ún.",
     ["da"]="",
     ["de"]="Feb.",
     ["en"]="feb",
+    ["eo"]="Feb.",
     ["es"]="feb.",
     ["et"]="veebr",
     ["fi"]="",
@@ -1414,8 +1498,8 @@ data.labels={
     ["ru"]="",
     ["sk"]="feb.",
     ["sl"]="",
-    ["sr"]="феб.",
-    ["sr-latn"]="feb.",
+    ["sr"]="феб",
+    ["sr-latn"]="feb",
     ["sv"]="",
     ["tk"]="",
     ["tr"]="",
@@ -1435,8 +1519,10 @@ data.labels={
     ["da"]="Figur ",
     ["de"]="Abbildung ",
     ["en"]="Figure ",
+    ["eo"]="Figuro ",
     ["es"]="Figura ",
     ["et"]="Joonis ",
+    ["fa"]="شکل ",
     ["fi"]="Kuva ",
     ["fr"]="Figure ",
     ["gr"]="Σχήμα",
@@ -1451,7 +1537,6 @@ data.labels={
     ["nb"]="Figur ",
     ["nl"]="Figuur ",
     ["nn"]="Figur ",
-    ["pe"]="شکل ",
     ["pl"]="Ilustracja ",
     ["pt"]="Figura ",
     ["ro"]="Figura ",
@@ -1470,22 +1555,25 @@ data.labels={
   ["following:plural"]={
    ["labels"]={
     ["en"]="ff.",
+    ["eo"]="sekvv",
     ["fr"]=hairspace .. "sqq",
    },
   },
   ["following:singular"]={
    ["labels"]={
     ["en"]="f.",
+    ["eo"]="sekv",
     ["fr"]=hairspace .. "sq",
    },
   },
   ["followingpage"]={
    ["labels"]={
     ["en"]="on a following page",
+    ["eo"]="je sekvanta paĝo",
     ["et"]="järgmisel leheküljel",
+    ["fa"]="در صفحات آینده",
     ["mk"]="на следната страница",
     ["nl"]="op een volgende bladzijde",
-    ["pe"]="در صفحات آینده",
     ["sr"]="на следећој страници",
     ["sr-latn"]="na sledećoj stranici",
    },
@@ -1502,8 +1590,10 @@ data.labels={
     ["da"]="fredag",
     ["de"]="Freitag",
     ["en"]="Friday",
+    ["eo"]="vendredo",
     ["es"]="viernes",
     ["et"]="reede",
+    ["fa"]="جمعه",
     ["fi"]="perjantai",
     ["fr"]="vendredi",
     ["gr"]="Παρασκευή",
@@ -1518,7 +1608,6 @@ data.labels={
     ["nb"]="fredag",
     ["nl"]="vrijdag",
     ["nn"]="fredag",
-    ["pe"]="جمعه",
     ["pl"]="piątek",
     ["pt"]="sexta-feira",
     ["ro"]="vineri",
@@ -1536,10 +1625,14 @@ data.labels={
   },
   ["friday:mnem"]={
    ["labels"]={
+    ["bg"]="пт",
+    ["cs"]="pá",
     ["de"]="Fr.",
     ["en"]="fri",
-    ["sr"]="пет.",
-    ["sr-latn"]="pet.",
+    ["eo"]="ven.",
+    ["sk"]="pi",
+    ["sr"]="пет",
+    ["sr-latn"]="pet",
    },
   },
   ["graphic"]={
@@ -1554,8 +1647,10 @@ data.labels={
     ["da"]="Grafik ",
     ["de"]="Graphik ",
     ["en"]="Graphic ",
+    ["eo"]="Grafiko",
     ["es"]="Gráfico ",
     ["et"]="Pilt ",
+    ["fa"]="طرح ",
     ["fi"]="Grafiikka ",
     ["fr"]="Illustration ",
     ["gr"]="Γραφικό",
@@ -1569,7 +1664,6 @@ data.labels={
     ["nb"]="Bilde ",
     ["nl"]="Grafiek ",
     ["nn"]="Bilete ",
-    ["pe"]="طرح ",
     ["pl"]="Grafika ",
     ["pt"]="Gráfico ",
     ["ro"]="Graficul ",
@@ -1589,14 +1683,17 @@ data.labels={
    ["labels"]={
     ["af"]="",
     ["ar"]="كما وضحنا سابقا",
-    ["be"]="Графіка",
+    ["be"]="гл. вышэй",
+    ["bg"]="виж по-горе",
     ["ca"]="",
     ["cs"]="viz výše",
     ["da"]="se foroven",
     ["de"]="siehe oben",
     ["en"]="as we show above",
+    ["eo"]="laŭsupre",
     ["es"]="como se muestra arriba",
     ["et"]="nii nagu üleval näidatud",
+    ["fa"]="چنان‌که شرح دادیم",
     ["fi"]="",
     ["fr"]="ci-dessus",
     ["gr"]="",
@@ -1610,14 +1707,12 @@ data.labels={
     ["nb"]="som vist over",
     ["nl"]="hierboven",
     ["nn"]="som vist over",
-    ["pe"]="چنان‌که شرح دادیم",
     ["pl"]="jak pokazano wyżej",
     ["pt"]="",
     ["ro"]="",
     ["ru"]="см. выше",
     ["sk"]="pozri hore",
     ["sl"]="glej zgoraj",
-    ["sr"]="види горе",
     ["sr"]="као што је показано изнад",
     ["sr-latn"]="kao što je pokazano iznad",
     ["sv"]="se ovan",
@@ -1631,15 +1726,17 @@ data.labels={
    ["labels"]={
     ["af"]="",
     ["ar"]="كما نوضح لاحقا",
-    ["be"]="гл. вышэй",
+    ["be"]="гл. ніжэй",
     ["bg"]="ў далейшым",
     ["ca"]="",
     ["cs"]="viz níže",
     ["da"]="se forneden",
     ["de"]="siehe unten",
     ["en"]="as we show below",
+    ["eo"]="laŭsube",
     ["es"]="como se muestra abajo",
     ["et"]="nii nagu all näidatud",
+    ["fa"]="چنان‌که شرح خواهیم داد",
     ["fi"]="",
     ["fr"]="ci-dessous",
     ["gr"]="",
@@ -1653,14 +1750,12 @@ data.labels={
     ["nb"]="som vist under",
     ["nl"]="hieronder",
     ["nn"]="som vist under",
-    ["pe"]="چنان‌که شرح خواهیم داد",
     ["pl"]="jak pokazano niżej",
     ["pt"]="",
     ["ro"]="",
     ["ru"]="см. ниже",
     ["sk"]="pozri ďalej",
     ["sl"]="glej spodaj",
-    ["sr"]="види доле",
     ["sr"]="као што је показано ниже",
     ["sr-latn"]="kao što je pokazano niže",
     ["sv"]="se nedan",
@@ -1674,14 +1769,15 @@ data.labels={
    ["labels"]={
     ["af"]="Intermezzo ",
     ["ar"]="فسحة ",
-    ["be"]="Устаўка",
-    ["bg"]="Aнтракт ",
+    ["be"]="Інтэрмецца ",
+    ["bg"]="Интермецо ",
     ["ca"]="Intermedi ",
     ["cn"]="퉣",
     ["cs"]="Intermezzo ",
     ["da"]="Intermezzo ",
     ["de"]="Intermezzo ",
     ["en"]="Intermezzo ",
+    ["eo"]="Intermezo",
     ["es"]="Intermedio ",
     ["et"]="Vahemäng ",
     ["fi"]="Intermezzo ",
@@ -1704,7 +1800,6 @@ data.labels={
     ["ru"]="Вставка ",
     ["sk"]="Intermezzo ",
     ["sl"]="Intermezzo ",
-    ["sr"]="Интермеззо ",
     ["sr"]="Дигресија ",
     ["sr-latn"]="Digresija ",
     ["sv"]="Intermezzo ",
@@ -1728,8 +1823,10 @@ data.labels={
     ["da"]="januar",
     ["de"]="Januar",
     ["en"]="January",
+    ["eo"]="Januaro",
     ["es"]="enero",
     ["et"]="jaanuar",
+    ["fa"]="ژانویه",
     ["fi"]="tammikuu",
     ["fr"]="janvier",
     ["gr"]="Ιανουάριος",
@@ -1744,7 +1841,6 @@ data.labels={
     ["nb"]="januar",
     ["nl"]="januari",
     ["nn"]="januar",
-    ["pe"]="ژانویه",
     ["pl"]="stycznia",
     ["pt"]="janeiro",
     ["ro"]="ianuarie",
@@ -1769,11 +1865,13 @@ data.labels={
   ["january:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="ян.",
     ["ca"]="",
     ["cs"]="led.",
     ["da"]="",
     ["de"]="Jan.",
     ["en"]="jan",
+    ["eo"]="Jan.",
     ["es"]="ene.",
     ["et"]="jaan",
     ["fi"]="",
@@ -1794,8 +1892,8 @@ data.labels={
     ["ru"]="",
     ["sk"]="jan.",
     ["sl"]="",
-    ["sr"]="јан.",
-    ["sr-latn"]="jan.",
+    ["sr"]="јан",
+    ["sr-latn"]="jan",
     ["sv"]="",
     ["tk"]="",
     ["tr"]="",
@@ -1818,8 +1916,10 @@ data.labels={
     ["da"]="juli",
     ["de"]="Juli",
     ["en"]="July",
+    ["eo"]="Julio",
     ["es"]="julio",
     ["et"]="juuli",
+    ["fa"]="ژوئیه",
     ["fi"]="heinäkuu",
     ["fr"]="juillet",
     ["gr"]="Ιούλιος",
@@ -1834,7 +1934,6 @@ data.labels={
     ["nb"]="juli",
     ["nl"]="juli",
     ["nn"]="juli",
-    ["pe"]="ژوئیه",
     ["pl"]="lipca",
     ["pt"]="julho",
     ["ro"]="iulie",
@@ -1859,11 +1958,13 @@ data.labels={
   ["july:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="юли",
     ["ca"]="",
     ["cs"]="čce",
     ["da"]="",
     ["de"]="Jul.",
     ["en"]="jul",
+    ["eo"]="Jul.",
     ["es"]="jul.",
     ["et"]="juuli",
     ["fi"]="",
@@ -1884,8 +1985,8 @@ data.labels={
     ["ru"]="",
     ["sk"]="júla",
     ["sl"]="",
-    ["sr"]="јул.",
-    ["sr-latn"]="jul.",
+    ["sr"]="јул",
+    ["sr-latn"]="jul",
     ["sv"]="",
     ["tk"]="",
     ["tr"]="",
@@ -1907,8 +2008,10 @@ data.labels={
     ["da"]="juni",
     ["de"]="Juni",
     ["en"]="June",
+    ["eo"]="Junio",
     ["es"]="junio",
     ["et"]="juuni",
+    ["fa"]="ژوئن",
     ["fi"]="kesäkuu",
     ["fr"]="juin",
     ["gr"]="Ιούνιος",
@@ -1923,7 +2026,6 @@ data.labels={
     ["nb"]="juni",
     ["nl"]="juni",
     ["nn"]="juni",
-    ["pe"]="ژوئن",
     ["pl"]="czerwca",
     ["pt"]="junho",
     ["ro"]="iunie",
@@ -1948,11 +2050,13 @@ data.labels={
   ["june:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="юни",
     ["ca"]="",
     ["cs"]="čer.",
     ["da"]="",
     ["de"]="Jun.",
     ["en"]="jun",
+    ["eo"]="Jun.",
     ["es"]="jun.",
     ["et"]="juuni",
     ["fi"]="",
@@ -1994,8 +2098,10 @@ data.labels={
     ["da"]="linie ",
     ["de"]="Zeile ",
     ["en"]="line ",
+    ["eo"]="linio ",
     ["es"]="línea ",
     ["et"]="joon ",
+    ["fa"]="سطر ",
     ["fi"]="rivi ",
     ["fr"]="ligne ",
     ["gr"]="Γραμμή",
@@ -2010,7 +2116,6 @@ data.labels={
     ["nb"]="linje ",
     ["nl"]="regel ",
     ["nn"]="linje ",
-    ["pe"]="سطر ",
     ["pl"]="wiersz ",
     ["pt"]="linha ",
     ["ro"]="linia ",
@@ -2038,8 +2143,10 @@ data.labels={
     ["da"]="linier ",
     ["de"]="Zeilen ",
     ["en"]="lines ",
+    ["eo"]="linioj ",
     ["es"]="líneas ",
     ["et"]="jooned ",
+    ["fa"]="سطرهای ",
     ["fi"]="rivie ",
     ["fr"]="lignes ",
     ["gr"]="Γραμμές",
@@ -2054,7 +2161,6 @@ data.labels={
     ["nb"]="linjer ",
     ["nl"]="regels ",
     ["nn"]="linjer ",
-    ["pe"]="سطرهای ",
     ["pl"]="wiersze ",
     ["pt"]="linhas ",
     ["ro"]="liniile ",
@@ -2083,8 +2189,10 @@ data.labels={
     ["da"]="marts",
     ["de"]="März",
     ["en"]="March",
+    ["eo"]="Marto",
     ["es"]="marzo",
     ["et"]="märts",
+    ["fa"]="مارس",
     ["fi"]="maaliskuu",
     ["fr"]="mars",
     ["gr"]="Μάρτιος",
@@ -2099,7 +2207,6 @@ data.labels={
     ["nb"]="mars",
     ["nl"]="maart",
     ["nn"]="mars",
-    ["pe"]="مارس",
     ["pl"]="marca",
     ["pt"]="março",
     ["ro"]="martie",
@@ -2124,11 +2231,13 @@ data.labels={
   ["march:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="март",
     ["ca"]="",
     ["cs"]="břez.",
     ["da"]="",
     ["de"]="Mrz.",
     ["en"]="mar",
+    ["eo"]="Mar.",
     ["es"]="mar.",
     ["et"]="märts",
     ["fi"]="",
@@ -2149,8 +2258,8 @@ data.labels={
     ["ru"]="",
     ["sk"]="mar.",
     ["sl"]="",
-    ["sr"]="мар.",
-    ["sr-latn"]="mar.",
+    ["sr"]="мар",
+    ["sr-latn"]="mar",
     ["sv"]="",
     ["tk"]="",
     ["tr"]="",
@@ -2173,8 +2282,10 @@ data.labels={
     ["da"]="maj",
     ["de"]="Mai",
     ["en"]="May",
+    ["eo"]="Majo",
     ["es"]="mayo",
     ["et"]="mai",
+    ["fa"]="مه",
     ["fi"]="toukokuu",
     ["fr"]="mai",
     ["gr"]="Μάιος",
@@ -2189,7 +2300,6 @@ data.labels={
     ["nb"]="mai",
     ["nl"]="mei",
     ["nn"]="mai",
-    ["pe"]="مه",
     ["pl"]="maja",
     ["pt"]="maio",
     ["ro"]="mai",
@@ -2214,11 +2324,13 @@ data.labels={
   ["may:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="май",
     ["ca"]="",
     ["cs"]="květ.",
     ["da"]="",
     ["de"]="Mai",
     ["en"]="may",
+    ["eo"]="Maj.",
     ["es"]="may.",
     ["et"]="mai",
     ["fi"]="",
@@ -2260,8 +2372,10 @@ data.labels={
     ["da"]="mandag",
     ["de"]="Montag",
     ["en"]="Monday",
+    ["eo"]="lundo",
     ["es"]="lunes",
     ["et"]="esmaspäev",
+    ["fa"]="دوشنبه",
     ["fi"]="maanantai",
     ["fr"]="lundi",
     ["gr"]="Δευτέρα",
@@ -2276,7 +2390,6 @@ data.labels={
     ["nb"]="mandag",
     ["nl"]="maandag",
     ["nn"]="måndag",
-    ["pe"]="دوشنبه",
     ["pl"]="poniedziałek",
     ["pt"]="segunda-feira",
     ["ro"]="luni",
@@ -2294,10 +2407,14 @@ data.labels={
   },
   ["monday:mnem"]={
    ["labels"]={
+    ["bg"]="пн",
+    ["cs"]="po",
     ["de"]="Mo.",
     ["en"]="mon",
-    ["sr"]="пон.",
-    ["sr-latn"]="pon.",
+    ["eo"]="lun.",
+    ["sk"]="po",
+    ["sr"]="пон",
+    ["sr-latn"]="pon",
    },
   },
   ["month"]={
@@ -2305,11 +2422,12 @@ data.labels={
     ["be"]="месяц",
     ["bg"]="месец",
     ["en"]="month",
+    ["eo"]="monato",
     ["et"]="kuu",
+    ["fa"]="ماه",
     ["kr"]="월",
     ["mk"]="месец",
     ["nl"]="maand",
-    ["pe"]="ماه",
     ["sr"]="месец",
     ["sr-latn"]="mesec",
    },
@@ -2328,8 +2446,10 @@ data.labels={
     ["da"]="november",
     ["de"]="November",
     ["en"]="November",
+    ["eo"]="Novembro",
     ["es"]="noviembre",
     ["et"]="november",
+    ["fa"]="نوامبر",
     ["fi"]="marraskuu",
     ["fr"]="novembre",
     ["gr"]="Νοέμβριος",
@@ -2344,7 +2464,6 @@ data.labels={
     ["nb"]="november",
     ["nl"]="november",
     ["nn"]="november",
-    ["pe"]="نوامبر",
     ["pl"]="listopada",
     ["pt"]="novembro",
     ["ro"]="noiembrie",
@@ -2369,11 +2488,13 @@ data.labels={
   ["november:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="ноем.",
     ["ca"]="",
     ["cs"]="list.",
     ["da"]="",
     ["de"]="Nov.",
     ["en"]="nov",
+    ["eo"]="Nov.",
     ["es"]="nov.",
     ["et"]="nov",
     ["fi"]="",
@@ -2394,8 +2515,8 @@ data.labels={
     ["ru"]="",
     ["sk"]="nov.",
     ["sl"]="",
-    ["sr"]="нов.",
-    ["sr-latn"]="nov.",
+    ["sr"]="нов",
+    ["sr-latn"]="nov",
     ["sv"]="",
     ["tk"]="",
     ["tr"]="",
@@ -2416,8 +2537,10 @@ data.labels={
     ["da"]="oktober",
     ["de"]="Oktober",
     ["en"]="October",
+    ["eo"]="Oktobro",
     ["es"]="octubre",
     ["et"]="oktoober",
+    ["fa"]="اکتبر",
     ["fi"]="lokakuu",
     ["fr"]="octobre",
     ["gr"]="Οκτώβριος",
@@ -2432,7 +2555,6 @@ data.labels={
     ["nb"]="oktober",
     ["nl"]="oktober",
     ["nn"]="oktober",
-    ["pe"]="اکتبر",
     ["pl"]="października",
     ["pt"]="outubro",
     ["ro"]="octombrie",
@@ -2457,11 +2579,13 @@ data.labels={
   ["october:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="окт.",
     ["ca"]="",
     ["cs"]="říj.",
     ["da"]="",
     ["de"]="Okt.",
     ["en"]="oct",
+    ["eo"]="Okt.",
     ["es"]="oct.",
     ["et"]="okt",
     ["fi"]="",
@@ -2482,8 +2606,8 @@ data.labels={
     ["ru"]="",
     ["sk"]="okt.",
     ["sl"]="",
-    ["sr"]="окт.",
-    ["sr-latn"]="okt.",
+    ["sr"]="окт",
+    ["sr-latn"]="okt",
     ["sv"]="",
     ["tk"]="",
     ["tr"]="",
@@ -2502,8 +2626,10 @@ data.labels={
     ["da"]="Side ",
     ["de"]="Seite ",
     ["en"]="page ",
+    ["eo"]="paĝo ",
     ["es"]="página ",
     ["et"]="lehekülg ",
+    ["fa"]="صفحه ",
     ["fi"]="",
     ["fr"]="page ",
     ["gr"]="",
@@ -2517,7 +2643,6 @@ data.labels={
     ["nb"]="side ",
     ["nl"]="pagina ",
     ["nn"]="side ",
-    ["pe"]="صفحه ",
     ["pl"]="strona ",
     ["pt"]="",
     ["ro"]="",
@@ -2545,8 +2670,10 @@ data.labels={
     ["da"]="Del ",
     ["de"]="Teil ",
     ["en"]="Part ",
+    ["eo"]="Parto ",
     ["es"]="Parte ",
     ["et"]="Osa ",
+    ["fa"]="قسمت ",
     ["fi"]="Osa ",
     ["fr"]="Partie ",
     ["gr"]="Μέρος",
@@ -2561,7 +2688,6 @@ data.labels={
     ["nb"]="Del ",
     ["nl"]="Deel ",
     ["nn"]="Del",
-    ["pe"]="قسمت ",
     ["pl"]="Część ",
     ["pt"]="Parte ",
     ["ro"]="Partea ",
@@ -2580,10 +2706,11 @@ data.labels={
   ["precedingpage"]={
    ["labels"]={
     ["en"]="on a preceding page",
+    ["eo"]="sur antaŭa paĝo",
     ["et"]="eelmisel lehel",
+    ["fa"]="در صفحات گذشته",
     ["mk"]="на претходната страница",
     ["nl"]="op een voorgaande bladzijde",
-    ["pe"]="در صفحات گذشته",
     ["sr"]="на претходној страници",
     ["sr-latn"]="na prethodnoj stranici",
    },
@@ -2600,8 +2727,10 @@ data.labels={
     ["da"]="lørdag",
     ["de"]="Samstag",
     ["en"]="Saturday",
+    ["eo"]="sabato",
     ["es"]="sábado",
     ["et"]="laupäev",
+    ["fa"]="شنبه",
     ["fi"]="lauantai",
     ["fr"]="samedi",
     ["gr"]="Σάββατο",
@@ -2616,7 +2745,6 @@ data.labels={
     ["nb"]="lørdag",
     ["nl"]="zaterdag",
     ["nn"]="laurdag",
-    ["pe"]="شنبه",
     ["pl"]="sobota",
     ["pt"]="sábado",
     ["ro"]="sâmbătă",
@@ -2634,10 +2762,14 @@ data.labels={
   },
   ["saturday:mnem"]={
    ["labels"]={
+    ["bg"]="сб",
+    ["cs"]="so",
     ["de"]="Sa.",
     ["en"]="sat",
-    ["sr"]="суб.",
-    ["sr-latn"]="sub.",
+    ["eo"]="sab.",
+    ["sk"]="so",
+    ["sr"]="суб",
+    ["sr-latn"]="sub",
    },
   },
   ["section"]={
@@ -2651,9 +2783,11 @@ data.labels={
     ["cs"]="Sekce ",
     ["da"]="",
     ["de"]="",
-    ["en"]="",
+    ["en"]="Section",
+    ["eo"]="Sekcio ",
     ["es"]="Sección ",
     ["et"]="jaos ",
+    ["fa"]="بخش ",
     ["fi"]="",
     ["fr"]="Section ",
     ["gr"]="Ενότητα",
@@ -2668,7 +2802,6 @@ data.labels={
     ["nb"]="",
     ["nl"]="",
     ["nn"]="",
-    ["pe"]="بخش ",
     ["pl"]="Podrozdział ",
     ["pt"]="",
     ["ro"]="",
@@ -2695,8 +2828,10 @@ data.labels={
     ["da"]="se ",
     ["de"]="siehe ",
     ["en"]="see ",
+    ["eo"]="vidu ",
     ["es"]="ver: ",
     ["et"]="vaadake ",
+    ["fa"]="نگاه کنید به ",
     ["fi"]="",
     ["fr"]="cf. ",
     ["gr"]="",
@@ -2710,7 +2845,6 @@ data.labels={
     ["nb"]="se ",
     ["nl"]="zie ",
     ["nn"]="sjå ",
-    ["pe"]="نگاه کنید به ",
     ["pl"]="patrz ",
     ["pt"]="",
     ["ro"]="",
@@ -2740,8 +2874,10 @@ data.labels={
     ["da"]="september",
     ["de"]="September",
     ["en"]="September",
+    ["eo"]="Septembro",
     ["es"]="septiembre",
     ["et"]="september",
+    ["fa"]="سپتامبر",
     ["fi"]="syyskuu",
     ["fr"]="septembre",
     ["gr"]="Σεπτέμβριος",
@@ -2756,7 +2892,6 @@ data.labels={
     ["nb"]="september",
     ["nl"]="september",
     ["nn"]="september",
-    ["pe"]="سپتامبر",
     ["pl"]="września",
     ["pt"]="setembro",
     ["ro"]="septembrie",
@@ -2781,11 +2916,13 @@ data.labels={
   ["september:mnem"]={
    ["labels"]={
     ["af"]="",
+    ["bg"]="септ.",
     ["ca"]="",
     ["cs"]="září",
     ["da"]="",
     ["de"]="Sep.",
     ["en"]="sep",
+    ["eo"]="Sep.",
     ["es"]="sep.",
     ["et"]="sept",
     ["fi"]="",
@@ -2826,9 +2963,11 @@ data.labels={
     ["cs"]="Podsekce ",
     ["da"]="",
     ["de"]="",
-    ["en"]="",
+    ["en"]="Subsection",
+    ["eo"]="Subsekcio ",
     ["es"]="Subsección ",
     ["et"]="alajaotis ",
+    ["fa"]="زیربخش ",
     ["fi"]="",
     ["fr"]="Soussection ",
     ["gr"]="Υπόενότητα",
@@ -2842,7 +2981,6 @@ data.labels={
     ["nb"]="",
     ["nl"]="",
     ["nn"]="",
-    ["pe"]="زیربخش ",
     ["pl"]="Podpodrozdział ",
     ["pt"]="",
     ["ro"]="",
@@ -2869,9 +3007,11 @@ data.labels={
     ["cs"]="Podpodsekce ",
     ["da"]="",
     ["de"]="",
-    ["en"]="",
+    ["en"]="Subsubsection",
+    ["eo"]="Subsubsekcio ",
     ["es"]="Subsubsección ",
     ["et"]="alamjaotis ",
+    ["fa"]="زیرزیربخش ",
     ["fi"]="",
     ["fr"]="Soussoussection ",
     ["gr"]="",
@@ -2885,7 +3025,6 @@ data.labels={
     ["nb"]="",
     ["nl"]="",
     ["nn"]="",
-    ["pe"]="زیرزیربخش ",
     ["pl"]="",
     ["pt"]="",
     ["ro"]="",
@@ -2912,9 +3051,11 @@ data.labels={
     ["cs"]="Podpodpodsekce ",
     ["da"]="",
     ["de"]="",
-    ["en"]="",
+    ["en"]="Subsubsubsection",
+    ["eo"]="Subsubsubsekcio ",
     ["es"]="Subsubsubsección ",
     ["et"]="",
+    ["fa"]="زیرزیرزیربخش ",
     ["fi"]="",
     ["fr"]="Soussoussoussection ",
     ["gr"]="",
@@ -2928,7 +3069,6 @@ data.labels={
     ["nb"]="",
     ["nl"]="",
     ["nn"]="",
-    ["pe"]="زیرزیرزیربخش ",
     ["pl"]="",
     ["pt"]="",
     ["ro"]="",
@@ -2956,8 +3096,10 @@ data.labels={
     ["da"]="søndag",
     ["de"]="Sonntag",
     ["en"]="Sunday",
+    ["eo"]="dimanĉo",
     ["es"]="domingo",
     ["et"]="pühapäev",
+    ["fa"]="یکشنبه",
     ["fi"]="sunnuntai",
     ["fr"]="dimanche",
     ["gr"]="Κυριακή",
@@ -2972,7 +3114,6 @@ data.labels={
     ["nb"]="søndag",
     ["nl"]="zondag",
     ["nn"]="sundag",
-    ["pe"]="یکشنبه",
     ["pl"]="niedziela",
     ["pt"]="domingo",
     ["ro"]="duminică",
@@ -2990,10 +3131,14 @@ data.labels={
   },
   ["sunday:mnem"]={
    ["labels"]={
+    ["bg"]="нд",
+    ["cs"]="ne",
     ["de"]="So.",
     ["en"]="sun",
-    ["sr"]="нед.",
-    ["sr-latn"]="ned.",
+    ["eo"]="dim.",
+    ["sk"]="ne",
+    ["sr"]="нед",
+    ["sr-latn"]="ned",
    },
   },
   ["table"]={
@@ -3008,8 +3153,10 @@ data.labels={
     ["da"]="Tabel ",
     ["de"]="Tabelle ",
     ["en"]="Table ",
+    ["eo"]="Tabelo ",
     ["es"]="Tabla ",
     ["et"]="Tabel ",
+    ["fa"]="جدول ",
     ["fi"]="Taulukko ",
     ["fr"]="Tableau ",
     ["gr"]="Πίνακας",
@@ -3024,7 +3171,6 @@ data.labels={
     ["nb"]="Tabell ",
     ["nl"]="Tabel ",
     ["nn"]="Tabell ",
-    ["pe"]="جدول ",
     ["pl"]="Tabela ",
     ["pt"]="Tabela ",
     ["ro"]="Tabelul ",
@@ -3052,8 +3198,10 @@ data.labels={
     ["da"]="torsdag",
     ["de"]="Donnerstag",
     ["en"]="Thursday",
+    ["eo"]="ĵaŭdo",
     ["es"]="jueves",
     ["et"]="neljapäev",
+    ["fa"]="پنج‌شنبه",
     ["fi"]="torstai",
     ["fr"]="jeudi",
     ["gr"]="Πέμπτη",
@@ -3068,7 +3216,6 @@ data.labels={
     ["nb"]="torsdag",
     ["nl"]="donderdag",
     ["nn"]="torsdag",
-    ["pe"]="پنج‌شنبه",
     ["pl"]="czwartek",
     ["pt"]="quinta-feira",
     ["ro"]="joi",
@@ -3086,10 +3233,14 @@ data.labels={
   },
   ["thursday:mnem"]={
    ["labels"]={
+    ["bg"]="чт",
+    ["cs"]="čt",
     ["de"]="Do.",
     ["en"]="thu",
-    ["sr"]="чет.",
-    ["sr-latn"]="čet.",
+    ["eo"]="ĵaŭ.",
+    ["sk"]="št",
+    ["sr"]="чет",
+    ["sr-latn"]="čet",
    },
   },
   ["tuesday"]={
@@ -3104,8 +3255,10 @@ data.labels={
     ["da"]="tirsdag",
     ["de"]="Dienstag",
     ["en"]="Tuesday",
+    ["eo"]="mardo",
     ["es"]="martes",
     ["et"]="teisipäev",
+    ["fa"]="سه‌شنبه",
     ["fi"]="tiistai",
     ["fr"]="mardi",
     ["gr"]="Τρίτη",
@@ -3120,7 +3273,6 @@ data.labels={
     ["nb"]="tirsdag",
     ["nl"]="dinsdag",
     ["nn"]="tysdag",
-    ["pe"]="سه‌شنبه",
     ["pl"]="wtorek",
     ["pt"]="terça-feira",
     ["ro"]="marți",
@@ -3138,10 +3290,14 @@ data.labels={
   },
   ["tuesday:mnem"]={
    ["labels"]={
+    ["bg"]="вт",
+    ["cs"]="út",
     ["de"]="Di.",
     ["en"]="tue",
-    ["sr"]="уто.",
-    ["sr-latn"]="uto.",
+    ["eo"]="mar.",
+    ["sk"]="út",
+    ["sr"]="уто",
+    ["sr-latn"]="uto",
    },
   },
   ["wednesday"]={
@@ -3156,8 +3312,10 @@ data.labels={
     ["da"]="onsdag",
     ["de"]="Mittwoch",
     ["en"]="Wednesday",
+    ["eo"]="merkredo",
     ["es"]="miércoles",
     ["et"]="kolmapäev",
+    ["fa"]="چهارشنبه",
     ["fi"]="keskiviikko",
     ["fr"]="mercredi",
     ["gr"]="Τετάρτη",
@@ -3172,7 +3330,6 @@ data.labels={
     ["nb"]="onsdag",
     ["nl"]="woensdag",
     ["nn"]="onsdag",
-    ["pe"]="چهارشنبه",
     ["pl"]="środa",
     ["pt"]="quarta-feira",
     ["ro"]="miercuri",
@@ -3190,21 +3347,26 @@ data.labels={
   },
   ["wednesday:mnem"]={
    ["labels"]={
+    ["bg"]="ср",
+    ["cs"]="st",
     ["de"]="Mi.",
     ["en"]="wed",
-    ["sr"]="сре.",
-    ["sr-latn"]="sre.",
+    ["eo"]="mer.",
+    ["sk"]="st",
+    ["sr"]="сре",
+    ["sr-latn"]="sre",
    },
   },
   ["year"]={
    ["labels"]={
     ["bg"]="година",
     ["en"]="year",
+    ["eo"]="jaro",
     ["et"]="aasta",
+    ["fa"]="سال",
     ["kr"]="년",
     ["mk"]="година",
     ["nl"]="jaar",
-    ["pe"]="سال",
     ["sr"]="година",
     ["sr-latn"]="godina",
    },
@@ -3223,8 +3385,10 @@ data.labels={
     ["da"]="Forkortelser",
     ["de"]="Abkürzungen",
     ["en"]="Abbreviations",
+    ["eo"]="Mallongigoj",
     ["es"]="Abreviaturas",
     ["et"]="Lühend",
+    ["fa"]="نشانه‌های اختصاری",
     ["fi"]="Lyhennyksi",
     ["fr"]="Abréviations",
     ["gr"]="Συντομογραφίες",
@@ -3239,7 +3403,6 @@ data.labels={
     ["nb"]="Forkortelser",
     ["nl"]="Afkortingen",
     ["nn"]="Forkortingar",
-    ["pe"]="نشانه‌های اختصاری",
     ["pl"]="Wykaz skrótów",
     ["pt"]="Abreviaturas",
     ["ro"]="Abrevieri",
@@ -3267,8 +3430,10 @@ data.labels={
     ["da"]="Indhold",
     ["de"]="Inhalt",
     ["en"]="Contents",
+    ["eo"]="Enhavo",
     ["es"]="Contenido",
     ["et"]="Sisu",
+    ["fa"]="فهرست مطالب",
     ["fi"]="Sisällys",
     ["fr"]="Table des matières",
     ["gr"]="Περιεχόμενα",
@@ -3283,7 +3448,6 @@ data.labels={
     ["nb"]="Innhold",
     ["nl"]="Inhoud",
     ["nn"]="Innhald",
-    ["pe"]="فهرست مطالب",
     ["pl"]="Spis treści",
     ["pt"]="Conteúdo",
     ["ro"]="Cuprins",
@@ -3310,8 +3474,10 @@ data.labels={
     ["da"]="Figurer",
     ["de"]="Abbildungen",
     ["en"]="Figures",
+    ["eo"]="Figuroj",
     ["es"]="Figuras",
     ["et"]="Arvandmed",
+    ["fa"]="فهرست اشکال",
     ["fi"]="Kuvi",
     ["fr"]="Figures",
     ["gr"]="Σχήματα",
@@ -3326,7 +3492,6 @@ data.labels={
     ["nb"]="Figurer",
     ["nl"]="Figuren",
     ["nn"]="Figurar",
-    ["pe"]="فهرست اشکال",
     ["pl"]="Ilustracje",
     ["pt"]="Figuras",
     ["ro"]="Figuri",
@@ -3347,14 +3512,17 @@ data.labels={
     ["af"]="Grafieke",
     ["ar"]="الرسوم",
     ["be"]="Графiка",
+    ["bg"]="Графики",
     ["ca"]="Gràfiques",
     ["cn"]="图",
     ["cs"]="Seznam grafů",
     ["da"]="Grafik",
     ["de"]="Graphiken",
     ["en"]="Graphics",
+    ["eo"]="Grafikoj",
     ["es"]="Gráficos",
     ["et"]="Graafika",
+    ["fa"]="فهرست طرح‌ها",
     ["fi"]="Grafiikkaoi",
     ["fr"]="Graphiques",
     ["gr"]="Γραφικά",
@@ -3369,7 +3537,6 @@ data.labels={
     ["nb"]="Bilde",
     ["nl"]="Grafieken",
     ["nn"]="Bilete",
-    ["pe"]="فهرست طرح‌ها",
     ["pl"]="Grafiki",
     ["pt"]="Gráficos",
     ["ro"]="Grafice",
@@ -3397,8 +3564,10 @@ data.labels={
     ["da"]="Indeks",
     ["de"]="Index",
     ["en"]="Index",
+    ["eo"]="Indekso",
     ["es"]="Índice",
     ["et"]="Indeks",
+    ["fa"]="نمایه",
     ["fi"]="Indeksiluku",
     ["fr"]="Index",
     ["gr"]="Ευρετήριο",
@@ -3413,14 +3582,12 @@ data.labels={
     ["nb"]="Register",
     ["nl"]="Index",
     ["nn"]="Register",
-    ["pe"]="نمایه",
     ["pl"]="Indeks",
     ["pt"]="Índice",
     ["ro"]="Index",
     ["ru"]="Алфавитный указатель",
     ["sk"]="Zoznam",
     ["sl"]="Stvarno kazalo",
-    ["sr"]="Индекс",
     ["sr"]="Индекс појмова",
     ["sr-latn"]="Indeks pojmova",
     ["sv"]="Sakregister",
@@ -3435,12 +3602,14 @@ data.labels={
     ["af"]="Intermezzos",
     ["ar"]="فسح",
     ["be"]="Спіс уставак",
+    ["bg"]="Интермеца",
     ["ca"]="Intermedis",
     ["cn"]="퉣",
     ["cs"]="Intermezza",
     ["da"]="Intermezzoer",
     ["de"]="Intermezzi",
     ["en"]="Intermezzos",
+    ["eo"]="Intermezoj",
     ["es"]="Intermedios",
     ["et"]="Vahemängud",
     ["fi"]="Intermezzos",
@@ -3463,7 +3632,6 @@ data.labels={
     ["ru"]="Список вставок",
     ["sk"]="Intermezzá",
     ["sl"]="Intermezzi",
-    ["sr"]="Интермеззи",
     ["sr"]="Списак дигресија",
     ["sr-latn"]="Spisak digresija",
     ["sv"]="Intermezzon",
@@ -3485,8 +3653,10 @@ data.labels={
     ["da"]="Logoer",
     ["de"]="Logos",
     ["en"]="Logos",
+    ["eo"]="Markemblemoj",
     ["es"]="Logotipos",
     ["et"]="Logos",
+    ["fa"]="فهرست لوگوها",
     ["fi"]="Vertauskuva",
     ["fr"]="Logos",
     ["gr"]="Λογότυπα",
@@ -3501,7 +3671,6 @@ data.labels={
     ["nb"]="Logoer",
     ["nl"]="Logo's",
     ["nn"]="Logoar",
-    ["pe"]="فهرست لوگوها",
     ["pl"]="Znaki",
     ["pt"]="Logotipos",
     ["ro"]="Logo-uri",
@@ -3525,8 +3694,10 @@ data.labels={
     ["da"]="",
     ["de"]="Literatur",
     ["en"]="References",
+    ["eo"]="Referencoj",
     ["es"]="Bibliografía",
     ["et"]="Viited",
+    ["fa"]="کتاب‌نامه",
     ["fi"]="",
     ["fr"]="Bibliographie",
     ["gr"]="",
@@ -3540,7 +3711,6 @@ data.labels={
     ["nb"]="",
     ["nl"]="Literatuur",
     ["nn"]="",
-    ["pe"]="کتاب‌نامه",
     ["pl"]="Bibliografia",
     ["pt"]="",
     ["ro"]="",
@@ -3567,8 +3737,10 @@ data.labels={
     ["da"]="Tabeller",
     ["de"]="Tabellen",
     ["en"]="Tables",
+    ["eo"]="Tabeloj",
     ["es"]="Tablas",
     ["et"]="Tabelid",
+    ["fa"]="فهرست جداول",
     ["fi"]="Taulukkoj",
     ["fr"]="Tableaux",
     ["gr"]="Πίνακες",
@@ -3583,7 +3755,6 @@ data.labels={
     ["nb"]="Tabeller",
     ["nl"]="Tabellen",
     ["nn"]="Tabellar",
-    ["pe"]="فهرست جداول",
     ["pl"]="Tabele",
     ["pt"]="Tabelas",
     ["ro"]="Tabele",
@@ -3611,8 +3782,10 @@ data.labels={
     ["da"]="Enheder",
     ["de"]="Einheiten",
     ["en"]="Units",
+    ["eo"]="Unuoj",
     ["es"]="Unidades",
     ["et"]="Ühikud",
+    ["fa"]="واحدها",
     ["fi"]="Yksiköt",
     ["fr"]="Unités",
     ["gr"]="Μονάδες",
@@ -3627,7 +3800,6 @@ data.labels={
     ["nb"]="Enheter",
     ["nl"]="Eenheden",
     ["nn"]="Einingar",
-    ["pe"]="واحدها",
     ["pl"]="Jednostki",
     ["pt"]="Unidades",
     ["ro"]="Unități",
@@ -3658,3 +3830,4 @@ functions.atanh  = functions.arctanh
 functions.tg     = functions.tan
 functions.arctg  = functions.arctan
 functions.arctgh = functions.arctanh
+
diff --git a/tex/context/base/mkiv/lxml-tab.lua b/tex/context/base/mkiv/lxml-tab.lua
index 3af4974d3..edc4e75eb 100644
--- a/tex/context/base/mkiv/lxml-tab.lua
+++ b/tex/context/base/mkiv/lxml-tab.lua
@@ -1967,7 +1967,7 @@ function xml.kind(e)
                 local tg = d.tg
                 if tg == "@cd@" then
                     return "cdata"
-                elseif tg == "@cm" then
+                elseif tg == "@cm@" then
                     return "comment"
                 elseif tg == "@pi@" then
                     return "instruction"
diff --git a/tex/context/base/mkiv/mult-sys.mkiv b/tex/context/base/mkiv/mult-sys.mkiv
index 7e9792720..32d1b40a0 100644
--- a/tex/context/base/mkiv/mult-sys.mkiv
+++ b/tex/context/base/mkiv/mult-sys.mkiv
@@ -48,6 +48,7 @@
 \definesystemconstant {ancientlatin}   \definesystemconstant {ala}
 \definesystemconstant {arabic}         \definesystemconstant {ar}
 \definesystemconstant {belarussian}    \definesystemconstant {be}
+\definesystemconstant {bulgarian}      \definesystemconstant {bg}
 \definesystemconstant {bokmal}         \definesystemconstant {nb}
 \definesystemconstant {catalan}        \definesystemconstant {ca}
 \definesystemconstant {chinese}        \definesystemconstant {cn}
@@ -57,7 +58,7 @@
 \definesystemconstant {dutch}          \definesystemconstant {nl}
 \definesystemconstant {english}        \definesystemconstant {en}
 \definesystemconstant {estonian}       \definesystemconstant {et}
-\definesystemconstant {esperanto}    % \definesystemconstant {eo}
+\definesystemconstant {esperanto}      \definesystemconstant {eo}
 \definesystemconstant {farsi}          \definesystemconstant {fa} % just persian
 \definesystemconstant {finnish}        \definesystemconstant {fi}
 \definesystemconstant {french}         \definesystemconstant {fr}
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index e890fa88c..94c1fd1c6 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 ffeb01fef..40f9782ba 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index b60dd2ddd..096e94210 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.03.05 19:11}
+\newcontextversion{2021.03.09 11:39}
 
 %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/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index 88b99e7d4..8c2be0abc 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2021.03.05 19:11}
+\immutable\edef\contextversion{2021.03.09 11:39}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/lang-def.mkxl b/tex/context/base/mkxl/lang-def.mkxl
index 85c1f3ac7..cc94bf7ae 100644
--- a/tex/context/base/mkxl/lang-def.mkxl
+++ b/tex/context/base/mkxl/lang-def.mkxl
@@ -350,6 +350,21 @@
    \c!rightquotation=\upperrightdoublesixquote,
    \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
+\installlanguage
+  [\s!bg]
+  [\s!lefthyphenmin=2,
+   \s!righthyphenmin=2,
+   \c!spacing=\v!packed,
+   \c!leftsentence=\leftguillemot,
+   \c!rightsentence=\rightguillemot,
+   \c!leftsubsentence=\lowerleftdoubleninequote,
+   \c!rightsubsentence=\upperrightdoubleninequote,
+   \c!leftquote=\lowerleftsingleninequote,
+   \c!rightquote=\upperrightsinglesixquote,
+   \c!leftquotation=\lowerleftdoubleninequote,
+   \c!rightquotation=\upperrightdoublesixquote,
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
+
 \installlanguage [\s!russian]    [\s!ru]
 \installlanguage [\s!ukrainian]  [\s!ua]
 \installlanguage [\s!belarussian][\s!be]
@@ -357,6 +372,7 @@
 \installlanguage [\s!sr-latn]    [\s!sr]
 \installlanguage [\s!sr-cyrl]    [\s!sr]
 \installlanguage [\s!macedonian] [\s!mk]
+\installlanguage [\s!bulgarian]  [\s!bg]
 
 
 % Uralic Languages: Cheremiss, Estonian, Finnish, Karelian, Laap,
@@ -486,7 +502,7 @@
 \installlanguage [\s!arabic] [\s!ar]
 
 \installlanguage
-  [\s!pe]
+  [\s!farsi]
   [\c!spacing=\v!broad,
    \c!leftsentence=\emdash,
    \c!rightsentence=\emdash,
@@ -498,9 +514,9 @@
    \c!rightquotation=\rightguillemot,
    \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
-\installlanguage [\s!persian] [\s!pe]
-\installlanguage [\s!fa]      [\s!pe] % these two are redundant but sometimes might
-\installlanguage [\s!farsi]   [\s!fa] % sound more natural .. best set labels to 'pe'
+\installlanguage [\s!fa]      [\s!farsi]
+\installlanguage [\s!persian] [\s!farsi]
+\installlanguage [\s!pe]      [\s!farsi]
 
 % Just aliases to "ar" for now
 
@@ -539,20 +555,23 @@
 
 \installlanguage
   [\s!esperanto]
-  [%\c!spacing=\v!packed,
-   %\c!leftsentence=\emdash,
-   %\c!rightsentence=\emdash,
-   %\c!leftsubsentence=\emdash,
-   %\c!rightsubsentence=\emdash,
-   %\c!leftquote=\lowerleftdoubleninequote,
-   %\c!rightquote=\upperrightdoublesixquote,
-   %\c!leftquotation=\lowerleftdoubleninequote,
-   %\c!rightquotation=\upperrightdoublesixquote,
-   %\c!date={\v!year,~m.,\space,\v!month,\space,\v!day,~d.},
+  [\c!spacing=\v!packed,
+   \c!leftsentence=\endash,
+   \c!rightsentence=\endash,
+   \c!leftsubsentence=\endash,
+   \c!rightsubsentence=\endash,
+   \c!leftquote=\upperleftsinglesixquote,         %U+2018,
+   \c!rightquote=\upperrightsingleninequote,      %U+2019,
+   \c!leftquotation=\upperleftdoublesixquote,     %U+201C,
+   \c!rightquotation=\upperrightdoubleninequote,  %U+201D,
+   \c!date={\v!year,~m.,\space,\v!month,\space,\v!day,~d.},
+   \c!date={\v!day-a\space de\space \v!month\space \v!year},
    \s!patterns=eo,
    \s!lefthyphenmin=2,
    \s!righthyphenmin=2]
 
+\installlanguage[\s!eo][\c!default=\s!esperanto]
+
 % Baltic Languages: Lettish/Latvian, Lietuvių/Lithuanian
 
 \installlanguage
diff --git a/tex/context/base/mkxl/lpdf-lmt.lmt b/tex/context/base/mkxl/lpdf-lmt.lmt
index fbc002a93..3c2db0247 100644
--- a/tex/context/base/mkxl/lpdf-lmt.lmt
+++ b/tex/context/base/mkxl/lpdf-lmt.lmt
@@ -80,7 +80,7 @@ updaters.register("backend.update.lpdf",function()
     pdfgetfontname         = lpdf.getfontname
     pdfgetfontobjectnumber = lpdf.getfontobjectnumber
     --
-    pdfgetpagereference    = lpdf.getpagereference
+    pdfgetpagereference    = lpdf.getpagereference -- move code so we don't need this
 end)
 
 local pdf_pages      = pdfconstant("Pages")
@@ -2067,22 +2067,38 @@ do
         return nofobjects
     end
 
+ -- function lpdf.pagereference(n,complete) -- true | false | nil | n [true,false]
+ --     if nofpages == 0 then
+ --         nofpages = structures.pages.nofpages
+ --         if nofpages == 0 then
+ --             nofpages = 1
+ --         end
+ --     end
+ --     if n == true or not n then
+ --         complete = n
+ --         n = texgetcount("realpageno")
+ --     end
+ --     local r = n > nofpages and pdfgetpagereference(nofpages) or pdfgetpagereference(n)
+ --     return complete and pdfreference(r) or r
+ -- end
+
     function lpdf.pagereference(n,complete) -- true | false | nil | n [true,false]
-        if nofpages == 0 then
-            nofpages = structures.pages.nofpages
-            if nofpages == 0 then
-                nofpages = 1
-            end
-        end
         if n == true or not n then
             complete = n
             n = texgetcount("realpageno")
         end
-        local r = n > nofpages and pdfgetpagereference(nofpages) or pdfgetpagereference(n)
+        if n > nofpages then
+            nofpages = n
+        end
+        local r = pdfgetpagereference(n)
         return complete and pdfreference(r) or r
     end
 
-    function lpdf.nofpages()
+    function lpdf.lastreferredpage()
+        return nofpages
+    end
+
+    function lpdf.nofpages() -- this will change: document nofpages
         return structures.pages.nofpages
     end
 
@@ -2973,6 +2989,18 @@ do
                 return string.format("%s.%s, compresslevel %s, objectcompresslevel %s",outputfilename,"pdf",lpdf.getcompression())
             end)
             --
+            luatex.registerstopactions(function()
+                if pdfname then
+                    local r = lpdf.lastreferredpage() -- somehow referenced
+                    local t = lpdf.nofpages()         -- in tuc file
+                    local s = lpdf.getnofpages()      -- in page tree, saved in file
+                    if r > s then
+                        report()
+                        report("referred pages: %i, saved pages %i, pages from tuc file: %i, possible corrupt file",r,e,t)
+                        report()
+                    end
+                end
+            end)
         end
         converter  = drivers.converters.lmtx
         useddriver = driver
diff --git a/tex/context/base/mkxl/lxml-ini.mkxl b/tex/context/base/mkxl/lxml-ini.mkxl
index 01d0f883f..e4d982c76 100644
--- a/tex/context/base/mkxl/lxml-ini.mkxl
+++ b/tex/context/base/mkxl/lxml-ini.mkxl
@@ -305,10 +305,10 @@
 
 \installdirectcommandhandler \??xml {xml}
 
-\letvalue{\??xmldefaults\v!normal}\zerocount
-\letvalue{\??xmldefaults\v!none  }\zerocount
-\letvalue{\??xmldefaults\v!text  }\plusone
-\letvalue{\??xmldefaults\v!hidden}\plustwo
+\letcsname\??xmldefaults\v!normal\endcsname\zerocount
+\letcsname\??xmldefaults\v!none  \endcsname\zerocount
+\letcsname\??xmldefaults\v!text  \endcsname\plusone
+\letcsname\??xmldefaults\v!hidden\endcsname\plustwo
 
 \permanent\protected\def\xmldefaulttotext
   {\ifcase\xmlprocessingmode
@@ -334,7 +334,7 @@
     \doif{\directxmlparameter\c!entities}\v!yes\clf_xmlloadentities
 \to \everysetupxml
 
-\permanent\def\xmlmapvalue    #1#2#3{\setvalue{\??xmlmapvalue#1:#2}{#3}} % keep #3 to grab spaces
+\permanent\def\xmlmapvalue    #1#2#3{\defcsname\??xmlmapvalue#1:#2\endcsname{#3}} % keep #3 to grab spaces
 \permanent\def\xmldoifelsevalue #1#2{\ifcsname\??xmlmapvalue#1:#2\endcsname\expandafter\firstoftwoarguments\else\expandafter\secondoftwoarguments\fi}
 
 \permanent\def\xmlvalue#1#2% #3
diff --git a/tex/context/base/mkxl/mult-sys.mkxl b/tex/context/base/mkxl/mult-sys.mkxl
index 3e1d32a91..2941a7b08 100644
--- a/tex/context/base/mkxl/mult-sys.mkxl
+++ b/tex/context/base/mkxl/mult-sys.mkxl
@@ -48,6 +48,7 @@
 \definesystemconstant {ancientlatin}   \definesystemconstant {ala}
 \definesystemconstant {arabic}         \definesystemconstant {ar}
 \definesystemconstant {belarussian}    \definesystemconstant {be}
+\definesystemconstant {bulgarian}      \definesystemconstant {bg}
 \definesystemconstant {bokmal}         \definesystemconstant {nb}
 \definesystemconstant {catalan}        \definesystemconstant {ca}
 \definesystemconstant {chinese}        \definesystemconstant {cn}
@@ -57,7 +58,7 @@
 \definesystemconstant {dutch}          \definesystemconstant {nl}
 \definesystemconstant {english}        \definesystemconstant {en}
 \definesystemconstant {estonian}       \definesystemconstant {et}
-\definesystemconstant {esperanto}    % \definesystemconstant {eo}
+\definesystemconstant {esperanto}      \definesystemconstant {eo}
 \definesystemconstant {farsi}          \definesystemconstant {fa} % just persian
 \definesystemconstant {finnish}        \definesystemconstant {fi}
 \definesystemconstant {french}         \definesystemconstant {fr}
diff --git a/tex/context/base/mkxl/page-sel.mklx b/tex/context/base/mkxl/page-sel.mklx
index 1ec1b40e3..41ca751ad 100644
--- a/tex/context/base/mkxl/page-sel.mklx
+++ b/tex/context/base/mkxl/page-sel.mklx
@@ -114,7 +114,8 @@
    \egroup}
 
 \def\page_selectors_filter_a_page#filename#page%
-  {\hpack to \textwidth
+  {%\startpagemakeup
+   \hpack to \textwidth
      {\ifdim\scratchwidth>\zeropoint
         \rightorleftpageaction{\scratchwidth\zeropoint}{\hfill}%
       \fi
@@ -128,8 +129,8 @@
          \fi
          \hss}%
       \wd\scratchbox\zeropoint
-      \box\scratchbox}
-   \page}
+      \box\scratchbox}%
+   \page}%\stoppagemakeup}
 
 \permanent\tolerant\protected\def\copypages[#filename]#spacer[#settings]#spacer[#figuresettings]%
   {\bgroup
diff --git a/tex/context/base/mkxl/page-sid.mkxl b/tex/context/base/mkxl/page-sid.mkxl
index 3c1f1f7be..fd9f6837a 100644
--- a/tex/context/base/mkxl/page-sid.mkxl
+++ b/tex/context/base/mkxl/page-sid.mkxl
@@ -661,7 +661,7 @@
    \page_sides_set_skips
    \page_floats_report_total
    \relax
-   \lefttoright
+  %\lefttoright % not needed in lmtx
    \strc_floats_mark_par_as_free
    \ifcase\c_page_sides_float_type
      % invalid
diff --git a/tex/context/base/mkxl/strc-sec.mkxl b/tex/context/base/mkxl/strc-sec.mkxl
index 7c4a8fc24..a5b3cde6e 100644
--- a/tex/context/base/mkxl/strc-sec.mkxl
+++ b/tex/context/base/mkxl/strc-sec.mkxl
@@ -1272,8 +1272,8 @@
 \permanent\def\namedheadnumber      #1{\getstructurenumber    {\thenamedheadlevel{#1}}}
 \permanent\def\somenamedheadnumber#1#2{\getsomestructurenumber{\thenamedheadlevel{#1}}{#2}}
 
-\permanent\tolerant\protected\def\headnumber[#1]#*[#2]% simple case is just a number
-  {\getsomefullstructurenumber{\ifparameter#1\or\thenamedheadlevel{#1}\fi}{#2}}
+\permanent\tolerant\protected\def\headnumber[#1]#*[#2]%
+  {\getsomefullstructurenumber{\thenamedheadlevel{#1}}{#2}}
 
 \permanent\tolerant\protected\def\someheadnumber[#1]#*[#2]%
   {\dontleavehmode
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 0dae380ef..1928cabe4 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 2021-03-05 19:11
+-- merge date  : 2021-03-09 11:39
 
 do -- begin closure to overcome local limits and interference