#include "MathMacroTemplate.h"
-#include "DocIterator.h"
-#include "LaTeXFeatures.h"
#include "InsetMathBrace.h"
#include "InsetMathChar.h"
#include "InsetMathHull.h"
#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"
#include "support/docstream.h"
#include "support/lstrings.h"
+#include <set>
#include <sstream>
using namespace std;
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);
}
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("\\"));
}
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);
}
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();
}
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();
}
-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;
}
}
-void MathMacroTemplate::updateToContext(MacroContext const & mc) const
+void MathMacroTemplate::updateToContext(MacroContext const & mc)
{
redefinition_ = mc.get(name()) != 0;
}
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_) {
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)
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;
}
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();
{
// 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);
}
///
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_);
///
OptionalsMacroInstanceFix(int optionals) : optionals_(optionals) {}
///
- void operator()(MathMacro * macro) {
+ void operator()(MathMacro * macro)
+ {
macro->setOptionals(optionals_);
}
{
public:
///
- void operator()(MathMacro * macro) {}
+ void operator()(MathMacro * ) {}
};
// remember hull to trigger preview reload
DocIterator hull(dit.buffer());
bool preview_reload_needed = false;
+ set<DocIterator> 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();
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<DocIterator>::const_iterator sit = preview_hulls.begin();
+ set<DocIterator>::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);
+ }
}
{
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);
{
if (pos <= numargs_ && pos >= optionals_ && numargs_ < 9) {
++numargs_;
-
+
// append example #n
if (addarg) {
shiftArguments(pos, 1);
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<int>(arg) - 1; // it is checked for >=0 in getStatus
insertParameter(cur, cur, pos);
}
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<int>(arg) - 1; // it is checked for >=0 in getStatus
removeParameter(cur, cur, pos);
}
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;
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);
}
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);
}
}
-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<int>(arg);
bool on = (num >= optionals_
&& numargs_ < 9 && num <= numargs_ + 1);
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<int>(arg);
flag.setEnabled(num >= 1 && num <= numargs_);
break;
break;
default:
- ret = false;
+ ret = InsetMathNest::getStatus(cur, cmd, flag);
break;
}
return ret;
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());
}
-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.:
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();
{
docstring n = name();
- // empty name?
- if (n.size() == 0)
+ if (n.empty())
return false;
// converting back and force doesn't swallow anything?
}
// now it should be valid if anything in the name survived
- return data.size() > 0;
+ return !data.empty();
}
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
projects / lyx.git / blobdiff