#include "FloatList.h"
#include "language.h"
#include "ParagraphParameters.h"
+#include "counters.h"
#include "insets/inseterror.h"
#include "insets/insetbib.h"
LyXLayout_ptr const & layout = par->layout();
- Paragraph::depth_type par_depth = par->getDepth();
// We specialize the 95% common case:
- if (!par_depth) {
+ if (!par->getDepth()) {
if (layout->labeltype == LABEL_MANUAL
&& pos < beginningOfMainBody(buf, par)) {
// 1% goes here
{
LyXLayout_ptr const & layout = par->layout();
- Paragraph::depth_type par_depth = par->getDepth();
-
- if (!par_depth) {
+ if (!par->getDepth()) {
return layout->resfont;
}
{
LyXLayout_ptr const & layout = par->layout();
- Paragraph::depth_type par_depth = par->getDepth();
-
- if (!par_depth) {
+ if (!par->getDepth()) {
return layout->reslabelfont;
}
void LyXText::insertParagraph(BufferView * bview, Paragraph * par,
Row * row) const
{
- insertRow(row, par, 0); /* insert a new row, starting
- * at postition 0 */
+ // insert a new row, starting at position 0
+ insertRow(row, par, 0);
- setCounter(bview->buffer(), par); // set the counters
+ // set the counters
+ setCounter(bview->buffer(), par);
// and now append the whole paragraph behind the new row
if (!row) {
selection.start.pos(), false);
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos(), false);
- updateCounters(bview, cursor.row());
+ updateCounters(bview);
clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true);
setCursor(bview, selection.start.par(), selection.start.pos());
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos());
- updateCounters(bview, cursor.row());
+ updateCounters(bview);
clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos());
selection.start.pos());
selection.cursor = cursor;
setCursor(bview, selection.end.par(), selection.end.pos());
- updateCounters(bview, cursor.row());
+ updateCounters(bview);
clearSelection();
setSelection(bview);
setCursor(bview, tmpcursor.par(), tmpcursor.pos());
if (tmprow && tmprow->next())
setHeightOfRow(bview, tmprow->next());
+ updateCounters(bview);
}
Paragraph * endpar(selection.end.par());
pos_type const startpos(selection.start.pos());
pos_type const endpos(selection.end.pos());
-
+
if (startpar == endpar) {
return startpar->asString(buffer, startpos, endpos, label);
}
|| cursor.row()->next()->par() != cursor.row()->par()) {
setCursor(bview, cursor.par(), rowLast(cursor.row()) + 1);
} else {
- if (cursor.par()->size() &&
+ if (!cursor.par()->empty() &&
(cursor.par()->getChar(rowLast(cursor.row())) == ' '
|| cursor.par()->isNewline(rowLast(cursor.row())))) {
setCursor(bview, cursor.par(), rowLast(cursor.row()));
// 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);
+ LyXCursor const reset_cursor = cursor;
+ bool const implicitSelection = selectWordWhenUnderCursor(bview, PREVIOUS_WORD);
if (!selection.set()) {
bview->owner()->message(_("Nothing to index!"));
//and cursor is set to the original position.
if (implicitSelection) {
clearSelection();
- cursor = resetCursor;
+ cursor = reset_cursor;
setCursor(bview, cursor.par(), cursor.pos());
selection.cursor = cursor;
}
}
-char loweralphaCounter(int n)
-{
- if (n < 1 || n > 26)
- return '?';
- else
- return 'a' + n - 1;
-}
-
-
-namespace {
-
-inline
-char alphaCounter(int n)
-{
- if (n < 1 || n > 26)
- return '?';
- else
- return 'A' + n - 1;
-}
-
-
-inline
-char hebrewCounter(int n)
-{
- static const char hebrew[22] = {
- 'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è',
- 'é', 'ë', 'ì', 'î', 'ð', 'ñ', 'ò', 'ô', 'ö',
- '÷', 'ø', 'ù', 'ú'
- };
- if (n < 1 || n > 22)
- return '?';
- else
- return hebrew[n-1];
-}
-
-
-inline
-string const romanCounter(int n)
-{
- static char const * roman[20] = {
- "i", "ii", "iii", "iv", "v",
- "vi", "vii", "viii", "ix", "x",
- "xi", "xii", "xiii", "xiv", "xv",
- "xvi", "xvii", "xviii", "xix", "xx"
- };
- if (n < 1 || n > 20)
- return "??";
- else
- return roman[n-1];
-}
-
-} // namespace anon
-
-
// set the counter of a paragraph. This includes the labels
void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
{
LyXTextClass const & textclass = buf->params.getLyXTextClass();
LyXLayout_ptr const & layout = par->layout();
- // copy the prev-counters to this one,
- // unless this is the first paragraph
if (par->previous()) {
- for (int i = 0; i < 10; ++i) {
- par->setCounter(i, par->previous()->getFirstCounter(i));
- }
+
par->params().appendix(par->previous()->params().appendix());
if (!par->params().appendix() && par->params().startOfAppendix()) {
par->params().appendix(true);
- for (int i = 0; i < 10; ++i) {
- par->setCounter(i, 0);
- }
+ buf->counters().reset();
}
par->enumdepth = par->previous()->enumdepth;
par->itemdepth = par->previous()->itemdepth;
} else {
- for (int i = 0; i < 10; ++i) {
- par->setCounter(i, 0);
- }
par->params().appendix(par->params().startOfAppendix());
par->enumdepth = 0;
par->itemdepth = 0;
&& par->previous()->getDepth() > par->getDepth()
&& layout->labeltype != LABEL_BIBLIO) {
par->enumdepth = par->depthHook(par->getDepth())->enumdepth;
- par->setCounter(6 + par->enumdepth,
- par->depthHook(par->getDepth())->getCounter(6 + par->enumdepth));
- // reset the counters.A depth change is like a breaking layout
- for (int i = 6 + par->enumdepth + 1; i < 10; ++i)
- par->setCounter(i, 0);
}
if (!par->params().labelString().empty()) {
}
// is it a layout that has an automatic label?
- if (layout->labeltype >= LABEL_COUNTER_CHAPTER) {
+ if (layout->labeltype >= LABEL_COUNTER_CHAPTER) {
int i = layout->labeltype - LABEL_COUNTER_CHAPTER;
- if (i >= 0 && i<= buf->params.secnumdepth) {
- par->incCounter(i); // increment the counter
+ string numbertype, langtype;
+ ostringstream s;
+
+ if (i >= 0 && i <= buf->params.secnumdepth) {
+
+ buf->counters().step(buf->counters().sects[i]);
// Is there a label? Useful for Chapter layout
if (!par->params().appendix()) {
par->params().labelString(string());
}
- ostringstream s;
-
+ // Use if an integer is here less than elegant. For now.
+ int head = textclass.maxcounter() - LABEL_COUNTER_CHAPTER;
if (!par->params().appendix()) {
- switch (2 * LABEL_COUNTER_CHAPTER -
- textclass.maxcounter() + i) {
- case LABEL_COUNTER_CHAPTER:
- s << par->getCounter(i);
- break;
- case LABEL_COUNTER_SECTION:
- s << par->getCounter(i - 1) << '.'
- << par->getCounter(i);
- break;
- case LABEL_COUNTER_SUBSECTION:
- s << par->getCounter(i - 2) << '.'
- << par->getCounter(i - 1) << '.'
- << par->getCounter(i);
- break;
- case LABEL_COUNTER_SUBSUBSECTION:
- s << par->getCounter(i - 3) << '.'
- << par->getCounter(i - 2) << '.'
- << par->getCounter(i - 1) << '.'
- << par->getCounter(i);
-
- break;
- case LABEL_COUNTER_PARAGRAPH:
- s << par->getCounter(i - 4) << '.'
- << par->getCounter(i - 3) << '.'
- << par->getCounter(i - 2) << '.'
- << par->getCounter(i - 1) << '.'
- << par->getCounter(i);
- break;
- case LABEL_COUNTER_SUBPARAGRAPH:
- s << par->getCounter(i - 5) << '.'
- << par->getCounter(i - 4) << '.'
- << par->getCounter(i - 3) << '.'
- << par->getCounter(i - 2) << '.'
- << par->getCounter(i - 1) << '.'
- << par->getCounter(i);
-
- break;
- default:
- // Can this ever be reached? And in the
- // case it is, how can this be correct?
- // (Lgb)
- s << par->getCounter(i) << '.';
- break;
- }
- } else { // appendix
- switch (2 * LABEL_COUNTER_CHAPTER - textclass.maxcounter() + i) {
- case LABEL_COUNTER_CHAPTER:
- if (par->isRightToLeftPar(buf->params))
- s << hebrewCounter(par->getCounter(i));
- else
- s << alphaCounter(par->getCounter(i));
- break;
- case LABEL_COUNTER_SECTION:
- if (par->isRightToLeftPar(buf->params))
- s << hebrewCounter(par->getCounter(i - 1));
- else
- s << alphaCounter(par->getCounter(i - 1));
-
- s << '.'
- << par->getCounter(i);
-
- break;
- case LABEL_COUNTER_SUBSECTION:
- if (par->isRightToLeftPar(buf->params))
- s << hebrewCounter(par->getCounter(i - 2));
- else
- s << alphaCounter(par->getCounter(i - 2));
-
- s << '.'
- << par->getCounter(i-1) << '.'
- << par->getCounter(i);
-
- break;
- case LABEL_COUNTER_SUBSUBSECTION:
- if (par->isRightToLeftPar(buf->params))
- s << hebrewCounter(par->getCounter(i-3));
- else
- s << alphaCounter(par->getCounter(i-3));
-
- s << '.'
- << par->getCounter(i-2) << '.'
- << par->getCounter(i-1) << '.'
- << par->getCounter(i);
-
- break;
- case LABEL_COUNTER_PARAGRAPH:
- if (par->isRightToLeftPar(buf->params))
- s << hebrewCounter(par->getCounter(i-4));
- else
- s << alphaCounter(par->getCounter(i-4));
-
- s << '.'
- << par->getCounter(i-3) << '.'
- << par->getCounter(i-2) << '.'
- << par->getCounter(i-1) << '.'
- << par->getCounter(i);
-
- break;
- case LABEL_COUNTER_SUBPARAGRAPH:
- if (par->isRightToLeftPar(buf->params))
- s << hebrewCounter(par->getCounter(i-5));
- else
- s << alphaCounter(par->getCounter(i-5));
-
- s << '.'
- << par->getCounter(i-4) << '.'
- << par->getCounter(i-3) << '.'
- << par->getCounter(i-2) << '.'
- << par->getCounter(i-1) << '.'
- << par->getCounter(i);
-
- break;
- default:
- // Can this ever be reached? And in the
- // case it is, how can this be correct?
- // (Lgb)
- s << par->getCounter(i) << '.';
-
- break;
- }
+ numbertype = "sectioning";
+ } else {
+ numbertype = "appendix";
+ if (par->isRightToLeftPar(buf->params))
+ langtype = "hebrew";
+ else
+ langtype = "latin";
}
- par->params().labelString(par->params().labelString() +s.str().c_str());
+ s << buf->counters().numberLabel(buf->counters().sects[i],
+ 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...
- for (i++; i < 10; ++i) {
- // reset the following counters
- par->setCounter(i, 0);
- }
+ // reset enum counters
+ buf->counters().reset("enum");
} else if (layout->labeltype < LABEL_COUNTER_ENUMI) {
- for (i++; i < 10; ++i) {
- // reset the following counters
- par->setCounter(i, 0);
- }
+ buf->counters().reset("enum");
} else if (layout->labeltype == LABEL_COUNTER_ENUMI) {
- par->incCounter(i + par->enumdepth);
- int number = par->getCounter(i + par->enumdepth);
-
- ostringstream s;
-
- switch (par->enumdepth) {
- case 1:
- if (par->isRightToLeftPar(buf->params))
- s << '('
- << hebrewCounter(number)
- << ')';
- else
- s << '('
- << loweralphaCounter(number)
- << ')';
- break;
- case 2:
- if (par->isRightToLeftPar(buf->params))
- s << '.' << romanCounter(number);
- else
- s << romanCounter(number) << '.';
- break;
- case 3:
- if (par->isRightToLeftPar(buf->params))
- s << '.'
- << alphaCounter(number);
- else
- s << alphaCounter(number)
- << '.';
- break;
- default:
- if (par->isRightToLeftPar(buf->params))
- s << '.' << number;
- else
- s << number << '.';
- break;
- }
+ buf->counters().step(buf->counters().enums[par->enumdepth]);
+ s << buf->counters().numberLabel(buf->counters().enums[par->enumdepth],
+ "enumeration", langtype);
par->params().labelString(s.str().c_str());
- for (i += par->enumdepth + 1; i < 10; ++i) {
- // reset the following counters
- par->setCounter(i, 0);
- }
-
}
} else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
- int i = LABEL_COUNTER_ENUMI - LABEL_COUNTER_CHAPTER + par->enumdepth;
- par->incCounter(i);
- int number = par->getCounter(i);
+ buf->counters().step("bibitem");
+ int number = buf->counters().value("bibitem");
if (!par->bibkey) {
InsetCommandParams p("bibitem" );
par->bibkey = new InsetBibKey(p);
// the caption hack:
if (layout->labeltype == LABEL_SENSITIVE) {
- bool isOK (par->inInset() && par->inInset()->owner() &&
- (par->inInset()->owner()->lyxCode() == Inset::FLOAT_CODE));
+ Paragraph * tmppar = par;
+ Inset * in = 0;
+ bool isOK = false;
+ while (tmppar && tmppar->inInset()
+ // the single '=' is intended below
+ && (in = tmppar->inInset()->owner())) {
+ if (in->lyxCode() == Inset::FLOAT_CODE) {
+ isOK = true;
+ break;
+ } else {
+ tmppar = in->parOwner();
+ }
+ }
if (isOK) {
- InsetFloat * tmp = static_cast<InsetFloat*>(par->inInset()->owner());
Floating const & fl
- = floatList.getType(tmp->type());
- // We should get the correct number here too.
- s = fl.name() + " #:";
+ = textclass.floats().getType(static_cast<InsetFloat*>(in)->type());
+
+ buf->counters().step(fl.name());
+
+ // Doesn't work... yet.
+ ostringstream o;
+ //o << fl.name() << " " << buf->counters().value(fl.name()) << ":";
+ o << fl.name() << " #:";
+ s = o.str();
} else {
- /* par->SetLayout(0);
- s = layout->labelstring; */
+ // par->SetLayout(0);
+ // s = layout->labelstring;
s = (par->getParLanguage(buf->params)->lang() == "hebrew")
? " :úåòîùî øñç" : "Senseless: ";
}
}
par->params().labelString(s);
- /* reset the enumeration counter. They are always resetted
- * when there is any other layout between */
- for (int i = 6 + par->enumdepth; i < 10; ++i)
- par->setCounter(i, 0);
+ // reset the enumeration counter. They are always resetted
+ // when there is any other layout between
+ for (int i = par->enumdepth; i < 4; ++i) {
+ buf->counters().set(buf->counters().enums[i], 0);
+ }
}
}
// Updates all counters BEHIND the row. Changed paragraphs
// with a dynamic left margin will be rebroken.
-void LyXText::updateCounters(BufferView * bview, Row * row) const
+void LyXText::updateCounters(BufferView * bview) const
{
Paragraph * par;
- if (!row) {
- row = firstrow;
- par = row->par();
- } else {
- par = row->par()->next();
- }
+ Row * row = firstrow;
+ par = row->par();
+ bview->buffer()->counters().reset();
while (par) {
while (row->par() != par)
row = row->next();
setCursor(bview, cursor.par(), cursor.pos());
selection.cursor = cursor;
- updateCounters(bview, cursor.row());
+ updateCounters(bview);
}
selection.cursor = cursor;
setCursor(bview, actpar, pos);
setSelection(bview);
- updateCounters(bview, cursor.row());
+ updateCounters(bview);
}
}
-bool LyXText::gotoNextInset(BufferView * bview,
- vector<Inset::Code> const & codes,
- string const & contents) const
-{
- LyXCursor res = cursor;
- Inset * inset;
- do {
- if (res.pos() < res.par()->size() - 1) {
- res.pos(res.pos() + 1);
- } else {
- res.par(res.par()->next());
- res.pos(0);
- }
-
- } while (res.par() &&
- !(res.par()->isInset(res.pos())
- && (inset = res.par()->getInset(res.pos())) != 0
- && find(codes.begin(), codes.end(), inset->lyxCode())
- != codes.end()
- && (contents.empty() ||
- static_cast<InsetCommand *>(res.par()->getInset(res.pos()))->getContents()
- == contents)));
-
- if (res.par()) {
- setCursor(bview, res.par(), res.pos(), false);
- return true;
- }
- return false;
-}
-
-
void LyXText::checkParagraph(BufferView * bview, Paragraph * par,
pos_type pos)
{
return false;
}
}
-
+
void LyXText::setCursorFromCoordinates(BufferView * bview, LyXCursor & cur,
int x, int y) const
cur.x(x);
cur.y(y + row->baseline());
cur.row(row);
-
+
if (beforeFullRowInset(*row, cur)) {
pos_type last = rowLastPrintable(row);
float x = getCursorX(bview, row->next(), cur.pos(), last, bound);
// we can't possibly have deleted a paragraph before this point
bool deleted = false;
- if ((old_cursor.par()->size() == 0
+ if ((old_cursor.par()->empty()
|| (old_cursor.par()->size() == 1
&& old_cursor.par()->isLineSeparator(0)))) {
// ok, we will delete anything
* there is another layout before */
if (refresh_row->next()) {
breakAgain(bview, refresh_row->next());
- updateCounters(bview, refresh_row);
+ updateCounters(bview);
}
setHeightOfRow(bview, refresh_row);
} else {
there is another layout before */
if (refresh_row) {
breakAgain(bview, refresh_row);
- updateCounters(bview, refresh_row->previous());
+ updateCounters(bview);
}
}
}
-void LyXText::toggleAppendix(BufferView * bview)
-{
- Paragraph * par = cursor.par();
- bool start = !par->params().startOfAppendix();
-
- // ensure that we have only one start_of_appendix in this document
- Paragraph * tmp = ownerParagraph();
- for (; tmp; tmp = tmp->next()) {
- tmp->params().startOfAppendix(false);
- }
-
- par->params().startOfAppendix(start);
-
- // we can set the refreshing parameters now
- status(bview, LyXText::NEED_MORE_REFRESH);
- refresh_y = 0;
- refresh_row = 0; // not needed for full update
- updateCounters(bview, 0);
- setCursor(bview, cursor.par(), cursor.pos());
-}
-
-
Paragraph * LyXText::ownerParagraph() const
{
if (inset_owner) {
return inset_owner->paragraph();
}
- return bv_owner->buffer()->paragraph;
+ return &*(bv_owner->buffer()->paragraphs.begin());
}
if (inset_owner) {
inset_owner->paragraph(p);
} else {
- bv_owner->buffer()->paragraph = p;
+ bv_owner->buffer()->paragraphs.set(p);
}
}
void LyXText::status(BufferView * bview, LyXText::text_status st) const
{
LyXText * t = bview->text;
-
+
// We should only go up with refreshing code so this means that if
// we have a MORE refresh we should never set it to LITTLE if we still
// didn't handle it (and then it will be UNCHANGED. Now as long as