ws changes only

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

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 168705380450f94c2b0c2399614bbee5f90a373c..3c611f7f1842c92a76da58529768e1f230c6ae2e 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -13,11 +13,13 @@
 #include "insetert.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "language.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
 #include "paragraph.h"
@@ -28,13 +30,14 @@
 
 #include "support/tostr.h"
 
-using namespace lyx::support;
-
 using lyx::pos_type;
 
+using lyx::support::split;
+using lyx::support::strToInt;
+
 using std::endl;
 using std::min;
-
+using std::string;
 using std::auto_ptr;
 using std::ostream;
 
@@ -42,10 +45,13 @@ using std::ostream;
 void InsetERT::init()
 {
        setButtonLabel();
-       labelfont = LyXFont(LyXFont::ALL_SANE);
-       labelfont.decSize();
-       labelfont.decSize();
-       labelfont.setColor(LColor::latex);
+
+       LyXFont font(LyXFont::ALL_SANE);
+       font.decSize();
+       font.decSize();
+       font.setColor(LColor::latex);
+       setLabelFont(font);
+
        setInsetName("ERT");
 }
 
@@ -142,7 +148,7 @@ void InsetERT::read(Buffer const & buf, LyXLex & lex)
                string const token = lex.getString();
                if (token == "collapsed") {
                        lex.next();
-                       collapsed_ = lex.getBool();
+                       setCollapsed(lex.getBool());
                } else {
                        // Take countermeasures
                        lex.pushToken(token);
@@ -167,11 +173,10 @@ void InsetERT::read(Buffer const & buf, LyXLex & lex)
 #endif
 
        if (!token_found) {
-               if (collapsed_) {
-                       status(0, Collapsed);
-               } else {
+               if (isOpen())
                        status(0, Open);
-               }
+               else
+                       status(0, Collapsed);
        }
        setButtonLabel();
 }
@@ -197,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) {
@@ -256,11 +261,10 @@ void InsetERT::setFont(BufferView *, LyXFont const &, bool, bool selectall)
 void InsetERT::updateStatus(BufferView * bv, bool swap) const
 {
        if (status_ != Inlined) {
-               if (collapsed_) {
-                       status(bv, swap ? Open : Collapsed);
-               } else {
+               if (isOpen())
                        status(bv, swap ? Collapsed : Open);
-               }
+               else
+                       status(bv, swap ? Open : Collapsed);
        }
 }
 
@@ -299,10 +303,9 @@ bool InsetERT::lfunMouseRelease(FuncRequest const & cmd)
                cmd1.y = ascent() + cmd.y - inset.ascent();
 
                // inlined is special - the text appears above
-               // button_dim.y2
                if (status_ == Inlined)
                        inset.localDispatch(cmd1);
-               else if (!collapsed_ && (cmd.y > button_dim.y2)) {
+               else if (isOpen() && (cmd.y > buttonDim().y2)) {
                        cmd1.y -= height_collapsed();
                        inset.localDispatch(cmd1);
                }
@@ -412,9 +415,9 @@ int InsetERT::docbook(Buffer const &, ostream & os, bool) const
 }
 
 
-InsetOld::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
+dispatch_result InsetERT::localDispatch(FuncRequest const & cmd)
 {
-       InsetOld::RESULT result = UNDISPATCHED;
+       dispatch_result result = UNDISPATCHED;
        BufferView * bv = cmd.view();
 
        if (inset.paragraphs.begin()->empty()) {
@@ -587,11 +590,11 @@ void InsetERT::status(BufferView * bv, ERTStatus const st) const
                case Inlined:
                        break;
                case Open:
-                       collapsed_ = false;
+                       setCollapsed(false);
                        setButtonLabel();
                        break;
                case Collapsed:
-                       collapsed_ = true;
+                       setCollapsed(true);
                        setButtonLabel();
                        if (bv)
                                bv->unlockInset(const_cast<InsetERT *>(this));
@@ -614,7 +617,7 @@ bool InsetERT::showInsetDialog(BufferView * bv) const
 
 void InsetERT::open(BufferView * bv)
 {
-       if (!collapsed_)
+       if (isOpen())
                return;
        status(bv, Open);
 }