Do not make spaces unbreakable when tt font is used in a paragraph

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

diff --git a/ChangeLog b/ChangeLog
index ae862e0e80954d7f9c0c5fc911d00678387f98cc..49ea43644ec558d593cf531144bcfb69d1f6901e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-10-25  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/paragraph.C (SimpleTeXBlanks): spaces are automatically made
+       unbreakable if we are in freespacing mode (LyX-Code), but not in
+       latex mode.
+
 1999-10-26  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * development/lyx.spec.in (%build): add CFLAGS also.

diff --git a/src/paragraph.C b/src/paragraph.C
index 7c749727fd5d19ea6f50f97ac81c79fd49d81958..ea982871803c09b1940c228aa73e7e7fa6962f73 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -2914,7 +2914,7 @@ void LyXParagraph::SimpleTeXBlanks(string &file, TexRow &texrow,
                texrow.start(this, i+1);
                column = 0;
        } else if (font.latex() == LyXFont::OFF) {
-               if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
+               if (style->free_spacing) {
                        file += '~';
                } else {
                        file += ' ';