copylayouttype(0)
{}
-void LyXText::init(BufferView * bview)
-{
- if (firstrow)
+void LyXText::init(BufferView * bview, bool reinit)
+{
+ if (reinit) {
+ // Delete all rows, this does not touch the paragraphs!
+ Row * tmprow = firstrow;
+ while (firstrow) {
+ tmprow = firstrow->next();
+ delete firstrow;
+ firstrow = tmprow;
+ }
+ lastrow = refresh_row = need_break_row = 0;
+ width = height = copylayouttype = 0;
+ number_of_rows = first = refresh_y = 0;
+ status_ = LyXText::UNCHANGED;
+ } else if (firstrow)
return;
Paragraph * par = ownerParagraph();
// 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
{
LyXLayout const & layout =
textclasslist.Style(buf->params.textclass, par->getLayout());
// 1% goes here
LyXFont f = par->getFontSettings(buf->params,
pos);
- return f.realize(layout.reslabelfont);
+ return f.realize(layout.reslabelfont, buf->params.language);
} else {
LyXFont f = par->getFontSettings(buf->params, pos);
- return f.realize(layout.resfont);
+ return f.realize(layout.resfont, buf->params.language);
}
} else {
layoutfont = layout.font;
}
tmpfont = par->getFontSettings(buf->params, pos);
- tmpfont.realize(layoutfont);
+ tmpfont.realize(layoutfont, buf->params.language);
} else {
// 5% goes here.
// process layoutfont for pos == -1 and labelfont for pos < -1
if (par) {
tmpfont.realize(textclasslist.
Style(buf->params.textclass,
- par->getLayout()).font);
+ par->getLayout()).font,
+ buf->params.language);
par_depth = par->getDepth();
}
}
- tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont());
+ tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(),
+ buf->params.language);
return tmpfont;
}
{
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);
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);
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);
// inserts a new row behind the specified row, increments
// the touched counters
void LyXText::insertRow(Row * row, Paragraph * par,
- Paragraph::size_type pos) const
+ Paragraph::size_type pos) const
{
Row * tmprow = new Row;
if (!row) {
// insert the specified paragraph behind the specified row
void LyXText::insertParagraph(BufferView * bview, Paragraph * par,
- Row * row) const
+ Row * row) const
{
- insertRow(row, par, 0); /* insert a new row, starting
- * at postition 0 */
+ insertRow(row, par, 0); /* insert a new row, starting
+ * at postition 0 */
setCounter(bview->buffer(), par); // set the counters
}
}
-void LyXText::openStuff(BufferView * bview)
+
+Inset * LyXText::getInset() const
{
- if (cursor.pos() == 0 && cursor.par()->bibkey){
- cursor.par()->bibkey->edit(bview, 0, 0, 0);
+ Inset * inset = 0;
+ if (cursor.pos() == 0 && cursor.par()->bibkey) {
+ inset = cursor.par()->bibkey;
} else if (cursor.pos() < cursor.par()->size()
&& cursor.par()->getChar(cursor.pos()) == Paragraph::META_INSET) {
- Inset * inset = cursor.par()->getInset(cursor.pos());
- if (!inset->editable())
- return;
- bview->owner()->message(inset->editMessage());
- if (inset->editable() != Inset::HIGHLY_EDITABLE)
- setCursorParUndo(bview);
- inset->edit(bview, 0, 0, 0);
+ inset = cursor.par()->getInset(cursor.pos());
}
+ return inset;
+}
+
+
+void LyXText::toggleInset(BufferView * bview)
+{
+ Inset * inset = getInset();
+ if (!inset->editable())
+ return;
+ //bview->owner()->message(inset->editMessage());
+
+ // 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
}
else
layoutfont = getFont(bview->buffer(), cursor.par(),-1);
// 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;
}
{
selection.set(false);
selection.mark(false);
- selection.end = selection.start = cursor;
+ selection.end = selection.start = selection.cursor = cursor;
}
// is disabled.
LyXCursor resetCursor = cursor;
bool implicitSelection = (font.language() == ignore_language
- && font.number() == LyXFont::IGNORE)
+ && font.number() == LyXFont::IGNORE)
? selectWordWhenUnderCursor(bview) : false;
// Set font
void LyXText::insertInset(BufferView * bview, Inset * inset)
{
- if (!cursor.par()->insertInsetAllowed(inset))
+ if (!cursor.par()->insetAllowed(inset->lyxCode()))
return;
setUndo(bview, Undo::INSERT,
cursor.par(), cursor.par()->next());
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);
- // 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());
projects / lyx.git / blobdiff