Enable convertDefault.sh to run even if its executable bit is not set.

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

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 86aa7b7bef2383c6aeb059673b57f9401685e9fe..5cc6ba64c99498d76d9eda6e9c11573953c2ebf0 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -6,12 +6,13 @@
  * \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 "insetert.h"
 #include "insettext.h"
+#include "metricsinfo.h"
 
 #include "buffer.h"
 #include "BufferView.h"
@@ -111,7 +112,7 @@ InsetERT::~InsetERT()
 }
 
 
-void InsetERT::read(Buffer const * buf, LyXLex & lex)
+void InsetERT::read(Buffer const & buf, LyXLex & lex)
 {
        bool token_found = false;
        if (lex.isOK()) {
@@ -181,7 +182,7 @@ void InsetERT::read(Buffer const * buf, LyXLex & lex)
 }
 
 
-void InsetERT::write(Buffer const * buf, ostream & os) const
+void InsetERT::write(Buffer const & buf, ostream & os) const
 {
        string st;
 
@@ -201,7 +202,7 @@ void InsetERT::write(Buffer const * buf, ostream & os) const
           << "status "<< st << "\n";
 
        //inset.writeParagraphData(buf, os);
-       string const layout(buf->params.getLyXTextClass().defaultLayoutName());
+       string const layout(buf.params.getLyXTextClass().defaultLayoutName());
        ParagraphList::iterator par = inset.paragraphs.begin();
        ParagraphList::iterator end = inset.paragraphs.end();
        for (; par != end; ++par) {
@@ -295,8 +296,7 @@ bool InsetERT::lfunMouseRelease(FuncRequest const & cmd)
                return true;
        }
 
-       if (status_ != Inlined && (cmd.x >= 0) && (cmd.x < button_length) &&
-           (cmd.y >= button_top_y) && (cmd.y <= button_bottom_y)) {
+       if (status_ != Inlined && hitButton(cmd)) {
                updateStatus(bv, true);
        } else {
                FuncRequest cmd1 = cmd;
@@ -304,10 +304,10 @@ bool InsetERT::lfunMouseRelease(FuncRequest const & cmd)
                cmd1.y = ascent() + cmd.y - inset.ascent();
 
                // inlined is special - the text appears above
-               // button_bottom_y
+               // button_dim.y2
                if (status_ == Inlined)
                        inset.localDispatch(cmd1);
-               else if (!collapsed_ && (cmd.y > button_bottom_y)) {
+               else if (!collapsed_ && (cmd.y > button_dim.y2)) {
                        cmd1.y -= height_collapsed();
                        inset.localDispatch(cmd1);
                }
@@ -325,7 +325,7 @@ void InsetERT::lfunMouseMotion(FuncRequest const & cmd)
 }
 
 
-int InsetERT::latex(Buffer const *, ostream & os,
+int InsetERT::latex(Buffer const &, ostream & os,
                    LatexRunParams const &) const
 {
        ParagraphList::iterator par = inset.paragraphs.begin();
@@ -357,13 +357,13 @@ int InsetERT::latex(Buffer const *, ostream & os,
 }
 
 
-int InsetERT::ascii(Buffer const *, ostream &, int /*linelen*/) const
+int InsetERT::ascii(Buffer const &, ostream &, int /*linelen*/) const
 {
        return 0;
 }
 
 
-int InsetERT::linuxdoc(Buffer const *, ostream & os) const
+int InsetERT::linuxdoc(Buffer const &, ostream & os) const
 {
        ParagraphList::iterator par = inset.paragraphs.begin();
        ParagraphList::iterator end = inset.paragraphs.end();
@@ -390,7 +390,7 @@ int InsetERT::linuxdoc(Buffer const *, ostream & os) const
 }
 
 
-int InsetERT::docbook(Buffer const *, ostream & os, bool) const
+int InsetERT::docbook(Buffer const &, ostream & os, bool) const
 {
        ParagraphList::iterator par = inset.paragraphs.begin();
        ParagraphList::iterator end = inset.paragraphs.end();
@@ -517,7 +517,7 @@ string const InsetERT::get_new_label() const
                la += inset.paragraphs.begin()->getChar(j);
                ++i;
        }
-       if (p_siz > 1 || (i > 0 && j < p_siz)) {
+       if (inset.paragraphs.size() > 1 || (i > 0 && j < p_siz)) {
                la += "...";
        }
        if (la.empty()) {
@@ -556,6 +556,10 @@ void InsetERT::metrics(MetricsInfo & mi, Dimension & dim) const
                inset.metrics(mi, dim);
        else
                InsetCollapsable::metrics(mi, dim);
+       // Make it stand out on its own as it is code, not part of running
+       // text:
+       if (isOpen() && !inlined())
+               dim.wid = mi.base.textwidth;
        dim_ = dim;
 }
 
@@ -586,8 +590,6 @@ void InsetERT::status(BufferView * bv, ERTStatus const st) const
                status_ = st;
                switch (st) {
                case Inlined:
-                       if (bv)
-                               inset.setUpdateStatus(InsetText::INIT);
                        break;
                case Open:
                        collapsed_ = false;
@@ -601,7 +603,7 @@ void InsetERT::status(BufferView * bv, ERTStatus const st) const
                        break;
                }
                if (bv) {
-                       bv->updateInset(const_cast<InsetERT *>(this));
+                       bv->updateInset(this);
                        bv->buffer()->markDirty();
                }
        }