I send this one the second time. it fixes a bug,
seen with Tuukkas testfile. long time ago ...
Herbert
--
http://www.lyx.org/help/
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.697
diff -u -r1.697 ChangeLog
--- src/ChangeLog 30 Apr 2002 10:58:10 -0000 1.697
+++ src/ChangeLog 30 Apr 2002 15:52:02 -0000
@@ -1,3 +1,8 @@
+2002-04-30 Herbert Voss <[EMAIL PROTECTED]>
+
+ * buffer.C (parseSingleLyXformat2Token): fix bug with ignored
+ "keep" option
+
2002-04-30 Juergen Vigna <[EMAIL PROTECTED]>
* buffer.C (parseSingleLyXformat2Token): reset the font before the
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.330
diff -u -r1.330 buffer.C
--- src/buffer.C 30 Apr 2002 10:58:10 -0000 1.330
+++ src/buffer.C 30 Apr 2002 15:52:03 -0000
@@ -1035,15 +1035,21 @@
} else if (token == "\\added_space_top") {
lex.nextToken();
VSpace value = VSpace(lex.getString());
+ // only add the length when value > 0 or
+ // with option keep
if ((value.length().len().value() != 0) ||
+ value.keep() ||
(value.kind() != VSpace::LENGTH))
- par->params().spaceTop(value);
+ par->params().spaceTop(value);
} else if (token == "\\added_space_bottom") {
lex.nextToken();
VSpace value = VSpace(lex.getString());
+ // only add the length when value > 0 or
+ // with option keep
if ((value.length().len().value() != 0) ||
+ value.keep() ||
(value.kind() != VSpace::LENGTH))
- par->params().spaceBottom(value);
+ par->params().spaceBottom(value);
#ifndef NO_COMPABILITY
#ifndef NO_PEXTRA_REALLY
} else if (token == "\\pextra_type") {
