X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.cpp;h=7c0d6ce5505a3f86d7b1cc15f2b9ed4cdf662b03;hb=7986ac2f322aeb9c764d1c518cedd159d62f32d7;hp=02da0f78cbfe16e027e644db7ec66df1fdbf95e4;hpb=3dfa1cb417fe909adb96311500bc00e7f8306fd6;p=lyx.git diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 02da0f78cb..7c0d6ce550 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -165,7 +165,24 @@ InsetLabel * createLabel(Buffer * buf, docstring const & label_str) return new InsetLabel(buf, icp); } -} // namespace anon + +char_type replaceCommaInBraces(docstring & params) +{ + // Code point from private use area + char_type private_char = 0xE000; + int count = 0; + for (char_type & c : params) { + if (c == '{') + ++count; + else if (c == '}') + --count; + else if (c == ',' && count) + c = private_char; + } + return private_char; +} + +} // namespace InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p) @@ -197,11 +214,6 @@ InsetInclude::InsetInclude(InsetInclude const & other) InsetInclude::~InsetInclude() { - if (isBufferLoaded()) - /* We do not use buffer() because Coverity believes that this - * may throw an exception. Actually this code path is not - * taken when buffer_ == 0 */ - buffer_->invalidateBibfileCache(); delete label_; } @@ -265,24 +277,24 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd) InsetListingsParams new_params(to_utf8(p["lstparams"])); docstring const new_label = from_utf8(new_params.getParamValue("label")); - + if (new_label.empty()) { delete label_; label_ = 0; } else { docstring old_label; - if (label_) + if (label_) old_label = label_->getParam("name"); else { label_ = createLabel(buffer_, new_label); label_->setBuffer(buffer()); - } + } if (new_label != old_label) { label_->updateLabelAndRefs(new_label, &cur); // the label might have been adapted (duplicate) if (new_label != label_->getParam("name")) { - new_params.addParam("label", "{" + + new_params.addParam("label", "{" + to_utf8(label_->getParam("name")) + "}", true); p["lstparams"] = from_utf8(new_params.params()); } @@ -354,8 +366,6 @@ void InsetInclude::setParams(InsetCommandParams const & p) if (type(params()) == INPUT) add_preview(*preview_, *this, buffer()); - - buffer().invalidateBibfileCache(); } @@ -412,7 +422,7 @@ docstring InsetInclude::screenLabel() const Buffer * InsetInclude::getChildBuffer() const { - Buffer * childBuffer = loadIfNeeded(); + Buffer * childBuffer = loadIfNeeded(); // FIXME RECURSIVE INCLUDE // This isn't sufficient, as the inclusion could be downstream. @@ -427,7 +437,7 @@ Buffer * InsetInclude::loadIfNeeded() const // try to load the cloned child document again. if (buffer().isClone()) return child_buffer_; - + // Don't try to load it again if we failed before. if (failedtoload_ || isVerbatim(params()) || isListings(params())) return 0; @@ -436,7 +446,7 @@ Buffer * InsetInclude::loadIfNeeded() const // Use cached Buffer if possible. if (child_buffer_ != 0) { if (theBufferList().isLoaded(child_buffer_) - // additional sanity check: make sure the Buffer really is + // additional sanity check: make sure the Buffer really is // associated with the file we want. && child_buffer_ == theBufferList().getBuffer(included_file)) return child_buffer_; @@ -618,43 +628,57 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const string const opt = to_utf8(params()["lstparams"]); // opt is set in QInclude dialog and should have passed validation. InsetListingsParams lstparams(opt); - string parameters = lstparams.params(); - string language; - string caption; - string label; - string placement; + docstring parameters = from_utf8(lstparams.params()); + docstring language; + docstring caption; + docstring label; + docstring placement; bool isfloat = lstparams.isFloat(); - if (use_minted) { - // Get float placement, language, caption, and - // label, then remove the relative options. - vector opts = - getVectorFromString(parameters, ",", false); - for (size_t i = 0; i < opts.size(); ++i) { - if (prefixIs(opts[i], "float")) { - if (prefixIs(opts[i], "float=")) - placement = opts[i].substr(6); - opts.erase(opts.begin() + i--); - } else if (prefixIs(opts[i], "language=")) { - language = opts[i].substr(9); - opts.erase(opts.begin() + i--); - } else if (prefixIs(opts[i], "caption=")) { - caption = opts[i].substr(8); - opts.erase(opts.begin() + i--); - } else if (prefixIs(opts[i], "label=")) { - label = opts[i].substr(6); - opts.erase(opts.begin() + i--); - } + // We are going to split parameters at commas, so + // replace commas that are not parameter separators + // with a code point from the private use area + char_type comma = replaceCommaInBraces(parameters); + // Get float placement, language, caption, and + // label, then remove the relative options if minted. + vector opts = + getVectorFromString(parameters, from_ascii(","), false); + vector latexed_opts; + for (size_t i = 0; i < opts.size(); ++i) { + // Restore replaced commas + opts[i] = subst(opts[i], comma, ','); + if (use_minted && prefixIs(opts[i], from_ascii("float"))) { + if (prefixIs(opts[i], from_ascii("float="))) + placement = opts[i].substr(6); + opts.erase(opts.begin() + i--); + } else if (use_minted && prefixIs(opts[i], from_ascii("language="))) { + language = opts[i].substr(9); + opts.erase(opts.begin() + i--); + } else if (prefixIs(opts[i], from_ascii("caption="))) { + // FIXME We should use HANDLING_LATEXIFY here, + // but that's a file format change (see #10455). + caption = opts[i].substr(8); + opts.erase(opts.begin() + i--); + if (!use_minted) + latexed_opts.push_back(from_ascii("caption=") + caption); + } else if (prefixIs(opts[i], from_ascii("label="))) { + label = params().prepareCommand(runparams, trim(opts[i].substr(6), "{}"), + ParamInfo::HANDLING_ESCAPE); + opts.erase(opts.begin() + i--); + if (!use_minted) + latexed_opts.push_back(from_ascii("label={") + label + "}"); } - if (!label.empty()) { + if (use_minted && !label.empty()) { if (isfloat || !caption.empty()) label = trim(label, "{}"); else - opts.push_back("label=" + label); + opts.push_back(from_ascii("label=") + label); } - parameters = getStringFromVector(opts, ","); } + if (!latexed_opts.empty()) + opts.insert(opts.end(), latexed_opts.begin(), latexed_opts.end()); + parameters = getStringFromVector(opts, from_ascii(",")); if (language.empty()) - language = "TeX"; + language = from_ascii("TeX"); if (use_minted && isfloat) { os << breakln << "\\begin{listing}"; if (!placement.empty()) @@ -670,7 +694,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const if (!parameters.empty()) os << "[" << parameters << "]"; if (use_minted) - os << '{' << language << '}'; + os << '{' << ascii_lowercase(language) << '}'; os << '{' << incfile << '}'; if (use_minted && isfloat) { if (!caption.empty()) @@ -761,7 +785,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const "uses module `%2$s'\n" "which is not used in parent file."), included_file.displayName(), from_utf8(module)); - Alert::warning(_("Module not found"), text); + Alert::warning(_("Module not found"), text, true); } } } @@ -898,20 +922,20 @@ docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const return docstring(); // are we generating only some paragraphs, or all of them? - bool const all_pars = !rp.dryrun || - (rp.par_begin == 0 && + bool const all_pars = !rp.dryrun || + (rp.par_begin == 0 && rp.par_end == (int)buffer().text().paragraphs().size()); - + OutputParams op = rp; if (all_pars) { op.par_begin = 0; op.par_end = 0; ibuf->writeLyXHTMLSource(xs.os(), op, Buffer::IncludedFile); } else - xs << XHTMLStream::ESCAPE_NONE - << ""; return docstring(); } @@ -1072,7 +1096,7 @@ void InsetInclude::validate(LaTeXFeatures & features) const } -void InsetInclude::collectBibKeys(InsetIterator const & /*di*/) const +void InsetInclude::collectBibKeys(InsetIterator const & /*di*/, FileNameList & checkedFiles) const { Buffer * child = loadIfNeeded(); if (!child) @@ -1082,7 +1106,7 @@ void InsetInclude::collectBibKeys(InsetIterator const & /*di*/) const // But it'll have to do for now. if (child == &buffer()) return; - child->collectBibKeys(); + child->collectBibKeys(checkedFiles); } @@ -1209,7 +1233,7 @@ void add_preview(RenderMonitoredPreview & renderer, InsetInclude const & inset, } } -} // namespace anon +} // namespace void InsetInclude::addPreview(DocIterator const & /*inset_pos*/, @@ -1281,7 +1305,7 @@ void InsetInclude::updateCommand() InsetListingsParams par(to_utf8(params()["lstparams"])); par.addParam("label", "{" + to_utf8(new_label) + "}", true); p["lstparams"] = from_utf8(par.params()); - setParams(p); + setParams(p); }