#include <boost/bind.hpp>
#include <boost/filesystem/operations.hpp>
+
+namespace lyx {
+
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::unlink;
+using support::bformat;
+using support::libFileSearch;
+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;
-extern BufferList bufferlist;
-
namespace {
bool readFile(Buffer * const b, string const & s)
// 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"));
return false;
}
-
+// FIXME newFile() should probably be a member method of Application...
Buffer * newFile(string const & filename, string const & templatename,
bool const isNamed)
{
// get a free buffer
- Buffer * b = bufferlist.newBuffer(filename);
+ Buffer * b = theBufferList().newBuffer(filename);
BOOST_ASSERT(b);
string tname;
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);
- bufferlist.release(b);
+ theBufferList().release(b);
return 0;
}
}
pos_end);
} while (found && id_start == id_end && pos_start == pos_end);
- errorList.push_back(ErrorItem(cit->error_desc,
- cit->error_text, id_start, pos_start, pos_end));
+ errorList.push_back(ErrorItem(from_utf8(cit->error_desc),
+ from_utf8(cit->error_text), id_start, pos_start, pos_end));
}
}
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;
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();
par.itemdepth = getItemDepth(it);
// erase what was there before
- par.params().labelString(string());
+ par.params().labelString(docstring());
if (layout->margintype == MARGIN_MANUAL) {
if (par.params().labelWidthString().empty())
par.setLabelWidthString(layout->labelstring());
} else {
- par.setLabelWidthString(string());
+ par.setLabelWidthString(docstring());
}
// is it a layout that has an automatic label?
&& (layout->latextype != LATEX_ENVIRONMENT
|| isFirstInSequence(it.pit(), it.plist()))) {
counters.step(layout->counter);
- string label = expandLabel(buf, layout,
- par.params().appendix());
+ docstring label = expandLabel(buf, layout,
+ par.params().appendix());
par.params().labelString(label);
}
} else if (layout->labeltype == LABEL_ITEMIZE) {
// par.params().labelString(
// bufparams.user_defined_bullet(par.itemdepth).getText());
// for now, use a simple hardcoded label
- string itemlabel;
+ docstring 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;
}
// 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:
break;
}
- // FIXME UNICODE
- par.params().labelString(counters.counterLabel(lyx::to_utf8(buf.B_(format))));
+ par.params().labelString(counters.counterLabel(buf.B_(format)));
} 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())));
+ par.params().labelString(buf.B_(to_ascii(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;
}
}
- string s;
+ 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 #:"), lyx::to_utf8(buf.B_(fl.name())));
+ s = bformat(_("%1$s #:"), buf.B_(fl.name()));
} else {
// par->SetLayout(0);
// FIXME UNICODE
- s = lyx::to_utf8(buf.B_(layout->labelstring()));
+ s = buf.B_(to_ascii(layout->labelstring()));
}
par.params().labelString(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(buf.B_(to_ascii(layout->labelstring())));
}
} // anon namespace
setLabel(buf, it);
}
- lyx::toc::updateToc(buf);
+ toc::updateToc(buf);
}
-string expandLabel(Buffer const & buf,
- LyXLayout_ptr const & layout, bool appendix)
+docstring 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()));
+ docstring fmt = buf.B_(to_ascii(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) {
+ if (i != docstring::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);
+ if (j != docstring::npos) {
+ docstring parent(fmt, i + 1, j - i - 1);
+ // FIXME UNICODE
+ 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
projects / lyx.git / blobdiff