fix bug 1665

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10000 a592a061-630c-0410-9148-cb99ea01b6c8

src/mathed/ChangeLog

@@ -1,3 +1,10 @@
+2005-06-06  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+	* math_parser.h (latexkeys): new member requires
+	* math_factory.C (initSymbols): fill the requires field for fonts
+	* math_symbolinset.C (validate): use sym_->requires instead of
+	sym_->inset (fixes bug 1665)
+
 2005-04-26  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* math_cursor.C (interpret): treat & as special character (fixes

src/mathed/math_factory.C

@@ -144,6 +144,12 @@ void initSymbols()
 			// tmp.inset _is_ the fontname here.
 			// create fallbacks if necessary
 
+			// store requirements as long as we can
+			if (tmp.inset == "msa" || tmp.inset == "msb")
+				tmp.requires = "amssymb";
+			else if (tmp.inset == "wasy")
+				tmp.requires = "wasysym";
+
 			// symbol font is not available sometimes
 			string symbol_font = "lyxsymbol";
 

src/mathed/math_parser.h

@@ -39,6 +39,8 @@ struct latexkeys {
 	string extra;
 	/// how is this called as XML entity?
 	string xmlname;
+	/// required LaTeXFeatures
+	string requires;
 };
 
 

src/mathed/math_symbolinset.C

@@ -122,10 +122,8 @@ bool MathSymbolInset::takesLimits() const
 
 void MathSymbolInset::validate(LaTeXFeatures & features) const
 {
-	if (sym_->inset == "msa" || sym_->inset == "msb")
-		features.require("amssymb");
-	else if (sym_->inset == "wasy")
-		features.require("wasysym");
+	if (!sym_->requires.empty())
+		features.require(sym_->requires);
 }
 
 

status.13x

@@ -65,6 +65,8 @@ What's new
 - Make sure that the wasysym package is used in LaTeX output when
   using symbols from the wasy font.
 
+- Fix export via commandline of symbols using AMS or wasy fonts [bug 1665].
+
 - Make sure that the natbib and url packages are not loaded with
   REVTeX 4, since the functionality is already provided by the class.