anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* lengthcommon.[Ch]: remove obsolete unit_name_ltx;

Browse Source 
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
This commit is contained in:
Michael Schmitt 2006-07-18 21:56:07 +00:00
parent 66662d3f26
commit c31900f69d
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lengthcommon.C
View File

@ -20,9 +20,7 @@ using std::string;
// I am not sure if "mu" should be possible to select (Lgb) // I am not sure if "mu" should be possible to select (Lgb)
// unit_name is for compatibility. Can be deleted when all works well. // the latex units
// means, when we have full language support for the lengths
// in all gui's (Herbert 2002-11-01)
char const * const unit_name[] = { char const * const unit_name[] = {
"sp", "pt", "bp", "dd", "mm", "pc", "sp", "pt", "bp", "dd", "mm", "pc",
"cc", "cm", "in", "ex", "em", "mu", "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); 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 // the LyX gui units
char const * const unit_name_gui[] = { char const * const unit_name_gui[] = {
N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"), 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_("cc"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
N_("text%"), N_("col%"), N_("page%"), N_("line%"), N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
N_("theight%"), N_("pheight%"), "" }; 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) LyXLength::UNIT unitFromString(string const & data)
{ {

1
src/lengthcommon.h
View File

@ -28,7 +28,6 @@ extern int const num_units;
*/ */
extern char const * const unit_name[]; extern char const * const unit_name[];
extern char const * const unit_name_gui[]; extern char const * const unit_name_gui[];
extern char const * const unit_name_ltx[];
/// return the unit given a string representation such as "cm" /// return the unit given a string representation such as "cm"
LyXLength::UNIT unitFromString(std::string const & data); LyXLength::UNIT unitFromString(std::string const & data);