stable 2010.05.21 11:10

5 files changed, 196 insertions, 165 deletions

diff --git a/tex/context/base/core-con.lua b/tex/context/base/core-con.lua
index e8a243852..dca1c7d10 100644
--- a/tex/context/base/core-con.lua
+++ b/tex/context/base/core-con.lua
@@ -16,7 +16,7 @@ slower but look nicer this way.</p>
 
 local utf = unicode.utf8
 
-local floor, mod, date, time, concat = math.floor, math.mod, os.date, os.time, table.concat
+local floor, date, time, concat = math.floor, os.date, os.time, table.concat
 local lower, format, rep = string.lower, string.format, string.rep
 local texsprint, utfchar = tex.sprint, utf.char
 local tonumber, tostring = tonumber, tostring
@@ -296,10 +296,10 @@ function converters.toabjad(n,what)
         return medium[n]
     else
         local a, b, c, d
-        a, n = floor(n/1000), mod(n,1000)
-        b, n = floor(n/ 100), mod(n, 100)
-        c, n = floor(n/  10), mod(n,  10)
-        d, n = floor(n/   1), mod(n,   1)
+        a, n = floor(n/1000), n % 1000 -- mod(n,1000)
+        b, n = floor(n/ 100), n %  100 -- mod(n, 100)
+        c, n = floor(n/  10), n %   10 -- mod(n,  10)
+        d, n = floor(n/   1), n %    1 -- mod(n,   1)
         return (large[4][a] or "") .. (large[3][b] or "") .. (large[2][c] or "") .. (large[1][d] or "")
     end
 end
diff --git a/tex/context/base/pret-lua.lua b/tex/context/base/pret-lua.lua
index a59ba0e32..8803971f3 100644
--- a/tex/context/base/pret-lua.lua
+++ b/tex/context/base/pret-lua.lua
@@ -22,6 +22,12 @@ local visualizer = buffers.newvisualizer("lua")
 visualizer.identifiers = { }
 
 -- borrowed from scite
