anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx/text.cpp: remove a now unnecessary hack

Browse Source 
\framebox{} is equal to \fbox{} and \makebox{} is equal to \mbox{}
When I once wrote this code LyX did not support \fbbox and \mbox and therefore had to use a workaround.
This commit is contained in:
Uwe Stöhr 2015-05-19 23:25:36 +02:00
parent 2e78738bf0
commit 8f3ed42294
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,8 @@ blabla \begin{framed}\begin{framed}nested framed\end{framed}\end{framed} blabla
blabla \fbox{fbox} blabla blabla \fbox{fbox} blabla
blabla \framebox{framebox} blabla
\fbox{\begin{minipage}[t]{0.9\columnwidth}% \fbox{\begin{minipage}[t]{0.9\columnwidth}%
fbox around minipage% fbox around minipage%
\end{minipage}} \end{minipage}}

12
src/tex2lyx/text.cpp
View File

@ -1021,18 +1021,6 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
} }
p.popPosition(); p.popPosition();
} }
// if only \makebox{content} was used we can set its width to 1\width
// because this identic and also identic to \mbox
// this doesn't work for \framebox{content}, thus we have to use ERT for this
if (latex_width.empty() && inner_type == "makebox" && background_color.empty()) {
width_value = "1";
width_unit = "in";
width_special = "width";
} else if (latex_width.empty() && outer_type == "framebox") {
width_value.clear();
width_unit.clear();
width_special = "none";
}
// try to determine the box content alignment // try to determine the box content alignment
// first handle the simple case of "{\centering..." // first handle the simple case of "{\centering..."