anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx/text.cpp: support for \fcolorbox

Browse Source 
and a fix also for \colorbox
This commit is contained in:
Uwe Stöhr 2015-05-19 00:04:45 +02:00
parent c7a11c1da5
commit bcc423c7ea
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tex2lyx/TODO.txt
View File

@ -86,7 +86,6 @@ Format LaTeX feature LyX feature
489 horizontal alignment in boxes InsetBox
\centering
\reggedleft
492 command \fcolorbox InsetBox
General

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

@ -191,6 +191,18 @@ www
\colorbox{blue}{\makebox[0.9\columnwidth][l]{www}}
\fcolorbox{lime}{white}{\begin{minipage}[t]{0.9\columnwidth}%
www%
\end{minipage}}
\fcolorbox{lime}{white}{\parbox[t]{0.9\columnwidth}{%
www%
}}
\fcolorbox{lime}{white}{\makebox[0.9\columnwidth][l]{www}}
\fcolorbox{lime}{white}{www}
\subsection{LyX Boxes}
\begin{lyxgreyedout}

22
src/tex2lyx/text.cpp
View File

@ -1099,7 +1099,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
begin_inset(os, "Box ");
if (outer_type == "framed")
os << "Framed\n";
else if (outer_type == "framebox" || outer_type == "fbox")
else if (outer_type == "framebox" || outer_type == "fbox" || frame_color != "")
os << "Boxed\n";
else if (outer_type == "shadowbox")
os << "Shadowbox\n";
@ -1118,6 +1118,8 @@ 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 != "")
os << "has_inner_box 0\n";
else
os << "has_inner_box " << !inner_type.empty() << "\n";
os << "inner_pos \"" << inner_pos << "\"\n";
@ -1125,6 +1127,8 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
<< '\n';
if (outer_type == "mbox")
os << "use_makebox 1\n";
if (frame_color != "")
os << "use_makebox 0\n";
else
os << "use_makebox " << (inner_type == "makebox") << '\n';
if (outer_type == "mbox")
@ -1210,7 +1214,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
}
#endif
}
if (background_color != "") {
if (inner_flags != FLAG_BRACE_LAST && (frame_color != "" || background_color != "")) {
// in this case we have to eat the the closing brace of the color box
p.get_token().asInput(); // the '}'
}
@ -4235,9 +4239,17 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
t.cs() == "shadowbox" || t.cs() == "doublebox")
parse_outer_box(p, os, FLAG_ITEM, outer, context, t.cs(), "");
else if (t.cs() == "colorbox") {
string const backgroundcolor = p.getArg('{', '}');
parse_box(p, os, 0, 0, outer, context, "", "", "", "", backgroundcolor);
else if (t.cs() == "fcolorbox" || t.cs() == "colorbox") {
string backgroundcolor;
preamble.registerAutomaticallyLoadedPackage("xcolor");
if (t.cs() == "fcolorbox") {
string const framecolor = p.getArg('{', '}');
backgroundcolor = p.getArg('{', '}');
parse_box(p, os, 0, 0, outer, context, "", "", "", framecolor, backgroundcolor);
} else {
backgroundcolor = p.getArg('{', '}');
parse_box(p, os, 0, 0, outer, context, "", "", "", "", backgroundcolor);
}
}
else if (t.cs() == "fboxrule" || t.cs() == "fboxsep"