15 files changed, 46 insertions, 13 deletions
diff --git a/scripts/context/lua/mtx-patterns.lua b/scripts/context/lua/mtx-patterns.lua
index f887d8c6c..5e2b2d902 100644
--- a/scripts/context/lua/mtx-patterns.lua
+++ b/scripts/context/lua/mtx-patterns.lua
@@ -286,8 +286,11 @@ function scripts.patterns.load(path,name,mnemonic,ignored)
                                 used[char(b)] = true
                             elseif ct == "nd" then
                                 -- number
+                            elseif ct == "cf" then
+                                report("%s: %s line with suspected utf character %C, category %s: %s",basename,"keeping",b,ct,line)
+                                used[char(b)] = true
                             else -- maybe accent cf  (200D)
-                                report("%s: removing line with suspected utf character %C, category %s: %s",basename,b,ct,line)
+                                report("%s: %s line with suspected utf character %C, category %s: %s",basename,"removing",b,ct,line)
                                 splitdata[i] = ""
                                 break
                             end
diff --git a/tex/context/base/bibl-tra.lua b/tex/context/base/bibl-tra.lua
index c879c1cf4..82f8dc2aa 100644
--- a/tex/context/base/bibl-tra.lua
+++ b/tex/context/base/bibl-tra.lua
@@ -8,6 +8,19 @@ if not modules then modules = { } end modules ['bibl-tra'] = {
 
 -- also see bibl-tra-new !
 
+-- temporary hack, needed for transition
+
+if not punlications then
+
+    local hacks = utilities.storage.allocate()
+
+    job.register('publications.collected',hacks,function(t) publications.collected = t end)
+
+end
+
+-- end of hack
+
+
 local match, gmatch, format, concat, sort = string.match, string.gmatch, string.format, table.concat, table.sort
 
 bibtex       = bibtex or { }
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index a957c7117..03a26311b 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{2013.12.14 13:43}
+\newcontextversion{2013.12.19 00:11}
 
 %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 febab1a1a..a9b04a923 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index af95bdc97..516567e89 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.12.14 13:43}
