X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.C;h=8ed3e855a58923d276a9e7257736b3144b92e10c;hb=2b378ca3fdbd701b0d5e350e1c6b22155c07a2dc;hp=a203b62feebb74a8ca698357807724ee767d004d;hpb=479e9054dbba9753a1a5e03e12ffab970caf4557;p=lyx.git diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C index a203b62fee..8ed3e855a5 100644 --- a/src/buffer_funcs.C +++ b/src/buffer_funcs.C @@ -38,13 +38,12 @@ #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 @@ -54,7 +53,9 @@ namespace lyx { using namespace std; using support::bformat; +using support::FileName; using support::libFileSearch; +using support::makeAbsPath; using support::makeDisplayPath; using support::onlyFilename; using support::onlyPath; @@ -68,13 +69,13 @@ 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); @@ -82,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" @@ -108,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 " @@ -142,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 = @@ -183,16 +186,16 @@ Buffer * newFile(string const & filename, string const & templatename, 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); @@ -235,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(from_utf8(cit->error_desc), - 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)); } } @@ -349,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(); @@ -376,7 +377,7 @@ void setLabel(Buffer const & buf, ParIterator & it) if (layout->margintype == MARGIN_MANUAL) { if (par.params().labelWidthString().empty()) - par.setLabelWidthString(layout->labelstring()); + par.setLabelWidthString(buf.translateLabel(layout->labelstring())); } else { par.setLabelWidthString(docstring()); } @@ -395,7 +396,7 @@ void setLabel(Buffer const & buf, ParIterator & it) // 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 docstring itemlabel; switch (par.itemdepth) { @@ -468,8 +469,7 @@ void setLabel(Buffer const & buf, ParIterator & it) int number = counters.value(from_ascii("bibitem")); if (par.bibitem()) par.bibitem()->setCounter(number); - // FIXME UNICODE - par.params().labelString(buf.B_(to_ascii(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 @@ -495,16 +495,14 @@ void setLabel(Buffer const & buf, ParIterator & it) s = bformat(_("%1$s #:"), buf.B_(fl.name())); } else { // par->SetLayout(0); - // FIXME UNICODE - s = buf.B_(to_ascii(layout->labelstring())); + s = buf.translateLabel(layout->labelstring()); } par.params().labelString(s); } else if (layout->labeltype == LABEL_NO_LABEL) par.params().labelString(docstring()); else - // FIXME UNICODE - par.params().labelString(buf.B_(to_ascii(layout->labelstring()))); + par.params().labelString(buf.translateLabel(layout->labelstring())); } } // anon namespace @@ -528,7 +526,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 +542,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,7 +593,16 @@ 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); + } } const_cast(buf).tocBackend().update(); @@ -596,9 +614,9 @@ docstring expandLabel(Buffer const & buf, { LyXTextClass const & tclass = buf.params().getLyXTextClass(); - // FIXME UNICODE - docstring fmt = buf.B_(to_ascii(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}'