Georg's tex2lyx patch.

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

diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog
index 4d3f03544f1cbd6db177d8abfe1b99e8437c342c..2898830900cfc7dcf3eb06bd61d2dc69391102e9 100644 (file)
--- a/src/tex2lyx/ChangeLog
+++ b/src/tex2lyx/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-26  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * text.C (parse_text): handle vspaces like '1cm' correctly
+
 2004-02-01  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * text.C (parse_box): "\\" -> '\\' in calls to contains.

diff --git a/src/tex2lyx/text.C b/src/tex2lyx/text.C
index 64c3dda4e4a0bb9299e663faa09371922f34521b..5280682583f0a85b966a93f9860affc13c889576 100644 (file)
--- a/src/tex2lyx/text.C
+++ b/src/tex2lyx/text.C
@@ -1403,7 +1403,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                                unit = "vfill";
                                                known_vspace = true;
                                        }
-                               } else {
+                               }
+                               if (!known_vspace) {
                                        switch (unitFromString(unit)) {
                                        case LyXLength::SP:
                                        case LyXLength::PT: