ibus-typing-booster September 2013

ibus-typing-booster@lists.fedorahosted.org

1 participants
7 discussions

[ibus-typing-booster] miketmp: Release 1.2.4 version (ff7c615)
by mfabian＠fedoraproject.org 30 Sep '13

30 Sep '13

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : miketmp >--------------------------------------------------------------- commit ff7c6151930305b7326a30c9e1148a48d604a651 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Sat Sep 28 09:29:59 2013 +0200 Release 1.2.4 version >--------------------------------------------------------------- ibus-typing-booster/ChangeLog | 5 +++++ ibus-typing-booster/configure.ac | 2 +- ibus-typing-booster/ibus-typing-booster.pc.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ibus-typing-booster/ChangeLog b/ibus-typing-booster/ChangeLog index bb8c817..cc7e374 100644 --- a/ibus-typing-booster/ChangeLog +++ b/ibus-typing-booster/ChangeLog @@ -1,4 +1,9 @@ * Author: Mike FABIAN <mfabian(a)redhat.com> +* 28 Sep 2013 Released 1.2.4 version +* Use normalization form NFD internally for Korean as well +* Add check for input purpose for gnome-shell password dialog (Resolves: rhbz#1013008 - ibus-typing-booster shows entered text in password fields) + +* Author: Mike FABIAN <mfabian(a)redhat.com> * 06 Aug 2013 Released 1.2.3 version * Fix exception handling when trying to install a rpm package (Resolves: rhbz#986178) diff --git a/ibus-typing-booster/configure.ac b/ibus-typing-booster/configure.ac index ed324ca..b74845a 100755 --- a/ibus-typing-booster/configure.ac +++ b/ibus-typing-booster/configure.ac @@ -24,7 +24,7 @@ m4_define([package_name], [ibus-typing-booster]) m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [2]) -m4_define([ibus_micro_version], [3]) +m4_define([ibus_micro_version], [4]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) diff --git a/ibus-typing-booster/ibus-typing-booster.pc.in b/ibus-typing-booster/ibus-typing-booster.pc.in index 3855e46..05aa19b 100755 --- a/ibus-typing-booster/ibus-typing-booster.pc.in +++ b/ibus-typing-booster/ibus-typing-booster.pc.in @@ -11,7 +11,7 @@ enginedir=/usr/share/ibus/engine Name: IBus-Typing-Booster Description: Table Based Input Method Framework for Intelligent Input Bus for Linux / Unix OS -Version: 1.2.3 +Version: 1.2.4 Requires: Libs: Cflags: \ No newline at end of file

1 0

[ibus-typing-booster] miketmp: Add check for input purpose for gnome-shell password dialog (f45528a)
by mfabian＠fedoraproject.org 30 Sep '13

30 Sep '13

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : miketmp >--------------------------------------------------------------- commit f45528a210a0a24ed6b5d4242dc1ece18b5f0164 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Sat Sep 28 08:10:15 2013 +0200 Add check for input purpose for gnome-shell password dialog Resolves: rhbz#1013008 - ibus-typing-booster shows entered text in password fields >--------------------------------------------------------------- ibus-typing-booster/engine/hunspell_table.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ibus-typing-booster/engine/hunspell_table.py b/ibus-typing-booster/engine/hunspell_table.py index fb93d7b..e0c3cb9 100644 --- a/ibus-typing-booster/engine/hunspell_table.py +++ b/ibus-typing-booster/engine/hunspell_table.py @@ -515,6 +515,10 @@ class tabengine (IBus.Engine): debug_level = int(os.getenv('IBUS_TYPING_BOOSTER_DEBUG_LEVEL')) except: debug_level = int(0) + self._input_purpose = 0 + self._has_input_purpose = False + if hasattr(IBus, 'InputPurpose'): + self._has_input_purpose = True self._bus = bus self.db = db self._name = self.db.ime_properties.get('name') @@ -726,6 +730,9 @@ class tabengine (IBus.Engine): Key Events include Key Press and Key Release, modifier means Key Pressed ''' + if self._has_input_purpose and self._input_purpose == IBus.InputPurpose.PASSWORD: + return False + key = KeyEvent(keyval, state & IBus.ModifierType.RELEASE_MASK == 0, state) # ignore NumLock mask key.mask &= ~IBus.ModifierType.MOD2_MASK @@ -978,10 +985,16 @@ class tabengine (IBus.Engine): self._update_ui () def do_focus_out (self): + if self._has_input_purpose: + self._input_purpose = 0 self._editor.clear_context() self.reset() return + def do_set_content_type(self, purpose, hints): + if self._has_input_purpose: + self._input_purpose = purpose + def do_enable (self): # Tell the input-context that the engine will utilize # surrounding-text:

1 0

[ibus-typing-booster] miketmp: Remove unused parameters ��name�� and ��user_db�� from __init__() of tabsqlitedb (c7deb19)
by mfabian＠fedoraproject.org 30 Sep '13

30 Sep '13

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : miketmp >--------------------------------------------------------------- commit c7deb1989958d6d1aae8caaaa11fbbfaaac3f5f3 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Tue Sep 3 15:59:11 2013 +0200 Remove unused parameters “name” and “user_db” from __init__() of tabsqlitedb Never used in ibus-typing-booster, inherited from ibus-table. >--------------------------------------------------------------- ibus-typing-booster/engine/factory.py | 4 ++-- ibus-typing-booster/engine/tabsqlitedb.py | 6 ++---- ibus-typing-booster/setup/main.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ibus-typing-booster/engine/factory.py b/ibus-typing-booster/engine/factory.py index 8307e07..61579ab 100755 --- a/ibus-typing-booster/engine/factory.py +++ b/ibus-typing-booster/engine/factory.py @@ -37,7 +37,7 @@ class EngineFactory (IBus.Factory): """Table IM Engine Factory""" def __init__ (self, bus, db="", icon=""): if db: - self.db = tabsqlitedb.tabsqlitedb(filename=db) + self.db = tabsqlitedb.tabsqlitedb(config_filename=db) else: self.db = None self.dbdict = {} @@ -57,7 +57,7 @@ class EngineFactory (IBus.Factory): if name in self.dbdict: self.db = self.dbdict[name] else: - self.db = tabsqlitedb.tabsqlitedb(filename=name+'.conf') + self.db = tabsqlitedb.tabsqlitedb(config_filename=name+'.conf') self.dbdict[name] = self.db if name in self.enginedict: engine = self.enginedict[name] diff --git a/ibus-typing-booster/engine/tabsqlitedb.py b/ibus-typing-booster/engine/tabsqlitedb.py index c128f9e..5108927 100755 --- a/ibus-typing-booster/engine/tabsqlitedb.py +++ b/ibus-typing-booster/engine/tabsqlitedb.py @@ -78,16 +78,14 @@ class tabsqlitedb: user_db: Database on disk where the phrases learned from the user are stored user_freq >= 1: The number of times the user has used this phrase ''' - def __init__(self, name = 'table.db', user_db = None, filename = None ): - # use filename when you are creating db from source - # use name when you are using db + def __init__(self, config_filename=None): self._phrase_table_column_names = ['id', 'input_phrase', 'phrase', 'p_phrase', 'pp_phrase', 'user_freq'] self.old_phrases=[] self._conf_file_path = "/usr/share/ibus-typing-booster/hunspell-tables/" - self.ime_properties = ImeProperties(self._conf_file_path+filename) + self.ime_properties = ImeProperties(self._conf_file_path+config_filename) self._language = self.ime_properties.get('language') self._normalization_form_internal = 'NFD' diff --git a/ibus-typing-booster/setup/main.py b/ibus-typing-booster/setup/main.py index ca714c8..b18761f 100644 --- a/ibus-typing-booster/setup/main.py +++ b/ibus-typing-booster/setup/main.py @@ -104,7 +104,7 @@ class SetupUI: sys.exit(1) return - self.tabsqlitedb = tabsqlitedb.tabsqlitedb (filename=self.config_file) + self.tabsqlitedb = tabsqlitedb.tabsqlitedb (config_filename=self.config_file) self.name = self.tabsqlitedb.ime_properties.get('name') self.config_section = "engine/typing-booster/%s" % self.name self.hunspell_dict_package = self.tabsqlitedb.ime_properties.get('hunspell_dict_package')

1 0

[ibus-typing-booster] miketmp: Remove unused variables self._m17ndb and self._m17n_mim_name from class tabsqlitedb (dde014b)
by mfabian＠fedoraproject.org 30 Sep '13

30 Sep '13

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : miketmp >--------------------------------------------------------------- commit dde014bbc0b96da6c4b71c88fe379ff4f8888076 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Mon Sep 2 17:52:57 2013 +0200 Remove unused variables self._m17ndb and self._m17n_mim_name from class tabsqlitedb >--------------------------------------------------------------- ibus-typing-booster/engine/tabsqlitedb.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/ibus-typing-booster/engine/tabsqlitedb.py b/ibus-typing-booster/engine/tabsqlitedb.py index 7c42ad8..c128f9e 100755 --- a/ibus-typing-booster/engine/tabsqlitedb.py +++ b/ibus-typing-booster/engine/tabsqlitedb.py @@ -90,8 +90,6 @@ class tabsqlitedb: self.ime_properties = ImeProperties(self._conf_file_path+filename) self._language = self.ime_properties.get('language') self._normalization_form_internal = 'NFD' - self._m17ndb = 'm17n' - self._m17n_mim_name = "" self.hunspell_obj = hunspell_suggest.Hunspell( lang=self._language,

1 0

[ibus-typing-booster] miketmp: Use normalization form NFD internally for Korean as well (f07da6a)
by mfabian＠fedoraproject.org 30 Sep '13

30 Sep '13

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : miketmp >--------------------------------------------------------------- commit f07da6a1fc34f4fe2af67d49ee3e7d3032eb7d5e Author: Mike FABIAN <mfabian(a)redhat.com> Date: Sun Sep 1 17:54:42 2013 +0200 Use normalization form NFD internally for Korean as well Use the normalization forms as follows: NFD: for internal matching in the sql database and grepping in the hunspell dictionary for all languages except Korean NFC: for display in the preëdit and the lookup table, for calculating the caret position in the preëdit, for commiting. Also for input into pyhunspell. I used NFKD for Korean internally for the database. But that makes it difficult to use the same database for all languages. And the reason that I used NFKD for Korean is only that the 2 Korean input methods we have in m17n produce Jamo from the Hangul compatibility block and not from the Hangul Jamo area. For example transliterationg 'h' using /usr/share/m17n/ko-romaja.mim gives U+314E ㅎ not U+1112 ᄒ https://en.wikipedia.org/wiki/List_of_hangul_jamo To match correctly in the hunspell dictionary /usr/share/myspell/ko_KR.dic we need the latter (U1112 from the Hangul Jamo area). But instead of converting to NFKD when writing to our database and when matching in the hunspell dictionary, we can just as well convert the transliteration output immediately to NFKD. Converting the transliteration output of /usr/share/m17n/ko-romaja.mim and /usr/share/m17n/ko-han2.mim to NFKD converts U+314E ㅎ to U+1112 ᄒ etc. Further converting these Jamo from the Hangul Jamo area (like U+1112 ᄒ) to any of the normalization forms NFC, NFKC, NFD, and NFKD does not change them anymore. I.e. when the conversion to NFKD is done right after the transliteration when using one of these 2 Korean input methods, the matching works as well and we do not have to use a different normalization form for Korean in our database. >--------------------------------------------------------------- ibus-typing-booster/engine/hunspell_suggest.py | 2 -- ibus-typing-booster/engine/hunspell_table.py | 6 ++++++ ibus-typing-booster/engine/tabsqlitedb.py | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ibus-typing-booster/engine/hunspell_suggest.py b/ibus-typing-booster/engine/hunspell_suggest.py index 9e9e1ed..c1556fa 100755 --- a/ibus-typing-booster/engine/hunspell_suggest.py +++ b/ibus-typing-booster/engine/hunspell_suggest.py @@ -41,8 +41,6 @@ class Hunspell: def __init__(self,lang='en',loc='/usr/share/myspell/',dict_name='en_US.dic',aff_name='en_US.aff'): self.language=lang self.normalization_form_internal = 'NFD' - if self.language.startswith('ko'): - self.normalization_form_internal = 'NFKD' self.loc = loc self.dict_name = dict_name self.aff_name = aff_name diff --git a/ibus-typing-booster/engine/hunspell_table.py b/ibus-typing-booster/engine/hunspell_table.py index 43e71f9..9e49350 100644 --- a/ibus-typing-booster/engine/hunspell_table.py +++ b/ibus-typing-booster/engine/hunspell_table.py @@ -173,6 +173,9 @@ class editor(object): if self.trans_m17n_mode: self._transliterated_string = self.trans.transliterate( self._typed_string)[0].decode('UTF-8') + if self._current_ime in ['ko-romaja', 'ko-han2']: + self._transliterated_string = unicodedata.normalize( + 'NFKD', self._transliterated_string) else: self._transliterated_string = self._typed_string @@ -266,6 +269,9 @@ class editor(object): self._typed_string[:self._typed_string_cursor])[0].decode('UTF-8') else: transliterated_string_up_to_cursor = self._typed_string[:self._typed_string_cursor] + if self._current_ime in ['ko-romaja', 'ko-han2']: + transliterated_string_up_to_cursor = unicodedata.normalize( + 'NFKD', transliterated_string_up_to_cursor) transliterated_string_up_to_cursor = unicodedata.normalize( 'NFC', transliterated_string_up_to_cursor) return len(transliterated_string_up_to_cursor) diff --git a/ibus-typing-booster/engine/tabsqlitedb.py b/ibus-typing-booster/engine/tabsqlitedb.py index 39d2acd..7c42ad8 100755 --- a/ibus-typing-booster/engine/tabsqlitedb.py +++ b/ibus-typing-booster/engine/tabsqlitedb.py @@ -90,8 +90,6 @@ class tabsqlitedb: self.ime_properties = ImeProperties(self._conf_file_path+filename) self._language = self.ime_properties.get('language') self._normalization_form_internal = 'NFD' - if self._language.startswith('ko'): - self._normalization_form_internal = 'NFKD' self._m17ndb = 'm17n' self._m17n_mim_name = ""

1 0

[ibus-typing-booster] branch 'miketmp' created
by mfabian＠fedoraproject.org 30 Sep '13

30 Sep '13

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git New branch : miketmp Referencing: ff7c6151930305b7326a30c9e1148a48d604a651

1 0

[ibus-typing-booster] branch 'miketmp-debug' deleted
by mfabian＠fedoraproject.org 01 Sep '13

01 Sep '13

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git Deleted branch: miketmp-debug

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

ibus-typing-booster September 2013