using std::vector;
using std::pair;
using std::for_each;
+using std::auto_ptr;
using namespace lyx::support;
using namespace lyx::graphics;
}
-InsetBase * InsetText::clone() const
+auto_ptr<InsetBase> InsetText::clone() const
{
- return new InsetText(*this);
+ return auto_ptr<InsetBase>(new InsetText(*this));
}
break;
}
- if (token == "\\the_end") {
- lex.printError("\\the_end read in inset! Error in document!");
+ if (token == "\\end_document") {
+ lex.printError("\\end_document read in inset! Error in document!");
return;
}
void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
{
- //lyxerr << "InsetText::metrics: " << getInsetName()
- // << " width: " << mi.base.textwidth << "\n";
- if (mi.base.textwidth)
- textwidth_ = mi.base.textwidth;
+ //lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << "\n";
+
+ textwidth_ = mi.base.textwidth;
BufferView * bv = mi.base.bv;
setViewCache(bv);
- text_.rebuild(mi.base.textwidth);
- dim.asc = text_.rows().begin()->ascent_of_text() + TEXT_TO_INSET_OFFSET;
- dim.des = text_.height - dim.asc + TEXT_TO_INSET_OFFSET;
- dim.wid = max(textwidth_, int(text_.width)) + 2 * TEXT_TO_INSET_OFFSET;
+ text_.metrics(mi, dim);
+ dim.asc += TEXT_TO_INSET_OFFSET;
+ dim.des += TEXT_TO_INSET_OFFSET;
+ dim.wid += 2 * TEXT_TO_INSET_OFFSET;
dim.wid = max(dim.wid, 10);
dim_ = dim;
}
return;
}
+ bv->hideCursor();
+
if (!owner())
x += scroll();
}
if (the_locking_inset && cpar() == inset_par && cpos() == inset_pos) {
- inset_x = cix(bv) - x + drawTextXOffset;
+ inset_x = cix() - x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
}
x += TEXT_TO_INSET_OFFSET;
- RowList::iterator rowit = text_.rows().begin();
+ RowList::iterator rit = text_.rows().begin();
RowList::iterator end = text_.rows().end();
- int y_offset = baseline - rowit->ascent_of_text();
- int ph = pain.paperHeight();
+ int y_offset = baseline - rit->ascent_of_text();
+ int y2 = pain.paperHeight();
int first = 0;
int y = y_offset;
- while (rowit != end && y + rowit->height() <= 0) {
- y += rowit->height();
- first += rowit->height();
- ++rowit;
+ while (rit != end && y + rit->height() <= 0) {
+ y += rit->height();
+ first += rit->height();
+ ++rit;
}
if (y_offset < 0) {
text_.top_y(-y_offset);
first = 0;
}
- int yf = y_offset + first;
- y = 0;
+ int yo = y_offset + first;
- bv->hideCursor();
-
- while (rowit != end && yf < ph) {
- paintRows(*bv, text_, rowit,
- y + y_offset + first, int(x), y + text_.top_y());
- y += rowit->height();
- yf += rowit->height();
- ++rowit;
- }
+ paintRows(*bv, text_, rit, x, 0, yo, y2, yo);
text_.clearPaint();
- if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked)) {
+ if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked))
drawFrame(pain, int(start_x));
- }
- if (need_update != INIT) {
+ if (need_update != INIT)
need_update = NONE;
- }
}
}
-void InsetText::lockInset(BufferView * bv, UpdatableInset * inset)
+void InsetText::lockInset(BufferView * /*bv*/, UpdatableInset * inset)
{
the_locking_inset = inset;
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
inset_pos = cpos();
inset_par = cpar();
if (the_locking_inset && the_locking_inset == inset) {
if (cpar() == inset_par && cpos() == inset_pos) {
lyxerr[Debug::INSETS] << "OK" << endl;
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
} else {
lyxerr[Debug::INSETS] << "cursor.pos != inset_pos" << endl;
}
-bool InsetText::updateInsetInInset(BufferView * bv, Inset * inset)
+bool InsetText::updateInsetInInset(BufferView * bv, InsetOld * inset)
{
if (!autoBreakRows && paragraphs.size() > 1)
collapseParagraphs(bv);
return false;
found = tl_inset->updateInsetInInset(bv, inset);
ustat = FULL;
- }
- if (found)
+ } else {
text_.updateInset(tl_inset);
- if (found)
setUpdateStatus(ustat);
+ }
return found;
}
bool found = text_.updateInset(inset);
if (the_locking_inset &&
cpar() == inset_par && cpos() == inset_pos)
{
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
}
}
int tmp_x = cmd.x - drawTextXOffset;
int tmp_y = cmd.y + dim_.asc - getLyXText(bv)->top_y();
- Inset * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
+ InsetOld * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
if (the_locking_inset) {
if (the_locking_inset == inset) {
int tmp_x = cmd.x - drawTextXOffset;
int tmp_y = cmd.y + dim_.asc - getLyXText(bv)->top_y();
- Inset * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
+ InsetOld * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
bool ret = false;
if (inset) {
// This code should probably be removed now. Simple insets
if (cur == text_.cursor)
return;
text_.setSelection();
- bool flag = (text_.toggle_cursor.par() != text_.toggle_end_cursor.par() ||
- text_.toggle_cursor.pos() != text_.toggle_end_cursor.pos());
- if (flag) {
- updateLocal(bv, SELECTION, false);
- }
+ updateLocal(bv, SELECTION, false);
}
-Inset::RESULT InsetText::localDispatch(FuncRequest const & cmd)
+InsetOld::RESULT InsetText::localDispatch(FuncRequest const & cmd)
{
BufferView * bv = cmd.view();
setViewCache(bv);
locked = true;
the_locking_inset = 0;
- inset_pos = inset_x = inset_y = 0;
+ inset_pos = 0;
+ inset_x = 0;
+ inset_y = 0;
inset_boundary = false;
inset_par = paragraphs.end();
old_par = paragraphs.end();
if (cmd.argument == "left")
text_.setCursorIntern(paragraphs.begin(), 0);
else {
- ParagraphList::iterator it = paragraphs.begin();
- ParagraphList::iterator end = paragraphs.end();
- while (boost::next(it) != end)
- ++it;
- // int const pos = (p->size() ? p->size()-1 : p->size());
+ ParagraphList::iterator it = boost::prior(paragraphs.end());
text_.setCursor(it, it->size());
}
} else {
* true (on). */
#if 0
// This should not be needed here and is also WRONG!
- setUndo(bv, Undo::INSERT, text_.cursor.par());
+ recordUndo(bv, Undo::INSERT, text_.cursor.par());
#endif
bv->switchKeyMap();
if (lyxrc.auto_region_delete) {
}
+int InsetText::linuxdoc(Buffer const * buf, ostream & os) const
+{
+ ParagraphList::iterator pit = const_cast<ParagraphList&>(paragraphs).begin();
+ ParagraphList::iterator pend = const_cast<ParagraphList&>(paragraphs).end();
+
+ // There is a confusion between the empty paragraph and the default paragraph
+ // The default paragraph is <p></p>, the empty paragraph is *empty*
+ // Since none of the floats of linuxdoc accepts standard paragraphs
+ // I disable them. I don't expect problems. (jamatos 2003/07/27)
+ for (; pit != pend; ++pit) {
+ const string name = pit->layout()->latexname();
+ if (name != "p")
+ sgml::openTag(os, 1, 0, name);
+ buf->simpleLinuxDocOnePar(os, pit, 0);
+ if (name != "p")
+ sgml::closeTag(os, 1, 0, name);
+ }
+ return 0;
+}
+
+
int InsetText::docbook(Buffer const * buf, ostream & os, bool mixcont) const
{
unsigned int lines = 0;
the_locking_inset->getCursor(bv, x, y);
return;
}
- x = cx(&bv);
+ x = cx();
y = cy() + InsetText::y();
}
the_locking_inset->getCursorPos(bv, x, y);
return;
}
- x = cx(bv) - top_x - TEXT_TO_INSET_OFFSET;
+ x = cx() - top_x - TEXT_TO_INSET_OFFSET;
y = cy() - TEXT_TO_INSET_OFFSET;
}
if (!the_locking_inset)
return 0;
- return (inset_y + the_locking_inset->insetInInsetY());
+ return inset_y + the_locking_inset->insetInInsetY();
}
the_locking_inset->fitInsetCursor(bv);
return;
}
- LyXFont const font = text_.getFont(bv->buffer(), cpar(), cpos());
+
+ LyXFont const font = text_.getFont(cpar(), cpos());
int const asc = font_metrics::maxAscent(font);
int const desc = font_metrics::maxDescent(font);
- if (bv->fitLockedInsetCursor(cx(bv), cy(), asc, desc))
+ if (bv->fitLockedInsetCursor(cx(), cy(), asc, desc))
need_update |= FULL;
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveRight(BufferView * bv, bool activate_inset, bool selecting)
{
if (text_.cursor.par()->isRightToLeftPar(bv->buffer()->params))
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveLeft(BufferView * bv, bool activate_inset, bool selecting)
{
if (text_.cursor.par()->isRightToLeftPar(bv->buffer()->params))
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveRightIntern(BufferView * bv, bool front,
bool activate_inset, bool selecting)
{
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveLeftIntern(BufferView * bv, bool front,
bool activate_inset, bool selecting)
{
}
-Inset::RESULT InsetText::moveUp(BufferView * bv)
+InsetOld::RESULT InsetText::moveUp(BufferView * bv)
{
if (crow() == text_.rows().begin())
return FINISHED_UP;
}
-Inset::RESULT InsetText::moveDown(BufferView * bv)
+InsetOld::RESULT InsetText::moveDown(BufferView * bv)
{
if (boost::next(crow()) == text_.rows().end())
return FINISHED_DOWN;
}
-bool InsetText::insertInset(BufferView * bv, Inset * inset)
+bool InsetText::insertInset(BufferView * bv, InsetOld * inset)
{
if (the_locking_inset) {
if (the_locking_inset->insetAllowed(inset))
}
-bool InsetText::insetAllowed(Inset::Code code) const
+bool InsetText::insetAllowed(InsetOld::Code code) const
{
// in_insetAllowed is a really gross hack,
// to allow us to call the owner's insetAllowed
}
-UpdatableInset * InsetText::getFirstLockingInsetOfType(Inset::Code c)
+UpdatableInset * InsetText::getFirstLockingInsetOfType(InsetOld::Code c)
{
if (c == lyxCode())
return this;
if (text_.selection.set())
- setUndo(bv, Undo::EDIT, text_.cursor.par());
+ recordUndo(bv, Undo::ATOMIC, text_.cursor.par());
if (selectall) {
text_.cursorTop();
bool InsetText::checkAndActivateInset(BufferView * bv, bool front)
{
- if (cpar()->isInset(cpos())) {
- Inset * inset =
- static_cast<UpdatableInset*>(cpar()->getInset(cpos()));
- if (!isHighlyEditableInset(inset))
- return false;
- FuncRequest cmd(bv, LFUN_INSET_EDIT, front ? "left" : "right");
- inset->localDispatch(cmd);
- if (!the_locking_inset)
- return false;
- updateLocal(bv, CURSOR, false);
- return true;
- }
- return false;
+ InsetOld * inset = cpar()->getInset(cpos());
+ if (!isHighlyEditableInset(inset))
+ return false;
+ FuncRequest cmd(bv, LFUN_INSET_EDIT, front ? "left" : "right");
+ inset->localDispatch(cmd);
+ if (!the_locking_inset)
+ return false;
+ updateLocal(bv, CURSOR, false);
+ return true;
}
x -= drawTextXOffset;
int dummyx = x;
int dummyy = y + dim_.asc;
- Inset * inset = getLyXText(bv)->checkInsetHit(dummyx, dummyy);
+ InsetOld * inset = getLyXText(bv)->checkInsetHit(dummyx, dummyy);
// we only do the edit() call if the inset was hit by the mouse
// or if it is a highly editable inset. So we should call this
// function from our own edit with button < 0.
if (button == mouse_button::none && !isHighlyEditableInset(inset))
return false;
- if (inset) {
- if (x < 0)
- x = dim_.wid;
- if (y < 0)
- y = dim_.des;
- inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy() + drawTextYOffset;
- FuncRequest cmd(bv, LFUN_INSET_EDIT, x - inset_x, y - inset_y, button);
- inset->localDispatch(cmd);
- if (!the_locking_inset)
- return false;
- updateLocal(bv, CURSOR, false);
- return true;
- }
- return false;
+ if (!inset)
+ return false;
+ if (x < 0)
+ x = dim_.wid;
+ if (y < 0)
+ y = dim_.des;
+ inset_x = cix() - top_x + drawTextXOffset;
+ inset_y = ciy() + drawTextYOffset;
+ FuncRequest cmd(bv, LFUN_INSET_EDIT, x - inset_x, y - inset_y, button);
+ inset->localDispatch(cmd);
+ if (!the_locking_inset)
+ return false;
+ updateLocal(bv, CURSOR, false);
+ return true;
}
ParagraphList::const_iterator end = plist.end();
for (; it != end; ++it) {
paragraphs.push_back(*it);
- Paragraph & tmp = paragraphs.back();
- tmp.setInsetOwner(this);
+ paragraphs.back().setInsetOwner(this);
}
reinitLyXText();
}
-int InsetText::cx(BufferView * bv) const
+int InsetText::cx() const
{
int x = text_.cursor.x() + top_x + TEXT_TO_INSET_OFFSET;
if (the_locking_inset) {
- LyXFont font = text_.getFont(bv->buffer(), text_.cursor.par(),
- text_.cursor.pos());
+ LyXFont font = text_.getFont(text_.cursor.par(), text_.cursor.pos());
if (font.isVisibleRightToLeft())
x -= the_locking_inset->width();
}
}
-int InsetText::cix(BufferView * bv) const
+int InsetText::cix() const
{
int x = text_.cursor.ix() + top_x + TEXT_TO_INSET_OFFSET;
if (the_locking_inset) {
- LyXFont font = text_.getFont(bv->buffer(), text_.cursor.par(),
- text_.cursor.pos());
+ LyXFont font = text_.getFont(text_.cursor.par(), text_.cursor.pos());
if (font.isVisibleRightToLeft())
x -= the_locking_inset->width();
}
}
-void InsetText::resizeLyXText(BufferView * bv, bool force) const
+void InsetText::resizeLyXText(BufferView * bv, bool /*force*/) const
{
if (paragraphs.size() == 1 && paragraphs.begin()->empty()) {
// no data, resize not neccessary!
text_.init(bv);
restoreLyXTextState();
+ // seems to be unneeded
+#if 1
if (the_locking_inset) {
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
}
} else {
need_update |= FULL;
}
+#endif
}
text_.init(bv);
restoreLyXTextState();
if (the_locking_inset) {
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
}
text_.top_y(bv->screen().topCursorVisible(&text_));
if (!owner()) {
- const_cast<InsetText*>(this)->updateLocal(bv, FULL, false);
// this will scroll the screen such that the cursor becomes visible
bv->updateScrollbar();
} else {
}
-Inset * InsetText::getInsetFromID(int id_arg) const
+InsetOld * InsetText::getInsetFromID(int id_arg) const
{
if (id_arg == id())
return const_cast<InsetText *>(this);
for (; it != end; ++it) {
if (it->inset->id() == id_arg)
return it->inset;
- Inset * in = it->inset->getInsetFromID(id_arg);
+ InsetOld * in = it->inset->getInsetFromID(id_arg);
if (in)
return in;
}
void InsetText::toggleSelection(BufferView * bv, bool kill_selection)
{
- if (the_locking_inset) {
+ if (the_locking_inset)
the_locking_inset->toggleSelection(bv, kill_selection);
- }
int x = top_x + TEXT_TO_INSET_OFFSET;
- RowList::iterator rowit = text_.rows().begin();
+ RowList::iterator rit = text_.rows().begin();
RowList::iterator end = text_.rows().end();
- int y_offset = top_baseline - rowit->ascent_of_text();
+ int y_offset = top_baseline - rit->ascent_of_text();
int y = y_offset;
- while ((rowit != end) && ((y + rowit->height()) <= 0)) {
- y += rowit->height();
- ++rowit;
+ while (rit != end && y + rit->height() <= 0) {
+ y += rit->height();
+ ++rit;
}
if (y_offset < 0)
y_offset = y;
return true;
text_.cursorRight(true);
}
- lyxfind::SearchResult result =
- lyxfind::findNextChange(bv, &text_, length);
+ lyx::find::SearchResult result =
+ lyx::find::findNextChange(bv, &text_, length);
- if (result == lyxfind::SR_FOUND) {
+ if (result == lyx::find::SR_FOUND) {
LyXCursor cur = text_.cursor;
bv->unlockInset(bv->theLockingInset());
if (bv->lockInset(this))
text_.setSelectionRange(length);
updateLocal(bv, SELECTION, false);
}
- return result != lyxfind::SR_NOT_FOUND;
+ return result != lyx::find::SR_NOT_FOUND;
}
return true;
text_.cursorRight(true);
}
- lyxfind::SearchResult result =
- lyxfind::LyXFind(bv, &text_, str, true, cs, mw);
+ lyx::find::SearchResult result =
+ lyx::find::find(bv, &text_, str, true, cs, mw);
- if (result == lyxfind::SR_FOUND) {
+ if (result == lyx::find::SR_FOUND) {
LyXCursor cur = text_.cursor;
bv->unlockInset(bv->theLockingInset());
if (bv->lockInset(this))
text_.setSelectionRange(str.length());
updateLocal(bv, SELECTION, false);
}
- return (result != lyxfind::SR_NOT_FOUND);
+ return result != lyx::find::SR_NOT_FOUND;
}
+
bool InsetText::searchBackward(BufferView * bv, string const & str,
bool cs, bool mw)
{
text_.setCursor(pit, pit->size());
}
- lyxfind::SearchResult result =
- lyxfind::LyXFind(bv, &text_, str, false, cs, mw);
+ lyx::find::SearchResult result =
+ lyx::find::find(bv, &text_, str, false, cs, mw);
- if (result == lyxfind::SR_FOUND) {
+ if (result == lyx::find::SR_FOUND) {
LyXCursor cur = text_.cursor;
bv->unlockInset(bv->theLockingInset());
if (bv->lockInset(this))
text_.setSelectionRange(str.length());
updateLocal(bv, SELECTION, false);
}
- return (result != lyxfind::SR_NOT_FOUND);
+ return result != lyx::find::SR_NOT_FOUND;
}
projects / lyx.git / blobdiff