Force a Buffer * argument to math insets constructor

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

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index d101904e83f97e01162c09ccdc0168497fceb615..1f9356f8f241bdaf97de18bbf4f619b4e31f6749 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -191,7 +191,7 @@ void extractStrings(MathData & ar)
                if (!ar[i]->asCharInset())
                        continue;
                docstring s = charSequence(ar.begin() + i, ar.end());
-               ar[i] = MathAtom(new InsetMathString(s));
+               ar[i] = MathAtom(new InsetMathString(ar.buffer(), s));
                ar.erase(i + 1, i + s.size());
        }
        //lyxerr << "\nStrings to: " << ar << endl;
@@ -292,10 +292,23 @@ bool testString(MathAtom const & at, char const * const str)
        return testString(at, from_ascii(str));
 }
 
+
+bool testSymbol(MathAtom const & at, docstring const & name)
+{
+       return at->asSymbolInset() && at->asSymbolInset()->name() == name;
+}
+
+
+bool testSymbol(MathAtom const & at, char const * const name)
+{
+       return testSymbol(at, from_ascii(name));
+}
+
+
 // search end of nested sequence
 MathData::iterator endNestSearch(
        MathData::iterator it,
-       MathData::iterator last,
+       const MathData::iterator& last,
        TestItemFunc testOpen,
        TestItemFunc testClose
 )
@@ -473,7 +486,7 @@ void extractNumbers(MathData & ar)
 
                docstring s = digitSequence(ar.begin() + i, ar.end());
 
-               ar[i] = MathAtom(new InsetMathNumber(s));
+               ar[i] = MathAtom(new InsetMathNumber(ar.buffer(), s));
                ar.erase(i + 1, i + s.size());
        }
        //lyxerr << "\nNumbers to: " << ar << endl;
@@ -523,12 +536,52 @@ MathAtom replaceBracketDelims(const MathData & ar)
 }
 
 
-// replace '('...')' and '['...']' sequences by a real InsetMathDelim
+bool testOpenVert(MathAtom const & at)
+{
+       return testSymbol(at, "lvert");
+}
+
+
+bool testCloseVert(MathAtom const & at)
+{
+       return testSymbol(at, "rvert");
+}
+
+
+MathAtom replaceVertDelims(const MathData & ar)
+{
+       return MathAtom(new InsetMathDelim(const_cast<Buffer *>(ar.buffer()),
+               from_ascii("lvert"), from_ascii("rvert"), ar, true));
+}
+
+
+bool testOpenAngled(MathAtom const & at)
+{
+       return testSymbol(at, "langle");
+}
+
+
+bool testCloseAngled(MathAtom const & at)
+{
+       return testSymbol(at, "rangle");
+}
+
+
+MathAtom replaceAngledDelims(const MathData & ar)
+{
+       return MathAtom(new InsetMathDelim(const_cast<Buffer *>(ar.buffer()),
+               from_ascii("langle"), from_ascii("rangle"), ar, true));
+}
+
+
+// replace '('...')', '['...']', '|'...'|', and '<'...'>' sequences by a real InsetMathDelim
 void extractDelims(MathData & ar)
 {
        //lyxerr << "\nDelims from: " << ar << endl;
        replaceNested(ar, testOpenParen, testCloseParen, replaceParenDelims);
        replaceNested(ar, testOpenBracket, testCloseBracket, replaceBracketDelims);
+       replaceNested(ar, testOpenVert, testCloseVert, replaceVertDelims);
+       replaceNested(ar, testOpenAngled, testCloseAngled, replaceAngledDelims);
        //lyxerr << "\nDelims to: " << ar << endl;
 }
 
@@ -595,7 +648,7 @@ void extractFunctions(MathData & ar, ExternalMath kind)
 
                // do we have an exponent like in
                // 'sin' '^2' 'x' -> 'sin(x)' '^2'
-               MathData exp;
+               MathData exp(buf);
                extractScript(exp, jt, ar.end(), true);
 
                // create a proper inset as replacement
@@ -622,18 +675,6 @@ void extractFunctions(MathData & ar, ExternalMath kind)
 // search integrals
 //
 
