X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.C;h=fae278648eb63d135638af6dc90562d1a6199a53;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=706f0ccf81f36a7b8b6b3a02e26c91c4dfe1ab10;hpb=28ad9602557a145bfd88c79dddecdc34c95c698c;p=lyx.git diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C index 706f0ccf81..fae278648e 100644 --- a/src/buffer_funcs.C +++ b/src/buffer_funcs.C @@ -32,37 +32,37 @@ #include "pariterator.h" #include "lyxvc.h" #include "texrow.h" +#include "TocBackend.h" #include "vc-backend.h" -#include "toc.h" #include "frontends/Alert.h" #include "insets/insetbibitem.h" +#include "insets/insetinclude.h" #include "support/filetools.h" #include "support/fs_extras.h" #include "support/lyxlib.h" -#include - #include #include + +namespace lyx { + using namespace std; -using lyx::pit_type; -using lyx::docstring; -using lyx::support::bformat; -using lyx::support::libFileSearch; -using lyx::support::makeDisplayPath; -using lyx::support::onlyFilename; -using lyx::support::onlyPath; -using lyx::support::unlink; +using support::bformat; +using support::libFileSearch; +using support::makeDisplayPath; +using support::onlyFilename; +using support::onlyPath; +using support::unlink; using std::min; using std::string; -namespace Alert = lyx::frontend::Alert; +namespace Alert = frontend::Alert; namespace fs = boost::filesystem; namespace { @@ -234,8 +234,8 @@ void bufferErrors(Buffer const & buf, TeXErrors const & terr, pos_end); } while (found && id_start == id_end && pos_start == pos_end); - errorList.push_back(ErrorItem(lyx::from_utf8(cit->error_desc), - lyx::from_utf8(cit->error_text), id_start, pos_start, pos_end)); + errorList.push_back(ErrorItem(cit->error_desc, + cit->error_text, id_start, pos_start, pos_end)); } } @@ -260,7 +260,7 @@ int countWords(DocIterator const & from, DocIterator const & to) if (dit.inTexted() && dit.pos() != dit.lastpos() && dit.paragraph().isLetter(dit.pos()) - && !isDeletedText(dit.paragraph(), dit.pos())) { + && !dit.paragraph().isDeleted(dit.pos())) { if (!inword) { ++count; inword = true; @@ -275,9 +275,9 @@ int countWords(DocIterator const & from, DocIterator const & to) namespace { -lyx::depth_type getDepth(DocIterator const & it) +depth_type getDepth(DocIterator const & it) { - lyx::depth_type depth = 0; + depth_type depth = 0; for (size_t i = 0 ; i < it.depth() ; ++i) if (!it[i].inset().inMathed()) depth += it[i].paragraph().getDepth() + 1; @@ -285,7 +285,7 @@ lyx::depth_type getDepth(DocIterator const & it) return depth - 1; } -lyx::depth_type getItemDepth(ParIterator const & it) +depth_type getItemDepth(ParIterator const & it) { Paragraph const & par = *it; LYX_LABEL_TYPES const labeltype = par.layout()->labeltype; @@ -294,7 +294,7 @@ lyx::depth_type getItemDepth(ParIterator const & it) return 0; // this will hold the lowest depth encountered up to now. - lyx::depth_type min_depth = getDepth(it); + depth_type min_depth = getDepth(it); ParIterator prev_it = it; while (true) { if (prev_it.pit()) @@ -311,7 +311,7 @@ lyx::depth_type getItemDepth(ParIterator const & it) // 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); + depth_type const prev_depth = getDepth(prev_it); if (labeltype == prev_par.layout()->labeltype) { if (prev_depth < min_depth) { return prev_par.itemdepth + 1; @@ -334,7 +334,7 @@ bool needEnumCounterReset(ParIterator const & it) { Paragraph const & par = *it; BOOST_ASSERT(par.layout()->labeltype == LABEL_ENUMERATE); - lyx::depth_type const cur_depth = par.getDepth(); + depth_type const cur_depth = par.getDepth(); ParIterator prev_it = it; while (prev_it.pit()) { --prev_it.top().pit(); @@ -348,11 +348,9 @@ bool needEnumCounterReset(ParIterator const & it) // set the label of a paragraph. This includes the counters. -void setLabel(Buffer const & buf, ParIterator & it) +void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textclass) { Paragraph & par = *it; - BufferParams const & bufparams = buf.params(); - LyXTextClass const & textclass = bufparams.getLyXTextClass(); LyXLayout_ptr const & layout = par.layout(); Counters & counters = textclass.counters(); @@ -371,13 +369,13 @@ void setLabel(Buffer const & buf, ParIterator & it) par.itemdepth = getItemDepth(it); // erase what was there before - par.params().labelString(string()); + par.params().labelString(docstring()); if (layout->margintype == MARGIN_MANUAL) { if (par.params().labelWidthString().empty()) - par.setLabelWidthString(layout->labelstring()); + par.setLabelWidthString(buf.translateLabel(layout->labelstring())); } else { - par.setLabelWidthString(string()); + par.setLabelWidthString(docstring()); } // is it a layout that has an automatic label? @@ -386,29 +384,29 @@ void setLabel(Buffer const & buf, ParIterator & it) && (layout->latextype != LATEX_ENVIRONMENT || isFirstInSequence(it.pit(), it.plist()))) { counters.step(layout->counter); - string label = expandLabel(buf, layout, - par.params().appendix()); + docstring label = expandLabel(buf, layout, + par.params().appendix()); par.params().labelString(label); } } else if (layout->labeltype == LABEL_ITEMIZE) { // At some point of time we should do something more // clever here, like: // par.params().labelString( - // bufparams.user_defined_bullet(par.itemdepth).getText()); + // buf.params().user_defined_bullet(par.itemdepth).getText()); // for now, use a simple hardcoded label - string itemlabel; + docstring itemlabel; switch (par.itemdepth) { case 0: - itemlabel = "*"; + itemlabel = char_type(0x2022); break; case 1: - itemlabel = "-"; + itemlabel = char_type(0x2013); break; case 2: - itemlabel = "@"; + itemlabel = char_type(0x2217); break; case 3: - itemlabel = "ยท"; + itemlabel += char_type(0x2219); // or 0x00b7 break; } @@ -417,7 +415,7 @@ void setLabel(Buffer const & buf, ParIterator & it) // FIXME // Yes I know this is a really, really! bad solution // (Lgb) - string enumcounter = "enum"; + docstring enumcounter = from_ascii("enum"); switch (par.itemdepth) { case 2: @@ -461,19 +459,17 @@ void setLabel(Buffer const & buf, ParIterator & it) break; } - // FIXME UNICODE - par.params().labelString(counters.counterLabel(lyx::to_utf8(buf.B_(format)))); + par.params().labelString(counters.counterLabel(buf.B_(format))); } else if (layout->labeltype == LABEL_BIBLIO) {// ale970302 - counters.step("bibitem"); - int number = counters.value("bibitem"); + counters.step(from_ascii("bibitem")); + int number = counters.value(from_ascii("bibitem")); if (par.bibitem()) par.bibitem()->setCounter(number); - // FIXME UNICODE - par.params().labelString(lyx::to_utf8(buf.B_(layout->labelstring()))); + par.params().labelString(buf.translateLabel(layout->labelstring())); // In biblio should't be following counters but... } else if (layout->labeltype == LABEL_SENSITIVE) { // Search for the first float or wrap inset in the iterator - string type; + docstring type; size_t i = it.depth(); while (i > 0) { --i; @@ -487,25 +483,22 @@ void setLabel(Buffer const & buf, ParIterator & it) docstring s; if (!type.empty()) { - Floating const & fl = textclass.floats().getType(type); - - counters.step(fl.type()); + Floating const & fl = textclass.floats().getType(to_ascii(type)); + // FIXME UNICODE + counters.step(from_ascii(fl.type())); // Doesn't work... yet. - // FIXME UNICODE s = bformat(_("%1$s #:"), buf.B_(fl.name())); } else { // par->SetLayout(0); - // FIXME UNICODE - s = buf.B_(layout->labelstring()); + s = buf.translateLabel(layout->labelstring()); } - par.params().labelString(lyx::to_utf8(s)); + par.params().labelString(s); } else if (layout->labeltype == LABEL_NO_LABEL) - par.params().labelString(string()); + par.params().labelString(docstring()); else - // FIXME UNICODE - par.params().labelString(lyx::to_utf8(buf.B_(layout->labelstring()))); + par.params().labelString(buf.translateLabel(layout->labelstring())); } } // anon namespace @@ -517,7 +510,7 @@ bool updateCurrentLabel(Buffer const & buf, if (it == par_iterator_end(buf.inset())) return false; -// if (it.lastpit == 0 && LyXText::isMainText()) +// if (it.lastpit == 0 && LyXText::isMainText(buf)) // return false; switch (it->layout()->labeltype) { @@ -529,7 +522,7 @@ bool updateCurrentLabel(Buffer const & buf, case LABEL_CENTERED_TOP_ENVIRONMENT: case LABEL_STATIC: case LABEL_ITEMIZE: - setLabel(buf, it); + setLabel(buf, it, buf.params().getLyXTextClass()); return true; case LABEL_SENSITIVE: @@ -545,33 +538,44 @@ bool updateCurrentLabel(Buffer const & buf, void updateLabels(Buffer const & buf, - ParIterator & from, ParIterator & to) + ParIterator & from, ParIterator & to, bool childonly) { for (ParIterator it = from; it != to; ++it) { if (it.pit() > it.lastpit()) return; if (!updateCurrentLabel (buf, it)) { - updateLabels(buf); + updateLabels(buf, childonly); return; } } } -void updateLabels(Buffer const & buf, - ParIterator & iter) +void updateLabels(Buffer const & buf, ParIterator & iter, bool childonly) { if (updateCurrentLabel(buf, iter)) return; - updateLabels(buf); + updateLabels(buf, childonly); } -void updateLabels(Buffer const & buf) +void updateLabels(Buffer const & buf, bool childonly) { - // start over the counters - buf.params().getLyXTextClass().counters().reset(); + // Use the master text class also for child documents + LyXTextClass const & textclass = buf.params().getLyXTextClass(); + + if (!childonly) { + // If this is a child document start with the master + Buffer const * const master = buf.getMasterBuffer(); + if (master != &buf) { + updateLabels(*master); + return; + } + + // start over the counters + textclass.counters().reset(); + } ParIterator const end = par_iterator_end(buf.inset()); @@ -585,33 +589,46 @@ void updateLabels(Buffer const & buf) it->params().depth(0); // set the counter for this paragraph - setLabel(buf, it); + setLabel(buf, it, textclass); + + // Now included docs + InsetList::const_iterator iit = it->insetlist.begin(); + InsetList::const_iterator end = it->insetlist.end(); + for (; iit != end; ++iit) { + if (iit->inset->lyxCode() == InsetBase::INCLUDE_CODE) + static_cast(iit->inset) + ->updateLabels(buf); + } } - lyx::toc::updateToc(buf); + const_cast(buf).tocBackend().update(); } -string expandLabel(Buffer const & buf, - LyXLayout_ptr const & layout, bool appendix) +docstring expandLabel(Buffer const & buf, + LyXLayout_ptr const & layout, bool appendix) { LyXTextClass const & tclass = buf.params().getLyXTextClass(); - // FIXME UNICODE - string fmt = lyx::to_utf8(buf.B_(appendix ? layout->labelstring_appendix() - : layout->labelstring())); + docstring fmt = buf.translateLabel(appendix ? + layout->labelstring_appendix() : + layout->labelstring()); // handle 'inherited level parts' in 'fmt', // i.e. the stuff between '@' in '@Section@.\arabic{subsection}' size_t const i = fmt.find('@', 0); - if (i != string::npos) { + if (i != docstring::npos) { size_t const j = fmt.find('@', i + 1); - if (j != string::npos) { - string parent(fmt, i + 1, j - i - 1); - string label = expandLabel(buf, tclass[parent], appendix); - fmt = string(fmt, 0, i) + label + string(fmt, j + 1, string::npos); + if (j != docstring::npos) { + docstring parent(fmt, i + 1, j - i - 1); + // FIXME UNICODE + docstring label = expandLabel(buf, tclass[to_utf8(parent)], appendix); + fmt = docstring(fmt, 0, i) + label + docstring(fmt, j + 1, docstring::npos); } } return tclass.counters().counterLabel(fmt); } + + +} // namespace lyx