X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfloat.C;h=41da3b33a9aaf25a36e5c03b10cb248381ac3239;hb=5603df4a5b7e511b31026c9a4f8f55b2b10fde57;hp=a039efc2669294383b158e85a1ec5a12546276cc;hpb=0db4507ee2d8cf33d6a423f1d9d1c4feb392768f;p=lyx.git

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index a039efc266..41da3b33a9 100644
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -6,38 +6,42 @@
  * \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 "insetfloat.h"
-#include "insettext.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
+#include "cursor.h"
 #include "debug.h"
+#include "dispatchresult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "funcrequest.h"
 #include "gettext.h"
-#include "iterators.h"
 #include "LaTeXFeatures.h"
-#include "Lsstream.h"
-#include "lyxfont.h"
+#include "LColor.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
-#include "Lsstream.h"
+#include "outputparams.h"
+#include "paragraph.h"
+#include "pariterator.h"
 
-#include "support/LOstream.h"
 #include "support/lstrings.h"
 #include "support/tostr.h"
+#include "support/std_sstream.h"
 
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
+using lyx::support::contains;
 
-using std::ostream;
 using std::endl;
+using std::string;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
 
 
 // With this inset it will be possible to support the latex package
@@ -129,9 +133,7 @@ string floatname(string const & type, BufferParams const & bp)
 InsetFloat::InsetFloat(BufferParams const & bp, string const & type)
 	: InsetCollapsable(bp)
 {
-	string lab(_("float: "));
-	lab += floatname(type, bp);
-	setLabel(lab);
+	setLabel(_("float: ") + floatname(type, bp));
 	LyXFont font(LyXFont::ALL_SANE);
 	font.decSize();
 	font.decSize();
@@ -141,127 +143,136 @@ InsetFloat::InsetFloat(BufferParams const & bp, string const & type)
 	setInsetName(type);
 	LyXTextClass const & tclass = bp.getLyXTextClass();
 	if (tclass.hasLayout(caplayout))
-		inset.paragraphs.begin()->layout(tclass[caplayout]);
+		paragraphs().begin()->layout(tclass[caplayout]);
 }
 
 
-InsetFloat::InsetFloat(InsetFloat const & in, bool same_id)
-	: InsetCollapsable(in, same_id), params_(in.params_)
-{}
-
-
 InsetFloat::~InsetFloat()
 {
-	InsetFloatMailer mailer(*this);
-	mailer.hideDialog();
+	InsetFloatMailer(*this).hideDialog();
 }
 
 
-dispatch_result InsetFloat::localDispatch(FuncRequest const & cmd)
+void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
-	Inset::RESULT result = UNDISPATCHED;
-
 	switch (cmd.action) {
+
 	case LFUN_INSET_MODIFY: {
 		InsetFloatParams params;
 		InsetFloatMailer::string2params(cmd.argument, params);
-
 		params_.placement = params.placement;
 		params_.wide      = params.wide;
-
-		wide(params_.wide, cmd.view()->buffer()->params);
-		cmd.view()->updateInset(this);
-		result = DISPATCHED;
+		params_.sideways  = params.sideways;
+		wide(params_.wide, cur.buffer().params());
+		sideways(params_.sideways, cur.buffer().params());
+		cur.bv().update();
+		break;
 	}
-	break;
 
 	case LFUN_INSET_DIALOG_UPDATE: {
-		InsetFloatMailer mailer(*this);
-		mailer.updateDialog(cmd.view());
+		InsetFloatMailer(*this).updateDialog(&cur.bv());
+		break;
 	}
-	break;
 
-	default:
-		result = InsetCollapsable::localDispatch(cmd);
+	case LFUN_MOUSE_RELEASE: {
+		if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
+			InsetFloatMailer(*this).showDialog(&cur.bv());
+			break;
+		}
+		InsetCollapsable::priv_dispatch(cur, cmd);
+		break;
 	}
 
