diff options
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4181 -> 4193 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/node-ref.lua | 32 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24497 -> 24485 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 249947 -> 249949 bytes | |||
| -rw-r--r-- | tex/context/base/strc-flt.mkvi | 2 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
8 files changed, 26 insertions, 14 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index bfdf7e2f2..f28c10d49 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.04.13 22:45} +\newcontextversion{2015.04.14 00:54} %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 Binary files differindex 1b74b910a..6eef61668 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 7aed8a11d..b4fd91e60 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2015.04.13 22:45} +\edef\contextversion{2015.04.14 00:54} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/node-ref.lua b/tex/context/base/node-ref.lua index 863dbb07c..1f802a49f 100644 --- a/tex/context/base/node-ref.lua +++ b/tex/context/base/node-ref.lua @@ -434,17 +434,29 @@ local u_transparency = nil local u_colors = { } local force_gray = true -local function addstring(str,what) +local function addstring(what,str) --todo make a pluggable helper (in font-ctx) if str then local typesetters = nuts.typesetters if typesetters then + local hashes = fonts.hashes + local infofont = fonts.infofont() + local emwidth = hashes.emwidths [infofont] + local exheight = hashes.exheights[infofont] + local shift = nil if what == "reference" then - str = str .. "<" + str = str .. " " + shift = - 1.25*exheight else - str = str .. ">" + str = str .. " " + shift = 2*exheight end - local text = typesetters.fast_hpack(str,fonts.infofont()) - return text + local text = typesetters.fast_hpack(str,infofont) + local rule = new_rule(emwidth/10,4*exheight,3*exheight) + local list = getlist(text) + setfield(text,"shift",shift) + return nuts.fasthpack(nuts.linked(text,rule)) + -- local text = typesetters.fast_hpack(str,fonts.infofont()) + -- return text end end end @@ -489,7 +501,7 @@ local function colorize(width,height,depth,n,reference,what,sr) else if sr and sr ~= "" then - local text = addstring(sr) + local text = addstring(what,sr) if text then local kern = new_kern(-getfield(text,"width")) setfield(kern,"next",text) @@ -506,7 +518,7 @@ end local function justadd(what,sr) if sr and sr ~= "" then - local text = addstring(sr) + local text = addstring(what,sr) if text then local kern = new_kern(-getfield(text,"width")) setfield(kern,"next",text) @@ -577,7 +589,7 @@ local function makereference(width,height,depth,reference) -- height and depth a local p = d.prefix if r then if p then - texts = p .. " : " .. r + texts = p .. "|" .. r else texts = r end @@ -682,7 +694,7 @@ local function makedestination(width,height,depth,reference) local p = d.usedprefix if r then if p then - t[#t+1] = p .. " : " .. r + t[#t+1] = p .. "|" .. r else t[#t+1] = r end @@ -692,7 +704,7 @@ local function makedestination(width,height,depth,reference) end end if #t > 0 then - texts = concat(t," | ") + texts = concat(t," & ") end end end diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 98ee6f6b8..be436f6c7 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 Binary files differindex c3cbee2cb..dc0a481c8 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi index 722f70c9a..9a7fc56f6 100644 --- a/tex/context/base/strc-flt.mkvi +++ b/tex/context/base/strc-flt.mkvi @@ -569,7 +569,7 @@ {\flushnotes \page_otr_command_flush_side_floats % here ! \strc_floats_begin_group - \dodoubleempty\strc_floats_start_place_float} + \dotripleempty\strc_floats_start_place_float} \def\strc_floats_start_place_float[#tag]% {\strc_floats_set_current_tag{#tag}% diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 0727392ed..96c7c0878 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 : 04/13/15 22:45:24 +-- merge date : 04/14/15 00:54:19 do -- begin closure to overcome local limits and interference |