Introduce the InsetMathHull::outerDisplay method and use it

[lyx.git] / src / mathed / MathFactory.cpp

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 0814167612e3c110fdd76cd1ec84e4ba42fa9bef..bb7be8ba6ba25744d15bdf55c2d33f8bee729c54 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -387,7 +387,7 @@ bool ensureMath(WriteStream & os, bool needs_mathmode, bool macro,
                        brace = true;
                }
                os.textMode(true);
-       } else if (macro && brace && !textmode_macro) {
+       } else if (macro && brace && !needs_mathmode && !textmode_macro) {
                // This is a user defined macro, not a MathMacro, so we
                // cannot be sure what mode is needed. We leave it in the
                // same environment it was entered by closing either \lyxmathsym
@@ -689,7 +689,7 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
                InsetSpace::string2params(to_utf8(str), isp);
                InsetSpace is(isp);
                odocstringstream ods;
-               otexstream os(ods, false);
+               otexstream os(ods);
                Encoding const * const ascii = encodings.fromLyXName("ascii");
                OutputParams op(ascii);
                is.latex(os, op);