#include "insets/insetspecialchar.h"
#include "insets/insettext.h"
#include "insets/insetfloat.h"
+#include "insets/insetwrap.h"
#include "support/LAssert.h"
#include "support/textutils.h"
LyXText::LyXText(BufferView * bv)
- : number_of_rows(0), height(0), width(0), first_y(0),
+ : height(0), width(0), first_y(0),
bv_owner(bv), inset_owner(0), the_locking_inset(0),
need_break_row(0), refresh_y(0), refresh_row(0),
status_(LyXText::UNCHANGED), firstrow(0), lastrow(0)
LyXText::LyXText(InsetText * inset)
- : number_of_rows(0), height(0), width(0), first_y(0),
+ : height(0), width(0), first_y(0),
bv_owner(0), inset_owner(inset), the_locking_inset(0),
need_break_row(0), refresh_y(0), refresh_row(0),
status_(LyXText::UNCHANGED), firstrow(0), lastrow(0)
need_break_row = 0;
width = height = 0;
copylayouttype.erase();
- number_of_rows = first_y = refresh_y = 0;
+ first_y = refresh_y = 0;
status_ = LyXText::UNCHANGED;
} else if (firstrow)
return;
}
setCursorIntern(bview, firstrow->par(), 0);
selection.cursor = cursor;
+
+ updateCounters(bview);
}
while (par && par_depth && !tmpfont.resolved()) {
par = par->outerHook();
if (par) {
-#ifndef INHERIT_LANGUAGE
tmpfont.realize(par->layout()->font);
-#else
- tmpfont.realize(tclass[par->layout()]->font,
- buf->params.language);
-#endif
par_depth = par->getDepth();
}
}
-#ifndef INHERIT_LANGUAGE
tmpfont.realize(tclass.defaultfont());
-#else
- tmpfont.realize(tclass.defaultfont(), buf->params.language);
-#endif
return tmpfont;
}
LyXFont f = par->getFontSettings(buf->params, pos);
if (par->inInset())
par->inInset()->getDrawFont(f);
-#ifndef INHERIT_LANGUAGE
return f.realize(layout->reslabelfont);
-#else
- return f.realize(layout.reslabelfont, buf->params.language);
-#endif
} else {
LyXFont f = par->getFontSettings(buf->params, pos);
if (par->inInset())
par->inInset()->getDrawFont(f);
-#ifndef INHERIT_LANGUAGE
return f.realize(layout->resfont);
-#else
- return f.realize(layout.resfont, buf->params.language);
-#endif
}
}
}
LyXFont tmpfont = par->getFontSettings(buf->params, pos);
-#ifndef INHERIT_LANGUAGE
tmpfont.realize(layoutfont);
-#else
- tmpfont.realize(layoutfont, buf->params.language);
-#endif
+
if (par->inInset())
par->inInset()->getDrawFont(tmpfont);
while (!layoutfont.resolved() && tp && tp->getDepth()) {
tp = tp->outerHook();
if (tp)
-#ifndef INHERIT_LANGUAGE
layoutfont.realize(tp->layout()->font);
-#else
- layoutfont.realize(tclass[tp->layout()].font,
- buf->params.language);
-#endif
}
}
-#ifndef INHERIT_LANGUAGE
layoutfont.realize(tclass.defaultfont());
-#else
- layoutfont.realize(tclass.defaultfont(), buf->params.language);
-#endif
// Now, reduce font against full layout font
font.reduce(layoutfont);
if (row == lastrow)
lastrow = tmprow;
- ++number_of_rows;
}
height -= row->height(); // the text becomes smaller
delete row;
- --number_of_rows; // one row less
}
// insert a new row, starting at position 0
insertRow(row, par, 0);
- // set the counters
- setCounter(bview->buffer(), par);
-
// and now append the whole paragraph behind the new row
if (!row) {
firstrow->height(0);
// and sel_end cursor
cursor = selection.start;
- bool anything_changed = false;
-
while (true) {
// NOTE: you can't change the depth of a bibliography entry
if (cursor.par()->layout()->labeltype != LABEL_BIBLIO) {
if (cursor.par()->getDepth()
< prev->getMaxDepthAfter()) {
cursor.par()->params().depth(cursor.par()->getDepth() + 1);
- anything_changed = true;
}
}
}
cursor.par(cursor.par()->next());
}
- // if nothing changed set all depth to 0
- if (!anything_changed) {
- cursor = selection.start;
- while (cursor.par() != selection.end.par()) {
- cursor.par()->params().depth(0);
- cursor.par(cursor.par()->next());
- }
- cursor.par()->params().depth(0);
- }
-
redoParagraphs(bview, selection.start, endpar);
// we have to reset the selection, because the
current_font = real_current_font;
current_font.reduce(layoutfont);
// And resolve it completely
-#ifndef INHERIT_LANGUAGE
real_current_font.realize(layoutfont);
-#else
- real_current_font.realize(layoutfont,
- bview->buffer()->params.language);
-#endif
+
return;
}
par->params().appendix(par->previous()->params().appendix());
if (!par->params().appendix() && par->params().startOfAppendix()) {
par->params().appendix(true);
- buf->counters().reset();
+ textclass.counters().reset();
}
par->enumdepth = par->previous()->enumdepth;
par->itemdepth = par->previous()->itemdepth;
if (layout->labeltype >= LABEL_COUNTER_CHAPTER) {
int i = layout->labeltype - LABEL_COUNTER_CHAPTER;
- string numbertype, langtype;
+ string numbertype;
+ string langtype;
ostringstream s;
if (i >= 0 && i <= buf->params.secnumdepth) {
- buf->counters().step(buf->counters().sects[i]);
+ textclass.counters().step(layout->latexname());
// Is there a label? Useful for Chapter layout
if (!par->params().appendix()) {
langtype = "latin";
}
- s << buf->counters().numberLabel(buf->counters().sects[i],
- numbertype, langtype, head);
+ s << textclass.counters()
+ .numberLabel(layout->latexname(),
+ numbertype, langtype, head);
par->params().labelString(par->params().labelString() + s.str().c_str());
// We really want to remove the c_str as soon as
// possible...
// reset enum counters
- buf->counters().reset("enum");
+ textclass.counters().reset("enum");
} else if (layout->labeltype < LABEL_COUNTER_ENUMI) {
- buf->counters().reset("enum");
+ textclass.counters().reset("enum");
} else if (layout->labeltype == LABEL_COUNTER_ENUMI) {
- buf->counters().step(buf->counters().enums[par->enumdepth]);
+ // FIXME
+ // Yes I know this is a really, really! bad solution
+ // (Lgb)
+ string enumcounter("enum");
+
+ switch (par->enumdepth) {
+ case 2:
+ enumcounter += 'i';
+ case 1:
+ enumcounter += 'i';
+ case 0:
+ enumcounter += 'i';
+ break;
+ case 3:
+ enumcounter += "iv";
+ break;
+ default:
+ // not a valid enumdepth...
+ break;
+ }
- s << buf->counters().numberLabel(buf->counters().enums[par->enumdepth],
- "enumeration", langtype);
- par->params().labelString(s.str().c_str());
+ textclass.counters().step(enumcounter);
+ s << textclass.counters()
+ .numberLabel(enumcounter,
+ "enumeration", langtype);
+ par->params().labelString(s.str().c_str());
}
} else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
- buf->counters().step("bibitem");
- int number = buf->counters().value("bibitem");
+ textclass.counters().step("bibitem");
+ int number = textclass.counters().value("bibitem");
if (!par->bibkey) {
- InsetCommandParams p("bibitem" );
+ InsetCommandParams p("bibitem");
par->bibkey = new InsetBibKey(p);
}
par->bibkey->setCounter(number);
while (tmppar && tmppar->inInset()
// the single '=' is intended below
&& (in = tmppar->inInset()->owner())) {
- if (in->lyxCode() == Inset::FLOAT_CODE) {
+ if (in->lyxCode() == Inset::FLOAT_CODE ||
+ in->lyxCode() == Inset::WRAP_CODE) {
isOK = true;
break;
} else {
Floating const & fl
= textclass.floats().getType(static_cast<InsetFloat*>(in)->type());
- buf->counters().step(fl.name());
+ textclass.counters().step(fl.type());
// Doesn't work... yet.
ostringstream o;
}
par->params().labelString(s);
- // reset the enumeration counter. They are always resetted
+ // reset the enumeration counter. They are always reset
// when there is any other layout between
- for (int i = par->enumdepth; i < 4; ++i) {
- buf->counters().set(buf->counters().enums[i], 0);
+ // Just fall-through between the cases so that all
+ // enum counters deeper than enumdepth is also reset.
+ switch (par->enumdepth) {
+ case 0:
+ textclass.counters().reset("enumi");
+ case 1:
+ textclass.counters().reset("enumii");
+ case 2:
+ textclass.counters().reset("enumiii");
+ case 3:
+ textclass.counters().reset("enumiv");
}
}
}
Row * row = firstrow;
par = row->par();
- bview->buffer()->counters().reset();
+ // CHECK if this is really needed. (Lgb)
+ bview->buffer()->params.getLyXTextClass().counters().reset();
+
while (par) {
while (row->par() != par)
row = row->next();