Added "AE" filter to flavor text. Allowed nesting of curly quotes.

Also compatibility update.


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

configure.ac

@@ -6,7 +6,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(magicseteditor, 0.3.3, twanvl@users.sourceforge.net)
+AC_INIT(magicseteditor, 0.3.4, twanvl@users.sourceforge.net)
 AC_CONFIG_SRCDIR([src/main.cpp])
 # TODO: Actually use the config header
 AC_CONFIG_HEADER([src/config.h])

data/magic.mse-game/game

@@ -1,4 +1,4 @@
-mse version: 0.3.3
+mse version: 0.3.3
 short name: Magic
 full name: Magic the Gathering
 icon: card-back.png
@@ -307,9 +307,13 @@ init script:
 	# the flavor text filter
 	#  - makes all text italic
 	flavor_text_filter :=
-		# step 1 : remove italic tags
+		# step 1 : Æ replacement rule
+		replace_rule(
+			match: "AE",
+			replace: "Æ") +
+		# step 2 : remove italic tags
 		tag_remove_rule(tag: "<i-flavor>")   +
-		# step 2 : surround by <i> tags
+		# step 3 : surround by <i> tags
 		{ "<i-flavor>" + input + "</i-flavor>" } +
 		# curly quotes
 		curly_quotes

src/data/export_template.hpp

@@ -43,12 +43,12 @@ class ExportTemplate : public Packaged {
 
 /// Information that can be used by export functions
 struct ExportInfo {
-	SetP            set;                ///< The set that is being exported
-	ExportTemplateP export_template;    ///< The export template used
-	String          directory_relative; ///< The directory for storing extra files (or "" if !export->create_directory)
-	                                    ///  This is just the directory name
-	String          directory_absolute; ///< The absolute path of the directory
-	set<String>     exported_images;	///< Images (from symbol font) already exported
+	SetP                 set;                ///< The set that is being exported
+	ExportTemplateP      export_template;    ///< The export template used
+	String               directory_relative; ///< The directory for storing extra files (or "" if !export->create_directory)
+	                                         ///  This is just the directory name
+	String               directory_absolute; ///< The absolute path of the directory
+	std::set<String>     exported_images;	///< Images (from symbol font) already exported
 };
 
 DECLARE_DYNAMIC_ARG(ExportInfo*, export_info);

src/gui/html_export_window.cpp

@@ -15,6 +15,7 @@
 #include <data/export_template.hpp>
 #include <util/window_id.hpp>
 #include <util/error.hpp>
+#include <util/platform.hpp>
 #include <wx/filename.h>
 #include <wx/wfstream.h>
 

src/script/functions/basic.cpp

@@ -1,3 +1,4 @@
+
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
 //| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
@@ -106,7 +107,8 @@ SCRIPT_FUNCTION(curly_quotes) {
 		} else if (c == _('>')) {
 			in_tag = false;
 		} else if (!in_tag) {
-			open = isSpace(c);
+			// Also allow double-nesting of quotes
+			open = isSpace(c) || c == LEFT_DOUBLE_QUOTE || c == LEFT_SINGLE_QUOTE;
 		}
 	}
 	SCRIPT_RETURN(input);