#include "ParagraphParameters.h"
#include "ParIterator.h"
#include "PDFOptions.h"
+#include "Session.h"
#include "SpellChecker.h"
#include "sgml.h"
#include "texstream.h"
#include "mathed/InsetMathHull.h"
#include "mathed/MacroTable.h"
-#include "mathed/MathMacroTemplate.h"
+#include "mathed/InsetMathMacroTemplate.h"
#include "mathed/MathSupport.h"
#include "graphics/GraphicsCache.h"
typedef map<string, bool> DepClean;
typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
-} // namespace anon
+} // namespace
// A storehouse for the cloned buffers.
// Make sure the file monitor monitors the good file.
void refreshFileMonitor();
- /// has it been notified of an external modification?
- bool isExternallyModified() const { return externally_modified_; }
-
/// Notify or clear of external modification
- void fileExternallyModified(bool modified) const;
+ void fileExternallyModified(bool exists);
- /// Block notifications of external modifications
- FileMonitorBlocker blockFileMonitor() { return file_monitor_->block(10); }
+ /// has been externally modified? Can be reset by the user.
+ mutable bool externally_modified_;
private:
/// So we can force access via the accessors.
int char_count_;
int blank_count_;
- /// has been externally modified? Can be reset by the user.
- mutable bool externally_modified_;
-
FileMonitorPtr file_monitor_;
};
bibfile_cache_valid_(false), cite_labels_valid_(false), preview_error_(false),
inset(0), preview_loader_(0), cloned_buffer_(cloned_buffer),
clone_list_(0), doing_export(false),
- tracked_changes_present_(0), parent_buffer(0),
- word_count_(0), char_count_(0), blank_count_(0),
- externally_modified_(false)
+ tracked_changes_present_(0), externally_modified_(false), parent_buffer(0),
+ word_count_(0), char_count_(0), blank_count_(0)
{
refreshFileMonitor();
if (!cloned_buffer_) {
Impl::BufferPositionMap::iterator end = d->children_positions.end();
for (; it != end; ++it) {
Buffer * child = const_cast<Buffer *>(it->first);
- if (theBufferList().isLoaded(child)) {
- if (theBufferList().isOthersChild(this, child))
- child->setParent(0);
- else
- theBufferList().release(child);
+ if (theBufferList().isLoaded(child)) {
+ if (theBufferList().isOthersChild(this, child))
+ child->setParent(0);
+ else
+ theBufferList().release(child);
}
}
double Buffer::fontScalingFactor() const
{
return isExporting() ? 75.0 * params().html_math_img_scale
- : 0.01 * lyxrc.dpi * lyxrc.zoom * lyxrc.preview_scale_factor * params().display_pixel_ratio;
+ : 0.01 * lyxrc.dpi * lyxrc.currentZoom * lyxrc.preview_scale_factor * params().display_pixel_ratio;
}
errorList.push_back(ErrorItem(_("Document header error"), s));
}
+ params().shell_escape = theSession().shellescapeFiles().find(absFileName());
+
params().makeDocumentClass();
return unknown_tokens;
if (file_format != LYX_FORMAT) {
FileName tmpFile;
ReadStatus ret_clf = convertLyXFormat(fn, tmpFile, file_format);
+ if (ret_clf != ReadSuccess)
+ return ret_clf;
+ ret_clf = readFile(tmpFile);
if (ret_clf == ReadSuccess) {
- ret_clf = readFile(tmpFile);
- if (ret_clf == ReadSuccess) {
- d->file_format = file_format;
- d->need_format_backup = true;
- return ret_clf;
- }
- }
- if (ret_clf != ReadSuccess) {
- int const ret = Alert::prompt(_("Document format failure"),
- _("Fileformat unrecognized by lyx2lyx. Trying to load anyway, "
- "but some contents might be lost and LyX might crash!\n"
- "Would you like to proceed ?"), 0, 1, _("&No"), _("&Yes"));
- if (ret == 0)
- return ret_clf;
+ d->file_format = file_format;
+ d->need_format_backup = true;
}
+ return ret_clf;
}
// FIXME: InsetInfo needs to know whether the file is under VCS
// Should probably be moved to somewhere else: BufferView? GuiView?
bool Buffer::save() const
{
- FileMonitorBlocker block = d->blockFileMonitor();
docstring const file = makeDisplayPath(absFileName(), 20);
d->filename.refresh();
support::bformat(_("The languages %1$s are only supported by Polyglossia."), langs)
: support::bformat(_("The language %1$s is only supported by Polyglossia."), langs);
if (!blangs.empty())
- plangs += "\n";
+ plangs += "\n";
}
frontend::Alert::warning(
continue;
// get macro data
- MathMacroTemplate & macroTemplate =
+ InsetMathMacroTemplate & macroTemplate =
*iit->inset->asInsetMath()->asMacroTemplate();
MacroContext mc(owner_, it);
macroTemplate.updateToContext(mc);
// loop over children
Impl::BufferPositionMap::iterator it = d->children_positions.begin();
Impl::BufferPositionMap::iterator end = d->children_positions.end();
- for (; it != end; ++it)
- it->first->listMacroNames(macros);
+ for (; it != end; ++it) {
+ Buffer * child = const_cast<Buffer *>(it->first);
+ // The buffer might have been closed (see #10766).
+ if (theBufferList().isLoaded(child))
+ child->listMacroNames(macros);
+ }
// call parent
Buffer const * const pbuf = d->parent();
if (data) {
macros.insert(data);
- // we cannot access the original MathMacroTemplate anymore
+ // we cannot access the original InsetMathMacroTemplate anymore
// here to calls validate method. So we do its work here manually.
// FIXME: somehow make the template accessible here.
if (data->optionals() > 0)
ots.texrow().newlines(2);
if (master)
runparams.is_child = true;
+ updateBuffer();
writeLaTeXSource(ots, string(), runparams, output);
texrow = ots.releaseTexRow();
}
return pid;
}
-} // namespace anon
+} // namespace
FileName Buffer::getEmergencyFileName() const
ParIterator parit = cbuf.par_iterator_begin();
updateBuffer(parit, utype);
- /// FIXME: Perf
- /// Update the tocBackend for any buffer. The outliner uses the master's,
- /// and the navigation menu uses the child's.
- cbuf.tocBackend().update(true, utype);
-
if (master != this)
+ // If this document has siblings, then update the TocBackend later. The
+ // reason is to ensure that later siblings are up to date when e.g. the
+ // broken or not status of references is computed. The update is called
+ // in InsetInclude::addToToc.
return;
d->bibinfo_cache_valid_ = true;
d->cite_labels_valid_ = true;
+ /// FIXME: Perf
+ cbuf.tocBackend().update(true, utype);
if (scope == UpdateMaster)
cbuf.structureChanged();
}
switch (par.itemdepth) {
case 2:
enumcounter += 'i';
+ // fall through
case 1:
enumcounter += 'i';
+ // fall through
case 0:
enumcounter += 'i';
break;
// set the counter for this paragraph
d->setLabel(parit, utype);
- // update change-tracking flag
+ // update change-tracking flag
parit->addChangesToBuffer(*this);
// now the insets
void Buffer::Impl::refreshFileMonitor()
{
- if (file_monitor_ && file_monitor_->filename() == filename.absFileName())
- return file_monitor_->refresh();
+ if (file_monitor_ && file_monitor_->filename() == filename.absFileName()) {
+ file_monitor_->refresh();
+ return;
+ }
// The previous file monitor is invalid
// This also destroys the previous file monitor and all its connections
file_monitor_ = FileSystemWatcher::monitor(filename);
- fileExternallyModified(false);
// file_monitor_ will be destroyed with *this, so it is not going to call a
// destroyed object method.
- file_monitor_->connect([this](){ fileExternallyModified(true); });
+ file_monitor_->connect([this](bool exists) {
+ fileExternallyModified(exists);
+ });
}
-void Buffer::Impl::fileExternallyModified(bool modified) const
+void Buffer::Impl::fileExternallyModified(bool const exists)
{
- if (modified)
- lyx_clean = bak_clean = false;
- externally_modified_ = modified;
- if (wa_)
+ // ignore notifications after our own saving operations
+ if (checksum_ == filename.checksum()) {
+ LYXERR(Debug::FILES, "External modification but "
+ "checksum unchanged: " << filename);
+ return;
+ }
+ lyx_clean = bak_clean = false;
+ // If the file has been deleted, only mark the file as dirty since it is
+ // pointless to prompt for reloading. If later a file is moved into this
+ // location, then the externally modified warning will appear then.
+ if (exists)
+ externally_modified_ = true;
+ // Update external modification notification.
+ // Dirty buffers must be visible at all times.
+ if (wa_ && wa_->unhide(owner_))
wa_->updateTitles();
+ else
+ // Unable to unhide the buffer (e.g. no GUI or not current View)
+ lyx_clean = true;
}
bool Buffer::notifiesExternalModification() const
{
- return d->isExternallyModified();
+ return d->externally_modified_;
}
void Buffer::clearExternalModification() const
{
- d->fileExternallyModified(false);
+ d->externally_modified_ = false;
+ if (d->wa_)
+ d->wa_->updateTitles();
}
projects / lyx.git / blobdiff