X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettext.C;h=9b2233c5ddd22bf0687262998cb62bdd4505d5fd;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=8bcc58ef48b17368fbcd2a2fdd399ab675625678;hpb=4cb9cd44ec196ff9fc03ab858ab50750892eb3f3;p=lyx.git diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 8bcc58ef48..9b2233c5dd 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -16,6 +16,7 @@ #include "buffer.h" #include "bufferparams.h" #include "BufferView.h" +#include "coordcache.h" #include "CutAndPaste.h" #include "cursor.h" #include "debug.h" @@ -32,7 +33,6 @@ #include "metricsinfo.h" #include "output_docbook.h" #include "output_latex.h" -#include "output_linuxdoc.h" #include "output_plaintext.h" #include "paragraph.h" #include "paragraph_funcs.h" @@ -44,19 +44,21 @@ #include "undo.h" #include "frontends/Alert.h" -#include "frontends/font_metrics.h" #include "frontends/Painter.h" -#include "support/lyxalgo.h" // lyx::count +#include "support/lyxalgo.h" // count #include #include -using lyx::pos_type; +#include -using lyx::graphics::PreviewLoader; -using lyx::support::isStrUnsignedInt; +namespace lyx { + +using graphics::PreviewLoader; + +using support::isStrUnsignedInt; using boost::bind; using boost::ref; @@ -74,12 +76,10 @@ int InsetText::border_ = 2; InsetText::InsetText(BufferParams const & bp) - : drawFrame_(false), frame_color_(LColor::insetframe), text_(0) + : drawFrame_(false), frame_color_(LColor::insetframe) { paragraphs().push_back(Paragraph()); paragraphs().back().layout(bp.getLyXTextClass().defaultLayout()); - if (bp.tracking_changes) - paragraphs().back().trackChanges(); // Dispose of the infamous L-shaped cursor. text_.current_font.setLanguage(bp.language); text_.real_current_font.setLanguage(bp.language); @@ -88,7 +88,7 @@ InsetText::InsetText(BufferParams const & bp) InsetText::InsetText(InsetText const & in) - : InsetOld(in), text_(in.text_.bv_owner) + : InsetOld(in), text_() { text_.autoBreakRows_ = in.text_.autoBreakRows_; drawFrame_ = in.drawFrame_; @@ -103,7 +103,6 @@ InsetText::InsetText(InsetText const & in) InsetText::InsetText() - : text_(0) {} @@ -114,14 +113,6 @@ void InsetText::init() } -void InsetText::markErased(bool erased) -{ - ParagraphList & pars = paragraphs(); - for_each(pars.begin(), pars.end(), - bind(&Paragraph::markErased, _1, erased)); -} - - void InsetText::clear() { ParagraphList & pars = paragraphs(); @@ -153,16 +144,11 @@ void InsetText::read(Buffer const & buf, LyXLex & lex) { clear(); -#ifdef WITH_WARNINGS -#warning John, look here. Doesnt make much sense. -#endif - if (buf.params().tracking_changes) - paragraphs().begin()->trackChanges(); - // delete the initial paragraph Paragraph oldpar = *paragraphs().begin(); paragraphs().clear(); - bool res = text_.read(buf, lex); + ErrorList errorList; + bool res = text_.read(buf, lex, errorList); init(); if (!res) { @@ -177,37 +163,41 @@ void InsetText::read(Buffer const & buf, LyXLex & lex) } -void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const +bool InsetText::metrics(MetricsInfo & mi, Dimension & dim) const { + TextMetrics & tm = mi.base.bv->textMetrics(&text_); + //lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl; - setViewCache(mi.base.bv); mi.base.textwidth -= 2 * border_; font_ = mi.base.font; // Hand font through to contained lyxtext: text_.font_ = mi.base.font; - text_.metrics(mi, dim); + tm.metrics(mi, dim); dim.asc += border_; dim.des += border_; dim.wid += 2 * border_; mi.base.textwidth += 2 * border_; + bool const changed = dim_ != dim; dim_ = dim; + return changed; } void InsetText::draw(PainterInfo & pi, int x, int y) const { - BOOST_ASSERT(!text_.paragraphs().front().rows().empty()); // update our idea of where we are setPosCache(pi, x, y); + TextMetrics & tm = pi.base.bv->textMetrics(&text_); + text_.background_color_ = backgroundColor(); text_.draw(pi, x + border_, y); if (drawFrame_) { - int const w = text_.width() + 2 * border_; - int const a = text_.ascent() + border_; - int const h = a + text_.descent() + border_; - pi.pain.rectangle(x, y - a, (Wide() ? text_.maxwidth_ : w), h, + int const w = tm.width() + 2 * border_; + int const a = tm.ascent() + border_; + int const h = a + tm.descent() + border_; + pi.pain.rectangle(x, y - a, (wide() ? tm.maxWidth() : w), h, frameColor()); } } @@ -215,16 +205,30 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const void InsetText::drawSelection(PainterInfo & pi, int x, int y) const { - int const w = text_.width() + 2 * border_; - int const a = text_.ascent() + border_; - int const h = a + text_.descent() + border_; - pi.pain.fillRectangle(x, y - a, (Wide() ? text_.maxwidth_ : w), h, + TextMetrics & tm = pi.base.bv->textMetrics(&text_); + + int const w = tm.width() + 2 * border_; + int const a = tm.ascent() + border_; + int const h = a + tm.descent() + border_; + pi.pain.fillRectangle(x, y - a, (wide() ? tm.maxWidth() : w), h, backgroundColor()); text_.drawSelection(pi, x, y); } -string const InsetText::editMessage() const +bool InsetText::covers(BufferView const & bv, int x, int y) const +{ + TextMetrics const & tm = bv.textMetrics(&text_); + + return bv.coordCache().getInsets().has(this) + && x >= xo(bv) + && x <= xo(bv) + width() + (wide() ? tm.maxWidth() : 0) + && y >= yo(bv) - ascent() + && y <= yo(bv) + descent(); +} + + +docstring const InsetText::editMessage() const { return _("Opened Text Inset"); } @@ -233,7 +237,6 @@ string const InsetText::editMessage() const void InsetText::edit(LCursor & cur, bool left) { //lyxerr << "InsetText: edit left/right" << endl; - setViewCache(&cur.bv()); int const pit = left ? 0 : paragraphs().size() - 1; int const pos = left ? 0 : paragraphs().back().size(); text_.setCursor(cur.top(), pit, pos); @@ -248,23 +251,11 @@ InsetBase * InsetText::editXY(LCursor & cur, int x, int y) } -void InsetText::forceParagraphsToDefault(LCursor & cur) -{ - BufferParams const & bp = cur.buffer().params(); - LyXLayout_ptr const layout = - bp.getLyXTextClass().defaultLayout(); - ParagraphList::iterator const end = paragraphs().end(); - for (ParagraphList::iterator par = paragraphs().begin(); - par != end; ++par) - par->layout(layout); -} - - void InsetText::doDispatch(LCursor & cur, FuncRequest & cmd) { - lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION - << " [ cmd.action = " << cmd.action << ']' << endl; - setViewCache(&cur.bv()); + lyxerr[Debug::ACTION] << BOOST_CURRENT_FUNCTION + << " [ cmd.action = " + << cmd.action << ']' << endl; text_.dispatch(cur, cmd); } @@ -276,7 +267,41 @@ bool InsetText::getStatus(LCursor & cur, FuncRequest const & cmd, } -int InsetText::latex(Buffer const & buf, ostream & os, +void InsetText::setChange(Change const & change) +{ + ParagraphList::iterator pit = paragraphs().begin(); + ParagraphList::iterator end = paragraphs().end(); + for (; pit != end; ++pit) { + pit->setChange(change); + } +} + + +void InsetText::acceptChanges() +{ + ParagraphList::iterator pit = paragraphs().begin(); + ParagraphList::iterator end = paragraphs().end(); + for (; pit != end; ++pit) { + // FIXME: change tracking (MG) + // we must handle end-of-par chars! + pit->acceptChanges(0, pit->size() + 1); + } +} + + +void InsetText::rejectChanges() +{ + ParagraphList::iterator pit = paragraphs().begin(); + ParagraphList::iterator end = paragraphs().end(); + for (; pit != end; ++pit) { + // FIXME: change tracking (MG) + // we must handle end-of-par chars! + pit->rejectChanges(0, pit->size() + 1); + } +} + + +int InsetText::latex(Buffer const & buf, odocstream & os, OutputParams const & runparams) const { TexRow texrow; @@ -285,30 +310,25 @@ int InsetText::latex(Buffer const & buf, ostream & os, } -int InsetText::plaintext(Buffer const & buf, ostream & os, +int InsetText::plaintext(Buffer const & buf, odocstream & os, OutputParams const & runparams) const { ParagraphList::const_iterator beg = paragraphs().begin(); ParagraphList::const_iterator end = paragraphs().end(); ParagraphList::const_iterator it = beg; bool ref_printed = false; + odocstringstream oss; for (; it != end; ++it) - asciiParagraph(buf, *it, os, runparams, ref_printed); - - // FIXME: Give the total numbers of lines - return 1; -} - + writePlaintextParagraph(buf, *it, oss, runparams, ref_printed); -int InsetText::linuxdoc(Buffer const & buf, ostream & os, - OutputParams const & runparams) const -{ - linuxdocParagraphs(buf, paragraphs(), os, runparams); - return 0; + docstring const str = oss.str(); + os << str; + // Return how many newlines we issued. + return int(lyx::count(str.begin(), str.end(), '\n')); } -int InsetText::docbook(Buffer const & buf, ostream & os, +int InsetText::docbook(Buffer const & buf, odocstream & os, OutputParams const & runparams) const { docbookParagraphs(paragraphs(), buf, os, runparams); @@ -323,11 +343,11 @@ void InsetText::validate(LaTeXFeatures & features) const } -void InsetText::cursorPos - (CursorSlice const & sl, bool boundary, int & x, int & y) const +void InsetText::cursorPos(BufferView const & bv, + CursorSlice const & sl, bool boundary, int & x, int & y) const { - x = text_.cursorX(sl, boundary) + border_; - y = text_.cursorY(sl, boundary); + x = text_.cursorX(bv, sl, boundary) + border_; + y = text_.cursorY(bv, sl, boundary); } @@ -337,25 +357,12 @@ bool InsetText::showInsetDialog(BufferView *) const } -void InsetText::markNew(bool track_changes) -{ - ParagraphList::iterator pit = paragraphs().begin(); - ParagraphList::iterator end = paragraphs().end(); - for (; pit != end; ++pit) { - if (track_changes) - pit->trackChanges(); - else // no-op when not tracking - pit->cleanChanges(); - } -} - - -void InsetText::setText(string const & data, LyXFont const & font) +void InsetText::setText(docstring const & data, LyXFont const & font, bool trackChanges) { clear(); Paragraph & first = paragraphs().front(); for (unsigned int i = 0; i < data.length(); ++i) - first.insertChar(i, data[i], font); + first.insertChar(i, data[i], font, trackChanges); } @@ -374,7 +381,9 @@ void InsetText::setAutoBreakRows(bool flag) for (; it != end; ++it) for (int i = 0; i < it->size(); ++i) if (it->isNewline(i)) - it->erase(i); + // do not track the change, because the user + // is not allowed to revert/reject it + it->eraseChar(i, false); } @@ -396,23 +405,13 @@ void InsetText::setFrameColor(LColor_color col) } -void InsetText::setViewCache(BufferView const * bv) const -{ - if (bv && bv != text_.bv_owner) { - //lyxerr << "setting view cache from " - // << text_.bv_owner << " to " << bv << "\n"; - text_.bv_owner = const_cast(bv); - } -} - - void InsetText::appendParagraphs(Buffer * buffer, ParagraphList & plist) { -#ifdef WITH_WARNINGS -#warning FIXME Check if Changes stuff needs changing here. (Lgb) -// And it probably does. You have to take a look at this John. (Lgb) -#warning John, have a look here. (Lgb) -#endif + // There is little we can do here to keep track of changes. + // As of 2006/10/20, appendParagraphs is used exclusively by + // LyXTabular::setMultiColumn. In this context, the paragraph break + // is lost irreversibly and the appended text doesn't really change + ParagraphList & pl = paragraphs(); ParagraphList::iterator pit = plist.begin(); @@ -422,7 +421,7 @@ void InsetText::appendParagraphs(Buffer * buffer, ParagraphList & plist) std::distance(pl.begin(), ins) - 1); for_each(pit, plist.end(), - bind(&ParagraphList::push_back, ref(pl), _1)); + bind(&ParagraphList::push_back, ref(pl), _1)); } @@ -442,10 +441,10 @@ void InsetText::addPreview(PreviewLoader & loader) const //FIXME: instead of this hack, which only works by chance, // cells should have their own insetcell type, which returns CELL_CODE! -bool InsetText::neverIndent() const +bool InsetText::neverIndent(Buffer const & buffer) const { // this is only true for tabular cells - return !text_.isMainText() && lyxCode() == TEXT_CODE; + return !text_.isMainText(buffer) && lyxCode() == TEXT_CODE; } @@ -459,3 +458,6 @@ ParagraphList & InsetText::paragraphs() { return text_.paragraphs(); } + + +} // namespace lyx