beta 2014.10.09 15:22garden-master

author: Hans Hagen <pragma@wxs.nl> 2014-10-09 15:22:00 +0530
committer: Hans Hagen <pragma@wxs.nl> 2014-10-09 15:22:00 +0530
commit: 90544dcdefa0378a07533f565cf491aac7ee057c (patch)
tree: 8abc43b7cba4bec6fa091f92b9b239afb4eb61ca
parent: ddf0f923b0fc9037db6368cd1b47786b01f7cbd7 (diff)
download: context-90544dcdefa0378a07533f565cf491aac7ee057c.tar.gz
17 files changed, 52 insertions, 28 deletions
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index f3064f51e..e1e17628e 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -1561,7 +1561,16 @@ end
 
 do
 
+    local registered = structures.sections.registered
+    local f_level    = formatters[' level="%s"']
+
     local function section(result,element,detail,n,fulltag,di)
+
+        local r = registered[detail]
+        if r then
+            result[#result+1] = f_level(r.level)
+        end
+
         local data = listdata[fulltag]
         if data then
             extras.addreference(result,data.references)
@@ -2852,6 +2861,11 @@ local f_d_template = [[
     display: %display% ;
 }]]
 
+-- local f_d_template = [[
+-- %element%.%detail%, div.%element%.%detail% {
+--     display: %display% ;
+-- }]]
+
 local f_category = formatters["/* category: %s */"]
 
 -- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd" >
