#include "insets/InsetBibitem.h"
#include "insets/InsetInclude.h"
+#include "support/convert.h"
#include "support/debug.h"
#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
-
-
-namespace lyx {
+#include "support/textutils.h"
using namespace std;
+using namespace lyx::support;
-using support::bformat;
-using support::FileName;
-using support::libFileSearch;
-using support::makeAbsPath;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::onlyPath;
+namespace lyx {
namespace Alert = frontend::Alert;
if (filename.isReadableFile()) {
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.
}
+Buffer * newUnnamedFile(string const & templatename, FileName const & path)
+{
+ static int newfile_number;
+
+ string document_path = path.absFilename();
+ string filename = addName(document_path,
+ "newfile" + convert<string>(++newfile_number) + ".lyx");
+ while (theBufferList().exists(filename)
+ || FileName(filename).isReadableFile()) {
+ ++newfile_number;
+ filename = addName(document_path,
+ "newfile" + convert<string>(newfile_number) + ".lyx");
+ }
+ return newFile(filename, templatename, false);
+}
+
+
int countWords(DocIterator const & from, DocIterator const & to)
{
int count = 0;
}
+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()
+ && dit.pos() != dit.lastpos()
+ && !dit.paragraph().isDeleted(dit.pos())) {
+ if (dit.paragraph().isInset(dit.pos())) {
+ if (dit.paragraph().getInset(dit.pos())->isLetter())
+ ++chars;
+ else if (dit.paragraph().getInset(dit.pos())->isSpace() && with_blanks)
+ ++blanks;
+ } else {
+ char_type const c = dit.paragraph().getChar(dit.pos());
+ if (isPrintableNonspace(c))
+ ++chars;
+ else if (isSpace(c) && with_blanks)
+ ++blanks;
+ }
+ }
+ }
+
+ return chars + blanks;
+}
+
+
namespace {
depth_type getDepth(DocIterator const & it)
if (prev_depth == min_depth)
return prev_par.itemdepth;
}
- min_depth = std::min(min_depth, prev_depth);
+ min_depth = min(min_depth, prev_depth);
// small optimization: if we are at depth 0, we won't
// find anything else
if (prev_depth == 0)
{
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()) {