handle math-delim arguments

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

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 10e6514eea20fec3bfa21272d94ba0986af6b143..95d2255ac367736431b5646bf5862c9db2c44e0e 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-10  John Levon  <levon@movementarian.org>
+
+       * ControlMath.C (find_xpm): handle math_delim arguments
+
 2003-04-02  Angus Leeming  <leeming@lyx.org>
 
        * ControlCommandBuffer.[Ch] (c-tor): passed a LyXView & rather than

diff --git a/src/frontends/controllers/ControlMath.C b/src/frontends/controllers/ControlMath.C
index b34f3e5cafdee94d772980d5394d401767ce540c..a2710a137dbb1f48e0719809d0f67ef2591c749d 100644 (file)
--- a/src/frontends/controllers/ControlMath.C
+++ b/src/frontends/controllers/ControlMath.C
@@ -306,19 +306,13 @@ int const nr_latex_ams_ops = sizeof(latex_ams_ops) / sizeof(char const *);
 
 string const find_xpm(string const & name)
 {
+       string xpm_name = subst(name, "_", "underscore");
+       xpm_name = subst(xpm_name, ' ', '_');
+
 #warning Use a static table for this (Lgb)
        // And get O(log n) lookup (Lgb)
 
-       string xpm_name = subst(name, ' ', '_');
-       if (xpm_name == "(") xpm_name = "lparen";
-       else if (xpm_name == ")") xpm_name = "rparen";
-       else if (xpm_name == "[") xpm_name = "lbracket";
-       else if (xpm_name == "]") xpm_name = "rbracket";
-       else if (xpm_name == "{") xpm_name = "lbrace";
-       else if (xpm_name == "}") xpm_name = "rbrace";
-       else if (xpm_name == "|") xpm_name = "bars";
-       else if (xpm_name == "_") xpm_name = "underscore";
-       else if (xpm_name == "textrm_Å") xpm_name = "textrm_A";
+       if (xpm_name == "textrm_Å") xpm_name = "textrm_A";
        else if (xpm_name == "textrm_Ø") xpm_name = "textrm_0";
        else if (xpm_name == "Bumpeq") xpm_name = "bumpeq2";
        else if (xpm_name == "Cap") xpm_name = "cap2";
@@ -352,6 +346,16 @@ string const find_xpm(string const & name)
        else if (xpm_name == "vDash") xpm_name = "vdash2";
        else if (xpm_name == "Vdash") xpm_name = "vdash3";
        else if (xpm_name == "Xi") xpm_name = "xi2";
+       else {
+               // slightly different so we can have "math-delim { }" on toolbar
+               xpm_name = subst(xpm_name, "(", "lparen");
+               xpm_name = subst(xpm_name, ")", "rparen");
+               xpm_name = subst(xpm_name, "[", "lbracket");
+               xpm_name = subst(xpm_name, "]", "rbracket");
+               xpm_name = subst(xpm_name, "{", "lbrace");
+               xpm_name = subst(xpm_name, "}", "rbrace");
+               xpm_name = subst(xpm_name, "|", "bars");
+       }
 
        lyxerr[Debug::GUI] << "Looking for math XPM called \""
                << xpm_name << '"' << std::endl;