* Licence details can be found in the file COPYING.
*
* \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
* \author Stefan Schimanski
*
* Full author contact details are available in file CREDITS.
#include "MathMacro.h"
+#include "InsetMathChar.h"
#include "MathCompletionList.h"
#include "MathExtern.h"
+#include "MathFactory.h"
#include "MathStream.h"
#include "MathSupport.h"
#include "FuncStatus.h"
#include "FuncRequest.h"
#include "LaTeXFeatures.h"
-#include "LyXFunc.h"
+#include "LyX.h"
#include "LyXRC.h"
-#include "Undo.h"
#include "frontends/Painter.h"
asArray(def, def_);
}
///
+ InsetCode lyxCode() const { return ARGUMENT_PROXY_CODE; }
+ ///
void metrics(MetricsInfo & mi, Dimension & dim) const {
mathMacro_.macro()->unlock();
- if (!mathMacro_.editMetrics(mi.base.bv)
+ mathMacro_.cell(idx_).metrics(mi, dim);
+
+ if (!mathMacro_.editMetrics(mi.base.bv)
&& mathMacro_.cell(idx_).empty())
def_.metrics(mi, dim);
- else {
- CoordCache & coords = mi.base.bv->coordCache();
- dim = coords.arrays().dim(&mathMacro_.cell(idx_));
- }
+
mathMacro_.macro()->lock();
}
+ // FIXME Other external things need similar treatment.
+ ///
+ void mathmlize(MathStream & ms) const { ms << mathMacro_.cell(idx_); }
+ ///
+ void htmlize(HtmlStream & ms) const { ms << mathMacro_.cell(idx_); }
///
void draw(PainterInfo & pi, int x, int y) const {
if (mathMacro_.editMetrics(pi.base.bv)) {
};
-MathMacro::MathMacro(docstring const & name)
- : InsetMathNest(0), name_(name), displayMode_(DISPLAY_INIT),
- attachedArgsNum_(0), optionals_(0), nextFoldMode_(true),
- macro_(0), needsUpdate_(false), appetite_(9)
+MathMacro::MathMacro(Buffer * buf, docstring const & name)
+ : InsetMathNest(buf, 0), name_(name), displayMode_(DISPLAY_INIT),
+ expanded_(buf), attachedArgsNum_(0), optionals_(0), nextFoldMode_(true),
+ macroBackup_(buf), macro_(0), needsUpdate_(false), appetite_(9)
{}
{
MathMacro * copy = new MathMacro(*this);
copy->needsUpdate_ = true;
- copy->expanded_.cell(0).clear();
+ //copy->expanded_.cell(0).clear();
return copy;
}
docstring MathMacro::name() const
{
- if (displayMode_ == DISPLAY_UNFOLDED && name_.size() != 1)
+ if (displayMode_ == DISPLAY_UNFOLDED)
return asString(cell(0));
return name_;
// look if there is no other macro in edit mode above
++i;
for (; i != cur.depth(); ++i) {
- MathMacro const * macro = dynamic_cast<MathMacro const *>(&cur[i].inset());
- if (macro && macro->displayMode() == DISPLAY_NORMAL)
- return false;
+ InsetMath * im = cur[i].asInsetMath();
+ if (im) {
+ MathMacro const * macro = im->asMacro();
+ if (macro && macro->displayMode() == DISPLAY_NORMAL)
+ return false;
+ }
}
// ok, none found, I am the highest one
} else {
LASSERT(macro_ != 0, /**/);
- // metrics are computed here for the cells,
- // in the proxy we will then use the dim from the cache
- InsetMathNest::metrics(mi);
-
- // calculate metrics finally
+ // calculate metrics, hoping that all cells are seen
macro_->lock();
expanded_.cell(0).metrics(mi, dim);
+
+ // otherwise do a manual metrics call
+ CoordCache & coords = mi.base.bv->coordCache();
+ for (idx_type i = 0; i < nargs(); ++i) {
+ if (!coords.getArrays().has(&cell(i))) {
+ Dimension tdim;
+ cell(i).metrics(mi, tdim);
+ }
+ }
macro_->unlock();
// calculate dimension with label while editing
void MathMacro::updateMacro(MacroContext const & mc)
{
if (validName()) {
- macro_ = mc.get(name());
+ macro_ = mc.get(name());
if (macro_ && macroBackup_ != *macro_) {
macroBackup_ = *macro_;
needsUpdate_ = true;
// update requires
requires_ = macro_->requires();
- // non-normal mode? We are done!
- if (displayMode_ != DISPLAY_NORMAL)
+ if (!needsUpdate_
+ // non-normal mode? We are done!
+ || (displayMode_ != DISPLAY_NORMAL))
return;
- // macro changed?
- if (!needsUpdate_)
- return;
-
needsUpdate_ = false;
// get default values of macro
proxy = new ArgumentProxy(*this, i);
values[i].insert(0, MathAtom(proxy));
}
-
// expanding macro with the values
macro_->expand(values, expanded_.cell(0));
- // get definition for list edit mode
+ // get definition for list edit mode
docstring const & display = macro_->display();
asArray(display.empty() ? macro_->definition() : display, definition_);
}
&& editing_[pi.base.bv]) {
// Macro will be edited in a old-style list mode here:
- CoordCache & coords = pi.base.bv->coordCache();
+ CoordCache const & coords = pi.base.bv->coordCache();
FontInfo const & labelFont = sane_font;
// markers and box needs two pixels
// draw definition
definition_.draw(pi, x, y);
- Dimension defDim
- = coords.arrays().dim(&definition_);
+ Dimension const & defDim = coords.getArrays().dim(&definition_);
y += max(fontDim.des, defDim.des);
// draw parameters
for (idx_type i = 0; i < nargs(); ++i) {
// position of label
- Dimension cdim
- = coords.arrays().dim(&cell(i));
+ Dimension const & cdim = coords.getArrays().dim(&cell(i));
x = expx + 2;
y += max(fontDim.asc, cdim.asc) + 1;
// edit mode changed?
if (editing_[pi.base.bv] != editMode(pi.base.bv))
- pi.base.bv->cursor().updateFlags(Update::SinglePar);
+ pi.base.bv->cursor().screenUpdateFlags(Update::SinglePar);
}
if (!requires_.empty())
features.require(requires_);
- if (name() == "binom" || name() == "mathcircumflex")
- features.require(to_utf8(name()));
+ if (name() == "binom")
+ features.require("binom");
// validate the cells and the definition
if (displayMode() == DISPLAY_NORMAL) {
void MathMacro::edit(Cursor & cur, bool front, EntryDirection entry_from)
{
- cur.updateFlags(Update::SinglePar);
+ cur.screenUpdateFlags(Update::SinglePar);
InsetMathNest::edit(cur, front, entry_from);
}
{
// We may have 0 arguments, but InsetMathNest requires at least one.
if (nargs() > 0) {
- cur.updateFlags(Update::SinglePar);
+ cur.screenUpdateFlags(Update::SinglePar);
return InsetMathNest::editXY(cur, x, y);
} else
return this;
bool MathMacro::idxFirst(Cursor & cur) const
{
- cur.updateFlags(Update::SinglePar);
+ cur.screenUpdateFlags(Update::SinglePar);
return InsetMathNest::idxFirst(cur);
}
bool MathMacro::idxLast(Cursor & cur) const
{
- cur.updateFlags(Update::SinglePar);
+ cur.screenUpdateFlags(Update::SinglePar);
return InsetMathNest::idxLast(cur);
}
bool MathMacro::notifyCursorLeaves(Cursor const & old, Cursor & cur)
{
- cur.updateFlags(Update::Force);
+ if (displayMode_ == DISPLAY_UNFOLDED) {
+ docstring const & unfolded_name = name();
+ if (unfolded_name != name_) {
+ // The macro name was changed
+ Cursor inset_cursor = old;
+ int macroSlice = inset_cursor.find(this);
+ LASSERT(macroSlice != -1, /**/);
+ inset_cursor.cutOff(macroSlice);
+ inset_cursor.recordUndoInset();
+ inset_cursor.pop();
+ inset_cursor.cell().erase(inset_cursor.pos());
+ inset_cursor.cell().insert(inset_cursor.pos(),
+ createInsetMath(unfolded_name, cur.buffer()));
+ cur.resetAnchor();
+ cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
+ return true;
+ }
+ }
+ cur.screenUpdateFlags(Update::Force);
return InsetMathNest::notifyCursorLeaves(old, cur);
}
{
if (!nextFoldMode_) {
nextFoldMode_ = true;
- cur.updateFlags(Update::SinglePar);
+ cur.screenUpdateFlags(Update::SinglePar);
}
}
{
if (nextFoldMode_) {
nextFoldMode_ = false;
- cur.updateFlags(Update::SinglePar);
+ cur.screenUpdateFlags(Update::SinglePar);
}
}
// skip the tailing empty optionals
i = optionals_;
- // Print remaining macros
+ // Print remaining arguments
for (; i < cells_.size(); ++i) {
if (cell(i).size() == 1
- && cell(i)[0].nucleus()->asCharInset()) {
+ && cell(i)[0].nucleus()->asCharInset()
+ && cell(i)[0].nucleus()->asCharInset()->getChar() < 0x80) {
if (first)
os << " ";
os << cell(i);
void MathMacro::mathmlize(MathStream & os) const
{
- lyx::mathmlize(expanded_.cell(0), os);
+ os << expanded_.cell(0);
+}
+
+
+void MathMacro::htmlize(HtmlStream & os) const
+{
+ os << expanded_.cell(0);
}
docstring newName = name() + s;
asArray(newName, cell(0));
cur.bv().cursor().pos() = name().size();
- cur.updateFlags(Update::SinglePar);
+ cur.screenUpdateFlags(Update::SinglePar);
// finish macro
if (finished) {
cur.bv().cursor().pop();
++cur.bv().cursor().pos();
- cur.updateFlags(Update::SinglePar);
+ cur.screenUpdateFlags(Update::SinglePar);
}
return true;
projects / lyx.git / blobdiff