#include "layout.h"
#include "LyXView.h"
#include "support/textutils.h"
+#include "support/lstrings.h"
#include "undo_funcs.h"
#include "buffer.h"
#include "bufferparams.h"
#include "FloatList.h"
#include "language.h"
#include "ParagraphParameters.h"
+#include "support/LAssert.h"
using std::copy;
using std::find;
}
+namespace {
+
+LyXFont const realizeFont(LyXFont const & font,
+ Buffer const * buf,
+ Paragraph * par)
+{
+ LyXFont tmpfont(font);
+ Paragraph::depth_type par_depth = par->getDepth();
+
+ // Resolve against environment font information
+ while (par && par_depth && !tmpfont.resolved()) {
+ par = par->outerHook();
+ if (par) {
+ tmpfont.realize(textclasslist.
+ Style(buf->params.textclass,
+ par->getLayout()).font,
+ buf->params.language);
+ par_depth = par->getDepth();
+ }
+ }
+
+ tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
+ buf->params.language);
+
+ return tmpfont;
+}
+
+}
+
+
// Gets the fully instantiated font at a given position in a paragraph
// Basically the same routine as Paragraph::getFont() in paragraph.C.
// The difference is that this one is used for displaying, and thus we
// If position is -1, we get the layout font of the paragraph.
// If position is -2, we get the font of the manual label of the paragraph.
LyXFont const LyXText::getFont(Buffer const * buf, Paragraph * par,
- Paragraph::size_type pos) const
+ Paragraph::size_type pos) const
{
+ lyx::Assert(pos >= 0);
+
LyXLayout const & layout =
textclasslist.Style(buf->params.textclass, par->getLayout());
-
+
Paragraph::depth_type par_depth = par->getDepth();
// We specialize the 95% common case:
if (!par_depth) {
- if (pos >= 0){
- // 95% goes here
- if (layout.labeltype == LABEL_MANUAL
- && pos < beginningOfMainBody(buf, par)) {
+ if (layout.labeltype == LABEL_MANUAL
+ && pos < beginningOfMainBody(buf, par)) {
// 1% goes here
- LyXFont f = par->getFontSettings(buf->params,
- pos);
- return f.realize(layout.reslabelfont);
- } else {
- LyXFont f = par->getFontSettings(buf->params, pos);
- return f.realize(layout.resfont);
- }
-
+ LyXFont f = par->getFontSettings(buf->params,
+ pos);
+ return f.realize(layout.reslabelfont, buf->params.language);
} else {
- // 5% goes here.
- // process layoutfont for pos == -1 and labelfont for pos < -1
- if (pos == -1)
- return layout.resfont;
- else
- return layout.reslabelfont;
+ LyXFont f = par->getFontSettings(buf->params, pos);
+ return f.realize(layout.resfont, buf->params.language);
}
}
-
+
// The uncommon case need not be optimized as much
-
- LyXFont layoutfont, tmpfont;
-
- if (pos >= 0){
- // 95% goes here
- if (pos < beginningOfMainBody(buf, par)) {
- // 1% goes here
- layoutfont = layout.labelfont;
- } else {
- // 99% goes here
- layoutfont = layout.font;
- }
- tmpfont = par->getFontSettings(buf->params, pos);
- tmpfont.realize(layoutfont);
+
+ LyXFont layoutfont;
+
+ if (pos < beginningOfMainBody(buf, par)) {
+ // 1% goes here
+ layoutfont = layout.labelfont;
} else {
- // 5% goes here.
- // process layoutfont for pos == -1 and labelfont for pos < -1
- if (pos == -1)
- tmpfont = layout.font;
- else
- tmpfont = layout.labelfont;
+ // 99% goes here
+ layoutfont = layout.font;
}
- // Resolve against environment font information
- while (par && par_depth && !tmpfont.resolved()) {
- par = par->outerHook();
- if (par) {
- tmpfont.realize(textclasslist.
- Style(buf->params.textclass,
- par->getLayout()).font);
- par_depth = par->getDepth();
- }
+ LyXFont tmpfont = par->getFontSettings(buf->params, pos);
+ tmpfont.realize(layoutfont, buf->params.language);
+
+ return realizeFont(tmpfont, buf, par);
+}
+
+
+LyXFont const LyXText::getLayoutFont(Buffer const * buf, Paragraph * par) const
+{
+ LyXLayout const & layout =
+ textclasslist.Style(buf->params.textclass, par->getLayout());
+
+ Paragraph::depth_type par_depth = par->getDepth();
+
+ if (!par_depth) {
+ return layout.resfont;
}
- tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+ return realizeFont(layout.font, buf, par);
+}
+
- return tmpfont;
+LyXFont const LyXText::getLabelFont(Buffer const * buf, Paragraph * par) const
+{
+ LyXLayout const & layout =
+ textclasslist.Style(buf->params.textclass, par->getLayout());
+
+ Paragraph::depth_type par_depth = par->getDepth();
+
+ if (!par_depth) {
+ return layout.reslabelfont;
+ }
+
+ return realizeFont(layout.labelfont, buf, par);
}
{
Buffer const * buf = bv->buffer();
LyXFont font = getFont(buf, par, pos);
- font.update(fnt, buf->params.language, toggleall);
+ font.update(fnt, toggleall);
// Let the insets convert their font
if (par->getChar(pos) == Paragraph::META_INSET) {
Inset * inset = par->getInset(pos);
if (inset) {
- if (inset->editable()==Inset::HIGHLY_EDITABLE) {
+ if (inset->editable()==Inset::IS_EDITABLE) {
UpdatableInset * uinset =
static_cast<UpdatableInset *>(inset);
uinset->setFont(bv, fnt, toggleall, true);
}
- font = inset->convertFont(font);
}
}
tp = tp->outerHook();
if (tp)
layoutfont.realize(textclasslist.
- Style(buf->params.textclass,
- tp->getLayout()).font);
+ Style(buf->params.textclass,
+ tp->getLayout()).font,
+ buf->params.language);
}
}
- layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+ layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
+ buf->params.language);
// Now, reduce font against full layout font
font.reduce(layoutfont);
Paragraph::size_type pos, LyXFont const & fnt)
{
LyXFont font(fnt);
- // Let the insets convert their font
- if (par->getChar(pos) == Paragraph::META_INSET) {
- font = par->getInset(pos)->convertFont(font);
- }
LyXLayout const & layout =
textclasslist.Style(buf->params.textclass,
tp = tp->outerHook();
if (tp)
layoutfont.realize(textclasslist.
- Style(buf->params.textclass,
- tp->getLayout()).font);
+ Style(buf->params.textclass,
+ tp->getLayout()).font,
+ buf->params.language);
}
}
- layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+ layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
+ buf->params.language);
// Now, reduce font against full layout font
font.reduce(layoutfont);
}
}
+
Inset * LyXText::getInset() const
{
Inset * inset = 0;
return inset;
}
+
void LyXText::toggleInset(BufferView * bview)
{
Inset * inset = getInset();
// do we want to keep this?? (JMarc)
if (inset->editable() != Inset::HIGHLY_EDITABLE)
setCursorParUndo(bview);
+
+ if (inset->isOpen()) {
+ inset->close(bview);
+ } else {
+ inset->open(bview);
+ }
+#if 0
inset->open(bview, !inset->isOpen());
+#endif
}
LyXLayout const & layout =
textclasslist.Style(buf->params.textclass, par->getLayout());
- LyXFont layoutfont, tmpfont;
- for (Paragraph::size_type pos = 0;
- pos < par->size(); ++pos) {
+ LyXFont layoutfont;
+ for (Paragraph::size_type pos = 0; pos < par->size(); ++pos) {
if (pos < beginningOfMainBody(buf, par))
layoutfont = layout.labelfont;
else
layoutfont = layout.font;
- tmpfont = par->getFontSettings(buf->params, pos);
+ LyXFont tmpfont = par->getFontSettings(buf->params, pos);
tmpfont.reduce(layoutfont);
par->setFont(pos, tmpfont);
}
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos(), false);
updateCounters(bview, cursor.row());
- clearSelection(bview);
+ clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true);
}
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos());
updateCounters(bview, cursor.row());
- clearSelection(bview);
+ clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos());
}
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos());
updateCounters(bview, cursor.row());
- clearSelection(bview);
+ clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos());
}
// Determine basis font
LyXFont layoutfont;
if (cursor.pos() < beginningOfMainBody(bview->buffer(),
- cursor.par()))
- layoutfont = getFont(bview->buffer(), cursor.par(),-2);
- else
- layoutfont = getFont(bview->buffer(), cursor.par(),-1);
+ cursor.par())) {
+ layoutfont = getLabelFont(bview->buffer(),
+ cursor.par());
+ } else {
+ layoutfont = getLayoutFont(bview->buffer(),
+ cursor.par());
+ }
// Update current font
- real_current_font.update(font,
- bview->buffer()->params.language,
- toggleall);
+ real_current_font.update(font, toggleall);
// Reduce to implicit settings
current_font = real_current_font;
current_font.reduce(layoutfont);
// And resolve it completely
- real_current_font.realize(layoutfont);
+ real_current_font.realize(layoutfont,
+ bview->buffer()->params.language);
return;
}
// and sel_end cursor
setUndo(bview, Undo::EDIT,
- selection.start.par(),
- selection.end.par()->next());
+ selection.start.par(), selection.end.par()->next());
freezeUndo();
cursor = selection.start;
while (cursor.par() != selection.end.par() ||
- (cursor.pos() < selection.end.pos())) {
+ (cursor.pos() < selection.end.pos()))
+ {
if (cursor.pos() < cursor.par()->size()) {
// an open footnote should behave
// like a closed one
setCursor(bview, selection.start.par(), selection.start.pos());
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos());
- clearSelection(bview);
+ clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true,
- tmpcursor.boundary());
+ tmpcursor.boundary());
}
// and the specified par
// This function is needed after SetLayout and SetFont etc.
void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur,
- Paragraph const * endpar) const
+ Paragraph const * endpar) const
{
Row * tmprow2;
Paragraph * tmppar = 0;
} else {
first_phys_par = tmprow->par();
while (tmprow->previous()
- && tmprow->previous()->par() == first_phys_par) {
+ && tmprow->previous()->par() == first_phys_par)
+ {
tmprow = tmprow->previous();
y -= tmprow->height();
}
status(bview, LyXText::NEED_MORE_REFRESH);
refresh_y = y;
refresh_row = tmprow->previous(); /* the real refresh row will
- be deleted, so I store
- the previous here */
+ be deleted, so I store
+ the previous here */
// remove it
if (tmprow->next())
tmppar = tmprow->next()->par();
// remove the first one
tmprow2 = tmprow; /* this is because tmprow->previous()
- can be 0 */
+ can be 0 */
tmprow = tmprow->previous();
removeRow(tmprow2);
}
-void LyXText::clearSelection(BufferView * /*bview*/) const
+void LyXText::clearSelection() const
{
selection.set(false);
selection.mark(false);
// is disabled.
LyXCursor resetCursor = cursor;
bool implicitSelection = (font.language() == ignore_language
- && font.number() == LyXFont::IGNORE)
- ? selectWordWhenUnderCursor(bview) : false;
+ && font.number() == LyXFont::IGNORE)
+ ? selectWordWhenUnderCursor(bview, WHOLE_WORD_STRICT) : false;
// Set font
setFont(bview, font, toggleall);
// Implicit selections are cleared afterwards
//and cursor is set to the original position.
if (implicitSelection) {
- clearSelection(bview);
+ clearSelection();
cursor = resetCursor;
setCursor(bview, cursor.par(), cursor.pos());
selection.cursor = cursor;
}
+string
+LyXText::getStringToIndex(BufferView * bview)
+{
+ string idxstring;
+
+ // Try implicit word selection
+ // If there is a change in the language the implicit word selection
+ // is disabled.
+ LyXCursor resetCursor = cursor;
+ bool implicitSelection = selectWordWhenUnderCursor(bview, PREVIOUS_WORD);
+
+ if (!selection.set()) {
+ bview->owner()->message(_("Nothing to index!"));
+ return string();
+ }
+ if (selection.start.par() != selection.end.par()) {
+ bview->owner()->message(_("Cannot index more than one paragraph!"));
+ return string();
+ }
+
+ idxstring = selectionAsString(bview->buffer());
+
+ // Implicit selections are cleared afterwards
+ //and cursor is set to the original position.
+ if (implicitSelection) {
+ clearSelection();
+ cursor = resetCursor;
+ setCursor(bview, cursor.par(), cursor.pos());
+ selection.cursor = cursor;
+ }
+ return idxstring;
+}
+
Paragraph::size_type
LyXText::beginningOfMainBody(Buffer const * buf,
Paragraph const * par) const
redoParagraphs(bview, selection.start, endpar);
- clearSelection(bview);
+ clearSelection();
setCursor(bview, selection.start.par(), selection.start.pos());
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos());
}
-void LyXText::cutSelection(BufferView * bview, bool doclear)
+void LyXText::cutSelection(BufferView * bview, bool doclear, bool realcut)
{
// Stuff what we got on the clipboard. Even if there is no selection.
endpar = selection.end.par();
int pos = selection.end.pos();
CutAndPaste::cutSelection(selection.start.par(), &endpar,
- selection.start.pos(), pos,
- bview->buffer()->params.textclass, doclear);
+ selection.start.pos(), pos,
+ bview->buffer()->params.textclass, doclear,
+ realcut);
selection.end.pos(pos);
} else {
endpar = selection.end.par();
int pos = selection.end.pos();
CutAndPaste::cutSelection(selection.start.par(), &endpar,
- selection.start.pos(), pos,
- bview->buffer()->params.textclass, doclear);
+ selection.start.pos(), pos,
+ bview->buffer()->params.textclass, doclear,
+ realcut);
cursor.par(endpar);
selection.end.par(endpar);
selection.end.pos(pos);
cursor = selection.start;
// need a valid cursor. (Lgb)
- clearSelection(bview);
+ clearSelection();
setCursor(bview, cursor.par(), cursor.pos());
selection.cursor = cursor;
redoParagraphs(bview, cursor, endpar);
setCursor(bview, cursor.par(), cursor.pos());
- clearSelection(bview);
+ clearSelection();
selection.cursor = cursor;
setCursor(bview, actpar, pos);
}
// Cut the selection
- cutSelection(bview);
+ cutSelection(bview, true, false);
unFreezeUndo();
}
setCursorParUndo(bview);
- bool isEnvironment =
- textclasslist.Style(bview->buffer()->params.textclass,
- cursor.par()->getLayout()).isEnvironment();
- bool free_spacing =
- textclasslist.Style(bview->buffer()->params.textclass,
- cursor.par()->getLayout()).free_spacing;
- bool keepempty =
- textclasslist.Style(bview->buffer()->params.textclass,
- cursor.par()->getLayout()).keepempty;
-
// only to be sure, should not be neccessary
- clearSelection(bview);
+ clearSelection();
- // insert the string, don't insert doublespace
- bool space_inserted = true;
- for(string::const_iterator cit = str.begin();
- cit != str.end(); ++cit) {
- if (*cit == '\n') {
- if (par->size() || keepempty) {
- par->breakParagraph(bview->buffer()->params,
- pos, isEnvironment);
- par = par->next();
- pos = 0;
- space_inserted = true;
- } else {
- continue;
- }
- // do not insert consecutive spaces if !free_spacing
- } else if ((*cit == ' ' || *cit == '\t')
- && space_inserted && !free_spacing) {
- continue;
- } else if (*cit == '\t') {
- if (!free_spacing) {
- // tabs are like spaces here
- par->insertChar(pos, ' ',
- current_font);
- ++pos;
- space_inserted = true;
- } else {
- const Paragraph::value_type nb = 8 - pos % 8;
- for (Paragraph::size_type a = 0;
- a < nb ; ++a) {
- par->insertChar(pos, ' ',
- current_font);
- ++pos;
- }
- space_inserted = true;
- }
- } else if (!IsPrintable(*cit)) {
- // Ignore unprintables
- continue;
- } else {
- // just insert the character
- par->insertChar(pos, *cit, current_font);
- ++pos;
- space_inserted = (*cit == ' ');
- }
-
- }
+ bview->buffer()->insertStringAsLines(par, pos, current_font, str);
redoParagraphs(bview, cursor, endpar);
setCursor(bview, cursor.par(), cursor.pos());
void LyXText::setCursor(BufferView * bview, Paragraph * par,
- Paragraph::size_type pos,
- bool setfont, bool boundary) const
+ Paragraph::size_type pos,
+ bool setfont, bool boundary) const
{
LyXCursor old_cursor = cursor;
setCursorIntern(bview, par, pos, setfont, boundary);
bview->buffer()->params.textclass,
row->par()->getLayout())
.labelsep,
- getFont(bview->buffer(), row->par(), -2));
+ getLabelFont(bview->buffer(), row->par()));
if (row->par()->isLineSeparator(main_body-1))
x -= singleWidth(bview, row->par(),main_body-1);
}
bool setfont, bool boundary) const
{
InsetText * it = static_cast<InsetText *>(par->inInset());
- if (it && (it != inset_owner)) {
- it->getLyXText(bview)->setCursorIntern(bview, par, pos, setfont,
- boundary);
- } else {
- setCursor(bview, cursor, par, pos, boundary);
- if (setfont)
- setCurrentFont(bview);
+ if (it) {
+ if (it != inset_owner) {
+ lyxerr << "InsetText is " << it << endl;
+ lyxerr << "inset_owner is " << inset_owner << endl;
+#warning I belive this code is wrong. (Lgb)
+#warning Jürgen, have a look at this. (Lgb)
+#warning Hmmm, I guess you are right but we
+#warning should verify when this is needed
+ // Jürgen, would you like to have a look?
+ // I guess we need to move the outer cursor
+ // and open and lock the inset (bla bla bla)
+ // stuff I don't know... so can you have a look?
+ // (Lgb)
+ // I moved the lyxerr stuff in here so we can see if this
+ // is actually really needed and where!
+ // (Jug)
+ it->getLyXText(bview)->setCursorIntern(bview, par, pos, setfont,
+ boundary);
+ return;
+ }
}
+
+ setCursor(bview, cursor, par, pos, boundary);
+ if (setfont)
+ setCurrentFont(bview);
}
void LyXText::setCursorFromCoordinates(BufferView * bview, int x, int y) const
{
LyXCursor old_cursor = cursor;
-
- // Get the row first.
-
- Row * row = getRowNearY(y);
- cursor.par(row->par());
- bool bound = false;
- int column = getColumnNearX(bview, row, x, bound);
- cursor.pos(row->pos() + column);
- cursor.x(x);
- cursor.y(y + row->baseline());
- cursor.row(row);
- cursor.boundary(bound);
+ setCursorFromCoordinates(bview, cursor, x, y);
setCurrentFont(bview);
deleteEmptyParagraphMechanism(bview, old_cursor);
}
Row * row = getRowNearY(y);
bool bound = false;
- int column = getColumnNearX(bview, row, x, bound);
+ int const column = getColumnNearX(bview, row, x, bound);
cur.par(row->par());
cur.pos(row->pos() + column);
void LyXText::status(BufferView * bview, LyXText::text_status st) const
{
-#if 0
- if ((status_ != NEED_MORE_REFRESH)
- || (status_ == NEED_MORE_REFRESH)
- && (st != NEED_VERY_LITTLE_REFRESH)) {
- status_ = st;
- if (inset_owner && st != UNCHANGED) {
- bview->text->status(bview, NEED_VERY_LITTLE_REFRESH);
- }
- }
-#else
-#warning Please tell what the intention is here. (Lgb)
- // The above does not make any sense, I changed it to what is here,
- // but it still does not make much sense. (Lgb)
-#warning Sure have a look now! (Jug)
// well as much as I know && binds more then || so the above and the
// below are identical (this for your known use of parentesis!)
// Now some explanation:
status_ = st;
if (inset_owner && st != UNCHANGED) {
bview->text->status(bview, NEED_VERY_LITTLE_REFRESH);
+ if (!bview->text->refresh_row) {
+ bview->text->refresh_row = bview->text->cursor.row();
+ bview->text->refresh_y = bview->text->cursor.y() -
+ bview->text->cursor.row()->baseline();
+ }
}
}
-#endif
}