Herbert Voss wrote:
>> Take a look at
>> http://www.ee.oulu.fi/~tuukkat/tmp/lyx1/
>> There's a pretty complex example.
>
>
>
> try to open and run this doc with 1.2
this fixes the bug with keep-option for a length
like \vspace*{0cm}, which is in cvs ignored
herbert
--
http://www.lyx.org/help/
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.691
diff -u -r1.691 ChangeLog
--- src/ChangeLog 24 Apr 2002 21:45:28 -0000 1.691
+++ src/ChangeLog 25 Apr 2002 18:00:02 -0000
@@ -1,3 +1,8 @@
+2002-04-25 Herbert Voss <[EMAIL PROTECTED]>
+
+ * buffer.C (parseSingleLyXformat2Token): fix bug with ignored
+ "keep" option
+
2002-04-24 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* CutAndPaste.C (SwitchLayoutsBetweenClasses): when converting a
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.326
diff -u -r1.326 buffer.C
--- src/buffer.C 24 Apr 2002 10:00:38 -0000 1.326
+++ src/buffer.C 25 Apr 2002 18:00:03 -0000
@@ -1031,15 +1031,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") {
