Adding chaos symbol to mana fonts - set to "C".

Magic-mana-future updates by Shiv2503.
Also, changing how curly quotes are handled until curly_quotes is better.

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

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

@@ -1,5 +1,5 @@
-mse version: 0.3.7
+mse version: 0.3.8
-version: 2008-08-13
+version: 2009-08-10
 short name: beveled style (firepenguinmaster)
 installer group: magic/Mana symbols/beveled style (FirePenguinMaster)
 position hint: 101
@@ -37,6 +37,10 @@ symbol:
 symbol:
 	code: Q
 	image: mana_q.png
+symbol:
+	code: C
+	image: mana_chaos.png
+	image font size: 142.11
 symbol:
 	code: B/G/W
 	image: mana_bgw.png
@@ -285,6 +289,7 @@ symbol:
 insert symbol menu:
 	item: T
 	item: Q
+	item: C
 	item:
 		type: line
 	item: X

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

@@ -1,5 +1,5 @@
-mse version: 0.3.7
+mse version: 0.3.8
-version: 2008-08-13
+version: 2009-08-11
 # Symbol font in the 'futuristic' style, used for casting costs on futureshift cards
 short name: Future Sight style
 installer group: magic/Mana symbols/Future Sight style
@@ -15,20 +15,8 @@ symbol:
 	code: Q
 	image: mana_q.png
 symbol:
-	code: 2/W
+	code: C
-	image: mana_2w.png
+	image: mana_chaos.png
-symbol:
-	code: 2/U
-	image: mana_2u.png
-symbol:
-	code: 2/B
-	image: mana_2b.png
-symbol:
-	code: 2/R
-	image: mana_2r.png
-symbol:
-	code: 2/G
-	image: mana_2g.png
 symbol:
 	code: W/U
 	image: mana_guild_wu.png
@@ -102,23 +90,23 @@ symbol:
 symbol:
 	code: 1/2
 	enabled: { colorless_color() == "w" }
-	image: mana_1_half_w.png
+	image: {masked_blend(light: "mana_1_half.png", dark: "mana_circle_w.png", mask:"mana_circle_mask.png")}
 symbol:
 	code: 1/2
 	enabled: { colorless_color() == "u" }
-	image: mana_1_half_u.png
+	image: {masked_blend(light: "mana_1_half.png", dark: "mana_circle_u.png", mask:"mana_circle_mask.png")}
 symbol:
 	code: 1/2
 	enabled: { colorless_color() == "b" }
-	image: mana_1_half_b.png
+	image: {masked_blend(light: "mana_1_half.png", dark: "mana_circle_b.png", mask:"mana_circle_mask.png")}
 symbol:
 	code: 1/2
 	enabled: { colorless_color() == "r" }
-	image: mana_1_half_r.png
+	image: {masked_blend(light: "mana_1_half.png", dark: "mana_circle_r.png", mask:"mana_circle_mask.png")}
 symbol:
 	code: 1/2
 	enabled: { colorless_color() == "g" }
-	image: mana_1_half_g.png
+	image: {masked_blend(light: "mana_1_half.png", dark: "mana_circle_g.png", mask:"mana_circle_mask.png")}
 symbol:
 	code: 1/2
 	image: mana_1_half.png
@@ -164,26 +152,96 @@ symbol:
 symbol:
 	code: I
 	enabled: { colorless_color() == "w" }
-	image: mana_infinite_w.png
+	image: {masked_blend(light: "mana_infinite.png", dark: "mana_circle_w.png", mask:"mana_circle_mask.png")}
 symbol:
 	code: I
 	enabled: { colorless_color() == "u" }
-	image: mana_infinite_u.png
+	image: {masked_blend(light: "mana_infinite.png", dark: "mana_circle_u.png", mask:"mana_circle_mask.png")}
 symbol:
 	code: I
 	enabled: { colorless_color() == "b" }
-	image: mana_infinite_b.png
+	image: {masked_blend(light: "mana_infinite.png", dark: "mana_circle_b.png", mask:"mana_circle_mask.png")}
 symbol:
 	code: I
 	enabled: { colorless_color() == "r" }
-	image: mana_infinite_r.png
+	image: {masked_blend(light: "mana_infinite.png", dark: "mana_circle_r.png", mask:"mana_circle_mask.png")}
 symbol:
 	code: I
 	enabled: { colorless_color() == "g" }
-	image: mana_infinite_g.png
+	image: {masked_blend(light: "mana_infinite.png", dark: "mana_circle_g.png", mask:"mana_circle_mask.png")}
 symbol:
 	code: I
 	image: mana_infinite.png
