From 15ce07e8034fcca5c9caa29245c93a10c50970c5 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Sat, 19 Jan 2008 23:53:29 +0000
Subject: [PATCH] Fix inline-fx parsing in karaskel and handling in
 kara-templater. (Fixes #577)

Originally committed to SVN as r1783.
---
 automation/autoload/kara-templater.lua | 4 ++--
 automation/include/karaskel-auto4.lua  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/automation/autoload/kara-templater.lua b/automation/autoload/kara-templater.lua
index 01e41b44b..0de118cf0 100644
--- a/automation/autoload/kara-templater.lua
+++ b/automation/autoload/kara-templater.lua
@@ -136,7 +136,7 @@ function parse_template(meta, styles, line, templates, mods)
 		addtext = true,
 		keeptags = false,
 		fxgroup = nil,
-		inline_fx = nil,
+		fx = nil,
 		multi = false,
 		isline = false,
 		perchar = false,
@@ -634,7 +634,7 @@ function apply_one_syllable_template(syl, line, template, tenv, varctx, subs, sk
 	aegisub.debug.out(5, "Applying template to one syllable with text: %s\n", syl.text)
 	
 	-- Check for right inline_fx
-	if t.inline_fx and t.inline_fx ~= syl.inline_fx then
+	if t.fx and t.fx ~= syl.inline_fx then
 		aegisub.debug.out(5, "Syllable has wrong inline-fx (wanted '%s', got '%s'), skipping.\n", t.inline_fx, syl.inline_fx)
 		return false
 	end
diff --git a/automation/include/karaskel-auto4.lua b/automation/include/karaskel-auto4.lua
index d4656008f..9e023e112 100644
--- a/automation/include/karaskel-auto4.lua
+++ b/automation/include/karaskel-auto4.lua
@@ -137,7 +137,7 @@ function karaskel.preproc_line_text(meta, styles, line)
 		local syl = kara[i]
 		
 		-- Detect any inline-fx tags
-		local inline_fx = syl.text:match("%{.*\\%-([^}\\]-)")
+		local inline_fx = syl.text:match("%{.*\\%-([^}\\]+)")
 		if inline_fx then
 			cur_inline_fx = inline_fx
 		end