diff -r 9116599821fc lib/simplesteps.lua --- a/lib/simplesteps.lua Thu Dec 13 20:49:38 2012 -0200 +++ b/lib/simplesteps.lua Fri Dec 14 01:59:00 2012 +0100 @@ -7,10 +7,12 @@ license = "GPL version 3.0 or any later version" } -simplesteps = simplesteps or {} +thirddata = thirddata or {} +thirddata.simplesteps = thirddata.simplesteps or {} +local simplesteps = thirddata.simplesteps -local stepcounter = 0 -local maxstepcount = 1 +local stepcounter = 0 +local maxstepcount = 1 function simplesteps.distance_to_step(str) @@ -51,7 +53,7 @@ function simplesteps.update_maxstepcount(steps) for i=1,#steps do - step = steps[i] + local step = steps[i] if maxstepcount < step then maxstepcount = step diff -r 9116599821fc lib/simplesteps.mkiv --- a/lib/simplesteps.mkiv Thu Dec 13 20:49:38 2012 -0200 +++ b/lib/simplesteps.mkiv Fri Dec 14 01:59:00 2012 +0100 @@ -18,7 +18,7 @@ \unprotect %D \macros -%D {simplesteps} +%D {startframe,stopframe} %D %D \startframe[Slide 1] %D \startitemize @@ -31,49 +31,53 @@ \unexpanded\def\uncover[#1]% {\ctxlua{ - distance = simplesteps.distance_to_step("#1") + local distance = thirddata.simplesteps.distance_to_step("#1") if 0 == distance then elseif 1 == distance then - tex.sprint('\\simplestepscoverednext') + context.simplestepscoverednext() elseif 2 == distance then - tex.sprint('\\simplestepscoveredfar') + context.simplestepscoveredfar() else - tex.sprint('\\simplestepscoveredveryfar') + context.simplestepscoveredveryfar() end }} \unexpanded\def\only[#1]% {\ctxlua{ - if not simplesteps.instep("#1") + if not thirddata.simplesteps.instep("#1") then - tex.sprint('\\simplestepshidden') + context.simplestepshidden() end }} \unexpanded\def\simplestepsplaybuffer% - {\ctxlua{simplesteps.playbuffer()}} + {\ctxlua{thirddata.simplesteps.playbuffer()}} -\definecolor[hidden1][s=0.75] -\definecolor[hidden2][s=0.90] -\definecolor[hidden3][s=0.95] +\definecolor[simplesteps:hidden1][s=0.75] +\definecolor[simplesteps:hidden2][s=0.90] +\definecolor[simplesteps:hidden3][s=0.95] \unexpanded\def\simplestepshidden#1{} -\unexpanded\def\simplestepscoverednext#1{\color[hidden1]{#1}} -\unexpanded\def\simplestepscoveredfar#1{\color[hidden2]{#1}} -\unexpanded\def\simplestepscoveredveryfar#1{\color[hidden3]{#1}} +\unexpanded\def\simplestepscoverednext#1{\color[simplesteps:hidden1]{#1}} +\unexpanded\def\simplestepscoveredfar#1{\color[simplesteps:hidden2]{#1}} +\unexpanded\def\simplestepscoveredveryfar#1{\color[simplesteps:hidden3]{#1}} + + +\unexpanded\def\startframe{\dosingleempty\frame_start} + +\def\frame_start[#1]{% + \iffirstargument + \section{#1}%% solution needed here! + \fi + \begingroup + \grabbufferdata[simplesteps][startframe][stopframe]% +} + +\let\stopframe\simplestepsplaybuffer \protect - -\setupsectionblock - [frame] - [before=\initframe,after=\endframe] - -\def\initframe{\startbuffer[simplesteps]} -\def\endframe{\stopbuffer\simplestepsplaybuffer} - - \endinput