Final fix to get unit with optional arg (value) working

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

diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 1e063263a8e888a71da5ae10310205e9dc050220..9a0500e9a4465a8c3eb8c9a052319952d513f4d6 100644 (file)
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -275,7 +275,7 @@ ToolbarSet
                Item "No hor. line      \\atop" "math-insert \atop"
                Item "Nice (3/4)        \\nicefrac" "math-insert \nicefrac"
                Item "Unit (km) \\unit" "math-insert \unitone"
-               Item "Unit (864 m)      \\unit" "math-insert \unit"
+               Item "Unit (864 m)      \\unit" "math-insert \unittwo"
                Item "Unitfrac (km/h)   \\unitfrac" "math-insert \unitfrac"
                Item "Unitfrac (20 km/h)        \\unitfrac" "math-insert \unitfracthree"
                Item "Text frac (amsmath)       \\tfrac" "math-insert \tfrac"

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 01ad4fbe57e8757f7b6ffd6c1f50a5af5ad38d1c..00e90f7785f3f2a289655a4aa3b84e2c9e0082eb 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -377,7 +377,7 @@ MathAtom createInsetMath(docstring const & s)
                return MathAtom(new InsetMathFrac(InsetMathFrac::UNITFRAC, 3));
        if (s == "unitone")
                return MathAtom(new InsetMathFrac(InsetMathFrac::UNIT, 1));
-       if (s == "unit")
+       if (s == "unittwo")
                return MathAtom(new InsetMathFrac(InsetMathFrac::UNIT));
        //if (s == "infer")
        //      return MathAtom(new MathInferInset);