New keyword mode: 'inline', givin correct reminder text for 'scry'

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@374 0fc631ac-6414-0410-93d0-97cfa31319b6

data/en.mse-locale/locale

@@ -348,6 +348,10 @@ label:
 	# Open dialogs
 	all files			All files
 	
+	# New set window
+	game type:			&Game type:
+	style type:			&Card style:
+	
 	# Preferences
 	language:			Language
 	app language:		Language of the user interface:
@@ -380,6 +384,9 @@ label:
 	set code:			Set &Code:
 	apprentice export cancled: Export to Apprentice is cancled
 	
+	# Html export
+	html template:		Template:
+	
 	# Image slicer
 	original:			Original:
 	result:				Result:
@@ -462,6 +469,7 @@ title:
 	# export
 	export images:		Export Images
 	export cancled:		Export Cancled
+	export html:		Export HTML
 
 ############################################################## Action (undo/redo) names
 action:

data/magic-blends.mse-include/include

@@ -1,6 +1,6 @@
-mse version: 0.3.2
+mse version: 0.3.3
 full name: Magic The Gathering, card blend utilities
-version: 2006.01.17
+version: 2007.05.13
 
 # This file doesn't do anything, other files in this directory can be included
 # in game/style files:

data/magic.mse-game/game

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.3
 short name: Magic
 full name: Magic the Gathering
 icon: card-back.png
@@ -214,7 +214,12 @@ init script:
 			default_expand: { contains(match:mode, set.automatic_reminder_text) },
 			combine:        {
 				if mode == "pseudo" then "<i-auto>{keyword}</i-auto>"
-				else "{keyword}<atom-reminder><i> ({process_english_hints(reminder)})</i></atom-reminder>" }
+				else "{keyword}<atom-reminder-{mode}> ({process_english_hints(reminder)})</atom-reminder-{mode}>" }
+			) +
+		# step 2b : move inline keywords' reminder text to the end of the line
+		replace_rule(
+			match: "(<atom-reminder-inline>.*</atom-reminder-inline></kw[^>]*>)([^\n(]+)",
+			replace: "\\2\\1"
 			) +
 		# step 3a : expand shortcut words ~ and CARDNAME
 		replace_rule(
@@ -410,8 +415,9 @@ set field:
 	choice: core
 	choice: expert
 	choice: pseudo
+	choice: inline
 	choice: custom
-	initial: old, core, expert, pseudo, custom
+	initial: old, core, expert, pseudo, inline, custom
 	# Convert from older mse versions
 	script:
 		if value = "yes" then "old, core, expert, custom"
@@ -1459,8 +1465,12 @@ keyword:
 keyword:
 	keyword: Scry
 	match: Scry <atom-param>number</atom-param>
-	mode: expert
+	mode: inline
-	reminder: Look at the top {english_number_multiple(param1)} card(s) of your library. Put any number of them on the bottom of your library in any order and the rest on top of your library in any order.
+	reminder:
+		To scry {param1}, look at the top {
+		 if param1.value==1 then "card of your library, then you may put that card on the bottom of your library."
+		 else "{english_number(param1)} cards of your library. Put any number of them on the bottom of your library in any order and the rest on top in any order."
+		}
 keyword:
 	keyword: Sunburst
 	match: Sunburst

src/data/keyword.cpp

@@ -441,8 +441,8 @@ String KeywordDatabase::expand(const String& text,
 	assert(combine_script);
 	
 	// Remove all old reminder texts
-	String s = remove_tag_contents(text, _("<atom-reminder>"));
+	String s = remove_tag_contents(text, _("<atom-reminder"));
-	s = remove_tag_contents(s, _("<atom-keyword>")); // OLD, TODO: REMOVEME
+	s = remove_tag_contents(s, _("<atom-keyword")); // OLD, TODO: REMOVEME
 	s = remove_tag_contents(s, _("<atom-kwpph>"));
 	s = remove_tag(s, _("<keyword-param"));
 	s = remove_tag(s, _("<param-"));