#include "InsetInclude.h"
-#include "BaseClassList.h"
+#include "LayoutFile.h"
#include "Buffer.h"
#include "buffer_funcs.h"
#include "BufferList.h"
#include "graphics/PreviewImage.h"
#include "graphics/PreviewLoader.h"
-#include "insets/RenderPreview.h"
+#include "insets/InsetLabel.h"
#include "insets/InsetListingsParams.h"
+#include "insets/RenderPreview.h"
#include "support/debug.h"
#include "support/docstream.h"
EmbeddedFile file(to_utf8(params["filename"]),
onlyPath(parentFilename(buffer)));
file.setEmbed(!params["embed"].empty());
- file.enable(buffer.embedded(), &buffer);
+ file.setInzipName(to_utf8(params["embed"]));
+ file.enable(buffer.embedded(), &buffer, false);
return file;
}
+InsetLabel * createLabel(docstring const & label_str)
+{
+ if (label_str.empty())
+ return 0;
+ InsetCommandParams icp(LABEL_CODE);
+ icp["name"] = label_str;
+ return new InsetLabel(icp);
+}
+
} // namespace anon
InsetInclude::InsetInclude(InsetCommandParams const & p)
: InsetCommand(p, "include"), include_label(uniqueID()),
- preview_(new RenderMonitoredPreview(this)), set_label_(false)
+ preview_(new RenderMonitoredPreview(this)), set_label_(false), label_(0)
{
preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
+
+ if (isListings(params())) {
+ InsetListingsParams listing_params(to_utf8(p["lstparams"]));
+ label_ = createLabel(from_utf8(listing_params.getParamValue("label")));
+ }
}
InsetInclude::InsetInclude(InsetInclude const & other)
: InsetCommand(other), include_label(other.include_label),
- preview_(new RenderMonitoredPreview(this)), set_label_(false)
+ preview_(new RenderMonitoredPreview(this)), set_label_(false), label_(0)
{
preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
+
+ if (other.label_)
+ label_ = new InsetLabel(*other.label_);
}
InsetInclude::~InsetInclude()
{
+ delete label_;
if (isVerbatim(params()) || isListings(params()))
return;
}
+void InsetInclude::setBuffer(Buffer & buffer)
+{
+ if (buffer_) {
+ try {
+ EmbeddedFile file_from = includedFilename(*buffer_, params());
+ EmbeddedFile file_to = file_from.copyTo(&buffer);
+ if (file_to.embedded())
+ setParam("embed", from_utf8(file_to.inzipName()));
+ } catch (ExceptionMessage const & message) {
+ Alert::error(message.title_, message.details_);
+ // failed to embed
+ setParam("embed", docstring());
+ }
+
+ }
+ buffer_ = &buffer;
+ if (label_)
+ label_->setBuffer(buffer);
+
+}
+
+
ParamInfo const & InsetInclude::findInfo(string const & /* cmdName */)
{
// FIXME
InsetCommandMailer::string2params("include", to_utf8(cmd.argument()), p);
if (!p.getCmdName().empty()) {
if (isListings(p)){
- InsetListingsParams par_old(to_utf8(params()["lstparams"]));
- InsetListingsParams par_new(to_utf8(p["lstparams"]));
- if (par_old.getParamValue("label") !=
- par_new.getParamValue("label")
- && !par_new.getParamValue("label").empty())
- cur.bv().buffer().changeRefsIfUnique(
- from_utf8(par_old.getParamValue("label")),
- from_utf8(par_new.getParamValue("label")),
- REF_CODE);
- }
- try {
- // the embed parameter passed back from the dialog
- // is "true" or "false", we need to change it.
- if (p["embed"] == _("false"))
- p["embed"].clear();
- else
- p["embed"] = from_utf8(EmbeddedFile(to_utf8(p["filename"]),
- onlyPath(parentFilename(cur.buffer()))).inzipName());
- // test parameter
- includedFilename(cur.buffer(), p);
- } catch (ExceptionMessage const & message) {
- Alert::error(message.title_, message.details_);
- // do not set parameter if an error happens
- break;
+ InsetListingsParams new_params(to_utf8(p["lstparams"]));
+ docstring const label_str = from_utf8(new_params.getParamValue("label"));
+ if (label_str.empty())
+ delete label_;
+ else if (label_)
+ label_->updateCommand(label_str);
+ else {
+ label_ = createLabel(label_str);
+ label_->setBuffer(buffer());
+ label_->initView();
+ }
}
setParams(p);
buffer().updateBibfilesCache();
if (tmp->params().baseClass() != masterBuffer->params().baseClass()) {
// FIXME UNICODE
docstring text = bformat(_("Included file `%1$s'\n"
- "has textclass `%2$s'\n"
- "while parent file has textclass `%3$s'."),
- included_file.displayName(),
- from_utf8(tmp->params().documentClass().name()),
- from_utf8(masterBuffer->params().documentClass().name()));
+ "has textclass `%2$s'\n"
+ "while parent file has textclass `%3$s'."),
+ included_file.displayName(),
+ from_utf8(tmp->params().documentClass().name()),
+ from_utf8(masterBuffer->params().documentClass().name()));
Alert::warning(_("Different textclasses"), text);
- //return 0;
}
// Make sure modules used in child are all included in master
string const module = *it;
vector<string>::const_iterator found =
find(masterModules.begin(), masterModules.end(), module);
- if (found != masterModules.end()) {
+ if (found == masterModules.end()) {
docstring text = bformat(_("Included file `%1$s'\n"
- "uses module `%2$s'\n"
- "which is not used in parent file."),
- included_file.displayName(), from_utf8(module));
+ "uses module `%2$s'\n"
+ "which is not used in parent file."),
+ included_file.displayName(), from_utf8(module));
Alert::warning(_("Module not found"), text);
}
}
}
-void InsetInclude::getLabelList(vector<docstring> & list) const
-{
- if (isListings(params())) {
- InsetListingsParams p(to_utf8(params()["lstparams"]));
- string label = p.getParamValue("label");
- if (!label.empty())
- list.push_back(from_utf8(label));
- }
- else if (loadIfNeeded(buffer(), params())) {
- string const included_file = includedFilename(buffer(), params()).absFilename();
- Buffer * tmp = theBufferList().getBuffer(included_file);
- tmp->setParent(0);
- tmp->getLabelList(list);
- tmp->setParent(const_cast<Buffer *>(&buffer()));
- }
-}
-
-
void InsetInclude::fillWithBibKeys(BiblioInfo & keys,
InsetIterator const & /*di*/) const
{
void InsetInclude::addToToc(ParConstIterator const & cpit) const
{
+ bool const embedded_status = !params()["embed"].empty();
+ TocBackend & backend = buffer().tocBackend();
+
if (isListings(params())) {
+ if (label_)
+ label_->addToToc(cpit);
+
InsetListingsParams p(to_utf8(params()["lstparams"]));
string caption = p.getParamValue("caption");
if (caption.empty())
return;
- Toc & toc = buffer().tocBackend().toc("listing");
- docstring const str = convert<docstring>(toc.size() + 1)
+ Toc & toc = backend.toc("listing");
+ docstring str = convert<docstring>(toc.size() + 1)
+ ". " + from_utf8(caption);
+ if (embedded_status) {
+ backend.toc("embedded").push_back(TocItem(cpit, 0, str));
+ str += _(" (embedded)");
+ }
ParConstIterator pit = cpit;
pit.push_back(*this);
toc.push_back(TocItem(pit, 0, str));
return;
}
Buffer const * const childbuffer = getChildBuffer(buffer(), params());
- if (!childbuffer)
+ if (!childbuffer) {
+ if (embedded_status)
+ // Add it to the embedded list nonetheless.
+ backend.toc("embedded").push_back(TocItem(cpit, 0,
+ params()["filename"]));
return;
+ }
+
+ Toc & toc = backend.toc("child");
+ docstring str = childbuffer->fileName().displayName();
+ if (embedded_status) {
+ backend.toc("embedded").push_back(TocItem(cpit, 0, str));
+ str += _(" (embedded)");
+ }
+ toc.push_back(TocItem(cpit, 0, str));
- TocList & toclist = buffer().tocBackend().tocs();
+ TocList & toclist = backend.tocs();
TocList const & childtoclist = childbuffer->tocBackend().tocs();
TocList::const_iterator it = childtoclist.begin();
TocList::const_iterator const end = childtoclist.end();
for(; it != end; ++it)
toclist[it->first].insert(toclist[it->first].end(),
- it->second.begin(), it->second.end());
+ it->second.begin(), it->second.end());
}
-void InsetInclude::updateLabels(ParIterator const &)
+void InsetInclude::updateLabels(ParIterator const & it)
{
Buffer const * const childbuffer = getChildBuffer(buffer(), params());
if (childbuffer) {
if (!isListings(params()))
return;
+ if (label_)
+ label_->updateLabels(it);
+
InsetListingsParams const par(to_utf8(params()["lstparams"]));
if (par.getParamValue("caption").empty()) {
listings_label_.clear();
projects / lyx.git / blobdiff