X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetminipage.C;h=9d194680131eb4296f0b88d486e4d04e0250aa81;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=bb154b42516bd9c0b6ff5fdba1a14a3d6f106b7e;hpb=4e61c013f4155f9f477b9ceca6df65eef5de624e;p=lyx.git

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index bb154b4251..9d19468013 100644
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -25,6 +25,7 @@
 #include "support/lstrings.h"
 #include "debug.h"
 #include "gettext.h"
+#include "lyxlex.h"
 
 using std::ostream;
 using std::endl;
@@ -60,17 +61,37 @@ using std::endl;
 
 InsetMinipage::InsetMinipage()
 	: InsetCollapsable(), pos_(center),
-	  inner_pos_(inner_center)
+	  inner_pos_(inner_center), width_(100, LyXLength::PW)
 {
 	setLabel(_("minipage"));
 	LyXFont font(LyXFont::ALL_SANE);
 	font.decSize();
 	font.decSize();
-	font.setColor(LColor::footnote);
+	font.setColor(LColor::collapsable);
 	setLabelFont(font);
+#if 0
 	setAutoCollapse(false);
+#endif
+#ifdef WITH_WARNINGS
+#warning Remove this color definitions before 1.2.0 final!
+#endif
+	// just for experimentation :)
+	setBackgroundColor(LColor::green);
+	inset.setFrameColor(0, LColor::blue);
 	setInsetName("Minipage");
-	width_ = "100%"; // set default to 100% of column_width
+}
+
+
+InsetMinipage::InsetMinipage(InsetMinipage const & in, bool same_id)
+	: InsetCollapsable(in, same_id),
+	  pos_(in.pos_), inner_pos_(in.inner_pos_),
+	  height_(in.height_), width_(in.width_)
+{}
+
+
+Inset * InsetMinipage::clone(Buffer const &, bool same_id) const
+{
+	return new InsetMinipage(*const_cast<InsetMinipage *>(this), same_id);
 }
 
 
@@ -80,120 +101,79 @@ InsetMinipage::~InsetMinipage()
 }
 
 
-void InsetMinipage::Write(Buffer const * buf, ostream & os) const 
+void InsetMinipage::write(Buffer const * buf, ostream & os) const 
 {
 	os << getInsetName() << "\n"
 	   << "position " << pos_ << "\n"
 	   << "inner_position " << inner_pos_ << "\n"
-	   << "height \"" << height_ << "\"\n"
-	   << "width \"" << width_ << "\"\n";
-	InsetCollapsable::Write(buf, os);
+	   << "height \"" << height_.asString() << "\"\n"
+	   << "width \"" << width_.asString() << "\"\n";
+	InsetCollapsable::write(buf, os);
 }
 
 
