diff options
author | Hans Hagen <pragma@wxs.nl> | 2009-08-11 23:48:00 +0200 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2009-08-11 23:48:00 +0200 |
commit | 8def9a965dd090ee803cc6c12e186bb48ae4dcf7 (patch) | |
tree | e25e57a4285eb0930853120f174343add7172011 /tex | |
parent | 06f543b2faef1df3adf5f00839e16942863f0376 (diff) | |
download | context-8def9a965dd090ee803cc6c12e186bb48ae4dcf7.tar.gz |
beta 2009.08.11 23:48
Diffstat (limited to 'tex')
-rw-r--r-- | tex/context/base/back-pdf.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/java-fld.tex | 1 | ||||
-rw-r--r-- | tex/context/base/java-ini.lua | 6 | ||||
-rw-r--r-- | tex/context/base/lpdf-fld.lua | 32 | ||||
-rw-r--r-- | tex/context/base/lpdf-ini.lua | 2 | ||||
-rw-r--r-- | tex/context/base/lpdf-mis.lua | 4 | ||||
-rw-r--r-- | tex/context/base/lpdf-wid.lua | 2 | ||||
-rw-r--r-- | tex/context/base/lxml-ini.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/m-punk.tex | 232 | ||||
-rw-r--r-- | tex/context/base/scrn-fld.mkiv | 45 | ||||
-rw-r--r-- | tex/context/base/supp-mps.mkii | 4 | ||||
-rw-r--r-- | tex/context/base/syst-aux.mkiv | 11 | ||||
-rw-r--r-- | tex/context/base/syst-gen.mkii | 11 |
13 files changed, 319 insertions, 35 deletions
diff --git a/tex/context/base/back-pdf.mkiv b/tex/context/base/back-pdf.mkiv index c635f1c3b..2d3ba8524 100644 --- a/tex/context/base/back-pdf.mkiv +++ b/tex/context/base/back-pdf.mkiv @@ -161,7 +161,7 @@ \def\predefinesymbol[#1]% {\begingroup - \setobject{SYM}{#1}\hbox{\symbol[#1]}% + \settightobject{SYM}{#1}\hbox{\symbol[#1]}% to be checked ... maybe only fitting \dogetobjectreference{SYM}{#1}\lastref \ctxlua{backends.codeinjections.registersymbol("#1",\lastref)}% \endgroup} diff --git a/tex/context/base/java-fld.tex b/tex/context/base/java-fld.tex index 4fdf41ce4..3c24b7e02 100644 --- a/tex/context/base/java-fld.tex +++ b/tex/context/base/java-fld.tex @@ -144,7 +144,6 @@ function Do_Vide_Field ( Name, Closable ) { ++visible_fields ; visible_field[visible_fields] = Name ; v.hidden = false ; - % v.display = display.visible ; if (Closable) { v.readonly = false ; v.value = "On" } diff --git a/tex/context/base/java-ini.lua b/tex/context/base/java-ini.lua index 0fe7d3d29..6dc789e71 100644 --- a/tex/context/base/java-ini.lua +++ b/tex/context/base/java-ini.lua @@ -6,6 +6,8 @@ if not modules then modules = { } end modules ['java-ini'] = { license = "see context related readme files" } +local format = string.format + javascripts = javascripts or { } javascripts.codes = javascripts.codes or { } javascripts.preambles = javascripts.preambles or { } @@ -96,7 +98,9 @@ function javascripts.code(name,arguments) end local f = functions[name] if f then - return string.format("%s(%s)",name,arguments or "") + -- temporary hack, i need a more clever approach + arguments = '"' .. arguments.gsub(arguments,'%s*,%s*','"%1",') .. '"' + return format("%s(%s)",name,arguments or "") end end diff --git a/tex/context/base/lpdf-fld.lua b/tex/context/base/lpdf-fld.lua index b9c63347f..6bdfdd36c 100644 --- a/tex/context/base/lpdf-fld.lua +++ b/tex/context/base/lpdf-fld.lua @@ -73,6 +73,8 @@ local plus = { AutoView = 256, -- 288 (6+9) } +-- todo: check what is interfaced + flag.readonly = flag.ReadOnly flag.required = flag.Required flag.protected = flag.Password @@ -86,7 +88,7 @@ plus.hidden = plus.Hidden plus.printable = plus.Printable plus.auto = plus.AutoView --- some day .. lpeg with function +-- some day .. lpeg with function or table local function fieldflag(specification) local o, n = specification.options, 0 @@ -101,7 +103,7 @@ end local function fieldplus(specification) local o, n = specification.options, 0 if o and o ~= "" then - for p in gmatch(o,"[^, ]") do + for p in gmatch(o,"[^, ]+") do n = n + (plus[p] or 0) end end @@ -117,11 +119,12 @@ local function checked(what) end local function fieldactions(specification) -- share actions +--~ print(table.serialize(specification)) local d, a = { }, nil a = specification.mousedown if a and a ~= "" then d.D = checked(a) end a = specification.mouseup if a and a ~= "" then d.U = checked(a) end - a = specification.enterregion if a and a ~= "" then d.E = checked(a) end - a = specification.exitregion if a and a ~= "" then d.X = checked(a) end + a = specification.regionin if a and a ~= "" then d.E = checked(a) end -- Enter + a = specification.regionout if a and a ~= "" then d.X = checked(a) end -- eXit a = specification.afterkeystroke if a and a ~= "" then d.K = checked(a) end a = specification.formatresult if a and a ~= "" then d.F = checked(a) end a = specification.validateresult if a and a ~= "" then d.V = checked(a) end @@ -218,9 +221,8 @@ local function fieldappearances(specification) return lpdf.sharedobj(tostring(appearance)) end -local function fieldstates(specification) - -- splitter not needed, wil go - -- todo: caching +local function fieldstates(specification,forceyes) + -- we don't use Opt here (too messy for radio buttons) local values, default = specification.values, specification.default if not values then -- error @@ -263,15 +265,16 @@ local function fieldstates(specification) if not offvalue then offvalue = offn end + forceyes = forceyes and "On" -- spec likes Yes more but we've used On for ages now if default == yesn then - default = pdfconstant(yesn) + default = pdfconstant(forceyes or yesn) else default = pdfconstant("Off") end - local appearance = pdfdictionary { -- mayeb also cache components - N = pdfdictionary { [yesn] = registeredsymbol(yesn), Off = registeredsymbol(offn) }, - R = pdfdictionary { [yesr] = registeredsymbol(yesr), Off = registeredsymbol(offr) }, - D = pdfdictionary { [yesd] = registeredsymbol(yesd), Off = registeredsymbol(offd) } + local appearance = pdfdictionary { -- maybe also cache components + N = pdfdictionary { [forceyes or yesn] = registeredsymbol(yesn), Off = registeredsymbol(offn) }, + R = pdfdictionary { [forceyes or yesr] = registeredsymbol(yesr), Off = registeredsymbol(offr) }, + D = pdfdictionary { [forceyes or yesd] = registeredsymbol(yesd), Off = registeredsymbol(offd) } } local appearanceref = lpdf.sharedobj(tostring(appearance)) return appearanceref, default @@ -630,14 +633,15 @@ function methods.combo(name,specification) methods.choice(name,specification,"PopUp,Edit") end --- probably no default appearance needed for first kid +-- Probably no default appearance needed for first kid and no javascripts for the +-- parent ... I will look into it when I have to make a complex document. function methods.check(name,specification) -- no /Opt because (1) it's messy - see pdf spec, (2) it discouples kids and -- contrary to radio there is no way to associate then local field = fields[name] local kind = field.kind - local appearance, default = fieldstates(field) + local appearance, default = fieldstates(field,true) if not field.pobj then local d = pdfdictionary { Subtype = pdf_widget, diff --git a/tex/context/base/lpdf-ini.lua b/tex/context/base/lpdf-ini.lua index 1b099ed9b..753b09180 100644 --- a/tex/context/base/lpdf-ini.lua +++ b/tex/context/base/lpdf-ini.lua @@ -168,7 +168,7 @@ local tostring_z = function() return "null" end local tostring_t = function() return "true" end local tostring_f = function() return "false" end local tostring_r = function(t) return t[1] .. " 0 R" end -local tostring_v = function(t) return concat(t, "") end +local tostring_v = function(t) return concat(t[1],"") end local function value_x(t) return t end -- the call is experimental local function value_s(t,key) return t[1] end -- the call is experimental diff --git a/tex/context/base/lpdf-mis.lua b/tex/context/base/lpdf-mis.lua index 87230aff2..e3ed8919d 100644 --- a/tex/context/base/lpdf-mis.lua +++ b/tex/context/base/lpdf-mis.lua @@ -71,11 +71,11 @@ lpdf.registerdocumentfinalizer(initializeoverprint) function codeinjections.addtransparencygroup() -- png: /CS /DeviceRGB /I true - local d = tostring ( pdfdictionary { + local d = pdfdictionary { S = pdfconstant("Transparency"), I = true, K = true, - } ) + } lpdf.registerpagefinalizer(function() lpdf.addtopageattributes("Group",d) end) end diff --git a/tex/context/base/lpdf-wid.lua b/tex/context/base/lpdf-wid.lua index cc61a4f96..c87192b3a 100644 --- a/tex/context/base/lpdf-wid.lua +++ b/tex/context/base/lpdf-wid.lua @@ -241,7 +241,7 @@ local function insertrenderingwindow(label,width,height,specification) AA = actions, } local r = pdfreserveobj("annot") - node.write(nodes.pdfannot(label,width,height,d(),r)) -- save ref + node.write(nodes.pdfannot(width,height,0,d(),r)) -- save ref return pdfreference(r) end diff --git a/tex/context/base/lxml-ini.mkiv b/tex/context/base/lxml-ini.mkiv index 494e4f0b7..34a14f9d9 100644 --- a/tex/context/base/lxml-ini.mkiv +++ b/tex/context/base/lxml-ini.mkiv @@ -109,7 +109,7 @@ \let\xmlgrab\xmlsetsetup \def\xmlsetup#1#2% % we pass the reference so that we have access to the frozen number - {\def\xmlself{#1}% % by using #1 inside a setup + {\def\xmlself{#1}% % by using #1 inside a setup; maybe self becomes obsolete \setupwithargument{#2}{#1}} \newtoks \registeredxmlsetups diff --git a/tex/context/base/m-punk.tex b/tex/context/base/m-punk.tex new file mode 100644 index 000000000..3b1baa75b --- /dev/null +++ b/tex/context/base/m-punk.tex @@ -0,0 +1,232 @@ +%D \module +%D [ file=m-punk, +%D version=2008.04.15, +%D title=\CONTEXT\ Modules, +%D subtitle=Punk Support, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright=PRAGMA] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\ifx\luaversion\undefined \endinput \fi + +% At some point the font generation code will move into the +% ConTeXt MkIV kernel. + +\startluacode +do + local concat = table.concat + local chardata = characters.data + local fontdata = fonts.ids + + fonts.mp = fonts.mp or { } + + fonts.mp.version = fonts.mp.version or 1.11 + fonts.mp.inline = true + fonts.mp.cache = containers.define("fonts", "mp", fonts.mp.version, true) + + metapost.characters = metapost.characters or { } + +-- todo: use table share as in otf + + local characters, descriptions = { }, { } + local factor, l, n, w, h, d, total, variants = 100, { }, 0, 0, 0, 0, 0, 0, true + + -- A next version of mplib will provide the tfm font information which + -- gives better glyph dimensions, plus additional kerning information. + + local flusher = { + startfigure = function(chrnum,llx,lly,urx,ury) + l, n = { }, chrnum + w, h, d = urx - llx, ury, -lly + total = total + 1 + inline = fonts.mp.inline + end, + flushfigure = function(t) + for i=1, #t do + l[#l+1] = t[i] + end + end, + stopfigure = function() + local cd = chardata[n] + if inline then + descriptions[n] = { + -- unicode = n, + name = cd and cd.adobename, + width = w*100, + height = h*100, + depth = d*100, + boundingbox = { 0, -d, w, h }, + } + characters[n] = { + commands = { -- todo: xforms, should happen in backend + { "special", "pdf: " .. concat(l," ") }, + } + } + else + descriptions[n] = { + -- unicode = n, + name = cd and cd.adobename, + width = w*100, + height = h*100, + depth = d*100, + boundingbox = { 0, -d, w, h }, + } + characters[n] = { + commands = { + { "image", { stream = concat(l," "), bbox = { 0, -d*65536, w*65536, h*65536 } } }, + } + } + end + end + } + + metapost.characters.instances = metapost.characters.instances or 10 + + function metapost.characters.process(mpxformat, name, instances, scalefactor) + statistics.starttiming(metapost.characters) + scalefactor = scalefactor or 1 + instances = instances or metapost.characters.instances or 10 + local fontname = file.removesuffix(file.basename(name)) + local hash = file.robustname(string.format("%s %05i %03i", fontname, scalefactor*1000, instances)) + local lists = containers.read(fonts.mp.cache(), hash) + if not lists then + statistics.starttiming(flusher) + -- we can use a format per font + local data = io.loaddata(resolvers.find_file(name)) + metapost.reset(mpxformat) + metapost.set_outer_color(2) -- no outer color and no reset either + lists = { } + for i=1,instances do + list = { } + characters, descriptions = { }, { } + metapost.process( + mpxformat, + { + "randomseed := " .. i*10 .. ";", + "scale_factor := " .. scalefactor .. " ;", + data + }, + false, + flusher + ) + lists[i] = { + designsize = 655360, + name = string.format("%s-%03i",hash,i), + parameters = { + slant = 0, + space = 333 * scalefactor, + space_stretch = 166.5 * scalefactor, + space_shrink = 111 * scalefactor, + x_height = 431 * scalefactor, + quad =1000 * scalefactor, + extra_space = 0 + }, + ["type"] = "virtual", + characters = characters, + descriptions = descriptions, + -- embedding = "subset", + -- mkiv: + spacer = "space", + unit = 1000, + shared = { }, + unique = { }, + } + end + metapost.reset(mpxformat) -- saves memory + lists = containers.write(fonts.mp.cache(), hash, lists) + statistics.stoptiming(flusher) + end + variants = variants + #lists + statistics.stoptiming(metapost.characters) + return lists + end + + function fonts.vf.aux.combine.commands.metafont(g,v) + local size = g.specification.size + local data = metapost.characters.process(v[2],v[3],v[4],size/655360) + local list, t = { }, { } + for d=1,#data do + t = data[d] + t = fonts.tfm.scale(t, -1000) + local id = font.nextid() + t.fonts = { { id = id } } + fontdata[id] = t + fonts.vf.aux.compose_characters(t) + list[d] = font.define(t) + end + for k, v in pairs(t) do + g[k] = v -- kind of replace, when not present, make nil + end + g.virtualized = true + g.variants = list + end + + fonts.define.methods.install( "punk", { + { "metafont", "mfplain", "punkfont.mp", 10 }, + } ) + + cases.actions[99] = function(current) + local used = fontdata[current.font].variants + if used then + local f = math.random(1,#used) + current.font = used[f] + return current, true + else + return current, false + end + end + + metapost.characters.flusher = flusher + + statistics.register("metapost font generation", function() + local time = statistics.elapsedtime(flusher) + if total > 0 then + return string.format("%i glyphs, %.3f seconds runtime, %i glyphs/second", total, time, total/time) + else + return string.format("%i glyphs, %.3f seconds runtime", total, time) + end + end) + + statistics.register("metapost font loading",function() + local time = statistics.elapsedtime(metapost.characters) + if variants > 0 then + return string.format("%.3f seconds, %i instances, %0.3f instances/second", time, variants, variants/time) + else + return string.format("%.3f seconds, %i instances", time, variants) + end + end) + +end +\stopluacode + +\unexpanded\def\EnableRandomPunk {\setcharactercasing[99]} +\unexpanded\def\RandomPunk {\groupedcommand\EnableRandomPunk\donothing} +\unexpanded\def\StartRandomPunk {\begingroup\EnableRandomPunk} +\unexpanded\def\StopRandomPunk {\endgroup} + +\starttypescript [serif] [punk] [default] + \setups[font:fallback:serif] % no style variants yet + \definefontsynonym [Serif] [demo@punk] +\stoptypescript + +\starttypescript [punk] + \definetypeface [punk] [rm] [serif] [punk] [default] +\stoptypescript + +\endinput + +\usetypescript[punk] + +\setupbodyfont[punk,14pt] + +\starttext + \definedfont[demo@punk at 10pt]hello world\par + \definedfont[demo@punk at 12pt]hello world\par + \definedfont[demo@punk at 16pt]hello world\par + \definedfont[demo@punk at 20pt]hello world\par +\stoptext + diff --git a/tex/context/base/scrn-fld.mkiv b/tex/context/base/scrn-fld.mkiv index eef6bbe7d..4bcc0eabd 100644 --- a/tex/context/base/scrn-fld.mkiv +++ b/tex/context/base/scrn-fld.mkiv @@ -150,6 +150,32 @@ \def\donormalfield{\doprocessfield\dohandlefield} \def\dofitfield {\doprocessfield\dohandlefitfield} +% \def\doprocessfield#1[#2][#3]% \method [name] [label] +% {\dontleavehmode +% \begingroup +% \loadfieldscripts +% \edef\currentfieldname {#2}% +% \edef\currentfieldlabel{#3}% +% \edef\currentfieldgroup{\ctxlua{backends.codeinjections.getfieldgroup("#2")}}% +% \ifx\currentfieldlabel\empty +% \let\currentfieldlabel\currentfieldname +% \fi +% \ifx\currentfieldgroup\empty +% #1[#2][\v!label,\v!frame,\v!horizontal][][][]% +% \else +% \getvalue{\??fd::\currentfieldgroup}% +% #1[#2][][][][]% todo: pass setups +% \fi +% \endgroup} + +% \def\dosetupfieldindeed#1#2[#3][#4][#5][#6][#7]% +% {#1[#2][#4][#5][#6][#7]} +% +% equals: + +\def\dosetupfieldindeed#1#2[#3]% [#4][#5][#6][#7]% + {#1[#2]} % [#4][#5][#6][#7]} + \def\doprocessfield#1[#2][#3]% \method [name] [label] {\dontleavehmode \begingroup @@ -163,7 +189,8 @@ \ifx\currentfieldgroup\empty #1[#2][\v!label,\v!frame,\v!horizontal][][][]% \else - #1[#2][][][][]% todo: pass setups + \def\dosetupfield{\dosetupfieldindeed{#1}{#2}}% + \getvalue{\??fd::\currentfieldgroup}% \fi \endgroup} @@ -246,11 +273,11 @@ \v!horizontal=>\HorizontalFieldtrue, \v!vertical=>\VerticalFieldtrue]% \ifVerticalField - \getparameters[\??fd][\c!distance=\!!zeropoint,\c!inbetween=\vskip\@@localoffset,\c!align=\v!right,\c!width=20em]% + \getparameters[\??fd][\c!distance=\zeropoint,\c!inbetween=\vskip\@@localoffset,\c!align=\v!right,\c!width=20em]% \else\ifHorizontalField \getparameters[\??fd][\c!distance=\@@localoffset,\c!inbetween=,\c!align=\c!left,\c!height=10ex]% \else - \getparameters[\??fd][\c!distance=\!!zeropoint,\c!inbetween=,\c!align=\c!left]% + \getparameters[\??fd][\c!distance=\zeropoint,\c!inbetween=,\c!align=\c!left]% \fi\fi \getparameters[\??fd][\c!n=,\c!before=,\c!after=\vss,\c!style=,\c!color=,#3]% \ifShowFieldFrame @@ -283,7 +310,7 @@ \c!clickin=,\c!clickout=,\c!regionin=,\c!regionout=, \c!afterkey=,\c!format=,\c!validate=,\c!calculate=, \c!focusin=,\c!focusout=, - \c!fieldoffset=\!!zeropoint,\c!fieldbackgroundcolor=, + \c!fieldoffset=\zeropoint,\c!fieldbackgroundcolor=, \c!fieldframecolor=,\c!fieldlayer=\@@iafieldlayer,#5]% \scratchdimen\framedwidth \edef\@@fdwidth {\the\scratchdimen}% \scratchdimen\framedheight\edef\@@fdheight{\the\scratchdimen}% @@ -324,11 +351,11 @@ \c!clickin=,\c!clickout=,\c!regionin=,\c!regionout=, \c!focusin=,\c!focusout=, \c!afterkey=,\c!format=,\c!validate=,\c!calculate=, - \c!fieldoffset=\!!zeropoint,\c!fieldbackgroundcolor=, + \c!fieldoffset=\zeropoint,\c!fieldbackgroundcolor=, \c!fieldframecolor=,\c!fieldlayer=\@@iafieldlayer,#5,\c!align=] {\edef\defaultfield{\ctxlua{backends.codeinjections.getdefaultfieldvalue("#1")}}% -\dopresetsymbol\defaultfield -\setbox\scratchbox\hbox{\dogetsymbol\defaultfield}% + % \dopresetsymbol\defaultfield + \setbox\scratchbox\hbox{\symbol[\defaultfield]}% \edef\@@fdwidth {\the\wd\scratchbox}% \ifcase\fitfieldmode \edef\@@fdheight{\the\ht\scratchbox}% @@ -376,7 +403,7 @@ \setupfield [systemfield] [\c!n=1024, % beware: weblink plugin truncates - \c!location=\v!low,\c!strut=\v!yes,\c!fieldoffset=0pt, + \c!location=\v!low,\c!strut=\v!yes,\c!fieldoffset=\zeropoint, \c!height=1.2\openlineheight,\c!width=\dimen0,\c!offset=\v!overlay, \c!style=,\c!align=\v!middle,\c!frame=\v!off, \c!color=red,\c!fieldbackgroundcolor=\s!white,\c!fieldframecolor=blue, @@ -438,7 +465,7 @@ {\fitfield[\currentsystemfield:but]}% #2}% \ht0\strutht\dp0\strutdp\box0 - \enfgroup} + \endgroup} %D And one more: diff --git a/tex/context/base/supp-mps.mkii b/tex/context/base/supp-mps.mkii index 9864cd9a1..3629ccf0b 100644 --- a/tex/context/base/supp-mps.mkii +++ b/tex/context/base/supp-mps.mkii @@ -1174,8 +1174,8 @@ \ifx\undefined\interactionmode \chardef\interactionmode=255 \fi - \def\MPOSTbatchswitch {-int=batchmode} - \def\MPOSTnonstopswitch {-int=nonstopmode} + \def\MPOSTbatchswitch {-interaction=batchmode} % was -int, but newer mpost does not support partial flags + \def\MPOSTnonstopswitch {-interaction=nonstopmode} % was -int, but newer mpost does not support partial flags \def\MPOSTformatswitch {-progname=metafun -mem=} \def\MPOSTdriver {dvips} diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv index d650e4513..7b119f578 100644 --- a/tex/context/base/syst-aux.mkiv +++ b/tex/context/base/syst-aux.mkiv @@ -1842,7 +1842,8 @@ \def\undoassign[#1][#2]{\let\setsomevalue\doresetvalue\p!doassign#1\@relax@#2==\empty\@relax@} %D \macros -%D {processassignmentlist,processassignmentcommand} +%D {processassignmentlist,processassignmentcommand, +%D startprocessassignmentlist,startprocessassignmentcommand} %D %D For Wolfgang: %D @@ -1861,6 +1862,14 @@ \def\processassignmentcommand[#1]% {\normalexpanded{\noexpand\processassignmentlist[#1]}} +\long\def\startprocessassignmentlist[#1]#2\stopprocessassignmentlist + {\long\def\currentassignmentlistcommand##1##2{\def\currentassignmentlistkey{##1}\def\currentassignmentlistvalue{##2}#2}% + \processassignmentlist[#1]\currentassignmentlistcommand} + +\long\def\startprocessassignmentcommand[#1]#2\stopprocessassignmentcommand + {\long\def\currentassignmentlistcommand##1##2{\def\currentassignmentlistkey{##1}\def\currentassignmentlistvalue{##2}#2}% + \normalexpanded{\noexpand\processassignmentlist[#1]}\currentassignmentlistcommand} + %D \macros{currentvalue} %D %D Just in case a \type{\getparameter} argument itself ends up diff --git a/tex/context/base/syst-gen.mkii b/tex/context/base/syst-gen.mkii index 2db71650f..65a501360 100644 --- a/tex/context/base/syst-gen.mkii +++ b/tex/context/base/syst-gen.mkii @@ -2911,7 +2911,8 @@ {\ifundefined{#1#2}\dosetvalue{#1}{#2}{#3}\fi} %D \macros -%D {processassignmentlist,processassignmentcommand} +%D {processassignmentlist,processassignmentcommand, +%D startprocessassignmentlist,startprocessassignmentcommand} %D %D For Wolfgang: %D @@ -2927,6 +2928,14 @@ \def\processassignmentcommand[#1]% {\normalexpanded{\noexpand\processassignmentlist[#1]}} +\long\def\startprocessassignmentlist[#1]#2\stopprocessassignmentlist + {\long\def\currentassignmentlistcommand##1##2{\def\currentassignmentlistkey{##1}\def\currentassignmentlistvalue{##2}#2}% + \processassignmentlist[#1]\currentassignmentlistcommand} + +\long\def\startprocessassignmentcommand[#1]#2\stopprocessassignmentcommand + {\long\def\currentassignmentlistcommand##1##2{\def\currentassignmentlistkey{##1}\def\currentassignmentlistvalue{##2}#2}% + \normalexpanded{\noexpand\processassignmentlist[#1]}\currentassignmentlistcommand} + %D \macros %D {getparameters,geteparameters,getgparameters, %D forgetparameters} |