+symbol:
+	image: mana_nw.png
+	code: ([XYZ0-9])/W
+	regex: yes
+	draw text: 1
+	text margin left:   -.0
+	text margin right:  .44
+	text margin top:    -.0
+	text margin bottom: .445
+	text font:
+		name: MPlantin
+		size: .53
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nu.png
+	code: ([XYZ0-9])/U
+	regex: yes
+	draw text: 1
+	text margin left:   -.0
+	text margin right:  .44
+	text margin top:    -.0
+	text margin bottom: .445
+	text font:
+		name: MPlantin
+		size: .53
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nb.png
+	code: ([XYZ0-9])/B
+	regex: yes
+	draw text: 1
+	text margin left:   -.0
+	text margin right:  .44
+	text margin top:    -.0
+	text margin bottom: .445
+	text font:
+		name: MPlantin
+		size: .53
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nr.png
+	code: ([XYZ0-9])/R
+	regex: yes
+	draw text: 1
+	text margin left:   -.0
+	text margin right:  .44
+	text margin top:    -.0
+	text margin bottom: .445
+	text font:
+		name: MPlantin
+		size: .53
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_ng.png
+	code: ([XYZ0-9])/G
+	regex: yes
+	draw text: 1
+	text margin left:   -.0
+	text margin right:  .44
+	text margin top:    -.0
+	text margin bottom: .445
+	text font:
+		name: MPlantin
+		size: .53
+		color: rgb(0,0,0)
+		max stretch: 0.5
 symbol:
 	image: mana_circle_w.png
 	enabled: { colorless_color() == "w" }
@@ -374,6 +432,7 @@ symbol:
 insert symbol menu:
 	item: T
 	item: Q
+	item: C
 	item: X
 	item: Y
 	item: Z

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

@@ -1,5 +1,5 @@
-mse version: 0.3.7
+mse version: 0.3.8
-version: 2008-08-13
+version: 2009-08-10
 # Symbol font in the 'popup' style, used for casting costs on modern cards
 short name: popup style
 installer group: magic/Mana symbols/popup style
@@ -30,6 +30,10 @@ symbol:
 symbol:
 	code: Q
 	image: mana_q.png
+symbol:
+	code: C
+	image: mana_chaos.png
+	image font size: 151.69
 symbol:
 	code: B/G/W
 	image: mana_bgw.png
@@ -313,6 +317,7 @@ symbol:
 insert symbol menu:
 	item: T
 	item: Q
+	item: C
 	item:
 		type: line
 	item: X

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

@@ -1,5 +1,5 @@
-mse version: 0.3.7
+mse version: 0.3.8
-version: 2008-08-12
+version: 2009-08-10
 short name: normal (colorless)
 position hint: 11
 installer group: magic/Mana symbols/colorless normal style
@@ -37,6 +37,10 @@ symbol:
 symbol:
 	code: Q
 	image: mana_q.png
+symbol:
+	code: C
+	image: mana_chaos.png
+	image font size: 168.75
 symbol:
 	code: B/G/W
 	image: mana_bgw.png
@@ -320,6 +324,7 @@ symbol:
 insert symbol menu:
 	item: T
 	item: Q
+	item: C
 	item:
 		type: line
 	item: X

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

@@ -1,5 +1,5 @@
-mse version: 0.3.7
+mse version: 0.3.8
-version: 2008-08-12
+version: 2009-08-10
 short name: normal
 installer group: magic/Mana symbols/normal style
 position hint: 001
@@ -37,6 +37,10 @@ symbol:
 symbol:
 	code: Q
 	image: mana_q.png
+symbol:
+	code: C
+	image: mana_chaos.png
+	image font size: 168.75
 symbol:
 	code: B/G/W
 	image: mana_bgw.png
@@ -320,6 +324,7 @@ symbol:
 insert symbol menu:
 	item: T
 	item: Q
+	item: C
 	item:
 		type: line
 	item: X

data/magic.mse-game/keywords

@@ -29,7 +29,7 @@ keyword mode:
 
 keyword parameter type:
 	name: mana
-	match: [STQXYZI0-9WUBRG/|]+
+	match: [SCTQXYZI0-9WUBRG/|]+
 	refer script:
 		name: normal
 		description: No changes made
@@ -48,7 +48,7 @@ keyword parameter type:
 # By pichoro and bunnierein
 keyword parameter type:
 	name: cost
