installer: further preparation

[lyx.git] / src / tex2lyx / text.cpp

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 2206e003705373857181791318a9a8d9c6ff7fa5..5d90fed629107a823f9eda56a4fdd16baa3514a6 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -935,9 +935,8 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
                width_unit = "in";
                width_special = "width";
        } else if (latex_width.empty() && outer_type == "framebox") {
-               outer_type == "fbox";
-               width_value = "-999";
-               width_unit = "col%";
+               width_value.clear();
+               width_unit.clear();
                width_special = "none";
        }
        if (use_ert) {
@@ -1038,7 +1037,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
                else
                        os << "use_makebox " << (inner_type == "makebox") << '\n';
                if (outer_type == "fbox" || outer_type == "mbox")
-                       os << "width \"-999col%\"\n";
+                       os << "width \"\"\n";
                else
                        os << "width \"" << width_value << width_unit << "\"\n";
                os << "special \"" << width_special << "\"\n";
@@ -3930,8 +3929,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                string const absfigname =
                                        changeExtension(abstexname, ".fig");
                                fix_child_filename(filename);
-                               string const lyxname =
-                                       changeExtension(filename, ".lyx");
+                               string const lyxname = changeExtension(filename,
+                                       roundtripMode() ? ".lyx.lyx" : ".lyx");
                                string const abslyxname = makeAbsPath(
                                        lyxname, getParentFilePath(false)).absFileName();
                                bool xfig = false;