convert graphics for .tex export, fixes bug 1231

[lyx.git] / src / insets / insetfloat.C

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index ed173ac63bf2b7e4f44d4698fbe7a33cac6b306e..41da3b33a9aaf25a36e5c03b10cb248381ac3239 100644 (file)
--- 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"
@@ -162,7 +162,9 @@ void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & 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();
                break;
        }
@@ -172,6 +174,15 @@ void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                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:
                InsetCollapsable::priv_dispatch(cur, cmd);
                break;
@@ -181,8 +192,7 @@ void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 
 void InsetFloatParams::write(ostream & os) const
 {
-       os << "Float " // getInsetName()
-          << type << '\n';
+       os << "Float " << type << '\n';
 
        if (!placement.empty())
                os << "placement " << placement << "\n";
@@ -191,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);
        }
 }
 
@@ -233,6 +251,7 @@ 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);
 }
 
@@ -243,6 +262,9 @@ void InsetFloat::validate(LaTeXFeatures & features) const
                features.require("float");
        }
 
+       if (params_.sideways)
+               features.require("rotating");
+
        features.useFloat(params_.type);
        InsetCollapsable::validate(features);
 }
@@ -264,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
@@ -287,7 +315,8 @@ 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';
@@ -377,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(0, paragraphs());
-       ParIterator end(paragraphs().size(), 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) {
@@ -432,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);
 }