#include "frontends/Painter.h"
#include "frontends/Selection.h"
+#include "support/lassert.h"
#include "support/debug.h"
#include "support/gettext.h"
#include "support/lstrings.h"
// to touch all (math)inset's draw() methods. Right now, we'll store
// absolute value, and make them here relative, only to make them
// absolute again when actually drawing the cursor. What a mess.
- BOOST_ASSERT(&sl.inset() == this);
+ LASSERT(&sl.inset() == this, /**/);
MathData const & ar = sl.cell();
CoordCache const & coord_cache = bv.coordCache();
if (!coord_cache.getArrays().has(&ar)) {
bool InsetMathNest::idxNext(Cursor & cur) const
{
- BOOST_ASSERT(&cur.inset() == this);
+ LASSERT(&cur.inset() == this, /**/);
if (cur.idx() == cur.lastidx())
return false;
++cur.idx();
bool InsetMathNest::idxPrev(Cursor & cur) const
{
- BOOST_ASSERT(&cur.inset() == this);
+ LASSERT(&cur.inset() == this, /**/);
if (cur.idx() == 0)
return false;
--cur.idx();
bool InsetMathNest::idxFirst(Cursor & cur) const
{
- BOOST_ASSERT(&cur.inset() == this);
+ LASSERT(&cur.inset() == this, /**/);
if (nargs() == 0)
return false;
cur.idx() = 0;
bool InsetMathNest::idxLast(Cursor & cur) const
{
- BOOST_ASSERT(&cur.inset() == this);
+ LASSERT(&cur.inset() == this, /**/);
if (nargs() == 0)
return false;
cur.idx() = cur.lastidx();
void InsetMathNest::write(WriteStream & os) const
{
- os << '\\' << name().c_str();
+ ModeSpecifier specifier(os, currentMode());
+ docstring const latex_name = name();
+ os << '\\' << latex_name;
for (size_t i = 0; i < nargs(); ++i)
os << '{' << cell(i) << '}';
if (nargs() == 0)
void InsetMathNest::normalize(NormalStream & os) const
{
- os << '[' << name().c_str();
+ os << '[' << name();
for (size_t i = 0; i < nargs(); ++i)
os << ' ' << cell(i);
os << ']';
int InsetMathNest::latex(odocstream & os, OutputParams const & runparams) const
{
- WriteStream wi(os, runparams.moving_arg, true);
+ WriteStream wi(os, runparams.moving_arg, true, runparams.dryrun,
+ runparams.encoding);
write(wi);
return wi.line();
}
break;
// Math fonts
- case LFUN_FONT_FREE_APPLY:
- case LFUN_FONT_FREE_UPDATE:
+ case LFUN_TEXTSTYLE_APPLY:
+ case LFUN_TEXTSTYLE_UPDATE:
handleFont2(cur, cmd.argument());
break;
else
handleFont(cur, cmd.argument(), "mathbb");
break;
- /*
- case LFUN_FONT_FREE_APPLY:
- handleFont(cur, cmd.argument(), "textrm");
- break;
- */
case LFUN_FONT_DEFAULT:
handleFont(cur, cmd.argument(), "textnormal");
break;
// ignore math-mode on when already in math mode
if (currentMode() == Inset::MATH_MODE && cmd.argument() == "on")
break;
+ cur.recordUndoSelection();
cur.macroModeClose();
docstring const save_selection = grabAndEraseSelection(cur);
selClearOrDel(cur);
cur.niceInsert(save_selection);
#else
if (currentMode() == Inset::TEXT_MODE) {
+ cur.recordUndoSelection();
cur.niceInsert(MathAtom(new InsetMathHull("simple")));
cur.message(_("create new math text environment ($...$)"));
} else {
break;
}
- case LFUN_MATH_SIZE:
-#if 0
- cur.recordUndoSelection();
- cur.setSize(arg);
-#endif
+ case LFUN_MATH_SIZE: {
+ FuncRequest fr = FuncRequest(LFUN_MATH_INSERT, cmd.argument());
+ doDispatch(cur, fr);
break;
+ }
case LFUN_MATH_MATRIX: {
cur.recordUndo();
}
case LFUN_SPACE_INSERT:
- case LFUN_MATH_SPACE:
cur.recordUndoSelection();
cur.insert(MathAtom(new InsetMathSpace(from_ascii(","))));
break;
+ case LFUN_MATH_SPACE:
+ cur.recordUndoSelection();
+ if (cmd.argument().empty())
+ cur.insert(MathAtom(new InsetMathSpace(from_ascii(","))));
+ else
+ cur.insert(MathAtom(new InsetMathSpace(cmd.argument())));
+ break;
+
case LFUN_ERT_INSERT:
// interpret this as if a backslash was typed
cur.recordUndo();
else {
MathData ar;
asArray(cmd.argument(), ar);
- if (ar.size() == 1 && ar[0]->asNestInset())
+ if (ar.size() == 1 && ar[0]->asNestInset()
+ && ar[0]->asNestInset()->nargs() > 1)
handleNest(cur, ar[0]);
else
cur.niceInsert(cmd.argument());
string const arg = to_utf8(cmd.argument());
switch (cmd.action) {
case LFUN_TABULAR_FEATURE:
- flag.enabled(false);
+ flag.setEnabled(false);
break;
#if 0
case LFUN_TABULAR_FEATURE:
case LFUN_FONT_NOUN:
case LFUN_FONT_ROMAN:
case LFUN_FONT_DEFAULT:
- flag.enabled(true);
+ flag.setEnabled(true);
break;
case LFUN_MATH_MUTATE:
//flag.setOnOff(mathcursor::formula()->hullType() == to_utf8(cmd.argument()));
case LFUN_MATH_SPACE:
case LFUN_MATH_LIMITS:
case LFUN_MATH_EXTERN:
- flag.enabled(true);
+ flag.setEnabled(true);
break;
case LFUN_FONT_FRAK:
- flag.enabled(currentMode() != TEXT_MODE);
+ flag.setEnabled(currentMode() != TEXT_MODE);
break;
case LFUN_MATH_INSERT: {
arg == "\\textsl" || arg == "\\textup" ||
arg == "\\texttt" || arg == "\\textbb" ||
arg == "\\textnormal";
- flag.enabled(currentMode() != TEXT_MODE || textarg);
+ flag.setEnabled(currentMode() != TEXT_MODE || textarg);
break;
}
case LFUN_MATH_MATRIX:
- flag.enabled(currentMode() == MATH_MODE);
+ flag.setEnabled(currentMode() == MATH_MODE);
break;
case LFUN_INSET_INSERT: {
// getStatus is not called with a valid reference and the
// dialog would not be applyable.
string const name = cmd.getArg(0);
- flag.enabled(name == "ref");
+ flag.setEnabled(name == "ref");
break;
}
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM:
// Don't do this with multi-cell selections
- flag.enabled(cur.selBegin().idx() == cur.selEnd().idx());
+ flag.setEnabled(cur.selBegin().idx() == cur.selEnd().idx());
break;
case LFUN_MATH_MACRO_FOLD:
case LFUN_MATH_MACRO_UNFOLD: {
Cursor it = cur;
bool found = findMacroToFoldUnfold(it, cmd.action == LFUN_MATH_MACRO_FOLD);
- flag.enabled(found);
+ flag.setEnabled(found);
break;
}
case LFUN_SPECIALCHAR_INSERT:
// FIXME: These would probably make sense in math-text mode
- flag.enabled(false);
+ flag.setEnabled(false);
break;
case LFUN_INSET_DISSOLVE:
- flag.enabled(!asHullInset());
+ flag.setEnabled(!asHullInset());
break;
default:
cur.backspace();
cur.niceInsert(MathAtom(new InsetMathComment));
} else if (c == '#') {
- BOOST_ASSERT(cur.activeMacro());
+ LASSERT(cur.activeMacro(), /**/);
cur.activeMacro()->setName(name + docstring(1, c));
} else {
cur.backspace();
cur.inset().idxFirst(cur);
return true;
}
- if (cur.posForward() || idxForward(cur) || cur.selection())
+ if (cur.posForward() || idxForward(cur))
return true;
// try to pop forwards --- but don't pop out of math! leave that to
// the FINISH lfuns
cur.inset().idxLast(cur);
return true;
}
- if (cur.posBackward() || idxBackward(cur) || cur.selection())
+ if (cur.posBackward() || idxBackward(cur))
return true;
// try to pop backwards --- but don't pop out of math! leave that to
// the FINISH lfuns
// fill in global macros
macros.clear();
MacroTable::globalMacros().getMacroNames(macros);
- lyxerr << "Globals completion macros: ";
+ //lyxerr << "Globals completion macros: ";
for (it = macros.begin(); it != macros.end(); ++it) {
- lyxerr << "\\" + *it << " ";
+ //lyxerr << "\\" + *it << " ";
globals.push_back("\\" + *it);
}
- lyxerr << std::endl;
+ //lyxerr << std::endl;
// fill in global commands
globals.push_back(from_ascii("\\boxed"));
globals.push_back(from_ascii("\\alignedat"));
globals.push_back(from_ascii("\\cases"));
globals.push_back(from_ascii("\\substack"));
+ globals.push_back(from_ascii("\\xymatrix"));
globals.push_back(from_ascii("\\subarray"));
globals.push_back(from_ascii("\\array"));
globals.push_back(from_ascii("\\sqrt"));
globals.push_back(from_ascii("\\stackrel"));
globals.push_back(from_ascii("\\binom"));
globals.push_back(from_ascii("\\choose"));
- globals.push_back(from_ascii("\\choose"));
+ globals.push_back(from_ascii("\\brace"));
+ globals.push_back(from_ascii("\\brack"));
globals.push_back(from_ascii("\\frac"));
globals.push_back(from_ascii("\\over"));
globals.push_back(from_ascii("\\nicefrac"));
globals.push_back(from_ascii("\\vphantom"));
MathWordList const & words = mathedWordList();
MathWordList::const_iterator it2;
- lyxerr << "Globals completion commands: ";
+ //lyxerr << "Globals completion commands: ";
for (it2 = words.begin(); it2 != words.end(); ++it2) {
globals.push_back("\\" + (*it2).first);
- lyxerr << "\\" + (*it2).first << " ";
+ //lyxerr << "\\" + (*it2).first << " ";
}
- lyxerr << std::endl;
+ //lyxerr << std::endl;
sort(globals.begin(), globals.end());
}
projects / lyx.git / blobdiff