beta 2013.01.22 18:33

22 files changed, 67 insertions, 95 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 2d272051e..6aa0a82d5 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{2013.01.21 18:18}
+\newcontextversion{2013.01.22 18:33}
 
 %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 e30f91f58..2e0a6c4c4 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.01.21 18:18}
+\newcontextversion{2013.01.22 18:33}
 
 %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 1e37d5bb4..1318060a5 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 beb1a9ba9..26753f6a0 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 0796a482c..b6f91d1ed 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{2013.01.21 18:18}
+\edef\contextversion{2013.01.22 18:33}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index db76f786a..3e85c4426 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.01.21 18:18}
+\edef\contextversion{2013.01.22 18:33}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/font-mis.lua b/tex/context/base/font-mis.lua
index c103d57d5..cfef770d7 100644
--- a/tex/context/base/font-mis.lua
+++ b/tex/context/base/font-mis.lua
@@ -22,7 +22,7 @@ local handlers = fonts.handlers
 handlers.otf   = handlers.otf or { }
 local otf      = handlers.otf
 
-otf.version    = otf.version or 2.738
+otf.version    = otf.version or 2.740
 otf.cache      = otf.cache   or containers.define("fonts", "otf", otf.version, true)
 
 function otf.loadcached(filename,format,sub)
diff --git a/tex/context/base/font-otf.lua b/tex/context/base/font-otf.lua
index 4d0828209..782e2d194 100644
--- a/tex/context/base/font-otf.lua
+++ b/tex/context/base/font-otf.lua
@@ -47,7 +47,7 @@ local otf                = fonts.handlers.otf
 
 otf.glists               = { "gsub", "gpos" }
 
-otf.version              = 2.738 -- beware: also sync font-mis.lua
+otf.version              = 2.740 -- beware: also sync font-mis.lua
 otf.cache                = containers.define("fonts", "otf", otf.version, true)
 
 local fontdata           = fonts.hashes.identifiers
