From 4421b24761b125677851cf22c6e6a9883cd06f85 Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Thu, 15 Jan 2009 22:15:59 +0000
Subject: [PATCH] the way expand_keyword works has changed, templates updated.
 parameter un-bolding now works for vs templates

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1359 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 data/magic.mse-game/script       |  4 ++--
 data/vanguard.mse-game/game      |  6 ++++--
 data/vs-new.mse-style/style      | 11 +++++++++--
 data/vs-oversize.mse-style/style | 11 +++++++++--
 data/vs.mse-game/script          | 12 +++++++-----
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script
index 175b302f..0ca75002 100644
--- a/data/magic.mse-game/script
+++ b/data/magic.mse-game/script
@@ -388,8 +388,8 @@ text_filter :=
 			keyword  := "<nospellcheck>{keyword}</nospellcheck>"
 			reminder := process_english_hints(reminder)
 			if mode == "pseudo" then "<i-auto>{keyword}</i-auto>"
-			else "{keyword}<atom-reminder-{mode}> ({reminder})</atom-reminder-{mode}>" }
-		) +
+			else keyword + if expand then "<atom-reminder-{mode}> ({reminder})</atom-reminder-{mode}>"
+		}) +
 	# step 2b : move action keywords' reminder text to the end of the line
 	replace@(
 		match: "(<atom-reminder-action>(?:(?!<kw-).)*</atom-reminder-action></kw[^>]*>)(((?!<atom-reminder| ?<kw-)[^\n(])+)",
diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game
index 790f47ca..73b3d5ee 100644
--- a/data/vanguard.mse-game/game
+++ b/data/vanguard.mse-game/game
@@ -126,9 +126,11 @@ init script:
 			default_expand: {
 				chosen(choice:if correct_case then mode else "lower case", set.automatic_reminder_text)
 			},
-			combine:        {
+			combine: {
+				keyword  := "<nospellcheck>{keyword}</nospellcheck>"
+				reminder := process_english_hints(reminder)
 				if mode == "pseudo" then "<i-auto>{keyword}</i-auto>"
-				else "{keyword}<atom-reminder-{mode}> ({process_english_hints(reminder)})</atom-reminder-{mode}>" }
+				else keyword + if expand then "<atom-reminder-{mode}> ({reminder})</atom-reminder-{mode}>" }
 			) +
 		# step 2b : move inline keywords' reminder text to the end of the line
 		replace@(
diff --git a/data/vs-new.mse-style/style b/data/vs-new.mse-style/style
index 4eba6bd8..055265ec 100644
--- a/data/vs-new.mse-style/style
+++ b/data/vs-new.mse-style/style
@@ -51,8 +51,15 @@ init script:
 			default_expand: {
 				chosen(choice:if correct_case then mode else "lower case", set.automatic_reminder_text)
 			},
-			combine:        { "<b-auto>{keyword}</b-auto><atom-reminder-{mode}> ({process_english_hints(reminder)})</atom-reminder-{mode}>" }
-			) +
+			combine: {
+				# un-bold parameters
+				keyword := tag_contents(keyword, tag:"<param",
+				              contents: {"</b-auto>{input}<b-auto>"})
+				reminder := process_english_hints(reminder)
+				# the combined result
+				"<b-auto>{keyword}</b-auto>"
+				 + if expand then "<atom-reminder-{mode}> ({reminder})</atom-reminder-{mode}>"
+			}) +
 		# step 3 : Expand shortcut words ~ and CARDNAME
 		replace_rule(
 			match: "~|~THIS~|CARDNAME",
diff --git a/data/vs-oversize.mse-style/style b/data/vs-oversize.mse-style/style
index e836b03a..fe56e441 100644
--- a/data/vs-oversize.mse-style/style
+++ b/data/vs-oversize.mse-style/style
@@ -42,8 +42,15 @@ init script:
 			default_expand: {
 				chosen(choice:if correct_case then mode else "lower case", set.automatic_reminder_text)
 			},
-			combine:        { "<b-auto>{keyword}</b-auto><atom-reminder-{mode}> ({process_english_hints(reminder)})</atom-reminder-{mode}>" }
-			) +
+			combine: {
+				# un-bold parameters
+				keyword := tag_contents(keyword, tag:"<param",
+				              contents: {"</b-auto>{input}<b-auto>"})
+				reminder := process_english_hints(reminder)
+				# the combined result
+				"<b-auto>{keyword}</b-auto>"
+				 + if expand then "<atom-reminder-{mode}> ({reminder})</atom-reminder-{mode}>"
+			}) +
 		# step 3 : Expand shortcut words ~ and CARDNAME
 		replace_rule(
 			match: "~|~THIS~|CARDNAME",
diff --git a/data/vs.mse-game/script b/data/vs.mse-game/script
index 6e13d695..c00aa619 100644
--- a/data/vs.mse-game/script
+++ b/data/vs.mse-game/script
@@ -45,13 +45,15 @@
 			default_expand: {
 				chosen(choice:if correct_case then mode else "lower case", set.automatic_reminder_text)
 			},
-			combine:        { 
+			combine: {
 				# un-bold parameters
-				keyword := tag_contents@(keyword, tag:"<param",
-					contents: {"</b-auto>{input}<b-auto>"})
+				keyword := tag_contents(keyword, tag:"<param",
+				              contents: {"</b-auto>{input}<b-auto>"})
+				reminder := process_english_hints(reminder)
 				# the combined result
-				"<b-auto>{keyword}</b-auto><atom-reminder-{mode}> ({process_english_hints(reminder)})</atom-reminder-{mode}>" }
-			) +
+				"<b-auto>{keyword}</b-auto>"
+				 + if expand then "<atom-reminder-{mode}> ({reminder})</atom-reminder-{mode}>"
+			}) +
 		# step 3 : Expand shortcut words ~ and CARDNAME
 		replace_rule(
 			match: "~|~THIS~|CARDNAME",