#include "lyxvc.h"
#include "texrow.h"
#include "vc-backend.h"
+#include "toc.h"
#include "frontends/Alert.h"
#include "support/fs_extras.h"
#include "support/lyxlib.h"
+#include <iostream>
+
#include <boost/bind.hpp>
#include <boost/filesystem/operations.hpp>
+using namespace std;
+
using lyx::pit_type;
using lyx::support::bformat;
-using lyx::support::LibFileSearch;
-using lyx::support::MakeDisplayPath;
-using lyx::support::OnlyFilename;
-using lyx::support::OnlyPath;
+using lyx::support::libFileSearch;
+using lyx::support::makeDisplayPath;
+using lyx::support::onlyFilename;
+using lyx::support::onlyPath;
using lyx::support::unlink;
using std::min;
// File information about normal file
if (!fs::exists(s)) {
- string const file = MakeDisplayPath(s, 50);
+ string const file = makeDisplayPath(s, 50);
string text = bformat(_("The specified document\n%1$s"
"\ncould not be read."), file);
Alert::error(_("Could not read document"), text);
}
// Check if emergency save file exists and is newer.
- string const e = OnlyPath(s) + OnlyFilename(s) + ".emergency";
+ string const e = onlyPath(s) + onlyFilename(s) + ".emergency";
if (fs::exists(e) && fs::exists(s)
&& fs::last_write_time(e) > fs::last_write_time(s))
{
- string const file = MakeDisplayPath(s, 20);
+ string const file = makeDisplayPath(s, 20);
string const text =
bformat(_("An emergency save of the document "
"%1$s exists.\n\n"
}
// Now check if autosave file is newer.
- string const a = OnlyPath(s) + '#' + OnlyFilename(s) + '#';
+ string const a = onlyPath(s) + '#' + onlyFilename(s) + '#';
if (fs::exists(a) && fs::exists(s)
&& fs::last_write_time(a) > fs::last_write_time(s))
{
- string const file = MakeDisplayPath(s, 20);
+ string const file = makeDisplayPath(s, 20);
string const text =
bformat(_("The backup of the document "
"%1$s is newer.\n\nLoad the "
return true;
}
} else {
- string const file = MakeDisplayPath(s, 20);
+ string const file = makeDisplayPath(s, 20);
// Here we probably should run
if (LyXVC::file_not_found_hook(s)) {
string const text =
string tname;
// use defaults.lyx as a default template if it exists.
if (templatename.empty())
- tname = LibFileSearch("templates", "defaults.lyx");
+ tname = libFileSearch("templates", "defaults.lyx");
else
tname = templatename;
if (!tname.empty()) {
if (!b->readFile(tname)) {
- string const file = MakeDisplayPath(tname, 50);
+ string const file = makeDisplayPath(tname, 50);
string const text = bformat(_("The specified document template\n%1$s\ncould not be read."), file);
Alert::error(_("Could not read template"), text);
- // no template, start with empty buffer
+ bufferlist.release(b);
+ return 0;
}
}
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));
+ buf.addError(ErrorItem(cit->error_desc,
+ cit->error_text, id_start, pos_start, pos_end));
}
}
void bufferErrors(Buffer const & buf, ErrorList const & el)
{
- for_each(el.begin(), el.end(), bind(ref(buf.error), _1));
+ buf.setErrorList(el);
}
-string const BufferFormat(Buffer const & buffer)
+string const bufferFormat(Buffer const & buffer)
{
if (buffer.isLinuxDoc())
return "linuxdoc";
}
-// set the counter of a paragraph. This includes the labels
-void setCounter(Buffer const & buf, ParIterator & it)
+// set the label of a paragraph. This includes the counters.
+void setLabel(Buffer const & buf, ParIterator & it)
{
Paragraph & par = *it;
BufferParams const & bufparams = buf.params();
}
par.params().labelString(s);
- } else
+ } else if (layout->labeltype == LABEL_NO_LABEL)
+ par.params().labelString(string());
+ else
par.params().labelString(buf.B_(layout->labelstring()));
}
} // anon namespace
-void updateCounters(Buffer const & buf)
+bool updateCurrentLabel(Buffer const & buf,
+ ParIterator & it)
+{
+ if (it == par_iterator_end(buf.inset()))
+ return false;
+
+// if (it.lastpit == 0 && LyXText::isMainText())
+// return false;
+
+ switch (it->layout()->labeltype) {
+
+ case LABEL_NO_LABEL:
+ case LABEL_MANUAL:
+ case LABEL_BIBLIO:
+ case LABEL_TOP_ENVIRONMENT:
+ case LABEL_CENTERED_TOP_ENVIRONMENT:
+ case LABEL_STATIC:
+ case LABEL_ITEMIZE:
+ setLabel(buf, it);
+ return true;
+
+ case LABEL_SENSITIVE:
+ case LABEL_COUNTER:
+ // do more things with enumerate later
+ case LABEL_ENUMERATE:
+ return false;
+ }
+
+ // This is dead code which get rid of a warning:
+ return true;
+}
+
+
+void updateLabels(Buffer const & buf,
+ ParIterator & from, ParIterator & to)
{
- // start over
+ for (ParIterator it = from; it != to; ++it) {
+ if (it.pit() > it.lastpit())
+ return;
+ if (!updateCurrentLabel (buf, it)) {
+ updateLabels(buf);
+ return;
+ }
+ }
+}
+
+
+void updateLabels(Buffer const & buf,
+ ParIterator & iter)
+{
+ if (updateCurrentLabel(buf, iter))
+ return;
+
+ updateLabels(buf);
+}
+
+
+void updateLabels(Buffer const & buf)
+{
+ // start over the counters
buf.params().getLyXTextClass().counters().reset();
+
+ ParIterator const end = par_iterator_end(buf.inset());
- for (ParIterator it = par_iterator_begin(buf.inset()); it; ++it) {
+ for (ParIterator it = par_iterator_begin(buf.inset()); it != end; ++it) {
// reduce depth if necessary
if (it.pit()) {
Paragraph const & prevpar = it.plist()[it.pit() - 1];
it->params().depth(0);
// set the counter for this paragraph
- setCounter(buf, it);
+ setLabel(buf, it);
}
+
+ lyx::toc::updateToc(buf);
}
projects / lyx.git / blobdiff