Fixed some problems with magic-extended-art.

Added infinity mana symbol.
Added insert symbol menus to all symbol fonts that were lacking them.
Updated font color choice for fpm promo to improve readability.

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

data/magic-embossedletters.mse-symbol-font/symbol-font

@@ -1,5 +1,5 @@
 mse version: 0.3.5
-version: 2007-09-23
+version: 2007-10-13
 
 image font size: 46
 horizontal space: 1.2
@@ -185,3 +185,45 @@ text margin left:   .26
 text margin right:  .2
 text margin top:    -.12
 text margin bottom: -.12
+
+
+##############################################################
+# Insert-symbol menu
+insert symbol menu:
+	item:
+		name: A-M
+		item: A
+		item: Æ
+		item: B
+		item: C
+		item: D
+		item: E
+		item: F
+		item: G
+		item: H
+		item: I
+		item: J
+		item: K
+		item: L
+		item: M
+	item:
+		name: N-Z
+		item: N
+		item: O
+		item: P
+		item: Q
+		item: R
+		item: S
+		item: T
+		item: U
+		item: V
+		item: W
+		item: X
+		item: Y
+		item: Z
+	item:
+		name: punctuation
+		item: &
+		item: '
+		item: ,
+		item: -

data/magic-extended-art.mse-style/style

@@ -39,8 +39,8 @@ init script:
 		then	"oa"
 		else	input
 	}
