From 373ae8954dcd9f9d986edd1a316a331dff47a534 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Sat, 24 Jan 2015 00:15:04 +0100 Subject: 2015-01-23 22:14:00 --- tex/context/base/back-exp.lua | 4 ++-- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4388 -> 4377 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/grph-inc.lua | 4 +++- tex/context/base/math-tag.lua | 11 ++++++++++- tex/context/base/mult-fun.lua | 12 +++++++----- tex/context/base/mult-mps.lua | 4 ++-- tex/context/base/status-files.pdf | Bin 24932 -> 24950 bytes tex/context/base/status-lua.pdf | Bin 333215 -> 333212 bytes tex/context/base/tabl-ntb.mkiv | 14 +++++++------- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 12 files changed, 34 insertions(+), 21 deletions(-) (limited to 'tex') diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua index 485a36e2f..0c99a6fd5 100644 --- a/tex/context/base/back-exp.lua +++ b/tex/context/base/back-exp.lua @@ -2241,9 +2241,9 @@ local function push(fulltag,depth) treestack[currentdepth] = tree if trace_export then if detail and detail ~= "" then - report_export("%w<%s trigger=%a paragraph=%a index=%a detail=%a>",currentdepth-1,fulltag,currentattribute or 0,currentparagraph or 0,#treedata,detail) + report_export("%w<%s trigger=%q n=%q paragraph=%q index=%q detail=%q>",currentdepth-1,tg,n,currentattribute or 0,currentparagraph or 0,#treedata,detail) else - report_export("%w<%s trigger=%a paragraph=%a index=%a>",currentdepth-1,fulltag,currentattribute or 0,currentparagraph or 0,#treedata) + report_export("%w<%s trigger=%q n=%q paragraph=%q index=%q>",currentdepth-1,tg,n,currentattribute or 0,currentparagraph or 0,#treedata) end end tree = t diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 49176ff44..9f60db71e 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{2015.01.22 18:18} +\newcontextversion{2015.01.23 22:11} %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 9f1ea93ab..5c41d8c1f 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 9e0a1f78b..f461f9b1c 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{2015.01.22 18:18} +\edef\contextversion{2015.01.23 22:11} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/grph-inc.lua index 6f62f88b7..0d76d306f 100644 --- a/tex/context/base/grph-inc.lua +++ b/tex/context/base/grph-inc.lua @@ -538,7 +538,8 @@ function figures.push(request) end function figures.pop() - lastfiguredata = remove(callstack) or lastfiguredata + remove(callstack) + lastfiguredata = callstack[#callstack] or lastfiguredata statistics.stoptiming(figures) end @@ -1102,6 +1103,7 @@ function figures.include(data) end function figures.scale(data) -- will become lua code + data = data or callstack[#callstack] or lastfiguredata context.doscalefigure() return data end diff --git a/tex/context/base/math-tag.lua b/tex/context/base/math-tag.lua index 9f73d0afc..61d28edde 100644 --- a/tex/context/base/math-tag.lua +++ b/tex/context/base/math-tag.lua @@ -170,10 +170,18 @@ end -------------------- +local function showtag(n,id) + local attr = getattr(n,a_tagged) + report_tags("%s = %s",nodecodes[id or getid(n)],attr and taglist[attr].tagname or "?") +end + process = function(start) -- we cannot use the processor as we have no finalizers (yet) local mtexttag = nil while start do local id = getid(start) + +-- showtag(start,id) + if id == glyph_code or id == disc_code then if not mtexttag then mtexttag = start_tagged("mtext") @@ -330,7 +338,7 @@ process = function(start) -- we cannot use the processor as we have no finalizer local attr = getattr(start,a_tagged) local last = attr and taglist[attr] if last then - local tag = last.tag + local tag = last.tagname local detail = last.detail if tag == "maction" then if detail == "" then @@ -350,6 +358,7 @@ process = function(start) -- we cannot use the processor as we have no finalizer end elseif tag == "mstacker" then -- or tag == "mstackertop" or tag == "mstackermid" or tag == "mstackerbot" then -- looks like it gets processed twice +-- do we still end up here ? setattr(start,a_tagged,restart_tagged(attr)) -- so we just reuse the attribute process(list) stop_tagged() diff --git a/tex/context/base/mult-fun.lua b/tex/context/base/mult-fun.lua index 4ba583dfe..280d6bd5b 100644 --- a/tex/context/base/mult-fun.lua +++ b/tex/context/base/mult-fun.lua @@ -64,7 +64,7 @@ return { -- "define_linear_shade", "define_circular_shade", -- "define_circular_linear_shade", "define_circular_linear_shade", -- "define_sampled_linear_shade", "define_sampled_circular_shade", - "space", "crlf", "dquote", "SPACE", "CRLF", "DQUOTE", + "space", "crlf", "dquote", "percent", "SPACE", "CRLF", "DQUOTE", "PERCENT", "grayscale", "greyscale", "withgray", "withgrey", "colorpart", "readfile", @@ -74,10 +74,12 @@ return { "break", "xstretched", "ystretched", "snapped", -- - "pathconnectors", "function", "constructedpath", "constructedpairs", - "punkedfunction", "straightfunction", "curvedfunction", "tightfunction", - "punkedpath", "straightpath", "curvedpath", "tightpath", - "punkedpairs", "straightpairs", "curvedpairs", "tightpairs", + "pathconnectors", "function", + "constructedfunction", "constructedpath", "constructedpairs", + -- "punkedfunction", "punkedpath", "punkedpairs", + "straightfunction", "straightpath", "straightpairs", + "curvedfunction", "curvedpath", "curvedpairs", + -- "tightfunction", "tightpath", "tightpairs", -- "evenly", "oddly", -- diff --git a/tex/context/base/mult-mps.lua b/tex/context/base/mult-mps.lua index 1181977a9..1275af47b 100644 --- a/tex/context/base/mult-mps.lua +++ b/tex/context/base/mult-mps.lua @@ -150,8 +150,8 @@ return { "italcorr", "kern", "labelfont", "ligtable", "lowres_fix", "makebox", "makegrid", "maketicks", "mode_def", "mode_setup", "nodisplays", "notransforms", "numspecial", "o_correction", "openit", "openwindow", - "proofing", "proofoffset", "proofrule", "proofrulethickness", "rulepen", - "screenchars", "screenrule", "screenstrokes", "screen_cols", "screen_rows", + "pixels_per_inch", "proofing", "proofoffset", "proofrule", "proofrulethickness", + "rulepen", "screenchars", "screenrule", "screenstrokes", "screen_cols", "screen_rows", "showit", "slantfont", "smode", "smoothing", "titlefont", "totalweight", "tracingedges", "tracingpens", "turningcheck", "unitpixel", "vppp", "vround", "xoffset", "yoffset", diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index a5b42628e..5c8aebff7 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index c21faf601..237343253 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/tabl-ntb.mkiv index b0fc71627..667a90bac 100644 --- a/tex/context/base/tabl-ntb.mkiv +++ b/tex/context/base/tabl-ntb.mkiv @@ -1117,7 +1117,7 @@ \fi} \def\tabl_ntb_row_stop_boxed - {\noindent % \dontleavehmode + {% \noindent % no, else double leftskip in narrower \normalexpanded {\t_tabl_ntb {\the\t_tabl_ntb @@ -1462,12 +1462,12 @@ \def\tabl_ntb_table_stop {\forgetall % new, here see narrower-004.tex - \setbox\scratchbox\hbox - {\letnaturaltablelocalparameter\c!frame\v!off - \letnaturaltablelocalparameter\c!background\empty - \letnaturaltablelocalparameter\c!align\v!no - \inheritednaturaltablelocalframed{\strut}}% - \edef\minimalcellheight{\the\ht\scratchbox}% not used + %\setbox\scratchbox\hbox + % {\letnaturaltablelocalparameter\c!frame\v!off + % \letnaturaltablelocalparameter\c!background\empty + % \letnaturaltablelocalparameter\c!align\v!no + % \inheritednaturaltablelocalframed{\strut}}% + %\edef\minimalcellheight{\the\ht\scratchbox}% not used \dorecurse\c_tabl_ntb_maximum_col {\tabl_ntb_let_aut\recurselevel\zeropoint % new diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index ae12c52b3..68db85670 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 : 01/22/15 18:18:07 +-- merge date : 01/23/15 22:11:53 do -- begin closure to overcome local limits and interference -- cgit v1.2.3