X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_macro.C;h=9983cf5f78b523af9c7425a1a17867bf75460d45;hb=d359dd8fca52c4f0100f7cf4bf636113c5c4e49f;hp=7ac130d2659aa729c60718d481bdca4dbfd63b8a;hpb=49710a766f6d95525873bc6f220fa1e1bc6a6e7a;p=lyx.git diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C index 7ac130d265..9983cf5f78 100644 --- a/src/mathed/math_macro.C +++ b/src/mathed/math_macro.C @@ -1,7 +1,7 @@ /* * File: math_macro.C - * Purpose: Implementation of macro class for mathed - * Author: Alejandro Aguilar Sierra + * Purpose: Implementation of macro class for mathed + * Author: Alejandro Aguilar Sierra * Created: November 1996 * Description: WYSIWYG math macros * @@ -20,18 +20,20 @@ #include "math_macro.h" #include "math_support.h" -#include "math_cursor.h" #include "math_extern.h" #include "math_macrotable.h" #include "math_macrotemplate.h" #include "math_mathmlstream.h" +#include "math_streamstr.h" #include "support/lstrings.h" #include "support/LAssert.h" #include "debug.h" -#include "Painter.h" #include "LaTeXFeatures.h" +using std::max; + + MathMacro::MathMacro(string const & name) : MathNestInset(MathMacroTable::provide(name)->asMacroTemplate()->numargs()), tmplate_(MathMacroTable::provide(name)) @@ -51,9 +53,9 @@ MathInset * MathMacro::clone() const } -const char * MathMacro::name() const +string const & MathMacro::name() const { - return tmplate_->asMacroTemplate()->name().c_str(); + return tmplate_->asMacroTemplate()->name(); } @@ -64,47 +66,48 @@ bool MathMacro::defining() const } -bool MathMacro::editing() const +void MathMacro::expand() const { - return mathcursor && mathcursor->isInside(this); + expanded_ = tmplate_->xcell(tmplate_->cell(1).empty() ? 0 : 1); } -void MathMacro::metrics(MathMetricsInfo const & mi) const +void MathMacro::metrics(MathMetricsInfo & mi) const { + augmentFont(font_, "lyxtex"); mi_ = mi; if (defining()) { - mathed_string_dim(LM_TC_TEX, mi_, name(), ascent_, descent_, width_); + mathed_string_dim(font_, name(), ascent_, descent_, width_); return; } if (editing()) { - expanded_ = tmplate_->xcell(0); + expand(); expanded_.metrics(mi_); width_ = expanded_.width() + 4; ascent_ = expanded_.ascent() + 2; descent_ = expanded_.descent() + 2; - width_ += mathed_string_width(LM_TC_TEXTRM, mi_, name()) + 10; + width_ += mathed_string_width(font_, name()) + 10; int lasc; int ldes; int lwid; - mathed_string_dim(LM_TC_TEXTRM, mi_, "#1: ", lasc, ldes, lwid); + mathed_string_dim(font_, "#1: ", lasc, ldes, lwid); for (idx_type i = 0; i < nargs(); ++i) { MathXArray const & c = xcell(i); c.metrics(mi_); - width_ = std::max(width_, c.width() + lwid); - descent_ += std::max(c.ascent(), lasc) + 5; - descent_ += std::max(c.descent(), ldes) + 5; + width_ = max(width_, c.width() + lwid); + descent_ += max(c.ascent(), lasc) + 5; + descent_ += max(c.descent(), ldes) + 5; } return; - } + } - expanded_ = tmplate_->xcell(0); - expanded_.data_.substitute(*this); + expand(); + expanded_.data().substitute(*this); expanded_.metrics(mi_); width_ = expanded_.width(); ascent_ = expanded_.ascent(); @@ -112,41 +115,44 @@ void MathMacro::metrics(MathMetricsInfo const & mi) const } -void MathMacro::draw(Painter & pain, int x, int y) const +void MathMacro::draw(MathPainterInfo & pi, int x, int y) const { metrics(mi_); + LyXFont texfont; + augmentFont(texfont, "lyxtex"); + if (defining()) { - drawStr(pain, LM_TC_TEX, mi_, x, y, name()); + drawStr(pi, texfont, x, y, name()); return; } if (editing()) { int h = y - ascent() + 2 + expanded_.ascent(); - drawStr(pain, LM_TC_TEXTRM, mi_, x + 3, h, name()); + drawStr(pi, font_, x + 3, h, name()); - int const w = mathed_string_width(LM_TC_TEXTRM, mi_, name()); - expanded_.draw(pain, x + w + 12, h); + int const w = mathed_string_width(font_, name()); + expanded_.draw(pi, x + w + 12, h); h += expanded_.descent(); int lasc; int ldes; int lwid; - mathed_string_dim(LM_TC_TEXTRM, mi_, "#1: ", lasc, ldes, lwid); + mathed_string_dim(font_, "#1: ", lasc, ldes, lwid); for (idx_type i = 0; i < nargs(); ++i) { MathXArray const & c = xcell(i); - h += std::max(c.ascent(), lasc) + 5; - c.draw(pain, x + lwid, h); + h += max(c.ascent(), lasc) + 5; + c.draw(pi, x + lwid, h); char str[] = "#1:"; str[1] += static_cast(i); - drawStr(pain, LM_TC_TEX, mi_, x + 3, h, str); - h += std::max(c.descent(), ldes) + 5; + drawStr(pi, texfont, x + 3, h, str); + h += max(c.descent(), ldes) + 5; } return; } - expanded_.draw(pain, x, y); + expanded_.draw(pi, x, y); } @@ -162,15 +168,11 @@ void MathMacro::dump() const } -bool MathMacro::idxUp(idx_type & idx, pos_type & pos) const +bool MathMacro::idxUpDown(idx_type & idx, bool up) const { - return MathNestInset::idxLeft(idx, pos); -} - - -bool MathMacro::idxDown(idx_type & idx, pos_type & pos) const -{ - return MathNestInset::idxRight(idx, pos); + pos_type pos; + return + up ? MathNestInset::idxLeft(idx, pos) : MathNestInset::idxRight(idx, pos); } @@ -188,8 +190,8 @@ bool MathMacro::idxRight(idx_type &, pos_type &) const void MathMacro::validate(LaTeXFeatures & features) const { - if (name() == "binom") - features.require("binom"); + if (name() == "binom" || name() == "mathcircumflex") + features.require(name()); //MathInset::validate(features); } @@ -197,28 +199,28 @@ void MathMacro::validate(LaTeXFeatures & features) const void MathMacro::maplize(MapleStream & os) const { updateExpansion(); - ::maplize(expanded_.data_, os); + ::maplize(expanded_.data(), os); } void MathMacro::mathmlize(MathMLStream & os) const { updateExpansion(); - ::mathmlize(expanded_.data_, os); + ::mathmlize(expanded_.data(), os); } void MathMacro::octavize(OctaveStream & os) const { updateExpansion(); - ::octavize(expanded_.data_, os); + ::octavize(expanded_.data(), os); } void MathMacro::normalize(NormalStream & os) const { os << "[macro " << name() << " "; - for (idx_type i = 0; i < nargs(); ++i) + for (idx_type i = 0; i < nargs(); ++i) os << cell(i) << ' '; os << ']'; } @@ -229,13 +231,13 @@ void MathMacro::write(WriteStream & os) const os << '\\' << name(); for (idx_type i = 0; i < nargs(); ++i) os << '{' << cell(i) << '}'; - if (nargs() == 0) + if (nargs() == 0) os << ' '; } void MathMacro::updateExpansion() const { - expanded_ = tmplate_->xcell(0); - expanded_.data_.substitute(*this); + expand(); + expanded_.data().substitute(*this); }