Fix insertion of protected blanks in InsertStringA.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@605 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 2dc4452de0f32a691e7dca562dff03357bdf0f2b..a284e0eb03cfd88a496e3c10112640559bf97fe6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-14  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/text2.C (InsertStringA): don't forget to insert a META_INSET
+       character when inserting an inset.
+
 2000-03-12  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/bufferparams.C (readLanguage): now takes "default" into

diff --git a/src/buffer.C b/src/buffer.C
index 3d96d3be3565dce10756f4b29f692897c239e039..cbb04c2793392672d5e1a9a7d72f1a559bad3c7b 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -298,7 +298,6 @@ bool Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                inset = new InsetLatexAccent;
                inset->Read(lex);
                par->InsertChar(pos, LyXParagraph::META_INSET); 
-                       
                par->InsertInset(pos, inset);
                par->SetFont(pos, font);
                ++pos;

diff --git a/src/text2.C b/src/text2.C
index 11d739e0646692529b0e90d6fe1e6f5dbb9ca49e..fad86fa97064fc268fbe4599a951c35dda906ca5 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -2677,6 +2677,7 @@ void LyXText::InsertStringA(char const * s)
 #if 1
                                InsetSpecialChar * new_inset =
                                        new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
+                               par->InsertChar(pos, LyXParagraph::META_INSET);
                                par->InsertInset(pos, new_inset);
 #else
                                par->InsertChar(pos, LyXParagraph::META_PROTECTED_SEPARATOR);
@@ -2687,6 +2688,7 @@ void LyXText::InsertStringA(char const * s)
 #if 1
                                InsetSpecialChar * new_inset =
                                        new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
+                               par->InsertChar(pos, LyXParagraph::META_INSET);
                                par->InsertInset(pos, new_inset);
 #else
                                        par->InsertChar(a, LyXParagraph::META_PROTECTED_SEPARATOR);
@@ -2727,6 +2729,7 @@ void LyXText::InsertStringA(char const * s)
 #if 1
                                        InsetSpecialChar * new_inset =
                                                new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
+                                       par->InsertChar(pos, LyXParagraph::META_INSET);
                                        par->InsertInset(pos, new_inset);
 #else
                                         par->InsertChar(pos, LyXParagraph::META_PROTECTED_SEPARATOR);