+ (with_blanks ? blank_count_ : 0);
}
+ // does the buffer contain tracked changes? (if so, we automatically
+ // display the review toolbar, for instance)
+ mutable bool tracked_changes_present_;
+
private:
/// So we can force access via the accessors.
mutable Buffer const * parent_buffer;
preview_file_ = cloned_buffer_->d->preview_file_;
preview_format_ = cloned_buffer_->d->preview_format_;
preview_error_ = cloned_buffer_->d->preview_error_;
+ tracked_changes_present_ = cloned_buffer_->d->tracked_changes_present_;
}
Impl::BufferPositionMap::iterator end = d->children_positions.end();
for (; it != end; ++it) {
Buffer * child = const_cast<Buffer *>(it->first);
- if (theBufferList().isLoaded(child))
- theBufferList().releaseChild(this, child);
+ if (theBufferList().isLoaded(child)) {
+ if (theBufferList().isOthersChild(this, child))
+ child->setParent(0);
+ else
+ theBufferList().release(child);
+ }
}
if (!isClean()) {
params().indiceslist().addDefault(B_("Index"));
// read main text
- d->old_position = originFilePath();
+ if (FileName::isAbsolute(params().origin))
+ d->old_position = params().origin;
+ else
+ d->old_position = filePath();
bool const res = text().read(lex, errorList, d->inset);
d->old_position.clear();
}
-string Buffer::getBackupName() const {
+FileName Buffer::getBackupName() const {
FileName const & fn = fileName();
string const fname = fn.onlyFileNameWithoutExt();
string const fext = fn.extension();
fn.onlyPath().absFileName() :
lyxrc.backupdir_path;
string const fform = convert<string>(d->file_format);
- string const backname = fname + "-" + fform;
+ string const backname = fname + "-lyxformat-" + fform;
FileName backup(addName(fpath, addExtension(backname, fext)));
// limit recursion, just in case
v = 1000;
break;
}
- string newbackname = backname + "-" + convert<string>(v);
+ string const newbackname = backname + "-" + convert<string>(v);
backup.set(addName(fpath, addExtension(newbackname, fext)));
v++;
}
- return v < 100 ? backup.onlyFileName() : "";
+ return v < 100 ? backup : FileName();
}
bool made_backup = true;
FileName backupName;
- if (lyxrc.make_backup || d->need_format_backup) {
- if (d->need_format_backup) {
- string backup_name = getBackupName();
- if (!backup_name.empty())
- backupName.set(backup_name);
- }
+ bool const needBackup = lyxrc.make_backup || d->need_format_backup;
+ if (needBackup) {
+ if (d->need_format_backup)
+ backupName = getBackupName();
// If we for some reason failed to find a backup name in case of
// a format change, this will still set one. It's the best we can
}
// else we saved the file, but failed to move it to the right location.
- if (lyxrc.make_backup && made_backup && !symlink) {
- // the original file was moved to filename.lyx~, so it will look
+ if (needBackup && made_backup && !symlink) {
+ // the original file was moved to some new location, so it will look
// to the user as if it was deleted. (see bug #9234.) we could try
// to restore it, but that would basically mean trying to do again
// what we just failed to do. better to leave things as they are.
OutputParams runparams = runparams_in;
// XeTeX with TeX fonts is only safe with ASCII encoding,
- // See #9740 and FIXME in BufferParams::encoding()
+ // but the "flavor" is not known in BufferParams::encoding().
if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX))
runparams.encoding = encodings.fromLyXName("ascii");
OutputParams runparams = runparams_in;
// XeTeX with TeX fonts is only safe with ASCII encoding,
- // See #9740 and FIXME in BufferParams::encoding()
- // FIXME: when only the current paragraph is shown, this is ignored and
- // characters encodable in the current encoding are not converted
- // to ASCII-representation.
+ // but the "flavor" is not known in BufferParams::encoding().
if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX))
runparams.encoding = encodings.fromLyXName("ascii");
+ // FIXME: when only the current paragraph is shown, this is ignored
+ // (or not reached) and characters encodable in the current
+ // encoding are not converted to ASCII-representation.
// If we are compiling a file standalone, even if this is the
// child of some other buffer, let's cut the link here, so the
list.clear();
shared_ptr<Toc> toc = d->toc_backend.toc("label");
- TocIterator toc_it = toc->begin();
- TocIterator end = toc->end();
+ Toc::const_iterator toc_it = toc->begin();
+ Toc::const_iterator end = toc->end();
for (; toc_it != end; ++toc_it) {
if (toc_it->depth() == 0)
list.push_back(toc_it->str());
break;
case LFUN_CHANGES_TRACK:
- undo().recordUndoBufferParams(CursorData());
+ if (params().save_transient_properties)
+ undo().recordUndoBufferParams(CursorData());
params().track_changes = !params().track_changes;
+ if (!params().track_changes)
+ dr.forceChangesUpdate();
break;
case LFUN_CHANGES_OUTPUT:
- undo().recordUndoBufferParams(CursorData());
+ if (params().save_transient_properties)
+ undo().recordUndoBufferParams(CursorData());
params().output_changes = !params().output_changes;
if (params().output_changes) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
}
-string Buffer::originFilePath() const
+DocFileName Buffer::getReferencedFileName(string const & fn) const
{
- if (FileName::isAbsolute(params().origin))
- return params().origin;
+ DocFileName result;
+ if (FileName::isAbsolute(fn) || !FileName::isAbsolute(params().origin))
+ result.set(fn, filePath());
+ else {
+ // filePath() ends with a path separator
+ FileName const test(filePath() + fn);
+ if (test.exists())
+ result.set(fn, filePath());
+ else
+ result.set(fn, params().origin);
+ }
- return filePath();
+ return result;
}
// update all caches
clearReferenceCache();
updateMacros();
+ setChangesPresent(false);
Buffer & cbuf = const_cast<Buffer &>(*this);
// set the counter for this paragraph
d->setLabel(parit, utype);
+ // update change-tracking flag
+ parit->addChangesToBuffer(*this);
+
// now the insets
InsetList::const_iterator iit = parit->insetList().begin();
InsetList::const_iterator end = parit->insetList().end();
string Buffer::includedFilePath(string const & name, string const & ext) const
{
+ if (d->old_position.empty() ||
+ equivalent(FileName(d->old_position), FileName(filePath())))
+ return name;
+
bool isabsolute = FileName::isAbsolute(name);
- // old_position already contains a trailing path separator
- string const absname = isabsolute ? name : d->old_position + name;
+ // both old_position and filePath() end with a path separator
+ string absname = isabsolute ? name : d->old_position + name;
+
+ // if old_position is set to origin, we need to do the equivalent of
+ // getReferencedFileName() (see readDocument())
+ if (!isabsolute && d->old_position == params().origin) {
+ FileName const test(addExtension(filePath() + name, ext));
+ if (test.exists())
+ absname = filePath() + name;
+ }
- if (d->old_position.empty()
- || equivalent(FileName(d->old_position), FileName(filePath()))
- || !FileName(addExtension(absname, ext)).exists())
+ if (!FileName(addExtension(absname, ext)).exists())
return name;
if (isabsolute)
from_utf8(filePath())));
}
+
+void Buffer::setChangesPresent(bool b) const
+{
+ d->tracked_changes_present_ = b;
+}
+
+
+bool Buffer::areChangesPresent() const
+{
+ return d->tracked_changes_present_;
+}
+
+
+void Buffer::updateChangesPresent() const
+{
+ LYXERR(Debug::CHANGES, "Buffer::updateChangesPresent");
+ setChangesPresent(false);
+ ParConstIterator it = par_iterator_begin();
+ ParConstIterator const end = par_iterator_end();
+ for (; !areChangesPresent() && it != end; ++it)
+ it->addChangesToBuffer(*this);
+}
+
+
+
} // namespace lyx