#include <config.h>
#include "buffer_funcs.h"
-
#include "buffer.h"
#include "bufferlist.h"
#include "bufferparams.h"
#include "Floating.h"
#include "FloatList.h"
#include "gettext.h"
+#include "language.h"
#include "LaTeX.h"
#include "lyxtextclass.h"
#include "paragraph.h"
TeXErrors::Errors::const_iterator end = terr.end();
for (; cit != end; ++cit) {
- int par_id = -1;
- int posstart = -1;
- int const errorrow = cit->error_in_line;
- buf.texrow().getIdFromRow(errorrow, par_id, posstart);
- int posend = -1;
- buf.texrow().getIdFromRow(errorrow + 1, par_id, posend);
- buf.error(ErrorItem(cit->error_desc,
- cit->error_text,
- par_id, posstart, posend));
+ int id_start = -1;
+ int pos_start = -1;
+ int errorrow = cit->error_in_line;
+ bool found = buf.texrow().getIdFromRow(errorrow, id_start,
+ pos_start);
+ int id_end = -1;
+ int pos_end = -1;
+ do {
+ ++errorrow;
+ found = buf.texrow().getIdFromRow(errorrow, id_end,
+ pos_end);
+ } while (found && id_start == id_end && pos_start == pos_end);
+
+ buf.error(ErrorItem(cit->error_desc, cit->error_text,
+ id_start, pos_start, pos_end));
}
}
namespace {
-void incrementItemDepth(ParagraphList & pars, pit_type pit, pit_type first_pit)
+lyx::depth_type getDepth(DocIterator const & it)
{
- int const cur_labeltype = pars[pit].layout()->labeltype;
+ lyx::depth_type depth = 0;
+ for (size_t i = 0 ; i < it.depth() ; ++i)
+ if (!it[i].inset().inMathed())
+ depth += it[i].paragraph().getDepth() + 1;
+ // remove 1 since the outer inset does not count
+ return depth - 1;
+}
- if (cur_labeltype != LABEL_ENUMERATE && cur_labeltype != LABEL_ITEMIZE)
- return;
+lyx::depth_type getItemDepth(ParIterator const & it)
+{
+ Paragraph const & par = *it;
+ LYX_LABEL_TYPES const labeltype = par.layout()->labeltype;
- int const cur_depth = pars[pit].getDepth();
+ if (labeltype != LABEL_ENUMERATE && labeltype != LABEL_ITEMIZE)
+ return 0;
- pit_type prev_pit = pit - 1;
+ // this will hold the lowest depth encountered up to now.
+ lyx::depth_type min_depth = getDepth(it);
+ ParIterator prev_it = it;
while (true) {
- int const prev_depth = pars[prev_pit].getDepth();
- int const prev_labeltype = pars[prev_pit].layout()->labeltype;
- if (prev_depth == 0 && cur_depth > 0) {
- if (prev_labeltype == cur_labeltype) {
- pars[pit].itemdepth = pars[prev_pit].itemdepth + 1;
+ if (prev_it.pit())
+ --prev_it.top().pit();
+ else {
+ // start of nested inset: go to outer par
+ prev_it.pop_back();
+ if (prev_it.empty()) {
+ // start of document: nothing to do
+ return 0;
}
- break;
- } else if (prev_depth < cur_depth) {
- if (prev_labeltype == cur_labeltype) {
- pars[pit].itemdepth = pars[prev_pit].itemdepth + 1;
- break;
+ }
+
+ // We search for the first paragraph with same label
+ // that is not more deeply nested.
+ Paragraph & prev_par = *prev_it;
+ lyx::depth_type const prev_depth = getDepth(prev_it);
+ if (labeltype == prev_par.layout()->labeltype) {
+ if (prev_depth < min_depth) {
+ return prev_par.itemdepth + 1;
}
- } else if (prev_depth == cur_depth) {
- if (prev_labeltype == cur_labeltype) {
- pars[pit].itemdepth = pars[prev_pit].itemdepth;
- break;
+ else if (prev_depth == min_depth) {
+ return prev_par.itemdepth;
}
}
- if (prev_pit == first_pit)
- break;
-
- --prev_pit;
+ min_depth = std::min(min_depth, prev_depth);
+ // small optimization: if we are at depth 0, we won't
+ // find anything else
+ if (prev_depth == 0) {
+ return 0;
+ }
}
}
-void resetEnumCounterIfNeeded(ParagraphList & pars, pit_type pit,
- pit_type firstpit, Counters & counters)
+bool needEnumCounterReset(ParIterator const & it)
{
- if (pit == firstpit)
- return;
-
- int const cur_depth = pars[pit].getDepth();
- pit_type prev_pit = pit - 1;
- while (true) {
- int const prev_depth = pars[prev_pit].getDepth();
- int const prev_labeltype = pars[prev_pit].layout()->labeltype;
- if (prev_depth <= cur_depth) {
- if (prev_labeltype != LABEL_ENUMERATE) {
- switch (pars[pit].itemdepth) {
- case 0:
- counters.reset("enumi");
- case 1:
- counters.reset("enumii");
- case 2:
- counters.reset("enumiii");
- case 3:
- counters.reset("enumiv");
- }
- }
- break;
- }
-
- if (prev_pit == firstpit)
- break;
-
- --prev_pit;
+ Paragraph const & par = *it;
+ BOOST_ASSERT(par.layout()->labeltype == LABEL_ENUMERATE);
+ lyx::depth_type const cur_depth = par.getDepth();
+ ParIterator prev_it = it;
+ while (prev_it.pit()) {
+ --prev_it.top().pit();
+ Paragraph const & prev_par = *prev_it;
+ if (prev_par.getDepth() <= cur_depth)
+ return prev_par.layout()->labeltype != LABEL_ENUMERATE;
}
+ // start of nested inset: reset
+ return true;
}
LyXLayout_ptr const & layout = par.layout();
Counters & counters = textclass.counters();
- // Always reset
- par.itemdepth = 0;
-
if (it.pit() == 0) {
par.params().appendix(par.params().startOfAppendix());
} else {
par.params().appendix(true);
textclass.counters().reset();
}
-
- // Maybe we have to increment the item depth.
- incrementItemDepth(it.plist(), it.pit(), 0);
}
+ // Compute the item depth of the paragraph
+ par.itemdepth = getItemDepth(it);
+
// erase what was there before
par.params().labelString(string());
par.params().labelString(itemlabel);
} else if (layout->labeltype == LABEL_ENUMERATE) {
- // Maybe we have to reset the enumeration counter.
- resetEnumCounterIfNeeded(it.plist(), it.pit(), 0, counters);
-
// FIXME
// Yes I know this is a really, really! bad solution
// (Lgb)
break;
}
+ // Maybe we have to reset the enumeration counter.
+ if (needEnumCounterReset(it))
+ counters.reset(enumcounter);
+
counters.step(enumcounter);
- par.params().labelString(counters.enumLabel(enumcounter));
+ string format;
+
+ switch (par.itemdepth) {
+ case 0:
+ format = N_("\\arabic{enumi}.");
+ break;
+ case 1:
+ format = N_("(\\alph{enumii})");
+ break;
+ case 2:
+ format = N_("\\roman{enumiii}.");
+ break;
+ case 3:
+ format = N_("\\Alph{enumiv}.");
+ break;
+ default:
+ // not a valid enumdepth...
+ break;
+ }
+
+ par.params().labelString(counters.counterLabel(buf.B_(format)));
} else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
counters.step("bibitem");
int number = counters.value("bibitem");
- if (par.bibitem())
+ if (par.bibitem())
par.bibitem()->setCounter(number);
par.params().labelString(buf.B_(layout->labelstring()));
// In biblio should't be following counters but...
--i;
InsetBase * const in = &it[i].inset();
if (in->lyxCode() == InsetBase::FLOAT_CODE
- || in->lyxCode() == InsetBase::WRAP_CODE)
+ || in->lyxCode() == InsetBase::WRAP_CODE) {
type = in->getInsetName();
break;
+ }
}
string s;
{
LyXTextClass const & tclass = buf.params().getLyXTextClass();
- string fmt = buf.B_(appendix ? layout->labelstring_appendix()
+ string fmt = buf.B_(appendix ? layout->labelstring_appendix()
: layout->labelstring());
// handle 'inherited level parts' in 'fmt',
projects / lyx.git / blobdiff