beta 2012.10.16 23:38

10 files changed, 15 insertions, 7 deletions

diff --git a/tex/context/base/chem-str.lua b/tex/context/base/chem-str.lua
index 34b5ba7af..844284b79 100644
--- a/tex/context/base/chem-str.lua
+++ b/tex/context/base/chem-str.lua
@@ -230,15 +230,23 @@ local function process(spec,text,n,rulethickness,rulecolor,offset)
     local txt = #stack
     local m = #metacode
     for i=1,#spec do
-        local s = spec[i]
+        local step = spec[i]
+        local s = lower(step)
         local d = definitions[s]
         if d then
+            if trace_structure then
+                report_chemistry("%s => definition: %s",step,s)
+            end
             for i=1,#d do
                 local di = d[i]
                 process(di.spec,di.text,1,rulethickness,rulecolor)
             end
         else
-            local rep, operation, special, index, upto, set, text = lpegmatch(pattern,s)
+            local rep, operation, special, index, upto, set, text = lpegmatch(pattern,step)
+            if trace_structure then
+                report_chemistry("%s => rep: %s, operation: %s, special: %s, index: %s, upto: %s, set: %s, text: %s",
+                    step,rep or "?",operation or "?",special or "?",index or "?",upto or "?",set or "?",text or "?")
+            end
             if operation == "pb" then
                 insert(pstack,variant)
                 m = m + 1 ; metacode[m] = syntax.pb.direct
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 017508a6f..e894ad522 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.10.16 22:12}
+\newcontextversion{2012.10.16 23:38}
 
 %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index b0c938c35..d039d5aec 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{2012.10.16 22:12}
+\newcontextversion{2012.10.16 23:38}
 
 %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 1fb36e726..322ff3a27 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 34013308e..4c22e68e1 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 04ca4b0b4..c7442f646 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.10.16 22:12}
+\edef\contextversion{2012.10.16 23:38}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 36c86b936..6b25f4ddb 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{2012.10.16 22:12}
+\edef\contextversion{2012.10.16 23:38}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 85d08b2dc..cfa720a48 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 3486f2ff0..54202c732 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 04af40c84..891238ff9 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  : 10/16/12 22:12:54
+-- merge date  : 10/16/12 23:38:52
 
 do -- begin closure to overcome local limits and interference