anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 16:31:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
now all box constructs should be fully supported by tex2lyx
This commit is contained in:
Uwe Stöhr 2015-05-19 23:35:56 +02:00
parent 8f3ed42294
commit 013eb54270
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tex2lyx/text.cpp
View File

@ -906,7 +906,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
inner_pos = "t"; inner_pos = "t";
} }
} }
if (inner_type == "makebox" && !p.hasOpt()) if (!p.hasOpt() && (inner_type == "makebox" || outer_type == "mbox"))
hor_pos = "c"; hor_pos = "c";
if (!inner_type.empty() && p.hasOpt()) { if (!inner_type.empty() && p.hasOpt()) {
if (inner_type != "makebox") if (inner_type != "makebox")
@ -1142,7 +1142,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
os << "hor_pos \"" << hor_pos << "\"\n"; os << "hor_pos \"" << hor_pos << "\"\n";
if (outer_type == "mbox") if (outer_type == "mbox")
os << "has_inner_box 1\n"; os << "has_inner_box 1\n";
if (!frame_color.empty()) else if (!frame_color.empty())
os << "has_inner_box 0\n"; os << "has_inner_box 0\n";
else else
os << "has_inner_box " << !inner_type.empty() << "\n"; os << "has_inner_box " << !inner_type.empty() << "\n";
@ -1151,7 +1151,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
<< '\n'; << '\n';
if (outer_type == "mbox") if (outer_type == "mbox")
os << "use_makebox 1\n"; os << "use_makebox 1\n";
if (!frame_color.empty()) else if (!frame_color.empty())
os << "use_makebox 0\n"; os << "use_makebox 0\n";
else else
os << "use_makebox " << (inner_type == "makebox") << '\n'; os << "use_makebox " << (inner_type == "makebox") << '\n';