tex2lyx/text.cpp: fixes for \mbox{}

now all box constructs should be fully supported by tex2lyx

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 120e48cb8b3843f4e5e09160c79ed057e2aaefa4..3dc60c558d74ebd0cfc966b0b02f3dbe3e362e5c 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -906,7 +906,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
                        inner_pos = "t";
                }
        }
-       if (inner_type == "makebox" && !p.hasOpt())
+       if (!p.hasOpt() && (inner_type == "makebox" || outer_type == "mbox"))
                hor_pos = "c";
        if (!inner_type.empty() && p.hasOpt()) {
                if (inner_type != "makebox")
@@ -1142,7 +1142,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
                os << "hor_pos \"" << hor_pos << "\"\n";
                if (outer_type == "mbox")
                        os << "has_inner_box 1\n";
-               if (!frame_color.empty())
+               else if (!frame_color.empty())
                        os << "has_inner_box 0\n";
                else
                        os << "has_inner_box " << !inner_type.empty() << "\n";
@@ -1151,7 +1151,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
                   << '\n';
                if (outer_type == "mbox")
                        os << "use_makebox 1\n";
-               if (!frame_color.empty())
+               else if (!frame_color.empty())
                        os << "use_makebox 0\n";
                else
                        os << "use_makebox " << (inner_type == "makebox") << '\n';