+\edef\contextversion{2013.12.19 00:11}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/core-env.mkiv b/tex/context/base/core-env.mkiv
index 0332631dc..1c92a371c 100644
--- a/tex/context/base/core-env.mkiv
+++ b/tex/context/base/core-env.mkiv
@@ -384,6 +384,9 @@
 \edef\setupwithargument#1% saves a few expansions
   {\noexpand\csname\??setup:\noexpand\ifcsname\??setup:#1\endcsname#1\noexpand\else\letterpercent\noexpand\fi\endcsname}
 
+\edef\setupwithargumentswapped#1#2% saves a few expansions (can be \let)
+  {\noexpand\csname\??setup:\noexpand\ifcsname\??setup:#2\endcsname#2\noexpand\else\letterpercent\noexpand\fi\endcsname{#1}}
+
 \let\directsetup\syst_setups
 \let\texsetup   \syst_setups % nicer than \directsetup and more en par with xmlsetup and luasetup
 
diff --git a/tex/context/base/core-uti.lua b/tex/context/base/core-uti.lua
index d626fa67b..ef792c1d8 100644
--- a/tex/context/base/core-uti.lua
+++ b/tex/context/base/core-uti.lua
@@ -36,7 +36,7 @@ local report_passes = logs.reporter("job","passes")
 job                 = job or { }
 local job           = job
 
-job.version         = 1.23
+job.version         = 1.24
 job.packversion     = 1.02
 
 -- some day we will implement loading of other jobs and then we need
@@ -301,6 +301,8 @@ statistics.register("randomizer", function()
     end
 end)
 
+-- a sort of joke (for ctx meeting)
+
 local kg_per_watt_per_second  = 1 / 15000000
 local watts_per_core          = 50
 local speedup_by_other_engine = 1.2
diff --git a/tex/context/base/lxml-ini.mkiv b/tex/context/base/lxml-ini.mkiv
index c3ab2dc73..cfa0114d0 100644
--- a/tex/context/base/lxml-ini.mkiv
+++ b/tex/context/base/lxml-ini.mkiv
@@ -124,9 +124,10 @@
 \let\xmlgrab\xmlsetsetup % obsolete
 \let\xmlself\s!unknown   % obsolete
 
-\def\xmlsetup#1#2{\setupwithargument{#2}{#1}}
+%\ef\xmlsetup#1#2{\setupwithargument{#2}{#1}}
+\let\xmlsetup\setupwithargumentswapped
 
-\let\xmls\xmlsetup
+\let\xmls\setupwithargumentswapped
 \let\xmlw\setupwithargument
 
 \newtoks \registeredxmlsetups
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 1c14f4f18..ee9b2305c 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 8febd8ba0..c4a37bf21 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/patterns/lang-ml.lua b/tex/context/patterns/lang-ml.lua
index b9d1cdbaf..042cdf5df 100644
--- a/tex/context/patterns/lang-ml.lua
+++ b/tex/context/patterns/lang-ml.lua
@@ -34,12 +34,12 @@ return {
 % ",
  },
  ["patterns"]={
-  ["characters"]="ംഃഅആഇഈഉഊഋഌഎഏഐഒഓഔകഖഗഘങചഛജഝഞടഠഡഢണതഥദധനപഫബഭമയരറലളഴവശഷസഹാിീുൂൃെേൈൊോൌ്ൗൠൡൺൻർൽൾൿ‌",
-  ["data"]="1‌1 1അ1 1ആ1 1ഇ1 1ഈ1 1ഉ1 1ഊ1 1ഋ1 1ൠ1 1ഌ1 1ൡ1 1എ1 1ഏ1 1ഐ1 1ഒ1 1ഓ1 1ഔ1 ാ1 ി1 ീ1 ു1 ൂ1 ൃ1 െ1 േ1 ൈ1 ൊ1 ോ1 ൌ1 ൗ1 1ക 1ഖ 1ഗ 1ഘ 1ങ 1ച 1ഛ 1ജ 1ഝ 1ഞ 1ട 1ഠ 1ഡ 1ഢ 1ണ 1ത 1ഥ 1ദ 1ധ 1ന 1പ 1ഫ 1ബ 1ഭ 1മ 1യ 1ര 1റ 1ല 1ള 1ഴ 1വ 1ശ 1ഷ 1സ 1ഹ 2ഃ1 2ം1 2്2 ന്2 ര്2 ള്2 ല്2 ക്2 ണ്2 2ൺ 2ൻ 2ർ 2ൽ 2ൾ 2ൿ",
-  ["length"]=442,
+  ["characters"]="ംഃഅആഇഈഉഊഋഌഎഏഐഒഓഔകഖഗഘങചഛജഝഞടഠഡഢണതഥദധനപഫബഭമയരറലളഴവശഷസഹാിീുൂൃെേൈൊോൌ്ൗൠൡൺൻർൽൾൿ‌‍",
+  ["data"]="2‍2 1‌1 1അ1 1ആ1 1ഇ1 1ഈ1 1ഉ1 1ഊ1 1ഋ1 1ൠ1 1ഌ1 1ൡ1 1എ1 1ഏ1 1ഐ1 1ഒ1 1ഓ1 1ഔ1 ാ1 ി1 ീ1 ു1 ൂ1 ൃ1 െ1 േ1 ൈ1 ൊ1 ോ1 ൌ1 ൗ1 1ക 1ഖ 1ഗ 1ഘ 1ങ 1ച 1ഛ 1ജ 1ഝ 1ഞ 1ട 1ഠ 1ഡ 1ഢ 1ണ 1ത 1ഥ 1ദ 1ധ 1ന 1പ 1ഫ 1ബ 1ഭ 1മ 1യ 1ര 1റ 1ല 1ള 1ഴ 1വ 1ശ 1ഷ 1സ 1ഹ 2ഃ1 2ം1 2്2 ന്2 ര്2 ള്2 ല്2 ക്2 ണ്2 2ന്‍ 2ല്‍ 2ള്‍ 2ണ്‍ 2ര്‍ 2ക്‍ 2ൺ 2ൻ 2ർ 2ൽ 2ൾ 2ൿ",
+  ["length"]=514,
   ["minhyphenmax"]=1,
   ["minhyphenmin"]=1,
-  ["n"]=81,
+  ["n"]=88,
  },
  ["version"]="1.001",
 }
 \ No newline at end of file
diff --git a/tex/context/patterns/lang-ml.pat b/tex/context/patterns/lang-ml.pat
index 86813b5a7..b53251a69 100644
--- a/tex/context/patterns/lang-ml.pat
+++ b/tex/context/patterns/lang-ml.pat
@@ -2,9 +2,10 @@
 
 % for comment and copyright, see lang-ml.rme
 
-% used: ം ഃ അ ആ ഇ ഈ ഉ ഊ ഋ ഌ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര റ ല ള ഴ വ ശ ഷ സ ഹ ാ ി ീ ു ൂ ൃ െ േ ൈ ൊ ോ ൌ ് ൗ ൠ ൡ ൺ ൻ ർ ൽ ൾ ൿ ‌
+% used: ം ഃ അ ആ ഇ ഈ ഉ ഊ ഋ ഌ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര റ ല ള ഴ വ ശ ഷ സ ഹ ാ ി ീ ു ൂ ൃ െ േ ൈ ൊ ോ ൌ ് ൗ ൠ ൡ ൺ ൻ ർ ൽ ൾ ൿ ‌ ‍
 
 \patterns{
+2‍2
 1‌1
 1അ1
 1ആ1
@@ -80,6 +81,12 @@
 ല്2
 ക്2
 ണ്2
+2ന്‍
+2ല്‍
+2ള്‍
+2ണ്‍
+2ര്‍
+2ക്‍
 2ൺ
 2ൻ
 2ർ
diff --git a/tex/generic/context/luatex/luatex-basics.tex b/tex/generic/context/luatex/luatex-basics.tex
index bb34587ff..abe498970 100644
--- a/tex/generic/context/luatex/luatex-basics.tex
+++ b/tex/generic/context/luatex/luatex-basics.tex
@@ -12,6 +12,8 @@
 %D rather dumb attribute allocator. We start at 256 because we don't want
 %D any interference with the attributes used in the font handler.
 
+\ifx\newattribute\undefined \else \endinput \fi
+
 \newcount \lastallocatedattribute \lastallocatedattribute=255
 
 \def\newattribute#1%
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 468168c0c..321bb7700 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  : 12/14/13 13:43:12
+-- merge date  : 12/19/13 00:11:25
 
 do -- begin closure to overcome local limits and interference
 
diff --git a/tex/generic/context/luatex/luatex-fonts.tex b/tex/generic/context/luatex/luatex-fonts.tex
index a7c8bc2b8..7b457e9b4 100644
--- a/tex/generic/context/luatex/luatex-fonts.tex
+++ b/tex/generic/context/luatex/luatex-fonts.tex
@@ -132,7 +132,9 @@
 %D and the \CONTEXT\ wiki.
 
 \directlua {
-    dofile(kpse.find_file("luatex-fonts.lua","tex"))
+    if not fonts then
+        dofile(kpse.find_file("luatex-fonts.lua","tex"))
+    end
 }
 
 \endinput