Length.h, lengthcommon.cpp: sort the units, the current sorting had no rule and there...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30595 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Length.h b/src/Length.h
index c6e32c3431e94b570681bf4bd38ba711213881a4..3a7e87a91cde8e3e5a2e660242e28cdb07b2fc33 100644 (file)
--- a/src/Length.h
+++ b/src/Length.h
@@ -38,24 +38,24 @@ class Length {
 public:
        /// length units
        enum UNIT {
-               SP, ///< Scaled point (65536sp = 1pt) TeX's smallest unit.
-               PT, ///< Point = 1/72.27in = 0.351mm
                BP, ///< Big point (72bp = 1in), also PostScript point
-               DD, ///< Didot point = 1/72 of a French inch, = 0.376mm
-               MM, ///< Millimeter = 2.845pt
-               PC, ///< Pica = 12pt = 4.218mm
                CC, ///< Cicero = 12dd = 4.531mm
                CM, ///< Centimeter = 10mm = 2.371pc
-               IN, ///< Inch = 25.4mm = 72.27pt = 6.022pc
-               EX, ///< Height of a small "x" for the current font.
+               DD, ///< Didot point = 1/72 of a French inch, = 0.376mm
                EM, ///< Width of capital "M" in current font.
+               EX, ///< Height of a small "x" for the current font.
+               IN, ///< Inch = 25.4mm = 72.27pt = 6.022pc
+               MM, ///< Millimeter = 2.845pt
                MU, ///< Math unit (18mu = 1em) for positioning in math mode
-               PTW, //< Percent of TextWidth
+               PC, ///< Pica = 12pt = 4.218mm
+               PT, ///< Point = 1/72.27in = 0.351mm
+               SP, ///< Scaled point (65536sp = 1pt) TeX's smallest unit.
                PCW, //< Percent of ColumnWidth
-               PPW, //< Percent of PageWidth
                PLW, //< Percent of LineWidth
-               PTH, //< Percent of TextHeight          // Herbert 2002-05-16
                PPH, //< Percent of PaperHeight         // Herbert 2002-05-16
+               PPW, //< Percent of PageWidth
+               PTH, //< Percent of TextHeight          // Herbert 2002-05-16
+               PTW, //< Percent of TextWidth
                UNIT_NONE ///< no unit
        };
 

diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp
index 8fa5c07fd01e48df444e4ba84f9819718e2d6db1..c1360915f51578fa6dfa83c4e45db341fc31f887 100644 (file)
--- a/src/lengthcommon.cpp
+++ b/src/lengthcommon.cpp
@@ -25,8 +25,8 @@ namespace lyx {
 
 // 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%", "" };
 
@@ -34,9 +34,9 @@ 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[[unit of measure]]"), N_("Text 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 %"), "" };