anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-10 18:58:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Factor out the code that handles default macro arguments

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2016-11-28 13:13:36 +01:00
parent 0f15dcc698
commit 190d312e35
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mathed/MathMacro.cpp
View File

@ -68,6 +68,14 @@ public:
MathMacro const * owner() { return mathMacro_; } MathMacro const * owner() { return mathMacro_; }
/// ///
InsetCode lyxCode() const { return ARGUMENT_PROXY_CODE; } InsetCode lyxCode() const { return ARGUMENT_PROXY_CODE; }
/// The math data to use for display
MathData const & displayCell(BufferView const * bv) const
{
// handle default macro arguments
bool use_def_arg = !mathMacro_->editMetrics(bv)
&& mathMacro_->cell(idx_).empty();
return use_def_arg ? def_ : mathMacro_->cell(idx_);
}
/// ///
bool addToMathRow(MathRow & mrow, MetricsInfo & mi) const bool addToMathRow(MathRow & mrow, MetricsInfo & mi) const
{ {
@ -82,13 +90,7 @@ public:
mrow.push_back(e_beg); mrow.push_back(e_beg);
mathMacro_->macro()->unlock(); mathMacro_->macro()->unlock();
bool has_contents; bool has_contents = displayCell(mi.base.bv).addToMathRow(mrow, mi);
// handle default macro arguments
if (!mathMacro_->editMetrics(mi.base.bv)
&& mathMacro_->cell(idx_).empty())
has_contents = def_.addToMathRow(mrow, mi);
else
has_contents = mathMacro_->cell(idx_).addToMathRow(mrow, mi);
mathMacro_->macro()->lock(); mathMacro_->macro()->lock();
// if there was no contents, and the contents is editable, // if there was no contents, and the contents is editable,
@ -137,11 +139,7 @@ public:
/// ///
int kerning(BufferView const * bv) const int kerning(BufferView const * bv) const
{ {
if (mathMacro_->editMetrics(bv) return displayCell(bv).kerning(bv);
|| !mathMacro_->cell(idx_).empty())
return mathMacro_->cell(idx_).kerning(bv);
else
return def_.kerning(bv);
} }
private: private: