commit 3b09ef61a6d78d11f62b0b54851cfb1766e68484
Author: Richard Kimberly Heck <rikih...@lyx.org>
Date: Mon May 4 13:45:39 2020 -0400
Fix remaining (I think) requires keyword issues.
---
src/ModuleList.h | 2 +-
src/mathed/MathFactory.cpp | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/ModuleList.h b/src/ModuleList.h
index 252ebfd..1095f9e 100644
--- a/src/ModuleList.h
+++ b/src/ModuleList.h
@@ -52,7 +52,7 @@ public:
LyXModule(std::string const & name, std::string const & id,
std::string const & description,
std::vector<std::string> const & packagelist,
- std::vector<std::string> const & requires,
+ std::vector<std::string> const & required,
std::vector<std::string> const & excludes,
std::string const & catgy, bool const local);
/// whether the required packages are available
diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index f4b5668..698d8f4 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -189,20 +189,20 @@ void initSymbols()
// \def\macroname{definition} extra xmlname requires
istringstream is(line);
string macro;
- string requires;
+ string required;
string extra;
string xmlname;
bool hidden = false;
- is >> setw(65536) >> macro >> requires;
+ is >> setw(65536) >> macro >> required;
if ((is >> xmlname)) {
- extra = requires;
- if (!(is >> requires))
- requires = "";
+ extra = required;
+ if (!(is >> required))
+ required = "";
} else
xmlname = "";
MacroTable::iterator it =
MacroTable::globalMacros().insert(
0, from_utf8(macro));
- if (!extra.empty() || !xmlname.empty() ||
!requires.empty()) {
+ if (!extra.empty() || !xmlname.empty() ||
!required.empty()) {
MathWordList::iterator wit =
theMathWordList.find(it->first);
if (wit != theMathWordList.end())
LYXERR(Debug::MATHED, "readSymbols:
inset "
@@ -213,11 +213,11 @@ void initSymbols()
tmp.name = it->first;
tmp.extra = from_utf8(extra);
tmp.xmlname = from_utf8(xmlname);
- if (requires == "hiddensymbol") {
- requires = "";
+ if (required == "hiddensymbol") {
+ required = "";
tmp.hidden = hidden = true;
} else
- tmp.required = requires;
+ tmp.required = required;
theMathWordList[it->first] = tmp;
wit = theMathWordList.find(it->first);
it->second.setSymbol(&(wit->second));
@@ -230,7 +230,7 @@ void initSymbols()
<< " draw: 0"
<< " extra: " << extra
<< " xml: " << xmlname
- << " requires: " << requires
+ << " requires: " << required
<< " hidden: " << hidden << '\'');
continue;
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
