X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.C;h=52f9b6f5e325c6f70aca3f1daabeb7a74b1c3b8c;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=782ae4c68fb15a0302ea9aeeaf61b2ccc24c87ba;hpb=1396c7326234f0ee41488e8b8e3d9c57c6a0a2d0;p=lyx.git diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C index 782ae4c68f..52f9b6f5e3 100644 --- a/src/buffer_funcs.C +++ b/src/buffer_funcs.C @@ -14,6 +14,7 @@ #include "buffer_funcs.h" #include "buffer.h" +#include "bufferlist.h" #include "bufferparams.h" #include "dociterator.h" #include "counters.h" @@ -31,48 +32,50 @@ #include "pariterator.h" #include "lyxvc.h" #include "texrow.h" +#include "TocBackend.h" #include "vc-backend.h" -#include "toc.h" #include "frontends/Alert.h" -#include "frontends/Application.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::FileName; +using support::libFileSearch; +using support::makeAbsPath; +using support::makeDisplayPath; +using support::onlyFilename; +using support::onlyPath; +using support::unlink; using std::min; using std::string; +namespace Alert = frontend::Alert; namespace fs = boost::filesystem; namespace { -bool readFile(Buffer * const b, string const & s) +bool readFile(Buffer * const b, FileName const & s) { BOOST_ASSERT(b); // File information about normal file - if (!fs::exists(s)) { - docstring const file = makeDisplayPath(s, 50); + if (!fs::exists(s.toFilesystemEncoding())) { + docstring const file = makeDisplayPath(s.absFilename(), 50); docstring text = bformat(_("The specified document\n%1$s" "\ncould not be read."), file); Alert::error(_("Could not read document"), text); @@ -80,12 +83,13 @@ bool readFile(Buffer * const b, string const & s) } // Check if emergency save file exists and is newer. - string const e = onlyPath(s) + onlyFilename(s) + ".emergency"; + FileName const e(s.absFilename() + ".emergency"); - if (fs::exists(e) && fs::exists(s) - && fs::last_write_time(e) > fs::last_write_time(s)) + if (fs::exists(e.toFilesystemEncoding()) && + fs::exists(s.toFilesystemEncoding()) && + fs::last_write_time(e.toFilesystemEncoding()) > fs::last_write_time(s.toFilesystemEncoding())) { - docstring const file = makeDisplayPath(s, 20); + docstring const file = makeDisplayPath(s.absFilename(), 20); docstring const text = bformat(_("An emergency save of the document " "%1$s exists.\n\n" @@ -106,12 +110,13 @@ bool readFile(Buffer * const b, string const & s) } // Now check if autosave file is newer. - string const a = onlyPath(s) + '#' + onlyFilename(s) + '#'; + FileName const a(onlyPath(s.absFilename()) + '#' + onlyFilename(s.absFilename()) + '#'); - if (fs::exists(a) && fs::exists(s) - && fs::last_write_time(a) > fs::last_write_time(s)) + if (fs::exists(a.toFilesystemEncoding()) && + fs::exists(s.toFilesystemEncoding()) && + fs::last_write_time(a.toFilesystemEncoding()) > fs::last_write_time(s.toFilesystemEncoding())) { - docstring const file = makeDisplayPath(s, 20); + docstring const file = makeDisplayPath(s.absFilename(), 20); docstring const text = bformat(_("The backup of the document " "%1$s is newer.\n\nLoad the " @@ -140,19 +145,19 @@ bool readFile(Buffer * const b, string const & s) -bool loadLyXFile(Buffer * b, string const & s) +bool loadLyXFile(Buffer * b, FileName const & s) { BOOST_ASSERT(b); - if (fs::is_readable(s)) { + if (fs::is_readable(s.toFilesystemEncoding())) { if (readFile(b, s)) { b->lyxvc().file_found_hook(s); - if (!fs::is_writable(s)) + if (!fs::is_writable(s.toFilesystemEncoding())) b->setReadonly(true); return true; } } else { - docstring const file = makeDisplayPath(s, 20); + docstring const file = makeDisplayPath(s.absFilename(), 20); // Here we probably should run if (LyXVC::file_not_found_hook(s)) { docstring const text = @@ -178,24 +183,24 @@ Buffer * newFile(string const & filename, string const & templatename, bool const isNamed) { // get a free buffer - Buffer * b = theApp->bufferList().newBuffer(filename); + Buffer * b = theBufferList().newBuffer(filename); BOOST_ASSERT(b); - string tname; + FileName tname; // use defaults.lyx as a default template if it exists. if (templatename.empty()) tname = libFileSearch("templates", "defaults.lyx"); else - tname = templatename; + tname = makeAbsPath(templatename); if (!tname.empty()) { if (!b->readFile(tname)) { - docstring const file = makeDisplayPath(tname, 50); + docstring const file = makeDisplayPath(tname.absFilename(), 50); docstring const text = bformat( _("The specified document template\n%1$s\ncould not be read."), file); Alert::error(_("Could not read template"), text); - theApp->bufferList().release(b); + theBufferList().release(b); return 0; } } @@ -233,8 +238,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)); } } @@ -259,7 +264,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; @@ -274,9 +279,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; @@ -284,7 +289,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; @@ -293,7 +298,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()) @@ -310,7 +315,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; @@ -333,7 +338,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(); @@ -347,11 +352,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(); @@ -369,54 +372,56 @@ void setLabel(Buffer const & buf, ParIterator & it) // Compute the item depth of the paragraph par.itemdepth = getItemDepth(it); - // erase what was there before - par.params().labelString(string()); - if (layout->margintype == MARGIN_MANUAL) { if (par.params().labelWidthString().empty()) - par.setLabelWidthString(layout->labelstring()); + par.params().labelWidthString(par.translateIfPossible(layout->labelstring(), buf.params())); } else { - par.setLabelWidthString(string()); + par.params().labelWidthString(docstring()); } + // Optimisation: setLabel() can be called for each for each + // paragraph of the document. So we make the string static to + // avoid the repeated instanciation. + static docstring itemlabel; + // is it a layout that has an automatic label? if (layout->labeltype == LABEL_COUNTER) { if (layout->toclevel <= buf.params().secnumdepth && (layout->latextype != LATEX_ENVIRONMENT || isFirstInSequence(it.pit(), it.plist()))) { counters.step(layout->counter); - string label = expandLabel(buf, layout, - par.params().appendix()); - par.params().labelString(label); - } + par.params().labelString( + par.expandLabel(layout, buf.params())); + } else + par.params().labelString(docstring()); + } 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; 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; } - par.params().labelString(itemlabel); + } else if (layout->labeltype == LABEL_ENUMERATE) { // 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: @@ -460,51 +465,51 @@ 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( + par.translateIfPossible(from_ascii(format), buf.params()))); + } 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()))); - // In biblio should't be following counters but... + + par.params().labelString( + par.translateIfPossible(layout->labelstring(), buf.params())); + // In biblio shouldn't be following counters but... } else if (layout->labeltype == LABEL_SENSITIVE) { // Search for the first float or wrap inset in the iterator - string type; size_t i = it.depth(); + InsetBase * in; while (i > 0) { --i; - InsetBase * const in = &it[i].inset(); + in = &it[i].inset(); if (in->lyxCode() == InsetBase::FLOAT_CODE - || in->lyxCode() == InsetBase::WRAP_CODE) { - type = in->getInsetName(); + || in->lyxCode() == InsetBase::WRAP_CODE) break; - } } + docstring const & type = in->getInsetName(); - 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())); + par.params().labelString(par.translateIfPossible( + bformat(from_ascii("%1$s #:"), from_utf8(fl.name())), + buf.params())); } else { // par->SetLayout(0); - // FIXME UNICODE - s = buf.B_(layout->labelstring()); + par.params().labelString(par.translateIfPossible( + layout->labelstring(), buf.params())); } - par.params().labelString(lyx::to_utf8(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( + par.translateIfPossible(layout->labelstring(), buf.params())); } } // anon namespace @@ -516,7 +521,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) { @@ -528,7 +533,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: @@ -544,33 +549,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()); @@ -584,33 +600,20 @@ 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) -{ - LyXTextClass const & tclass = buf.params().getLyXTextClass(); - - // FIXME UNICODE - string fmt = lyx::to_utf8(buf.B_(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) { - 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); - } - } - - return tclass.counters().counterLabel(fmt); -} +} // namespace lyx