This small patch fixes a problem in the layout file converter which was
discovered by Helge Hafting: It add an empty line after each line. This fix
is going in right now.
Georg
Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.739
diff -u -p -r1.739 ChangeLog
--- lib/ChangeLog 21 Oct 2005 16:11:32 -0000 1.739
+++ lib/ChangeLog 24 Oct 2005 14:09:58 -0000
@@ -1,3 +1,7 @@
+2005-10-24 Georg Baum <[EMAIL PROTECTED]>
+
+ * scripts/layout2layout.py: fix line ending removal
+
2005-10-21 Georg Baum <[EMAIL PROTECTED]>
* layouts/*.{inc,layout}: Add format information
Index: lib/scripts/layout2layout.py
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/scripts/layout2layout.py,v
retrieving revision 1.1
diff -u -p -r1.1 layout2layout.py
--- lib/scripts/layout2layout.py 21 Oct 2005 16:11:35 -0000 1.1
+++ lib/scripts/layout2layout.py 24 Oct 2005 14:09:58 -0000
@@ -29,7 +29,7 @@ def trim_eol(line):
" Remove end of line char(s)."
if line[-2:-1] == '\r':
return line[:-2]
- elif line[-1:-1] == '\r' or line[-1:-1] == '\n':
+ elif line[-1:] == '\r' or line[-1:] == '\n':
return line[:-1]
else:
# file with no EOL in last line
