More symbols (mainly arrows)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2772 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/symbols b/lib/symbols
index 3094df01eba9535c42e5b6148aca7204beaad1be..4d5a1d078391ab4ed609fd69e7330cbf330376b9 100644 (file)
--- a/lib/symbols
+++ b/lib/symbols
@@ -412,7 +412,14 @@ Bbbk               msb  124   0 mathord
 hslash             msb  125   0 mathord
 backepsilon        msb  127   0 mathrel
 
-neq                x   0 185 mathrel
-textdegree         x   0 176 mathord
-cong               x   0  64 mathrel
-surd               x   0 214 mathord
+neq                x      0 185 mathrel
+textdegree         x      0 176 mathord
+cong               x      0  64 mathrel
+surd               x      0 214 mathord
+
+lyxbar             cmsy 161   0 mathord
+lyxeq              cmr   61   0 mathord      
+lyxdabar           msa   57   0 mathord
+lyxright           msa   75   0 mathord
+lyxleft            msa   76   0 mathord
+

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 636d3198809038fa1ef08f3db6ec89506274e8d6..de109d12801a395b608562241a0fcce5d6c7a875 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-19  Dekel Tsur  <dekelts@tau.ac.il>
+
+       * math_macrotable.C (builtinMacros): Add some macros if latex
+       fonts are available.
+
 2001-09-14  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * formula.C (insetAllowed): disallow label insertion in inline

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index ac067a97787dd8c32c0fdf5cf4ea9750be486551..8f3e6383d377edd40bfdaf5c6a0e903e394ad02a 100644 (file)
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -11,7 +11,7 @@
 #include "math_macrotemplate.h"
 #include "math_parser.h"
 #include "debug.h"
-
+#include "support.h" // math_font_available
 
 MathArray mathed_parse_cell(string const &);
 
@@ -106,36 +106,45 @@ void MathMacroTable::builtinMacros()
        createTemplate("Longleftrightarrow", 0, "\\Leftarrow\\kern-6mu\\Rightarrow");
        createTemplate("doteq", 0, "\\stackrel{\\cdot}{=}");
 
-#if 0
-       // The following either require using the latex fonts,
-       // or don't look good, so they are disabled
+       //createTemplate("models",         0, "|\\kern-9mu=");
 
-       createTemplate("hookrightarrow", 0, "\\lhook\\kern-3mu\\rightarrow");
-       createTemplate("hookleftarrow",  0, "\\leftarrow\\kern-3mu\\rhook");
-       createTemplate("bowtie",         0, "\\triangleright\\kern-3mu\\triangleleft");
+       if (math_font_available(LM_TC_CMSY)) {
+               createTemplate("longrightarrow", 0, "\\lyxbar\\kern-5mu\\rightarrow");
+               createTemplate("longleftarrow",  0, "\\leftarrow\\kern-5mu\\lyxbar");
+               createTemplate("mapsto",  0, "\\mapstochar\\rightarrow");
+               createTemplate("longmapsto",  0, "\\mapstochar\\lyxbar\\kern-5mu\\rightarrow");
+       }
 
-       createTemplate("models",         0, "|\\kern-9mu=");
-       createTemplate("longrightarrow", 0, "-\\kern-9mu\\rightarrow");
-       createTemplate("longleftarrow",  0, "\\leftarrow\\kern-9mu-");
-       createTemplate("Longrightarrow", 0, "=\\kern-9mu\\Rightarrow");
-       createTemplate("Longleftarrow",  0, "\\Leftarrow\\kern-9mu=");
+       if (math_font_available(LM_TC_CMR)) {
+               createTemplate("Longrightarrow", 0, "\\lyxeq\\kern-3mu\\Rightarrow");
+               createTemplate("Longleftarrow",  0, "\\Leftarrow\\kern-9mu\\lyxeq");
+       }
 
-       //amsfonts.sty
+       if (math_font_available(LM_TC_CMM)) {
+               createTemplate("hookrightarrow", 0, "\\lhook\\kern-5mu\\rightarrow");
+               createTemplate("hookleftarrow",  0, "\\leftarrow\\kern-5mu\\rhook");
+               createTemplate("bowtie",         0, "\\triangleright\\kern-3mu\\triangleleft");
+       }
 
-       createTemplate("dasharrow",    0, "\\dashrightarrow");
-       createTemplate("Box",          0, "\\square");
-       createTemplate("Diamond",      0, "\\lozenge");
-       createTemplate("leadsto",      0, "\\rightsquigarrow");
+       if (math_font_available(LM_TC_MSA)) {
+               //amsfonts.sty
 
-       // amssymb.sty
+               createTemplate("dashrightarrow", 0, "\\lyxdabar\\lyxdabar\\lyxright");
+               createTemplate("dashleftarrow", 0, "\\lyxleft\\lyxdabar\\lyxdabar");
+               createTemplate("dasharrow",    0, "\\dashrightarrow");
+               createTemplate("Box",          0, "\\square");
+               createTemplate("Diamond",      0, "\\lozenge");
+               createTemplate("leadsto",      0, "\\rightsquigarrow");
 
-       createTemplate("restriction",  0, "\\upharpoonright");
-       createTemplate("Doteq",        0, "\\doteqdot");
-       createTemplate("doublecup",    0, "\\Cup");
-       createTemplate("doublecap",    0, "\\Cap");
-       createTemplate("llless",       0, "\\lll");
-       createTemplate("gggtr",        0, "\\ggg");
-#endif
+               // amssymb.sty
+
+               createTemplate("restriction",  0, "\\upharpoonright");
+               createTemplate("Doteq",        0, "\\doteqdot");
+               createTemplate("doublecup",    0, "\\Cup");
+               createTemplate("doublecap",    0, "\\Cap");
+               createTemplate("llless",       0, "\\lll");
+               createTemplate("gggtr",        0, "\\ggg");
+       }
 
        //createTemplate("lint",       4, "\\int_#1^#2#3 d#4");
        //createTemplate("silentmult", 0, "\\cdot");