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

Move defaults into struct definition

Browse Source
This commit is contained in:
Richard Kimberly Heck 2020-09-28 21:30:40 -04:00
parent 35c0783bd3
commit 54a72663ae
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Layout.cpp
View File

@ -1151,19 +1151,8 @@ void Layout::readSpacing(Lexer & lex)
void Layout::readArgument(Lexer & lex)
{
latexarg arg;
// writeArgument() makes use of these default values
arg.mandatory = false;
arg.nodelims = false;
arg.autoinsert = false;
arg.insertcotext = false;
arg.insertonnewline = false;
bool error = false;
bool finished = false;
arg.font = inherit_font;
arg.labelfont = inherit_font;
arg.is_toc_caption = false;
arg.passthru = PT_INHERITED;
arg.free_spacing = false;
string id;
lex >> id;
bool const itemarg = prefixIs(id, "item:");

20
src/Layout.h
View File

@ -93,8 +93,8 @@ public:
struct latexarg {
docstring labelstring;
docstring menustring;
bool mandatory;
bool nodelims;
bool mandatory = false;
bool nodelims = false;
docstring ldelim;
docstring rdelim;
docstring defaultarg;
@ -102,15 +102,15 @@ public:
docstring tooltip;
std::string required;
std::string decoration;
FontInfo font;
FontInfo labelfont;
bool autoinsert;
bool insertcotext;
bool insertonnewline;
ArgPassThru passthru;
FontInfo font = inherit_font;
FontInfo labelfont = inherit_font;
bool autoinsert = false;
bool insertcotext = false;
bool insertonnewline = false;
ArgPassThru passthru = PT_INHERITED;
docstring pass_thru_chars;
bool is_toc_caption;
bool free_spacing;
bool is_toc_caption = false;
bool free_spacing = false;
std::string newlinecmd;
};
///