@@ -3034,12 +3048,12 @@ local htmltemplate = [[
                 local tg = c.tg
                 local ns = c.ns
                 if ns == "m" then
-if false then
-                    c.ns = ""
-                    c.at["xmlns:m"] = nil
-end
-             --  elseif tg == "a" then
-             --      c.ns = ""
+                    if false then -- yes or no
+                        c.ns = ""
+                        c.at["xmlns:m"] = nil
+                    end
+             -- elseif tg == "a" then
+             --     c.ns = ""
                 else
                  -- if tg == "tabulatecell" or tg == "tablecell" then
                         local dt = c.dt
@@ -3356,6 +3370,7 @@ end
 
 -- These are called at the tex end:
 
+commands.settagsectionlevel      = structurestags.setsectionlevel
 commands.settagitemgroup         = structurestags.setitemgroup
 commands.settagsynonym           = structurestags.setsynonym
 commands.settagsorting           = structurestags.setsorting
diff --git a/tex/context/base/back-exp.mkiv b/tex/context/base/back-exp.mkiv
index dc510b2a6..e8b9ef61a 100644
--- a/tex/context/base/back-exp.mkiv
+++ b/tex/context/base/back-exp.mkiv
@@ -89,6 +89,10 @@
     \unexpanded\def\dotagtabulatesignal{\dontleavehmode\char\zerocount\ignorespaces}%
 \to \everyenableelements
 
+% \appendtoks
+%     \unexpanded\def\dotagsectionlevel{\taggedctxcommand{settagsectionlevel("\currentheadlevel")}}%
+% \to \everyenableelements
+
 \appendtoks
     \unexpanded\def\dotagsynonym{\taggedctxcommand{settagsynonym("\currentsynonym","\currentsynonymtag")}}%
 \to \everyenableelements
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 5730e9d36..177366224 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{2014.10.08 23:31}
+\newcontextversion{2014.10.09 15:22}
 
 %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 83121d179..835657da2 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 4dc1f42a5..d08f95dd4 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.10.08 23:31}
+\edef\contextversion{2014.10.09 15:22}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/font-ctx.lua
index 51f152baf..b49c16489 100644
--- a/tex/context/base/font-ctx.lua
+++ b/tex/context/base/font-ctx.lua
@@ -57,7 +57,9 @@ local helpers             = fonts.helpers
 local hashes              = fonts.hashes
 local currentfont         = font.current
 
-local aglunicodes         = fonts.encodings.agl.unicodes
+local encodings           = fonts.encodings
+----- aglunicodes         = encodings.agl.unicodes
+local aglunicodes         = nil -- delayed loading
 
 local nuts                = nodes.nuts
 local tonut               = nuts.tonut
@@ -1445,7 +1447,6 @@ mappings.reset() -- resets the default file
 
 -- => commands
 
-
 local function nametoslot(name)
     local t = type(name)
     local s = nil
@@ -1454,6 +1455,9 @@ local function nametoslot(name)
         if slot then
             return slot
         end
+        if not aglunicodes then
+            aglunicodes = encodings.agl.unicodes
+        end
         slot = aglunicodes[name]
         if characters[true][slot] then
             return slot
diff --git a/tex/context/base/font-lib.mkvi b/tex/context/base/font-lib.mkvi
index bfd85245c..01a142307 100644
--- a/tex/context/base/font-lib.mkvi
+++ b/tex/context/base/font-lib.mkvi
@@ -19,7 +19,7 @@
 \registerctxluafile{font-log}{1.001}
 \registerctxluafile{font-con}{1.001}
 \registerctxluafile{font-enc}{1.001}
-%registerctxluafile{font-agl}{1.001} % loaded when needed, saves 100K in format
+\registerctxluafile{font-agl}{1.001} % if needed we can comment this and delay loading
 \registerctxluafile{font-cid}{1.001} % cid maps
 \registerctxluafile{font-map}{1.001}
 \registerctxluafile{font-syn}{1.001}
diff --git a/tex/context/base/font-map.lua b/tex/context/base/font-map.lua
index 890e47d3f..e26f28e34 100644
--- a/tex/context/base/font-map.lua
+++ b/tex/context/base/font-map.lua
@@ -206,8 +206,6 @@ local overloads = {
     fk  = { name = "f_k",   unicode = { 0x66, 0x6B } },
 }
 
-require("char-ini")
-
 for k, v in next, overloads do
     local name = v.name
     local mess = v.mess
diff --git a/tex/context/base/lpdf-tag.lua b/tex/context/base/lpdf-tag.lua
index f9ef43818..77c5776e2 100644
--- a/tex/context/base/lpdf-tag.lua
+++ b/tex/context/base/lpdf-tag.lua
@@ -199,11 +199,11 @@ local function makeelement(fulltag,parent,attr)
     elseif tg == "mstackertop" or tg == "mstackerbot" or tg == "mstackermid"then
         return true
     elseif tg == "mstacker" then
-print("get",fulltag)
         local p = properties[fulltag]
         tg = p and p.subtype or tg
     end
-    local k, r = pdfarray(), pdfreserveobject()
+    local k = pdfarray()
+    local r = pdfreserveobject()
     local a = userproperties[fulltag]
     usedmapping[tg] = true
     tg = usedlabels[tg] or tg
diff --git a/tex/context/base/math-stc.mkvi b/tex/context/base/math-stc.mkvi
index 73f2c1a7d..158473305 100644
--- a/tex/context/base/math-stc.mkvi
+++ b/tex/context/base/math-stc.mkvi
@@ -399,13 +399,13 @@
       % analysis
       \ifdim\htdp\scratchboxtwo>\zeropoint
         \ifdim\htdp\scratchboxone>\zeropoint
-          \dosetelementproperty\s!subtype\t!munderover
+          \dosettagproperty\s!subtype\t!munderover
         \else
-          \dosetelementproperty\s!subtype\t!munder
+          \dosettagproperty\s!subtype\t!munder
         \fi
       \else
         \ifdim\htdp\scratchboxone>\zeropoint
-          \dosetelementproperty\s!subtype\t!mover
+          \dosettagproperty\s!subtype\t!mover
         \else
           % brrr
         \fi
@@ -539,13 +539,13 @@
       % analysis
       \ifcase#bottom\relax
         \ifcase#top\relax
-            \dosetelementproperty\s!subtype\t!munderover
+            \dosettagproperty\s!subtype\t!munderover
         \else
-            \dosetelementproperty\s!subtype\t!mover
+            \dosettagproperty\s!subtype\t!mover
         \fi
       \else
         \ifcase#top\relax
-            \dosetelementproperty\s!subtype\t!munder
+            \dosettagproperty\s!subtype\t!munder
         \else
             % brrr
         \fi
@@ -743,7 +743,7 @@
       %
       \math_stackers_normalize_three
       % analysis
-      \dosetelementproperty\s!subtype\t!munderover
+      \dosettagproperty\s!subtype\t!munderover
       % base
       \math_stackers_start_tagged_mid
         \math_stackers_middle\bgroup
diff --git a/tex/context/base/mult-sys.mkiv b/tex/context/base/mult-sys.mkiv
index 9b75f332f..3f7a837fc 100644
--- a/tex/context/base/mult-sys.mkiv
+++ b/tex/context/base/mult-sys.mkiv
@@ -322,6 +322,7 @@
 \definesystemconstant {designsize}
 %definesystemconstant {background}
 %definesystemconstant {ucmap}
+\definesystemconstant {level}
 
 %definesystemconstant {property}
 %definesystemconstant {overprint}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 38da726f3..4791ec7e4 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 6c9ac5f42..2eb5f4a46 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-sec.mkiv b/tex/context/base/strc-sec.mkiv
index 5adfeba1e..bce3448cc 100644
--- a/tex/context/base/strc-sec.mkiv
+++ b/tex/context/base/strc-sec.mkiv
@@ -990,10 +990,14 @@
      \hskip\s_strc_sectioniong_continuous_signal\relax
    \fi}
 
