#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::docstring;
using lyx::support::bformat;
using lyx::support::libFileSearch;
using lyx::support::makeDisplayPath;
// File information about normal file
if (!fs::exists(s)) {
- string const file = makeDisplayPath(s, 50);
- string text = bformat(_("The specified document\n%1$s"
- "\ncould not be read."), file);
+ docstring const file = makeDisplayPath(s, 50);
+ docstring text = bformat(_("The specified document\n%1$s"
+ "\ncould not be read."), file);
Alert::error(_("Could not read document"), text);
return false;
}
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 text =
+ docstring const file = makeDisplayPath(s, 20);
+ docstring const text =
bformat(_("An emergency save of the document "
"%1$s exists.\n\n"
- "Recover emergency save?"), file);
+ "Recover emergency save?"), file);
switch (Alert::prompt(_("Load emergency save?"), text, 0, 2,
_("&Recover"), _("&Load Original"),
_("&Cancel")))
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 text =
+ docstring const file = makeDisplayPath(s, 20);
+ docstring const text =
bformat(_("The backup of the document "
"%1$s is newer.\n\nLoad the "
- "backup instead?"), file);
+ "backup instead?"), file);
switch (Alert::prompt(_("Load backup?"), text, 0, 2,
_("&Load backup"), _("Load &original"),
_("&Cancel") ))
return true;
}
} else {
- string const file = makeDisplayPath(s, 20);
+ docstring const file = makeDisplayPath(s, 20);
// Here we probably should run
if (LyXVC::file_not_found_hook(s)) {
- string const text =
+ docstring const text =
bformat(_("Do you want to retrieve the document"
- " %1$s from version control?"), file);
+ " %1$s from version control?"), file);
int const ret = Alert::prompt(_("Retrieve from version control?"),
text, 0, 1, _("&Retrieve"), _("&Cancel"));
if (!tname.empty()) {
if (!b->readFile(tname)) {
- string const file = makeDisplayPath(tname, 50);
- string const text = bformat(_("The specified document template\n%1$s\ncould not be read."), file);
+ docstring const file = makeDisplayPath(tname, 50);
+ docstring 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;
}
}
}
-void bufferErrors(Buffer const & buf, TeXErrors const & terr)
+void bufferErrors(Buffer const & buf, TeXErrors const & terr,
+ ErrorList & errorList)
{
TeXErrors::Errors::const_iterator cit = terr.begin();
TeXErrors::Errors::const_iterator end = terr.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));
+ errorList.push_back(ErrorItem(lyx::from_utf8(cit->error_desc),
+ lyx::from_utf8(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));
-}
-
-
string const bufferFormat(Buffer const & buffer)
{
- if (buffer.isLinuxDoc())
- return "linuxdoc";
- else if (buffer.isDocBook())
+ if (buffer.isDocBook())
return "docbook";
else if (buffer.isLiterate())
return "literate";
}
-// 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();
break;
}
- par.params().labelString(counters.counterLabel(buf.B_(format)));
+ // FIXME UNICODE
+ par.params().labelString(counters.counterLabel(lyx::to_utf8(buf.B_(format))));
} else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
counters.step("bibitem");
int number = counters.value("bibitem");
if (par.bibitem())
par.bibitem()->setCounter(number);
- par.params().labelString(buf.B_(layout->labelstring()));
+ // FIXME UNICODE
+ par.params().labelString(lyx::to_utf8(buf.B_(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 s;
+ docstring s;
if (!type.empty()) {
Floating const & fl = textclass.floats().getType(type);
counters.step(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());
}
- par.params().labelString(s);
- } else
- par.params().labelString(buf.B_(layout->labelstring()));
+ par.params().labelString(lyx::to_utf8(s));
+ } else if (layout->labeltype == LABEL_NO_LABEL)
+ par.params().labelString(string());
+ else
+ // FIXME UNICODE
+ par.params().labelString(lyx::to_utf8(buf.B_(layout->labelstring())));
}
} // anon namespace
-bool needsUpdateCounters(Buffer const & buf, ParIterator & it)
+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_CENTERED_TOP_ENVIRONMENT:
case LABEL_STATIC:
case LABEL_ITEMIZE:
- setCounter(buf, it);
- return false;
+ setLabel(buf, it);
+ return true;
case LABEL_SENSITIVE:
case LABEL_COUNTER:
// do more things with enumerate later
case LABEL_ENUMERATE:
- return true;
+ return false;
+ }
+
+ // This is dead code which get rid of a warning:
+ return true;
+}
+
+
+void updateLabels(Buffer const & buf,
+ ParIterator & from, ParIterator & to)
+{
+ for (ParIterator it = from; it != to; ++it) {
+ if (it.pit() > it.lastpit())
+ return;
+ if (!updateCurrentLabel (buf, it)) {
+ updateLabels(buf);
+ return;
+ }
}
}
-void updateCounters(Buffer const & buf)
+void updateLabels(Buffer const & buf,
+ ParIterator & iter)
{
- // start over
+ if (updateCurrentLabel(buf, iter))
+ return;
+
+ updateLabels(buf);
+}
+
+
+void updateLabels(Buffer const & buf)
+{
+ // start over the counters
buf.params().getLyXTextClass().counters().reset();
- for (ParIterator it = par_iterator_begin(buf.inset()); it; ++it) {
+ ParIterator const end = par_iterator_end(buf.inset());
+
+ 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);
}
{
LyXTextClass const & tclass = buf.params().getLyXTextClass();
- string fmt = buf.B_(appendix ? layout->labelstring_appendix()
- : layout->labelstring());
+ // 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}'
projects / lyx.git / blobdiff