+--
+-- depricated:
+--
+-- gcinfo unpack getfenv setfenv loadlib
+-- table.maxn table.getn table.setn
+-- math.log10 math.mod math.modf math.fmod
 
 visualizer.identifiers.core = {
     "and", "break", "do", "else", "elseif", "end", "false", "for", "function",
@@ -30,17 +36,15 @@ visualizer.identifiers.core = {
 }
 
 visualizer.identifiers.base = {
-    "assert", "collectgarbage", "dofile", "error", "gcinfo", "loadfile",
+    "assert", "collectgarbage", "dofile", "error", "loadfile",
     "loadstring", "print", "rawget", "rawset", "require", "tonumber",
-    "tostring", "type", "unpack",
+    "tostring", "type",
 }
 
 visualizer.identifiers.five = {
-    "_G", "getmetatable", "ipairs", "loadlib", "next", "pairs",
+    "_G", "getmetatable", "ipairs", "next", "pairs",
     "pcall", "rawequal", "setmetatable", "xpcall", "string", "table",
     "math", "coroutine", "io", "os", "debug", "load", "module", "select",
-    -- depricated
-    "getfenv", "setfenv",
 }
 
 visualizer.identifiers.libs = {
@@ -56,25 +60,25 @@ visualizer.identifiers.libs = {
     -- math
     "math.abs", "math.acos", "math.asin", "math.atan", "math.atan2", "math.ceil",
     "math.cos", "math.deg", "math.exp", "math.floor math.", "math.ldexp",
-    "math.log", "math.max", "math.min", "math.mod", "math.pi", "math.pow",
+    "math.log", "math.max", "math.min", "math.pi", "math.pow",
     "math.rad", "math.random", "math.randomseed", "math.sin", "math.sqrt",
-    "math.tan", "math.cosh", "math.fmod", "math.modf", "math.sinh", "math.tanh",
+    "math.tan", "math.cosh", "math.sinh", "math.tanh",
     "math.huge",
     -- string
     "string.byte", "string.char", "string.dump", "string.find", "string.len",
     "string.lower", "string.rep", "string.sub", "string.upper", "string.format",
     "string.gfind", "string.gsub", "string.gmatch", "string.match", "string.reverse",
     -- table
-    "table.concat", "table.foreach", "table.foreachi", "table.getn",
-    "table.sort", "table.insert", "table.remove", "table.setn",
+    "table.concat", "table.foreach", "table.foreachi",
+    "table.sort", "table.insert", "table.remove",
     "table.pack", "table.unpack",
     -- os
     "os.clock", "os.date", "os.difftime", "os.execute", "os.exit", "os.getenv",
     "os.remove", "os.rename", "os.setlocale", "os.time", "os.tmpname",
     -- package
     "package.preload", "package.seeall",
-    -- depricated
- -- "math.log10", "table.maxn",
+    -- bit
+    -- ... todo ...
 }
 
 local known_words = { }
diff --git a/tex/context/base/sort-ini.lua b/tex/context/base/sort-ini.lua
index a2d65f28d..b745c9aa5 100644
--- a/tex/context/base/sort-ini.lua
+++ b/tex/context/base/sort-ini.lua
@@ -16,6 +16,7 @@ local gsub, rep, sort, concat = string.gsub, string.rep, table.sort, table.conca
 local utfbyte, utfchar = utf.byte, utf.char
 local utfcharacters, utfvalues, strcharacters = string.utfcharacters, string.utfvalues, string.characters
 local chardata = characters.data
+local next, type, tonumber = next, type, tonumber
 
 local trace_tests = false  trackers.register("sorters.tests", function(v) trace_tests = v end)
 
@@ -26,6 +27,15 @@ sorters.entries      = { }
 sorters.mappings     = { }
 sorters.replacements = { }
 
+sorters.ignored_offset     = 0x10000
+sorters.replacement_offset = 0x10000
+sorters.digits_offset      = 0x20000
+sorters.digits_maximum     = 0xFFFFF
+
+local ignored_offset = sorters.ignored_offset
+local digits_offset  = sorters.digits_offset
+local digits_maximum = sorters.digits_maximum
+
 local mappings     = sorters.mappings
 local entries      = sorters.entries
 local replacements = sorters.replacements
@@ -47,7 +57,9 @@ sorters.setlanguage()
 -- maybe inline code if it's too slow
 
 local function basicsort(sort_a,sort_b)
-    if #sort_a > #sort_b then
+    if not sort_a or not sort_b then
+        return 0
+    elseif #sort_a > #sort_b then
         if #sort_b == 0 then
             return 1
         else
@@ -104,7 +116,7 @@ function sorters.comparers.basic(a,b)
             local eai, ebi = ea[i], eb[i]
             result = basicsort(eai.e,ebi.e)
             if result == 0 then
-                result = basicsort(eai.m,ebi.m)
+                result = basicsort(eai.m,ebi.m) -- only needed it there are m's
             end
             if result ~= 0 then
                 break
@@ -122,13 +134,23 @@ function sorters.comparers.basic(a,b)
     end
 end
 
-local function padd(s) return rep(" ",10-#s) .. s end -- or format with padd
+local function numify(s)
+    return rep(" ",10-#s) .. s -- or format with padd
+end
+
+local function numify(s)
+    s = digits_offset + tonumber(s)
+    if s > digits_maximum then
+        s = digits_maximum
+    end
+    return utfchar(s)
+end
 
 function sorters.strip(str) -- todo: only letters and such utf.gsub("([^%w%d])","")
     if str then
         str = gsub(str,"\\%S*","")
         str = gsub(str,"[%s%[%](){}%$\"\']*","")
-        str = gsub(str,"(%d+)",padd) -- sort numbers properly
+        str = gsub(str,"(%d+)",numify) -- sort numbers properly
         return str
     else
         return ""
@@ -158,17 +180,43 @@ function sorters.splitters.utf(str)
             str = gsub(str,v[1],v[2])
         end
     end
-    local s, m, e, n = { }, { }, { }, 0
+    local s, e, m, n = { }, { }, { }, 0
     for sc in utfcharacters(str) do -- maybe an lpeg
+        local ec, mc = currententries[sc], currentmappings[sc] or utfbyte(sc)
         n = n + 1
-        local mc, ec = currentmappings[sc] or utfbyte(sc), currententries[sc]
         s[n] = sc
-        m[n] = mc
         e[n] = currentmappings[ec] or mc
+        m[n] = mc
     end
-    return { s = s, m = m, e = e }
+    return { s = s, e = e, m = m }
 end
 
+-- we can use one array instead (sort of like in mkii)
+-- but for the moment we do it this way as it is more
+-- handy for tracing
+
+-- function sorters.splitters.utf(str)
+--     if #currentreplacements > 0 then
+--         for k=1,#currentreplacements do
+--             local v = currentreplacements[k]
+--             str = gsub(str,v[1],v[2])
+--         end
+--     end
+--     local s, e, m, n = { }, { }, { }, 0
+--     for sc in utfcharacters(str) do -- maybe an lpeg
+--         local ec, mc = currententries[sc], currentmappings[sc] or utfbyte(sc)
+--         n = n + 1
+--         ec = currentmappings[ec] or mc
+--         s[n] = sc
+--         e[n] = ec
+--         if ec ~= mc then
+--             n = n + 1
+--             e[n] = mc
+--         end
+--     end
+--     return { s = s, e = e }
+-- end
+
 function table.remap(t)
     local tt = { }
     for k,v in next, t do
@@ -185,7 +233,7 @@ local function pack(entry)
             local tt, li = { }, split[i].s
             for j=1,#li do
                 local lij = li[j]
-                tt[j] = utfbyte(lij) > 0xFF00 and "[]" or lij
+                tt[j] = utfbyte(lij) > ignored_offset and "[]" or lij
             end
             t[i] = concat(tt)
         end
@@ -194,7 +242,7 @@ local function pack(entry)
         local t, li = { }, split.s
         for j=1,#li do
             local lij = li[j]
-            t[j] = utfbyte(lij) > 0xFF00 and "[]" or lij
+            t[j] = utfbyte(lij) > ignored_offset and "[]" or lij
         end
         return concat(t)
     end
@@ -228,29 +276,42 @@ end
 
 -- some day we can have a characters.upper and characters.lower
 
-function sorters.add_uppercase_entries(entries)
-    local new = { }
-    for k, v in next, entries do
+function sorters.add_uppercase_replacements(what)
+    local rep, new = replacements[what], { }
+    for i=1,#rep do
+        local r = rep[i]
+        local u = chardata[utfbyte(r[1])].uccode
+        if u then
+            new[utfchar(u)] = r[2]
+        end
+    end
+    for k, v in next, new do
+        rep[k] = v
+    end
+end
+
+function sorters.add_uppercase_entries(what)
+    local ent, new = entries[what], { }
+    for k, v in next, ent do
         local u = chardata[utfbyte(k)].uccode
         if u then
             new[utfchar(u)] = v
         end
     end
     for k, v in next, new do
-        entries[k] = v
+        ent[k] = v
     end
 end
 
-function sorters.add_uppercase_mappings(mappings,offset)
-    local new = { }
-    for k, v in next, mappings do
+function sorters.add_uppercase_mappings(what,offset)
+    local map, new, offset = mappings[what], { }, offset or 0
+    for k, v in next, map do
         local u = chardata[utfbyte(k)].uccode
         if u then
             new[utfchar(u)] = v + offset
         end
     end
-    offset = offset or 0
     for k, v in next, new do
-        mappings[k] = v
+        map[k] = v
     end
 end
diff --git a/tex/context/base/sort-lan.lua b/tex/context/base/sort-lan.lua
index 56af2d16c..ed7e8ba35 100644
--- a/tex/context/base/sort-lan.lua
+++ b/tex/context/base/sort-lan.lua
@@ -6,24 +6,28 @@ if not modules then modules = { } end modules ['sort-lan'] = {
     license   = "see context related readme files"
 }
 
-local utf = unicode.utf8
+-- this is a rather preliminary and incomplete file
+-- maybe we should load this kind of stuff runtime
+
+-- replacements are indexed as they need to be applied in sequence
 
+local utf = unicode.utf8
 local uc = utf.char
 local ub = utf.byte
 
--- this is a rather preliminary and incomplete file
--- maybe we should load this kind of stuff runtime
-
--- english
+local mappings                   = sorters.mappings
+local entries                    = sorters.entries
+local replacements               = sorters.replacements
 
--- The next one can be more efficient when not indexed this way, but
--- other languages are sparse so for the moment we keep this one.
+local add_uppercase_replacements = sorters.add_uppercase_replacements
+local add_uppercase_entries      = sorters.add_uppercase_entries
+local add_uppercase_mappings     = sorters.add_uppercase_mappings
 
--- replacements are indexed as they need to be applied in sequence
+local replacement_offset         = sorters.replacement_offset
 
-sorters = sorters or { entries = { }, replacements = { }, mappings =  { } }
+-- english
 
-sorters.entries['en'] = {
+entries['en'] = {
     ["a"] = "a", ["b"] = "b", ["c"] = "c", ["d"] = "d", ["e"] = "e",
     ["f"] = "f", ["g"] = "g", ["h"] = "h", ["i"] = "i", ["j"] = "j",
     ["k"] = "k", ["l"] = "l", ["m"] = "m", ["n"] = "n", ["o"] = "o",
@@ -38,7 +42,7 @@ sorters.entries['en'] = {
     ["Z"] = "z",
 }
 
-sorters.mappings['en'] = {
+mappings['en'] = {
     ["a"] =  1, ["b"] =  3, ["c"] =  5, ["d"] =  7, ["e"] =  9,
     ["f"] = 11, ["g"] = 13, ["h"] = 15, ["i"] = 17, ["j"] = 19,
     ["k"] = 21, ["l"] = 23, ["m"] = 25, ["n"] = 27, ["o"] = 29,
@@ -64,17 +68,20 @@ sorters.mappings['en'] = {
 
 -- dutch
 
-sorters.replacements['nl'] = { { "ij", 'y' }, { "IJ", 'Y' } }
-sorters.entries     ['nl'] = sorters.entries ['en']
-sorters.mappings    ['nl'] = sorters.mappings['en']
+replacements['nl'] = { { "ij", 'y' }, { "IJ", 'Y' } }
+entries     ['nl'] = entries ['en']
+mappings    ['nl'] = mappings['en']
 
 -- czech
 
-sorters.replacements['cz'] = {
-    [1] = { "ch", uc(0xFF01) }
+local cz_ch = uc(replacement_offset + 1)
+local cz_CH = uc(replacement_offset + 2)
+
+replacements['cz'] = {
+    [1] = { "ch", cz_ch }
 }
 
-sorters.entries['cz'] = {
+entries['cz'] = {
     ['a']        = "a",        -- a
     [uc(0x00E1)] = "a",        -- aacute
     ['b']        = "b",        -- b
@@ -88,7 +95,7 @@ sorters.entries['cz'] = {
     ['f']        = "f",        -- f
     ['g']        = "g",        -- g
     ['h']        = "h",        -- h
-    [uc(0xFF01)] = "ch",       -- ch
+    [cz_ch]      = "ch",       -- ch
     ['i']        = "i",        -- i
     [uc(0x00ED)] = "i",        -- iacute
     ['j']        = "j",        -- j
@@ -118,7 +125,7 @@ sorters.entries['cz'] = {
     [uc(0x017E)] = uc(0x017E), -- zcaron
 }
 
-sorters.mappings['cz'] = {
+mappings['cz'] = {
     ['a']        =  1, -- a
     [uc(0x00E1)] =  3, -- aacute
     ['b']        =  5, -- b
@@ -132,7 +139,7 @@ sorters.mappings['cz'] = {
     ['f']        = 21, -- f
     ['g']        = 23, -- g
     ['h']        = 25, -- h
-    [uc(0xFF01)] = 27, -- ch
+    [cz_ch]      = 27, -- ch
     ['i']        = 29, -- i
     [uc(0x00ED)] = 31, -- iacute
     ['j']        = 33, -- j
@@ -162,30 +169,33 @@ sorters.mappings['cz'] = {
     [uc(0x017E)] = 81, -- zcaron
 }
 
-sorters.add_uppercase_entries (sorters.entries.cz)
-sorters.add_uppercase_mappings(sorters.mappings.cz,0) -- 1 can be option (but then we need a runtime variant)
+add_uppercase_entries ("cz")
+add_uppercase_mappings("cz") -- 1 can be option (but then we need a runtime variant)
+
+entries ['cz'][cz_CH] = entries ['cz'][cz_ch]
+mappings['cz'][cz_CH] = mappings['cz'][cz_ch]
 
-sorters.replacements['cs'] = sorters.replacements['cz']
-sorters.entries     ['cs'] = sorters.entries     ['cz']
-sorters.mappings    ['cs'] = sorters.mappings    ['cz']
+replacements['cs'] = replacements['cz']
+entries     ['cs'] = entries     ['cz']
+mappings    ['cs'] = mappings    ['cz']
 
---~ print(table.serialize(sorters.mappings.cs))
+--~ print(table.serialize(mappings.cs))
 
 -- French
 
-sorters.entries ['fr'] = sorters.entries ['en']
-sorters.mappings['fr'] = sorters.mappings['en']
+entries ['fr'] = entries ['en']
+mappings['fr'] = mappings['en']
 
 -- German (by Wolfgang Schuster)
 
 -- DIN 5007-1
 
-sorters.entries  ['DIN 5007-1'] = sorters.entries ['en']
-sorters.mappings ['DIN 5007-1'] = sorters.mappings['en']
+entries  ['DIN 5007-1'] = entries ['en']
+mappings ['DIN 5007-1'] = mappings['en']
 
 -- DIN 5007-2
 
-sorters.replacements['DIN 5007-2'] = {
+replacements['DIN 5007-2'] = { -- todo: add_uppercase_replacements
     { "ä", 'ae' },
     { "ö", 'oe' },
     { "ü", 'ue' },
@@ -194,104 +204,100 @@ sorters.replacements['DIN 5007-2'] = {
     { "Ü", 'Ue' },
 }
 
-sorters.entries     ['DIN 5007-2'] = sorters.entries ['en']
-sorters.mappings    ['DIN 5007-2'] = sorters.mappings['en']
+--~ add_uppercase_replacements('DIN 5007-2')
+
+entries     ['DIN 5007-2'] = entries ['en']
+mappings    ['DIN 5007-2'] = mappings['en']
 
 -- Duden
 
-sorters.replacements['Duden'] = { { "ß", 's' } }
-sorters.entries     ['Duden'] = sorters.entries ['en']
-sorters.mappings    ['Duden'] = sorters.mappings['en']
+replacements['Duden'] = { { "ß", 's' } }
+entries     ['Duden'] = entries ['en']
+mappings    ['Duden'] = mappings['en']
 
 -- new german
 
-sorters.entries     ['de'] = sorters.entries ['en']
-sorters.mappings    ['de'] = sorters.mappings['en']
+entries     ['de'] = entries ['en']
+mappings    ['de'] = mappings['en']
 
 -- old german
 
-sorters.entries     ['deo'] = sorters.entries ['de']
-sorters.mappings    ['deo'] = sorters.mappings['de']
+entries     ['deo'] = entries ['de']
+mappings    ['deo'] = mappings['de']
 
 -- german - Germany
 
-sorters.entries     ['de-DE'] = sorters.entries ['de']
-sorters.mappings    ['de-DE'] = sorters.mappings['de']
+entries     ['de-DE'] = entries ['de']
+mappings    ['de-DE'] = mappings['de']
 
 -- german - Swiss
 
-sorters.entries     ['de-CH'] = sorters.entries ['de']
-sorters.mappings    ['de-CH'] = sorters.mappings['de']
+entries     ['de-CH'] = entries ['de']
+mappings    ['de-CH'] = mappings['de']
 
 -- german - Austria
 
-sorters.entries['de-AT'] = {
+entries['de-AT'] = {
     ["a"] = "a", ["ä"] = "ä", ["b"] = "b", ["c"] = "c", ["d"] = "d",
     ["e"] = "e", ["f"] = "f", ["g"] = "g", ["h"] = "h", ["i"] = "i",
     ["j"] = "j", ["k"] = "k", ["l"] = "l", ["m"] = "m", ["n"] = "n",
     ["o"] = "o", ["ö"] = "ö", ["p"] = "p", ["q"] = "q", ["r"] = "r",
     ["s"] = "s", ["t"] = "t", ["u"] = "u", ["ü"] = "ü", ["v"] = "v",
     ["w"] = "w", ["x"] = "x", ["y"] = "y", ["z"] = "z",
-    ["A"] = "a", ["Ä"] = "ä", ["B"] = "b", ["C"] = "c", ["D"] = "d",
-    ["E"] = "e", ["F"] = "f", ["G"] = "g", ["H"] = "h", ["I"] = "i",
-    ["J"] = "j", ["K"] = "k", ["L"] = "l", ["M"] = "m", ["N"] = "n",
-    ["O"] = "o", ["Ö"] = "ö", ["P"] = "p", ["Q"] = "q", ["R"] = "r",
-    ["S"] = "s", ["T"] = "t", ["U"] = "u", ["Ü"] = "ü", ["V"] = "v",
-    ["W"] = "w", ["X"] = "x", ["Y"] = "y", ["Z"] = "z",
+--  ["A"] = "a", ["Ä"] = "ä", ["B"] = "b", ["C"] = "c", ["D"] = "d",
+--  ["E"] = "e", ["F"] = "f", ["G"] = "g", ["H"] = "h", ["I"] = "i",
+--  ["J"] = "j", ["K"] = "k", ["L"] = "l", ["M"] = "m", ["N"] = "n",
+--  ["O"] = "o", ["Ö"] = "ö", ["P"] = "p", ["Q"] = "q", ["R"] = "r",
+--  ["S"] = "s", ["T"] = "t", ["U"] = "u", ["Ü"] = "ü", ["V"] = "v",
+--  ["W"] = "w", ["X"] = "x", ["Y"] = "y", ["Z"] = "z",
 }
 
-sorters.mappings['de-AT'] = {
+mappings['de-AT'] = {
     ["a"] =  1, ["ä"] =  3, ["b"] =  5, ["c"] =  7, ["d"] =  9,
     ["e"] = 11, ["f"] = 13, ["g"] = 15, ["h"] = 17, ["i"] = 19,
     ["j"] = 21, ["k"] = 23, ["l"] = 25, ["m"] = 27, ["n"] = 29,
     ["o"] = 31, ["ö"] = 33, ["p"] = 35, ["q"] = 37, ["r"] = 39,
     ["s"] = 41, ["t"] = 43, ["u"] = 45, ["ü"] = 47, ["v"] = 49,
     ["w"] = 51, ["x"] = 53, ["y"] = 55, ["z"] = 57,
-    ["A"] =  2, ["Ä"] =  4, ["B"] =  6, ["C"] =  8, ["D"] = 10,
-    ["E"] = 12, ["F"] = 14, ["G"] = 16, ["H"] = 18, ["I"] = 20,
-    ["J"] = 22, ["K"] = 24, ["L"] = 26, ["M"] = 28, ["N"] = 30,
-    ["O"] = 32, ["Ö"] = 34, ["P"] = 36, ["Q"] = 38, ["R"] = 40,
-    ["S"] = 42, ["T"] = 44, ["U"] = 46, ["Ü"] = 48, ["V"] = 50,
-    ["W"] = 52, ["X"] = 54, ["Y"] = 56, ["Z"] = 58,
+--  ["A"] =  2, ["Ä"] =  4, ["B"] =  6, ["C"] =  8, ["D"] = 10,
+--  ["E"] = 12, ["F"] = 14, ["G"] = 16, ["H"] = 18, ["I"] = 20,
+--  ["J"] = 22, ["K"] = 24, ["L"] = 26, ["M"] = 28, ["N"] = 30,
+--  ["O"] = 32, ["Ö"] = 34, ["P"] = 36, ["Q"] = 38, ["R"] = 40,
+--  ["S"] = 42, ["T"] = 44, ["U"] = 46, ["Ü"] = 48, ["V"] = 50,
+--  ["W"] = 52, ["X"] = 54, ["Y"] = 56, ["Z"] = 58,
 }
 
--- finish (by Wolfgang Schuster)
+add_uppercase_entries ('de-AT')
+add_uppercase_mappings('de-AT',1)
 
-sorters.entries['fi'] = {
-    [ 1] = "a", [ 3] = "b", [ 5] = "c", [ 7] = "d", [ 9] = "e",
-    [11] = "f", [13] = "g", [15] = "h", [17] = "i", [19] = "j",
-    [21] = "k", [23] = "l", [25] = "m", [27] = "n", [29] = "o",
-    [31] = "p", [33] = "q", [35] = "r", [37] = "s", [39] = "t",
-    [41] = "u", [43] = "v", [45] = "w", [47] = "x", [49] = "y",
-    [51] = "z", [53] = "å", [55] = "ä", [57] = "ö",
-    [ 2] =   1, [ 4] =   3, [ 6] =   5, [ 8] =   7, [10] =   9,
-    [12] =  11, [14] =  13, [16] =  15, [18] =  17, [20] =  19,
-    [22] =  21, [24] =  23, [26] =  25, [28] =  27, [30] =  29,
-    [32] =  31, [34] =  33, [36] =  35, [38] =  37, [40] =  39,
-    [42] =  41, [44] =  43, [46] =  45, [48] =  47, [50] =  49,
-    [52] =  51, [54] =  53, [56] =  55, [58] =  57,
-}
+-- finish (by Wolfgang Schuster)
 
-sorters.entries['fi'] = {
+entries['fi'] = {
     ["a"] = "a", ["b"] = "b", ["c"] = "c", ["d"] = "d", ["e"] = "e",
     ["f"] = "f", ["g"] = "g", ["h"] = "h", ["i"] = "i", ["j"] = "j",
     ["k"] = "k", ["l"] = "l", ["m"] = "m", ["n"] = "n", ["o"] = "o",
     ["p"] = "p", ["q"] = "q", ["r"] = "r", ["s"] = "s", ["t"] = "t",
     ["u"] = "u", ["v"] = "v", ["w"] = "w", ["x"] = "x", ["y"] = "y",
     ["z"] = "z", ["å"] = "å", ["ä"] = "ä", ["ö"] = "ö",
-    ["A"] = "a", ["B"] = "b", ["C"] = "c", ["D"] = "d", ["E"] = "e",
-    ["F"] = "f", ["G"] = "g", ["H"] = "h", ["I"] = "i", ["J"] = "j",
-    ["K"] = "k", ["L"] = "l", ["M"] = "m", ["N"] = "n", ["O"] = "o",
-    ["P"] = "p", ["Q"] = "q", ["R"] = "r", ["S"] = "s", ["T"] = "t",
-    ["U"] = "u", ["V"] = "v", ["W"] = "w", ["X"] = "x", ["Y"] = "y",
-    ["Z"] = "z", ["Å"] = "å", ["Ä"] = "ä", ["Ö"] = "ö",
 }
 
+mappings['fi'] = {
+    ["a"] =  1, ["b"] =  3, ["c"] =  5, ["d"] =  7, ["e"] =  9,
+    ["f"] = 11, ["g"] = 13, ["h"] = 15, ["i"] = 17, ["j"] = 19,
+    ["k"] = 21, ["l"] = 23, ["m"] = 25, ["n"] = 27, ["o"] = 29,
+    ["p"] = 31, ["q"] = 33, ["r"] = 35, ["s"] = 37, ["t"] = 39,
+    ["u"] = 41, ["v"] = 43, ["w"] = 45, ["x"] = 47, ["y"] = 49,
+    ["z"] = 51, ["å"] = 53, ["ä"] = 55, ["ö"] = 57,
+}
+
+add_uppercase_entries ("fi")
+add_uppercase_mappings("fi")
+
 -- slovenian
 --
 -- MM: this will change since we need to add accented vowels
 
-sorters.entries['sl'] = {
+entries['sl'] = {
     ["a"] = "a", ["b"] = "b", ["c"] = "c", ["č"] = "č", ["ć"] = "ć", ["d"] = "d",
     ["đ"] = "đ", ["e"] = "e", ["f"] = "f", ["g"] = "g", ["h"] = "h", ["i"] = "i",
     ["j"] = "j", ["k"] = "k", ["l"] = "l", ["m"] = "m", ["n"] = "n", ["o"] = "o",
@@ -300,8 +306,7 @@ sorters.entries['sl'] = {
     ["ž"] = "ž",
 }
 
-
-sorters.mappings['sl'] = {
+mappings['sl'] = {
     ["a"] =  1, ["b"] =  3, ["c"] =  5, ["č"] =  7, ["ć"] =  9, ["d"] = 11,
     ["đ"] = 13, ["e"] = 15, ["f"] = 17, ["g"] = 19, ["h"] = 21, ["i"] = 23,
     ["j"] = 25, ["k"] = 27, ["l"] = 29, ["m"] = 31, ["n"] = 33, ["o"] = 35,
@@ -310,45 +315,5 @@ sorters.mappings['sl'] = {
     ["ž"] = 61,
 }
 
-sorters.add_uppercase_entries (sorters.entries.sl)
-sorters.add_uppercase_mappings(sorters.mappings.sl,0) -- cf. MM
-
---~ sorters.test = ''
---~ sorters.test = 'nl'
---~ sorters.test = 'cz'
-
---~ if sorters.test == 'nl' then -- dutch test
-
---~     data = {
---~         { 'e', { {"ijsco",""} },2,"","","",""},
---~         { 'e', { {"ysco" ,""} },2,"","","",""},
---~         { 'e', { {"ijsco",""} },2,"","","",""},
---~         { 'e', { {"hans" ,""}, {"aap" ,""} },2,"","","",""},
---~         { 'e', { {"$a$"  ,""} },2,"","","",""},
---~         { 'e', { {"aap"  ,""} },2,"","","",""},
---~         { 'e', { {"hans" ,""}, {"aap" ,""} },6,"","","",""},
---~         { 'e', { {"hans" ,""}, {"noot",""} },2,"","","",""},
---~         { 'e', { {"hans" ,""}, {"mies",""} },2,"","","",""},
---~         { 'e', { {"hans" ,""}, {"mies",""} },2,"","","",""},
---~         { 'e', { {"hans" ,""}, {"mies",""}, [3] = {"oeps",""} },2,"","","",""},
---~         { 'e', { {"hans" ,""}, {"mies",""}, [3] = {"oeps",""} },4,"","","",""},
---~     }
---~     sorters.index.process({ entries = data, language = 'nl'})
-
---~ elseif sorters.test == 'cz' then -- czech test
-
---~     data = {
---~         { 'e', { {"blabla",""} },2,"","","",""},
---~         { 'e', { {"czacza",""} },2,"","","",""},
---~         { 'e', { {"albalb",""} },2,"","","",""},
---~         { 'e', { {"azcazc",""} },2,"","","",""},
---~         { 'e', { {"chacha",""} },2,"","","",""},
---~         { 'e', { {"hazzah",""} },2,"","","",""},
---~         { 'e', { {"iaccai",""} },2,"","","",""},
---~     }
---~     sorters.index.process({ entries = data, language = 'cz'})
-
---~ end
-
-
---~ print(table.serialize(sorters))
+add_uppercase_entries ("sl")
+add_uppercase_mappings("sl") -- cf. MM
diff --git a/tex/context/base/supp-vis.tex b/tex/context/base/supp-vis.tex
index 82ada9202..f38c8e1e3 100644
--- a/tex/context/base/supp-vis.tex
+++ b/tex/context/base/supp-vis.tex
@@ -201,11 +201,12 @@
 %D offers \type{\hfilneg} and \type{\vfilneg}, we define our
 %D own alternative double \type{ll}'ed ones.
 
-\def\hfillneg
-  {\normalhskip\zeropoint \!!plus-1fill\relax}
-
-\def\vfillneg
-  {\normalvskip\zeropoint \!!plus-1fill\relax}
+\def\hfilneg  {\normalhskip\zeropoint \!!plus-1fil\relax}
+\def\vfilneg  {\normalvskip\zeropoint \!!plus-1fil\relax}
+\def\hfillneg {\normalhskip\zeropoint \!!plus-1fill\relax}
+\def\vfillneg {\normalvskip\zeropoint \!!plus-1fill\relax}
+\def\hfilllneg{\normalhskip\zeropoint \!!plus-1filll\relax}
+\def\vfilllneg{\normalvskip\zeropoint \!!plus-1filll\relax}
 
 %D \macros
 %D   {normalhss,normalhfil,normalhfill,