anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 10:40:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compilation fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8613 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-04-06 13:48:13 +00:00
parent ceff8c17ef
commit 5b992e53e5
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -225,7 +225,7 @@ Moreover, the following generic configure flags may be useful:
o --mandir=DIRECTORY gives the directory where the man pages will go. o --mandir=DIRECTORY gives the directory where the man pages will go.
[defaults to ${prefix}/man] [defaults to ${prefix}/man]
o --enable-mainainer-mode enables some code that automatically o --enable-maintainer-mode enables some code that automatically
rebuilds the configure script, makefiles templates and other useful rebuilds the configure script, makefiles templates and other useful
files when needed. This is off by default, to avoid surprises. files when needed. This is off by default, to avoid surprises.

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2004-04-05 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lengthcommon.C: compilation fix: remove explicit array size from
unit_name[] and friends
2004-04-05 Angus Leeming <leeming@lyx.org> 2004-04-05 Angus Leeming <leeming@lyx.org>
* LyXAction.C (init): set LFUN_DIALOG_UPDATE's atrib flag to NoBuffer. * LyXAction.C (init): set LFUN_DIALOG_UPDATE's atrib flag to NoBuffer.

11
src/lengthcommon.C
View File

@ -18,22 +18,21 @@
using std::string; using std::string;
int const num_units = LyXLength::UNIT_NONE;
// 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. // unit_name is for compatibility. Can be deleted when all works well.
// means, when we have full language support for the lengths // means, when we have full language support for the lengths
// in all gui's (Herbert 2002-11-01) // in all gui's (Herbert 2002-11-01)
char const * const unit_name[num_units + 1] = { 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",
"text%", "col%", "page%", "line%", "text%", "col%", "page%", "line%",
"theight%", "pheight%", "" }; "theight%", "pheight%", "" };
int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]));
// the latex units // the latex units
char const * const unit_name_ltx[num_units + 1] = { char const * const unit_name_ltx[] = {
"sp", "pt", "bp", "dd", "mm", "pc", "sp", "pt", "bp", "dd", "mm", "pc",
"cc", "cm", "in", "ex", "em", "mu", "cc", "cm", "in", "ex", "em", "mu",
// in 1.4 the following names should be used. then no // in 1.4 the following names should be used. then no
@ -44,7 +43,7 @@ char const * const unit_name_ltx[num_units + 1] = {
"theight%", "pheight%", "" }; "theight%", "pheight%", "" };
// the LyX gui units // the LyX gui units
char const * const unit_name_gui[num_units + 1] = { 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%"), N_("col%"), N_("page%"), N_("line%"),