-bool testSymbol(MathAtom const & at, docstring const & name)
-{
-       return at->asSymbolInset() && at->asSymbolInset()->name() == name;
-}
-
-
-bool testSymbol(MathAtom const & at, char const * const name)
-{
-       return testSymbol(at, from_ascii(name));
-}
-
-
 bool testIntSymbol(MathAtom const & at)
 {
        return testSymbol(at, from_ascii("int"));
@@ -959,7 +1000,7 @@ void extractLims(MathData & ar)
                MathData x0 = MathData(buf, st + 1, s.end());
 
                // use something behind the script as core
-               MathData f;
+               MathData f(buf);
                MathData::iterator tt = extractTerm(f, it + 1, ar.end());
 
                // cleanup
@@ -1114,7 +1155,7 @@ namespace {
 
                vector<string> tmp = getVectorFromString(out, "$$");
                if (tmp.size() < 2)
-                       return MathData();
+                       return MathData(nullptr);
 
                out = subst(subst(tmp[1], "\\>", string()), "{\\it ", "\\mathit{");
                lyxerr << "output: '" << out << "'" << endl;
@@ -1152,7 +1193,7 @@ namespace {
                        //lyxerr << "output: " << out << endl;
                        i = out.find("\\over", i + 4);
                }
-               MathData res;
+               MathData res(nullptr);
                mathed_parse_cell(res, from_utf8(out));
                return res;
        }
@@ -1230,7 +1271,7 @@ namespace {
                // change \_ into _
 
                //
-               MathData res;
+               MathData res(nullptr);
                mathed_parse_cell(res, from_utf8(out));
                return res;
        }
@@ -1290,7 +1331,7 @@ namespace {
                // ansi control sequence before, such as '\033[?1034hans = '
                size_t i = out.find("ans = ");
                if (i == string::npos)
-                       return MathData();
+                       return MathData(nullptr);
                out = out.substr(i + 6);
 
                // parse output as matrix or single number
@@ -1375,7 +1416,7 @@ namespace {
                size_t pos2 = out.find("In[2]:=");
 
                if (pos1 == string::npos || pos2 == string::npos)
-                       return MathData();
+                       return MathData(nullptr);
 
                // get everything from pos1+17 to pos2
                out = out.substr(pos1 + 17, pos2 - pos1 - 17);
@@ -1386,7 +1427,7 @@ namespace {
                prettifyMathematicaOutput(out, "Muserfunction", true, false);
                prettifyMathematicaOutput(out, "Mvariable", false, false);
 
-               MathData res;
+               MathData res(nullptr);
                mathed_parse_cell(res, from_utf8(out));
                return res;
        }
@@ -1422,18 +1463,23 @@ void write(MathData const & dat, TeXMathStream & wi)
 void writeString(docstring const & s, TeXMathStream & os)
 {
        if (!os.latex()) {
-               os << (os.asciiOnly() ? escape(s) : s);
+               os << s;
                return;
        }
-       else if (os.output() == TeXMathStream::wsSearchAdv) {
-               os << s;
+
+       docstring str = s;
+       if (os.asciiOnly())
+               str = escape(s);
+
+       if (os.output() == TeXMathStream::wsSearchAdv) {
+               os << str;
                return;
        }
 
        if (os.lockedMode()) {
                bool space;
                docstring cmd;
-               for (char_type c : s) {
+               for (char_type c : str) {
                        try {
                                Encodings::latexMathChar(c, true, os.encoding(), cmd, space);
                                os << cmd;
@@ -1471,7 +1517,7 @@ void writeString(docstring const & s, TeXMathStream & os)
        // We will take care of matching braces.
        os.pendingBrace(false);
 
-       for (char_type const c : s) {
+       for (char_type const c : str) {
                bool mathmode = in_forced_mode ? os.textMode() : !os.textMode();
                docstring command(1, c);
                try {
@@ -1672,12 +1718,12 @@ MathData pipeThroughExtern(string const & lang, docstring const & extra,
        FileName const file = libFileSearch("mathed", "extern_" + lang);
        if (file.empty()) {
                lyxerr << "converter to '" << lang << "' not found" << endl;
-               return MathData();
+               return MathData(nullptr);
        }
 
        // run external sript
        string out = captureOutput(file.absFileName(), data);
-       MathData res;
+       MathData res(nullptr);
        mathed_parse_cell(res, from_utf8(out));
        return res;
 }