From 7d94c29f6cd951a076693d110b0758cae8456f46 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 6 Jul 2001 09:33:15 +0000 Subject: [PATCH] latinX patch ; configure tweaks git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_1_6@2192 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 8 ++++++++ INSTALL | 11 ++++++----- config/lyxinclude.m4 | 7 ++++--- src/kbsequence.C | 31 ++++++++++++++++++++++++++++--- 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 599bbd4343..47b2470858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-07-05 Jean-Marc Lasgouttes + + * src/kbsequence.C (getiso): handle latin[23489] characters. + + * INSTALL: + * config/lyxinclude.m4 (LYX_PATH_XFORMS): do not warn against + xforms 0.89.6 + 2001-07-05 Dekel Tsur * LaTeX.C (scanLogFile): Parse rerun messages from latex packages. diff --git a/INSTALL b/INSTALL index 6fedffb514..731e8a0bc5 100644 --- a/INSTALL +++ b/INSTALL @@ -35,11 +35,12 @@ You will need to have both an Xforms library and Xpm library to compile LyX. It is imperative that you have the correct versions of these libraries, and their associated header files. -As of LyX version 1.1.5, you will need to have Xforms library and header -version 0.88 or 0.89. Version 0.88 is a stable release and the -recommended version. On some systems, such as linux ELF, there are shared -library versions of the Xforms library, which require an installation step -to configure the system. +As of LyX version 1.1.5, you will need to have Xforms library and +header version 0.88 or 0.89. Version 0.88 is a stable release and the +recommended version, but 0.89.6 seems to be work very well too. On +some systems, such as linux ELF, there are shared library versions of +the Xforms library, which require an installation step to configure +the system. Xforms is available (free) only in binary format, source code is not available. If it is not available for your machine, contact the Xforms diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index ef60934080..a3ffd87b3e 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -642,10 +642,11 @@ case "$lyx_cv_xfversion" in Version $lyx_cv_xfversion of xforms is not compatible with LyX. This version of LyX works best with versions 0.88 (recommended) and later.) ;; 0.88*) ;; - 0.89*) LYX_WARNING(dnl + 0.89[012345]) LYX_WARNING(dnl LyX should work ok with version $lyx_cv_xfversion of xforms[,] but -it is an unproven version and might still have some bugs. If you -have problems[,] please use version 0.88 instead.) ;; +it is an unproven version and might still have some bugs. You should +probably use version 0.89.6 (or 0.88) instead) ;; + 0.89*) ;; *) LYX_WARNING(dnl Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,] since it is newer than 0.88. You might have slight problems with it.);; diff --git a/src/kbsequence.C b/src/kbsequence.C index fe828e29e6..c5497c0027 100644 --- a/src/kbsequence.C +++ b/src/kbsequence.C @@ -261,11 +261,36 @@ unsigned int kb_sequence::getsym() const char kb_sequence::getiso() const { - int const c = getsym(); + unsigned int const c = getsym(); + + lyxerr[Debug::KBMAP] << "Raw keysym: " + << std::hex << c << std::dec << endl; + lyxerr[Debug::KBMAP] << "byte 3: " + << std::hex << (c & 0x0000FF00) << std::dec + << endl; - if (c > 0xff) + switch (c & 0x0000FF00) { + // latin 1 byte 3 = 0 + case 0x00000000: + return c; + // latin 2 byte 3 = 1 + case 0x00000100: + // latin 3 byte 3 = 2 + case 0x00000200: + // latin 4 byte 3 = 3 + case 0x00000300: + // latin 8 byte 3 = 18 (0x12) + case 0x00001200: + // latin 9 byte 3 = 19 (0x13) + case 0x00001300: + return c & 0x000000FF; + default: return '\0'; - return c; + } + + // not a latin char we know of + // Yes but this is already handled above (JMarc) + //return '\0'; }