diff --git a/tex/context/base/font-otp.lua b/tex/context/base/font-otp.lua
index fc98b2bdc..62368adc0 100644
--- a/tex/context/base/font-otp.lua
+++ b/tex/context/base/font-otp.lua
@@ -11,6 +11,7 @@ if not modules then modules = { } end modules ['font-otp'] = {
 
 local next, type = next, type
 local sort, concat = table.sort, table.concat
+local sortedhash = table.sortedhash
 
 local trace_packing = false  trackers.register("otf.packing", function(v) trace_packing = v end)
 local trace_loading = false  trackers.register("otf.loading", function(v) trace_loading = v end)
@@ -99,18 +100,17 @@ local function tabstr_boolean(t)
     end
 end
 
--- -- saves only a few tens of bytes
---
--- local function stripdata(data)
---     for k, v in next, data do
---         if not v or v == "" then
---             data[k] = nil
---         elseif type(v) == "table" then
---             stripdata(v) -- keep empty tables
---         end
---     end
+-- tabstr_boolean_x = tabstr_boolean
+
+-- tabstr_boolean = function(t)
+--     local a = tabstr_normal(t)
+--     local b = tabstr_boolean_x(t)
+--     print(a)
+--     print(b)
+--     return b
 -- end
 
+
 local function packdata(data)
     if data then
      -- stripdata(data)
@@ -118,7 +118,7 @@ local function packdata(data)
         local hh, tt, cc = { }, { }, { }
         local nt, ntt = 0, 0
         local function pack_normal(v)
-            local tag = tabstr_normal(v,flat)
+            local tag = tabstr_normal(v)
             local ht = h[tag]
             if ht then
                 c[ht] = c[ht] + 1
@@ -319,18 +319,18 @@ local function packdata(data)
                 for _, lookup in next, lookups do
                     local rules = lookup.rules
                     if rules then
-                        for i=1,#rules do -- was next loop
+                        for i=1,#rules do
                             local rule = rules[i]
                             local r = rule.before       if r then for i=1,#r do r[i] = pack_boolean(r[i]) end end
                             local r = rule.after        if r then for i=1,#r do r[i] = pack_boolean(r[i]) end end
                             local r = rule.current      if r then for i=1,#r do r[i] = pack_boolean(r[i]) end end
-                            local r = rule.replacements if r then rule.replacements  = pack_boolean(r)        end
-                            local r = rule.lookups      if r then rule.lookups       = pack_boolean(r)        end
+                            local r = rule.replacements if r then rule.replacements  = pack_flat   (r)    end
+                            local r = rule.lookups      if r then rule.lookups       = pack_indexed(r)    end
                         end
                     end
                 end
             end
-            local anchor_to_lookup = resources.anchor_to_lookup
+            local anchor_to_lookup  = resources.anchor_to_lookup
             if anchor_to_lookup then
                 for anchor, lookup in next, anchor_to_lookup do
                     anchor_to_lookup[anchor] = pack_normal(lookup)
diff --git a/tex/context/base/l-string.lua b/tex/context/base/l-string.lua
index 828285ca1..b6e3576f0 100644
--- a/tex/context/base/l-string.lua
+++ b/tex/context/base/l-string.lua
@@ -99,7 +99,6 @@ function string.is_empty(str)
     end
 end
 
-
 -- if not string.escapedpattern then
 --
 --     local patterns_escapes = {
diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/meta-ini.mkiv
index aea43ee87..ef7e86540 100644
--- a/tex/context/base/meta-ini.mkiv
+++ b/tex/context/base/meta-ini.mkiv
@@ -566,7 +566,7 @@
 
 \unexpanded\def\meta_obey_box_origin
   {\setbox\b_meta_graphic\hbox\bgroup
-     \hskip\MPllx\raise\MPlly\box\b_meta_graphic
+     \kern\MPllx\raise\MPlly\box\b_meta_graphic
    \egroup}
 
 \unexpanded\def\obeyMPboxdepth  {\let\meta_relocate_box\meta_obey_box_depth  }
diff --git a/tex/context/base/mlib-pps.mkiv b/tex/context/base/mlib-pps.mkiv
index 3ecabc1c3..f21d84e0d 100644
--- a/tex/context/base/mlib-pps.mkiv
+++ b/tex/context/base/mlib-pps.mkiv
@@ -126,7 +126,7 @@
 
 \def\doMPLIBstopgroup#1#2#3#4#5#6% some day this might happen elsewhere
   {\egroup
-   \setbox\scratchbox\hbox{\hskip\onebasepoint\box\scratchbox}% weird correction
+   \setbox\scratchbox\hbox{\kern\onebasepoint\box\scratchbox}% weird correction
    \wd\scratchbox \dimexpr#5\onebasepoint-#3\onebasepoint+2\onebasepoint\relax
    \ht\scratchbox #6\onebasepoint
    \dp\scratchbox-#4\onebasepoint
@@ -134,8 +134,8 @@
      attr      {/Group << /S /Transparency /I \ifnum#1=1 true \else false \fi /K \ifnum#1=1 true \else false \fi >>}
      resources {\pdfbackendcurrentresources}
      \scratchbox
-   \setbox\scratchbox\hbox\bgroup\hskip-\onebasepoint\pdfrefxform\pdflastxform\egroup
-   \setbox\scratchbox\hbox\bgroup\hskip-\onebasepoint\pdfrefxform\pdflastxform\egroup
+   \setbox\scratchbox\hbox\bgroup\kern-\onebasepoint\pdfrefxform\pdflastxform\egroup
+   \setbox\scratchbox\hbox\bgroup\kern-\onebasepoint\pdfrefxform\pdflastxform\egroup
    \wd\scratchbox\zeropoint
    \ht\scratchbox\zeropoint
    \dp\scratchbox\zeropoint
diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mult-low.lua
index 9b95be3cd..bdce5af7e 100644
--- a/tex/context/base/mult-low.lua
+++ b/tex/context/base/mult-low.lua
@@ -332,6 +332,8 @@ return {
         "obeylualines", "obeyluatokens",
         "startluacode", "stopluacode", "startlua", "stoplua",
         --
+        "carryoverpar",
+        --
         "Umathbotaccent",
     }
 }
diff --git a/tex/context/base/pack-box.mkiv b/tex/context/base/pack-box.mkiv
index 5829657d7..f8b36691c 100644
--- a/tex/context/base/pack-box.mkiv
+++ b/tex/context/base/pack-box.mkiv
@@ -233,7 +233,7 @@
    \global\advance\boxhdisplacement\d_pack_layers_x_position
    \ifdim\boxhdisplacement<\zeropoint
      \global\setbox\b_pack_boxes_collector\hbox
-       {\hskip-\boxhdisplacement
+       {\kern-\boxhdisplacement
         \box\b_pack_boxes_collector}%
    \fi
    \global\advance\boxvdisplacement\d_pack_layers_y_position
@@ -246,7 +246,7 @@
    \d_pack_layers_y_size\htdp\b_pack_boxes_collector
    \global\setbox\b_pack_boxes_collector\hbox
      {\box\b_pack_boxes_collector
-      \hskip\dimexpr
+      \kern\dimexpr
         -\d_pack_layers_x_size
         +\d_pack_layers_x_position
          \ifdim\boxhdisplacement<\zeropoint
@@ -888,12 +888,12 @@
      \setbox\nextbox\vbox
        {\forgetall % already done
         \offinterlineskip
-        \vskip\scratchtopoffset
+        \kern\scratchtopoffset
         \hbox
-          {\hskip\scratchleftoffset
+          {\kern\scratchleftoffset
            \box\nextbox
-           \hskip\scratchrightoffset}%
-        \vskip\scratchbottomoffset}%
+           \kern\scratchrightoffset}%
+        \kern\scratchbottomoffset}%
      \ht\nextbox\htdp\nextbox
      \dp\nextbox\zeropoint
    \fi
@@ -902,7 +902,7 @@
    \scratchdepth \offsetboxparameter\c!depth
    \edef\p_location{\offsetboxparameter\c!location}%
    \setbox\nextbox\hbox
-     {\hskip\scratchxposition
+     {\kern\scratchxposition
       \lower\scratchyposition\hbox
         {\ifx\p_location\empty
            \box\nextbox
diff --git a/tex/context/base/pack-com.mkiv b/tex/context/base/pack-com.mkiv
index d0768d97c..113ae89ab 100644
--- a/tex/context/base/pack-com.mkiv
+++ b/tex/context/base/pack-com.mkiv
@@ -291,7 +291,7 @@
   {\aligntab
    \aligntab
    \aligntab
-   \hskip\p_distance
+   \kern\p_distance
    \aligntab
    \pack_combinations_pickup}
 
@@ -619,12 +619,12 @@
 
 \def\pack_pairedboxes_flush_left
   {\box\b_pack_pairedboxes_second
-   \hskip\pairedboxparameter\c!distance
+   \kern\pairedboxparameter\c!distance
    \box\b_pack_pairedboxes_first}
 
 \def\pack_pairedboxes_flush_right
   {\box\b_pack_pairedboxes_first
-   \hskip\pairedboxparameter\c!distance
+   \kern\pairedboxparameter\c!distance
    \box\b_pack_pairedboxes_second}
 
 \def\pack_pairedboxes_flush_top
diff --git a/tex/context/base/page-box.mkvi b/tex/context/base/page-box.mkvi
index 58a5627cb..8f5647a14 100644
--- a/tex/context/base/page-box.mkvi
+++ b/tex/context/base/page-box.mkvi
@@ -99,7 +99,7 @@
   {\setbox#box\vbox
      {\offinterlineskip
       \dorecurse{\layoutparameter\c!ny}
-        {\hbox{\dorecurse{\layoutparameter\c!nx}{\copy#box\hskip\layoutparameter\c!dx}\unskip}%
+        {\hbox{\dorecurse{\layoutparameter\c!nx}{\copy#box\kern\layoutparameter\c!dx}\unskip}%
          \vskip\layoutparameter\c!dy}
       \unskip}}
 
@@ -194,7 +194,7 @@
       \advance\scratchwidth \scratchoffset
       \ifconditional#right\relax
          \scratchdimen-\scratchoffset
-         \hskip\scratchdimen
+         \kern\scratchdimen
       \else
          \scratchdimen\zeropoint
       \fi
@@ -227,10 +227,10 @@
       \doifbothsides
         {\advance\scratchwidth\scratchoffset
          \scratchdimen-\scratchoffset
-         \hskip\scratchdimen}%
+         \kern\scratchdimen}%
         {\scratchdimen\zeropoint}
         {\scratchdimen-\scratchoffset
-         \hskip\scratchdimen}%
+         \kern\scratchdimen}%
       \lower\scratchoffset\hbox
         {\clip
            [\c!hoffset=\scratchdimen,
diff --git a/tex/context/base/page-txt.mkvi b/tex/context/base/page-txt.mkvi
index dc445e0e1..707af25e9 100644
--- a/tex/context/base/page-txt.mkvi
+++ b/tex/context/base/page-txt.mkvi
@@ -555,40 +555,40 @@
   {\edef\currentlayoutelement{\currentlayouttextline:\v!edge}%
    \page_layouts_place_element_indeed\leftedgewidth
      {\hss\layoutelementparameter#parameter}%
-   \hskip\leftedgedistance}
+   \kern\leftedgedistance}
 
 \def\page_layouts_left_margin_element#parameter#extrastate%
   {\edef\currentlayoutelement{\currentlayouttextline:\v!margin}%
    \page_layouts_place_element_indeed\leftmarginwidth
      {\hbox to \leftmarginwidth{\hss\layoutelementparameter#parameter}%
       \ifnum#extrastate=\page_layouts_extra_at_margin_left
-        \hskip-\leftmarginwidth
+        \kern-\leftmarginwidth
         \hbox to \leftmarginwidth{\hss\layoutelementparameter\c!margintext}%
       \fi}%
-   \hskip\leftmargindistance}
+   \kern\leftmargindistance}
 
 \def\page_layouts_text_body_element#left#middle#right#extrastate%
   {\edef\currentlayoutelement{\currentlayouttextline:\v!text}%
    \page_layouts_place_element_indeed\makeupwidth
      {\hbox to \makeupwidth{\ifnum#extrastate=\page_layouts_extra_at_margin_left\page_layouts_place_extra_text_left\fi\layoutelementparameter#left\hss}%
-      \hskip-\makeupwidth
+      \kern-\makeupwidth
       \hbox to \makeupwidth{\hss\layoutelementparameter#middle\hss}%
-      \hskip-\makeupwidth
+      \kern-\makeupwidth
       \hbox to \makeupwidth{\hss\layoutelementparameter#right\ifnum#extrastate=\page_layouts_extra_at_margin_right\page_layouts_place_extra_text_right\fi}}}
 
 \def\page_layouts_right_margin_element#parameter#extrastate%
   {\edef\currentlayoutelement{\currentlayouttextline:\v!margin}%
-   \hskip\rightmargindistance
+   \kern\rightmargindistance
    \page_layouts_place_element_indeed\rightmarginwidth
      {\hbox to \rightmarginwidth{\layoutelementparameter#parameter\hss}%
       \ifnum#extrastate=\page_layouts_extra_at_margin_right
-        \hskip-\rightmarginwidth
+        \kern-\rightmarginwidth
         \hbox to \rightmarginwidth{\layoutelementparameter\c!margintext\hss}%
       \fi}}
 
 \def\page_layouts_right_edge_element#parameter%
   {\edef\currentlayoutelement{\currentlayouttextline:\v!edge}%
-   \hskip\rightedgedistance
+   \kern\rightedgedistance
    \page_layouts_place_element_indeed\rightedgewidth
      {\layoutelementparameter#parameter\hss}}
 
@@ -619,8 +619,8 @@
 
 %D This code will move to \type {page-flt.tex}.
 
-\appendtoks \placerightmarginblock \hskip-\rightmarginwidth \to \rightmargintextcontent
-\appendtoks \placeleftmarginblock  \hskip-\leftmarginwidth  \to \leftmargintextcontent
+\appendtoks \placerightmarginblock \kern-\rightmarginwidth \to \rightmargintextcontent
+\appendtoks \placeleftmarginblock  \kern-\leftmarginwidth  \to \leftmargintextcontent
 
 %D \macros
 %D   {definetext}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 0c20b0e47..9db601262 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 8f0c2a65d..06121b179 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/supp-box.mkiv b/tex/context/base/supp-box.mkiv
index 84ae00da1..8ab205d4c 100644
--- a/tex/context/base/supp-box.mkiv
+++ b/tex/context/base/supp-box.mkiv
@@ -1989,7 +1989,7 @@
    \scratchwidth\wd\ifdim\wd\nextbox>\wd\processbox\nextbox\else\processbox\fi
    \setbox\processbox\hbox to \scratchwidth
      {\hbox to \scratchwidth{\hss\box\processbox\hss}%
-      \hskip-\scratchwidth
+      \kern-\scratchwidth
       \hbox to \scratchwidth{\hss\box\nextbox   \hss}}}
 
 \unexpanded\def\startoverlay
diff --git a/tex/context/base/tabl-tbl.mkiv b/tex/context/base/tabl-tbl.mkiv
index 03e716e40..b5c3b0064 100644
--- a/tex/context/base/tabl-tbl.mkiv
+++ b/tex/context/base/tabl-tbl.mkiv
@@ -400,11 +400,11 @@
 % \unexpanded % we can expand this one
 \def\tabl_tabulate_inject_pre_skip#1%
   {\ifdim#1>\zeropoint
-     \hskip#1\relax
+     \kern#1\relax % was \hskip
    \else\ifnum\c_tabl_tabulate_column=\zerocount
      \ifconditional\c_tabl_tabulate_autorulespacing
        \ifcase\c_tabl_tabulate_has_rule_spec_first\else
-         \hskip\s_tabl_tabulate_first\relax
+         \kern\s_tabl_tabulate_first\relax % was \hskip
        \fi
      \fi
    \fi\fi}
@@ -412,11 +412,11 @@
 % \unexpanded % we can expand this one
 \def\tabl_tabulate_inject_post_skip#1%
   {\ifdim#1>\zeropoint
-     \hskip#1\relax
+     \kern#1\relax % was \hskip
    \else\ifnum\c_tabl_tabulate_columns=\c_tabl_tabulate_nofcolumns
      \ifconditional\c_tabl_tabulate_autorulespacing
        \ifcase\c_tabl_tabulate_has_rule_spec_last\else
-         \hskip\s_tabl_tabulate_last\relax
+         \kern\s_tabl_tabulate_last\relax % was \hskip
        \fi
      \fi
    \fi\fi}
@@ -1451,35 +1451,6 @@
     \let\tabl_tabulate_hrule_inject\tabl_tabulate_hrule_inject_second
 \to \t_tabl_tabulate_initializers_second
 
-% \def\totaltabulatecolumns{0}
-%
-% \def\donormaltabulatehlinerule
-%   {\leaders \hrule
-%      \s!height\dimexpr.5\lineheight-\strutdepth
-%      \s!depth-\dimexpr.5\lineheight-\strutdepth+\d_tabl_tabulate_hrulethickness_local
-%      \hfill}
-%
-% \def\docoloredtabulatehlinerule
-%   {\dousecolorparameter\currenttabulationlocalhrulecolor
-%    \donormaltabulatehlinerule}
-%
-% \def\dotabulatelinerule
-%   {\multispan\totaltabulatecolumns % \multispan is a plain macro
-%    % for the moment this one
-%    \strut\hskip\d_tabl_tabulate_margin
-%    % neg values are ok !
-%    \hskip\d_tabl_tabulate_indent\relax % new august 2003
-%    \ifcase\d_tabl_tabulate_hrulethickness_local\else
-%      \iftrialtypesetting % does not happen as we nil the caller
-%        \donormaltabulatehlinerule
-%      \else\ifx\currenttabulationlocalhrulecolor\empty
-%        \donormaltabulatehlinerule
-%      \else
-%        \docoloredtabulatehlinerule
-%      \fi\fi
-%    \fi
-%    \cr}
-
 %D Color:
 
 % \starttabulate[||p||]
diff --git a/tex/context/base/typo-del.mkiv b/tex/context/base/typo-del.mkiv
index ee5d76266..8dfb2d461 100644
--- a/tex/context/base/typo-del.mkiv
+++ b/tex/context/base/typo-del.mkiv
@@ -359,17 +359,17 @@
    \ignorespaces}
 
 \def\typo_delimited_stop_par
-   {\removeunwantedspaces
-    \removelastskip
-    \rightdelimitedtextmark
-    \endgroup
-    \popmacro\checkindentation
-    \typo_delimited_stop_par_indeed
-    \delimitedtextparameter\c!after
-    \doifsomething{\delimitedtextparameter\c!spaceafter}
-      {\blank[\delimitedtextparameter\c!spaceafter]}%
-    \useindentnextparameter\delimitedtextparameter
-    \dorechecknextindentation}% AM: This was missing!
+  {\removeunwantedspaces
+   \removelastskip
+   \rightdelimitedtextmark
+   \carryoverpar\endgroup % new per 2013-01-21 ... please left floats
+   \popmacro\checkindentation
+   \typo_delimited_stop_par_indeed
+   \delimitedtextparameter\c!after
+   \doifsomething{\delimitedtextparameter\c!spaceafter}
+     {\blank[\delimitedtextparameter\c!spaceafter]}%
+   \useindentnextparameter\delimitedtextparameter
+   \dorechecknextindentation}% AM: This was missing!
 
 \def\typo_delimited_start_txt
   {\let\typo_delimited_stop\typo_delimited_stop_txt