* \author Jürgen Vigna
* \author Lars Gullik Bjønnes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "insetminipage.h"
-#include "insettext.h"
#include "BufferView.h"
#include "debug.h"
-#include "dimension.h"
#include "funcrequest.h"
#include "gettext.h"
-#include "Lsstream.h"
-#include "lyxfont.h"
+#include "LColor.h"
#include "lyxlex.h"
-#include "lyxtext.h"
-#include "Lsstream.h"
#include "metricsinfo.h"
+#include "paragraph.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
+#include "support/std_sstream.h"
-#include "support/LOstream.h"
-using std::ostream;
+using std::string;
using std::endl;
using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
// Some information about Minipages in LaTeX:
#if 0
setAutoCollapse(false);
#endif
-
-#if 0
-#ifdef WITH_WARNINGS
-#warning Remove this color definitions before 1.2.0 final!
-#endif
- // just for experimentation :)
- setBackgroundColor(LColor::green);
-#endif
-
- inset.setFrameColor(0, LColor::blue);
+ inset.setFrameColor(LColor::blue);
setInsetName("Minipage");
}
/* FIXME: I refuse to believe we have to live
* with ugliness like this ... */
inset.getLyXText(cmd.view())->fullRebreak();
- cmd.view()->updateInset();
+ cmd.view()->updateInset(this);
return DISPATCHED;
}
}
-void InsetMinipage::write(Buffer const * buf, ostream & os) const
+void InsetMinipage::write(Buffer const & buf, ostream & os) const
{
params_.write(os);
InsetCollapsable::write(buf, os);
}
-void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
+void InsetMinipage::read(Buffer const & buf, LyXLex & lex)
{
params_.read(lex);
InsetCollapsable::read(buf, lex);
void InsetMinipage::metrics(MetricsInfo & mi, Dimension & dim) const
{
- if (collapsed_)
- dimension_collapsed(dim);
- else {
+ if (isOpen()) {
Dimension d;
MetricsInfo m = mi;
m.base.textwidth = params_.width.inPixels(mi.base.textwidth);
break;
}
dim.wid = d.wid;
- }
+ } else
+ dimension_collapsed(dim);
+
dim_ = dim;
}
}
-int InsetMinipage::latex(Buffer const * buf, ostream & os,
+int InsetMinipage::latex(Buffer const & buf, ostream & os,
LatexRunParams const & runparams) const
{
string s_pos;
if (in.empty())
return;
- istringstream data(STRCONV(in));
+ istringstream data(in);
LyXLex lex(0, 0);
lex.setStream(data);
ostringstream data;
data << name_ << ' ';
params.write(data);
- return STRCONV(data.str());
+ return data.str();
}