- Added some calls to assert_tagged

- The tag_contents script function now works as advertised:
     - uses 'input' script variable instead of 'contents'
     - keeps the full old tag, not the one from 'tag'
     - no template code in svn breaks.

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

src/data/keyword.cpp

@@ -404,6 +404,7 @@ String KeywordDatabase::expand(const String& text,
                                const ScriptValueP& combine_script,
                                Context& ctx) const {
 	assert(combine_script);
+	assert_tagged(text);
 	
 	// Clean up usage statistics
 	KeywordUsageStatistics* stat = keyword_usage_statistics();
@@ -505,6 +506,7 @@ String KeywordDatabase::expand(const String& text,
 		matched_keyword:;
 	}
 	
+	assert_tagged(result);
 	return result;
 }