-void InsetMinipage::Read(Buffer const * buf, LyXLex & lex)
+void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
 {
-    string token;
-
-    if (lex.IsOK()) {
-	lex.next();
-	token = lex.GetString();
-	if (token == "position") {
-	    lex.next();
-	    pos_ = static_cast<Position>(lex.GetInteger());
-	    token = string();
-	} else {
-		lyxerr << "InsetMinipage::Read: Missing 'position'-tag!"
-		       << endl;
-	}
-    }
-    if (lex.IsOK()) {
-	if (token.empty()) {
-	    lex.next();
-	    token = lex.GetString();
-	}
-	if (token == "inner_position") {
-	    lex.next();
-	    inner_pos_ = static_cast<InnerPosition>(lex.GetInteger());
-	    token = string();
-	} else {
-		lyxerr << "InsetMinipage::Read: Missing 'inner_position'-tag!"
-		       << endl;
-	}
-    }
-    if (lex.IsOK()) {
-	if (token.empty()) {
-	    lex.next();
-	    token = lex.GetString();
-	}
-	if (token == "height") {
-	    lex.next();
-	    height_ = lex.GetString();
-	    token = string();
-	} else {
-		lyxerr << "InsetMinipage::Read: Missing 'height'-tag!"
-		       << endl;
-	}
-    }
-    if (lex.IsOK()) {
-	if (token.empty()) {
-	    lex.next();
-	    token = lex.GetString();
+	if (lex.isOK()) {
+		lex.next();
+		string const token = lex.getString();
+		if (token == "position") {
+			lex.next();
+			pos_ = static_cast<Position>(lex.getInteger());
+		} else {
+			lyxerr << "InsetMinipage::Read: Missing 'position'-tag!"
+				   << endl;
+			// take countermeasures
+			lex.pushToken(token);
+		}
 	}
-	if (token == "width") {
-	    lex.next();
-	    width_ = lex.GetString();
-	    token = string();
-	} else {
-		lyxerr << "InsetMinipage::Read: Missing 'width'-tag!"
-		       << endl;
+	if (lex.isOK()) {
+		lex.next();
+		string const token = lex.getString();
+		if (token == "inner_position") {
+			lex.next();
+			inner_pos_ = static_cast<InnerPosition>(lex.getInteger());
+		} else {
+			lyxerr << "InsetMinipage::Read: Missing 'inner_position'-tag!"
+				   << endl;
+			// take countermeasures
+			lex.pushToken(token);
+		}
 	}
-    }
-#ifdef WITH_WARNINGS
-#warning Remove me before final 1.2.0 (Jug)
-#endif
-    // this is only for compatibility to the intermediate format and should
-    // vanish till the final 1.2.0!
-    if (lex.IsOK()) {
-	if (token.empty()) {
-	    lex.next();
-	    token = lex.GetString();
+	if (lex.isOK()) {
+		lex.next();
+		string const token = lex.getString();
+		if (token == "height") {
+			lex.next();
+			height_ = LyXLength(lex.getString());
+		} else {
+			lyxerr << "InsetMinipage::Read: Missing 'height'-tag!"
+				   << endl;
+			// take countermeasures
+			lex.pushToken(token);
+		}
 	}
-	if (token == "widthp") {
-	    lex.next();
-	    // only do this if the width_-string was not already set!
-	    if (width_.empty())
-		width_ = lex.GetString() + "%";
-	    token = string();
-	} else {
-		lyxerr << "InsetMinipage::Read: Missing 'widthp_'-tag!"
-		       << endl;
+	if (lex.isOK()) {
+		lex.next();
+		string const token = lex.getString();
+		if (token == "width") {
+			lex.next();
+			width_ = LyXLength(lex.getString());
+		} else {
+			lyxerr << "InsetMinipage::Read: Missing 'width'-tag!"
+				   << endl;
+			// take countermeasures
+			lex.pushToken(token);
+		}
 	}
-    }
-    if (!token.empty())
-	lex.pushToken(token);
-    InsetCollapsable::Read(buf, lex);
-}
-
-
-Inset * InsetMinipage::Clone(Buffer const &) const
-{
-	InsetMinipage * result = new InsetMinipage;
-	result->inset.init(&inset);
-	
-	result->collapsed = collapsed;
-	result->pos_ = pos_;
-	result->inner_pos_ = inner_pos_;
-	result->height_ = height_;
-	result->width_ = width_;
-	return result;
+	InsetCollapsable::read(buf, lex);
 }
 
 
 int InsetMinipage::ascent(BufferView * bv, LyXFont const & font) const
 {
-	if (collapsed)
-		return ascent_collapsed(bv->painter(), font);
+	if (collapsed_)
+		return ascent_collapsed();
 	else {
 		// Take placement into account.
 		int i = 0;
@@ -216,8 +196,8 @@ int InsetMinipage::ascent(BufferView * bv, LyXFont const & font) const
 
 int InsetMinipage::descent(BufferView * bv, LyXFont const & font) const
 {
-	if (collapsed)
-		return descent_collapsed(bv->painter(), font);
+	if (collapsed_)
+		return descent_collapsed();
 	else {
 		// Take placement into account.
 		int i = 0;
@@ -238,13 +218,13 @@ int InsetMinipage::descent(BufferView * bv, LyXFont const & font) const
 }
 
 
-string const InsetMinipage::EditMessage() const
+string const InsetMinipage::editMessage() const
 {
 	return _("Opened Minipage Inset");
 }
 
 
-int InsetMinipage::Latex(Buffer const * buf,
+int InsetMinipage::latex(Buffer const * buf,
 			 ostream & os, bool fragile, bool fp) const
 {
 	string s_pos;
@@ -260,22 +240,21 @@ int InsetMinipage::Latex(Buffer const * buf,
 		break;
 	}
 	os << "\\begin{minipage}[" << s_pos << "]{"
-	   << LyXLength(width_).asLatexString() << "}%\n";
+	   << width_.asLatexString() << "}%\n";
 	
-	int i = inset.Latex(buf, os, fragile, fp);
+	int i = inset.latex(buf, os, fragile, fp);
 
 	os << "\\end{minipage}%\n";
 	return i + 2;
 }
 
 
-bool InsetMinipage::InsertInsetAllowed(Inset * in) const
+bool InsetMinipage::insetAllowed(Inset::Code code) const
 {
-	if ((in->LyxCode() == Inset::FLOAT_CODE) ||
-	    (in->LyxCode() == Inset::MARGIN_CODE)) {
+	if ((code == Inset::FLOAT_CODE) || (code == Inset::MARGIN_CODE))
 		return false;
-	}
-	return true;
+
+	return InsetCollapsable::insetAllowed(code);
 }
 
 
@@ -287,7 +266,10 @@ InsetMinipage::Position InsetMinipage::pos() const
 
 void InsetMinipage::pos(InsetMinipage::Position p)
 {
-	pos_ = p;
+	if (pos_ != p) {
+		pos_ = p;
+		need_update = FULL;
+	}
 }
 
 
@@ -303,54 +285,66 @@ void InsetMinipage::innerPos(InsetMinipage::InnerPosition ip)
 }
 
 
-string const & InsetMinipage::height() const
+LyXLength const & InsetMinipage::pageHeight() const
 {
 	return height_;
 }
 
 
-void InsetMinipage::height(string const & ll)
+void InsetMinipage::pageHeight(LyXLength const & ll)
 {
-	height_ = ll;
+	if (height_ != ll) {
+		height_ = ll;
+		need_update = FULL;
+	}
 }
 
 
-string const & InsetMinipage::width() const
+LyXLength const & InsetMinipage::pageWidth() const
 {
 	return width_;
 }
 
 
-void InsetMinipage::width(string const & ll)
+void InsetMinipage::pageWidth(LyXLength const & ll)
 {
-	width_ = ll;
+	if (ll != width_) {
+		width_ = ll;
+		need_update = FULL;
+	}
 }
 
 
-bool InsetMinipage::ShowInsetDialog(BufferView * bv) const
+bool InsetMinipage::showInsetDialog(BufferView * bv) const
 {
-    if (!inset.ShowInsetDialog(bv))
-	bv->owner()->getDialogs()->showMinipage(const_cast<InsetMinipage *>(this));
-    return true;
+	if (!inset.showInsetDialog(bv))
+		bv->owner()->getDialogs()->showMinipage(const_cast<InsetMinipage *>(this));
+	return true;
 }
 
 
-void InsetMinipage::InsetButtonRelease(BufferView * bv, int x, int y,
-				       int button)
+int InsetMinipage::getMaxWidth(BufferView * bv, UpdatableInset const * inset)
+	const
 {
-    if (button == 3) {
-	ShowInsetDialog(bv);
-	return;
-    }
-    InsetCollapsable::InsetButtonRelease(bv, x, y, button);
+	if (owner() &&
+	    static_cast<UpdatableInset*>(owner())->getMaxWidth(bv, inset) < 0) {
+		return -1;
+	}
+	if (!width_.zero()) {
+		int ww1 = latexTextWidth(bv);
+		int ww2 = InsetCollapsable::getMaxWidth(bv, inset);
+		if (ww2 > 0 && ww2 < ww1) {
+			return ww2;
+		}
+		return ww1;
+	}
+	// this should not happen!
+	return InsetCollapsable::getMaxWidth(bv, inset);
 }
 
 
-int InsetMinipage::getMaxWidth(BufferView * bv, UpdatableInset const * inset)
-    const
+int InsetMinipage::latexTextWidth(BufferView * bv) const
 {
-    if (!width_.empty())
-	return VSpace(width_).inPixels(bv);
-    // this should not happen!
-    return InsetCollapsable::getMaxWidth(bv, inset);
+	return width_.inPixels(InsetCollapsable::latexTextWidth(bv),
+			       bv->text->defaultHeight());
 }