this should be changed before 1.2.pre if it should be changed ...
c% -> col%
t% -> text%
l% -> line%
p% -> page%
column% is also possible but than some guis need to be
changed (too small choices). It's obviously that this is much
more better for users to understand what relative length
they choose.
Herbert
--
http://www.lyx.org/help/
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.648
diff -u -r1.648 ChangeLog
--- src/ChangeLog 27 Mar 2002 00:05:28 -0000 1.648
+++ src/ChangeLog 27 Mar 2002 10:29:13 -0000
@@ -1,3 +1,8 @@
+2002-03-27 Herbert Voss <[EMAIL PROTECTED]>
+
+ * lengthcommon.C: change c%, l%, p% t% to col%, line%, page%
+ and text%
+
2002-03-27 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* MenuBackend.C (expand): translate the name of floats
Index: src/lengthcommon.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lengthcommon.C,v
retrieving revision 1.2
diff -u -r1.2 lengthcommon.C
--- src/lengthcommon.C 7 Feb 2002 16:50:28 -0000 1.2
+++ src/lengthcommon.C 27 Mar 2002 10:29:14 -0000
@@ -5,10 +5,10 @@
int const num_units = LyXLength::UNIT_NONE;
// I am not sure if "mu" should be possible to select (Lgb)
-char const * unit_name[num_units] = { "sp", "pt", "bp", "dd",
- "mm", "pc", "cc", "cm",
- "in", "ex", "em", "mu",
- "t%", "c%", "p%", "l%" };
+char const * unit_name[num_units] = {
+ "sp", "pt", "bp", "dd", "mm", "pc", "cc", "cm",
+ "in", "ex", "em", "mu",
+ "text%", "col%", "page%", "line%" };
LyXLength::UNIT unitFromString(string const & data)
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.336
diff -u -r1.336 ChangeLog
--- src/frontends/xforms/ChangeLog 26 Mar 2002 15:20:01 -0000 1.336
+++ src/frontends/xforms/ChangeLog 27 Mar 2002 10:29:15 -0000
@@ -1,3 +1,9 @@
+2002-03-27 Herbert Voss <[EMAIL PROTECTED]>
+
+ * xforms_helpers.h:
+ * FormGraphics.C: change c%, l%, p% t% to col%, line%, page%
+ and text%
+
2002-03-26 Angus Leeming <[EMAIL PROTECTED]>
* FormPreferences.C (browse): don't use BrowseRelPath here you noodle!
Index: src/frontends/xforms/FormGraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormGraphics.C,v
retrieving revision 1.63
diff -u -r1.63 FormGraphics.C
--- src/frontends/xforms/FormGraphics.C 26 Mar 2002 15:20:01 -0000 1.63
+++ src/frontends/xforms/FormGraphics.C 27 Mar 2002 10:29:16 -0000
@@ -522,7 +522,7 @@
} else if (ob == lyxview_->button_latex_values) {
if (contains(fl_get_choice_text(size_->choice_width),'%'))
Alert::alert(_("Warning!"),
- _("The units t%, p%, c% and l% are not allowed
here."),
+ _("The units text%, page%, col% and line% are not
+allowed here."),
_("Cannot use the values from LaTeX size!"));
else {
LyXLength dummy =
Index: src/frontends/xforms/xforms_helpers.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/xforms_helpers.h,v
retrieving revision 1.21
diff -u -r1.21 xforms_helpers.h
--- src/frontends/xforms/xforms_helpers.h 21 Mar 2002 21:18:05 -0000 1.21
+++ src/frontends/xforms/xforms_helpers.h 27 Mar 2002 10:29:16 -0000
@@ -25,7 +25,7 @@
// what we always need for lengths
string const choice_Length_All =
- "cm|mm|in|t%%|c%%|p%%|l%%|ex|em|pt|sp|bp|dd|pc|cc|mu";
+ "cm|mm|in|text%%|col%%|page%%|line%%|ex|em|pt|sp|bp|dd|pc|cc|mu";
string const choice_Length_WithUnit =
"cm|mm|in|ex|em|pt|sp|bp|dd|pc|cc|mu"; // all with a Unit
Index: src/insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.370
diff -u -r1.370 ChangeLog
--- src/insets/ChangeLog 27 Mar 2002 00:05:28 -0000 1.370
+++ src/insets/ChangeLog 27 Mar 2002 10:29:17 -0000
@@ -1,3 +1,7 @@
+2002-03-27 Herbert Voss <[EMAIL PROTECTED]>
+
+ * insetgraphicsparam.C: change c%, p% to col%, page%
+
2002-03-27 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* insetspecialchar.C (isLineSeparator): disable the nice code to
Index: src/insets/insetgraphicsParams.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphicsParams.C,v
retrieving revision 1.31
diff -u -r1.31 insetgraphicsParams.C
--- src/insets/insetgraphicsParams.C 26 Mar 2002 12:17:04 -0000 1.31
+++ src/insets/insetgraphicsParams.C 27 Mar 2002 10:29:17 -0000
@@ -53,9 +53,9 @@
else if (token == "inch")
return (LyXLength(value+"in"));
else if (token == "percentOfColumn")
- return (LyXLength(value+"c%"));
+ return (LyXLength(value+"col%"));
else if (token == "percentOfPage")
- return (LyXLength(value+"p%"));
+ return (LyXLength(value+"page%"));
else return LyXLength("0pt"); // nothing with figinset
}
