The attached patch is already committed. Without it we are corrupting files
so I thought this was rather urgent...

[Yes, I'll clean it up later, twice strlen is not nice...]

Andre'

-- 
Those who desire to give up Freedom in order to gain Security,
will not have, nor do they deserve, either one. (T. Jefferson)
? tmp.diff
? crash.diff
? haveit
? script.diff
? all
? rmcopyright.sh
? shared_ptr.diff
Index: math_mathmlstream.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_mathmlstream.C,v
retrieving revision 1.30
diff -u -p -r1.30 math_mathmlstream.C
--- math_mathmlstream.C 11 Sep 2002 09:14:56 -0000      1.30
+++ math_mathmlstream.C 16 Oct 2002 15:31:55 -0000
@@ -72,6 +72,11 @@ WriteStream & operator<<(WriteStream & w
 
 WriteStream & operator<<(WriteStream & ws, char const * s)
 {
+       if (ws.pendingSpace() && strlen(s) > 0) {
+               if (isAlpha(s[0]))
+                       ws.os() << ' ';
+               ws.pendingSpace(false);
+       }
        ws.os() << s;
        ws.addlines(int(lyx::count(s, s + strlen(s), '\n')));
        return ws;
Index: math_streamstr.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_streamstr.C,v
retrieving revision 1.10
diff -u -p -r1.10 math_streamstr.C
--- math_streamstr.C    11 Sep 2002 09:14:56 -0000      1.10
+++ math_streamstr.C    16 Oct 2002 15:31:55 -0000
@@ -13,12 +13,7 @@
 
 WriteStream & operator<<(WriteStream & ws, string const & s)
 {
-       if (ws.pendingSpace()) {
-               ws.os() << ' ';
-               ws.pendingSpace(false);
-       }
-       ws.os() << s;
-       ws.addlines(int(lyx::count(s.begin(), s.end(), '\n')));
+       ws << s.c_str();
        return ws;
 }
 

Reply via email to