- 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--);
- }
+ // 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<docstring> opts =
+ getVectorFromString(parameters, from_ascii(","), false);
+ vector<docstring> 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 + "}");