#include "LaTeXFeatures.h"
#include "LaTeX.h"
#include "Layout.h"
-#include "Lexer.h"
#include "LyXAction.h"
#include "LyX.h"
#include "LyXRC.h"
#include "support/filetools.h"
#include "support/gettext.h"
#include "support/gzstream.h"
+#include "support/Lexer.h"
#include "support/lstrings.h"
#include "support/mutex.h"
#include "support/os.h"
}
+Undo const & Buffer::undo() const
+{
+ return d->undo_;
+}
+
+
void Buffer::setChild(DocIterator const & dit, Buffer * child)
{
d->children_positions[child] = dit;
params().clearRemovedModules();
params().clearIncludedChildren();
params().pdfoptions().clear();
+ params().document_metadata.clear();
params().indiceslist().clear();
params().backgroundcolor = lyx::rgbFromHexName("#ffffff");
params().isbackgroundcolor = false;
// This is only set once per document (in master)
if (!runparams.is_child) {
runparams.use_polyglossia = features.usePolyglossia();
- runparams.use_hyperref = features.isRequired("hyperref");
+ runparams.use_hyperref = features.isRequired("hyperref")
+ || features.isProvided("hyperref");
runparams.use_CJK = features.mustProvide("CJK");
}
LYXERR(Debug::OUTFILE, " Buffer validation done.");
os << "<!DOCTYPE html>\n"
<< "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"" << from_ascii(htmlCode) << "\">\n"
<< "<head>\n"
- << "<meta name=\"GENERATOR\" content=\"" << PACKAGE_STRING << "\" />\n"
- << "<meta charset=\"UTF-8\" />\n"
- // FIXME Presumably need to set this right
- << "<meta http-equiv=\"content-type\" content=\"text/html;charset=UTF-8\" />\n";
+ << "<meta name=\"generator\" content=\"" << PACKAGE_STRING << "\" />\n";
docstring const & doctitle = features.htmlTitle();
os << "<title>"
// we are here if the CSS is supposed to be written to the header
// or if we failed to write it to an external file.
if (!written) {
- os << "<style type='text/css'>\n"
+ os << "<style>\n"
<< dstyles
<< "\n</style>\n";
}
}
-void Buffer::getLabelList(vector<std::pair<docstring, docstring>> & list) const
+void Buffer::getLabelList(vector<std::tuple<docstring, docstring, docstring>> & list) const
{
// If this is a child document, use the master's list instead.
if (parent()) {
list.clear();
shared_ptr<Toc> toc = d->toc_backend.toc("label");
for (auto const & tocit : *toc) {
- if (tocit.depth() == 0)
- list.push_back(make_pair(tocit.str(), tocit.asString()));
+ if (tocit.depth() == 0) {
+ list.push_back(make_tuple(tocit.str(), tocit.asString(), tocit.prettyStr()));
+ }
}
}
{
d->bibinfo_cache_valid_ = false;
d->cite_labels_valid_ = false;
- removeBiblioTempFiles();
+ scheduleBiblioTempRemoval();
// also invalidate the cache for the parent buffer
Buffer const * const pbuf = d->parent();
if (pbuf)
Buffer const * const pbuf = parent();
if (pbuf)
pbuf->removeBiblioTempFiles();
+ removeBiblioTemps = false;
}
}
+bool Buffer::branchActivationEnabled(FuncCode act, docstring const & branch) const
+{
+ bool const master = act == LFUN_BRANCH_MASTER_ACTIVATE
+ || act == LFUN_BRANCH_MASTER_DEACTIVATE;
+ bool const activate = act == LFUN_BRANCH_ACTIVATE
+ || act == LFUN_BRANCH_MASTER_ACTIVATE;
+ Buffer const * buf = master ? masterBuffer() : this;
+ Branch const * our_branch = buf->params().branchlist().find(branch);
+ // Can be disabled if
+ // - this is a _MASTER_ command and there is no master
+ // - the relevant buffer does not know the branch
+ // - the branch is already in the desired state
+ return ((!master || parent() != nullptr)
+ && !branch.empty() && our_branch
+ && our_branch->isSelected() != activate);
+}
+
+
bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
{
if (isInternal()) {
case LFUN_BRANCH_ACTIVATE:
case LFUN_BRANCH_DEACTIVATE:
case LFUN_BRANCH_MASTER_ACTIVATE:
- case LFUN_BRANCH_MASTER_DEACTIVATE: {
- bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE
- || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE);
- BranchList const & branchList = master ? masterBuffer()->params().branchlist()
- : params().branchlist();
- docstring const & branchName = cmd.argument();
- flag.setEnabled(!branchName.empty() && branchList.find(branchName));
+ case LFUN_BRANCH_MASTER_DEACTIVATE:
+ // Let a branch inset handle that
+ if (cmd.argument().empty())
+ return false;
+ flag.setEnabled(branchActivationEnabled(cmd.action(), cmd.argument()));
break;
- }
case LFUN_BRANCH_ADD:
case LFUN_BRANCHES_RENAME:
}
+bool Buffer::branchActivationDispatch(FuncCode act, docstring const & branch)
+{
+ bool const master = (act == LFUN_BRANCH_MASTER_ACTIVATE
+ || act == LFUN_BRANCH_MASTER_DEACTIVATE);
+ bool const activate = (act == LFUN_BRANCH_ACTIVATE
+ || act == LFUN_BRANCH_MASTER_ACTIVATE);
+ Buffer * buf = master ? const_cast<Buffer *>(masterBuffer()) : this;
+ Branch * our_branch = buf->params().branchlist().find(branch);
+
+ // See comment in branchActivationStatus
+ if ((master && parent() == nullptr)
+ || !our_branch
+ || our_branch->isSelected() == activate)
+ return false;
+
+ if (master && !buf->hasGuiDelegate()
+ && (!theApp() || !theApp()->unhide(buf)))
+ // at least issue a warning for now (ugly, but better than dataloss).
+ frontend::Alert::warning(_("Branch state changes in master document"),
+ lyx::support::bformat(_("The state of the branch '%1$s' "
+ "was changed in the master file. "
+ "Please make sure to save the master."), branch), true);
+
+ UndoGroupHelper ugh(buf);
+ buf->undo().recordUndoBufferParams(CursorData());
+ our_branch->setSelected(activate);
+ // cur.forceBufferUpdate() is not enough)
+ buf->updateBuffer();
+
+ // if branch exists in a descendant, update previews.
+ // TODO: only needed if "Show preview" is enabled in the included inset.
+ bool exists_in_desc = false;
+ for (auto const & it : buf->getDescendants()) {
+ if (it->params().branchlist().find(branch))
+ exists_in_desc = true;
+ }
+ if (exists_in_desc) {
+ // TODO: ideally we would only update the previews of the
+ // specific children that have this branch directly or
+ // in one of their descendants
+ buf->removePreviews();
+ buf->updatePreviews();
+ }
+ return true;
+}
+
+
void Buffer::dispatch(string const & command, DispatchResult & result)
{
return dispatch(lyxaction.lookupFunc(command), result);
// whether we have a GUI or not. The boolean use_gui holds this information.
void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
{
+ LYXERR(Debug::ACTION, "Buffer::dispatch: cmd: " << func);
if (isInternal()) {
// FIXME? if there is an Buffer LFUN that can be dispatched even
// if internal, put a switch '(cmd.action())' here.
case LFUN_BRANCH_DEACTIVATE:
case LFUN_BRANCH_MASTER_ACTIVATE:
case LFUN_BRANCH_MASTER_DEACTIVATE: {
- bool const master = (func.action() == LFUN_BRANCH_MASTER_ACTIVATE
- || func.action() == LFUN_BRANCH_MASTER_DEACTIVATE);
- Buffer * buf = master ? const_cast<Buffer *>(masterBuffer())
- : this;
-
- docstring const & branch_name = func.argument();
- // the case without a branch name is handled elsewhere
- if (branch_name.empty()) {
- dispatched = false;
- break;
- }
- Branch * branch = buf->params().branchlist().find(branch_name);
- if (!branch) {
- LYXERR0("Branch " << branch_name << " does not exist.");
- dr.setError(true);
- docstring const msg =
- bformat(_("Branch \"%1$s\" does not exist."), branch_name);
- dr.setMessage(msg);
- break;
+ // Let a branch inset handle that
+ if (func.argument().empty()) {
+ dr.dispatched(false);
+ return;
}
- bool const activate = (func.action() == LFUN_BRANCH_ACTIVATE
- || func.action() == LFUN_BRANCH_MASTER_ACTIVATE);
- if (branch->isSelected() != activate) {
- buf->undo().recordUndoBufferParams(CursorData());
- branch->setSelected(activate);
- dr.setError(false);
+ bool const res = branchActivationDispatch(func.action(), func.argument());
+ dr.setError(!res);
+ if (res)
dr.screenUpdate(Update::Force);
- dr.forceBufferUpdate();
- }
break;
}
LaTeXFeatures features(*this, params(), runparams);
validate(features);
runparams.use_polyglossia = features.usePolyglossia();
- runparams.use_hyperref = features.isRequired("hyperref");
+ runparams.use_babel = features.useBabel();
+ runparams.use_hyperref = features.isRequired("hyperref")
+ || features.isProvided("hyperref");
// latex or literate
otexstream ots(os);
// output above
Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir,
bool includeall, string & result_file) const
{
+ if (removeBiblioTemps)
+ removeBiblioTempFiles();
LYXERR(Debug::FILES, "target=" << target);
OutputParams runparams(¶ms().encoding());
string format = target;
translateIfPossible(theFormats().prettyName(format)));
if (format == "pdf4")
s += "\n"
- + bformat(_("Hint: use non-TeX fonts or set input encoding "
+ + bformat(_("Hint: use non-TeX fonts or set input encoding"
" to '%1$s'"), from_utf8(encodings.fromLyXName("ascii")->guiName()));
Alert::error(_("Couldn't export file"), s);
}
"asked about it again the next time you try to load "
"this file, and may over-write your own work."));
} else {
- Alert::warning(_("Emergency File Renames"),
+ Alert::warning(_("Emergency File Renamed"),
bformat(_("Emergency file renamed as:\n %1$s"),
from_utf8(newname.onlyFileName())));
}
par.itemdepth = getItemDepth(it);
if (layout.margintype == MARGIN_MANUAL) {
- if (par.params().labelWidthString().empty())
- par.params().labelWidthString(par.expandLabel(layout, bp));
+ // nothing to do: empty label width string is fine.
} else if (layout.latextype == LATEX_BIB_ENVIRONMENT) {
// we do not need to do anything here, since the empty case is
// handled during export.
void Buffer::updateBuffer(ParIterator & parit, UpdateType utype, bool const deleted) const
{
+ // if fomatted references are shown in workarea update buffer accordingly
+ if (params().use_formatted_ref)
+ utype = OutputUpdate;
+
pushIncludedBuffer(this);
// LASSERT: Is it safe to continue here, or should we just return?
LASSERT(parit.pit() == 0, /**/);
docstring const disp_fn = makeDisplayPath(d->filename.absFileName());
// clear parent. this will get reset if need be.
+ Buffer const * oldparent = d->parent();
d->setParent(nullptr);
ReadStatus const status = loadLyXFile();
+ // The inset members in cursors held by buffer views are now wrong.
+ workAreaManager().sanitizeCursors();
+ setBusy(false);
if (status == ReadSuccess) {
updateBuffer();
changed(true);
updateTitles();
+ // reset parent if this hasn't been done yet
+ // but only if this is still its child (e.g.,
+ // not after the former child has been saved as...)
+ if (!d->parent() && oldparent && oldparent->isFullyLoaded()
+ && oldparent->isChild(this))
+ d->setParent(oldparent);
markClean();
message(bformat(_("Document %1$s reloaded."), disp_fn));
d->undo_.clear();
} else {
message(bformat(_("Could not reload document %1$s."), disp_fn));
}
- setBusy(false);
removePreviews();
updatePreviews();
errors("Parse");
"checksum unchanged: " << filename);
return;
}
+ lyx_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;
+ externally_modified_ = true;
// Update external modification notification.
// Dirty buffers must be visible at all times.
- if (wa_ && wa_->unhide(owner_))
+ if (wa_ && wa_->unhide(owner_)) {
wa_->updateTitles();
+ if (!exists) {
+ frontend::Alert::warning(
+ _("File deleted from disk"),
+ bformat(_("The file\n %1$s\n"
+ "has been deleted from disk!"),
+ from_utf8(filename.absFileName())));
+ }
+ }
else
// Unable to unhide the buffer (e.g. no GUI or not current View)
lyx_clean = true;