LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index 9c613595881d7abd5e73993f4dc6bde05b01982a..015a83f03fe2e8b394c6ac0988907a5493768b19 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -136,7 +136,7 @@ namespace {
        void mathDispatch(LCursor & cur, FuncRequest const & cmd, bool display)
        {
                recordUndo(cur);
-               string sel = to_utf8(cur.selectionAsString(false));
+               docstring sel = cur.selectionAsString(false);
                //lyxerr << "selection is: '" << sel << "'" << endl;
 
                // It may happen that sel is empty but there is a selection
@@ -162,11 +162,11 @@ namespace {
                        // create a macro if we see "\\newcommand"
                        // somewhere, and an ordinary formula
                        // otherwise
-                       istringstream is(sel);
-                       if (sel.find("\\newcommand") == string::npos
-                           && sel.find("\\def") == string::npos)
+                       if (sel.find(from_ascii("\\newcommand")) == string::npos
+                           && sel.find(from_ascii("\\def")) == string::npos)
                        {
                                InsetMathHull * formula = new InsetMathHull;
+                               istringstream is(to_utf8(sel));
                                LyXLex lex(0, 0);
                                lex.setStream(is);
                                formula->read(cur.buffer(), lex);
@@ -175,8 +175,9 @@ namespace {
                                        // delimiters are left out
                                        formula->mutate(hullSimple);
                                cur.insert(formula);
-                       } else
-                               cur.insert(new MathMacroTemplate(is));
+                       } else {
+                               cur.insert(new MathMacroTemplate(sel));
+                       }
                }
                cur.message(from_utf8(N_("Math editor mode")));
        }
@@ -892,6 +893,21 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                break;
        }
 
+       case LFUN_UNICODE_INSERT: {
+               if (cmd.argument().empty())
+                       break;
+               docstring hexstring = cmd.argument();
+               if (lyx::support::isHex(hexstring)) {
+                       char_type c = lyx::support::hexToInt(hexstring);
+                       if (c > 32 && c < 0x10ffff) {
+                               lyxerr << "Inserting c: " << c << endl;
+                               docstring s = docstring(1, c);
+                               lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, s));
+                       }
+               }
+               break;
+       }
+               
        case LFUN_QUOTE_INSERT: {
                cap::replaceSelection(cur);
                Paragraph & par = cur.paragraph();
@@ -1793,6 +1809,7 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
        case LFUN_BUFFER_BEGIN:
        case LFUN_BUFFER_BEGIN_SELECT:
        case LFUN_BUFFER_END_SELECT:
+       case LFUN_UNICODE_INSERT:
                // these are handled in our dispatch()
                enable = true;
                break;