X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathExtern.cpp;h=ee2004b5088644679fe6dee20eb44f6197f4cef6;hb=6c13af3f298a96c5564684b83c52989473b020ce;hp=afeba3ebe2519ba1fb89ca57a4464ed2f0e698ce;hpb=3915c2d01a534da1e275dc159c49971cbb170a68;p=lyx.git diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp index afeba3ebe2..ee2004b508 100644 --- a/src/mathed/MathExtern.cpp +++ b/src/mathed/MathExtern.cpp @@ -35,11 +35,17 @@ #include "MathParser.h" #include "MathStream.h" +#include "Encoding.h" + #include "support/debug.h" #include "support/docstream.h" #include "support/FileName.h" #include "support/filetools.h" +#include "support/gettext.h" #include "support/lstrings.h" +#include "support/TempFile.h" +#include "support/textutils.h" +#include "support/unique_ptr.h" #include #include @@ -54,6 +60,7 @@ namespace lyx { namespace { enum ExternalMath { + HTML, MAPLE, MAXIMA, MATHEMATICA, @@ -120,7 +127,7 @@ MathData::iterator extractArgument(MathData & ar, // leave out delimiters if this is a function argument // unless we are doing MathML, in which case we do want // the delimiters - if (function && kind != MATHML) { + if (function && kind != MATHML && kind != HTML) { MathData const & arg = (*pos)->asDelimInset()->cell(0); MathData::const_iterator cur = arg.begin(); MathData::const_iterator end = arg.end(); @@ -351,7 +358,7 @@ void splitScripts(MathData & ar) continue; // we must have a nucleus if we only have a superscript - if (!script->hasDown() && script->nuc().size() == 0) + if (!script->hasDown() && script->nuc().empty()) continue; if (script->nuc().size() == 1) { @@ -364,7 +371,7 @@ void splitScripts(MathData & ar) // create extra script inset and move superscript over InsetMathScript * p = ar[i].nucleus()->asScriptInset(); - auto_ptr q(new InsetMathScript(buf, true)); + auto q = make_unique(buf, true); swap(q->up(), p->up()); p->removeScript(true); @@ -536,6 +543,9 @@ void extractDelims(MathData & ar) // assume 'extractDelims' ran before void extractFunctions(MathData & ar, ExternalMath kind) { + // FIXME From what I can see, this is quite broken right now, for reasons + // I will note below. (RGH) + // we need at least two items... if (ar.size() < 2) return; @@ -550,9 +560,26 @@ void extractFunctions(MathData & ar, ExternalMath kind) docstring name; // is it a function? // it certainly is if it is well known... + + // FIXME This will never give us anything. When we get here, *it will + // never point at a string, but only at a character. I.e., if we are + // working on "sin(x)", then we are seeing: + // [char s mathalpha][char i mathalpha][char n mathalpha][delim ( ) [char x mathalpha]] + // and of course we will not find the function name "sin" in there, but + // rather "n(x)". + // + // It appears that we original ran extractStrings() before we ran + // extractFunctions(), but Andre changed this at f200be55, I think + // because this messed up what he was trying to do with "dx" in the + // context of integrals. + // + // This could be fixed by looking at a charSequence instead of just at + // the various characters, one by one. But I am not sure I understand + // exactly what we are trying to do here. And it involves a lot of + // guessing. if (!extractFunctionName(*it, name)) { // is this a user defined function? - // it it probably not, if it doesn't have a name. + // probably not, if it doesn't have a name. if (!extractString(*it, name)) continue; // it is not if it has no argument @@ -563,7 +590,7 @@ void extractFunctions(MathData & ar, ExternalMath kind) InsetMathDelim const * del = (*jt)->asDelimInset(); if (!del || del->cell(0).size() != 1) continue; - // fall trough into main branch + // fall through into main branch } // do we have an exponent like in @@ -572,7 +599,7 @@ void extractFunctions(MathData & ar, ExternalMath kind) extractScript(exp, jt, ar.end(), true); // create a proper inset as replacement - auto_ptr p(new InsetMathExFunc(buf, name)); + auto p = make_unique(buf, name); // jt points to the "argument". Get hold of this. MathData::iterator st = @@ -618,7 +645,7 @@ bool testIntegral(MathAtom const & at) return testIntSymbol(at) || ( at->asScriptInset() - && at->asScriptInset()->nuc().size() + && !at->asScriptInset()->nuc().empty() && testIntSymbol(at->asScriptInset()->nuc().back()) ); } @@ -657,7 +684,7 @@ void extractIntegrals(MathData & ar, ExternalMath kind) continue; // core ist part from behind the scripts to the 'd' - auto_ptr p(new InsetMathExInt(buf, from_ascii("int"))); + auto p = make_unique(buf, from_ascii("int")); // handle scripts if available if (!testIntSymbol(*it)) { @@ -718,7 +745,7 @@ bool testSum(MathAtom const & at) return testSumSymbol(at) || ( at->asScriptInset() - && at->asScriptInset()->nuc().size() + && !at->asScriptInset()->nuc().empty() && testSumSymbol(at->asScriptInset()->nuc().back()) ); } @@ -742,7 +769,7 @@ void extractSums(MathData & ar) continue; // create a proper inset as replacement - auto_ptr p(new InsetMathExInt(buf, from_ascii("sum"))); + auto p = make_unique(buf, from_ascii("sum")); // collect lower bound and summation index InsetMathScript const * sub = ar[i]->asScriptInset(); @@ -799,7 +826,7 @@ bool testDiffItem(MathAtom const & at) bool testDiffArray(MathData const & ar) { - return ar.size() && testDiffItem(ar.front()); + return !ar.empty() && testDiffItem(ar.front()); } @@ -830,7 +857,7 @@ void extractDiff(MathData & ar) } // create a proper diff inset - auto_ptr diff(new InsetMathDiff(buf)); + auto diff = make_unique(buf); // collect function, let jt point behind last used item MathData::iterator jt = it + 1; @@ -948,21 +975,22 @@ void extractLims(MathData & ar) void extractStructure(MathData & ar, ExternalMath kind) { //lyxerr << "\nStructure from: " << ar << endl; - if (kind != MATHML) + if (kind != MATHML && kind != HTML) splitScripts(ar); extractDelims(ar); extractIntegrals(ar, kind); - if (kind != MATHML) + if (kind != MATHML && kind != HTML) extractSums(ar); extractNumbers(ar); extractMatrices(ar); - extractFunctions(ar, kind); - extractDets(ar); - extractDiff(ar); - extractExps(ar); - extractLims(ar); - if (kind != MATHML) + if (kind != MATHML && kind != HTML) { + extractFunctions(ar, kind); + extractDets(ar); + extractDiff(ar); + extractExps(ar); + extractLims(ar); extractStrings(ar); + } //lyxerr << "\nStructure to: " << ar << endl; } @@ -973,7 +1001,13 @@ namespace { { // In order to avoid parsing problems with command interpreters // we pass input data through a file - FileName const cas_tmpfile = FileName::tempName("casinput"); + // Since the CAS is supposed to read the temp file we need + // to unlock it on windows (bug 10262). + unique_ptr tempfile(new TempFile("casinput")); + tempfile->setAutoRemove(false); + FileName const cas_tmpfile = tempfile->name(); + tempfile.reset(); + if (cas_tmpfile.empty()) { lyxerr << "Warning: cannot create temporary file." << endl; @@ -1078,7 +1112,7 @@ namespace { if (tmp.size() < 2) return MathData(); - out = subst(tmp[1], "\\>", string()); + out = subst(subst(tmp[1], "\\>", string()), "{\\it ", "\\mathit{"); lyxerr << "output: '" << out << "'" << endl; // Ugly code that tries to make the result prettier @@ -1096,7 +1130,6 @@ namespace { + out.substr(k + 1); //lyxerr << "output: " << out << endl; i = out.find("\\mathchoice", i); - break; } i = out.find("\\over"); @@ -1174,7 +1207,7 @@ namespace { istringstream is(out); string line; getline(is, line); - if (line.find("on line") != 0) + if (!prefixIs(line, "on line")) break; // error message not identified getline(is, line); size_t pos = line.find('^'); @@ -1360,16 +1393,122 @@ namespace { void write(MathData const & dat, WriteStream & wi) { - MathData ar = dat; - extractStrings(ar); wi.firstitem() = true; - for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it) { - (*it)->write(wi); + docstring s; + for (MathData::const_iterator it = dat.begin(); it != dat.end(); ++it) { + InsetMathChar const * const c = (*it)->asCharInset(); + if (c) + s += c->getChar(); + else { + if (!s.empty()) { + writeString(s, wi); + s.clear(); + } + (*it)->write(wi); + wi.firstitem() = false; + } + } + if (!s.empty()) { + writeString(s, wi); wi.firstitem() = false; } } +void writeString(docstring const & s, WriteStream & os) +{ + if (!os.latex() || os.lockedMode()) { + os << (os.asciiOnly() ? escape(s) : s); + return; + } + + docstring::const_iterator cit = s.begin(); + docstring::const_iterator end = s.end(); + + // We may already be inside an \ensuremath command. + bool in_forced_mode = os.pendingBrace(); + + // We will take care of matching braces. + os.pendingBrace(false); + + while (cit != end) { + bool mathmode = in_forced_mode ? os.textMode() : !os.textMode(); + char_type const c = *cit; + docstring command(1, c); + try { + bool termination = false; + if (isASCII(c) || + Encodings::latexMathChar(c, mathmode, os.encoding(), command, termination)) { + if (os.textMode()) { + if (in_forced_mode) { + // we were inside \lyxmathsym + os << '}'; + os.textMode(false); + in_forced_mode = false; + } + if (!isASCII(c) && os.textMode()) { + os << "\\ensuremath{"; + os.textMode(false); + in_forced_mode = true; + } + } else if (isASCII(c) && in_forced_mode) { + // we were inside \ensuremath + os << '}'; + os.textMode(true); + in_forced_mode = false; + } + } else if (!os.textMode()) { + if (in_forced_mode) { + // we were inside \ensuremath + os << '}'; + in_forced_mode = false; + } else { + os << "\\lyxmathsym{"; + in_forced_mode = true; + } + os.textMode(true); + } + os << command; + // We may need a space if the command contains a macro + // and the last char is ASCII. + if (termination) + os.pendingSpace(true); + } catch (EncodingException const & e) { + switch (os.output()) { + case WriteStream::wsDryrun: { + os << "<" << _("LyX Warning: ") + << _("uncodable character") << " '"; + os << docstring(1, e.failed_char); + os << "'>"; + break; + } + case WriteStream::wsPreview: { + // indicate the encoding error by a boxed '?' + os << "{\\fboxsep=1pt\\fbox{?}}"; + LYXERR0("Uncodable character" << " '" + << docstring(1, e.failed_char) + << "'"); + break; + } + case WriteStream::wsDefault: + default: + // throw again + throw(e); + } + } + ++cit; + } + + if (in_forced_mode && os.textMode()) { + // We have to care for closing \lyxmathsym + os << '}'; + os.textMode(false); + } else { + os.pendingBrace(in_forced_mode); + } +} + + void normalize(MathData const & ar, NormalStream & os) { for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it) @@ -1417,28 +1556,41 @@ void mathmlize(MathData const & dat, MathStream & os) { MathData ar = dat; extractStructure(ar, MATHML); - if (ar.size() == 0) { - if (!os.inText()) - os << ""; - } else if (ar.size() == 1) + if (ar.empty()) + os << ""; + else if (ar.size() == 1) os << ar.front(); else { - if (!os.inText()) - os << MTag("mrow"); + os << MTag("mrow"); for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it) (*it)->mathmlize(os); - if (!os.inText()) - os << ETag("mrow"); + os << ETag("mrow"); } } +void htmlize(MathData const & dat, HtmlStream & os) +{ + MathData ar = dat; + extractStructure(ar, HTML); + if (ar.empty()) + return; + if (ar.size() == 1) { + os << ar.front(); + return; + } + for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it) + (*it)->htmlize(os); +} + + // convert this inset somehow to a number bool extractNumber(MathData const & ar, int & i) { idocstringstream is(charSequence(ar.begin(), ar.end())); is >> i; - return is; + // Do not convert is implicitly to bool, since that is forbidden in C++11. + return !is.fail(); } @@ -1446,7 +1598,8 @@ bool extractNumber(MathData const & ar, double & d) { idocstringstream is(charSequence(ar.begin(), ar.end())); is >> d; - return is; + // Do not convert is implicitly to bool, since that is forbidden in C++11. + return !is.fail(); } @@ -1482,7 +1635,7 @@ MathData pipeThroughExtern(string const & lang, docstring const & extra, } // run external sript - string out = captureOutput(file.absFilename(), data); + string out = captureOutput(file.absFileName(), data); MathData res; mathed_parse_cell(res, from_utf8(out)); return res;