mii/akaza
1
0
Fork 0
mirror of https://github.com/mii443/akaza.git synced 2025-12-03 02:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

snapshot

Browse Source
This commit is contained in:
Tokuhiro Matsuno
2020-09-15 18:39:56 +09:00
parent 51ea5709f3
commit b0ac6e701b
15 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -3,4 +3,6 @@ __pycache__
/comb.xml
/hello.*
/test_graph2.py
/akaza.xml
/akaza.xml
*.egg-info/
dist/

43
Makefile
View File

@@ -23,29 +23,32 @@ install-data: model/system_dict.trie
install -p -m 0644 model/system_dict.trie $(DESTDIR)$(DATADIR)/ibus-akaza/dictionary/
install -m 0644 model/system_language_model.trie $(DESTDIR)$(DATADIR)/ibus-akaza/model/
install: all akaza/config.py model/system_dict.trie install-data
install -m 0755 -d $(DESTDIR)$(DATADIR)/ibus-akaza/akaza $(DESTDIR)$(SYSCONFDIR)/xdg/akaza $(DESTDIR)$(DATADIR)/ibus/component $(DESTDIR)$(DATADIR)/ibus-akaza/model $(DESTDIR)$(DATADIR)/ibus-akaza/dictionary
install:
cd akaza-data && $(PYTHON) setup.py install
cd akaza-core && $(PYTHON) setup.py install
install -m 0644 akaza.svg $(DESTDIR)$(DATADIR)/ibus-akaza
install -m 0644 ibus.py $(DESTDIR)$(DATADIR)/ibus-akaza
install -m 0644 akaza.xml $(DESTDIR)$(DATADIR)/ibus/component
install -m 0644 akaza/__init__.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/graph.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/language_model.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/node.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/config.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/skkdict.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/akazaromkan.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/engine.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/ui.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/user_language_model.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/system_language_model.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/system_dict.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
install -m 0644 akaza/user_dict.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
#install: all akaza/config.py model/system_dict.trie install-data
# install -m 0755 -d $(DESTDIR)$(DATADIR)/ibus-akaza/akaza $(DESTDIR)$(SYSCONFDIR)/xdg/akaza $(DESTDIR)$(DATADIR)/ibus/component $(DESTDIR)$(DATADIR)/ibus-akaza/model $(DESTDIR)$(DATADIR)/ibus-akaza/dictionary
#
# install -m 0644 akaza.svg $(DESTDIR)$(DATADIR)/ibus-akaza
# install -m 0644 ibus.py $(DESTDIR)$(DATADIR)/ibus-akaza
# install -m 0644 akaza.xml $(DESTDIR)$(DATADIR)/ibus/component
#
# install -m 0644 akaza/__init__.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/graph.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/language_model.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/node.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/config.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/skkdict.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/romkan.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/engine.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/ui.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/user_language_model.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/system_language_model.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/system_dict.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
# install -m 0644 akaza/user_dict.py $(DESTDIR)$(DATADIR)/ibus-akaza/akaza/
uninstall:
rm -f $(DESTDIR)$(DATADIR)/ibus-akaza
rm -f $(DESTDIR)$(DATADIR)/ibus/component/akaza.xml

9
akaza-core/akaza.egg-info/PKG-INFO
View File

@@ -1,9 +0,0 @@
Metadata-Version: 2.1
Name: akaza
Version: 0.0.1
Summary: UNKNOWN
Home-page: UNKNOWN
License: UNKNOWN
Description: UNKNOWN
Platform: UNKNOWN
Provides-Extra: develop

6
akaza-core/akaza.egg-info/SOURCES.txt
View File

@@ -1,6 +0,0 @@
setup.py
akaza.egg-info/PKG-INFO
akaza.egg-info/SOURCES.txt
akaza.egg-info/dependency_links.txt
akaza.egg-info/requires.txt
akaza.egg-info/top_level.txt

1
akaza-core/akaza.egg-info/dependency_links.txt
View File

@@ -1 +0,0 @@

6
akaza-core/akaza.egg-info/requires.txt
View File

@@ -1,6 +0,0 @@
marisa-trie==0.7.5
jaconv==0.2.4
[develop]
dev-packageA
dev-packageB

1
akaza-core/akaza.egg-info/top_level.txt
View File

@@ -1 +0,0 @@

0
akaza-core/akaza/akazaromkan.py → akaza-core/akaza/romkan.py
View File

5
akaza-core/requires.txt
View File

@@ -1,3 +1,4 @@
marisa-trie=0.7.5
marisa-trie==0.7.5
jaconv==0.2.4
skkdictutils=0.0.2
skkdictutils==0.0.2
akaza-data>=0.0.1

11
akaza-data/setup.py Normal file
View File

@@ -0,0 +1,11 @@
from setuptools import setup
setup(
name="akaza-data",
version="0.0.1",
install_requires=["marisa-trie==0.7.5", "jaconv==0.2.4"],
extras_require={
},
entry_points={
}
)

5
ibus-akaza/Makefile
View File

