anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 07:42:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx/text.cpp: fix handling of \fbox

Browse Source 
since a while now lyX supports inner boxes in \fbox, tex2lyx was outdated in this case
This commit is contained in:
Uwe Stöhr 2015-05-18 23:45:27 +02:00
parent 5a1384d35c
commit c7a11c1da5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tex2lyx/test/box-color-size-space-align.tex
View File

@ -124,6 +124,10 @@ blabla \begin{framed}\begin{framed}nested framed\end{framed}\end{framed} blabla
blabla \fbox{fbox} blabla
\fbox{\begin{minipage}[t]{0.9\columnwidth}%
fbox around minipage%
\end{minipage}}
blabla \framebox{fr\textcolor{blue}{ame}box 1} blabla
blabla \framebox[3cm]{framebox 2} blabla

5
src/tex2lyx/text.cpp
View File

@ -1127,7 +1127,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
os << "use_makebox 1\n";
else
os << "use_makebox " << (inner_type == "makebox") << '\n';
if (outer_type == "fbox" || outer_type == "mbox")
if (outer_type == "mbox")
os << "width \"\"\n";
// for values like "1.5\width" LyX uses "1.5in" as width ad sets "width" as sepecial
else if (contains(width_unit, '\\'))
@ -1260,8 +1260,7 @@ void parse_outer_box(Parser & p, ostream & os, unsigned flags, bool outer,
p.skip_spaces(true);
}
}
if (outer_type == "shaded" || outer_type == "fbox"
|| outer_type == "mbox") {
if (outer_type == "shaded" || outer_type == "mbox") {
// These boxes never have an inner box
;
} else if (p.next_token().asInput() == "\\parbox") {