anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix remaining (I think) requires keyword issues.

Browse Source
This commit is contained in:
Richard Kimberly Heck 2020-05-04 13:45:39 -04:00
parent 23abb5aaa3
commit 3b09ef61a6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ModuleList.h
View File

@ -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

20
src/mathed/MathFactory.cpp
View File

@ -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;
}