-#ifdef __GNUG__
-#pragma implementation
-#endif
-
// This file contains most of the magic that extracts "context
// information" from the unstructered layout-oriented stuff in an
// MathArray.
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);
}
{
return
testIntSymbol(at) ||
- ( at->asScriptInset()
+ ( at->asScriptInset()
&& at->asScriptInset()->nuc().size()
&& testIntSymbol(at->asScriptInset()->nuc().back()) );
}
{
return
testSumSymbol(at) ||
- ( at->asScriptInset()
+ ( at->asScriptInset()
&& at->asScriptInset()->nuc().size()
&& testSumSymbol(at->asScriptInset()->nuc().back()) );
}
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)
// 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());
}
-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);
}
return ret.second;
}
+ string::size_type get_matching_brace(string const & str, string::size_type i)
+ {
+ int count = 1;
+ string::size_type n = str.size();
+ while (i < n) {
+ i = str.find_first_of("{}", i+1);
+ if (i == string::npos) return i;
+ if (str[i] == '{')
+ ++count;
+ else
+ --count;
+ if (count == 0)
+ return i;
+ }
+ return string::npos;
+ }
+
+ string::size_type get_matching_brace_back(string const & str, string::size_type i)
+ {
+ int count = 1;
+ while (i > 0) {
+ i = str.find_last_of("{}", i-1);
+ if (i == string::npos) return i;
+ if (str[i] == '}')
+ ++count;
+ else
+ --count;
+ if (count == 0)
+ return i;
+ }
+ return string::npos;
+ }
MathArray pipeThroughMaxima(string const &, MathArray const & ar)
{
ostringstream os;
MaximaStream ms(os);
ms << ar;
- string expr = os.str().c_str();
+ string expr = STRCONV(os.str());
string const header = "SIMPSUM:true;";
string out;
return MathArray();
out = subst(tmp[1],"\\>", "");
-
lyxerr << "out: '" << out << "'\n";
+
+ // Ugly code that tries to make the result prettier
+
+ string::size_type i = out.find("\\mathchoice");
+ while (i != string::npos) {
+ string::size_type j = get_matching_brace(out, i + 12);
+ string::size_type k = get_matching_brace(out, j + 1);
+ k = get_matching_brace(out, k + 1);
+ k = get_matching_brace(out, k + 1);
+ string mid = out.substr(i + 13,j - i - 13);
+ if (mid.find("\\over") != string::npos)
+ mid = '{' + mid + '}';
+ out = out.substr(0,i)
+ + mid
+ + out.substr(k + 1);
+ //lyxerr << "out: " << out << endl;
+ i = out.find("\\mathchoice", i);
+ break;
+ }
+
+ i = out.find("\\over");
+ while (i != string::npos) {
+ string::size_type j = get_matching_brace_back(out, i - 1);
+ if (j == string::npos || j == 0) break;
+ string::size_type k = get_matching_brace(out, i + 5);
+ if (k == string::npos || k + 1 == out.size()) break;
+ out = out.substr(0,j - 1)
+ + "\\frac"
+ + out.substr(j,i - j)
+ + out.substr(i + 5,k - i - 4)
+ + out.substr(k + 2);
+ //lyxerr << "out: " << out << endl;
+ i = out.find("\\over", i + 4);
+ }
MathArray res;
mathed_parse_cell(res, out);
return res;
ostringstream os;
MapleStream ms(os);
ms << ar;
- string expr = os.str().c_str();
+ string expr = STRCONV(os.str());
lyxerr << "ar: '" << ar << "'\n";
lyxerr << "ms: '" << os.str() << "'\n";
// 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 + "));";
ostringstream os;
OctaveStream vs(os);
vs << ar;
- string expr = os.str().c_str();
+ string expr = STRCONV(os.str());
string out;
lyxerr << "pipe: ar: '" << ar << "'\n";
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 << "]";
- string data = os.str().c_str();
+ 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();
}
projects / lyx.git / blobdiff