* add PreBabelPreamble to Language definition (fixes #4786).

[lyx.git] / src / lengthcommon.cpp

diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp
index f76093800e4b2f717907d7d0e1ea210a74b18fca..c1360915f51578fa6dfa83c4e45db341fc31f887 100644 (file)
--- a/src/lengthcommon.cpp
+++ b/src/lengthcommon.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Matthias Ettrich
  * \author John Levon
  *
@@ -12,22 +12,21 @@
 
 #include <config.h>
 
+#include "support/gettext.h"
 #include "Length.h"
-#include "gettext.h"
 
 #include <string>
 
+using namespace std;
 
 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",
+       "bp", "cc", "cm", "dd", "em", "ex", "in", "mm", "mu",
+       "pc", "pt", "sp",
        "text%",  "col%", "page%", "line%",
        "theight%", "pheight%", "" };
 
@@ -35,9 +34,10 @@ 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_("bp"), N_("cc[[unit of measure]]"), N_("cm"), N_("dd"), N_("em"),
+       N_("ex"), N_("in"), N_("mm"), N_("mu[[unit of measure]]"), N_("pc"),
+       N_("pt"), N_("sp"), N_("Text Width %"),
+       N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
        N_("Text Height %"), N_("Page Height %"), "" };
 
 Length::UNIT unitFromString(string const & data)