From c31900f69d108714a925f1d4ab722aad12653a64 Mon Sep 17 00:00:00 2001
From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Tue, 18 Jul 2006 21:56:07 +0000
Subject: [PATCH] 	* lengthcommon.[Ch]: remove obsolete unit_name_ltx; 
 choose user-friendly names for unit_name_gui

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14485 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/lengthcommon.C | 28 +++-------------------------
 src/lengthcommon.h |  1 -
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/lengthcommon.C b/src/lengthcommon.C
index fc1ea7017c..4bc050e571 100644
--- a/src/lengthcommon.C
+++ b/src/lengthcommon.C
@@ -20,9 +20,7 @@ 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)
+// the latex units
 char const * const unit_name[] = {
 	"sp", "pt", "bp", "dd", "mm", "pc",
 	"cc", "cm", "in", "ex", "em", "mu",
@@ -31,32 +29,12 @@ char const * const unit_name[] = {
 
 int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
 
-// the latex 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
-	// translation into the latex ones are needed
-//	"textheight",  "columnwidth", "pagewidth", "linewidth",
-//	"textheight", "pageheight" };
-	"text%",  "col%", "page%", "line%",
-	"theight%", "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%"), 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%") };
-
-	// or altenative this ones
-//	N_("twidth%"), N_("cwidth%"), N_("pwidth%"), N_("lwidth%"),
-//	N_("theight%"), N_("pheight%") };
+	N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
+	N_("Text Height %"), N_("Page Height %") };
 
 LyXLength::UNIT unitFromString(string const & data)
 {
diff --git a/src/lengthcommon.h b/src/lengthcommon.h
index ef74e411b7..ff5d6f5079 100644
--- a/src/lengthcommon.h
+++ b/src/lengthcommon.h
@@ -28,7 +28,6 @@ extern int const num_units;
  */
 extern char const * const unit_name[];
 extern char const * const unit_name_gui[];
-extern char const * const unit_name_ltx[];
 
 /// return the unit given a string representation such as "cm"
 LyXLength::UNIT unitFromString(std::string const & data);
-- 
2.39.2