Now also requires a dependency for symbol fonts;

Fixed all the dependency warnings for the magic templates

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

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

@@ -4,7 +4,20 @@ full name: Extended Art
 short name: Extended Art
 icon: card-sample.png
 position hint: 006
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-default-image.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-firepenguinmaster.mse-style/style

@@ -4,6 +4,7 @@ full name: FPM's Normal Magic
 short name: FPM Normal
 icon: card-sample.png
 position hint: 401
+
 version: 2007-09-23
 depends on:
 	package: magic.mse-game

data/magic-firepenguinmasterpromo.mse-style/style

@@ -4,7 +4,23 @@ full name: FPM's Promo Magic
 short name: FPM Promo
 icon: card-sample.png
 position hint: 404
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-future-common.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-beveled.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-firepenguinmastersplit.mse-style/style

@@ -4,7 +4,23 @@ full name: FPM's Split Magic
 short name: FPM Split
 icon: card-sample.png
 position hint: 403
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-future-common.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-beveled.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 523
 card height: 375

data/magic-firepenguinmastertokens.mse-style/style

@@ -4,7 +4,23 @@ full name: FPM's Token Magic
 short name: FPM Token
 icon: card-sample.png
 position hint: 407
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-future-common.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-beveled.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-future-textless.mse-style/style

@@ -4,7 +4,17 @@ short name: Future Textless
 full name: Futureshift Textless
 icon: card-sample.png
 position hint: 051
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-future-common.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-future.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523
@@ -117,14 +127,6 @@ styling field:
 	name: use guild mana symbols
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
-styling field:
-	type: choice
-	name: tap symbol
-	description: What tap symbol should be used on cards?
-	initial: modern
-	choice: modern
-	choice: old
-	choice: diagonal T
 styling field:
 	type: boolean
 	name: inverted common symbol
@@ -134,14 +136,8 @@ styling field:
 styling style:
 	use guild mana symbols:
 		choice images:
-			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
+			yes: /magic-mana-future.mse-symbol-font/mana_guild_rg.png
-			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
+			no:  /magic-mana-future.mse-symbol-font/mana_rg.png
-	tap symbol:
-		render style: both
-		choice images:
-			modern:     /magic-mana-large.mse-symbol-font/mana_t.png
-			old:        /magic-mana-large.mse-symbol-font/mana_t_old.png
-			diagonal T: /magic-mana-large.mse-symbol-font/mana_t_older.png
 
 ############################################################## Card fields
 card style:

data/magic-future.mse-style/style

@@ -4,7 +4,26 @@ short name: Future
 full name: Futureshift
 icon: card-sample.png
 position hint: 050
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-future-common.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-future.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-new-flip.mse-style/style

@@ -4,7 +4,23 @@ short name: Flip Cards
 full name: Modern flip cards
 icon: card-sample.png
 position hint: 002
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-default-image.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-new-planeswalker.mse-style/style

@@ -4,7 +4,26 @@ short name: Walkers
 full name: Modern Planeswalkers
 icon: card-sample.png
 position hint: 008
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-default-image.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-future-common.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-new-promo.mse-style/style

@@ -4,7 +4,23 @@ short name: Promotional
 full name: Large image
 icon: card-sample.png
 position hint: 004
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-default-image.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-new-split.mse-style/style

@@ -4,7 +4,23 @@ short name: Split Cards
 full name: Modern split cards
 icon: card-sample.png
 position hint: 003
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-default-image.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 523
 card height: 375

data/magic-new-token.mse-style/style

@@ -4,10 +4,26 @@ short name: Tokens
 full name: Modern style
 icon: card-sample.png
 position hint: 007
-version: 2007-06-27
+
+version: 2007-09-23
 depends on:
 	package: magic.mse-game
-	version: 2007-05-05
+	version: 2007-09-23
+depends on:
+	package: magic-default-image.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-future-common.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-embossedletters.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-new.mse-style/style

@@ -8,10 +8,19 @@ position hint: 001
 version: 2007-09-23
 depends on:
 	package: magic.mse-game
-	version: 2007-07-01
+	version: 2007-09-23
+depends on:
+	package: magic-default-image.mse-include
+	version: 2007-09-23
 depends on:
 	package: magic-watermarks.mse-include
-	version: 2006-08-03
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-old-split.mse-style/style

@@ -4,7 +4,20 @@ full name: Magic Old Split Cards
 short name: Old Splits
 icon: card-sample.png
 position hint: 103
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 523
 card height: 375