-	return result;
+	default:
+		InsetCollapsable::priv_dispatch(cur, cmd);
+		break;
+	}
 }
 
 
 void InsetFloatParams::write(ostream & os) const
 {
-	os << "Float " // getInsetName()
-	   << type << '\n';
+	os << "Float " << type << '\n';
 
-	if (!placement.empty()) {
+	if (!placement.empty())
 		os << "placement " << placement << "\n";
-	}
-	if (wide) {
+
+	if (wide)
 		os << "wide true\n";
-	} else {
+	else
 		os << "wide false\n";
-	}
+
+	if (sideways)
+		os << "sideways true\n";
+	else
+		os << "sideways false\n";
 }
 
 
 void InsetFloatParams::read(LyXLex & lex)
 {
-	if (lex.isOK()) {
-		lex.next();
-		string token = lex.getString();
-		if (token == "placement") {
-			lex.next();
-			placement = lex.getString();
-		} else {
-			// take countermeasures
-			lex.pushToken(token);
-		}
-		lex.next();
-		token = lex.getString();
-		if (token == "wide") {
-			lex.next();
-			string const tmptoken = lex.getString();
-			wide = (tmptoken == "true");
-		} else {
-			lyxerr << "InsetFloat::Read:: Missing wide!"
-			       << endl;
-			// take countermeasures
-			lex.pushToken(token);
-		}
+	string token;
+	lex >> token;
+	if (token == "placement") {
+		lex >> placement;
+	} else {
+		// take countermeasures
+		lex.pushToken(token);
+	}
+	lex >> token;
+	if (token == "wide") {
+		lex >> wide;
+	} else {
+		lyxerr << "InsetFloat::Read:: Missing wide!"
+		<< endl;
+		// take countermeasures
+		lex.pushToken(token);
+	}
+	lex >> token;
+	if (token == "sideways") {
+		lex >> sideways;
+	} else {
+		lyxerr << "InsetFloat::Read:: Missing sideways!"
+		<< endl;
+		// take countermeasures
+		lex.pushToken(token);
 	}
 }
 
 
-void InsetFloat::write(Buffer const * buf, ostream & os) const
+void InsetFloat::write(Buffer const & buf, ostream & os) const
 {
 	params_.write(os);
 	InsetCollapsable::write(buf, os);
 }
 
 
-void InsetFloat::read(Buffer const * buf, LyXLex & lex)
+void InsetFloat::read(Buffer const & buf, LyXLex & lex)
 {
 	params_.read(lex);
-	wide(params_.wide, buf->params);
+	wide(params_.wide, buf.params());
+	sideways(params_.sideways, buf.params());
 	InsetCollapsable::read(buf, lex);
 }
 
 
 void InsetFloat::validate(LaTeXFeatures & features) const
 {
-	if (contains(params_.placement, "H")) {
+	if (contains(params_.placement, 'H')) {
 		features.require("float");
 	}
 
+	if (params_.sideways)
+		features.require("rotating");
+
 	features.useFloat(params_.type);
 	InsetCollapsable::validate(features);
 }
 
 
-Inset * InsetFloat::clone(Buffer const &, bool same_id) const
+auto_ptr<InsetBase> InsetFloat::clone() const
 {
-	return new InsetFloat(*const_cast<InsetFloat *>(this), same_id);
+	return auto_ptr<InsetBase>(new InsetFloat(*this));
 }
 
 
@@ -271,18 +282,24 @@ string const InsetFloat::editMessage() const
 }
 
 
-int InsetFloat::latex(Buffer const * buf,
-		      ostream & os, bool fragile, bool fp) const
+int InsetFloat::latex(Buffer const & buf, ostream & os,
+		      OutputParams const & runparams) const
 {
-	FloatList const & floats = buf->params.getLyXTextClass().floats();
-	string const tmptype = (params_.wide ? params_.type + "*" : params_.type);
+	FloatList const & floats = buf.params().getLyXTextClass().floats();
+	string tmptype = (params_.wide ? params_.type + "*" : params_.type);
+	if (params_.sideways) {
+		if (params_.type == "table")
+			tmptype = "sidewaystable";
+		else if (params_.type == "figure")
+			tmptype = "sidewaysfigure";
+	}
 	// Figure out the float placement to use.
 	// From lowest to highest:
 	// - float default placement
 	// - document wide default placement
 	// - specific float placement
 	string placement;
-	string const buf_placement = buf->params.float_placement;
+	string const buf_placement = buf.params().float_placement;
 	string const def_placement = floats.defaultPlacement(params_.type);
 	if (!params_.placement.empty()
 	    && params_.placement != def_placement) {
@@ -298,12 +315,13 @@ int InsetFloat::latex(Buffer const * buf,
 	// when the current output line is empty.
 	os << "%\n\\begin{" << tmptype << '}';
 	// We only output placement if different from the def_placement.
-	if (!placement.empty()) {
+	// sidewaysfloats always use their own page
+	if (!placement.empty() && !params_.sideways) {
 		os << '[' << placement << ']';
 	}
 	os << '\n';
 
-	int const i = inset.latex(buf, os, fragile, fp);
+	int const i = InsetText::latex(buf, os, runparams);
 
 	// The \n is used to force \end{<floatname>} to appear in a new line.
 	// In this case, we do not case if the current output line is empty.
@@ -313,35 +331,67 @@ int InsetFloat::latex(Buffer const * buf,
 }
 
 
-int InsetFloat::docbook(Buffer const * buf, ostream & os, bool mixcont) const
+int InsetFloat::linuxdoc(Buffer const & buf, ostream & os,
+			 OutputParams const & runparams) const
+{
+	FloatList const & floats = buf.params().getLyXTextClass().floats();
+	string const tmptype =  params_.type;
+	// Figure out the float placement to use.
+	// From lowest to highest:
+	// - float default placement
+	// - document wide default placement
+	// - specific float placement
+	// This is the same as latex, as linuxdoc is modeled after latex.
+
+	string placement;
+	string const buf_placement = buf.params().float_placement;
+	string const def_placement = floats.defaultPlacement(params_.type);
+	if (!params_.placement.empty()
+	    && params_.placement != def_placement) {
+		placement = params_.placement;
+	} else if (params_.placement.empty()
+		   && !buf_placement.empty()
+		   && buf_placement != def_placement) {
+		placement = buf_placement;
+	}
+
+	os << "\n<" << tmptype ;
+	// We only output placement if different from the def_placement.
+	if (!placement.empty()) {
+		os << " loc=\"" << placement << '"';
+	}
+	os << ">";
+
+	int const i = InsetText::linuxdoc(buf, os, runparams);
+	os << "</" << tmptype << ">\n";
+
+	return i;
+}
+
+
+int InsetFloat::docbook(Buffer const & buf, ostream & os,
+			OutputParams const & runparams) const
 {
 	os << '<' << params_.type << '>';
-	int const i = inset.docbook(buf, os, mixcont);
+	int const i = InsetText::docbook(buf, os, runparams);
 	os << "</" << params_.type << '>';
 
 	return i;
 }
 
 
-bool InsetFloat::insetAllowed(Inset::Code code) const
+bool InsetFloat::insetAllowed(InsetOld::Code code) const
 {
-	if (code == Inset::FLOAT_CODE)
-		return false;
-	if (inset.getLockingInset() != const_cast<InsetFloat *>(this))
-		return inset.insetAllowed(code);
-	if ((code == Inset::FOOT_CODE) || (code == Inset::MARGIN_CODE))
-		return false;
-	return true;
+	return code != InsetOld::FLOAT_CODE
+	    && code != InsetOld::FOOT_CODE
+	    && code != InsetOld::MARGIN_CODE;
 }
 
 
 bool InsetFloat::showInsetDialog(BufferView * bv) const
 {
-	if (!inset.showInsetDialog(bv)) {
-		InsetFloat * tmp = const_cast<InsetFloat *>(this);
-		InsetFloatMailer mailer(*tmp);
-		mailer.showDialog(bv);
-	}
+	if (!InsetText::showInsetDialog(bv))
+		InsetFloatMailer(const_cast<InsetFloat &>(*this)).showDialog(bv);
 	return true;
 }
 
@@ -349,30 +399,36 @@ bool InsetFloat::showInsetDialog(BufferView * bv) const
 void InsetFloat::wide(bool w, BufferParams const & bp)
 {
 	params_.wide = w;
-
-	string lab(_("float:"));
-	lab += floatname(params_.type, bp);
-
+	string lab = _("float: ") + floatname(params_.type, bp);
 	if (params_.wide)
 		lab += '*';
+	setLabel(lab);
+}
+
 
+void InsetFloat::sideways(bool s, BufferParams const & bp)
+{
+	params_.sideways = s;
+	string lab = _("float: ") + floatname(params_.type, bp);
+	if (params_.sideways)
+		lab += _(" (sideways)");
 	setLabel(lab);
 }
 
 
-void InsetFloat::addToToc(toc::TocList & toclist, Buffer const * buf) const
+void InsetFloat::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
 {
-	ParIterator pit(inset.paragraphs.begin(), inset.paragraphs);
-	ParIterator end(inset.paragraphs.end(), inset.paragraphs);
+	ParConstIterator pit = par_const_iterator_begin(*this);
+	ParConstIterator end = par_const_iterator_end(*this);
 
 	// Find a caption layout in one of the (child inset's) pars
 	for (; pit != end; ++pit) {
 		if (pit->layout()->name() == caplayout) {
-			string const name = floatname(params_.type, buf->params);
+			string const name = floatname(params_.type, buf.params());
 			string const str =
 				tostr(toclist[name].size() + 1)
 				+ ". " + pit->asString(buf, false);
-			toc::TocItem const item(pit->id(), 0 , str);
+			lyx::toc::TocItem const item(pit->id(), 0 , str);
 			toclist[name].push_back(item);
 		}
 	}
@@ -386,7 +442,7 @@ InsetFloatMailer::InsetFloatMailer(InsetFloat & inset)
 {}
 
 
-string const InsetFloatMailer::inset2string() const
+string const InsetFloatMailer::inset2string(Buffer const &) const
 {
 	return params2string(inset_.params());
 }
@@ -396,33 +452,28 @@ void InsetFloatMailer::string2params(string const & in,
 				     InsetFloatParams & params)
 {
 	params = InsetFloatParams();
-
 	if (in.empty())
 		return;
 
-	istringstream data(STRCONV(in));
+	istringstream data(in);
 	LyXLex lex(0,0);
 	lex.setStream(data);
 
-	if (lex.isOK()) {
-		lex.next();
-		string const token = lex.getString();
-		if (token != name_)
-			return;
-	}
+	string name;
+	lex >> name;
+	if (!lex || name != name_)
+		return print_mailer_error("InsetFloatMailer", in, 1, name_);
 
 	// This is part of the inset proper that is usually swallowed
-	// by Buffer::readInset
-	if (lex.isOK()) {
-		lex.next();
-		string const token = lex.getString();
-		if (token != "Float" || !lex.eatLine())
-			return;
-	}
-
-	if (lex.isOK()) {
-		params.read(lex);
-	}
+	// by LyXText::readInset
+	string id;
+	lex >> id;
+	if (!lex || id != "Float")
+		return print_mailer_error("InsetBoxMailer", in, 2, "Float");
+
+	// We have to read the type here!
+	lex >> params.type;
+	params.read(lex);
 }
 
 
@@ -431,5 +482,5 @@ string const InsetFloatMailer::params2string(InsetFloatParams const & params)
 	ostringstream data;
 	data << name_ << ' ';
 	params.write(data);
-	return STRCONV(data.str());
+	return data.str();
 }