From e61bae3dbbc191260e587a59b901959b07d7d594 Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Wed, 7 Nov 2007 16:41:48 +0000
Subject: [PATCH] revert rev 21490.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21491 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Length.cpp       | 28 ------------------------
 src/Makefile.am      |  1 +
 src/lengthcommon.cpp | 51 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 28 deletions(-)
 create mode 100644 src/lengthcommon.cpp

diff --git a/src/Length.cpp b/src/Length.cpp
index 4f00562d86..cc45736570 100644
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -16,8 +16,6 @@
 #include <config.h>
 
 #include "Length.h"
-
-#include "gettext.h"
 #include "LyXRC.h"
 
 #include "support/docstream.h"
@@ -31,32 +29,6 @@ namespace lyx {
 using std::ostringstream;
 using std::string;
 
-// FIXME: I am not sure if "mu" should be possible to select (Lgb)
-char const * const unit_name[] = {
-	"sp", "pt", "bp", "dd", "mm", "pc",
-	"cc", "cm", "in", "ex", "em", "mu",
-	"text%",  "col%", "page%", "line%",
-	"theight%", "pheight%", "" };
-
-
-int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
-
-
-char const * const unit_name_gui[] = {
-	N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"),
-	N_("cc[[unit of measure]]"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
-	N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
-	N_("Text Height %"), N_("Page Height %"), "" };
-
-
-Length::UNIT unitFromString(string const & data)
-{
-	int i = 0;
-	while (i < num_units && data != unit_name[i])
-		++i;
-	return static_cast<Length::UNIT>(i);
-}
-
 
 /////////////////////////////////////////////////////////////////////
 //
diff --git a/src/Makefile.am b/src/Makefile.am
index 61a3e468ed..a5ecd478a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -182,6 +182,7 @@ liblyxcore_la_SOURCES = \
 	LayoutEnums.h \
 	Length.cpp \
 	Length.h \
+	lengthcommon.cpp \
 	Lexer.cpp \
 	Lexer.h \
 	lfuns.h \
diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp
new file mode 100644
index 0000000000..e783555733
--- /dev/null
+++ b/src/lengthcommon.cpp
@@ -0,0 +1,51 @@
+/**
+ * \file lengthcommon.cpp
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
+
+#include "gettext.h"
+#include "Length.h"
+
+#include <string>
+
+namespace lyx {
+
+using std::string;
+
+// I am not sure if "mu" should be possible to select (Lgb)
+
+// the latex units
+char const * const unit_name[] = {
+	"sp", "pt", "bp", "dd", "mm", "pc",
+	"cc", "cm", "in", "ex", "em", "mu",
+	"text%",  "col%", "page%", "line%",
+	"theight%", "pheight%", "" };
+
+int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
+
+// the LyX gui units
+char const * const unit_name_gui[] = {
+	N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"),
+	N_("cc[[unit of measure]]"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
+	N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
+	N_("Text Height %"), N_("Page Height %"), "" };
+
+Length::UNIT unitFromString(string const & data)
+{
+	int i = 0;
+	while (i < num_units && data != unit_name[i])
+		++i;
+	return static_cast<Length::UNIT>(i);
+}
+
+
+} // namespace lyx
-- 
2.39.5