#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::libFileSearch;
+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 {
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(from_utf8(cit->error_desc),
+ from_utf8(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();
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);
// FIXME UNICODE
- par.params().labelString(buf.B_(lyx::to_ascii(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;
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);
// FIXME UNICODE
- s = buf.B_(lyx::to_ascii(layout->labelstring()));
+ s = buf.B_(to_ascii(layout->labelstring()));
}
par.params().labelString(s);
par.params().labelString(docstring());
else
// FIXME UNICODE
- par.params().labelString(buf.B_(lyx::to_ascii(layout->labelstring())));
+ par.params().labelString(buf.B_(to_ascii(layout->labelstring())));
}
} // anon namespace
setLabel(buf, it);
}
- lyx::toc::updateToc(buf);
+ toc::updateToc(buf);
}
LyXTextClass const & tclass = buf.params().getLyXTextClass();
// FIXME UNICODE
- docstring fmt = buf.B_(lyx::to_ascii(appendix ? layout->labelstring_appendix()
+ docstring fmt = buf.B_(to_ascii(appendix ? layout->labelstring_appendix()
: layout->labelstring()));
// handle 'inherited level parts' in 'fmt',
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