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

Use FuncRequest::getArg instead of splitting the argument

Browse Source 
ourselves.
This commit is contained in:
Richard Heck 2018-04-16 22:32:04 -04:00
parent d8a1132e34
commit f7d502d024
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Text3.cpp
View File

@ -1699,12 +1699,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_UNICODE_INSERT: { case LFUN_UNICODE_INSERT: {
if (cmd.argument().empty()) if (cmd.argument().empty())
break; break;
// splits on whitespace int i = 0;
vector<docstring> args = while (true) {
getVectorFromString(cmd.argument(), from_ascii(" "), false, true); docstring const arg = from_utf8(cmd.getArg(i));
for (auto const & arg : args) { if (arg.empty())
break;
if (!isHex(arg)) { if (!isHex(arg)) {
LYXERR0("Not a hexstring: " << arg); LYXERR0("Not a hexstring: " << arg);
++i;
continue; continue;
} }
char_type c = hexToInt(arg); char_type c = hexToInt(arg);
@ -1712,6 +1714,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
LYXERR(Debug::KEY, "Inserting c: " << c); LYXERR(Debug::KEY, "Inserting c: " << c);
lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, docstring(1, c))); lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, docstring(1, c)));
} }
++i;
} }
break; break;
} }

12
src/mathed/InsetMathNest.cpp
View File

@ -1249,20 +1249,24 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_UNICODE_INSERT: { case LFUN_UNICODE_INSERT: {
if (cmd.argument().empty()) if (cmd.argument().empty())
break; break;
// splits on whitespace int i = 0;
vector<docstring> args = while (true) {
getVectorFromString(cmd.argument(), from_ascii(" "), false, true); docstring const arg = from_utf8(cmd.getArg(i));
for (auto const & arg : args) { if (arg.empty())
break;
if (!isHex(arg)) { if (!isHex(arg)) {
LYXERR0("Not a hexstring: " << arg); LYXERR0("Not a hexstring: " << arg);
++i;
continue; continue;
} }
char_type c = hexToInt(arg); char_type c = hexToInt(arg);
if (c >= 32 && c < 0x10ffff) { if (c >= 32 && c < 0x10ffff) {
LYXERR(Debug::KEY, "Inserting c: " << c);
FuncCode code = currentMode() == MATH_MODE ? FuncCode code = currentMode() == MATH_MODE ?
LFUN_MATH_INSERT : LFUN_SELF_INSERT; LFUN_MATH_INSERT : LFUN_SELF_INSERT;
lyx::dispatch(FuncRequest(code, docstring(1, c))); lyx::dispatch(FuncRequest(code, docstring(1, c)));
} }
++i;
} }
break; break;
} }