From 9e7456aa0b11591d11db709222359e307cdfb672 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sat, 27 Aug 2011 13:24:00 +0200 Subject: beta 2011.08.27 13:24 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4094 -> 4091 bytes tex/context/base/context-version.png | Bin 106211 -> 106191 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/font-otd.lua | 12 ++++++------ tex/context/base/font-otn.lua | 3 +-- tex/context/base/pack-rul.mkiv | 11 ++++++++++- tex/context/base/status-files.pdf | Bin 23880 -> 23880 bytes tex/context/base/status-lua.pdf | Bin 162211 -> 162208 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 5 ++--- 12 files changed, 23 insertions(+), 16 deletions(-) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 1da67eedf..eeebdcf05 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{2011.08.26 13:32} +\newcontextversion{2011.08.27 13:24} %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 815e84f60..5f5917fb9 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{2011.08.26 13:32} +\newcontextversion{2011.08.27 13:24} %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/context-version.pdf b/tex/context/base/context-version.pdf index 469fc8aa6..1bf918623 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-version.png b/tex/context/base/context-version.png index 579c7b48f..33940d225 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index ba1a4f21f..fea7fe58c 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{2011.08.26 13:32} +\edef\contextversion{2011.08.27 13:24} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 855070b9a..1c6d3c78b 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.08.26 13:32} +\edef\contextversion{2011.08.27 13:24} %D For those who want to use this: diff --git a/tex/context/base/font-otd.lua b/tex/context/base/font-otd.lua index a8061d6bc..7e7ec46ff 100644 --- a/tex/context/base/font-otd.lua +++ b/tex/context/base/font-otd.lua @@ -78,7 +78,7 @@ function otf.setdynamics(font,attribute) shared.features = { } -- end of save local set = constructors.checkedfeatures("otf",features) -set.mode = "node" -- really needed + set.mode = "node" -- really needed dsla = otf.setfeatures(tfmdata,set) if trace_dynamics then report_otf("setting dynamics %s: attribute %s, script %s, language %s, set: %s",contextnumbers[attribute],attribute,script,language,sequenced(set)) @@ -123,9 +123,9 @@ local function initialize(sequence,script,language,s_enabled,a_enabled,font,attr local features = sequence.features if features then for kind, scripts in next, features do - local s_e = s_enabled and s_enabled[kind] - local a_e = a_enabled and a_enabled[kind] - local e_e = s_e or a_e + local s_e = s_enabled and s_enabled[kind] -- the value + local a_e = a_enabled and a_enabled[kind] -- the value + local e_e = s_e or a_e -- todo: when one of them is true and the other is a value if e_e then local languages = scripts[script] or scripts[wildcard] if languages then @@ -134,13 +134,13 @@ local function initialize(sequence,script,language,s_enabled,a_enabled,font,attr -- only first attribute match check, so we assume simple fina's -- default can become a font feature itself if languages[language] then - valid = true + valid = e_e -- was true what = language -- elseif languages[default] then -- valid = true -- what = default elseif languages[wildcard] then - valid = true + valid = e_e -- was true what = wildcard end if valid then diff --git a/tex/context/base/font-otn.lua b/tex/context/base/font-otn.lua index bd1f78c38..0cbdea839 100644 --- a/tex/context/base/font-otn.lua +++ b/tex/context/base/font-otn.lua @@ -1995,11 +1995,10 @@ local function featuresprocessor(head,font,attr) featurevalue = dataset and dataset[1] -- todo: pass to function instead of using a global if featurevalue then local attribute, chain, typ, subtables = dataset[2], dataset[3], sequence.type, sequence.subtables ---~ inspect(sequence) if chain < 0 then -- this is a limited case, no special treatments like 'init' etc local handler = handlers[typ] - -- we need to get rid of this slide ! + -- we need to get rid of this slide! probably no longer needed in latest luatex local start = find_node_tail(head) -- slow (we can store tail because there's always a skip at the end): todo while start do local id = start.id diff --git a/tex/context/base/pack-rul.mkiv b/tex/context/base/pack-rul.mkiv index 6b90daee1..cabaec0f3 100644 --- a/tex/context/base/pack-rul.mkiv +++ b/tex/context/base/pack-rul.mkiv @@ -839,7 +839,16 @@ \c!framedepth=\framedparameter\c!depth, \c!location=\v!normal] -% so far +%D A nice example by Aditya: +%D +%D \starttyping +%D \setupframed +%D [loffset=\framedparameter{hoffset}, +%D roffset=\framedparameter{hoffset}, +%D hoffset=\zeropoint] +%D +%D \defineframed[test][hoffset=1cm] +%D \stoptyping \newdimen\!!framedwidth \newdimen\!!framedheight diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 6f9d48ae4..ca23a77e8 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 efb9e501a..398111145 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 94ed70e5b..36111651a 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 : 08/26/11 23:45:29 +-- merge date : 08/27/11 13:24:43 do -- begin closure to overcome local limits and interference @@ -10077,11 +10077,10 @@ local function featuresprocessor(head,font,attr) featurevalue = dataset and dataset[1] -- todo: pass to function instead of using a global if featurevalue then local attribute, chain, typ, subtables = dataset[2], dataset[3], sequence.type, sequence.subtables ---~ inspect(sequence) if chain < 0 then -- this is a limited case, no special treatments like 'init' etc local handler = handlers[typ] - -- we need to get rid of this slide ! + -- we need to get rid of this slide! probably no longer needed in latest luatex local start = find_node_tail(head) -- slow (we can store tail because there's always a skip at the end): todo while start do local id = start.id -- cgit v1.2.3