X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_macrotable.C;h=b7cd35d2d36afc409ca0c60f704d8600dfc75b34;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=d6436c9d51aca29dab116833841142f3a0e26f29;hpb=1c77a120de8a2ed328d3700f9af75bfebe36793c;p=lyx.git

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index d6436c9d51..b7cd35d2d3 100644
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -63,10 +63,10 @@ void MathMacroTable::create
 }
 
 
-void MathMacroTable::define(string const & def)
+void MathMacroTable::define(string const & display)
 {
 	string name;
-	mathed_parse_macro(name, def);
+	mathed_parse_macro(name, display);
 }
 
 
@@ -89,6 +89,7 @@ void MathMacroTable::builtinMacros()
 	//define("\\def\\emptyset{\\not0}");
 	define("\\def\\notin{\\not\\in}");
 	define("\\def\\slash{/}");
+	//define("\\def\\mathcircumflex{\\^}");
 
 	// fontmath.ltx
 
@@ -107,26 +108,26 @@ void MathMacroTable::builtinMacros()
 	define("\\def\\Longleftrightarrow{\\Leftarrow\\kern-8mu\\Rightarrow}");
 	define("\\def\\doteq{\\stackrel{\\cdot}{\\=}}");
 
-	if (math_font_available(LM_TC_CMSY)) {
+	//if (math_font_available(LM_TC_CMSY)) {
 		define("\\def\\longrightarrow{\\lyxbar\\kern-6mu\\rightarrow}");
 		define("\\def\\longleftarrow{\\leftarrow\\kern-6mu\\lyxbar}");
 		define("\\def\\mapsto{\\mapstochar\\kern-4mu\\rightarrow}");
 		define("\\def\\longmapsto{\\mapstochar\\kern-3mu\\lyxbar\\kern-6mu\\rightarrow}");
-	}
+	//}
 
-	if (math_font_available(LM_TC_CMR) && math_font_available(LM_TC_CMSY)) {
+	//if (math_font_available(LM_TC_CMR) && math_font_available(LM_TC_CMSY)) {
 		define("\\def\\Longrightarrow{\\lyxeq\\kern-5mu\\Rightarrow}");
 		define("\\def\\Longleftarrow{\\Leftarrow\\kern-5mu\\lyxeq}");
 		define("\\def\\models{\\vert\\kern-3mu\\lyxeq}");
-	}
+	//}
 
-	if (math_font_available(LM_TC_CMM)) {
+	//if (math_font_available(LM_TC_CMM)) {
 		define("\\def\\hookrightarrow{\\lhook\\kern-8mu\\rightarrow}");
 		define("\\def\\hookleftarrow{\\leftarrow\\kern-8mu\\rhook}");
 		define("\\def\\bowtie{\\triangleright\\kern-2mu\\triangleleft}");
-	}
+	//}
 
-	if (math_font_available(LM_TC_MSA)) {
+	//if (math_font_available(LM_TC_MSA)) {
 		//amsfonts.sty
 
 		define("\\def\\dashrightarrow{\\lyxdabar\\lyxdabar\\lyxright}");
@@ -144,11 +145,14 @@ void MathMacroTable::builtinMacros()
 		define("\\def\\doublecap{\\Cap}");
 		define("\\def\\llless{\\lll}");
 		define("\\def\\gggtr{\\ggg}");
-	}
+	//}
 
-	if (math_font_available(LM_TC_MSB)) {
+	//if (math_font_available(LM_TC_MSB)) {
 		define("\\def\\Join{\\ltimes\\kern-12mu\\rtimes}");
-	}
+	//}
+
+	//
+	define("\\def\\mathcircumflex{\\mbox{\\^{}}}\n"   "{\\hat{}}");
 
 	//define("\def\lint",       4, "\\int_#1^#2#3 d#4}");
 	//define("\\def\\silentmult{\\cdot}");