X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacroTemplate.cpp;h=d4cf4cfa560bbf830c9b982564ac9fb0aa7c35f8;hb=31cd421bcd26647cb7edbb694b05473271fe9153;hp=b36bf19d150cd19ef1f2222d2dffa272921b872d;hpb=92c8561674547dc5d3030d1956cb67ec052add54;p=lyx.git diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp index b36bf19d15..d4cf4cfa56 100644 --- a/src/mathed/MathMacroTemplate.cpp +++ b/src/mathed/MathMacroTemplate.cpp @@ -13,8 +13,6 @@ #include "MathMacroTemplate.h" -#include "DocIterator.h" -#include "LaTeXFeatures.h" #include "InsetMathBrace.h" #include "InsetMathChar.h" #include "InsetMathHull.h" @@ -31,11 +29,13 @@ #include "Color.h" #include "Cursor.h" #include "DispatchResult.h" +#include "DocIterator.h" #include "FuncRequest.h" #include "FuncStatus.h" +#include "LaTeXFeatures.h" #include "Lexer.h" -#include "LyXRC.h" -#include "Undo.h" +#include "MetricsInfo.h" +#include "TocBackend.h" #include "frontends/Painter.h" @@ -48,6 +48,7 @@ #include "support/docstream.h" #include "support/lstrings.h" +#include #include using namespace std; @@ -268,14 +269,12 @@ Inset * InsetMathWrapper::clone() const void InsetMathWrapper::metrics(MetricsInfo & mi, Dimension & dim) const { value_->metrics(mi, dim); - //metricsMarkers2(dim); } void InsetMathWrapper::draw(PainterInfo & pi, int x, int y) const { value_->draw(pi, x, y); - //drawMarkers(pi, x, y); } @@ -368,6 +367,7 @@ Inset * InsetNameWrapper::clone() const void InsetNameWrapper::metrics(MetricsInfo & mi, Dimension & dim) const { + Changer dummy = mi.base.changeFontSet("textit"); InsetMathWrapper::metrics(mi, dim); dim.wid += mathed_string_width(mi.base.font, from_ascii("\\")); } @@ -375,19 +375,17 @@ void InsetNameWrapper::metrics(MetricsInfo & mi, Dimension & dim) const void InsetNameWrapper::draw(PainterInfo & pi, int x, int y) const { - // create fonts - PainterInfo namepi = pi; - if (parent_.validMacro()) - namepi.base.font.setColor(Color_latex); - else - namepi.base.font.setColor(Color_error); + ColorCode const color = parent_.validMacro() ? Color_latex : Color_error; + + Changer dummy = pi.base.changeFontSet("textit"); + Changer dummy2 = pi.base.font.changeColor(color); // draw backslash - pi.pain.text(x, y, from_ascii("\\"), namepi.base.font); - x += mathed_string_width(namepi.base.font, from_ascii("\\")); + pi.pain.text(x, y, from_ascii("\\"), pi.base.font); + x += mathed_string_width(pi.base.font, from_ascii("\\")); // draw name - InsetMathWrapper::draw(namepi, x, y); + InsetMathWrapper::draw(pi, x, y); } @@ -396,7 +394,8 @@ void InsetNameWrapper::draw(PainterInfo & pi, int x, int y) const MathMacroTemplate::MathMacroTemplate(Buffer * buf) : InsetMathNest(buf, 3), numargs_(0), argsInLook_(0), optionals_(0), - type_(MacroTypeNewcommand), lookOutdated_(true) + type_(MacroTypeNewcommand), redefinition_(false), lookOutdated_(true), + premetrics_(false), labelBoxAscent_(0), labelBoxDescent_(0) { initMath(); } @@ -407,7 +406,8 @@ MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & name, int n MathData const & def, MathData const & display) : InsetMathNest(buf, optionals + 3), numargs_(numargs), argsInLook_(numargs), optionals_(optionals), optionalValues_(optionalValues), - type_(type), lookOutdated_(true) + type_(type), redefinition_(false), lookOutdated_(true), + premetrics_(false), labelBoxAscent_(0), labelBoxDescent_(0) { initMath(); @@ -426,26 +426,20 @@ MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & name, int n } -MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & str) - : InsetMathNest(buf, 3), numargs_(0), optionals_(0), - type_(MacroTypeNewcommand), lookOutdated_(true) +bool MathMacroTemplate::fromString(docstring const & str) { - buffer_ = buf; - initMath(); - - MathData ar(buf); + MathData ar(buffer_); mathed_parse_cell(ar, str, Parse::NORMAL); if (ar.size() != 1 || !ar[0]->asMacroTemplate()) { lyxerr << "Cannot read macro from '" << ar << "'" << endl; asArray(from_ascii("invalidmacro"), cell(0)); - // FIXME: The macro template does not make sense after this. - // The whole parsing should not be in a constructor which - // has no chance to report failure. - return; + // The macro template does not make sense after this. + return false; } operator=( *(ar[0]->asMacroTemplate()) ); updateLook(); + return true; } @@ -465,7 +459,7 @@ docstring MathMacroTemplate::name() const } -void MathMacroTemplate::updateToContext(MacroContext const & mc) const +void MathMacroTemplate::updateToContext(MacroContext const & mc) { redefinition_ = mc.get(name()) != 0; } @@ -546,18 +540,14 @@ void MathMacroTemplate::createLook(int args) const void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const { - FontSetChanger dummy1(mi.base, from_ascii("mathnormal")); - StyleChanger dummy2(mi.base, LM_ST_TEXT); + Changer dummy1 = mi.base.changeFontSet("mathnormal"); + Changer dummy2 = mi.base.font.changeStyle(LM_ST_TEXT); // valid macro? MacroData const * macro = 0; - if (validName()) { + if (validName()) macro = mi.macrocontext.get(name()); - // updateToContext() - avoids another lookup - redefinition_ = macro != 0; - } - // update look? int argsInDef = maxArgumentInDefinition(); if (lookOutdated_ || argsInDef != argsInLook_) { @@ -585,24 +575,23 @@ void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const dim.wid += 6; dim.des += 2; dim.asc += 2; - - setDimCache(mi, dim); } void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const { - FontSetChanger dummy1(pi.base, from_ascii("mathnormal")); - StyleChanger dummy2(pi.base, LM_ST_TEXT); + // FIXME: Calling Changer on the same object repeatedly is inefficient. + Changer dummy0 = pi.base.font.changeColor(Color_math); + Changer dummy1 = pi.base.changeFontSet("mathnormal"); + Changer dummy2 = pi.base.font.changeStyle(LM_ST_TEXT); - setPosCache(pi, x, y); Dimension const dim = dimension(*pi.base.bv); // draw outer frame int const a = y - dim.asc + 1; int const w = dim.wid - 2; int const h = dim.height() - 2; - pi.pain.rectangle(x, a, w, h, Color_mathframe); + pi.pain.rectangle(x + 1, a, w, h, Color_mathframe); // just to be sure: set some dummy values for coord cache for (idx_type i = 0; i < nargs(); ++i) @@ -616,17 +605,20 @@ void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const void MathMacroTemplate::edit(Cursor & cur, bool front, EntryDirection entry_from) { updateLook(); - cur.updateFlags(Update::SinglePar); + cur.screenUpdateFlags(Update::SinglePar); InsetMathNest::edit(cur, front, entry_from); } bool MathMacroTemplate::notifyCursorLeaves(Cursor const & old, Cursor & cur) { + unsigned int const nargs_before = nargs(); commitEditChanges(cur, old); updateLook(); - cur.updateFlags(Update::Force); - return InsetMathNest::notifyCursorLeaves(old, cur); + cur.screenUpdateFlags(Update::Force); + // If we have removed a cell, we might have invalidated the cursor + return InsetMathNest::notifyCursorLeaves(old, cur) + || nargs() < nargs_before; } @@ -673,7 +665,7 @@ void MathMacroTemplate::shiftArguments(size_t from, int by) int MathMacroTemplate::maxArgumentInDefinition() const { // We don't have a buffer when pasting from the clipboard (bug 6014). - Buffer const * macro_buffer = this->isBufferValid() ? &buffer() : 0; + Buffer const * macro_buffer = isBufferLoaded() ? &buffer() : 0; int maxArg = 0; DocIterator it = doc_iterator_begin(macro_buffer, this); it.idx() = defIdx(); @@ -721,11 +713,11 @@ void MathMacroTemplate::changeArity(Cursor & cur, { // remove parameter which do not appear anymore in the definition for (int i = numargs_; i > newNumArg; --i) - removeParameter(cur, inset_pos, numargs_ - 1, false); + removeParameter(cur, inset_pos, numargs_ - 1, true); // add missing parameter for (int i = numargs_; i < newNumArg; ++i) - insertParameter(cur, inset_pos, numargs_, false, false); + insertParameter(cur, inset_pos, numargs_, true, false); } @@ -736,7 +728,8 @@ public: /// AddRemoveMacroInstanceFix(int n, bool insert) : n_(n), insert_(insert) {} /// - void operator()(MathMacro * macro) { + void operator()(MathMacro * macro) + { if (macro->folded()) { if (insert_) macro->insertArgument(n_); @@ -760,7 +753,8 @@ public: /// OptionalsMacroInstanceFix(int optionals) : optionals_(optionals) {} /// - void operator()(MathMacro * macro) { + void operator()(MathMacro * macro) + { macro->setOptionals(optionals_); } @@ -775,7 +769,7 @@ class NullMacroInstanceFix { public: /// - void operator()(MathMacro * macro) {} + void operator()(MathMacro * ) {} }; @@ -791,18 +785,15 @@ void fixMacroInstances(Cursor & cur, DocIterator const & inset_pos, // remember hull to trigger preview reload DocIterator hull(dit.buffer()); bool preview_reload_needed = false; + set preview_hulls; // iterate over all positions until macro is redefined for (; dit; dit.forwardPos()) { // left the outer hull? if (!hull.empty() && dit.depth() == hull.depth()) { - // reload the preview if necessary + // schedule reload of the preview if necessary if (preview_reload_needed) { - InsetMathHull * inset_hull = - hull.nextInset()->asInsetMath()->asHullInset(); - LASSERT(inset_hull, /**/); - inset_hull->reloadPreview(hull); - cur.updateFlags(Update::Force); + preview_hulls.insert(hull); preview_reload_needed = false; } hull.clear(); @@ -834,10 +825,23 @@ void fixMacroInstances(Cursor & cur, DocIterator const & inset_pos, MathMacro * macro = insetMath->asMacro(); if (macro && macro->name() == name && macro->folded()) { fix(macro); - if (RenderPreview::status() == LyXRC::PREVIEW_ON) + if (RenderPreview::previewMath()) preview_reload_needed = true; } } + + if (!preview_hulls.empty()) { + // reload the scheduled previews + set::const_iterator sit = preview_hulls.begin(); + set::const_iterator end = preview_hulls.end(); + for (; sit != end; ++sit) { + InsetMathHull * inset_hull = + sit->nextInset()->asInsetMath()->asHullInset(); + LBUFERR(inset_hull); + inset_hull->reloadPreview(*sit); + } + cur.screenUpdateFlags(Update::Force); + } } @@ -846,7 +850,9 @@ void MathMacroTemplate::commitEditChanges(Cursor & cur, { int args_in_def = maxArgumentInDefinition(); if (args_in_def != numargs_) { - cur.recordUndoFullDocument(); + // FIXME: implement precise undo handling (only a few places + // need undo) + cur.recordUndoFullBuffer(); changeArity(cur, inset_pos, args_in_def); } insertMissingArguments(args_in_def); @@ -862,7 +868,7 @@ void MathMacroTemplate::insertParameter(Cursor & cur, { if (pos <= numargs_ && pos >= optionals_ && numargs_ < 9) { ++numargs_; - + // append example #n if (addarg) { shiftArguments(pos, 1); @@ -974,14 +980,16 @@ void MathMacroTemplate::makeNonOptional(Cursor & cur, void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) { string const arg = to_utf8(cmd.argument()); - switch (cmd.action) { + switch (cmd.action()) { case LFUN_MATH_MACRO_ADD_PARAM: if (numargs_ < 9) { commitEditChanges(cur, cur); - cur.recordUndoFullDocument(); + // FIXME: implement precise undo handling (only a few places + // need undo) + cur.recordUndoFullBuffer(); size_t pos = numargs_; - if (arg.size() != 0) + if (!arg.empty()) pos = (size_t)convert(arg) - 1; // it is checked for >=0 in getStatus insertParameter(cur, cur, pos); } @@ -991,9 +999,11 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_MATH_MACRO_REMOVE_PARAM: if (numargs_ > 0) { commitEditChanges(cur, cur); - cur.recordUndoFullDocument(); + // FIXME: implement precise undo handling (only a few places + // need undo) + cur.recordUndoFullBuffer(); size_t pos = numargs_ - 1; - if (arg.size() != 0) + if (!arg.empty()) pos = (size_t)convert(arg) - 1; // it is checked for >=0 in getStatus removeParameter(cur, cur, pos); } @@ -1002,7 +1012,9 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_MATH_MACRO_APPEND_GREEDY_PARAM: if (numargs_ < 9) { commitEditChanges(cur, cur); - cur.recordUndoFullDocument(); + // FIXME: implement precise undo handling (only a few places + // need undo) + cur.recordUndoFullBuffer(); insertParameter(cur, cur, numargs_, true); } break; @@ -1010,27 +1022,35 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_MATH_MACRO_REMOVE_GREEDY_PARAM: if (numargs_ > 0) { commitEditChanges(cur, cur); - cur.recordUndoFullDocument(); + // FIXME: implement precise undo handling (only a few places + // need undo) + cur.recordUndoFullBuffer(); removeParameter(cur, cur, numargs_ - 1, true); } break; case LFUN_MATH_MACRO_MAKE_OPTIONAL: commitEditChanges(cur, cur); - cur.recordUndoFullDocument(); + // FIXME: implement precise undo handling (only a few places + // need undo) + cur.recordUndoFullBuffer(); makeOptional(cur, cur); break; case LFUN_MATH_MACRO_MAKE_NONOPTIONAL: commitEditChanges(cur, cur); - cur.recordUndoFullDocument(); + // FIXME: implement precise undo handling (only a few places + // need undo) + cur.recordUndoFullBuffer(); makeNonOptional(cur, cur); break; case LFUN_MATH_MACRO_ADD_OPTIONAL_PARAM: if (numargs_ < 9) { commitEditChanges(cur, cur); - cur.recordUndoFullDocument(); + // FIXME: implement precise undo handling (only a few places + // need undo) + cur.recordUndoFullBuffer(); insertParameter(cur, cur, optionals_); makeOptional(cur, cur); } @@ -1039,14 +1059,18 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_MATH_MACRO_REMOVE_OPTIONAL_PARAM: if (optionals_ > 0) { commitEditChanges(cur, cur); - cur.recordUndoFullDocument(); + // FIXME: implement precise undo handling (only a few places + // need undo) + cur.recordUndoFullBuffer(); removeParameter(cur, cur, optionals_ - 1); } break; case LFUN_MATH_MACRO_ADD_GREEDY_OPTIONAL_PARAM: if (numargs_ == optionals_) { commitEditChanges(cur, cur); - cur.recordUndoFullDocument(); + // FIXME: implement precise undo handling (only a few places + // need undo) + cur.recordUndoFullBuffer(); insertParameter(cur, cur, 0, true); makeOptional(cur, cur); } @@ -1059,15 +1083,15 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) } -bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd, +bool MathMacroTemplate::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { bool ret = true; string const arg = to_utf8(cmd.argument()); - switch (cmd.action) { + switch (cmd.action()) { case LFUN_MATH_MACRO_ADD_PARAM: { int num = numargs_ + 1; - if (arg.size() != 0) + if (!arg.empty()) num = convert(arg); bool on = (num >= optionals_ && numargs_ < 9 && num <= numargs_ + 1); @@ -1079,9 +1103,10 @@ bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd, flag.setEnabled(numargs_ < 9); break; + case LFUN_MATH_MACRO_REMOVE_GREEDY_PARAM: case LFUN_MATH_MACRO_REMOVE_PARAM: { int num = numargs_; - if (arg.size() != 0) + if (!arg.empty()) num = convert(arg); flag.setEnabled(num >= 1 && num <= numargs_); break; @@ -1116,7 +1141,7 @@ bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd, break; default: - ret = false; + ret = InsetMathNest::getStatus(cur, cmd, flag); break; } return ret; @@ -1141,7 +1166,8 @@ void MathMacroTemplate::read(Lexer & lex) void MathMacroTemplate::write(ostream & os) const { odocstringstream oss; - WriteStream wi(oss, false, false, WriteStream::wsDefault); + otexrowstream ots(oss); + WriteStream wi(ots, false, false, WriteStream::wsDefault); oss << "FormulaMacro\n"; write(wi); os << to_utf8(oss.str()); @@ -1154,8 +1180,10 @@ void MathMacroTemplate::write(WriteStream & os) const } -void MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) const +int MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) const { + int num_lines = 0; + if (os.latex()) { if (optionals_ > 0) { // macros with optionals use the xargs package, e.g.: @@ -1218,18 +1246,28 @@ void MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) cons if (os.latex()) { // writing .tex. done. os << "\n"; + ++num_lines; } else { // writing .lyx, write special .tex export only if necessary - if (!cell(displayIdx()).empty()) + if (!cell(displayIdx()).empty()) { os << "\n{" << cell(displayIdx()) << '}'; + ++num_lines; + } } + + return num_lines; } -int MathMacroTemplate::plaintext(odocstream & os, - OutputParams const &) const +docstring MathMacroTemplate::xhtml(XHTMLStream &, OutputParams const &) const +{ + return docstring(); +} + +int MathMacroTemplate::plaintext(odocstringstream & os, + OutputParams const &, size_t) const { - static docstring const str = '[' + buffer().B_("math macro") + ']'; + docstring const str = '[' + buffer().B_("math macro") + ']'; os << str; return str.size(); @@ -1240,8 +1278,7 @@ bool MathMacroTemplate::validName() const { docstring n = name(); - // empty name? - if (n.size() == 0) + if (n.empty()) return false; // converting back and force doesn't swallow anything? @@ -1290,7 +1327,7 @@ bool MathMacroTemplate::fixNameAndCheckIfValid() } // now it should be valid if anything in the name survived - return data.size() > 0; + return !data.empty(); } @@ -1337,13 +1374,28 @@ size_t MathMacroTemplate::numOptionals() const void MathMacroTemplate::infoize(odocstream & os) const { - os << "Math Macro: \\" << name(); + os << bformat(_("Math Macro: \\%1$s"), name()); +} + + +string MathMacroTemplate::contextMenuName() const +{ + return "context-math-macro-definition"; } -docstring MathMacroTemplate::contextMenu(BufferView const &, int, int) const +void MathMacroTemplate::addToToc(DocIterator const & pit, bool output_active, + UpdateType, TocBackend & backend) const { - return from_ascii("context-math-macro-definition"); + docstring str; + if (!validMacro()) + str = bformat(_("Invalid macro! \\%1$s"), name()); + else + str = "\\" + name(); + TocBuilder & b = backend.builder("math-macro"); + b.pushItem(pit, str, output_active); + b.pop(); } + } // namespace lyx