#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 <algorithm>
#include <sstream>
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) {
// create extra script inset and move superscript over
InsetMathScript * p = ar[i].nucleus()->asScriptInset();
- auto_ptr<InsetMathScript> q(new InsetMathScript(buf, true));
+ auto q = make_unique<InsetMathScript>(buf, true);
swap(q->up(), p->up());
p->removeScript(true);
// 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;
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
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
extractScript(exp, jt, ar.end(), true);
// create a proper inset as replacement
- auto_ptr<InsetMathExFunc> p(new InsetMathExFunc(buf, name));
+ auto p = make_unique<InsetMathExFunc>(buf, name);
// jt points to the "argument". Get hold of this.
MathData::iterator st =
return
testIntSymbol(at) ||
( at->asScriptInset()
- && at->asScriptInset()->nuc().size()
+ && !at->asScriptInset()->nuc().empty()
&& testIntSymbol(at->asScriptInset()->nuc().back()) );
}
continue;
// core ist part from behind the scripts to the 'd'
- auto_ptr<InsetMathExInt> p(new InsetMathExInt(buf, from_ascii("int")));
+ auto p = make_unique<InsetMathExInt>(buf, from_ascii("int"));
// handle scripts if available
if (!testIntSymbol(*it)) {
return
testSumSymbol(at) ||
( at->asScriptInset()
- && at->asScriptInset()->nuc().size()
+ && !at->asScriptInset()->nuc().empty()
&& testSumSymbol(at->asScriptInset()->nuc().back()) );
}
continue;
// create a proper inset as replacement
- auto_ptr<InsetMathExInt> p(new InsetMathExInt(buf, from_ascii("sum")));
+ auto p = make_unique<InsetMathExInt>(buf, from_ascii("sum"));
// collect lower bound and summation index
InsetMathScript const * sub = ar[i]->asScriptInset();
bool testDiffArray(MathData const & ar)
{
- return ar.size() && testDiffItem(ar.front());
+ return !ar.empty() && testDiffItem(ar.front());
}
}
// create a proper diff inset
- auto_ptr<InsetMathDiff> diff(new InsetMathDiff(buf));
+ auto diff = make_unique<InsetMathDiff>(buf);
// collect function, let jt point behind last used item
MathData::iterator jt = it + 1;
extractSums(ar);
extractNumbers(ar);
extractMatrices(ar);
- extractFunctions(ar, kind);
if (kind != MATHML && kind != HTML) {
+ extractFunctions(ar, kind);
extractDets(ar);
extractDiff(ar);
extractExps(ar);
{
// In order to avoid parsing problems with command interpreters
// we pass input data through a file
- FileName const cas_tmpfile = FileName::tempName("casinput");
+ TempFile tempfile("casinput");
+ FileName const cas_tmpfile = tempfile.name();
if (cas_tmpfile.empty()) {
lyxerr << "Warning: cannot create temporary file."
<< endl;
lyxerr << "calling: " << cmd
<< "\ninput: '" << data << "'" << endl;
cmd_ret const ret = runCommand(command);
- cas_tmpfile.removeFile();
return ret.second;
}
+ out.substr(k + 1);
//lyxerr << "output: " << out << endl;
i = out.find("\\mathchoice", i);
- break;
}
i = out.find("\\over");
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('^');
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)
{
MathData ar = dat;
extractStructure(ar, MATHML);
- if (ar.size() == 0) {
- if (!os.inText())
- os << "<mrow/>";
- } else if (ar.size() == 1)
+ if (ar.empty())
+ os << "<mrow/>";
+ 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");
}
}
{
MathData ar = dat;
extractStructure(ar, HTML);
- if (ar.size() == 0)
+ if (ar.empty())
return;
if (ar.size() == 1) {
os << ar.front();
{
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();
}
{
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();
}
}
// 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;
projects / lyx.git / blobdiff