#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 <iostream>
-
#include <boost/bind.hpp>
#include <boost/filesystem/operations.hpp>
+
+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 = lyx::frontend::Alert;
+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);
}
// 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"
}
// 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 "
-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 =
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 = FileName(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);
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));
}
}
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;
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;
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())
// 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;
{
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();
// 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();
if (layout->margintype == MARGIN_MANUAL) {
if (par.params().labelWidthString().empty())
- // FIXME UNICODE
- par.setLabelWidthString(lyx::from_ascii(layout->labelstring()));
+ par.setLabelWidthString(buf.translateLabel(layout->labelstring()));
} else {
par.setLabelWidthString(docstring());
}
if (layout->toclevel <= buf.params().secnumdepth
&& (layout->latextype != LATEX_ENVIRONMENT
|| isFirstInSequence(it.pit(), it.plist()))) {
- // FIXME UNICODE
- counters.step(lyx::from_ascii(layout->counter));
+ counters.step(layout->counter);
docstring label = expandLabel(buf, layout,
par.params().appendix());
par.params().labelString(label);
// 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) {
case 0:
- itemlabel = lyx::char_type(0x2022);
+ itemlabel = char_type(0x2022);
break;
case 1:
- itemlabel = lyx::char_type(0x2013);
+ itemlabel = char_type(0x2013);
break;
case 2:
- itemlabel = lyx::char_type(0x2217);
+ itemlabel = char_type(0x2217);
break;
case 3:
- itemlabel += lyx::char_type(0x2219); // or 0x00b7
+ itemlabel += char_type(0x2219); // or 0x00b7
break;
}
// FIXME
// Yes I know this is a really, really! bad solution
// (Lgb)
- docstring enumcounter = lyx::from_ascii("enum");
+ docstring enumcounter = from_ascii("enum");
switch (par.itemdepth) {
case 2:
par.params().labelString(counters.counterLabel(buf.B_(format)));
} else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
- counters.step(lyx::from_ascii("bibitem"));
- int number = counters.value(lyx::from_ascii("bibitem"));
+ counters.step(from_ascii("bibitem"));
+ int number = counters.value(from_ascii("bibitem"));
if (par.bibitem())
par.bibitem()->setCounter(number);
- par.params().labelString(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;
docstring s;
if (!type.empty()) {
- Floating const & fl = textclass.floats().getType(type);
+ Floating const & fl = textclass.floats().getType(to_ascii(type));
// FIXME UNICODE
- counters.step(lyx::from_ascii(fl.type()));
+ counters.step(from_ascii(fl.type()));
// Doesn't work... yet.
s = bformat(_("%1$s #:"), buf.B_(fl.name()));
} else {
// par->SetLayout(0);
- s = buf.B_(layout->labelstring());
+ s = buf.translateLabel(layout->labelstring());
}
par.params().labelString(s);
} else if (layout->labeltype == LABEL_NO_LABEL)
par.params().labelString(docstring());
else
- par.params().labelString(buf.B_(layout->labelstring()));
+ par.params().labelString(buf.translateLabel(layout->labelstring()));
}
} // anon namespace
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) {
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:
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());
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<InsetInclude const *>(iit->inset)
+ ->updateLabels(buf);
+ }
}
- lyx::toc::updateToc(buf);
+ const_cast<Buffer &>(buf).tocBackend().update();
}
{
LyXTextClass const & tclass = buf.params().getLyXTextClass();
- docstring fmt = 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}'
if (j != docstring::npos) {
docstring parent(fmt, i + 1, j - i - 1);
// FIXME UNICODE
- docstring label = expandLabel(buf, tclass[lyx::to_utf8(parent)], appendix);
+ 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