commit bea9086c85f89f2c2a5fe0e797ea7cc5ca7bfbb5
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Mon Feb 19 17:15:31 2018 +0100
escape label in included listings
Also use docstring rather than string.
Fixes part of #10544
(cherry picked from commit 0bf88651229bddc34b9856c7fa025245aa4246b8)
---
src/insets/InsetInclude.cpp | 66 ++++++++++++++++++++++++-------------------
status.23x | 3 ++
2 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index d6e3ae2..7b6f389 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -618,43 +618,51 @@ 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<string> 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--);
- }
+ // Get float placement, language, caption, and
+ // label, then remove the relative options if minted.
+ vector<docstring> opts =
+ getVectorFromString(parameters, from_ascii(","), false);
+ vector<docstring> latexed_opts;
+ for (size_t i = 0; i < opts.size(); ++i) {
+ 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())
diff --git a/status.23x b/status.23x
index fc321d3..74dc00f 100644
--- a/status.23x
+++ b/status.23x
@@ -34,6 +34,9 @@ What's new
* DOCUMENT INPUT/OUTPUT
+- Properly escape labels entered for included program listings in Insert > File
+ > Child Document (part of bug 10544).
+
* LYX2LYX
