#include "LaTeX.h"
#include "Layout.h"
#include "LyX.h"
+#include "LyXVC.h"
#include "TextClass.h"
#include "Paragraph.h"
#include "ParagraphList.h"
return checkBuffer;
}
- if (filename.exists()) {
- if (!filename.isReadableFile()) {
+ bool const exists = filename.exists();
+ bool const tryVC = exists ? false : LyXVC::fileInVC(filename);
+ if (exists || tryVC) {
+ if (exists && !filename.isReadableFile()) {
docstring text = bformat(_("The file %1$s exists but is not "
"readable by the current user."),
from_utf8(filename.absFileName()));
}
-/*
- * FIXME : merge with countChars. The structures of the two functions
- * are similar but, unfortunately, they seem to have a different
- * notion of what to count. Since nobody ever complained about that,
- * this proves (again) that any number beats no number ! (JMarc)
- */
-int countWords(DocIterator const & from, DocIterator const & to)
-{
- int count = 0;
- bool inword = false;
-
- for (DocIterator dit = from ; dit != to && !dit.empty(); ) {
- if (!dit.inTexted()) {
- dit.forwardPos();
- continue;
- }
-
- Paragraph const & par = dit.paragraph();
- pos_type const pos = dit.pos();
-
- // Copied and adapted from isWordSeparator() in Paragraph
- if (pos == dit.lastpos()) {
- inword = false;
- } else if (!par.isDeleted(pos)) {
- Inset const * ins = par.getInset(pos);
- if (ins && !ins->producesOutput()) {
- //skip this inset
- ++dit.top().pos();
- if (dit >= to)
- break;
- continue;
- }
- if (par.isWordSeparator(pos))
- inword = false;
- else if (!inword) {
- ++count;
- inword = true;
- }
- }
- dit.forwardPos();
- }
-
- return count;
-}
-
-
-int countChars(DocIterator const & from, DocIterator const & to,
- bool with_blanks)
-{
- int chars = 0;
- int blanks = 0;
- for (DocIterator dit = from ; dit != to ; ) {
- if (!dit.inTexted()) {
- dit.forwardPos();
- continue;
- }
-
- Paragraph const & par = dit.paragraph();
- pos_type const pos = dit.pos();
-
- if (pos != dit.lastpos() && !par.isDeleted(pos)) {
- if (Inset const * ins = par.getInset(pos)) {
- if (!ins->producesOutput()) {
- //skip this inset
- ++dit.top().pos();
- continue;
- }
- 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;
- }
- }
- dit.forwardPos();
- }
-
- return chars + blanks;
-}
-
-
Buffer * loadIfNeeded(FileName const & fname)
{
Buffer * buffer = theBufferList().getBuffer(fname);
if (!buffer) {
- if (!fname.exists())
+ if (!fname.exists() && !LyXVC::fileInVC(fname))
return 0;
buffer = theBufferList().newBuffer(fname.absFileName());