*
* Full author contact details are available in file CREDITS.
*/
-#if 1
-#include <config.h>
-
+#include <config.h>
#include "InsetBox.h"
#include <sstream>
-
using namespace std;
using namespace lyx::support;
{}
-docstring InsetBox::name() const
+docstring InsetBox::layoutName() const
{
// FIXME: UNICODE
- string name = "Box";
- if (boxtranslator().find(params_.type) == Shaded)
- name += ":Shaded";
- return from_ascii(name);
+ return from_ascii("Box:" + params_.type);
}
if (params_.inner_box) {
if (params_.use_parbox)
inner = _("Parbox");
+ else if (params_.use_makebox)
+ inner = _("Makebox");
else
inner = _("Minipage");
}
bool InsetBox::forcePlainLayout(idx_type) const
{
- return !params_.inner_box && params_.type != "Framed";
+ return (!params_.inner_box || params_.use_makebox)
+ && params_.type != "Shaded" && params_.type != "Framed";
}
case LFUN_INSET_MODIFY: {
//lyxerr << "InsetBox::dispatch MODIFY" << endl;
- if (cmd.getArg(0) == "changetype")
+ cur.recordUndoInset(ATOMIC_UNDO, this);
+ if (cmd.getArg(0) == "changetype") {
params_.type = cmd.getArg(1);
- else
+ } else
string2params(to_utf8(cmd.argument()), params_);
setButtonLabel();
break;
switch (cmd.action()) {
case LFUN_INSET_MODIFY:
- if (cmd.getArg(0) == "changetype")
- flag.setOnOff(cmd.getArg(1) == params_.type);
- flag.setEnabled(true);
- return true;
+ if (cmd.getArg(0) == "changetype") {
+ string const type = cmd.getArg(1);
+ flag.setOnOff(type == params_.type);
+ flag.setEnabled(!params_.inner_box || type != "Framed");
+ return true;
+ }
+ return InsetCollapsable::getStatus(cur, cmd, flag);
case LFUN_INSET_DIALOG_UPDATE:
flag.setEnabled(true);
return true;
case LFUN_BREAK_PARAGRAPH:
- if (params_.inner_box || params_.type == "Framed")
+ if ((params_.inner_box && !params_.use_makebox)
+ || params_.type == "Shaded" || params_.type == "Framed")
return InsetCollapsable::getStatus(cur, cmd, flag);
flag.setEnabled(false);
return true;
}
-int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
+void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
{
BoxType btype = boxtranslator().find(params_.type);
}
}
- int i = 0;
- os << "%\n";
+ os << safebreakln;
+ if (runparams.lastid != -1)
+ os.texrow().start(runparams.lastid, runparams.lastpos);
+
// Adapt to column/text width correctly also if paragraphs indented:
if (stdwidth)
os << "\\noindent";
-
switch (btype) {
case Frameless:
break;
case Framed:
os << "\\begin{framed}%\n";
- i += 1;
break;
case Boxed:
os << "\\framebox";
if (!params_.inner_box) {
- os << "{\\makebox";
// Special widths, see usrguide ยง3.5
// FIXME UNICODE
if (params_.special != "none") {
- os << "["/* << params_.width.value()*/ << (double) 1
+ os << "[" << params_.width.value()
<< '\\' << from_utf8(params_.special)
<< ']';
- } /*else
+ } else
os << '[' << from_ascii(width_string)
<< ']';
if (params_.hor_pos != 'c')
- os << "[" << params_.hor_pos << "]";*/
+ os << "[" << params_.hor_pos << "]";
}
-
os << "{";
break;
case ovalbox:
os << "\\shadowbox{";
break;
case Shaded:
- // later
+ // must be set later because e.g. the width settings only work when
+ // it is inside a minipage or parbox
break;
case Doublebox:
os << "\\doublebox{";
break;
}
- #if 0
+
if (params_.inner_box) {
if (params_.use_parbox)
os << "\\parbox";
+ else if (params_.use_makebox) {
+ os << "\\makebox";
+ // FIXME UNICODE
+ // output the width and horizontal position
+ if (params_.special != "none") {
+ os << "[" << params_.width.value()
+ << '\\' << from_utf8(params_.special)
+ << ']';
+ } else
+ os << '[' << from_ascii(width_string)
+ << ']';
+ if (params_.hor_pos != 'c')
+ os << "[" << params_.hor_pos << "]";
+ os << "{";
+ }
else
os << "\\begin{minipage}";
- os << "[" << params_.pos << "]";
- if (params_.height_special == "none") {
- // FIXME UNICODE
- os << "[" << from_ascii(params_.height.asLatexString()) << "]";
- } else {
- // Special heights
- // set no optional argument when the value is the default "1\height"
- // (special units like \height are handled as "in")
- // but when the user has chosen a non-default inner_pos, the height
- // must be given: \minipage[pos][height][inner-pos]{width}
- if ((params_.height != Length("1in") ||
- params_.height_special != "totalheight") ||
- params_.inner_pos != params_.pos) {
+ // output parameters for parbox and minipage
+ if (!params_.use_makebox) {
+ os << "[" << params_.pos << "]";
+ if (params_.height_special == "none") {
// FIXME UNICODE
- os << "[" << params_.height.value()
- << "\\" << from_utf8(params_.height_special) << "]";
+ os << "[" << from_ascii(params_.height.asLatexString()) << "]";
+ } else {
+ // Special heights
+ // set no optional argument when the value is the default "1\height"
+ // (special units like \height are handled as "in")
+ // but when the user has chosen a non-default inner_pos, the height
+ // must be given: \minipage[pos][height][inner-pos]{width}
+ if ((params_.height != Length("1in") ||
+ params_.height_special != "totalheight") ||
+ params_.inner_pos != params_.pos) {
+ // FIXME UNICODE
+ os << "[" << params_.height.value()
+ << "\\" << from_utf8(params_.height_special) << "]";
+ }
}
+ if (params_.inner_pos != params_.pos)
+ os << "[" << params_.inner_pos << "]";
+ // FIXME UNICODE
+ os << '{' << from_ascii(width_string) << '}';
+ if (params_.use_parbox)
+ os << "{";
}
- if (params_.inner_pos != params_.pos)
- os << "[" << params_.inner_pos << "]";
- // FIXME UNICODE
- os << '{' << from_ascii(width_string) << '}';
-
- if (params_.use_parbox)
- os << "{";
os << "%\n";
- ++i;
- }
+ } // end if inner_box
+
if (btype == Shaded) {
os << "\\begin{shaded}%\n";
- ++i;
}
- i += InsetText::latex(os, runparams);
+ InsetText::latex(os, runparams);
if (btype == Shaded)
os << "\\end{shaded}";
if (params_.inner_box) {
- if (params_.use_parbox)
+ if (params_.use_parbox || params_.use_makebox)
os << "%\n}";
else
os << "%\n\\end{minipage}";
os << "\\end{framed}";
break;
case Boxed:
- if (!params_.inner_box)
- os << "}"; // for makebox
os << "}";
break;
case ovalbox:
// already done
break;
}
-
- i += 2;
-
- return i;
-#endif
- return 1;
}
-#else
+
int InsetBox::plaintext(odocstream & os, OutputParams const & runparams) const
{
BoxType const btype = boxtranslator().find(params_.type);
// construct attributes
string attrs = "class='" + params_.type + "'";
string style;
- if (!params_.width.empty())
- style += ("width: " + params_.width.asHTMLString() + "; ");
+ if (!params_.width.empty()) {
+ string w = params_.width.asHTMLString();
+ if (w != "100%")
+ style += ("width: " + params_.width.asHTMLString() + "; ");
+ }
// The special heights don't really mean anything for us.
if (!params_.height.empty() && params_.height_special == "none")
style += ("height: " + params_.height.asHTMLString() + "; ");
}
-docstring InsetBox::contextMenu(BufferView const &, int, int) const
+string InsetBox::contextMenuName() const
{
- return from_ascii("context-box");
+ return "context-box";
}
void InsetBox::string2params(string const & in, InsetBoxParams & params)
{
- params = InsetBoxParams(string());
if (in.empty())
return;
"Expected arg 2 to be \"Box\"\n");
}
+ params = InsetBoxParams(string());
params.read(lex);
}
InsetBoxParams::InsetBoxParams(string const & label)
: type(label),
use_parbox(false),
+ use_makebox(false),
inner_box(true),
width(Length("100col%")),
special("none"),
os << "has_inner_box " << inner_box << "\n";
os << "inner_pos \"" << inner_pos << "\"\n";
os << "use_parbox " << use_parbox << "\n";
+ os << "use_makebox " << use_makebox << "\n";
os << "width \"" << width.asString() << "\"\n";
os << "special \"" << special << "\"\n";
os << "height \"" << height.asString() << "\"\n";
inner_box = false;
lex >> "inner_pos" >> inner_pos;
lex >> "use_parbox" >> use_parbox;
+ lex >> "use_makebox" >> use_makebox;
lex >> "width" >> width;
lex >> "special" >> special;
lex >> "height" >> height;
lex >> "height_special" >> height_special;
}
-#endif
-} // namespace lyx
+} // namespace lyx