X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_extern.C;h=99e381d78aaf7cee47c9e96e39c52135d44a4582;hb=07cc9f67534474b167ca1ea727bda643fdd8d197;hp=c7c62c2b46f239fb918ae479b0e8d790ffbb1239;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C index c7c62c2b46..99e381d78a 100644 --- a/src/mathed/math_extern.C +++ b/src/mathed/math_extern.C @@ -1,3 +1,12 @@ +/** + * \file math_extern.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author André Pönitz + * + * Full author contact details are available in file CREDITS. + */ // This file contains most of the magic that extracts "context // information" from the unstructered layout-oriented stuff in an @@ -5,10 +14,11 @@ #include -#include "math_amsarrayinset.h" +#include "math_extern.h" #include "math_arrayinset.h" #include "math_charinset.h" #include "math_deliminset.h" +#include "math_data.h" #include "math_diffinset.h" #include "math_exfuncinset.h" #include "math_exintinset.h" @@ -20,21 +30,29 @@ #include "math_scriptinset.h" #include "math_stringinset.h" #include "math_symbolinset.h" -#include "math_unknowninset.h" #include "math_parser.h" -#include "Lsstream.h" +#include "support/std_sstream.h" #include "debug.h" -#include "support/lyxlib.h" -#include "support/systemcall.h" #include "support/filetools.h" #include "support/lstrings.h" #include -using std::ostream; -using std::istringstream; -using std::find_if; +using lyx::support::cmd_ret; +using lyx::support::getVectorFromString; +using lyx::support::LibFileSearch; +using lyx::support::RunCommand; +using lyx::support::subst; + +using std::string; using std::endl; +using std::find_if; +using std::auto_ptr; +using std::istringstream; +using std::ostream; +using std::ostringstream; +using std::swap; +using std::vector; ostream & operator<<(ostream & os, MathArray const & ar) @@ -129,23 +147,23 @@ string charSequence void extractStrings(MathArray & ar) { - //lyxerr << "\nStrings from: " << ar << "\n"; - for (MathArray::size_type i = 0; i < ar.size(); ++i) { + //lyxerr << "\nStrings from: " << ar << endl; + for (size_t i = 0; i < ar.size(); ++i) { if (!ar[i]->asCharInset()) continue; string s = charSequence(ar.begin() + i, ar.end()); ar[i] = MathAtom(new MathStringInset(s)); ar.erase(i + 1, i + s.size()); } - //lyxerr << "\nStrings to: " << ar << "\n"; + //lyxerr << "\nStrings to: " << ar << endl; } void extractMatrices(MathArray & ar) { - //lyxerr << "\nMatrices from: " << ar << "\n"; + //lyxerr << "\nMatrices from: " << ar << endl; // first pass for explicitly delimited stuff - for (MathArray::size_type i = 0; i < ar.size(); ++i) { + for (size_t i = 0; i < ar.size(); ++i) { if (!ar[i]->asDelimInset()) continue; MathArray const & arr = ar[i]->asDelimInset()->cell(0); @@ -157,10 +175,10 @@ void extractMatrices(MathArray & ar) } // second pass for AMS "pmatrix" etc - for (MathArray::size_type i = 0; i < ar.size(); ++i) + for (size_t i = 0; i < ar.size(); ++i) if (ar[i]->asAMSArrayInset()) ar[i] = MathAtom(new MathMatrixInset(*(ar[i]->asGridInset()))); - //lyxerr << "\nMatrices to: " << ar << "\n"; + //lyxerr << "\nMatrices to: " << ar << endl; } @@ -196,7 +214,7 @@ bool extractNumber(MathArray const & ar, double & d) } -bool testString(MathAtom const & at, const string & str) +bool testString(MathAtom const & at, string const & str) { string s; return extractString(at, s) && str == s; @@ -233,7 +251,7 @@ void replaceNested( { // use indices rather than iterators for the loop because we are going // to modify the array. - for (MathArray::size_type i = 0; i < ar.size(); ++i) { + for (size_t i = 0; i < ar.size(); ++i) { // check whether this is the begin of the sequence if (!testOpen(ar[i])) continue; @@ -259,8 +277,8 @@ void replaceNested( void splitScripts(MathArray & ar) { - //lyxerr << "\nScripts from: " << ar << "\n"; - for (MathArray::size_type i = 0; i < ar.size(); ++i) { + //lyxerr << "\nScripts from: " << ar << endl; + for (size_t i = 0; i < ar.size(); ++i) { // is this script inset? if (!ar[i]->asScriptInset()) continue; @@ -273,15 +291,15 @@ void splitScripts(MathArray & ar) // create extra script inset and move superscript over MathScriptInset * p = ar[i].nucleus()->asScriptInset(); - MathScriptInset * q = new MathScriptInset(true); - std::swap(q->up(), p->up()); + auto_ptr q(new MathScriptInset(true)); + swap(q->up(), p->up()); p->removeScript(true); // insert new inset behind ++i; - ar.insert(i, MathAtom(q)); + ar.insert(i, MathAtom(q.release())); } - //lyxerr << "\nScripts to: " << ar << "\n"; + //lyxerr << "\nScripts to: " << ar << endl; } @@ -291,8 +309,8 @@ void splitScripts(MathArray & ar) void extractExps(MathArray & ar) { - //lyxerr << "\nExps from: " << ar << "\n"; - for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) { + //lyxerr << "\nExps from: " << ar << endl; + for (size_t i = 0; i + 1 < ar.size(); ++i) { // is this 'e'? if (ar[i]->getChar() != 'e') continue; @@ -306,7 +324,7 @@ void extractExps(MathArray & ar) ar[i] = MathAtom(new MathExFuncInset("exp", sup->cell(1))); ar.erase(i + 1); } - //lyxerr << "\nExps to: " << ar << "\n"; + //lyxerr << "\nExps to: " << ar << endl; } @@ -315,7 +333,7 @@ void extractExps(MathArray & ar) // void extractDets(MathArray & ar) { - //lyxerr << "\ndet from: " << ar << "\n"; + //lyxerr << "\ndet from: " << ar << endl; for (MathArray::iterator it = ar.begin(); it != ar.end(); ++it) { MathDelimInset const * del = (*it)->asDelimInset(); if (!del) @@ -324,7 +342,7 @@ void extractDets(MathArray & ar) continue; *it = MathAtom(new MathExFuncInset("det", del->cell(0))); } - //lyxerr << "\ndet to: " << ar << "\n"; + //lyxerr << "\ndet to: " << ar << endl; } @@ -354,8 +372,8 @@ string digitSequence void extractNumbers(MathArray & ar) { - //lyxerr << "\nNumbers from: " << ar << "\n"; - for (MathArray::size_type i = 0; i < ar.size(); ++i) { + //lyxerr << "\nNumbers from: " << ar << endl; + for (size_t i = 0; i < ar.size(); ++i) { if (!ar[i]->asCharInset()) continue; if (!isDigitOrSimilar(ar[i]->asCharInset()->getChar())) @@ -366,7 +384,7 @@ void extractNumbers(MathArray & ar) ar[i] = MathAtom(new MathNumberInset(s)); ar.erase(i + 1, i + s.size()); } - //lyxerr << "\nNumbers to: " << ar << "\n"; + //lyxerr << "\nNumbers to: " << ar << endl; } @@ -396,9 +414,9 @@ MathAtom replaceDelims(const MathArray & ar) // replace '('...')' sequences by a real MathDelimInset void extractDelims(MathArray & ar) { - //lyxerr << "\nDelims from: " << ar << "\n"; + //lyxerr << "\nDelims from: " << ar << endl; replaceNested(ar, testOpenParan, testCloseParan, replaceDelims); - //lyxerr << "\nDelims to: " << ar << "\n"; + //lyxerr << "\nDelims to: " << ar << endl; } @@ -416,8 +434,8 @@ void extractFunctions(MathArray & ar) if (ar.size() < 2) return; - //lyxerr << "\nFunctions from: " << ar << "\n"; - for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) { + //lyxerr << "\nFunctions from: " << ar << endl; + for (size_t i = 0; i + 1 < ar.size(); ++i) { MathArray::iterator it = ar.begin() + i; MathArray::iterator jt = it + 1; @@ -448,20 +466,20 @@ void extractFunctions(MathArray & ar) extractScript(exp, jt, ar.end()); // create a proper inset as replacement - MathExFuncInset * p = new MathExFuncInset(name); + auto_ptr p(new MathExFuncInset(name)); // jt points to the "argument". Get hold of this. MathArray::iterator st = extractArgument(p->cell(0), jt, ar.end()); // replace the function name by a real function inset - *it = MathAtom(p); + *it = MathAtom(p.release()); // remove the source of the argument from the array ar.erase(it + 1, st); // re-insert exponent ar.insert(i + 1, exp); - //lyxerr << "\nFunctions to: " << ar << "\n"; + //lyxerr << "\nFunctions to: " << ar << endl; } } @@ -507,8 +525,8 @@ void extractIntegrals(MathArray & ar) if (ar.size() < 3) return; - //lyxerr << "\nIntegrals from: " << ar << "\n"; - for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) { + //lyxerr << "\nIntegrals from: " << ar << endl; + for (size_t i = 0; i + 1 < ar.size(); ++i) { MathArray::iterator it = ar.begin() + i; // search 'd' @@ -524,7 +542,7 @@ void extractIntegrals(MathArray & ar) continue; // core ist part from behind the scripts to the 'd' - MathExIntInset * p = new MathExIntInset("int"); + auto_ptr p(new MathExIntInset("int")); // handle scripts if available if (!testIntSymbol(*it)) { @@ -538,9 +556,9 @@ void extractIntegrals(MathArray & ar) // remove used parts ar.erase(it + 1, tt); - *it = MathAtom(p); + *it = MathAtom(p.release()); } - //lyxerr << "\nIntegrals to: " << ar << "\n"; + //lyxerr << "\nIntegrals to: " << ar << endl; } @@ -579,8 +597,8 @@ void extractSums(MathArray & ar) if (ar.size() < 2) return; - //lyxerr << "\nSums from: " << ar << "\n"; - for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) { + //lyxerr << "\nSums from: " << ar << endl; + for (size_t i = 0; i + 1 < ar.size(); ++i) { MathArray::iterator it = ar.begin() + i; // is this a sum name? @@ -588,7 +606,7 @@ void extractSums(MathArray & ar) continue; // create a proper inset as replacement - MathExIntInset * p = new MathExIntInset("sum"); + auto_ptr p(new MathExIntInset("sum")); // collect lower bound and summation index MathScriptInset const * sub = ar[i]->asScriptInset(); @@ -617,9 +635,9 @@ void extractSums(MathArray & ar) // cleanup ar.erase(it + 1, tt); - *it = MathAtom(p); + *it = MathAtom(p.release()); } - //lyxerr << "\nSums to: " << ar << "\n"; + //lyxerr << "\nSums to: " << ar << endl; } @@ -651,8 +669,8 @@ bool testDiffFrac(MathAtom const & at) void extractDiff(MathArray & ar) { - //lyxerr << "\nDiffs from: " << ar << "\n"; - for (MathArray::size_type i = 0; i < ar.size(); ++i) { + //lyxerr << "\nDiffs from: " << ar << endl; + for (size_t i = 0; i < ar.size(); ++i) { MathArray::iterator it = ar.begin() + i; // is this a "differential fraction"? @@ -661,12 +679,12 @@ void extractDiff(MathArray & ar) MathFracInset const * f = (*it)->asFracInset(); if (!f) { - lyxerr << "should not happen\n"; + lyxerr << "should not happen" << endl; continue; } // create a proper diff inset - MathDiffInset * diff = new MathDiffInset; + auto_ptr diff(new MathDiffInset); // collect function, let jt point behind last used item MathArray::iterator jt = it + 1; @@ -715,9 +733,9 @@ void extractDiff(MathArray & ar) // cleanup ar.erase(it + 1, jt); - *it = MathAtom(diff); + *it = MathAtom(diff.release()); } - //lyxerr << "\nDiffs to: " << ar << "\n"; + //lyxerr << "\nDiffs to: " << ar << endl; } @@ -741,8 +759,8 @@ void extractLims(MathArray & ar) if (ar.size() < 3) return; - //lyxerr << "\nLimits from: " << ar << "\n"; - for (MathArray::size_type i = 0; i + 2 < ar.size(); ++i) { + //lyxerr << "\nLimits from: " << ar << endl; + for (size_t i = 0; i + 2 < ar.size(); ++i) { MathArray::iterator it = ar.begin() + i; // is this a limit function? @@ -774,7 +792,7 @@ void extractLims(MathArray & ar) // create a proper inset as replacement *it = MathAtom(new MathLimInset(f, x, x0)); } - //lyxerr << "\nLimits to: " << ar << "\n"; + //lyxerr << "\nLimits to: " << ar << endl; } @@ -784,7 +802,7 @@ void extractLims(MathArray & ar) void extractStructure(MathArray & ar) { - //lyxerr << "\nStructure from: " << ar << "\n"; + //lyxerr << "\nStructure from: " << ar << endl; extractIntegrals(ar); extractSums(ar); splitScripts(ar); @@ -797,7 +815,7 @@ void extractStructure(MathArray & ar) extractExps(ar); extractLims(ar); extractStrings(ar); - //lyxerr << "\nStructure to: " << ar << "\n"; + //lyxerr << "\nStructure to: " << ar << endl; } @@ -820,39 +838,39 @@ void normalize(MathArray const & ar, NormalStream & os) } -void octavize(MathArray const & dat, OctaveStream & os) +void octave(MathArray const & dat, OctaveStream & os) { MathArray ar = dat; extractStructure(ar); for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it) - (*it)->octavize(os); + (*it)->octave(os); } -void maplize(MathArray const & dat, MapleStream & os) +void maple(MathArray const & dat, MapleStream & os) { MathArray ar = dat; extractStructure(ar); for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it) - (*it)->maplize(os); + (*it)->maple(os); } -void maximize(MathArray const & dat, MaximaStream & os) +void maxima(MathArray const & dat, MaximaStream & os) { MathArray ar = dat; extractStructure(ar); for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it) - (*it)->maximize(os); + (*it)->maxima(os); } -void mathematicize(MathArray const & dat, MathematicaStream & os) +void mathematica(MathArray const & dat, MathematicaStream & os) { MathArray ar = dat; extractStructure(ar); for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it) - (*it)->mathematicize(os); + (*it)->mathematica(os); } @@ -923,7 +941,7 @@ namespace { ostringstream os; MaximaStream ms(os); ms << ar; - string expr = STRCONV(os.str()); + string expr = os.str(); string const header = "SIMPSUM:true;"; string out; @@ -936,7 +954,7 @@ namespace { // 2x; // ^ // - lyxerr << "checking expr: '" << expr << "'\n"; + lyxerr << "checking expr: '" << expr << "'" << endl; string full = header + "tex(" + expr + ");"; out = captureOutput("maxima", full); @@ -957,7 +975,7 @@ namespace { getline(is, line); getline(is, line); string::size_type pos = line.find('^'); - lyxerr << "found caret at pos: '" << pos << "'\n"; + lyxerr << "found caret at pos: '" << pos << "'" << endl; if (pos == string::npos || pos < 4) break; // caret position not found pos -= 4; // skip the "tex(" part @@ -966,12 +984,12 @@ namespace { expr.insert(pos, "*"); } - std::vector tmp = getVectorFromString(out, "$$"); + vector tmp = getVectorFromString(out, "$$"); if (tmp.size() < 2) return MathArray(); out = subst(tmp[1],"\\>", ""); - lyxerr << "out: '" << out << "'\n"; + lyxerr << "out: '" << out << "'" << endl; // Ugly code that tries to make the result prettier @@ -1046,9 +1064,9 @@ namespace { ostringstream os; MapleStream ms(os); ms << ar; - string expr = STRCONV(os.str()); - lyxerr << "ar: '" << ar << "'\n"; - lyxerr << "ms: '" << os.str() << "'\n"; + string expr = os.str(); + lyxerr << "ar: '" << ar << "'\n" + << "ms: '" << os.str() << "'" << endl; for (int i = 0; i < 100; ++i) { // at most 100 attempts // try to fix missing '*' the hard way by using mint @@ -1058,7 +1076,7 @@ namespace { // ^ syntax error - // Probably missing an operator such as * p // - lyxerr << "checking expr: '" << expr << "'\n"; + lyxerr << "checking expr: '" << expr << "'" << endl; string out = captureOutput("mint -i 1 -S -s -q -q", expr + ';'); if (out.empty()) break; // expression syntax is ok @@ -1094,11 +1112,11 @@ namespace { ostringstream os; OctaveStream vs(os); vs << ar; - string expr = STRCONV(os.str()); + string expr = os.str(); string out; - lyxerr << "pipe: ar: '" << ar << "'\n"; - lyxerr << "pipe: expr: '" << expr << "'\n"; + lyxerr << "pipe: ar: '" << ar << "'\n" + << "pipe: expr: '" << expr << "'" << endl; for (int i = 0; i < 100; ++i) { // at most 100 attempts // @@ -1107,9 +1125,9 @@ namespace { // >>> ([[1 2 3 ];[2 3 1 ];[3 1 2 ]])([[1 2 3 ];[2 3 1 ];[3 1 2 ]]) // ^ // - lyxerr << "checking expr: '" << expr << "'\n"; + lyxerr << "checking expr: '" << expr << "'" << endl; out = captureOutput("octave -q 2>&1", expr); - lyxerr << "checking out: '" << out << "'\n"; + lyxerr << "checking out: '" << out << "'" << endl; // leave loop if expression syntax is probably ok if (out.find("parse error:") == string::npos) @@ -1120,7 +1138,7 @@ namespace { string line; while (is) { getline(is, line); - lyxerr << "skipping line: '" << line << "'\n"; + lyxerr << "skipping line: '" << line << "'" << endl; if (line.find(">>> ") != string::npos) break; } @@ -1128,8 +1146,8 @@ namespace { // found line with error, next line is the one with caret getline(is, line); string::size_type pos = line.find('^'); - lyxerr << "caret line: '" << line << "'\n"; - lyxerr << "found caret at pos: '" << pos << "'\n"; + lyxerr << "caret line: '" << line << "'" << endl; + lyxerr << "found caret at pos: '" << pos << "'" << endl; if (pos == string::npos || pos < 4) break; // caret position not found pos -= 4; // skip the ">>> " part @@ -1178,7 +1196,7 @@ MathArray pipeThroughExtern(string const & lang, string const & extra, os << '[' << extra << ' '; ns << ar; os << ']'; - string data = STRCONV(os.str()); + string data = os.str(); // search external script string file = LibFileSearch("mathed", "extern_" + lang);