+% \let\dotagsectionlevel\relax
+
 \def\strc_sectioning_before_yes
   {\strc_sectioning_check_before\strc_sectioning_handle_page_yes
    \headparameter\c!inbetween
-   \dostarttagged\t!section\currenthead}
+   \dostarttagged\t!section\currenthead
+%    \dotagsectionlevel
+   }
 
 \def\strc_sectioning_before_nop
   {\strc_sectioning_check_before\strc_sectioning_handle_page_nop
diff --git a/tex/context/base/strc-tag.lua b/tex/context/base/strc-tag.lua
index 2f8e9ff5d..690f86efd 100644
--- a/tex/context/base/strc-tag.lua
+++ b/tex/context/base/strc-tag.lua
@@ -230,7 +230,6 @@ end
 function tags.setaspect(key,value)
     local tag = chain[nstack]
     if tag then
-print("set",tag)
         local p = properties[tag]
         if p then
             p[key] = value
diff --git a/tex/context/base/strc-tag.mkiv b/tex/context/base/strc-tag.mkiv
index a79b5f80e..bbb0dcddd 100644
--- a/tex/context/base/strc-tag.mkiv
+++ b/tex/context/base/strc-tag.mkiv
@@ -212,12 +212,12 @@
   {\setuplanguage[\s!default][\s!righthyphenchar="AD]% for the moment here
    \let\startelement\strc_tags_element_start_yes
    \let\stopelement \strc_tags_element_stop_yes
-   \let\dosetelementproperty\strc_tags_set_aspect_yes}
+   \let\dosettagproperty\strc_tags_set_aspect_yes}
 
 \unexpanded\def\strc_tags_disable_elements
   {\let\startelement\strc_tags_element_start_nop
    \let\stopelement \strc_tags_element_stop_nop
-   \let\dosetelementproperty\strc_tags_set_aspect_nop}
+   \let\dosettagproperty\strc_tags_set_aspect_nop}
 
 % beware: making these unexpanded spoils tables (noalign problem)
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index f316e6acf..14f00406c 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/08/14 23:31:59
+-- merge date  : 10/09/14 15:22:01
 
 do -- begin closure to overcome local limits and interference
 
@@ -5336,7 +5336,6 @@ local overloads={
   fj={ name="f_j",unicode={ 0x66,0x6A } },
   fk={ name="f_k",unicode={ 0x66,0x6B } },
 }
-require("char-ini")
 for k,v in next,overloads do
   local name=v.name
   local mess=v.mess
author	Hans Hagen <pragma@wxs.nl>	2014-10-09 15:22:00 +0530
committer	Hans Hagen <pragma@wxs.nl>	2014-10-09 15:22:00 +0530
commit	90544dcdefa0378a07533f565cf491aac7ee057c (patch)
tree	8abc43b7cba4bec6fa091f92b9b239afb4eb61ca
parent	ddf0f923b0fc9037db6368cd1b47786b01f7cbd7 (diff)
download	context-90544dcdefa0378a07533f565cf491aac7ee057c.tar.gz