a new biblio::asValidLatexString helper function.

[lyx.git] / src / lengthcommon.C

diff --git a/src/lengthcommon.C b/src/lengthcommon.C
index dfabab4e7dbdc95206e8ae3827ac789ea5f9ecf9..89ff7e1a555a7101a3564995924286f43cea56aa 100644 (file)
--- a/src/lengthcommon.C
+++ b/src/lengthcommon.C
@@ -1,25 +1,38 @@
+/**
+ * \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"
 
 #include "gettext.h"
 
-
-int const num_units = LyXLength::UNIT_NONE;
+using std::string;
 
 // I am not sure if "mu" should be possible to select (Lgb)
 
 // 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] = {
+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%", "" };
+
+int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]));
 
 // the latex units
-char const * unit_name_ltx[num_units] = {
+char const * const unit_name_ltx[] = {
        "sp", "pt", "bp", "dd", "mm", "pc",
        "cc", "cm", "in", "ex", "em", "mu",
        // in 1.4 the following names should be used. then no
@@ -27,14 +40,14 @@ char const * unit_name_ltx[num_units] = {
 //     "textheight",  "columnwidth", "pagewidth", "linewidth",
 //     "textheight", "pageheight" };
        "text%",  "col%", "page%", "line%",
-       "theight%", "pheight%" };
+       "theight%", "pheight%", "" };
 
 // the LyX gui units
-char const * unit_name_gui[num_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%"), N_("col%"), N_("page%"), N_("line%"),
-       N_("theight%"), N_("pheight%") };
+       N_("theight%"), N_("pheight%"), "" };
 
        // this one maybe better ???? but there can be problems with
        // xforms (Herbert)