X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.cpp;h=afe57d6bd53d7f09bf292e1e3f32031724470262;hb=ae9dad17702242b63ca6043002a6e500734e9296;hp=2121f16ab2b81666b8c21b94e3b0c300a8885702;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git

diff --git a/src/ParagraphParameters.cpp b/src/ParagraphParameters.cpp
index 2121f16ab2..afe57d6bd5 100644
--- a/src/ParagraphParameters.cpp
+++ b/src/ParagraphParameters.cpp
@@ -18,19 +18,16 @@
 
 #include "Buffer.h"
 #include "gettext.h"
-#include "LyXLayout.h"
-#include "LyXLex.h"
-#include "LyXText.h"
+#include "Layout.h"
+#include "Lexer.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,19 +168,19 @@ 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;
 }
 
 
-void ParagraphParameters::read(LyXLex & lex)
+void ParagraphParameters::read(Lexer & lex)
 {
 	while (lex.isOK()) {
 		lex.nextToken();
@@ -194,7 +198,7 @@ void ParagraphParameters::read(LyXLex & 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);
@@ -275,14 +279,11 @@ void params2string(Paragraph const & par, string & data)
 	// This needs to be done separately
 	params.labelWidthString(par.getLabelWidthString());
 
-	// Alignment
-	LyXLayout_ptr const & layout = par.layout();
-	if (params.align() == LYX_ALIGN_LAYOUT)
-		params.align(layout->align);
-
 	ostringstream os;
 	params.write(os);
 
+	Layout_ptr const & layout = par.layout();
+
 	// Is alignment possible
 	os << "\\alignpossible " << layout->alignpossible << '\n';