3 files changed, 19 insertions, 14 deletions
diff --git a/tex/context/modules/mkiv/m-tikz.mkiv b/tex/context/modules/mkiv/m-tikz.mkiv
index 221c074ad..ef1b6b7e3 100644
--- a/tex/context/modules/mkiv/m-tikz.mkiv
+++ b/tex/context/modules/mkiv/m-tikz.mkiv
@@ -42,6 +42,7 @@
    \catcode`\@=11
    \catcode`\|=12
    \catcode`\!=12
+   \catcode`\~=12
    \relax}
 
 \permanent\protected\def\stoptikzinput
diff --git a/tex/context/modules/mkiv/s-abbreviations-logos.tex b/tex/context/modules/mkiv/s-abbreviations-logos.tex
index ab2b98a56..d04706ca6 100644
--- a/tex/context/modules/mkiv/s-abbreviations-logos.tex
+++ b/tex/context/modules/mkiv/s-abbreviations-logos.tex
@@ -177,10 +177,16 @@
 \logo [LMX]           {lmx}
 \logo [LPEG]          {lpeg}
 \logo [LUA]           {Lua}
-\logo [LUAJIT]        {Lua\wordboundary JIT}
-\logo [LUAJITTEX]     {Lua\wordboundary jit\TeXsuffix}
-\logo [LUAMETATEX]    {\Lua\wordboundary Meta\wordboundary\TeXsuffix}
-\logo [LUATEX]        {Lua\wordboundary\TeXsuffix}
+% \logo [LUAJIT]        {Lua\wordboundary JIT}
+% \logo [LUAJITTEX]     {Lua\wordboundary jit\TeXsuffix}
+% \logo [LUAMETATEX]    {\Lua\wordboundary Meta\wordboundary\TeXsuffix}
+% \logo [LUATEX]        {Lua\wordboundary\TeXsuffix}
+% \logo [LUAMETAFUN]    {\Lua\wordboundary\MetaFun}
+\logo [LUAJIT]        {Lua\-JIT}
+\logo [LUAJITTEX]     {Lua\-jit\-\TeXsuffix}
+\logo [LUAMETATEX]    {\Lua\-Meta\-\TeXsuffix}
+\logo [LUATEX]        {Lua\-\TeXsuffix}
+\logo [LUAMETAFUN]    {\Lua\-\MetaFun}
 \logo [LUATOOLS]      {luatools}
 \logo [MACOSX]        {MacOSX}
 %logo [MACROTEX]      {Macro\TeXsuffix}
@@ -189,7 +195,6 @@
 \logo [MAPS]          {Maps}
 \logo [MATHML]        {MathML}
 \logo [METAFONT]      {\MetaFont}
-\logo [LUAMETAFUN]    {\Lua\wordboundary\MetaFun}
 \logo [METAFUN]       {\MetaFun}
 \logo [METAPOST]      {\MetaPost}
 \logo [METATEX]       {Meta\TeXsuffix}
diff --git a/tex/context/modules/mkiv/x-asciimath.lua b/tex/context/modules/mkiv/x-asciimath.lua
index fdcab141c..f158065aa 100644
--- a/tex/context/modules/mkiv/x-asciimath.lua
+++ b/tex/context/modules/mkiv/x-asciimath.lua
@@ -6,15 +6,14 @@ if not modules then modules = { } end modules ['x-asciimath'] = {
     license   = "see context related readme files"
 }
 
---[[ldx--
-<p>Some backgrounds are discussed in <t>x-asciimath.mkiv</t>. This is a third version. I first
-tried a to make a proper expression parser but it's not that easy. First we have to avoid left
-recursion, which is not that trivial (maybe a future version of lpeg will provide that), and
-second there is not really a syntax but a mix of expressions and sequences with some fuzzy logic
-applied. Most problematic are fractions and we also need to handle incomplete expressions. So,
-instead we (sort of) tokenize the string and then do some passes over the result. Yes, it's real
-ugly and unsatisfying code mess down here. Don't take this as an example.</p>
---ldx]]--
+-- Some backgrounds are discussed in 'x-asciimath.mkiv'. This is a third version. I
+-- first tried a to make a proper expression parser but it's not that easy. First we
+-- have to avoid left recursion, which is not that trivial (maybe a future version
+-- of lpeg will provide that), and second there is not really a syntax but a mix of
+-- expressions and sequences with some fuzzy logic applied. Most problematic are
+-- fractions and we also need to handle incomplete expressions. So, instead we (sort
+-- of) tokenize the string and then do some passes over the result. Yes, it's real
+-- ugly and unsatisfying code mess down here. Don't take this as an example.
 
 -- todo: spaces around all elements in cleanup?
 -- todo: filter from files listed in tuc file