Georg Baum wrote:
I have a nervous feeling that these strings are parsed somewhere. If you
made sure that that is not the case then this is a good change. I would
maybe even go further and use real language like e.g. "page width %" (or
capitalized?)
I checked that the string are handled correctly for Box insets. If there
is any dialog that behaves incorrectly, we should fix the dialog rather
than lengthcommon.C.
I am committing the attached patch now.
Michael
Index: lengthcommon.C
===================================================================
--- lengthcommon.C (Revision 14484)
+++ lengthcommon.C (Arbeitskopie)
@@ -20,9 +20,7 @@
// 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,33 +29,13 @@
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%"), "" };
+ N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
+ N_("Text Height %"), N_("Page Height %") };
- // 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%") };
-
LyXLength::UNIT unitFromString(string const & data)
{
int i = 0;
Index: lengthcommon.h
===================================================================
--- lengthcommon.h (Revision 14484)
+++ lengthcommon.h (Arbeitskopie)
@@ -28,7 +28,6 @@
*/
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);
