++i;
}
struct TeXAccent temp = { static_cast<tex_accent>(0), 0,
- 0, static_cast<FuncCode>(0)};
+ nullptr, static_cast<FuncCode>(0)};
return temp;
}
// FIXME This is a hack.
// tmp is no valid UCS4 string, but misused to store the
// accent.
- docstring tmp;
- tmp += char_type(0);
- tmp += char_type(accent);
- keymap_[keys[i]] = tmp;
+ docstring tmpd;
+ tmpd += char_type(0);
+ tmpd += char_type(accent);
+ keymap_[keys[i]] = tmpd;
}
}
&& it->second[1] == accent_2)
break;
}
+
+ // could not find accent2 on a key -- this should not happen.
+ if (it == end)
+ return -1;
+
docstring allowed;
if (!lex.next())
return -1;
-
allowed = lex.getDocString();
LYXERR(Debug::KBMAP, "allowed: " << to_utf8(allowed));
if (!lex.next(true))
return -1;
- key_from = lex.getString()[0];
+ key_from = static_cast<unsigned char>(lex.getString()[0]);
LYXERR(Debug::KBMAP, "\t`" << lex.getString() << '\'');
if (!lex.next(true))
// TransFSMData
-TransFSMData::TransFSMData()
+TransFSMData::TransFSMData() : deadkey_(0), deadkey2_(0), init_state_(nullptr),
+ deadkey_state_(nullptr), combined_state_(nullptr), currentState(nullptr)
{
- deadkey_ = deadkey2_ = 0;
- deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
}