ConTeXt 2012.05.14 16:00

git-svn-id: svn://tug.org/texlive/trunk@26371 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 48 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/context/base/char-utf.lua b/Master/texmf-dist/tex/context/base/char-utf.lua
index 30124a6a2a6..a411c2d82a6 100644
--- a/Master/texmf-dist/tex/context/base/char-utf.lua
+++ b/Master/texmf-dist/tex/context/base/char-utf.lua
@@ -27,6 +27,7 @@ local allocate = utilities.storage.allocate
 local charfromnumber = characters.fromnumber
 
 -- todo: trackers
+-- graphemes: basic symbols
 
 characters            = characters or { }
 local characters      = characters
@@ -34,6 +35,9 @@ local characters      = characters
 characters.graphemes  = allocate()
 local graphemes       = characters.graphemes
 
+characters.combined   = allocate()
+local combined        = characters.combined
+
 characters.decomposed = allocate()
 local decomposed      = characters.decomposed
 
@@ -46,6 +50,8 @@ local filters         = characters.filters
 filters.utf           = filters.utf  or { }
 local utffilters      = characters.filters.utf
 
+-- is characters.combined cached?
+
 --[[ldx--
 <p>It only makes sense to collapse at runtime, since we don't expect
 source code to depend on collapsing.</p>
@@ -72,33 +78,48 @@ local decomposed = allocate {
 }
 characters.decomposed = decomposed
 
-local function initialize()
-    for unicode, v in next, characters.data do
+local function initialize() -- maybe only 'mn'
+    local data = characters.data
+    for unicode, v in next, data do
         -- using vs and first testing for length is faster (.02->.01 s)
         local vs = v.specials
-        if vs and #vs == 3 and vs[1] == 'char' then
+        local vc = vs and #vs == 3 and vs[1]
+        if vc == "char" then
             local one, two = vs[2], vs[3]
-            local first, second, combined = utfchar(one), utfchar(two), utfchar(unicode)
+            if data[two].category == "mn" then
+                local cgf = combined[one]
+                if not cgf then
+                    cgf = { [two] = unicode }
+                    combined[one]  = cgf
+                else
+                    cgf[two] = unicode
+                end
+            end
+            local first, second, combination = utfchar(one), utfchar(two), utfchar(unicode)
             local cgf = graphemes[first]
             if not cgf then
-                cgf = { }
+                cgf = { [second] = combination }
                 graphemes[first] = cgf
+            else
+                cgf[second] = combination
             end
-            cgf[second] = combined
             if v.mathclass or v.mathspec then
                 local mps = mathpairs[two]
                 if not mps then
-                    mps = { }
+                    mps = { [one] = unicode }
                     mathpairs[two] = mps
+                else
+                    mps[one] = unicode -- here unicode
                 end
-                mps[one] = unicode -- here unicode
                 local mps = mathpairs[second]
                 if not mps then
-                    mps = { }
+                    mps = { [first] = combination }
                     mathpairs[second] = mps
+                else
+                    mps[first] = combination
                 end
-                mps[first] = combined
             end
+     -- elseif vc == "compat" then
      -- else
      --     local description = v.description
      --     if find(description,"LIGATURE") then
@@ -122,8 +143,11 @@ local function initialize()
         end
     end
     initialize = false
+    characters.initialize = function() end -- when used outside tex
 end
 
+characters.initialize = initialize
+
 -- utffilters.addgrapheme(utfchar(318),'l','\string~')
 -- utffilters.addgrapheme('c','a','b')
 
@@ -440,17 +464,23 @@ function utffilters.decompose(str)
     return str
 end
 
-local textfileactions = resolvers.openers.helpers.textfileactions
+local sequencers = utilities.sequencers
+
+if sequencers then
 
-utilities.sequencers.appendaction (textfileactions,"system","characters.filters.utf.collapse")
-utilities.sequencers.disableaction(textfileactions,"characters.filters.utf.collapse")
+    local textfileactions = resolvers.openers.helpers.textfileactions
 
-utilities.sequencers.appendaction (textfileactions,"system","characters.filters.utf.decompose")
-utilities.sequencers.disableaction(textfileactions,"characters.filters.utf.decompose")
+    sequencers.appendaction (textfileactions,"system","characters.filters.utf.collapse")
+    sequencers.disableaction(textfileactions,"characters.filters.utf.collapse")
+
+    sequencers.appendaction (textfileactions,"system","characters.filters.utf.decompose")
+    sequencers.disableaction(textfileactions,"characters.filters.utf.decompose")
+
+    function characters.filters.utf.enable()
+        sequencers.enableaction(textfileactions,"characters.filters.utf.collapse")
+        sequencers.enableaction(textfileactions,"characters.filters.utf.decompose")
+    end
 
-function characters.filters.utf.enable()
-    utilities.sequencers.enableaction(textfileactions,"characters.filters.utf.collapse")
-    utilities.sequencers.enableaction(textfileactions,"characters.filters.utf.decompose")
 end
 
 --[[ldx--