data/magic-old-token.mse-style/style

@@ -10,7 +10,20 @@ short name: Tokens
 full name: Old style
 icon: card-sample.png
 position hint: 107
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-old.mse-style/style

@@ -10,7 +10,20 @@ short name: Old style
 full name: Before 8th edition
 icon: card-sample.png
 position hint: 101
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 337
 card height: 469

data/magic-planeshifted.mse-style/style

@@ -4,7 +4,20 @@ short name: Planeshifted
 full name: Planar Chaos Timeshifts
 icon: card-sample.png
 position hint: 011
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523

data/magic-textless.mse-style/style

@@ -4,7 +4,17 @@ short name: Textless
 full name: Modern style
 icon: card-sample.png
 position hint: 005
+
 version: 2007-09-23
+depends on:
+	package: magic.mse-game
+	version: 2007-09-23
+depends on:
+	package: magic-future-common.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
 
 card width: 375
 card height: 523
@@ -82,8 +92,8 @@ styling field:
 styling style:
 	use guild mana symbols:
 		choice images:
-			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
+			yes: /magic-mana-large.mse-symbol-font/mana_guild_rg.png
-			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
+			no:  /magic-mana-large.mse-symbol-font/mana_rg.png
 	tap symbol:
 		render style: both
 		choice images:

data/magic.mse-game/game

@@ -2,9 +2,16 @@
 short name: Magic
 full name: Magic the Gathering
 icon: card-back.png
-version: 2007-09-23
 position hint: 01
 
+version: 2007-09-23
+depends on:
+	package: magic-blends.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+
 ############################################################## Functions & filters
 
 # General functions

src/data/symbol_font.cpp

@@ -7,6 +7,7 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <data/symbol_font.hpp>
+#include <data/stylesheet.hpp>
 #include <util/dynamic_arg.hpp>
 #include <util/io/package_manager.hpp>
 #include <util/rotation.hpp>
@@ -581,10 +582,10 @@ bool SymbolFontRef::valid() const {
 bool SymbolFontRef::update(Context& ctx) {
 	if (name.update(ctx)) {
 		// font name changed, load another font
-		loadFont();
+		loadFont(ctx);
 		return true;
 	} else {
-		if (!font) loadFont();
+		if (!font) loadFont(ctx);
 		return false;
 	}
 }
@@ -592,11 +593,15 @@ void SymbolFontRef::initDependencies(Context& ctx, const Dependency& dep) const
 	name.initDependencies(ctx, dep);
 }
 
-void SymbolFontRef::loadFont() {
+void SymbolFontRef::loadFont(Context& ctx) {
 	if (name().empty()) {
 		font = SymbolFontP();
 	} else {
 		font = SymbolFont::byName(name);
+		// ensure the dependency on the font is present in the stylesheet this ref is in
+		// Getting this stylesheet from the context is a bit of a hack
+		StyleSheetP stylesheet = from_script<StyleSheetP>(ctx.getVariable(_("stylesheet")));
+		stylesheet->requireDependency(font.get());
 	}
 }
 

src/data/symbol_font.hpp

@@ -169,10 +169,11 @@ class SymbolFontRef {
 	Alignment          alignment;		///< Alignment of symbols in a line of text
 	SymbolFontP        font;			///< The font, if it is loaded
 	
-	/// (re)load the symbol font based on name
+  private:
-	void loadFont();
-	
 	DECLARE_REFLECTION();
+	
+	/// (re)load the symbol font based on name
+	void loadFont(Context& ctx);
 };
 
 // ----------------------------------------------------------------------------- : EOF

src/util/error.cpp

@@ -52,6 +52,7 @@ ScriptParseErrors::ScriptParseErrors(const vector<ScriptParseError>& errors)
 
 // Errors for which a message box was already shown
 vector<String> previous_errors;
+vector<String> previous_warnings;
 String pending_errors;
 String pending_warnings;
 DECLARE_TYPEOF_COLLECTION(String);
@@ -90,6 +91,11 @@ void handle_warning(const String& w, bool now) {
 	{
 		// Check duplicates
 		wxCriticalSectionLocker lock(crit_error_handling);
+		// Check duplicates
+		FOR_EACH(pw, previous_warnings) {
+			if (w == pw) return;
+		}
+		previous_warnings.push_back(w);
 		// Only show errors in the main thread
 		if (!pending_warnings.empty()) pending_warnings += _("\n\n");
 		pending_warnings += w;