[LyX/master] Rename declarations that overshadow general ones
Juergen Spitzmueller
spitz at lyx.org
Fri Feb 20 14:49:01 UTC 2026
commit 87f30e4113f84ba4ee7b2dd54e2c177b17df6818
Author: Juergen Spitzmueller <spitz at lyx.org>
Date: Fri Feb 20 15:43:41 2026 +0100
Rename declarations that overshadow general ones
---
src/BufferParams.cpp | 12 +++----
src/LaTeX.cpp | 34 +++++++++----------
src/LaTeXFeatures.h | 2 +-
src/LyXRC.cpp | 12 +++----
src/Text.cpp | 12 +++----
src/frontends/qt/FloatPlacement.cpp | 6 ++--
src/frontends/qt/GuiCounter.cpp | 4 +--
src/frontends/qt/GuiDocument.cpp | 8 ++---
src/frontends/qt/GuiInclude.cpp | 6 ++--
src/frontends/qt/GuiLyXFiles.cpp | 12 +++----
src/frontends/qt/GuiSelectionManager.cpp | 4 +--
src/frontends/qt/GuiTabularCreate.cpp | 8 ++---
src/frontends/qt/GuiView.cpp | 4 +--
src/frontends/qt/TocWidget.cpp | 8 ++---
src/insets/InsetInfo.cpp | 56 ++++++++++++++++----------------
src/insets/InsetRef.cpp | 4 +--
16 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 1a3fbfef13..325652c600 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1269,9 +1269,9 @@ string BufferParams::readToken(Lexer & lex, string const & token,
if (token == "\\spellchecker_ignore") {
lex.eatLine();
docstring wl = lex.getDocString();
- docstring language;
- docstring word = split(wl, language, ' ');
- Language const * lang = languages.getLanguage(to_ascii(language));
+ docstring l;
+ docstring word = split(wl, l, ' ');
+ Language const * lang = languages.getLanguage(to_ascii(l));
if (lang)
spellignore().push_back(WordLangTuple(word, lang));
break;
@@ -4116,15 +4116,15 @@ void BufferParams::writeEncodingPreamble(otexstream & os,
} else {
// We might have an additional language that requires inputenc
set<string> encoding_set = features.getEncodingSet(doc_encoding);
- bool inputenc = false;
+ bool use_inputenc = false;
for (auto const & enc : encoding_set) {
if (encodings.fromLaTeXName(enc)
&& encodings.fromLaTeXName(enc)->package() == Encoding::inputenc) {
- inputenc = true;
+ use_inputenc = true;
break;
}
}
- if (inputenc)
+ if (use_inputenc)
// load (lua)inputenc without options
// (the encoding is loaded later)
os << "\\usepackage{" << inputenc_package << "}\n";
diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 03359fb31c..7057c560b0 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -362,10 +362,10 @@ int LaTeX::run(TeXErrors & terr)
LYXERR(Debug::OUTFILE, "Running Bibliography Processor.");
message(_("Running Bibliography Processor."));
updateBibtexDependencies(head, bibtex_info);
- int exit_code;
- rerun |= runBibTeX(bibtex_info, runparams, exit_code);
- if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
- return exit_code;
+ int ex_code;
+ rerun |= runBibTeX(bibtex_info, runparams, ex_code);
+ if (ex_code == Systemcall::KILLED || ex_code == Systemcall::TIMEOUT)
+ return ex_code;
FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
if (blgfile.exists())
bscanres = scanBlgFile(head, terr);
@@ -394,9 +394,9 @@ int LaTeX::run(TeXErrors & terr)
LYXERR(Debug::DEPEND, "Dep. file has changed or rerun requested");
LYXERR(Debug::OUTFILE, "Run #" << count);
message(runMessage(count));
- int exit_code = startscript();
- if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
- return exit_code;
+ int ex_code = startscript();
+ if (ex_code == Systemcall::KILLED || ex_code == Systemcall::TIMEOUT)
+ return ex_code;
scanres = scanLogFile(terr);
// update the depedencies
@@ -423,10 +423,10 @@ int LaTeX::run(TeXErrors & terr)
LYXERR(Debug::OUTFILE, "Re-Running Bibliography Processor.");
message(_("Re-Running Bibliography Processor."));
updateBibtexDependencies(head, bibtex_info);
- int exit_code;
- rerun |= runBibTeX(bibtex_info, runparams, exit_code);
- if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
- return exit_code;
+ int ex_code;
+ rerun |= runBibTeX(bibtex_info, runparams, ex_code);
+ if (ex_code == Systemcall::KILLED || ex_code == Systemcall::TIMEOUT)
+ return ex_code;
FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
if (blgfile.exists())
bscanres = scanBlgFile(head, terr);
@@ -781,16 +781,16 @@ void LaTeX::updateBibtexDependencies(DepTable & dep,
it != bibtex_info.end(); ++it) {
for (set<string>::const_iterator it2 = it->databases.begin();
it2 != it->databases.end(); ++it2) {
- FileName const file = findtexfile(*it2, "bib");
- if (!file.empty())
- dep.insert(file, true);
+ FileName const fname = findtexfile(*it2, "bib");
+ if (!fname.empty())
+ dep.insert(fname, true);
}
for (set<string>::const_iterator it2 = it->styles.begin();
it2 != it->styles.end(); ++it2) {
- FileName const file = findtexfile(*it2, "bst");
- if (!file.empty())
- dep.insert(file, true);
+ FileName const fname = findtexfile(*it2, "bst");
+ if (!fname.empty())
+ dep.insert(fname, true);
}
}
diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index af0e42b7b3..ca64ef31cb 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -168,7 +168,7 @@ public:
///
std::set<std::string> getEncodingSet(std::string const & doc_encoding) const;
///
- void getFontEncodings(std::vector<std::string> & encodings,
+ void getFontEncodings(std::vector<std::string> & encs,
bool const onlylangs = false) const;
///
void useLayout(docstring const & layoutname);
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 650cacfbc1..3adc55a119 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -2804,12 +2804,12 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
system_lyxrc.viewer_alternatives.begin() : // we won't use it in this case
system_lyxrc.viewer_alternatives.find(fmt);
for (; sit != sen; ++sit) {
- string const & cmd = *sit;
+ string const & command = *sit;
if (ignore_system_lyxrc
|| sysfmt == sysend // format not found
- || sysfmt->second.count(cmd) == 0 // this command not found
+ || sysfmt->second.count(command) == 0 // this command not found
)
- os << "\\viewer_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n";
+ os << "\\viewer_alternatives " << fmt << " \"" << escapeCommand(command) << "\"\n";
}
}
if (tag != RC_LAST)
@@ -2830,12 +2830,12 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
system_lyxrc.editor_alternatives.begin() : // we won't use it in this case
system_lyxrc.editor_alternatives.find(fmt);
for (; sit != sen; ++sit) {
- string const & cmd = *sit;
+ string const & command = *sit;
if (ignore_system_lyxrc
|| sysfmt == sysend // format not found
- || sysfmt->second.count(cmd) == 0 // this command not found
+ || sysfmt->second.count(command) == 0 // this command not found
)
- os << "\\editor_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n";
+ os << "\\editor_alternatives " << fmt << " \"" << escapeCommand(command) << "\"\n";
}
}
if (tag != RC_LAST)
diff --git a/src/Text.cpp b/src/Text.cpp
index 9c49b79310..ef4c369c86 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -895,7 +895,7 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str,
pos_type pos = cur.pos();
// The special chars we handle
- static map<wchar_t, string> specialchars = {
+ static map<wchar_t, string> special_chars = {
{ 0x200c, "ligaturebreak" },
{ 0x200b, "allowbreak" },
{ 0x2026, "ldots" },
@@ -937,9 +937,9 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str,
++pos;
space_inserted = true;
}
- } else if (specialchars.find(ch) != specialchars.end()
+ } else if (special_chars.find(ch) != special_chars.end()
&& (par.insertInset(pos, new InsetSpecialChar(cur.buffer(), cur.current_font.language(),
- specialchars.find(ch)->second),
+ special_chars.find(ch)->second),
font, bparams.track_changes
? Change(Change::INSERTED)
: Change(Change::UNCHANGED)))) {
@@ -6966,10 +6966,10 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
&& (cur.text()->getTocLevel(cur.pit()) == Layout::NOT_IN_TOC
|| cur.pos() == 0 || cur.pos() == cur.lastpos());
if (cmd.getArg(0) == "contextual") {
- string cmd;
+ string command;
string gui;
- getContextualBreak(paragraphs(), cur.pit(), cmd, gui);
- enable &= !cmd.empty();
+ getContextualBreak(paragraphs(), cur.pit(), command, gui);
+ enable &= !command.empty();
}
break;
diff --git a/src/frontends/qt/FloatPlacement.cpp b/src/frontends/qt/FloatPlacement.cpp
index aa0548170f..4d48a5b6d1 100644
--- a/src/frontends/qt/FloatPlacement.cpp
+++ b/src/frontends/qt/FloatPlacement.cpp
@@ -225,11 +225,11 @@ string const FloatPlacement::getPlacement() const
{
string placement;
- QString const data =
+ QString const idata =
placementCO->itemData(placementCO->currentIndex()).toString();
- if (data == "class")
+ if (idata == "class")
return "class";
- if (data == "document")
+ if (idata == "document")
return "document";
if (heredefinitelyCB->isChecked()) {
diff --git a/src/frontends/qt/GuiCounter.cpp b/src/frontends/qt/GuiCounter.cpp
index 04fab3a664..4ac9b791a1 100644
--- a/src/frontends/qt/GuiCounter.cpp
+++ b/src/frontends/qt/GuiCounter.cpp
@@ -112,10 +112,10 @@ void GuiCounter::paramsToDialog(Inset const * ip)
}
-bool GuiCounter::initialiseParams(std::string const & data)
+bool GuiCounter::initialiseParams(std::string const & cdata)
{
InsetCommandParams params(insetCode());
- if (!InsetCommand::string2params(data, params))
+ if (!InsetCommand::string2params(cdata, params))
return false;
fillCombos();
diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index 71b9f60790..ca4f42688a 100644
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -3604,11 +3604,11 @@ void GuiDocument::getTableStyles()
QString fn = QFileInfo(it.next()).fileName();
if (!fn.endsWith(".lyx") || fn.contains("_1x"))
continue;
- QString data = fn.left(fn.lastIndexOf(".lyx"));
- QString guiname = data;
+ QString tsdata = fn.left(fn.lastIndexOf(".lyx"));
+ QString guiname = tsdata;
guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiname.replace('_', ' '))));
- if (textLayoutModule->tableStyleCO->findData(data) == -1)
- textLayoutModule->tableStyleCO->addItem(guiname, data);
+ if (textLayoutModule->tableStyleCO->findData(tsdata) == -1)
+ textLayoutModule->tableStyleCO->addItem(guiname, tsdata);
}
}
}
diff --git a/src/frontends/qt/GuiInclude.cpp b/src/frontends/qt/GuiInclude.cpp
index 0f4a5a2bab..7185acde46 100644
--- a/src/frontends/qt/GuiInclude.cpp
+++ b/src/frontends/qt/GuiInclude.cpp
@@ -250,11 +250,11 @@ void GuiInclude::applyView()
// the parameter string should have passed validation
InsetListingsParams par(fromqstr(listingsED->toPlainText()));
string caption = fromqstr(captionLE->text());
- string label = fromqstr(labelLE->text());
+ string lab = fromqstr(labelLE->text());
if (!caption.empty())
par.addParam("caption", "{" + caption + "}");
- if (!label.empty())
- par.addParam("label", "{" + label + "}");
+ if (!lab.empty())
+ par.addParam("label", "{" + lab + "}");
string const listparams = par.params();
params_["lstparams"] = from_utf8(listparams);
} else {
diff --git a/src/frontends/qt/GuiLyXFiles.cpp b/src/frontends/qt/GuiLyXFiles.cpp
index a93000c3c6..358e75a003 100644
--- a/src/frontends/qt/GuiLyXFiles.cpp
+++ b/src/frontends/qt/GuiLyXFiles.cpp
@@ -289,8 +289,8 @@ void GuiLyXFiles::on_filesLW_itemClicked(QTreeWidgetItem * item, int)
return;
}
- QString const data = item->data(0, Qt::UserRole).toString();
- if (!data.endsWith(getSuffix())) {
+ QString const idata = item->data(0, Qt::UserRole).toString();
+ if (!idata.endsWith(getSuffix())) {
// not a file (probably a header)
bc().setValid(false);
return;
@@ -299,8 +299,8 @@ void GuiLyXFiles::on_filesLW_itemClicked(QTreeWidgetItem * item, int)
languageCO->clear();
QMap<QString, QString>::const_iterator i =available_languages_.constBegin();
while (i != available_languages_.constEnd()) {
- if (localizations_.contains(data)
- && localizations_.find(data).value().contains(i.key()))
+ if (localizations_.contains(idata)
+ && localizations_.find(idata).value().contains(i.key()))
languageCO->addItem(i.value(), i.key());
++i;
}
@@ -604,9 +604,9 @@ bool GuiLyXFiles::initialiseParams(string const & type)
}
-void GuiLyXFiles::passParams(string const & data)
+void GuiLyXFiles::passParams(string const & params)
{
- initialiseParams(data);
+ initialiseParams(params);
updateContents();
}
diff --git a/src/frontends/qt/GuiSelectionManager.cpp b/src/frontends/qt/GuiSelectionManager.cpp
index 57056925f9..c3522ec039 100644
--- a/src/frontends/qt/GuiSelectionManager.cpp
+++ b/src/frontends/qt/GuiSelectionManager.cpp
@@ -300,8 +300,8 @@ void GuiSelectionManager::addPB_clicked()
// select and show last added item
if (isAdded) {
- QModelIndex idx = selectedModel->index(srows, 0);
- selectedLV->setCurrentIndex(idx);
+ QModelIndex i = selectedModel->index(srows, 0);
+ selectedLV->setCurrentIndex(i);
}
updateHook();
diff --git a/src/frontends/qt/GuiTabularCreate.cpp b/src/frontends/qt/GuiTabularCreate.cpp
index 483d53a1b1..95eb3b8f81 100644
--- a/src/frontends/qt/GuiTabularCreate.cpp
+++ b/src/frontends/qt/GuiTabularCreate.cpp
@@ -57,11 +57,11 @@ void GuiTabularCreate::getFiles()
QString fn = QFileInfo(it.next()).fileName();
if (!fn.endsWith(".lyx") || fn.contains("_1x"))
continue;
- QString data = fn.left(fn.lastIndexOf(".lyx"));
- QString guiname = data;
+ QString tdata = fn.left(fn.lastIndexOf(".lyx"));
+ QString guiname = tdata;
guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiname.replace('_', ' '))));
- if (styleCO->findData(data) == -1)
- styleCO->addItem(guiname, data);
+ if (styleCO->findData(tdata) == -1)
+ styleCO->addItem(guiname, tdata);
}
}
}
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index 3a42afefea..2e96d24089 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -2582,8 +2582,8 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
break;
}
enable = false;
- for (Buffer * buf : doc_buffer->allRelatives()) {
- GuiWorkArea * wa = workArea(*buf);
+ for (Buffer * bf : doc_buffer->allRelatives()) {
+ GuiWorkArea * wa = workArea(*bf);
if (!wa)
continue;
if (wa->bufferView().getStatus(cmdToPass, flag)) {
diff --git a/src/frontends/qt/TocWidget.cpp b/src/frontends/qt/TocWidget.cpp
index ca9ac3f39c..1db5b35a62 100644
--- a/src/frontends/qt/TocWidget.cpp
+++ b/src/frontends/qt/TocWidget.cpp
@@ -258,11 +258,11 @@ void TocWidget::doDispatch(Cursor & cur, FuncRequest const & cmd,
case LFUN_REFERENCE_TO_PARAGRAPH: {
docstring const type = cmd.argument();
- TocItem const & item =
+ TocItem const & toc_item =
gui_view_.tocModels().currentItem(current_type_, index);
- docstring const id = (item.parIDs().empty())
- ? item.dit().paragraphGotoArgument(true)
- : item.parIDs();
+ docstring const id = (toc_item.parIDs().empty())
+ ? toc_item.dit().paragraphGotoArgument(true)
+ : toc_item.parIDs();
docstring const arg = (type.empty()) ? id : id + " " + type;
dispatch(FuncRequest(cmd, arg));
refocus_wa = true;
diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 77206dc44f..32121c435c 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -350,37 +350,37 @@ vector<pair<string,docstring>> InsetInfoParams::getArguments(Buffer const * buf,
bool InsetInfoParams::validateArgument(Buffer const * buf, docstring const & arg,
bool const usedefaults) const
{
- string type;
- string name = trim(split(to_utf8(arg), type, ' '));
- if (name.empty() && usedefaults)
- name = defaultValueTranslator().find(type);
+ string itype;
+ string iname = trim(split(to_utf8(arg), itype, ' '));
+ if (iname.empty() && usedefaults)
+ iname = defaultValueTranslator().find(itype);
- switch (nameTranslator().find(type)) {
+ switch (nameTranslator().find(itype)) {
case UNKNOWN_INFO:
return false;
case SHORTCUT_INFO:
case SHORTCUTS_INFO:
case MENU_INFO: {
- FuncRequest func = lyxaction.lookupFunc(name);
+ FuncRequest func = lyxaction.lookupFunc(iname);
return func.action() != LFUN_UNKNOWN_ACTION;
}
case L7N_INFO:
- return !name.empty();
+ return !iname.empty();
case ICON_INFO: {
- FuncCode const action = lyxaction.lookupFunc(name).action();
+ FuncCode const action = lyxaction.lookupFunc(iname).action();
if (action == LFUN_UNKNOWN_ACTION) {
string dir = "images";
- return !imageLibFileSearch(dir, name, "svgz,png").empty();
+ return !imageLibFileSearch(dir, iname, "svgz,png").empty();
}
return true;
}
case LYXRC_INFO: {
set<string> rcs = lyxrc.getRCs();
- return rcs.find(name) != rcs.end();
+ return rcs.find(iname) != rcs.end();
}
case PACKAGE_INFO:
@@ -388,54 +388,54 @@ bool InsetInfoParams::validateArgument(Buffer const * buf, docstring const & arg
return true;
case BUFFER_INFO:
- return (name == "name" || name == "name-noext"
- || name == "path" || name == "class");
+ return (iname == "name" || iname == "name-noext"
+ || iname == "path" || iname == "class");
case VCS_INFO:
- if (name == "revision" || name == "revision-abbrev" || name == "tree-revision"
- || name == "author" || name == "date" || name == "time")
+ if (iname == "revision" || iname == "revision-abbrev" || iname == "tree-revision"
+ || iname == "author" || iname == "date" || iname == "time")
return buf->lyxvc().inUse();
return false;
case LYX_INFO:
- return name == "version" || name == "layoutformat";
+ return iname == "version" || iname == "layoutformat";
case FIXDATE_INFO: {
string date;
string piece;
- date = split(name, piece, '@');
+ date = split(iname, piece, '@');
if (!date.empty() && !QDate::fromString(toqstr(date), Qt::ISODate).isValid())
return false;
if (!piece.empty())
- name = piece;
+ iname = piece;
}
// fall through
case DATE_INFO:
case MODDATE_INFO: {
- if (name == "long" || name == "short" || name == "ISO")
+ if (iname == "long" || iname == "short" || iname == "ISO")
return true;
else {
QDate date = QDate::currentDate();
- return !date.toString(toqstr(name)).isEmpty();
+ return !date.toString(toqstr(iname)).isEmpty();
}
}
case FIXTIME_INFO: {
string time;
string piece;
- time = split(name, piece, '@');
+ time = split(iname, piece, '@');
if (!time.empty() && !QTime::fromString(toqstr(time), Qt::ISODate).isValid())
return false;
if (!piece.empty())
- name = piece;
+ iname = piece;
}
// fall through
case TIME_INFO:
case MODTIME_INFO: {
- if (name == "long" || name == "short" || name == "ISO")
+ if (iname == "long" || iname == "short" || iname == "ISO")
return true;
else {
QTime time = QTime::currentTime();
- return !time.toString(toqstr(name)).isEmpty();
+ return !time.toString(toqstr(iname)).isEmpty();
}
}
}
@@ -1040,11 +1040,11 @@ void InsetInfo::build()
// TODO: when away from a release, replace with getTextClassInfo.
// the TextClass can change
LayoutFileList const & list = LayoutFileList::get();
- bool available = false;
+ bool avail = false;
// params_.name is the class name
if (list.haveClass(params_.name))
- available = list[params_.name].isTeXClassAvailable();
- if (available) {
+ avail = list[params_.name].isTeXClassAvailable();
+ if (avail) {
gui = _("yes");
info(from_ascii("yes"), params_.lang);
} else {
@@ -1306,8 +1306,8 @@ std::pair<QDate, std::string> parseDate(Buffer const & buffer, const InsetInfoPa
if (params.type == InsetInfoParams::MODDATE_INFO)
date = QDateTime::fromSecsSinceEpoch(buffer.fileName().lastModified()).date();
else if (params.type == InsetInfoParams::FIXDATE_INFO && !date_specifier.empty()) {
- QDate date = QDate::fromString(toqstr(date_specifier), Qt::ISODate);
- date = (date.isValid()) ? date : QDate::currentDate();
+ QDate trydate = QDate::fromString(toqstr(date_specifier), Qt::ISODate);
+ date = (trydate.isValid()) ? trydate : QDate::currentDate();
} else {
if (params.type != InsetInfoParams::DATE_INFO && params.type != InsetInfoParams::FIXDATE_INFO)
lyxerr << "Unexpected InsetInfoParams::info_type in parseDate: " << params.type;
diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index af3e8edc8e..3613d92aea 100644
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -564,9 +564,9 @@ void InsetRef::latex(otexstream & os, OutputParams const & rp) const
os << '{' << data << '}';
} else if (nlabels == 1) {
InsetCommandParams p(REF_CODE, cmd);
- bool const use_nolink = hyper_on && getParam("nolink") == "true";
+ bool const nolink = hyper_on && getParam("nolink") == "true";
p["reference"] = getParam("reference");
- os << p.getCommand(rp, use_nolink);
+ os << p.getCommand(rp, nolink);
} else {
bool first = true;
vector<docstring>::const_iterator it = labels.begin();
More information about the lyx-cvs
mailing list