From 904ef6b07ed1461a9292316e87b675a435229116 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Mon, 6 Oct 2008 00:46:34 +0000 Subject: [PATCH] Fix bug with $x/$lx/$sx and others definition time. Originally committed to SVN as r2411. --- automation/autoload/kara-templater.lua | 37 +++++++++++++------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/automation/autoload/kara-templater.lua b/automation/autoload/kara-templater.lua index 88a4e345b..254b8db72 100644 --- a/automation/autoload/kara-templater.lua +++ b/automation/autoload/kara-templater.lua @@ -435,24 +435,6 @@ function apply_line(meta, styles, subs, line, templates, tenv) ly = math.floor(line.y+0.5) } - -- Specific for whole-line processing - varctx["start"] = varctx.lstart - varctx["end"] = varctx.lend - varctx.dur = varctx.ldur - varctx.kdur = math.floor(varctx.dur / 10) - varctx.mid = varctx.lmid - varctx.i = varctx.li - varctx.left = varctx.lleft - varctx.center = varctx.lcenter - varctx.right = varctx.lright - varctx.width = varctx.lwidth - varctx.top = varctx.ltop - varctx.middle = varctx.lmiddle - varctx.bottom = varctx.lbottom - varctx.height = varctx.lheight - varctx.x = varctx.lx - varctx.y = varctx.ly - tenv.orgline = line tenv.line = nil tenv.syl = nil @@ -463,6 +445,25 @@ function apply_line(meta, styles, subs, line, templates, tenv) for t in matching_templates(templates.line, line, tenv) do tenv.j = 0 tenv.maxj = t.loops + + -- Set varctx for per-line variables + varctx["start"] = varctx.lstart + varctx["end"] = varctx.lend + varctx.dur = varctx.ldur + varctx.kdur = math.floor(varctx.dur / 10) + varctx.mid = varctx.lmid + varctx.i = varctx.li + varctx.left = varctx.lleft + varctx.center = varctx.lcenter + varctx.right = varctx.lright + varctx.width = varctx.lwidth + varctx.top = varctx.ltop + varctx.middle = varctx.lmiddle + varctx.bottom = varctx.lbottom + varctx.height = varctx.lheight + varctx.x = varctx.lx + varctx.y = varctx.ly + while tenv.j < t.loops do tenv.j = tenv.j + 1 if t.code then