X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_extern.C;h=8f26fd7c5e5e3d66da7cd2fe0b33cdf398dcfb9f;hb=cd03e2b7db8379a91f3d31eac2c5bc25b159c541;hp=ac84ace03428a9bedfa39229ae5d37fcb6d4dde3;hpb=f522618723ca8dda9effc0b4f0dbf5165c62ac1c;p=lyx.git diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C index ac84ace034..8f26fd7c5e 100644 --- a/src/mathed/math_extern.C +++ b/src/mathed/math_extern.C @@ -1,7 +1,12 @@ - -#ifdef __GNUG__ -#pragma implementation -#endif +/** + * \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 @@ -9,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" @@ -24,21 +30,26 @@ #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::endl; +using std::find_if; + +using std::istringstream; +using std::ostream; +using std::ostringstream; ostream & operator<<(ostream & os, MathArray const & ar) @@ -133,7 +144,7 @@ string charSequence void extractStrings(MathArray & ar) { - //lyxerr << "\nStrings from: " << ar << "\n"; + //lyxerr << "\nStrings from: " << ar << endl; for (MathArray::size_type i = 0; i < ar.size(); ++i) { if (!ar[i]->asCharInset()) continue; @@ -141,13 +152,13 @@ void extractStrings(MathArray & ar) 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) { if (!ar[i]->asDelimInset()) @@ -164,7 +175,7 @@ void extractMatrices(MathArray & ar) for (MathArray::size_type 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; } @@ -200,7 +211,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; @@ -263,7 +274,7 @@ void replaceNested( void splitScripts(MathArray & ar) { - //lyxerr << "\nScripts from: " << ar << "\n"; + //lyxerr << "\nScripts from: " << ar << endl; for (MathArray::size_type i = 0; i < ar.size(); ++i) { // is this script inset? if (!ar[i]->asScriptInset()) @@ -285,7 +296,7 @@ void splitScripts(MathArray & ar) ++i; ar.insert(i, MathAtom(q)); } - //lyxerr << "\nScripts to: " << ar << "\n"; + //lyxerr << "\nScripts to: " << ar << endl; } @@ -295,7 +306,7 @@ void splitScripts(MathArray & ar) void extractExps(MathArray & ar) { - //lyxerr << "\nExps from: " << ar << "\n"; + //lyxerr << "\nExps from: " << ar << endl; for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) { // is this 'e'? if (ar[i]->getChar() != 'e') @@ -306,11 +317,11 @@ void extractExps(MathArray & ar) if (!sup || sup->hasDown()) continue; - // create a proper exp-inset as replacement + // create a proper exp-inset as replacement ar[i] = MathAtom(new MathExFuncInset("exp", sup->cell(1))); ar.erase(i + 1); } - //lyxerr << "\nExps to: " << ar << "\n"; + //lyxerr << "\nExps to: " << ar << endl; } @@ -319,7 +330,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) @@ -328,7 +339,7 @@ void extractDets(MathArray & ar) continue; *it = MathAtom(new MathExFuncInset("det", del->cell(0))); } - //lyxerr << "\ndet to: " << ar << "\n"; + //lyxerr << "\ndet to: " << ar << endl; } @@ -358,7 +369,7 @@ string digitSequence void extractNumbers(MathArray & ar) { - //lyxerr << "\nNumbers from: " << ar << "\n"; + //lyxerr << "\nNumbers from: " << ar << endl; for (MathArray::size_type i = 0; i < ar.size(); ++i) { if (!ar[i]->asCharInset()) continue; @@ -370,7 +381,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; } @@ -400,9 +411,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; } @@ -420,7 +431,7 @@ void extractFunctions(MathArray & ar) if (ar.size() < 2) return; - //lyxerr << "\nFunctions from: " << ar << "\n"; + //lyxerr << "\nFunctions from: " << ar << endl; for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) { MathArray::iterator it = ar.begin() + i; MathArray::iterator jt = it + 1; @@ -465,7 +476,7 @@ void extractFunctions(MathArray & ar) // re-insert exponent ar.insert(i + 1, exp); - //lyxerr << "\nFunctions to: " << ar << "\n"; + //lyxerr << "\nFunctions to: " << ar << endl; } } @@ -490,7 +501,7 @@ bool testIntegral(MathAtom const & at) { return testIntSymbol(at) || - ( at->asScriptInset() + ( at->asScriptInset() && at->asScriptInset()->nuc().size() && testIntSymbol(at->asScriptInset()->nuc().back()) ); } @@ -511,7 +522,7 @@ void extractIntegrals(MathArray & ar) if (ar.size() < 3) return; - //lyxerr << "\nIntegrals from: " << ar << "\n"; + //lyxerr << "\nIntegrals from: " << ar << endl; for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) { MathArray::iterator it = ar.begin() + i; @@ -544,7 +555,7 @@ void extractIntegrals(MathArray & ar) ar.erase(it + 1, tt); *it = MathAtom(p); } - //lyxerr << "\nIntegrals to: " << ar << "\n"; + //lyxerr << "\nIntegrals to: " << ar << endl; } @@ -569,7 +580,7 @@ bool testSum(MathAtom const & at) { return testSumSymbol(at) || - ( at->asScriptInset() + ( at->asScriptInset() && at->asScriptInset()->nuc().size() && testSumSymbol(at->asScriptInset()->nuc().back()) ); } @@ -583,7 +594,7 @@ void extractSums(MathArray & ar) if (ar.size() < 2) return; - //lyxerr << "\nSums from: " << ar << "\n"; + //lyxerr << "\nSums from: " << ar << endl; for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) { MathArray::iterator it = ar.begin() + i; @@ -623,7 +634,7 @@ void extractSums(MathArray & ar) ar.erase(it + 1, tt); *it = MathAtom(p); } - //lyxerr << "\nSums to: " << ar << "\n"; + //lyxerr << "\nSums to: " << ar << endl; } @@ -655,7 +666,7 @@ bool testDiffFrac(MathAtom const & at) void extractDiff(MathArray & ar) { - //lyxerr << "\nDiffs from: " << ar << "\n"; + //lyxerr << "\nDiffs from: " << ar << endl; for (MathArray::size_type i = 0; i < ar.size(); ++i) { MathArray::iterator it = ar.begin() + i; @@ -665,7 +676,7 @@ void extractDiff(MathArray & ar) MathFracInset const * f = (*it)->asFracInset(); if (!f) { - lyxerr << "should not happen\n"; + lyxerr << "should not happen" << endl; continue; } @@ -721,7 +732,7 @@ void extractDiff(MathArray & ar) ar.erase(it + 1, jt); *it = MathAtom(diff); } - //lyxerr << "\nDiffs to: " << ar << "\n"; + //lyxerr << "\nDiffs to: " << ar << endl; } @@ -745,12 +756,12 @@ void extractLims(MathArray & ar) if (ar.size() < 3) return; - //lyxerr << "\nLimits from: " << ar << "\n"; + //lyxerr << "\nLimits from: " << ar << endl; for (MathArray::size_type i = 0; i + 2 < ar.size(); ++i) { MathArray::iterator it = ar.begin() + i; // is this a limit function? - if (!testSymbol(*it, "lim")) + if (!testSymbol(*it, "lim")) continue; // the next one must be a subscript (without superscript) @@ -767,7 +778,7 @@ void extractLims(MathArray & ar) // the -> splits the subscript int x and x0 MathArray x = MathArray(s.begin(), st); MathArray x0 = MathArray(st + 1, s.end()); - + // use something behind the script as core MathArray f; MathArray::iterator tt = extractArgument(f, it + 2, ar.end()); @@ -778,7 +789,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; } @@ -788,7 +799,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); @@ -801,7 +812,7 @@ void extractStructure(MathArray & ar) extractExps(ar); extractLims(ar); extractStrings(ar); - //lyxerr << "\nStructure to: " << ar << "\n"; + //lyxerr << "\nStructure to: " << ar << endl; } @@ -824,39 +835,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); } @@ -927,7 +938,7 @@ namespace { ostringstream os; MaximaStream ms(os); ms << ar; - string expr = os.str().c_str(); + string expr = os.str(); string const header = "SIMPSUM:true;"; string out; @@ -940,7 +951,7 @@ namespace { // 2x; // ^ // - lyxerr << "checking expr: '" << expr << "'\n"; + lyxerr << "checking expr: '" << expr << "'" << endl; string full = header + "tex(" + expr + ");"; out = captureOutput("maxima", full); @@ -961,7 +972,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 @@ -975,7 +986,7 @@ namespace { return MathArray(); out = subst(tmp[1],"\\>", ""); - lyxerr << "out: '" << out << "'\n"; + lyxerr << "out: '" << out << "'" << endl; // Ugly code that tries to make the result prettier @@ -1050,9 +1061,9 @@ namespace { ostringstream os; MapleStream ms(os); ms << ar; - string expr = os.str().c_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 @@ -1062,8 +1073,8 @@ namespace { // ^ syntax error - // Probably missing an operator such as * p // - lyxerr << "checking expr: '" << expr << "'\n"; - string out = captureOutput("mint -i 1 -S -s -q -q", expr + ";"); + lyxerr << "checking expr: '" << expr << "'" << endl; + string out = captureOutput("mint -i 1 -S -s -q -q", expr + ';'); if (out.empty()) break; // expression syntax is ok istringstream is(out.c_str()); @@ -1078,7 +1089,7 @@ namespace { pos -= 15; // skip the "on line ..." part if (expr[pos] == '*' || (pos > 0 && expr[pos - 1] == '*')) break; // two '*' in a row are definitely bad - expr.insert(pos, "*"); + expr.insert(pos, 1, '*'); } string full = "latex(" + extra + '(' + expr + "));"; @@ -1098,11 +1109,11 @@ namespace { ostringstream os; OctaveStream vs(os); vs << ar; - string expr = os.str().c_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 // @@ -1111,9 +1122,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) @@ -1124,7 +1135,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; } @@ -1132,14 +1143,14 @@ 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 if (expr[pos] == '*') break; // two '*' in a row are definitely bad - expr.insert(pos, "*"); + expr.insert(pos, 1, '*'); } if (out.size() < 6) @@ -1179,15 +1190,15 @@ MathArray pipeThroughExtern(string const & lang, string const & extra, // create normalized expression ostringstream os; NormalStream ns(os); - os << "[" << extra << ' '; + os << '[' << extra << ' '; ns << ar; - os << "]"; - string data = os.str().c_str(); + os << ']'; + string data = os.str(); // search external script string file = LibFileSearch("mathed", "extern_" + lang); if (file.empty()) { - lyxerr << "converter to '" << lang << "' not found\n"; + lyxerr << "converter to '" << lang << "' not found" << endl; return MathArray(); }