@@ -26,9 +26,10 @@ akaza.xml: akaza.xml.in
sed -e "s:@PYTHON@:$(PYTHON):g;" \
-e "s:@DATADIR@:$(DATADIR):g" $< > $@
check:
test:
python -m py_compile ibus.py
python -m py_compile ibus_akaza/ui.py
pytest
uninstall:
rm -f $(DESTDIR)$(DATADIR)/ibus-akaza/akaza.svg
@@ -41,5 +42,5 @@ uninstall:
clean:
rm -f akaza.xml
.PHONY: all check install uninstall clean
.PHONY: all test install uninstall clean

2
ibus-akaza/ibus.py
View File

@@ -57,7 +57,7 @@ class IMApp:
logging.info("Loading IMApp")
from akaza.ui import AkazaIBusEngine
from ibus_akaza.ui import AkazaIBusEngine
self.mainloop = GLib.MainLoop()
self.bus = IBus.Bus()

0
ibus-akaza/ibus_akaza/__init__.py Normal file
View File

20
ibus-akaza/ibus_akaza/ui.py
View File

@@ -15,11 +15,11 @@ import pathlib
from jaconv import jaconv
from akaza import akazaromkan
from akaza import romkan
from akaza.engine import Comb
from akaza.node import Node
from akaza.user_language_model import UserLanguageModel
from akaza.system_dict import SystemDict
from akaza_data.system_dict import SystemDict
from akaza.user_dict import load_user_dict_from_json_config
from akaza.config import MODEL_DIR
@@ -63,7 +63,7 @@ try:
logging.info(f"'{user_dict_conf_path}' does not exist.")
system_language_model_path = f"{MODEL_DIR}/system_language_model.trie"
system_language_model = SystemLanguageModel.create(system_language_model_path)
system_language_model = SystemLanguageModel.load()
akaza = Comb(user_language_model, system_dict, user_dict, system_language_model)
logging.info("Finished Comb.")
@@ -173,7 +173,7 @@ class AkazaIBusEngine(IBus.Engine):
self.commit_candidate()
else:
# 無変換状態では、ひらがなに変換してコミットします。
self.commit_string(akazaromkan.to_hiragana(self.preedit_string))
self.commit_string(romkan.to_hiragana(self.preedit_string))
return True
elif keyval == IBus.Escape:
self.preedit_string = ''
@@ -294,7 +294,7 @@ class AkazaIBusEngine(IBus.Engine):
self.logger.info("Convert to full katakana")
# カタカナ候補のみを表示するようにする。
hira = akazaromkan.to_hiragana(self.preedit_string)
hira = romkan.to_hiragana(self.preedit_string)
kata = jaconv.hira2kata(hira)
self.convert_to_single(hira, kata)
@@ -303,14 +303,14 @@ class AkazaIBusEngine(IBus.Engine):
self.logger.info("Convert to full hiragana")
# カタカナ候補のみを表示するようにする。
hira = akazaromkan.to_hiragana(self.preedit_string)
hira = romkan.to_hiragana(self.preedit_string)
self.convert_to_single(hira, hira)
def convert_to_half_katakana(self):
self.logger.info("Convert to half katakana")
# 半角カタカナ候補のみを表示するようにする。
hira = akazaromkan.to_hiragana(self.preedit_string)
hira = romkan.to_hiragana(self.preedit_string)
kata = jaconv.hira2kata(hira)
kata = jaconv.z2h(kata)
@@ -320,7 +320,7 @@ class AkazaIBusEngine(IBus.Engine):
self.logger.info("Convert to half romaji")
# 半角カタカナ候補のみを表示するようにする。
hira = akazaromkan.to_hiragana(self.preedit_string)
hira = romkan.to_hiragana(self.preedit_string)
romaji = jaconv.z2h(self.preedit_string)
self.convert_to_single(hira, romaji)
@@ -328,7 +328,7 @@ class AkazaIBusEngine(IBus.Engine):
def convert_to_full_romaji(self):
self.logger.info("Convert to full romaji")
hira = akazaromkan.to_hiragana(self.preedit_string)
hira = romkan.to_hiragana(self.preedit_string)
romaji = jaconv.h2z(self.preedit_string, kana=True, digit=True, ascii=True)
self.convert_to_single(hira, romaji)
@@ -593,7 +593,7 @@ class AkazaIBusEngine(IBus.Engine):
return
# 平仮名にする。
text = akazaromkan.to_hiragana(self.preedit_string)
text = romkan.to_hiragana(self.preedit_string)
self.clauses = [
[Node(word=text, yomi=text, start_pos=3)]
]

2
ibus-akaza/test_ui.py
View File

@@ -3,7 +3,7 @@ import os
os.environ['AKAZA_DICTIONARY_DIR'] = 'model/'
os.environ['AKAZA_MODEL_DIR'] = 'model/'
from akaza.ui import AkazaIBusEngine
from ibus_akaza.ui import AkazaIBusEngine
def test_extend_clause_right():