hopefully fix tex2lyx linking.

[lyx.git] / src / lengthcommon.C

diff --git a/src/lengthcommon.C b/src/lengthcommon.C
index 071cda6e4438d97a128f790982a6d5e1986a9e82..dde8d54c169c5440bd11972b6683fa774217f08b 100644 (file)
--- a/src/lengthcommon.C
+++ b/src/lengthcommon.C
@@ -1,3 +1,15 @@
+/**
+ * \file lengthcommon.C
+ * 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 "lengthcommon.h"
@@ -5,45 +17,27 @@
 #include "gettext.h"
 
 
-int const num_units = LyXLength::UNIT_NONE;
+namespace lyx {
 
-// I am not sure if "mu" should be possible to select (Lgb)
+using std::string;
 
-// unit_name is for compatibility. Can be deleted when all works well.
-// means, when we have full language support for the lengths 
-// in all gui's                                (Herbert 2002-11-01)
-char const * unit_name[num_units] = { 
-       "sp", "pt", "bp", "dd", "mm", "pc", 
-       "cc", "cm", "in", "ex", "em", "mu", 
-       "text%",  "col%", "page%", "line%",
-       "theight%", "pheight%" };
+// I am not sure if "mu" should be possible to select (Lgb)
 
 // the latex units
-char const * unit_name_ltx[num_units] = { 
-       "sp", "pt", "bp", "dd", "mm", "pc", 
-       "cc", "cm", "in", "ex", "em", "mu", 
-       // in 1.4 the following names should be used. then no
-       // translation into the latex ones are needed
-//     "textheight",  "columnwidth", "pagewidth", "linewidth",
-//     "textheight", "pageheight" };
+char const * const unit_name[] = {
+       "sp", "pt", "bp", "dd", "mm", "pc",
+       "cc", "cm", "in", "ex", "em", "mu",
        "text%",  "col%", "page%", "line%",
-       "theight%", "pheight%" };
+       "theight%", "pheight%", "" };
 
-// the LyX gui units
-char const * unit_name_gui[num_units] = { 
-       N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"), 
-       N_("cc"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"), 
-       N_("text%"), N_("col%"), N_("page%"), N_("line%"),
-       N_("theight%"), N_("pheight%") };
-
-       // this one maybe better ???? but there can be problems with
-       // xforms (Herbert)
-//     N_("textwidth%"), N_("columnwidth%"), N_("pagewidth%"), N_("linewidth%"),
-//     N_("textheight%"), N_("pageheight%") };
+int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
 
-       // or altenative this ones
-//     N_("twidth%"), N_("cwidth%"), N_("pwidth%"), N_("lwidth%"),
-//     N_("theight%"), N_("pheight%") };
+// the LyX gui units
+char const * const unit_name_gui[] = {
+       N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"),
+       N_("cc"), 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 %"), "" };
 
 LyXLength::UNIT unitFromString(string const & data)
 {
@@ -53,3 +47,5 @@ LyXLength::UNIT unitFromString(string const & data)
        return static_cast<LyXLength::UNIT>(i);
 }
 
+
+} // namespace lyx