-#ifdef __GNUG__
-#pragma implementation
-#endif
// This file contains most of the magic that extracts "context
// information" from the unstructered layout-oriented stuff in an
}
-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);
}
// Probably missing an operator such as * p
//
lyxerr << "checking expr: '" << expr << "'\n";
- string out = captureOutput("mint -i 1 -S -s -q -q", expr + ";");
+ string out = captureOutput("mint -i 1 -S -s -q -q", expr + ';');
if (out.empty())
break; // expression syntax is ok
istringstream is(out.c_str());
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 + "));";
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)
// create normalized expression
ostringstream os;
NormalStream ns(os);
- os << "[" << extra << ' ';
+ os << '[' << extra << ' ';
ns << ar;
- os << "]";
+ os << ']';
string data = STRCONV(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();
}