anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-23 00:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix another problem related to bug #6284.

Browse Source 
When pasting "# a" within \mbox{} through Ctrl+Shift+V, the space is
correctly retained. However, using Ctrl+Shift+V for pasting "^ a" into
\mbox{}, the space gets swallowed. This is fixed by this patch.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31708 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2009-10-24 15:54:03 +00:00
parent d4be6cf24c
commit 5e26133947
1 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/mathed/MathParser.cpp
View File

@ -70,7 +70,6 @@ following hack as starting point to write some macros:
#include "support/debug.h" #include "support/debug.h"
#include "support/convert.h" #include "support/convert.h"
#include "support/docstream.h" #include "support/docstream.h"
#include "support/lstrings.h"
#include <sstream> #include <sstream>
@ -80,8 +79,6 @@ using namespace std;
namespace lyx { namespace lyx {
using support::subst;
namespace { namespace {
InsetMath::mode_type asMode(InsetMath::mode_type oldmode, docstring const & str) InsetMath::mode_type asMode(InsetMath::mode_type oldmode, docstring const & str)
@ -102,23 +99,52 @@ bool stared(docstring const & s)
} }
docstring const repl(docstring const & oldstr, char_type const c,
docstring const & macro, bool textmode = false)
{
docstring newstr;
size_t i;
size_t j;
for (i = 0, j = 0; i < oldstr.size(); ++i) {
if (c == oldstr[i]) {
newstr.append(oldstr, j, i - j);
newstr.append(macro);
j = i + 1;
if (macro.size() > 2 && j < oldstr.size())
newstr += (textmode && oldstr[j] == ' ' ? '\\' : ' ');
}
}
// Any substitution?
if (j == 0)
return oldstr;
newstr.append(oldstr, j, i - j);
return newstr;
}
docstring escapeSpecialChars(docstring const & str, bool textmode) docstring escapeSpecialChars(docstring const & str, bool textmode)
{ {
docstring const backslash = textmode ? from_ascii("\\textbackslash") docstring const backslash = textmode ? from_ascii("\\textbackslash")
: from_ascii("\\backslash"); : from_ascii("\\backslash");
docstring const caret = textmode ? from_ascii("\\textasciicircum") docstring const caret = textmode ? from_ascii("\\textasciicircum")
: from_ascii("\\mathcircumflex"); : from_ascii("\\mathcircumflex");
docstring const tilde = textmode ? from_ascii("\\textasciitilde")
: from_ascii("\\sim");
return subst(subst(subst(subst(subst(subst(subst(subst(subst(str, return repl(repl(repl(repl(repl(repl(repl(repl(repl(repl(str,
from_ascii("\\"), backslash), '\\', backslash, textmode),
from_ascii("^"), caret), '^', caret, textmode),
from_ascii("_"), from_ascii("\\_")), '~', tilde, textmode),
from_ascii("$"), from_ascii("\\$")), '_', from_ascii("\\_")),
from_ascii("#"), from_ascii("\\#")), '$', from_ascii("\\$")),
from_ascii("&"), from_ascii("\\&")), '#', from_ascii("\\#")),
from_ascii("%"), from_ascii("\\%")), '&', from_ascii("\\&")),
from_ascii("{"), from_ascii("\\{")), '%', from_ascii("\\%")),
from_ascii("}"), from_ascii("\\}")); '{', from_ascii("\\{")),
'}', from_ascii("\\}"));
} }