X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathHull.cpp;h=92574c8d2a0eac7e3b79c91236f7b94f54fd330f;hb=67215833a174bfb1db8a259f61ed57ae67e10655;hp=01501929c642f5b3d5078a715292cfd3f5ecc46a;hpb=e30f3d76d2bee0011ceaeb5f0cc221156458cbad;p=lyx.git diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp index 01501929c6..92574c8d2a 100644 --- a/src/mathed/InsetMathHull.cpp +++ b/src/mathed/InsetMathHull.cpp @@ -126,14 +126,14 @@ namespace { if (os.strikeoutMath()) { if (os.ulemCmd() == WriteStream::UNDERLINE) os << "\\raisebox{-\\belowdisplayshortskip}{" - "\\lyxmathsout{\\parbox[b]{\\columnwidth}{"; + "\\lyxmathsout{\\parbox[b]{\\linewidth}{"; else - os << "\\lyxmathsout{\\parbox{\\columnwidth}{"; + os << "\\lyxmathsout{\\parbox{\\linewidth}{"; } else if (os.ulemCmd() == WriteStream::UNDERLINE) os << "\\raisebox{-\\belowdisplayshortskip}{" - "\\parbox[b]{\\columnwidth}{"; + "\\parbox[b]{\\linewidth}{"; else if (os.ulemCmd() == WriteStream::STRIKEOUT) - os << "\\parbox{\\columnwidth}{"; + os << "\\parbox{\\linewidth}{"; } @@ -198,7 +198,7 @@ docstring hullName(HullType type) static InsetLabel * dummy_pointer = 0; InsetMathHull::InsetMathHull(Buffer * buf) - : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NUMBER), + : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NONUMBER), numbers_(1, empty_docstring()), label_(1, dummy_pointer), preview_(new RenderPreview(this)) { @@ -316,8 +316,12 @@ void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype) counter_map[eqstr] = cnts.value(eqstr); for (size_t i = 0; i != label_.size(); ++i) { if (numbered(i)) { - cnts.step(eqstr, utype); - numbers_[i] = cnts.theCounter(eqstr, lang); + Paragraph const & par = it.paragraph(); + if (!par.isDeleted(it.pos())) { + cnts.step(eqstr, utype); + numbers_[i] = cnts.theCounter(eqstr, lang); + } else + numbers_[i] = from_ascii("#"); } else numbers_[i] = empty_docstring(); } @@ -419,22 +423,6 @@ InsetMath::mode_type InsetMathHull::currentMode() const } -bool InsetMathHull::idxFirst(Cursor & cur) const -{ - cur.idx() = 0; - cur.pos() = 0; - return true; -} - - -bool InsetMathHull::idxLast(Cursor & cur) const -{ - cur.idx() = nargs() - 1; - cur.pos() = cur.lastpos(); - return true; -} - - // FIXME: InsetMathGrid should be changed to let the real column alignment be // given by a virtual method like displayColAlign, because the values produced // by defaultColAlign can be invalidated by lfuns such as add-column. For the @@ -442,7 +430,7 @@ bool InsetMathHull::idxLast(Cursor & cur) const // alignment is not implemented in the LyXHTML output. char InsetMathHull::defaultColAlign(col_type col) { - return colAlign(type_, col); + return colAlign(type_, col, buffer().params()); } @@ -464,7 +452,7 @@ char InsetMathHull::displayColAlign(idx_type idx) const case hullXAlignAt: case hullXXAlignAt: case hullFlAlign: - return colAlign(type_, col(idx)); + return colAlign(type_, col(idx), buffer().params()); default: break; } @@ -525,36 +513,51 @@ bool InsetMathHull::previewState(const BufferView *const bv) const namespace { -static const int ERROR_FRAME_WIDTH = 2; +const int ERROR_FRAME_WIDTH = 2; + +bool previewTooSmall(MetricsBase const & mb, Dimension const & dim) +{ + // Value was hardcoded to 10 pixels + int const minval = mb.bv->zoomedPixels(10); + return dim.width() <= minval && dim.height() <= minval; +} } + void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const { + // true value in LaTeX is 12pt plus 3pt minus 9pt + // FIXME: even better would be to handle the short skip case. + int const display_margin = display() ? mi.base.inPixels(Length(12, Length::PT)) : 0; + if (previewState(mi.base.bv)) { preview_->metrics(mi, dim); - if (previewTooSmall(dim)) { + if (previewTooSmall(mi.base, dim)) { // preview image is too small dim.wid += 2 * ERROR_FRAME_WIDTH; dim.asc += 2 * ERROR_FRAME_WIDTH; } else { - // insert a one pixel gap in front of the formula - dim.wid += 1; - if (display()) - dim.des += displayMargin(); + // insert a gap in front of the formula + // value was hardcoded to 1 pixel + dim.wid += mi.base.bv->zoomedPixels(1) ; + if (display()) { + dim.asc += display_margin; + dim.des += display_margin; + } } return; } Changer dummy1 = mi.base.changeFontSet(standardFont()); - Changer dummy2 = mi.base.font.changeStyle(display() ? LM_ST_DISPLAY - : LM_ST_TEXT); + Changer dummy2 = mi.base.font.changeStyle(display() ? FONT_STYLE_DISPLAY + : FONT_STYLE_TEXT); // let the cells adjust themselves InsetMathGrid::metrics(mi, dim); if (display()) { - dim.asc += displayMargin(); - dim.des += displayMargin(); + dim.asc += display_margin; + dim.des += display_margin; } if (numberedType()) { @@ -565,24 +568,11 @@ void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const if (l) // Value was hardcoded to 30 pixels - dim.wid += Length(0.3, Length::IN).inPixels(mi.base) + l; + dim.wid += mi.base.bv->zoomedPixels(30) + l; } // reserve some space for marker. dim.wid += 2; - - // make it at least as high as the current font - int asc = 0; - int des = 0; - math_font_max_dim(mi.base.font, asc, des); - dim.asc = max(dim.asc, asc); - dim.des = max(dim.des, des); -} - - -bool InsetMathHull::previewTooSmall(Dimension const & dim) const -{ - return dim.width() <= 10 && dim.height() <= 10; } @@ -591,7 +581,7 @@ ColorCode InsetMathHull::backgroundColor(PainterInfo const & pi) const BufferView const * const bv = pi.base.bv; if (previewState(bv)) { Dimension const dim = dimension(*pi.base.bv); - if (previewTooSmall(dim)) + if (previewTooSmall(pi.base, dim)) return Color_error; return graphics::PreviewLoader::backgroundColor(); } @@ -599,10 +589,29 @@ ColorCode InsetMathHull::backgroundColor(PainterInfo const & pi) const } +void InsetMathHull::drawMarkers(PainterInfo & pi, int x, int y) const +{ + ColorCode pen_color = mouseHovered(pi.base.bv) || editing(pi.base.bv)? + Color_mathframe : Color_mathcorners; + // If the corners have the same color as the background, do not paint them. + if (lcolor.getX11Name(Color_mathbg) == lcolor.getX11Name(pen_color)) + return; + + Inset::drawMarkers(pi, x, y); + Dimension const dim = dimension(*pi.base.bv); + int const t = x + dim.width() - 1; + int const a = y - dim.ascent(); + pi.pain.line(x, a + 3, x, a, pen_color); + pi.pain.line(t, a + 3, t, a, pen_color); + pi.pain.line(x, a, x + 3, a, pen_color); + pi.pain.line(t - 3, a, t, a, pen_color); +} + + void InsetMathHull::drawBackground(PainterInfo & pi, int x, int y) const { Dimension const dim = dimension(*pi.base.bv); - if (previewTooSmall(dim)) { + if (previewTooSmall(pi.base, dim)) { pi.pain.fillRectangle(x, y - 2 * ERROR_FRAME_WIDTH, dim.wid, dim.asc + dim.des, backgroundColor(pi)); return; @@ -626,12 +635,14 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const // already. Changer dummy = !canPaintChange(*bv) ? make_change(pi.change_, Change()) : Changer(); - if (previewTooSmall(dim)) { + if (previewTooSmall(pi.base, dim)) { // we have an extra frame preview_->draw(pi, x + ERROR_FRAME_WIDTH, y); } else { // one pixel gap in front - preview_->draw(pi, x + 1, y); + // value was hardcoded to 1 pixel + int const gap = pi.base.bv->zoomedPixels(1) ; + preview_->draw(pi, x + gap, y); } return; } @@ -642,8 +653,8 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const Changer dummy0 = really_change_color ? pi.base.font.changeColor(color) : Changer(); Changer dummy1 = pi.base.changeFontSet(standardFont()); - Changer dummy2 = pi.base.font.changeStyle(display() ? LM_ST_DISPLAY - : LM_ST_TEXT); + Changer dummy2 = pi.base.font.changeStyle(display() ? FONT_STYLE_DISPLAY + : FONT_STYLE_TEXT); int xmath = x; BufferParams::MathNumber const math_number = buffer().params().getMathNumber(); @@ -655,11 +666,11 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const if (l) // Value was hardcoded to 30 pixels - xmath += Length(0.3, Length::IN).inPixels(pi.base) + l; + xmath += pi.base.bv->zoomedPixels(30) + l; } InsetMathGrid::draw(pi, xmath + 1, y); - drawMarkers2(pi, x, y); + drawMarkers(pi, x, y); if (numberedType()) { Changer dummy = pi.base.changeFontSet("mathrm"); @@ -823,11 +834,9 @@ void InsetMathHull::preparePreview(DocIterator const & pos, for (idx_type idx = 0; idx < nargs(); ++idx) usedMacros(cell(idx), pos, macros, defs); - MacroNameSet::iterator it = defs.begin(); - MacroNameSet::iterator end = defs.end(); docstring macro_preamble; - for (; it != end; ++it) - macro_preamble.append(*it); + for (auto const & defvar : defs) + macro_preamble.append(defvar); // set the font series and size for this snippet DocIterator dit = pos.getInnerText(); @@ -1026,7 +1035,7 @@ int InsetMathHull::indent(BufferView const & bv) const { // FIXME: set this in the textclass. This value is what the article class uses. static Length default_indent(2.5, Length::EM); - if (buffer().params().is_math_indent) { + if (display() != Inline && buffer().params().is_math_indent) { Length const & len = buffer().params().getMathIndent(); if (len.empty()) return bv.inPixels(default_indent); @@ -1650,7 +1659,8 @@ void InsetMathHull::mutate(HullType newtype) default: // we passed the guard so we should not be here - LASSERT("Mutation not implemented, but should have been.", return); + LYXERR0("Mutation not implemented, but should have been."); + LASSERT(false, return); break; }// switch } @@ -1712,13 +1722,11 @@ void InsetMathHull::check() const void InsetMathHull::doExtern(Cursor & cur, FuncRequest & func) { - docstring dlang; - docstring extra; - idocstringstream iss(func.argument()); - iss >> dlang >> extra; + //FIXME: sort out whether we want std::string or docstring for those + string const lang = func.getArg(0); + docstring extra = from_utf8(func.getArg(1)); if (extra.empty()) extra = from_ascii("noextra"); - string const lang = to_ascii(dlang); // replace selection with result of computation if (reduceSelectionToOneCell(cur)) { @@ -2084,11 +2092,10 @@ bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_LABEL_COPY_AS_REFERENCE: { bool enabled = false; - row_type row; if (cmd.argument().empty() && &cur.inset() == this) { // if there is no argument and we're inside math, we retrieve // the row number from the cursor position. - row = (type_ == hullMultline) ? nrows() - 1 : cur.row(); + row_type row = (type_ == hullMultline) ? nrows() - 1 : cur.row(); enabled = numberedType() && label_[row] && numbered(row); } else { // if there is an argument, find the corresponding label, else @@ -2225,17 +2232,14 @@ void InsetMathHull::handleFont2(Cursor & cur, docstring const & arg) font.fromString(to_utf8(arg), b); if (font.fontInfo().color() != Color_inherit) { MathAtom at = MathAtom(new InsetMathColor(buffer_, true, font.fontInfo().color())); - cur.handleNest(at, 0); + cur.handleNest(at); } } void InsetMathHull::edit(Cursor & cur, bool front, EntryDirection entry_from) { - cur.push(*this); - bool enter_front = (entry_from == Inset::ENTRY_DIRECTION_LEFT || - (entry_from == Inset::ENTRY_DIRECTION_IGNORE && front)); - enter_front ? idxFirst(cur) : idxLast(cur); + InsetMathNest::edit(cur, front, entry_from); // The inset formula dimension is not necessarily the same as the // one of the instant preview image, so we have to indicate to the // BufferView that a metrics update is needed. @@ -2243,42 +2247,6 @@ void InsetMathHull::edit(Cursor & cur, bool front, EntryDirection entry_from) } -void InsetMathHull::revealCodes(Cursor & cur) const -{ - if (!cur.inMathed()) - return; - odocstringstream os; - cur.info(os); - cur.message(os.str()); -/* - // write something to the minibuffer - // translate to latex - cur.markInsert(bv); - ostringstream os; - write(os); - string str = os.str(); - cur.markErase(bv); - string::size_type pos = 0; - string res; - for (string::iterator it = str.begin(); it != str.end(); ++it) { - if (*it == '\n') - res += ' '; - else if (*it == '\0') { - res += " -X- "; - pos = it - str.begin(); - } - else - res += *it; - } - if (pos > 30) - res = res.substr(pos - 30); - if (res.size() > 60) - res = res.substr(0, 60); - cur.message(res); -*/ -} - - ///////////////////////////////////////////////////////////////////// @@ -2355,8 +2323,8 @@ bool InsetMathHull::readQuiet(Lexer & lex) int InsetMathHull::plaintext(odocstringstream & os, OutputParams const & op, size_t max_length) const { - // disables ASCII-art for export of equations. See #2275. - if (0 && display()) { + // Try enabling this now that there is a flag as requested at #2275. + if (buffer().isExporting() && display()) { Dimension dim; TextMetricsInfo mi; metricsT(mi, dim);