-	template      := { (if type == "pt" then "/magic-new.mse-style/" else "") + artifact_template() + "{type}.jpg" }
+	template      := { artifact_template() + "{type}.jpg" }
-	land_template := { (if type == "pt" then "/magic-new.mse-style/" else "") +(if input == "a" then "c" else input) + "l{type}.jpg" }
+	land_template := { (if input == "a" then "c" else input) + "l{type}.jpg" }
 	
 	# Use the normal tap symbol
 	mana_t := {
@@ -188,7 +188,7 @@ card style:
 
 	type:
 		left: 33
-		top : 445
+		top : 447
 		width: { 308 - max(22,card_style.rarity.content_width) }
 		height: 18
 		alignment: top shrink-overflow

data/magic-firepenguinmasterpromo.mse-style/style

@@ -1,11 +1,11 @@
-mse version: 0.3.4
+mse version: 0.3.5
 game: magic
 full name: FPM's Promo Magic
 short name: FPM Promo
 icon: card-sample.png
 position hint: 404
 
-version: 2007-09-23
+version: 2007-10-13
 depends on:
 	package: magic.mse-game
 	version: 2007-09-23
@@ -61,12 +61,15 @@ styling field:
 	choice: Matrix
 	choice: MatrixBoldSmallCaps
 styling field:
-	type: choice
+	type: color
 	name: font color
-	description: Use white or black for the card's font color?
+	description: The default text and typeline color for cards
-	initial: black
+	choice:
-	choice: black
+		name: black
-	choice: white
+		color: rgb(0,0,0)
+	choice:
+		name: white
+		color: rgb(255,255,255)
 styling field:
 	type: boolean
 	name: beveled mana symbols
@@ -215,10 +218,7 @@ card style:
 		font:
 			name: Matrix
 			size: 10
-			color: 
+			color: { styling.font_color }
-				{ if styling.font_color = "white" then rgb(255,255,255)
-				else if styling.font_color = "black" then rgb(0,0,0)
-				else rgb(0,0,0) }
 			separator color: rgb(128,128,128)
 
 	############################# Text box
@@ -232,10 +232,7 @@ card style:
 			italic name: MPlantin-Italic
 			size: 14
 			scale down to: 6
-			color: 
+			color: { styling.font_color }
-				{ if styling.font_color = "white" then rgb(255,255,255)
-				else if styling.font_color = "black" then rgb(0,0,0)
-				else rgb(0,0,0) }
 		symbol font:
 			name:
 				{ if styling.beveled_mana_symbols then "magic-mana-beveled"
@@ -313,10 +310,7 @@ card style:
 		font:
 			name: MPlantin-Italic
 			size: 8
-			color: 
+			color: { styling.font_color }
-				{ if styling.font_color = "white" then rgb(255,255,255)
-				else if styling.font_color = "black" then rgb(0,0,0)
-				else rgb(0,0,0) }
 
 	copyright line:
 		left: 65
@@ -328,10 +322,7 @@ card style:
 		font:
 			name: MPlantin
 			size: 7
-			color: 
+			color: { styling.font_color }
-				{ if styling.font_color = "white" then rgb(255,255,255)
-				else if styling.font_color = "black" then rgb(0,0,0)
-				else rgb(0,0,0) }
 
 
 ############################################################## Extra card fields

data/magic-mana-beveled.mse-symbol-font/symbol-font

@@ -1,5 +1,5 @@
 mse version: 0.3.5
-version: 2007-09-23
+version: 2007-10-12
 # Symbol font in the beveled style used for casting costs on FPM cards
 # Note:
 #  Define  small_mana_t:="mana_t(_old)?.png" in the init script of the style
@@ -185,6 +185,9 @@ symbol:
 symbol:
 	code: Z
 	image: mana_z.png
+symbol:
+	code: I
+	image: mana_infinite.png
 as text: .|[0-9]+(?!/)
 text font:
 	name: MPlantin
@@ -195,3 +198,64 @@ text margin left:   .24
 text margin right:  .24
 text margin top:    -.16
 text margin bottom: -.12
+
+##############################################################
+# Insert-symbol menu
+insert symbol menu:
+	item: T
+	item:
+		type: line
+	item: X
+	item: Y
+	item: Z
+	item: I
+	item:
+		type: custom
+		name: colorless
+	item:
+		type: line
+	item: W
+	item: U
+	item: B
+	item: R
+	item: G
+	item: S
+	item:
+		type: line
+	item:
+		name: half
+		item: 1/2
+		item: |W
+		item: |U
+		item: |B
+		item: |R
+		item: |G
+		item: |S
+	item:
+		name: hybrid
+		item: W/U
+		item: U/B
+		item: B/R
+		item: R/G
+		item: G/W
+		item:
+			type: line
+		item: W/B
+		item: U/R
+		item: B/G
+		item: R/W
+		item: G/U
+	item:
+		name: hybrid 3
+		item: W/U/B
+		item: U/B/R
+		item: B/R/G
+		item: R/G/W
+		item: G/W/U
+		item:
+			type: line
+		item: W/B/R
+		item: U/R/G
+		item: B/G/W
+		item: R/W/U
+		item: G/U/B

data/magic-mana-future.mse-symbol-font/symbol-font

@@ -1,5 +1,5 @@
 mse version: 0.3.5
-version: 2007-09-23
+version: 2007-10-12
 # Symbol font in the 'futuristic' style, used for casting costs on futureshift cards
 
 image font size: 135
@@ -137,6 +137,9 @@ symbol:
 symbol:
 	code: S
 	image: mana_s.png
+symbol:
+	code: I
+	image: mana_infinite.png
 as text: .|[0-9]+(?!/)
 text font:
 	name: MPlantin
@@ -148,3 +151,47 @@ text margin left:   .35
 text margin right:  .3
 text margin top:    0.1
 text margin bottom: 0.1
+
+##############################################################
+# Insert-symbol menu
+insert symbol menu:
+	item: T
+	item:
+		type: line
+	item: I
+	item:
+		type: custom
+		name: colorless
+	item:
+		type: line
+	item: W
+	item: U
+	item: B
+	item: R
+	item: G
+	item: S
+	item:
+		type: line
+	item:
+		name: half
+		item: 1/2
+		item: |W
+		item: |U
+		item: |B
+		item: |R
+		item: |G
+		item: |S
+	item:
+		name: hybrid
+		item: W/U
+		item: U/B
+		item: B/R
+		item: R/G
+		item: G/W
+		item:
+			type: line
+		item: W/B
+		item: U/R
+		item: B/G
+		item: R/W
+		item: G/U

data/magic-mana-large.mse-symbol-font/symbol-font

@@ -1,5 +1,5 @@
 mse version: 0.3.5
-version: 2007-09-23
+version: 2007-10-12
 # Symbol font in the 'popup' style, used for casting costs on modern cards
 
 image font size: 135
@@ -198,6 +198,9 @@ symbol:
 symbol:
 	code: Z
 	image: mana_z.png
+symbol:
+	code: I
+	image: mana_infinite.png
 as text: [0-9]+(?!/)
 text font:
 	name: MPlantin
@@ -219,6 +222,7 @@ insert symbol menu:
 	item: X
 	item: Y
 	item: Z
+	item: I
 	item:
 		type: custom
 		name: colorless

data/magic-mana-small.mse-symbol-font/symbol-font

@@ -1,5 +1,5 @@
 mse version: 0.3.5
-version: 2007-09-23
+version: 2007-10-12
 # Symbol font in the normal, flat, style, used for text boxes and on old style cards
 # Note:
 #  Define  mana_t := {"new|old|older"} in the init script of the style
@@ -205,6 +205,9 @@ symbol:
 symbol:
 	code: Z
 	image: mana_z.png
+symbol:
+	code: I
+	image: mana_infinite.png
 as text: .|[0-9]+(?!/)
 text font:
 	name: MPlantin
@@ -225,6 +228,7 @@ insert symbol menu:
 	item: X
 	item: Y
 	item: Z
+	item: I
 	item:
 		type: custom
 		name: colorless

data/magic-new.mse-style/style

@@ -195,7 +195,7 @@ card style:
 			color: rgb(0,0,0)
 	casting cost:
 		right: 343
-		top : 32
+		top : 31
 		width: { max(30, card_style.casting_cost.content_width) + 5 }
 		height: 23
 		alignment: bottom right

data/magic.mse-game/game

@@ -1,10 +1,10 @@
-mse version: 0.3.5
+mse version: 0.3.5
 short name: Magic
 full name: Magic the Gathering
 icon: card-back.png
 position hint: 01
 
-version: 2007-09-29
+version: 2007-10-13
 depends on:
 	package: magic-blends.mse-include
 	version: 2007-09-23
@@ -20,7 +20,7 @@ init script:
 	############################################################## Sorting mana symbols
 	
 	# correctly sort a mana symbol (no guild mana)
-	mana_sort       := sort_rule(order: "XYZ[0123456789]S(WUBRG)")
+	mana_sort       := sort_rule(order: "XYZI[0123456789]S(WUBRG)")
 	# correctly sort guild mana
 	mana_sort_guild := replace_rule(
 			match: "./.|././.|./././.|.[|]",
@@ -256,7 +256,7 @@ init script:
 	for_mana_costs := format_cost := {
 		if input.separator_before == "—" and contains(input.param, match: " ") then (
 			if contains(input.param, match:",") then (
-				if match(match: "^[STXYZWUBRG0-9/|]+,", input.param) then
+				if match(match: "^[STXYZIWUBRG0-9/|]+,", input.param) then
 					"{add}<param-cost>{combined_cost(input.param)}</param-cost>"
 				else "<param-cost>{combined_cost(input.param)}</param-cost>"
 			) else
@@ -267,7 +267,7 @@ init script:
 	alternative_cost := replace_rule(match:"^[A-Z]", replace: { to_lower() })
 	combined_cost := replace_rule(match:", [A-Z]", replace: { to_lower() })+
 		replace_rule(match:",", replace:" and")+
-		replace_rule(match:"^[STXYZWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
+		replace_rule(match:"^[STXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
 		replace_rule(match:"^[A-Z]", replace: { to_lower() })
 	long_dash := replace_rule(match:"-", replace:"—")
 	# Utilities for keywords
@@ -290,8 +290,8 @@ init script:
 		    |adds?|pay(ed)?[ ](with|using)
 		    )
 		    ([ ]either)?			 # pay either X or Y
-		    ([ ]<sym[^>]*>[STXYZWUBRG0-9/|]+</sym[^>]*>,)* # pay X, Y or Z
+		    ([ ]<sym[^>]*>[STXYZIWUBRG0-9/|]+</sym[^>]*>,)* # pay X, Y or Z
-		    ([ ]<sym[^>]*>[STXYZWUBRG0-9/|]+</sym[^>]*>[ ](and|or|and/or))* # pay X or Y
+		    ([ ]<sym[^>]*>[STXYZIWUBRG0-9/|]+</sym[^>]*>[ ](and|or|and/or))* # pay X or Y
 		    [ ]<match> 
 		    ([,.)]|$				# (end of word)
 		    |[ ][^ .,]*$			# still typing...
@@ -339,16 +339,16 @@ init script:
 			) +
 		# step 4 : explict non mana symbols
 		replace_rule(
-			match: "\\][STXYZWUBRG0-9/|]+\\[",
+			match: "\\][STXYZIWUBRG0-9/|]+\\[",
 			replace: {"<nosym>" + mana_filter_t() + "</nosym>"} ) +
 		# step 5 : add mana & tap symbols
 		replace_rule(
-			match: "[STXYZWUBRG0-9/|]+",
+			match: "[STXYZIWUBRG0-9/|]+",
 			in_context: mana_context,
 			replace: {"<sym-auto>" + mana_filter_t() + "</sym-auto>"} ) +
 		# step 5b : add explict mana symbols
 		replace_rule(
-			match: "\\[[STXYZWUBRG0-9/|]+\\]",
+			match: "\\[[STXYZIWUBRG0-9/|]+\\]",
 			replace: {"<sym>" + mana_filter_t() + "</sym>"} ) +
 		# step 7 : italic reminder text
 		replace_rule(
@@ -1978,7 +1978,7 @@ keyword mode:
 
 keyword parameter type:
 	name: mana
-	match: [STXYZ0-9WUBRG/|]+
+	match: [STXYZI0-9WUBRG/|]+
 	refer script:
 		name: normal
 		description: No changes made
@@ -1991,7 +1991,7 @@ keyword parameter type:
 # By pichoro and bunnierein
 keyword parameter type:
 	name: cost
-	match: [ ][STXYZ0-9WUBRG/|]*|[-—][^(\n]*
+	match: [ ][STXYZI0-9WUBRG/|]*|[-—][^(\n]*
 	separator before is: [ —-]
 	separator after is: [.]
 	optional: false

data/vanguard.mse-game/game

@@ -3,7 +3,7 @@ short name: Vanguard
 full name: Magic Vanguard
 icon: card-sample.png
 position hint: 02
-version: 2007-09-29
+version: 2007-10-13
 
 # Author : Wolfwood
 # Most stuff is copy/pasted from magic.mse-game
@@ -15,12 +15,13 @@ init script:
 	############################################################## Sorting mana symbols
 	
 	# correctly sort a mana symbol (no guild mana)
-	mana_sort       := sort_rule(order: "XYZ[0123456789]S(WUBRG)")
+	mana_sort       := sort_rule(order: "XYZI[0123456789]S(WUBRG)")
 	# correctly sort guild mana
-	mana_sort_guild := replace_rule( # swap these:
+	mana_sort_guild := replace_rule(
-			match: "U/W|B/U|R/B|G/B|W/G|B/W|R/U|G/B|W/R|U/G",
+			match: "./.|././.|./././.|.[|]",
 			in_context: "(^|[^/])<match>($|[^/])",
-			replace: {input[2] + "/" + input[0]})
+			replace: {sort_text(order:"in_place((WUBRG)")}
+			)
 	mana_has_guild     := sort_rule(order: "</|>") # Is there guild or half mana in the input?
 	# A mana cost can contain both normal and guild mana
 	mana_filter := to_upper + {
@@ -41,7 +42,7 @@ init script:
 	for_mana_costs := format_cost := {
 		if input.separator_before == "—" and contains(input.param, " ") then (
 			if contains(input.param, match:",") then (
-				if match(match: "^[STXYZWUBRG0-9/|]+,", input.param) then
+				if match(match: "^[STXYZIWUBRG0-9/|]+,", input.param) then
 					"{add}<param-cost>{combined_cost(input.param)}</param-cost>"
 				else "<param-cost>{combined_cost(input.param)}</param-cost>"
 			) else
@@ -52,7 +53,7 @@ init script:
 	alternative_cost := replace_rule(match:"^[A-Z]", replace: { to_lower() })
 	combined_cost := replace_rule(match:", [A-Z]", replace: { to_lower() })+
 		replace_rule(match:",", replace:" and")+
-		replace_rule(match:"^[STXYZWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
+		replace_rule(match:"^[STXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
 		replace_rule(match:"^[A-Z]", replace: { to_lower() })
 	long_dash := replace_rule(match:"-", replace:"—")
 	# Utilities for keywords
@@ -80,7 +81,7 @@ init script:
 		    |adds?|pay(ed)?[ ](with|using)
 		    )
 		    ([ ]either)?			 # pay either X or Y
-		    ([ ]<sym[^>]*>[XYZWUBRG0-9/|]+</sym[^>]*>[ ](and|or))* # pay X or Y
+		    ([ ]<sym[^>]*>[TSXYZIWUBRG0-9/|]+</sym[^>]*>[ ](and|or))* # pay X or Y
 		    [ ]<match> 
 		    ([,.)]|$				# (end of word)
 		    |[ ][^ .,]*$			# still typing...
@@ -131,16 +132,16 @@ init script:
 			) +
 		# step 4.5 : explict non mana symbols
 		replace_rule(
-			match: "\\][STXYZWUBRG0-9/|]+\\[",
+			match: "\\][STXYZIWUBRG0-9/|]+\\[",
 			replace: {"<nosym>" + mana_filter_t() + "</nosym>"} ) +
 		# step 5 : add mana & tap symbols
 		replace_rule(
-			match: "[STXYZWUBRG0-9/|]+",
+			match: "[STXYZIWUBRG0-9/|]+",
 			in_context: mana_context,
 			replace: {"<sym-auto>" + mana_filter_t() + "</sym-auto>"} ) +
 		# step 5b : add explict mana symbols
 		replace_rule(
-			match: "\\[[STXYZWUBRG0-9/|]+\\]",
+			match: "\\[[STXYZIWUBRG0-9/|]+\\]",
 			replace: {"<sym>" + mana_filter_t() + "</sym>"} ) +
 		# step 7 : italic reminder text
 		replace_rule(
@@ -419,7 +420,7 @@ keyword mode:
 
 keyword parameter type:
 	name: mana
-	match: [STXYZ0-9WUBRG/|]+
+	match: [STXYZI0-9WUBRG/|]+
 	refer script:
 		name: normal
 		description: No changes made
@@ -432,7 +433,7 @@ keyword parameter type:
 # By pichoro and bunnierein
 keyword parameter type:
 	name: cost
-	match: [ ][STXYZ0-9WUBRG/|]*|[-—][^(\n]*
+	match: [ ][STXYZI0-9WUBRG/|]*|[-—][^(\n]*
 	separator before is: [ —-]
 	separator after is: [.]
 	optional: false

data/vs-standard-arrow.mse-symbol-font/symbol-font

@@ -1,5 +1,5 @@
 mse version: 0.3.5
-version: 2007-09-23
+version: 2007-10-13
 # Symbol font for arrow symbol
 
 image font size: 135
@@ -16,3 +16,9 @@ symbol:
 symbol:
 	code: <>
 	image: diamonda.png
+
+##############################################################
+# Insert-symbol menu
+insert symbol menu:
+	item: ->
+	item: @

data/vs-standard-new.mse-symbol-font/symbol-font

@@ -1,5 +1,5 @@
 mse version: 0.3.5
-version: 2007-09-23
+version: 2007-10-13
 # Symbol font for the new template
 
 image font size: 135
@@ -143,7 +143,7 @@ symbol:
 	code: Sinister Syndicate
 	image: sinistersyndicate.png
 symbol:
-	code: Skeleton  Crew
+	code: Skeleton Crew
 	image: skeletoncrew.png
 symbol:
 	code: Spider-Friends
@@ -205,3 +205,81 @@ symbol:
 symbol:
 	code: 9
 	image: 9.png
+
+##############################################################
+# Insert-symbol menu
+insert symbol menu:
+	item: ->
+	item: <>
+	item: Activate
+	item:
+		name: numbers
+		item: 0
+		item: 1
+		item: 2
+		item: 3
+		item: 4
+		item: 5
+		item: 6
+		item: 7
+		item: 8
+		item: 9
+	item:
+		name: Marvel Teams
+		item: AIM
+		item: Alpha Flight
+		item: Avengers
+		item: Brood
+		item: Brotherhood
+		item: Captain America
+		item: Doom
+		item: Excalibur
+		item: Fantastic Four
+		item: The Hand
+		item: Hellfire Club
+		item: Heralds of Galactus
+		item: Heroes for Hire
+		item: Horsemen of Apocalypse
+		item: Hydra
+		item: Kree
+		item: Marvel Defenders
+		item: Marvel Knights
+		item: Masters of Evil
+		item: New Warriors
+		item: Omega Flight
+		item: Outsiders
+		item: Serpent Society
+		item: Shi'ar
+		item: SHIELD
+		item: Sinister Syndicate
+		item: Spider-Friends
+		item: Starjammers
+		item: Thor
+		item: Thunderbolts
+		item: The Ultimates
+		item: X-Men
+	item:
+		name: DC Teams
+		item: Anti-Matter
+		item: Arkham Inmates
+		item: Birds of Prey
+		item: Femizons
+		item: Gotham Knights
+		item: Green Lantern
+		item: JLA
+		item: JSA
+		item: Legionnaires
+		item: The Order
+		item: Outsiders
+		item: Secret Six
+		item: Shadowpact
+		item: Skeleton Crew
+		item: Team Superman
+		item: Teen Titans
+	item:
+		name: Other Teams
+		item: B.P.R.D.
+		item: Thule Society
+		item: Autobot
+		item: Decepticon
+		item: Quintesson

data/yugioh-standard-levels.mse-symbol-font/symbol-font

@@ -1,5 +1,5 @@
 mse version: 0.3.5
-version: 2007-09-23
+version: 2007-10-13
 # Symbol font for level symbols
 
 image font size: 16
@@ -34,3 +34,16 @@ symbol:
 	code: *
 	image: star.png
 	image font size: 20
+
+##############################################################
+# Insert-symbol menu
+insert symbol menu:
+	item: %
+	item: !
+	item: +
+	item: &
+	item: $
+	item: #
+	item: [
+	item: ]
+	item: *

data/yugioh-text-replacements.mse-symbol-font/symbol-font

@@ -1,6 +1,6 @@
 mse version: 0.3.5
 # Symbol font for missing characters
-version: 2007-09-23
+version: 2007-10-13
 
 image font size: 16
 horizontal space: 2
@@ -16,3 +16,11 @@ symbol:
 symbol:
 	code: ::
 	image: dot.png
+
+##############################################################
+# Insert-symbol menu
+insert symbol menu:
+	item: [
+	item: ]
+	item: @
+	item: ::