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

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 4e7ba7c409..41da3b33a9 100644
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -23,12 +23,12 @@
 #include "FloatList.h"
 #include "funcrequest.h"
 #include "gettext.h"
-#include "iterators.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
 #include "lyxlex.h"
 #include "outputparams.h"
 #include "paragraph.h"
+#include "pariterator.h"
 
 #include "support/lstrings.h"
 #include "support/tostr.h"
@@ -133,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();
@@ -145,7 +143,7 @@ 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]);
 }
 
 
@@ -155,8 +153,7 @@ InsetFloat::~InsetFloat()
 }
 
 
-DispatchResult
-InsetFloat::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
 	switch (cmd.action) {
 
@@ -165,26 +162,37 @@ InsetFloat::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
 		InsetFloatMailer::string2params(cmd.argument, params);
 		params_.placement = params.placement;
 		params_.wide      = params.wide;
-		wide(params_.wide, cur.bv().buffer()->params());
+		params_.sideways  = params.sideways;
+		wide(params_.wide, cur.buffer().params());
+		sideways(params_.sideways, cur.buffer().params());
 		cur.bv().update();
-		return DispatchResult(true, true);
+		break;
 	}
 
 	case LFUN_INSET_DIALOG_UPDATE: {
 		InsetFloatMailer(*this).updateDialog(&cur.bv());
-		return DispatchResult(true, true);
+		break;
+	}
+
+	case LFUN_MOUSE_RELEASE: {
+		if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
+			InsetFloatMailer(*this).showDialog(&cur.bv());
+			break;
+		}
+		InsetCollapsable::priv_dispatch(cur, cmd);
+		break;
 	}
 
 	default:
-		return InsetCollapsable::priv_dispatch(cur, cmd);
+		InsetCollapsable::priv_dispatch(cur, cmd);
+		break;
 	}
 }
 
 
 void InsetFloatParams::write(ostream & os) const
 {
-	os << "Float " // getInsetName()
-	   << type << '\n';
+	os << "Float " << type << '\n';
 
 	if (!placement.empty())
 		os << "placement " << placement << "\n";
@@ -193,33 +201,41 @@ void InsetFloatParams::write(ostream & os) const
 		os << "wide true\n";
 	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);
 	}
 }
 
@@ -235,16 +251,20 @@ void InsetFloat::read(Buffer const & buf, LyXLex & lex)
 {
 	params_.read(lex);
 	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);
 }
@@ -266,7 +286,13 @@ 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);
+	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
@@ -289,12 +315,13 @@ int InsetFloat::latex(Buffer const & buf, ostream & os,
 	// 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, runparams);
+	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.
@@ -335,7 +362,7 @@ int InsetFloat::linuxdoc(Buffer const & buf, ostream & os,
 	}
 	os << ">";
 
-	int const i = inset.linuxdoc(buf, os, runparams);
+	int const i = InsetText::linuxdoc(buf, os, runparams);
 	os << "</" << tmptype << ">\n";
 
 	return i;
@@ -346,7 +373,7 @@ int InsetFloat::docbook(Buffer const & buf, ostream & os,
 			OutputParams const & runparams) const
 {
 	os << '<' << params_.type << '>';
-	int const i = inset.docbook(buf, os, runparams);
+	int const i = InsetText::docbook(buf, os, runparams);
 	os << "</" << params_.type << '>';
 
 	return i;
@@ -356,14 +383,14 @@ int InsetFloat::docbook(Buffer const & buf, ostream & os,
 bool InsetFloat::insetAllowed(InsetOld::Code code) const
 {
 	return code != InsetOld::FLOAT_CODE
- 	    && code != InsetOld::FOOT_CODE 
+	    && code != InsetOld::FOOT_CODE
 	    && code != InsetOld::MARGIN_CODE;
 }
 
 
 bool InsetFloat::showInsetDialog(BufferView * bv) const
 {
-	if (!inset.showInsetDialog(bv))
+	if (!InsetText::showInsetDialog(bv))
 		InsetFloatMailer(const_cast<InsetFloat &>(*this)).showDialog(bv);
 	return true;
 }
@@ -379,10 +406,20 @@ void InsetFloat::wide(bool w, BufferParams const & bp)
 }
 
 
+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(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) {
@@ -434,6 +471,8 @@ void InsetFloatMailer::string2params(string const & in,
 	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);
 }