* Only enter inset which return true on isActive(). This is the behavior in the curso...

[lyx.git] / src / ParagraphParameters.cpp

diff --git a/src/ParagraphParameters.cpp b/src/ParagraphParameters.cpp
index ed3bf281d3a9322119c383537e81ec97c4db25e4..eb0dd65a15a4e475ad27bcad7a820d3060547451 100644 (file)
--- a/src/ParagraphParameters.cpp
+++ b/src/ParagraphParameters.cpp
@@ -18,19 +18,16 @@
 
 #include "Buffer.h"
 #include "gettext.h"
-#include "LyXLayout.h"
+#include "Layout.h"
 #include "Lexer.h"
-#include "LyXText.h"
+#include "Text.h"
 #include "Paragraph.h"
-#include "tex-strings.h"
 
 #include "support/lstrings.h"
 
 #include <sstream>
 
-namespace lyx {
-
-using support::rtrim;
+using lyx::support::rtrim;
 
 using std::istringstream;
 using std::ostream;
@@ -38,6 +35,13 @@ using std::ostringstream;
 using std::string;
 
 
+namespace lyx {
+
+static char const * const string_align[] = {
+       "block", "left", "right", "center", ""
+};
+
+
 static int findToken(char const * const str[], string const & search_token)
 {
        return search_token == "default" ?
@@ -164,13 +168,13 @@ void ParagraphParameters::labelWidthString(docstring const & lws)
 }
 
 
-LyXLength const & ParagraphParameters::leftIndent() const
+Length const & ParagraphParameters::leftIndent() const
 {
        return leftindent_;
 }
 
 
-void ParagraphParameters::leftIndent(LyXLength const & li)
+void ParagraphParameters::leftIndent(Length const & li)
 {
        leftindent_ = li;
 }
@@ -194,7 +198,7 @@ void ParagraphParameters::read(Lexer & lex)
                        noindent(true);
                } else if (token == "\\leftindent") {
                        lex.next();
-                       LyXLength value(lex.getString());
+                       Length value(lex.getString());
                        leftIndent(value);
                } else if (token == "\\start_of_appendix") {
                        startOfAppendix(true);
@@ -276,7 +280,7 @@ void params2string(Paragraph const & par, string & data)
        params.labelWidthString(par.getLabelWidthString());
 
        // Alignment
-       LyXLayout_ptr const & layout = par.layout();
+       Layout_ptr const & layout = par.layout();
        if (params.align() == LYX_ALIGN_LAYOUT)
                params.align(layout->align);