-	match: [ ][STQXYZI0-9WUBRG/|]*|[-—][^(\n]*
+	match: [ ][SCTQXYZI0-9WUBRG/|]*|[-—][^(\n]*
 	separator before is: [ —-]
 	separator after is: [.]
 	optional: false

data/magic.mse-game/script

@@ -23,7 +23,7 @@ mana_filter := to_upper + {
 	else                     mana_sort()
 }
 # Like mana filter, only also allow tap symbols:
-tap_filter := sort_text@(order: "<TQ>")
+tap_filter := sort_text@(order: "<CTQ>")
 mana_filter_t := replace@(               # Remove [] used for forcing mana symbols
 			match: "[\\[\\]]",
 			replace: ""
@@ -53,7 +53,7 @@ mana_to_color := {
 	count  := number_of_items(in: colors)
 	if hybrid == "" and contains(type, match:"Artifact") then
 		# not a hybrid, but artifact
-		if      count == 0 then  "colorless"
+		if      count == 0 then  "artifact"
 		else if count == 1 then  color_names_1() + ", artifact"
 		else if set.set_info.use_gradient_multicolor == "no"  then "artifact, multicolor" # stop here
 		else if count == 2 then  color_names_2() + ", artifact, multicolor"
@@ -323,7 +323,7 @@ add := "" # default is nothing
 for_mana_costs := format_cost := {
 	if input.separator_before == "—" and contains(input.param, match: " ") then (
 		if contains(input.param, match:",") then (
-			if match(match: "^[STQXYZIWUBRG0-9/|]+,", input.param) then
+			if match(match: "^[SCTQXYZIWUBRG0-9/|]+,", input.param) then
 				"{add}<param-cost>{combined_cost(input.param)}</param-cost>"
 			else "<param-cost>{combined_cost(input.param)}</param-cost>"
 		) else
@@ -336,7 +336,7 @@ alternative_cost := replace@(match:"^[A-Z]", replace: { to_lower() })
 #
 combined_cost := replace@(match:", [A-Z]", replace: { to_lower() })+
 	replace@(match:",", replace:" and")+
-	replace@(match:"^[STQXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
+	replace@(match:"^[SCTQXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
 	replace@(match:"^[A-Z]", replace: { to_lower() })
 long_dash := replace@(match:"-", replace:"—")
 
@@ -362,8 +362,8 @@ mana_context :=
 	    |adds?|pay(ed)?[ ](with|using)
 	    )
 	    ([ ]either)?			 # pay either X or Y
-	    ([ ](<sym[^>]*>)?[STQXYZIWUBRG0-9/|]+(</sym[^>]*>)?,)* # pay X, Y or Z
+	    ([ ](<sym[^>]*>)?[SCTQXYZIWUBRG0-9/|]+(</sym[^>]*>)?,)* # pay X, Y or Z
-	    ([ ](<sym[^>]*>)?[STQXYZIWUBRG0-9/|]+(</sym[^>]*>)?[ ](and|or|and/or))* # pay X or Y
+	    ([ ](<sym[^>]*>)?[SCTQXYZIWUBRG0-9/|]+(</sym[^>]*>)?[ ](and|or|and/or))* # pay X or Y
 	    [ ]<match>
 	    ([,.)]|$				# (end of word)
 	    |[ ][^ .,]*$			# still typing...
@@ -442,18 +442,34 @@ text_filter :=
 		) +
 	# step 4 : explict non mana symbols
 	replace@(
-		match: "\\][STQXYZIWUBRG0-9/|]+\\[",
+		match: "\\][SCTQXYZIWUBRG0-9/|]+\\[",
 		replace: {"<nosym>" + mana_filter_t() + "</nosym>"} ) +
 	# step 5 : add mana & tap symbols
 	replace@(
-		match: "\\b[STQXYZIWUBRG0-9/|]+\\b",
+		match: "\\b[SCTQXYZIWUBRG0-9/|]+\\b",
 		in_context: mana_context,
 		replace: {"<sym-auto>" + mana_filter_t() + "</sym-auto>"} ) +
 	# step 5b : add explict mana symbols
 	replace@(
-		match: "\\[[STQXYZIWUBRG0-9/|]+\\]",
+		match: "\\[[SCTQXYZIWUBRG0-9/|]+\\]",
 		replace: {"<sym>" + mana_filter_t() + "</sym>"} ) +
-	# step 7 : italic reminder text
+	# step 6a : curly double quotes
+	replace@(
+		match: "[[.quotation-mark.]]|“",
+		in_context: "[“][A-Za-z,.!?+$<>:;-— 0-9\\\\]*<match>",
+		replace: "”" )+
+	replace@(
+		match: "[[.quotation-mark.]]",
+		replace: "“" )+
+	# step 6b : curly single quotes
+	replace@(
+		match: "' |‘ ",
+		in_context: "[‘][A-Za-z,.!?+$<>:;-— 0-9\\\\]*<match>",
+		replace: "’ " )+
+	replace@(
+		match: " '",
+		replace: " ‘" )+
+	# step 7 : ???
 	replace@(
 	 	match: "[(]([^)\n]|[(][^)\n]*[)])*[)]?",
 		in_context: "(^|[[:space:]])<match>|<atom-keyword><match></",
@@ -464,7 +480,7 @@ text_filter :=
 		     + "([[:lower:]])" # match this
 		     + "(?![)])",      # not followed by this
 		replace: { _1 + to_upper(_2) }) +
-	curly_quotes +
+	#curly_quotes +
 	# step 9 : spellcheck
 	{ if set.mark_errors then
 		check_spelling(
@@ -584,7 +600,7 @@ colorless_color := { "c" }
 is_half_mana    := match@(match: "1/2|[|][WUBRGS]")
 is_colored_mana := match@(match: "[WUBRG]")
 only_numbers    := filter_text@(match: "^[0123456789]+")
-cmc_split := break_text@(match: "(?ix) 1/2 | [|][WUBRG] | [0-9]+(?!/[WUBRGSTQ2]) | [WUBRGS0-9](/[WUBRGS])\{0,4} ")
+cmc_split := break_text@(match: "(?ix) 1/2 | [|][WUBRG] | [0-9]+(?!/[WUBRGSCTQ2]) | [WUBRGS0-9](/[WUBRGS])\{0,4} ")
 cmc := {to_number(
 	for each sym in cmc_split(to_text()) do (
 		numbers := only_numbers(sym)