anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow argument definitions in layout files to modify existing ones.

Browse Source 
This is what layout re-definitions do in all other cases.
This commit is contained in:
Richard Kimberly Heck 2020-09-28 22:06:11 -04:00
parent 54a72663ae
commit 6f643e52d4
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Layout.cpp
View File

@ -1148,17 +1148,22 @@ void Layout::readSpacing(Lexer & lex)
} }
void Layout::readArgument(Lexer & lex) void Layout::readArgument(Lexer & lex, bool validating)
{ {
latexarg arg;
bool error = false;
bool finished = false;
string id; string id;
lex >> id; lex >> id;
bool const itemarg = prefixIs(id, "item:"); bool const itemarg = prefixIs(id, "item:");
bool const postcmd = prefixIs(id, "post:"); bool const postcmd = prefixIs(id, "post:");
bool const listpreamble = prefixIs(id, "listpreamble:"); bool const listpreamble = prefixIs(id, "listpreamble:");
LaTeXArgMap & lam = itemarg ? itemargs_ :
(postcmd ? postcommandargs_ :
(listpreamble ? listpreamble_ :
latexargs_));
latexarg & arg = lam[id];
bool error = false;
bool finished = false;
while (!finished && lex.isOK() && !error) { while (!finished && lex.isOK() && !error) {
lex.next(); lex.next();
string const tok = ascii_lowercase(lex.getString()); string const tok = ascii_lowercase(lex.getString());
@ -1239,16 +1244,9 @@ void Layout::readArgument(Lexer & lex)
} }
if (arg.labelstring.empty()) if (arg.labelstring.empty())
LYXERR0("Incomplete Argument definition!"); LYXERR0("Incomplete Argument definition!");
else if (itemarg) // remove invalid definition
itemargs_[id] = arg; lam.erase(id);
else if (postcmd) }
postcommandargs_[id] = arg;
else if (listpreamble) {
// list preamble has no delimiters by default
arg.nodelims = true;
listpreamble_[id] = arg;
} else
latexargs_[id] = arg;
} }