Added inset-select-all to emacs bindings

[lyx.git] / src / insets / InsetSeparator.cpp

diff --git a/src/insets/InsetSeparator.cpp b/src/insets/InsetSeparator.cpp
index ba985520795c567622948b363baddd6dfe56f6e4..1ec73c26ebb048abaceba53bda67b4118b854057 100644 (file)
--- a/src/insets/InsetSeparator.cpp
+++ b/src/insets/InsetSeparator.cpp
@@ -30,6 +30,7 @@
 #include "support/docstring.h"
 
 using namespace std;
+using namespace lyx::frontend;
 
 namespace lyx {
 
@@ -60,7 +61,7 @@ void InsetSeparatorParams::read(Lexer & lex)
 {
        string token;
        lex.setContext("InsetSeparatorParams::read");
-       lex >> token;   
+       lex >> token;
        if (token == "plain")
                kind = InsetSeparatorParams::PLAIN;
        else if (token == "parbreak")
@@ -108,47 +109,43 @@ bool InsetSeparator::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
        switch (cmd.action()) {
        // we handle these
-       case LFUN_INSET_MODIFY:
-               if (cmd.getArg(0) == "plain") {
-                       InsetSeparatorParams params;
-                       string2params(to_utf8(cmd.argument()), params);
-                       status.setOnOff(params_.kind == params.kind);
-               }
+       case LFUN_INSET_MODIFY: {
+               if (cmd.getArg(0) != "separator")
+                       break;
+               InsetSeparatorParams params;
+               string2params(to_utf8(cmd.argument()), params);
+               status.setOnOff(params_.kind == params.kind);
                status.setEnabled(true);
                return true;
+       }
        default:
                return Inset::getStatus(cur, cmd, status);
        }
+       return false;
 }
 
 
 ColorCode InsetSeparator::ColorName() const
 {
-       switch (params_.kind) {
-               case InsetSeparatorParams::PLAIN:
-                       return Color_latex;
-                       break;
-               case InsetSeparatorParams::PARBREAK:
-                       return Color_pagebreak;
-                       break;
-       }
-       // not really useful, but to avoids gcc complaints
        return Color_latex;
 }
 
 
 void InsetSeparator::latex(otexstream & os, OutputParams const &) const
 {
-       switch (params_.kind) {
-               case InsetSeparatorParams::PLAIN:
-                       os << breakln << "%\n";
-                       break;
-               case InsetSeparatorParams::PARBREAK:
-                       os << breakln << "\n";
-                       break;
-               default:
-                       os << breakln << "%\n";
-                       break;
+       // Do nothing if a paragraph break was just output
+       if (!os.afterParbreak()) {
+               switch (params_.kind) {
+                       case InsetSeparatorParams::PLAIN:
+                               os << breakln << "%\n";
+                               break;
+                       case InsetSeparatorParams::PARBREAK:
+                               os << breakln << "\n";
+                               break;
+                       default:
+                               os << breakln << "%\n";
+                               break;
+               }
        }
 }
 
@@ -207,9 +204,9 @@ void InsetSeparator::draw(PainterInfo & pi, int x, int y) const
 
                pi.pain.lines(xp, yp, 2, ColorName());
        } else {
-               yp[0] = int(y - 0.875 * asc * 0.75);
-               yp[1] = int(y - 0.500 * asc * 0.75);
-               yp[2] = int(y - 0.125 * asc * 0.75);
+               yp[0] = int(y - 0.875 * asc * 0.5);
+               yp[1] = int(y - 0.500 * asc * 0.5);
+               yp[2] = int(y - 0.125 * asc * 0.5);
 
                if (pi.ltr_pos) {
                        xp[0] = int(x + wid * 0.375);
@@ -221,11 +218,11 @@ void InsetSeparator::draw(PainterInfo & pi, int x, int y) const
                        xp[2] = int(x + wid * 0.625);
                }
 
-               pi.pain.lines(xp, yp, 3, ColorName());
+               pi.pain.lines(xp, yp, 3, ColorName(), Painter::fill_oddeven);
 
-               yp[0] = int(y - 0.500 * asc * 0.75);
-               yp[1] = int(y - 0.500 * asc * 0.75);
-               yp[2] = int(y - asc * 0.75);
+               yp[0] = int(y - 0.500 * asc * 0.5);
+               yp[1] = int(y - 0.500 * asc * 0.5);
+               yp[2] = int(y - asc * 0.5);
 
                if (pi.ltr_pos) {
                        xp[0] = int(x);