#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
+#include "support/textutils.h"
using namespace std;
using namespace lyx::support;
return checkAndLoadLyXFile(filename);
}
- if (filename.isReadableFile()) {
+ if (filename.exists()) {
+ if (!filename.isReadableFile()) {
+ docstring text = bformat(_("The file %1$s exists but is not "
+ "readable by the current user."),
+ from_utf8(filename.absFilename()));
+ Alert::error(_("File not readable!"), text);
+ return 0;
+ }
Buffer * b = theBufferList().newBuffer(filename.absFilename());
+ if (!b)
+ // Buffer creation is not possible.
+ return 0;
if (!b->loadLyXFile(filename)) {
theBufferList().release(b);
return 0;
{
// get a free buffer
Buffer * b = theBufferList().newBuffer(filename);
- BOOST_ASSERT(b);
+ if (!b)
+ // Buffer creation is not possible.
+ return 0;
FileName tname;
// use defaults.lyx as a default template if it exists.
}
+int countChars(DocIterator const & from, DocIterator const & to, bool with_blanks)
+{
+ int chars = 0;
+ int blanks = 0;
+ for (DocIterator dit = from ; dit != to ; dit.forwardPos()) {
+
+ if (!dit.inTexted()) continue;
+ Paragraph const & par = dit.paragraph();
+ pos_type const pos = dit.pos();
+
+ if (pos != dit.lastpos() && !par.isDeleted(pos)) {
+ if (par.isInset(pos)) {
+ Inset const * ins = par.getInset(pos);
+ if (ins->isLetter())
+ ++chars;
+ else if (with_blanks && ins->isSpace())
+ ++blanks;
+ } else {
+ char_type const c = par.getChar(pos);
+ if (isPrintableNonspace(c))
+ ++chars;
+ else if (isSpace(c) && with_blanks)
+ ++blanks;
+ }
+ }
+ }
+
+ return chars + blanks;
+}
+
+
namespace {
depth_type getDepth(DocIterator const & it)
{
BOOST_ASSERT(parit.pit() == 0);
+ // set the position of the text in the buffer to be able
+ // to resolve macros in it. This has nothing to do with
+ // labels, but by putting it here we avoid implementing
+ // a whole bunch of traversal routines just for this call.
+ parit.text()->setMacrocontextPosition(parit);
+
depth_type maxdepth = 0;
pit_type const lastpit = parit.lastpit();
for ( ; parit.pit() <= lastpit ; ++parit.pit()) {
}
-void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
-{
- if (par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
- Buffer const * master = buffer.masterBuffer();
- master->tocBackend().updateItem(par_it);
- master->structureChanged();
- }
-}
-
-
} // namespace lyx