fix drawing of double quotes; fix input of cyrillic and greek characters

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4387 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 726a5f87a8f8b46f43323e2effb5f90ef973e756..12634fda394b4a864a818b7086514a4f1b21b0db 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-12  "Andrew Zabolotny"  <zap@cobra.ru>
+
+       * kbmap.C (getiso): add support for cyrillic and greek
+
 2002-06-12  John Levon  <moz@compsoc.man.ac.uk>
 
        * BufferView.h:

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 98a15aa0f18084082c82535095978fd86926f21a..22a5eafd1e2361000cfac3b1c2c3d7127ce6e79b 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-12  Vitaly Lipatov  <LAV@VL3143.spb.edu>
+
+       * insetquotes.C (draw): fix drawing of double quotes
+
 2002-06-12  John Levon  <moz@compsoc.man.ac.uk>
 
        * insettabular.C: s/scrollCB/scrollDocView/

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index f001179ae9e4f3ba608a6a8109fe51133cdf25d2..fef7fa9ff10aa6c07546b0779988bb9d84b9aad9 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -232,7 +232,12 @@ void InsetQuotes::draw(BufferView * bv, LyXFont const & font,
 {
        string const text = dispString(font.language());
 
-       bv->painter().text(int(x), baseline, text, font);
+       if (text.length() == 2 && text[0] == text[1]) {
+               bv->painter().text(int(x), baseline, text[0], font);
+               int x2 = int(x + lyxfont::width(',', font));
+               bv->painter().text(x2, baseline, text[0], font);
+       } else
+               bv->painter().text(int(x), baseline, text, font);
        x += width(bv, font);
 }
 

diff --git a/src/kbmap.C b/src/kbmap.C
index 1fd6b6dafead502ecde4aa1172ea426f46c53248..8849e36ed0072be1e8e8af0ffc84b9d9b80605e8 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -52,6 +52,10 @@ char kb_keymap::getiso(unsigned int c)
        case 0x00000200:
                // latin 4 byte 3 = 3
        case 0x00000300:
+               // cyrillic KOI8 & Co
+       case 0x00000600:
+               // greek
+       case 0x00000700:
                // latin 8 byte 3 = 18 (0x12)
        case 0x00001200:
                // latin 9 byte 3 = 19 (0x13)