Menu
▾
▴
tomoe-commits — Automated diffs from our revision control system
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(58) |
May
(28) |
Jun
(308) |
Jul
(11) |
Aug
(1) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(4) |
Feb
(8) |
Mar
(3) |
Apr
(3) |
May
(8) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
| 2009 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <kt...@us...> - 2007-06-07 07:07:33
|
Revision: 1312
http://tomoe.svn.sourceforge.net/tomoe/?rev=1312&view=rev
Author: ktou
Date: 2007-06-07 00:07:33 -0700 (Thu, 07 Jun 2007)
Log Message:
-----------
* macros/ruby.m4: supported --with-ruby without "=PATH".
ikezoe and makeinu are veeeeeery ANGRY... orz
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/macros/ruby.m4
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-06-07 06:18:40 UTC (rev 1311)
+++ tomoe/trunk/ChangeLog 2007-06-07 07:07:33 UTC (rev 1312)
@@ -1,3 +1,7 @@
+2007-06-07 Kouhei Sutou <ko...@co...>
+
+ * macros/ruby.m4: supported --with-ruby without "=PATH".
+
2007-06-07 Hiroyuki Ikezoe <poi...@ik...>
* bindings/python/tomoe-dict.override,
Modified: tomoe/trunk/macros/ruby.m4
===================================================================
--- tomoe/trunk/macros/ruby.m4 2007-06-07 06:18:40 UTC (rev 1311)
+++ tomoe/trunk/macros/ruby.m4 2007-06-07 07:07:33 UTC (rev 1312)
@@ -12,7 +12,7 @@
if test "$RUBY" = "no"; then
: # ignore
-elif test "$RUBY" = ""; then
+elif test "$RUBY" = "" -o "$RUBY" = "yes"; then
AC_PATH_PROG(RUBY, ruby, none)
if test "$RUBY" != "none"; then
ruby_available="yes"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-07 06:18:48
|
Revision: 1311
http://tomoe.svn.sourceforge.net/tomoe/?rev=1311&view=rev
Author: ikezoe
Date: 2007-06-06 23:18:40 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
tomoe-gtk -> tomoegtk.
Modified Paths:
--------------
tomoe-gtk/trunk/bindings/python/Makefile.am
tomoe-gtk/trunk/bindings/python/tomoegtk-module.c
Modified: tomoe-gtk/trunk/bindings/python/Makefile.am
===================================================================
--- tomoe-gtk/trunk/bindings/python/Makefile.am 2007-06-07 06:12:19 UTC (rev 1310)
+++ tomoe-gtk/trunk/bindings/python/Makefile.am 2007-06-07 06:18:40 UTC (rev 1311)
@@ -1,6 +1,6 @@
pkgpyexecdir = $(pyexecdir)/gtk-2.0
-pkgpyexec_LTLIBRARIES = tomoe-gtk.la
+pkgpyexec_LTLIBRARIES = tomoegtk.la
INCLUDES = \
$(PYTHON_CFLAGS) \
@@ -9,19 +9,19 @@
$(GTK2_CFLAGS) \
$(TOMOE_CFLAGS)
-nodist_tomoe_gtk_la_SOURCES = \
+nodist_tomoegtk_la_SOURCES = \
tomoegtk.c
-tomoe_gtk_la_SOURCES = \
+tomoegtk_la_SOURCES = \
tomoegtk-module.c
-tomoe_gtk_la_LDFLAGS = \
+tomoegtk_la_LDFLAGS = \
-module \
-avoid-version \
$(TOMOE_LDFLAGS) \
$(PYTHON_LDFLAGS)
-tomoe_gtk_la_LIBADD = \
+tomoegtk_la_LIBADD = \
$(TOMOE_LIBS) \
$(PYGTK_LIBS) \
$(top_builddir)/src/libtomoe-gtk.la
Modified: tomoe-gtk/trunk/bindings/python/tomoegtk-module.c
===================================================================
--- tomoe-gtk/trunk/bindings/python/tomoegtk-module.c 2007-06-07 06:12:19 UTC (rev 1310)
+++ tomoe-gtk/trunk/bindings/python/tomoegtk-module.c 2007-06-07 06:18:40 UTC (rev 1311)
@@ -12,7 +12,7 @@
init_pygobject ();
- m = Py_InitModule ("tomoe", pytomoegtk_functions);
+ m = Py_InitModule ("tomoegtk", pytomoegtk_functions);
d = PyModule_GetDict (m);
pytomoegtk_register_classes (d);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-07 06:12:17
|
Revision: 1310
http://tomoe.svn.sourceforge.net/tomoe/?rev=1310&view=rev
Author: ikezoe
Date: 2007-06-06 23:12:19 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
Use pytomoe's defs file.
Modified Paths:
--------------
tomoe-gtk/trunk/bindings/python/Makefile.am
tomoe-gtk/trunk/bindings/python/tomoegtk.override
tomoe-gtk/trunk/macros/python.m4
Modified: tomoe-gtk/trunk/bindings/python/Makefile.am
===================================================================
--- tomoe-gtk/trunk/bindings/python/Makefile.am 2007-06-07 06:01:40 UTC (rev 1309)
+++ tomoe-gtk/trunk/bindings/python/Makefile.am 2007-06-07 06:12:19 UTC (rev 1310)
@@ -35,9 +35,11 @@
EXTRA_DIST = tomoegtk.defs $(OVERRIDES)
.defs.c:
- (cd $(srcdir) \
- && $(PYGTK_CODEGEN) \
- --override $*.override \
- --prefix py$* $*.defs) > gen-$*.c \
- && cp gen-$*.c $*.c \
+ (cd $(srcdir) \
+ && $(PYGTK_CODEGEN) \
+ --register $(PYGTK_DEFSDIR)/gtk-types.defs \
+ --register $(PYTOMOE_DEFSDIR)/tomoe.defs \
+ --override $*.override \
+ --prefix py$* $*.defs) > gen-$*.c \
+ && cp gen-$*.c $*.c \
&& rm -f gen-$*.c
Modified: tomoe-gtk/trunk/bindings/python/tomoegtk.override
===================================================================
--- tomoe-gtk/trunk/bindings/python/tomoegtk.override 2007-06-07 06:01:40 UTC (rev 1309)
+++ tomoe-gtk/trunk/bindings/python/tomoegtk.override 2007-06-07 06:12:19 UTC (rev 1310)
@@ -12,10 +12,18 @@
import gtk.Window as PyGtkWindow_Type
import gtk.Table as PyGtkTable_Type
import gtk.Dialog as PyGtkDialog_Type
+import gtk.TreeModel as PyGtkTreeModel_Type
+import tomoe.Char as PyTomoeChar_Type
+import tomoe.Context as PyTomoeContext_Type
+import tomoe.Dict as PyTomoeDict_Type
+import tomoe.Writing as PyTomoeWriting_Type
%%
ignore-glob
*_get_type
%%
+ignore
+ tomoe_scrollable_setup_widget_class
+%%
new-constructor TOMOE_TYPE_DETAILS
new-constructor TOMOE_TYPE_EDIT_CHAR
%%
Modified: tomoe-gtk/trunk/macros/python.m4
===================================================================
--- tomoe-gtk/trunk/macros/python.m4 2007-06-07 06:01:40 UTC (rev 1309)
+++ tomoe-gtk/trunk/macros/python.m4 2007-06-07 06:12:19 UTC (rev 1310)
@@ -35,6 +35,9 @@
AC_SUBST(PYGOBJECT_CFLAGS)
+ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+ AC_SUBST([PYGTK_DEFSDIR])
+
python_undef_package_macros="
#undef PACKAGE_NAME
#undef PACKAGE_TARNAME
@@ -50,6 +53,10 @@
CFLAGS=$_SAVE_CFLAGS
AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, [python_avairable="no"])
+
+ PYTOMOE_DEFSDIR=`$PKG_CONFIG --variable=defsdir tomoe`
+ AC_SUBST([PYTOMOE_DEFSDIR])
+
fi
AM_CONDITIONAL([WITH_PYTHON], [test "$python_available" = "yes"])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-07 06:01:40
|
Revision: 1309
http://tomoe.svn.sourceforge.net/tomoe/?rev=1309&view=rev
Author: ikezoe
Date: 2007-06-06 23:01:40 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
* tomoe.pc.in: Add defsdir for Python binding.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/tomoe.pc.in
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-06-07 05:42:46 UTC (rev 1308)
+++ tomoe/trunk/ChangeLog 2007-06-07 06:01:40 UTC (rev 1309)
@@ -7,6 +7,7 @@
* lib/tomoe-*.c: Remove "tomoe-" prefix from GObject's virtual
function's name.
* bindings/python/Makefile.am: Install tomoe.defs.
+ * tomoe.pc.in: Add defsdir for Python binding.
2007-06-06 Hiroyuki Ikezoe <poi...@ik...>
Modified: tomoe/trunk/tomoe.pc.in
===================================================================
--- tomoe/trunk/tomoe.pc.in 2007-06-07 05:42:46 UTC (rev 1308)
+++ tomoe/trunk/tomoe.pc.in 2007-06-07 06:01:40 UTC (rev 1309)
@@ -2,7 +2,12 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+# for Python binding
+defsdir=${datadir}/@PACKAGE@/python
+
Name: Tomoe
Description: Tegaki Online MOji-ninshiki Engine
Version: @VERSION@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-07 05:42:44
|
Revision: 1308
http://tomoe.svn.sourceforge.net/tomoe/?rev=1308&view=rev
Author: ikezoe
Date: 2007-06-06 22:42:46 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
* bindings/python/Makefile.am: Install tomoe.defs.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/bindings/python/Makefile.am
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-06-07 03:31:25 UTC (rev 1307)
+++ tomoe/trunk/ChangeLog 2007-06-07 05:42:46 UTC (rev 1308)
@@ -6,6 +6,7 @@
tomoe.Dict("XML", "filename", "/usr/share/tomoe/handwriting.xml") or tomoe.Dict("Unihan").
* lib/tomoe-*.c: Remove "tomoe-" prefix from GObject's virtual
function's name.
+ * bindings/python/Makefile.am: Install tomoe.defs.
2007-06-06 Hiroyuki Ikezoe <poi...@ik...>
Modified: tomoe/trunk/bindings/python/Makefile.am
===================================================================
--- tomoe/trunk/bindings/python/Makefile.am 2007-06-07 03:31:25 UTC (rev 1307)
+++ tomoe/trunk/bindings/python/Makefile.am 2007-06-07 05:42:46 UTC (rev 1308)
@@ -1,4 +1,5 @@
pyexec_LTLIBRARIES = tomoe.la
+defsdir = $(pkgdatadir)/python
INCLUDES = \
$(PYTHON_CFLAGS) \
@@ -32,10 +33,12 @@
tomoe-shelf.override \
tomoe-writing.override
-tomoe.c: tomoe.defs $(OVERRIDES)
+defs_DATA = tomoe.defs
+tomoe.c: $(defs_DATA) $(OVERRIDES)
+
CLEANFILES = tomoe.c
-EXTRA_DIST = tomoe.defs $(OVERRIDES)
+EXTRA_DIST = $(defs_DATA) $(OVERRIDES)
.defs.c:
(cd $(srcdir) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-07 03:31:29
|
Revision: 1307
http://tomoe.svn.sourceforge.net/tomoe/?rev=1307&view=rev
Author: ikezoe
Date: 2007-06-06 20:31:25 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
* lib/tomoe-*.c: Remove "tomoe-" prefix from GObject's virtual
function's name.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/lib/tomoe-candidate.c
tomoe/trunk/lib/tomoe-char.c
tomoe/trunk/lib/tomoe-config.c
tomoe/trunk/lib/tomoe-query.c
tomoe/trunk/lib/tomoe-reading.c
tomoe/trunk/lib/tomoe-shelf.c
tomoe/trunk/lib/tomoe-writing.c
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-06-07 03:30:14 UTC (rev 1306)
+++ tomoe/trunk/ChangeLog 2007-06-07 03:31:25 UTC (rev 1307)
@@ -4,6 +4,8 @@
bindings/python/tomoe-recognizer.override: TomoeDict and
TomoeRecognizer object can be created.
tomoe.Dict("XML", "filename", "/usr/share/tomoe/handwriting.xml") or tomoe.Dict("Unihan").
+ * lib/tomoe-*.c: Remove "tomoe-" prefix from GObject's virtual
+ function's name.
2007-06-06 Hiroyuki Ikezoe <poi...@ik...>
Modified: tomoe/trunk/lib/tomoe-candidate.c
===================================================================
--- tomoe/trunk/lib/tomoe-candidate.c 2007-06-07 03:30:14 UTC (rev 1306)
+++ tomoe/trunk/lib/tomoe-candidate.c 2007-06-07 03:31:25 UTC (rev 1307)
@@ -40,15 +40,15 @@
G_DEFINE_TYPE (TomoeCandidate, tomoe_candidate, G_TYPE_OBJECT)
-static void tomoe_candidate_dispose (GObject *object);
-static void tomoe_candidate_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void tomoe_candidate_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void dispose (GObject *object);
+static void set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void
tomoe_candidate_class_init (TomoeCandidateClass *klass)
@@ -57,9 +57,9 @@
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->dispose = tomoe_candidate_dispose;
- gobject_class->set_property = tomoe_candidate_set_property;
- gobject_class->get_property = tomoe_candidate_get_property;
+ gobject_class->dispose = dispose;
+ gobject_class->set_property = set_property;
+ gobject_class->get_property = get_property;
g_object_class_install_property (
gobject_class,
@@ -96,7 +96,7 @@
}
static void
-tomoe_candidate_dispose (GObject *object)
+dispose (GObject *object)
{
TomoeCandidatePrivate *priv = TOMOE_CANDIDATE_GET_PRIVATE (object);
@@ -108,10 +108,10 @@
}
static void
-tomoe_candidate_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
TomoeCandidate *cand = TOMOE_CANDIDATE (object);
TomoeCandidatePrivate *priv = TOMOE_CANDIDATE_GET_PRIVATE (cand);
@@ -134,10 +134,10 @@
static void
-tomoe_candidate_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
TomoeCandidate *cand = TOMOE_CANDIDATE (object);
TomoeCandidatePrivate *priv = TOMOE_CANDIDATE_GET_PRIVATE (cand);
Modified: tomoe/trunk/lib/tomoe-char.c
===================================================================
--- tomoe/trunk/lib/tomoe-char.c 2007-06-07 03:30:14 UTC (rev 1306)
+++ tomoe/trunk/lib/tomoe-char.c 2007-06-07 03:31:25 UTC (rev 1307)
@@ -60,15 +60,15 @@
G_DEFINE_TYPE (TomoeChar, tomoe_char, G_TYPE_OBJECT)
-static void tomoe_char_dispose (GObject *object);
-static void tomoe_char_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void tomoe_char_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void dispose (GObject *object);
+static void set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void
tomoe_char_class_init (TomoeCharClass *klass)
@@ -78,9 +78,9 @@
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->dispose = tomoe_char_dispose;
- gobject_class->set_property = tomoe_char_set_property;
- gobject_class->get_property = tomoe_char_get_property;
+ gobject_class->dispose = dispose;
+ gobject_class->set_property = set_property;
+ gobject_class->get_property = get_property;
spec = g_param_spec_string ("utf8",
N_("UTF8"),
@@ -147,7 +147,7 @@
}
static void
-tomoe_char_dispose (GObject *object)
+dispose (GObject *object)
{
TomoeCharPrivate *priv = TOMOE_CHAR_GET_PRIVATE (object);
@@ -180,10 +180,10 @@
}
static void
-tomoe_char_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
TomoeChar *chr;
@@ -208,10 +208,10 @@
}
static void
-tomoe_char_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
TomoeChar *chr;
TomoeCharPrivate *priv;
Modified: tomoe/trunk/lib/tomoe-config.c
===================================================================
--- tomoe/trunk/lib/tomoe-config.c 2007-06-07 03:30:14 UTC (rev 1306)
+++ tomoe/trunk/lib/tomoe-config.c 2007-06-07 03:31:25 UTC (rev 1307)
@@ -60,18 +60,18 @@
static const gchar *system_config_file = CONFDIR "/config";
-static void tomoe_config_dispose (GObject *object);
-static GObject *tomoe_config_constructor (GType type,
- guint n_props,
- GObjectConstructParam *props);
-static void tomoe_config_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void tomoe_config_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void dispose (GObject *object);
+static GObject *constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *props);
+static void set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void tomoe_config_load (TomoeConfig *config);
static void tomoe_config_save (TomoeConfig *config);
@@ -105,10 +105,10 @@
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->dispose = tomoe_config_dispose;
- gobject_class->constructor = tomoe_config_constructor;
- gobject_class->set_property = tomoe_config_set_property;
- gobject_class->get_property = tomoe_config_get_property;
+ gobject_class->dispose = dispose;
+ gobject_class->constructor = constructor;
+ gobject_class->set_property = set_property;
+ gobject_class->get_property = get_property;
g_object_class_install_property (gobject_class,
PROP_FILENAME,
@@ -122,8 +122,7 @@
}
static GObject *
-tomoe_config_constructor (GType type, guint n_props,
- GObjectConstructParam *props)
+constructor (GType type, guint n_props, GObjectConstructParam *props)
{
GObject *object;
@@ -160,7 +159,7 @@
}
static void
-tomoe_config_dispose (GObject *object)
+dispose (GObject *object)
{
TomoeConfig *config;
TomoeConfigPrivate *priv;
@@ -189,10 +188,10 @@
}
static void
-tomoe_config_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
TomoeConfigPrivate *priv = TOMOE_CONFIG_GET_PRIVATE (object);
@@ -210,10 +209,10 @@
}
static void
-tomoe_config_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
TomoeConfigPrivate *priv = TOMOE_CONFIG_GET_PRIVATE (object);
Modified: tomoe/trunk/lib/tomoe-query.c
===================================================================
--- tomoe/trunk/lib/tomoe-query.c 2007-06-07 03:30:14 UTC (rev 1306)
+++ tomoe/trunk/lib/tomoe-query.c 2007-06-07 03:31:25 UTC (rev 1307)
@@ -62,15 +62,15 @@
G_DEFINE_TYPE (TomoeQuery, tomoe_query, G_TYPE_OBJECT)
-static void tomoe_query_dispose (GObject *object);
-static void tomoe_query_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void tomoe_query_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void dispose (GObject *object);
+static void set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void
tomoe_query_class_init (TomoeQueryClass *klass)
@@ -80,9 +80,9 @@
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->dispose = tomoe_query_dispose;
- gobject_class->set_property = tomoe_query_set_property;
- gobject_class->get_property = tomoe_query_get_property;
+ gobject_class->dispose = dispose;
+ gobject_class->set_property = set_property;
+ gobject_class->get_property = get_property;
spec = g_param_spec_string ("utf8",
N_("UTF8"),
@@ -138,7 +138,7 @@
}
static void
-tomoe_query_dispose (GObject *object)
+dispose (GObject *object)
{
TomoeQueryPrivate *priv = TOMOE_QUERY_GET_PRIVATE (object);
@@ -168,10 +168,10 @@
G_OBJECT_CLASS (tomoe_query_parent_class)->dispose (object);
}
static void
-tomoe_query_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
TomoeQuery *query;
TomoeQueryPrivate *priv;
@@ -199,10 +199,10 @@
}
static void
-tomoe_query_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
TomoeQuery *query;
TomoeQueryPrivate *priv;
Modified: tomoe/trunk/lib/tomoe-reading.c
===================================================================
--- tomoe/trunk/lib/tomoe-reading.c 2007-06-07 03:30:14 UTC (rev 1306)
+++ tomoe/trunk/lib/tomoe-reading.c 2007-06-07 03:31:25 UTC (rev 1307)
@@ -52,15 +52,15 @@
G_DEFINE_TYPE (TomoeReading, tomoe_reading, G_TYPE_OBJECT)
-static void tomoe_reading_dispose (GObject *object);
-static void tomoe_reading_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void tomoe_reading_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void dispose (GObject *object);
+static void set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void
tomoe_reading_class_init (TomoeReadingClass *klass)
@@ -70,9 +70,9 @@
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->dispose = tomoe_reading_dispose;
- gobject_class->set_property = tomoe_reading_set_property;
- gobject_class->get_property = tomoe_reading_get_property;
+ gobject_class->dispose = dispose;
+ gobject_class->set_property = set_property;
+ gobject_class->get_property = get_property;
spec = g_param_spec_enum ("type",
N_("Type"),
@@ -112,7 +112,7 @@
}
static void
-tomoe_reading_dispose (GObject *object)
+dispose (GObject *object)
{
TomoeReadingPrivate *priv = TOMOE_READING_GET_PRIVATE (object);
@@ -123,10 +123,10 @@
G_OBJECT_CLASS (tomoe_reading_parent_class)->dispose (object);
}
static void
-tomoe_reading_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
TomoeReading *reading;
TomoeReadingPrivate *priv;
@@ -149,10 +149,10 @@
}
static void
-tomoe_reading_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
TomoeReading *reading;
TomoeReadingPrivate *priv;
Modified: tomoe/trunk/lib/tomoe-shelf.c
===================================================================
--- tomoe/trunk/lib/tomoe-shelf.c 2007-06-07 03:30:14 UTC (rev 1306)
+++ tomoe/trunk/lib/tomoe-shelf.c 2007-06-07 03:31:25 UTC (rev 1307)
@@ -35,7 +35,7 @@
G_DEFINE_TYPE (TomoeShelf, tomoe_shelf, G_TYPE_OBJECT)
-static void tomoe_shelf_dispose (GObject *object);
+static void dispose (GObject *object);
static void
tomoe_shelf_class_init (TomoeShelfClass *klass)
@@ -44,7 +44,7 @@
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->dispose = tomoe_shelf_dispose;
+ gobject_class->dispose = dispose;
g_type_class_add_private (gobject_class, sizeof (TomoeShelfPrivate));
}
@@ -69,7 +69,7 @@
}
static void
-tomoe_shelf_dispose (GObject *object)
+dispose (GObject *object)
{
TomoeShelfPrivate *priv = TOMOE_SHELF_GET_PRIVATE (object);
Modified: tomoe/trunk/lib/tomoe-writing.c
===================================================================
--- tomoe/trunk/lib/tomoe-writing.c 2007-06-07 03:30:14 UTC (rev 1306)
+++ tomoe/trunk/lib/tomoe-writing.c 2007-06-07 03:31:25 UTC (rev 1307)
@@ -39,7 +39,7 @@
G_DEFINE_TYPE (TomoeWriting, tomoe_writing, G_TYPE_OBJECT)
-static void tomoe_writing_dispose (GObject *object);
+static void dispose (GObject *object);
static GList *_stroke_new (gint x, gint y);
static void _stroke_free (GList *stroke);
@@ -50,7 +50,7 @@
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->dispose = tomoe_writing_dispose;
+ gobject_class->dispose = dispose;
g_type_class_add_private (gobject_class, sizeof (TomoeWritingPrivate));
}
@@ -64,7 +64,7 @@
}
static void
-tomoe_writing_dispose (GObject *object)
+dispose (GObject *object)
{
TomoeWriting *writing = TOMOE_WRITING (object);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-07 03:30:12
|
Revision: 1306
http://tomoe.svn.sourceforge.net/tomoe/?rev=1306&view=rev
Author: ikezoe
Date: 2007-06-06 20:30:14 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
* macros/python.m4, bindings/python/*, configure.ac, Makefile.am:
Python binding.
Modified Paths:
--------------
tomoe-gtk/trunk/ChangeLog
tomoe-gtk/trunk/Makefile.am
tomoe-gtk/trunk/configure.ac
Added Paths:
-----------
tomoe-gtk/trunk/bindings/
tomoe-gtk/trunk/bindings/Makefile.am
tomoe-gtk/trunk/bindings/python/
tomoe-gtk/trunk/bindings/python/Makefile.am
tomoe-gtk/trunk/bindings/python/tomoegtk-module.c
tomoe-gtk/trunk/bindings/python/tomoegtk.defs
tomoe-gtk/trunk/bindings/python/tomoegtk.override
tomoe-gtk/trunk/macros/
tomoe-gtk/trunk/macros/python.m4
Property Changed:
----------------
tomoe-gtk/trunk/
Property changes on: tomoe-gtk/trunk
___________________________________________________________________
Name: svn:ignore
- aclocal.m4
autom4te.cache
config.guess
config.log
config.status
config.sub
configure
depcomp
compile
install-sh
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
libtool
ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
stamp-h
stamp-h*
libtomoe-gtk.pc
*.bak
*~
*.log
*.rej
*.orig
+ aclocal.m4
autom4te.cache
config.guess
config.log
config.status
config.sub
configure
depcomp
compile
install-sh
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
libtool
ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
stamp-h
stamp-h*
tomoe-gtk.pc
*.bak
*~
*.log
*.rej
*.orig
gtk-doc.make
Modified: tomoe-gtk/trunk/ChangeLog
===================================================================
--- tomoe-gtk/trunk/ChangeLog 2007-06-07 03:29:46 UTC (rev 1305)
+++ tomoe-gtk/trunk/ChangeLog 2007-06-07 03:30:14 UTC (rev 1306)
@@ -1,3 +1,8 @@
+2007-06-07 Hiroyuki Ikezoe <poi...@ik...>
+
+ * macros/python.m4, bindings/python/*, configure.ac, Makefile.am:
+ Python binding.
+
2007-05-07 Takuro Ashie <as...@ho...>
* src/tomoe-char-table.c: Take care about entries which has multiple
Modified: tomoe-gtk/trunk/Makefile.am
===================================================================
--- tomoe-gtk/trunk/Makefile.am 2007-06-07 03:29:46 UTC (rev 1305)
+++ tomoe-gtk/trunk/Makefile.am 2007-06-07 03:30:14 UTC (rev 1306)
@@ -1,4 +1,4 @@
-SUBDIRS=src data po test doc
+SUBDIRS=src data po test doc bindings
EXTRA_DIST = autogen.sh tomoe-gtk.pc
Property changes on: tomoe-gtk/trunk/bindings
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Added: tomoe-gtk/trunk/bindings/Makefile.am
===================================================================
--- tomoe-gtk/trunk/bindings/Makefile.am (rev 0)
+++ tomoe-gtk/trunk/bindings/Makefile.am 2007-06-07 03:30:14 UTC (rev 1306)
@@ -0,0 +1,7 @@
+# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*-
+
+SUBDIRS =
+
+if WITH_PYTHON
+SUBDIRS += python
+endif
Property changes on: tomoe-gtk/trunk/bindings/python
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.deps
.libs
tomoegtk.c
Added: tomoe-gtk/trunk/bindings/python/Makefile.am
===================================================================
--- tomoe-gtk/trunk/bindings/python/Makefile.am (rev 0)
+++ tomoe-gtk/trunk/bindings/python/Makefile.am 2007-06-07 03:30:14 UTC (rev 1306)
@@ -0,0 +1,43 @@
+pkgpyexecdir = $(pyexecdir)/gtk-2.0
+
+pkgpyexec_LTLIBRARIES = tomoe-gtk.la
+
+INCLUDES = \
+ $(PYTHON_CFLAGS) \
+ $(PYGOBJECT_CFLAGS) \
+ $(PYGTK_CFLAGS) \
+ $(GTK2_CFLAGS) \
+ $(TOMOE_CFLAGS)
+
+nodist_tomoe_gtk_la_SOURCES = \
+ tomoegtk.c
+
+tomoe_gtk_la_SOURCES = \
+ tomoegtk-module.c
+
+tomoe_gtk_la_LDFLAGS = \
+ -module \
+ -avoid-version \
+ $(TOMOE_LDFLAGS) \
+ $(PYTHON_LDFLAGS)
+
+tomoe_gtk_la_LIBADD = \
+ $(TOMOE_LIBS) \
+ $(PYGTK_LIBS) \
+ $(top_builddir)/src/libtomoe-gtk.la
+
+OVERRIDES = \
+ tomoegtk.override
+
+tomoegtk.c: tomoegtk.defs $(OVERRIDES)
+
+CLEANFILES = tomoegtk.c
+EXTRA_DIST = tomoegtk.defs $(OVERRIDES)
+
+.defs.c:
+ (cd $(srcdir) \
+ && $(PYGTK_CODEGEN) \
+ --override $*.override \
+ --prefix py$* $*.defs) > gen-$*.c \
+ && cp gen-$*.c $*.c \
+ && rm -f gen-$*.c
Added: tomoe-gtk/trunk/bindings/python/tomoegtk-module.c
===================================================================
--- tomoe-gtk/trunk/bindings/python/tomoegtk-module.c (rev 0)
+++ tomoe-gtk/trunk/bindings/python/tomoegtk-module.c 2007-06-07 03:30:14 UTC (rev 1306)
@@ -0,0 +1,31 @@
+#include <pygobject.h>
+#include "tomoe-gtk.h"
+
+void pytomoegtk_register_classes (PyObject *d);
+
+extern PyMethodDef pytomoegtk_functions[];
+
+DL_EXPORT(void)
+inittomoegtk(void)
+{
+ PyObject *m, *d;
+
+ init_pygobject ();
+
+ m = Py_InitModule ("tomoe", pytomoegtk_functions);
+ d = PyModule_GetDict (m);
+
+ pytomoegtk_register_classes (d);
+
+ if (PyErr_Occurred ())
+ {
+ Py_FatalError ("can't initialize module globalkeys");
+ }
+
+ tomoe_gtk_init ();
+ atexit (tomoe_gtk_quit);
+}
+
+/*
+vi:ts=4:nowrap:ai:expandtab
+*/
Added: tomoe-gtk/trunk/bindings/python/tomoegtk.defs
===================================================================
--- tomoe-gtk/trunk/bindings/python/tomoegtk.defs (rev 0)
+++ tomoe-gtk/trunk/bindings/python/tomoegtk.defs 2007-06-07 03:30:14 UTC (rev 1306)
@@ -0,0 +1,576 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object Canvas
+ (in-module "Tomoe")
+ (parent "GtkWidget")
+ (c-name "TomoeCanvas")
+ (gtype-id "TOMOE_TYPE_CANVAS")
+)
+
+(define-object CharTable
+ (in-module "Tomoe")
+ (parent "GtkWidget")
+ (c-name "TomoeCharTable")
+ (gtype-id "TOMOE_TYPE_CHAR_TABLE")
+)
+
+(define-object Details
+ (in-module "Tomoe")
+ (parent "GtkDialog")
+ (c-name "TomoeDetails")
+ (gtype-id "TOMOE_TYPE_DETAILS")
+)
+
+(define-object EditChar
+ (in-module "Tomoe")
+ (parent "GtkDialog")
+ (c-name "TomoeEditChar")
+ (gtype-id "TOMOE_TYPE_EDIT_CHAR")
+)
+
+(define-object EditMeta
+ (in-module "Tomoe")
+ (parent "GtkDialog")
+ (c-name "TomoeEditMeta")
+ (gtype-id "TOMOE_TYPE_EDIT_META")
+)
+
+(define-object EditStrokes
+ (in-module "Tomoe")
+ (parent "GtkDialog")
+ (c-name "TomoeEditStrokes")
+ (gtype-id "TOMOE_TYPE_EDIT_STROKES")
+)
+
+(define-object Handwriting
+ (in-module "Tomoe")
+ (parent "GtkTable")
+ (c-name "TomoeHandwriting")
+ (gtype-id "TOMOE_TYPE_HANDWRITING")
+)
+
+(define-object ReadingSearch
+ (in-module "Tomoe")
+ (parent "GtkTable")
+ (c-name "TomoeReadingSearch")
+ (gtype-id "TOMOE_TYPE_READING_SEARCH")
+)
+
+(define-object Window
+ (in-module "Tomoe")
+ (parent "GtkWindow")
+ (c-name "TomoeWindow")
+ (gtype-id "TOMOE_TYPE_WINDOW")
+)
+
+;; Enumerations and flags ...
+
+;(define-enum CharTableLayout
+; (in-module "Tomoe")
+; (c-name "TomoeCharTableLayout")
+; (gtype-id "TOMOE_TYPE_CHAR_TABLE_LAYOUT")
+; (values
+; '("single-horizontal" "TOMOE_CHAR_TABLE_LAYOUT_SINGLE_HORIZONTAL")
+; '("single-vertical" "TOMOE_CHAR_TABLE_LAYOUT_SINGLE_VERTICAL")
+; '("horizontal" "TOMOE_CHAR_TABLE_LAYOUT_HORIZONTAL")
+; '("vertical" "TOMOE_CHAR_TABLE_LAYOUT_VERTICAL")
+; )
+;)
+
+
+;; From tomoe-canvas.h
+
+(define-function tomoe_canvas_get_type
+ (c-name "tomoe_canvas_get_type")
+ (return-type "GType")
+)
+
+(define-function tomoe_canvas_new
+ (c-name "tomoe_canvas_new")
+ (is-constructor-of "TomoeCanvas")
+ (return-type "GtkWidget*")
+)
+
+(define-method set_context
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_set_context")
+ (return-type "none")
+ (parameters
+ '("TomoeContext*" "context")
+ )
+)
+
+(define-method set_writing
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_set_writing")
+ (return-type "none")
+ (parameters
+ '("TomoeWriting*" "writing")
+ )
+)
+
+(define-method get_writing
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_get_writing")
+ (return-type "TomoeWriting*")
+)
+
+(define-method set_locked
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_set_locked")
+ (return-type "none")
+ (parameters
+ '("gboolean" "lock")
+ )
+)
+
+(define-method is_locked
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_is_locked")
+ (return-type "gboolean")
+)
+
+(define-method set_auto_find_time
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_set_auto_find_time")
+ (return-type "none")
+ (parameters
+ '("gint" "time_msec")
+ )
+)
+
+(define-method get_auto_find_time
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_get_auto_find_time")
+ (return-type "gint")
+)
+
+(define-method set_handwriting_line_color
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_set_handwriting_line_color")
+ (return-type "none")
+ (parameters
+ '("GdkColor*" "color")
+ )
+)
+
+(define-method set_adjusted_line_color
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_set_adjusted_line_color")
+ (return-type "none")
+ (parameters
+ '("GdkColor*" "color")
+ )
+)
+
+(define-method set_annotation_color
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_set_annotation_color")
+ (return-type "none")
+ (parameters
+ '("GdkColor*" "color")
+ )
+)
+
+(define-method set_axis_color
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_set_axis_color")
+ (return-type "none")
+ (parameters
+ '("GdkColor*" "color")
+ )
+)
+
+(define-method find
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_find")
+ (return-type "none")
+)
+
+(define-method get_n_candidates
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_get_n_candidates")
+ (return-type "guint")
+)
+
+(define-method get_nth_candidate
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_get_nth_candidate")
+ (return-type "TomoeChar*")
+ (parameters
+ '("guint" "nth")
+ )
+)
+
+(define-method get_candidates
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_get_candidates")
+ (return-type "const-GList*")
+)
+
+(define-method revert_stroke
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_revert_stroke")
+ (return-type "none")
+)
+
+(define-method clear
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_clear")
+ (return-type "none")
+)
+
+(define-method normalize
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_normalize")
+ (return-type "none")
+)
+
+(define-method has_stroke
+ (of-object "TomoeCanvas")
+ (c-name "tomoe_canvas_has_stroke")
+ (return-type "gboolean")
+)
+
+
+
+;; From tomoe-char-table.h
+
+(define-function tomoe_char_table_get_type
+ (c-name "tomoe_char_table_get_type")
+ (return-type "GType")
+)
+
+(define-function tomoe_char_table_new
+ (c-name "tomoe_char_table_new")
+ (is-constructor-of "TomoeCharTable")
+ (return-type "GtkWidget*")
+)
+
+(define-method get_selected
+ (of-object "TomoeCharTable")
+ (c-name "tomoe_char_table_get_selected")
+ (return-type "TomoeChar*")
+)
+
+(define-method get_layout
+ (of-object "TomoeCharTable")
+ (c-name "tomoe_char_table_get_layout")
+ (return-type "TomoeCharTableLayout")
+)
+
+(define-method set_layout
+ (of-object "TomoeCharTable")
+ (c-name "tomoe_char_table_set_layout")
+ (return-type "none")
+ (parameters
+ '("TomoeCharTableLayout" "layout")
+ )
+)
+
+(define-method set_model
+ (of-object "TomoeCharTable")
+ (c-name "tomoe_char_table_set_model")
+ (return-type "none")
+ (parameters
+ '("GtkTreeModel*" "model")
+ )
+)
+
+(define-method get_model
+ (of-object "TomoeCharTable")
+ (c-name "tomoe_char_table_get_model")
+ (return-type "GtkTreeModel*")
+)
+
+(define-method set_canvas
+ (of-object "TomoeCharTable")
+ (c-name "tomoe_char_table_set_canvas")
+ (return-type "none")
+ (parameters
+ '("TomoeCanvas*" "canvas")
+ )
+)
+
+
+
+;; From tomoe-details.h
+
+(define-function tomoe_details_get_type
+ (c-name "tomoe_details_get_type")
+ (return-type "GType")
+)
+
+(define-function tomoe_details_new
+ (c-name "tomoe_details_new")
+ (is-constructor-of "TomoeDetails")
+ (return-type "GtkWidget*")
+ (parameters
+ '("TomoeChar*" "chr")
+ '("TomoeDict*" "dict")
+ )
+)
+
+
+
+;; From tomoe-edit-char.h
+
+(define-function tomoe_edit_char_get_type
+ (c-name "tomoe_edit_char_get_type")
+ (return-type "GType")
+)
+
+(define-function tomoe_edit_char_new
+ (c-name "tomoe_edit_char_new")
+ (is-constructor-of "TomoeEditChar")
+ (return-type "GtkWidget*")
+ (parameters
+ '("TomoeChar*" "chr")
+ '("TomoeDict*" "dict")
+ )
+)
+
+
+
+;; From tomoe-edit-meta.h
+
+(define-function tomoe_edit_meta_get_type
+ (c-name "tomoe_edit_meta_get_type")
+ (return-type "GType")
+)
+
+(define-function tomoe_edit_meta_new
+ (c-name "tomoe_edit_meta_new")
+ (is-constructor-of "TomoeEditMeta")
+ (return-type "GtkWidget*")
+ (parameters
+ '("TomoeChar*" "chr")
+ )
+)
+
+
+
+;; From tomoe-edit-strokes.h
+
+(define-function tomoe_edit_strokes_get_type
+ (c-name "tomoe_edit_strokes_get_type")
+ (return-type "GType")
+)
+
+(define-function tomoe_edit_strokes_new
+ (c-name "tomoe_edit_strokes_new")
+ (is-constructor-of "TomoeEditStrokes")
+ (return-type "GtkWidget*")
+ (parameters
+ '("TomoeChar*" "chr")
+ )
+)
+
+
+
+;; From tomoe-handwriting.h
+
+(define-function tomoe_handwriting_get_type
+ (c-name "tomoe_handwriting_get_type")
+ (return-type "GType")
+)
+
+(define-function tomoe_handwriting_new
+ (c-name "tomoe_handwriting_new")
+ (is-constructor-of "TomoeHandwriting")
+ (return-type "GtkWidget*")
+ (parameters
+ '("TomoeContext*" "context")
+ )
+)
+
+(define-method get_canvas
+ (of-object "TomoeHandwriting")
+ (c-name "tomoe_handwriting_get_canvas")
+ (return-type "GtkWidget*")
+)
+
+(define-method get_button_area
+ (of-object "TomoeHandwriting")
+ (c-name "tomoe_handwriting_get_button_area")
+ (return-type "GtkWidget*")
+)
+
+(define-method get_char_table
+ (of-object "TomoeHandwriting")
+ (c-name "tomoe_handwriting_get_char_table")
+ (return-type "GtkWidget*")
+)
+
+(define-method get_selected_char
+ (of-object "TomoeHandwriting")
+ (c-name "tomoe_handwriting_get_selected_char")
+ (return-type "const-gchar*")
+)
+
+(define-method get_selected_tomoe_char
+ (of-object "TomoeHandwriting")
+ (c-name "tomoe_handwriting_get_selected_tomoe_char")
+ (return-type "TomoeChar*")
+)
+
+
+
+;; From tomoe-reading-search.h
+
+(define-function tomoe_reading_search_get_type
+ (c-name "tomoe_reading_search_get_type")
+ (return-type "GType")
+)
+
+(define-function tomoe_reading_search_new
+ (c-name "tomoe_reading_search_new")
+ (is-constructor-of "TomoeReadingSearch")
+ (return-type "GtkWidget*")
+ (parameters
+ '("TomoeContext*" "context")
+ )
+)
+
+(define-method get_selected_char
+ (of-object "TomoeReadingSearch")
+ (c-name "tomoe_reading_search_get_selected_char")
+ (return-type "const-gchar*")
+)
+
+(define-method get_selected_tomoe_char
+ (of-object "TomoeReadingSearch")
+ (c-name "tomoe_reading_search_get_selected_tomoe_char")
+ (return-type "TomoeChar*")
+)
+
+
+
+;; From tomoe-window.h
+
+(define-function tomoe_window_get_type
+ (c-name "tomoe_window_get_type")
+ (return-type "GType")
+)
+
+(define-function tomoe_window_new
+ (c-name "tomoe_window_new")
+ (is-constructor-of "TomoeWindow")
+ (return-type "GtkWidget*")
+)
+
+(define-method get_notebook
+ (of-object "TomoeWindow")
+ (c-name "tomoe_window_get_notebook")
+ (return-type "GtkWidget*")
+)
+
+(define-method append_page
+ (of-object "TomoeWindow")
+ (c-name "tomoe_window_append_page")
+ (return-type "none")
+ (parameters
+ '("GtkWidget*" "page")
+ '("GtkWidget*" "label")
+ '("const-gchar*" "label_text")
+ )
+)
+
+(define-method get_handwriting_page
+ (of-object "TomoeWindow")
+ (c-name "tomoe_window_get_handwriting_page")
+ (return-type "GtkWidget*")
+)
+
+(define-method get_reading_search_page
+ (of-object "TomoeWindow")
+ (c-name "tomoe_window_get_reading_search_page")
+ (return-type "GtkWidget*")
+)
+
+(define-method get_gucharmap_page
+ (of-object "TomoeWindow")
+ (c-name "tomoe_window_get_gucharmap_page")
+ (return-type "GtkWidget*")
+)
+
+(define-method get_selected_char
+ (of-object "TomoeWindow")
+ (c-name "tomoe_window_get_selected_char")
+ (return-type "const-gchar*")
+)
+
+(define-method get_selected_tomoe_char
+ (of-object "TomoeWindow")
+ (c-name "tomoe_window_get_selected_tomoe_char")
+ (return-type "TomoeChar*")
+)
+
+
+
+;; From tomoe-scrollable.h
+
+(define-function tomoe_scrollable_get_type
+ (c-name "tomoe_scrollable_get_type")
+ (return-type "GType")
+)
+
+(define-function tomoe_scrollable_setup_widget_class
+ (c-name "tomoe_scrollable_setup_widget_class")
+ (return-type "none")
+ (parameters
+ '("GtkWidgetClass*" "klass")
+ )
+)
+
+(define-method set_adjustments
+ (of-object "TomoeScrollable")
+ (c-name "tomoe_scrollable_set_adjustments")
+ (return-type "none")
+ (parameters
+ '("GtkAdjustment*" "h_adj")
+ '("GtkAdjustment*" "v_adj")
+ )
+)
+
+(define-method set_own_adjustments
+ (of-object "TomoeScrollable")
+ (c-name "tomoe_scrollable_set_own_adjustments")
+ (return-type "none")
+)
+
+(define-method get_adjustments
+ (of-object "TomoeScrollable")
+ (c-name "tomoe_scrollable_get_adjustments")
+ (return-type "none")
+ (parameters
+ '("GtkAdjustment**" "h_adj")
+ '("GtkAdjustment**" "v_adj")
+ )
+)
+
+(define-method h_page_up
+ (of-object "TomoeScrollable")
+ (c-name "tomoe_scrollable_h_page_up")
+ (return-type "none")
+)
+
+(define-method h_page_down
+ (of-object "TomoeScrollable")
+ (c-name "tomoe_scrollable_h_page_down")
+ (return-type "none")
+)
+
+(define-method v_page_up
+ (of-object "TomoeScrollable")
+ (c-name "tomoe_scrollable_v_page_up")
+ (return-type "none")
+)
+
+(define-method v_page_down
+ (of-object "TomoeScrollable")
+ (c-name "tomoe_scrollable_v_page_down")
+ (return-type "none")
+)
+
+
Added: tomoe-gtk/trunk/bindings/python/tomoegtk.override
===================================================================
--- tomoe-gtk/trunk/bindings/python/tomoegtk.override (rev 0)
+++ tomoe-gtk/trunk/bindings/python/tomoegtk.override 2007-06-07 03:30:14 UTC (rev 1306)
@@ -0,0 +1,21 @@
+%%
+headers
+#define NO_IMPORT_PYGOBJECT
+#include <pygobject.h>
+#include <pygtk/pygtk.h>
+#include "tomoe-gtk.h"
+%%
+modulename tomoegtk
+%%
+import gobject.GObject as PyGObject_Type
+import gtk.Widget as PyGtkWidget_Type
+import gtk.Window as PyGtkWindow_Type
+import gtk.Table as PyGtkTable_Type
+import gtk.Dialog as PyGtkDialog_Type
+%%
+ignore-glob
+ *_get_type
+%%
+new-constructor TOMOE_TYPE_DETAILS
+new-constructor TOMOE_TYPE_EDIT_CHAR
+%%
Modified: tomoe-gtk/trunk/configure.ac
===================================================================
--- tomoe-gtk/trunk/configure.ac 2007-06-07 03:29:46 UTC (rev 1305)
+++ tomoe-gtk/trunk/configure.ac 2007-06-07 03:30:14 UTC (rev 1306)
@@ -110,6 +110,9 @@
AC_SUBST(TOMOE_REQUIRED_LIBS)
AM_CONDITIONAL([USE_GUCHARMAP], [test x"$use_gucharmap" = "xyes"])
+# Check for pygtk
+PYTHON_CHECK
+
# Checks for gtk-doc
GTK_DOC_CHECK([1.4])
@@ -180,6 +183,8 @@
doc/Makefile
doc/reference/Makefile
doc/reference/version.xml
+bindings/Makefile
+bindings/python/Makefile
tomoe-gtk.pc
])
@@ -192,6 +197,10 @@
echo
echo "Configure Result:"
echo
+echo " * Language Bindings"
+echo
+echo " Python : ${with_pygtk}"
+echo
echo " Use gucharmap : ${use_gucharmap}"
echo " Use gtk-doc : ${enable_gtk_doc}"
echo
Added: tomoe-gtk/trunk/macros/python.m4
===================================================================
--- tomoe-gtk/trunk/macros/python.m4 (rev 0)
+++ tomoe-gtk/trunk/macros/python.m4 2007-06-07 03:30:14 UTC (rev 1306)
@@ -0,0 +1,56 @@
+# -*- autoconf -*-
+AC_DEFUN([PYTHON_CHECK],
+[
+python_available="no"
+AC_ARG_WITH([python],
+ AS_HELP_STRING([--with-python=PATH],
+ [Python interpreter path (default: auto-detect)]),
+ [PYTHON="$withval"])
+
+if test "$PYTHON" = "no"; then
+ : # ignore
+elif test "$PYTHON" = ""; then
+ AM_PATH_PYTHON
+ if test "$PYTHON" != "none"; then
+ python_available="yes"
+ fi
+else
+ AC_CHECK_FILE([$PYTHON],
+ [python_available="yes"],
+ [AC_MSG_WARN([$PYTHON is not found. Disable PYTHON binding.])])
+fi
+
+if test "$python_available" = "yes"; then
+ PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
+ PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
+ PYTHON_LIBS="-lpython$PYTHON_VERSION"
+ PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config"
+ PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
+
+ PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0)
+
+ AC_SUBST(PYTHON_CFLAGS)
+ AC_SUBST(PYTHON_LIBS)
+ AC_SUBST(PYTHON_LDFLAGS)
+
+ AC_SUBST(PYGOBJECT_CFLAGS)
+
+ python_undef_package_macros="
+#undef PACKAGE_NAME
+#undef PACKAGE_TARNAME
+#undef PACKAGE_STRING
+#undef PACKAGE_VERSION
+"
+ python_disable_message="Disable Python binding."
+ CFLAGS="$CFLAGS $PYTHON_CFLAGS"
+ AC_CHECK_HEADERS(Python.h, [],
+ [python_available="no"
+ AC_MSG_WARN([$python_disable_message])],
+ [$python_undef_package_macros])
+ CFLAGS=$_SAVE_CFLAGS
+
+ AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, [python_avairable="no"])
+fi
+
+AM_CONDITIONAL([WITH_PYTHON], [test "$python_available" = "yes"])
+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-07 03:29:48
|
Revision: 1305
http://tomoe.svn.sourceforge.net/tomoe/?rev=1305&view=rev
Author: ikezoe
Date: 2007-06-06 20:29:46 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
orz.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-06-07 01:21:35 UTC (rev 1304)
+++ tomoe/trunk/ChangeLog 2007-06-07 03:29:46 UTC (rev 1305)
@@ -3,7 +3,7 @@
* bindings/python/tomoe-dict.override,
bindings/python/tomoe-recognizer.override: TomoeDict and
TomoeRecognizer object can be created.
- tomoe.Dict("XML", filename) or tomoe.Dict("Unihan").
+ tomoe.Dict("XML", "filename", "/usr/share/tomoe/handwriting.xml") or tomoe.Dict("Unihan").
2007-06-06 Hiroyuki Ikezoe <poi...@ik...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-07 01:21:34
|
Revision: 1304
http://tomoe.svn.sourceforge.net/tomoe/?rev=1304&view=rev
Author: ikezoe
Date: 2007-06-06 18:21:35 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
insert a space.
Modified Paths:
--------------
tomoe/trunk/bindings/python/tomoe-module.c
Modified: tomoe/trunk/bindings/python/tomoe-module.c
===================================================================
--- tomoe/trunk/bindings/python/tomoe-module.c 2007-06-07 00:59:42 UTC (rev 1303)
+++ tomoe/trunk/bindings/python/tomoe-module.c 2007-06-07 01:21:35 UTC (rev 1304)
@@ -23,7 +23,7 @@
}
tomoe_init ();
- atexit(tomoe_quit);
+ atexit (tomoe_quit);
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-07 00:59:40
|
Revision: 1303
http://tomoe.svn.sourceforge.net/tomoe/?rev=1303&view=rev
Author: ikezoe
Date: 2007-06-06 17:59:42 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
* bindings/python/tomoe-dict.override,
bindings/python/tomoe-recognizer.override: TomoeDict and
TomoeRecognizer object can be created.
tomoe.Dict("XML", filename) or tomoe.Dict("Unihan").
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/bindings/python/tomoe-dict.override
tomoe/trunk/bindings/python/tomoe-recognizer.override
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-06-06 23:09:40 UTC (rev 1302)
+++ tomoe/trunk/ChangeLog 2007-06-07 00:59:42 UTC (rev 1303)
@@ -1,3 +1,10 @@
+2007-06-07 Hiroyuki Ikezoe <poi...@ik...>
+
+ * bindings/python/tomoe-dict.override,
+ bindings/python/tomoe-recognizer.override: TomoeDict and
+ TomoeRecognizer object can be created.
+ tomoe.Dict("XML", filename) or tomoe.Dict("Unihan").
+
2007-06-06 Hiroyuki Ikezoe <poi...@ik...>
* lib/tomoe-config.c: Invoke tomoe_config_load() in constructor since
Modified: tomoe/trunk/bindings/python/tomoe-dict.override
===================================================================
--- tomoe/trunk/bindings/python/tomoe-dict.override 2007-06-06 23:09:40 UTC (rev 1302)
+++ tomoe/trunk/bindings/python/tomoe-dict.override 2007-06-07 00:59:42 UTC (rev 1303)
@@ -26,23 +26,32 @@
if ((len = PyTuple_Size(args)) < 1) {
PyErr_SetString(PyExc_TypeError, "requires at least one argument");
- return 0;
+ return -1;
}
first_arg = PyTuple_GetItem(args, 0);
if (!PyString_Check(first_arg)) {
PyErr_SetString(PyExc_TypeError,
"first argument should be a string");
- return 0;
+ return -1;
}
- dict_name = PyString_AsString(first_arg);
+ dict_name = g_ascii_strdown(PyString_AsString(first_arg), PyString_Size(first_arg));
module = tomoe_dict_load_module(dict_name);
+ type_name = g_strconcat("TomoeDict", PyString_AsString(first_arg), NULL);
+ g_free(dict_name);
- type_name = g_strconcat("TomoeDict", dict_name, NULL);
obj_type = g_type_from_name(type_name);
- if (!obj_type)
- return 0;
+ if (!obj_type) {
+ gchar buf[512];
+ g_snprintf(buf, sizeof(buf),
+ "%s does not exist",
+ type_name);
+ PyErr_SetString(PyExc_TypeError, buf);
+ g_free(type_name);
+ return -1;
+ }
+ g_free(type_name);
params = g_new0(GParameter, len / 2);
@@ -79,7 +88,12 @@
pyg_value_from_pyobject(¶ms[n].value, (PyObject*)py_value);
}
- ret = pygobject_constructv(self, n, params);
+ if (self->obj == NULL) {
+ GObject *obj;
+ obj = g_object_newv(obj_type, n, params);
+ self->obj = obj;
+ pygobject_register_wrapper((PyObject *) self);
+ }
END:
while (n--)
@@ -110,3 +124,4 @@
return py_cands;
}
+%%
Modified: tomoe/trunk/bindings/python/tomoe-recognizer.override
===================================================================
--- tomoe/trunk/bindings/python/tomoe-recognizer.override 2007-06-06 23:09:40 UTC (rev 1302)
+++ tomoe/trunk/bindings/python/tomoe-recognizer.override 2007-06-07 00:59:42 UTC (rev 1303)
@@ -11,11 +11,96 @@
tomoe_recognizer_get_log_domains
%%
override tomoe_recognizer_new
-static PyObject *
+static int
_wrap_tomoe_recognizer_new(PyGObject *self, PyObject *args)
{
- /* NOT IMPLEMENTED YET */
- return NULL;
+ PyObject *first_arg;
+ TomoeModule *module;
+ gchar *recognizer_name, *type_name;
+ GObjectClass *class;
+ GType obj_type;
+ GParameter *params;
+ guint i, len, n;
+ int ret = 0;
+
+ if ((len = PyTuple_Size(args)) < 1) {
+ PyErr_SetString(PyExc_TypeError, "requires at least one argument");
+ return -1;
+ }
+
+ first_arg = PyTuple_GetItem(args, 0);
+ if (!PyString_Check(first_arg)) {
+ PyErr_SetString(PyExc_TypeError,
+ "first argument should be a string");
+ return -1;
+ }
+
+ recognizer_name = g_ascii_strdown(PyString_AsString(first_arg), PyString_Size(first_arg));
+ module = tomoe_recognizer_load_module(recognizer_name);
+ type_name = g_strconcat("TomoeRecognizer", PyString_AsString(first_arg), NULL);
+ g_free(recognizer_name);
+
+ obj_type = g_type_from_name(type_name);
+ if (!obj_type) {
+ gchar buf[512];
+ g_snprintf(buf, sizeof(buf),
+ "%s does not exist",
+ type_name);
+ PyErr_SetString(PyExc_TypeError, buf);
+ g_free(type_name);
+ return -1;
+ }
+ g_free(type_name);
+
+ params = g_new0(GParameter, len / 2);
+
+ class = g_type_class_ref(obj_type);
+ for (i = 1, n = 0; i < len; i+=2, n++) {
+ PyObject *py_property = PyTuple_GetItem(args, i);
+ PyObject *py_value = PyTuple_GetItem(args, i + 1);
+ gchar *property_name;
+ GParamSpec *pspec;
+
+ if (!PyString_Check(py_property)) {
+ PyErr_SetString(PyExc_TypeError,
+ "Expected string argument for property.");
+ goto END;
+ }
+
+ property_name = PyString_AsString(py_property);
+
+ pspec = g_object_class_find_property(class, property_name);
+ if (!pspec) {
+ gchar buf[512];
+ g_snprintf(buf, sizeof(buf),
+ "%s does not support property `%s'",
+ g_type_name(obj_type),
+ property_name);
+ PyErr_SetString(PyExc_TypeError, buf);
+
+ goto END;
+ }
+
+ params[n].name = property_name;
+ params[n].value.g_type = 0;
+ g_value_init(¶ms[n].value, G_PARAM_SPEC_VALUE_TYPE(pspec));
+ pyg_value_from_pyobject(¶ms[n].value, (PyObject*)py_value);
+ }
+
+ if (self->obj == NULL) {
+ GObject *obj;
+ obj = g_object_newv(obj_type, n, params);
+ self->obj = obj;
+ pygobject_register_wrapper((PyObject *) self);
+ }
+
+END:
+ while (n--)
+ g_value_unset(¶ms[n].value);
+ g_free(params);
+ g_type_class_unref(class);
+
+ return ret;
}
%%
override tomoe_recognizer_search kwargs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 23:09:40
|
Revision: 1302
http://tomoe.svn.sourceforge.net/tomoe/?rev=1302&view=rev
Author: ikezoe
Date: 2007-06-06 16:09:40 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
tomoe's one.
Modified Paths:
--------------
tomoe-gtk/trunk/autogen.sh
Modified: tomoe-gtk/trunk/autogen.sh
===================================================================
--- tomoe-gtk/trunk/autogen.sh 2007-06-06 12:15:54 UTC (rev 1301)
+++ tomoe-gtk/trunk/autogen.sh 2007-06-06 23:09:40 UTC (rev 1302)
@@ -1,12 +1,21 @@
#!/bin/sh
-libtoolize --copy --force \
- && gtkdocize \
- && aclocal \
- && autoheader \
- && automake --add-missing --foreign --copy
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
-glib-gettextize --copy --force
-autoconf
+run()
+{
+ $@
+ if test $? -ne 0; then
+ echo "Failed $@"
+ exit 1
+ fi
+}
-/bin/rm -rf autom4te.cache
+run libtoolize --copy --force
+run glib-gettextize --force --copy
+run gtkdocize --copy
+run aclocal -I macros
+run autoheader
+run automake --add-missing --foreign --copy
+run autoconf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-06-06 12:18:36
|
Revision: 1301
http://tomoe.svn.sourceforge.net/tomoe/?rev=1301&view=rev
Author: makeinu
Date: 2007-06-06 05:15:54 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
2400/3390 has been finished.
Modified Paths:
--------------
tools/stroke-editor/data/ja/jis-x-0208-level2.xml
Modified: tools/stroke-editor/data/ja/jis-x-0208-level2.xml
===================================================================
--- tools/stroke-editor/data/ja/jis-x-0208-level2.xml 2007-06-06 11:34:49 UTC (rev 1300)
+++ tools/stroke-editor/data/ja/jis-x-0208-level2.xml 2007-06-06 12:15:54 UTC (rev 1301)
@@ -32806,63 +32806,60 @@
<point x="325" y="696"/>
</stroke>
<stroke>
- <point x="570" y="155"/>
- <point x="410" y="222"/>
+ <point x="605" y="252"/>
+ <point x="710" y="254"/>
</stroke>
<stroke>
- <point x="418" y="220"/>
- <point x="425" y="638"/>
+ <point x="603" y="155"/>
+ <point x="590" y="353"/>
+ <point x="688" y="362"/>
+ <point x="685" y="636"/>
</stroke>
<stroke>
- <point x="700" y="203"/>
- <point x="840" y="192"/>
- <point x="848" y="653"/>
+ <point x="590" y="459"/>
+ <point x="593" y="629"/>
</stroke>
<stroke>
- <point x="433" y="347"/>
- <point x="535" y="345"/>
+ <point x="520" y="166"/>
+ <point x="438" y="213"/>
</stroke>
<stroke>
- <point x="743" y="349"/>
- <point x="868" y="345"/>
+ <point x="440" y="216"/>
+ <point x="440" y="644"/>
</stroke>
<stroke>
- <point x="433" y="494"/>
- <point x="530" y="496"/>
+ <point x="450" y="347"/>
+ <point x="508" y="341"/>
</stroke>
<stroke>
- <point x="755" y="506"/>
- <point x="888" y="500"/>
+ <point x="448" y="491"/>
+ <point x="538" y="485"/>
</stroke>
<stroke>
- <point x="600" y="254"/>
- <point x="743" y="250"/>
+ <point x="730" y="207"/>
+ <point x="835" y="213"/>
+ <point x="840" y="653"/>
</stroke>
<stroke>
- <point x="593" y="159"/>
- <point x="588" y="373"/>
+ <point x="743" y="336"/>
+ <point x="810" y="343"/>
</stroke>
<stroke>
- <point x="563" y="375"/>
- <point x="725" y="358"/>
- <point x="698" y="651"/>
+ <point x="733" y="494"/>
+ <point x="828" y="489"/>
</stroke>
<stroke>
- <point x="605" y="453"/>
- <point x="595" y="642"/>
+ <point x="358" y="651"/>
+ <point x="945" y="651"/>
</stroke>
<stroke>
- <point x="343" y="664"/>
- <point x="943" y="642"/>
+ <point x="530" y="700"/>
+ <point x="418" y="843"/>
</stroke>
<stroke>
- <point x="508" y="711"/>
- <point x="403" y="864"/>
+ <point x="733" y="703"/>
+ <point x="823" y="830"/>
</stroke>
- <stroke>
- <point x="715" y="713"/>
- <point x="880" y="836"/>
- </stroke>
</strokes>
</character>
<character>
@@ -50362,6 +50359,22 @@
<point x="302" y="461"/>
</stroke>
<stroke>
+ <point x="683" y="151"/>
+ <point x="589" y="265"/>
+ </stroke>
+ <stroke>
+ <point x="603" y="172"/>
+ <point x="686" y="259"/>
+ </stroke>
+ <stroke>
+ <point x="673" y="319"/>
+ <point x="549" y="379"/>
+ </stroke>
+ <stroke>
+ <point x="589" y="300"/>
+ <point x="686" y="381"/>
+ </stroke>
+ <stroke>
<point x="539" y="149"/>
<point x="394" y="196"/>
</stroke>
@@ -50370,43 +50383,27 @@
<point x="404" y="397"/>
</stroke>
<stroke>
- <point x="711" y="183"/>
- <point x="845" y="185"/>
- <point x="848" y="405"/>
- </stroke>
- <stroke>
<point x="404" y="261"/>
<point x="524" y="265"/>
</stroke>
<stroke>
- <point x="716" y="263"/>
- <point x="850" y="265"/>
- </stroke>
- <stroke>
<point x="439" y="338"/>
<point x="564" y="336"/>
</stroke>
<stroke>
- <point x="728" y="332"/>
- <point x="858" y="319"/>
+ <point x="711" y="183"/>
+ <point x="845" y="185"/>
+ <point x="848" y="405"/>
</stroke>
<stroke>
- <point x="683" y="151"/>
- <point x="589" y="265"/>
+ <point x="716" y="263"/>
+ <point x="850" y="265"/>
</stroke>
<stroke>
- <point x="603" y="172"/>
- <point x="686" y="259"/>
+ <point x="728" y="332"/>
+ <point x="858" y="319"/>
</stroke>
<stroke>
- <point x="673" y="319"/>
- <point x="549" y="379"/>
- </stroke>
- <stroke>
- <point x="589" y="300"/>
- <point x="686" y="381"/>
- </stroke>
- <stroke>
<point x="324" y="409"/>
<point x="337" y="515"/>
</stroke>
@@ -51500,6 +51497,20 @@
<utf8>擧</utf8>
<strokes>
<stroke>
+ <point x="464" y="207"/>
+ <point x="606" y="198"/>
+ </stroke>
+ <stroke>
+ <point x="450" y="131"/>
+ <point x="445" y="287"/>
+ <point x="600" y="278"/>
+ <point x="583" y="429"/>
+ </stroke>
+ <stroke>
+ <point x="454" y="343"/>
+ <point x="454" y="433"/>
+ </stroke>
+ <stroke>
<point x="342" y="119"/>
<point x="185" y="185"/>
</stroke>
@@ -51508,41 +51519,27 @@
<point x="177" y="438"/>
</stroke>
<stroke>
- <point x="651" y="194"/>
- <point x="825" y="192"/>
- <point x="828" y="453"/>
- </stroke>
- <stroke>
<point x="200" y="269"/>
<point x="329" y="269"/>
</stroke>
<stroke>
- <point x="641" y="254"/>
- <point x="850" y="259"/>
- </stroke>
- <stroke>
<point x="197" y="353"/>
<point x="339" y="356"/>
</stroke>
<stroke>
- <point x="666" y="349"/>
- <point x="843" y="356"/>
+ <point x="651" y="194"/>
+ <point x="825" y="192"/>
+ <point x="828" y="453"/>
</stroke>
<stroke>
- <point x="464" y="207"/>
- <point x="606" y="198"/>
+ <point x="641" y="254"/>
+ <point x="850" y="259"/>
</stroke>
<stroke>
- <point x="450" y="131"/>
- <point x="445" y="287"/>
- <point x="600" y="278"/>
- <point x="583" y="429"/>
+ <point x="666" y="349"/>
+ <point x="843" y="356"/>
</stroke>
<stroke>
- <point x="454" y="343"/>
- <point x="454" y="433"/>
- </stroke>
- <stroke>
<point x="57" y="442"/>
<point x="943" y="440"/>
</stroke>
@@ -51581,73 +51578,71 @@
<utf8>舉</utf8>
<strokes>
<stroke>
- <point x="334" y="134"/>
- <point x="197" y="216"/>
+ <point x="450" y="200"/>
+ <point x="585" y="200"/>
</stroke>
<stroke>
- <point x="209" y="200"/>
- <point x="195" y="448"/>
+ <point x="435" y="134"/>
+ <point x="443" y="287"/>
+ <point x="565" y="291"/>
+ <point x="558" y="472"/>
</stroke>
<stroke>
- <point x="638" y="196"/>
- <point x="813" y="192"/>
- <point x="796" y="448"/>
+ <point x="448" y="353"/>
+ <point x="445" y="466"/>
</stroke>
<stroke>
- <point x="232" y="289"/>
- <point x="357" y="289"/>
+ <point x="353" y="140"/>
+ <point x="208" y="196"/>
</stroke>
<stroke>
- <point x="646" y="280"/>
- <point x="815" y="284"/>
+ <point x="215" y="192"/>
+ <point x="210" y="455"/>
</stroke>
<stroke>
- <point x="222" y="379"/>
- <point x="354" y="373"/>
+ <point x="223" y="269"/>
+ <point x="350" y="278"/>
</stroke>
<stroke>
- <point x="661" y="371"/>
- <point x="808" y="371"/>
+ <point x="230" y="360"/>
+ <point x="343" y="366"/>
</stroke>
<stroke>
- <point x="469" y="205"/>
- <point x="616" y="198"/>
+ <point x="643" y="192"/>
+ <point x="808" y="196"/>
+ <point x="790" y="448"/>
</stroke>
<stroke>
- <point x="458" y="140"/>
- <point x="450" y="291"/>
- <point x="590" y="291"/>
- <point x="578" y="442"/>
+ <point x="680" y="274"/>
+ <point x="788" y="278"/>
</stroke>
<stroke>
- <point x="461" y="343"/>
- <point x="466" y="461"/>
+ <point x="665" y="375"/>
+ <point x="793" y="377"/>
</stroke>
<stroke>
- <point x="30" y="470"/>
- <point x="943" y="438"/>
+ <point x="95" y="470"/>
+ <point x="928" y="472"/>
</stroke>
<stroke>
- <point x="312" y="498"/>
- <point x="200" y="601"/>
- <point x="67" y="666"/>
+ <point x="343" y="472"/>
+ <point x="95" y="642"/>
</stroke>
<stroke>
- <point x="678" y="459"/>
- <point x="773" y="558"/>
- <point x="968" y="619"/>
+ <point x="685" y="485"/>
+ <point x="923" y="638"/>
</stroke>
<stroke>
- <point x="312" y="610"/>
- <point x="691" y="612"/>
+ <point x="313" y="601"/>
+ <point x="710" y="608"/>
</stroke>
<stroke>
- <point x="195" y="731"/>
- <point x="803" y="720"/>
+ <point x="190" y="718"/>
+ <point x="835" y="718"/>
</stroke>
<stroke>
- <point x="476" y="470"/>
- <point x="504" y="871"/>
+ <point x="498" y="504"/>
+ <point x="505" y="869"/>
</stroke>
</strokes>
</character>
@@ -68961,6 +68956,20 @@
<point x="305" y="560"/>
</stroke>
<stroke>
+ <point x="573" y="211"/>
+ <point x="715" y="209"/>
+ </stroke>
+ <stroke>
+ <point x="570" y="155"/>
+ <point x="570" y="293"/>
+ <point x="673" y="278"/>
+ <point x="668" y="466"/>
+ </stroke>
+ <stroke>
+ <point x="578" y="347"/>
+ <point x="580" y="450"/>
+ </stroke>
+ <stroke>
<point x="513" y="159"/>
<point x="430" y="213"/>
</stroke>
@@ -68969,41 +68978,27 @@
<point x="398" y="474"/>
</stroke>
<stroke>
- <point x="730" y="196"/>
- <point x="865" y="194"/>
- <point x="848" y="470"/>
- </stroke>
- <stroke>
<point x="418" y="284"/>
<point x="508" y="282"/>
</stroke>
<stroke>
- <point x="738" y="287"/>
- <point x="853" y="287"/>
- </stroke>
- <stroke>
<point x="400" y="384"/>
<point x="513" y="381"/>
</stroke>
<stroke>
- <point x="753" y="384"/>
- <point x="880" y="384"/>
+ <point x="730" y="196"/>
+ <point x="865" y="194"/>
+ <point x="848" y="470"/>
</stroke>
<stroke>
- <point x="573" y="211"/>
- <point x="715" y="209"/>
+ <point x="738" y="287"/>
+ <point x="853" y="287"/>
</stroke>
<stroke>
- <point x="570" y="155"/>
- <point x="570" y="293"/>
- <point x="673" y="278"/>
- <point x="668" y="466"/>
+ <point x="753" y="384"/>
+ <point x="880" y="384"/>
</stroke>
<stroke>
- <point x="578" y="347"/>
- <point x="580" y="450"/>
- </stroke>
- <stroke>
<point x="295" y="463"/>
<point x="923" y="453"/>
</stroke>
@@ -70462,81 +70457,78 @@
<utf8>歟</utf8>
<strokes>
<stroke>
- <point x="258" y="164"/>
- <point x="128" y="220"/>
+ <point x="313" y="244"/>
+ <point x="418" y="244"/>
</stroke>
<stroke>
- <point x="133" y="211"/>
- <point x="120" y="649"/>
+ <point x="303" y="157"/>
+ <point x="290" y="343"/>
+ <point x="393" y="341"/>
+ <point x="400" y="631"/>
</stroke>
<stroke>
- <point x="443" y="218"/>
- <point x="563" y="213"/>
+ <point x="295" y="425"/>
+ <point x="300" y="625"/>
</stroke>
<stroke>
- <point x="560" y="216"/>
- <point x="535" y="649"/>
+ <point x="233" y="181"/>
+ <point x="130" y="216"/>
</stroke>
<stroke>
- <point x="133" y="356"/>
- <point x="208" y="356"/>
+ <point x="128" y="220"/>
+ <point x="138" y="614"/>
</stroke>
<stroke>
- <point x="455" y="356"/>
- <point x="558" y="356"/>
+ <point x="150" y="351"/>
+ <point x="223" y="349"/>
</stroke>
<stroke>
- <point x="133" y="491"/>
- <point x="223" y="494"/>
+ <point x="155" y="500"/>
+ <point x="228" y="496"/>
</stroke>
<stroke>
- <point x="438" y="494"/>
- <point x="548" y="487"/>
+ <point x="445" y="207"/>
+ <point x="540" y="209"/>
+ <point x="540" y="642"/>
</stroke>
<stroke>
- <point x="313" y="233"/>
- <point x="418" y="233"/>
+ <point x="443" y="345"/>
+ <point x="530" y="347"/>
</stroke>
<stroke>
- <point x="290" y="162"/>
- <point x="275" y="347"/>
- <point x="388" y="345"/>
- <point x="393" y="629"/>
+ <point x="428" y="494"/>
+ <point x="540" y="496"/>
</stroke>
<stroke>
- <point x="293" y="429"/>
- <point x="295" y="636"/>
+ <point x="53" y="638"/>
+ <point x="603" y="636"/>
</stroke>
<stroke>
- <point x="30" y="659"/>
- <point x="620" y="625"/>
+ <point x="203" y="690"/>
+ <point x="65" y="830"/>
</stroke>
<stroke>
- <point x="233" y="679"/>
- <point x="90" y="834"/>
+ <point x="378" y="683"/>
+ <point x="443" y="821"/>
</stroke>
<stroke>
- <point x="393" y="692"/>
- <point x="493" y="802"/>
+ <point x="700" y="162"/>
+ <point x="600" y="457"/>
</stroke>
<stroke>
- <point x="723" y="159"/>
- <point x="628" y="416"/>
+ <point x="630" y="295"/>
+ <point x="895" y="289"/>
+ <point x="808" y="446"/>
</stroke>
<stroke>
- <point x="655" y="306"/>
- <point x="880" y="289"/>
- <point x="813" y="472"/>
+ <point x="768" y="295"/>
+ <point x="738" y="550"/>
+ <point x="588" y="804"/>
</stroke>
<stroke>
- <point x="775" y="317"/>
- <point x="740" y="534"/>
- <point x="578" y="894"/>
+ <point x="750" y="487"/>
+ <point x="933" y="832"/>
</stroke>
- <stroke>
- <point x="735" y="504"/>
- <point x="945" y="845"/>
- </stroke>
</strokes>
</character>
<character>
@@ -77423,23 +77415,23 @@
<point x="408" y="485"/>
</stroke>
<stroke>
+ <point x="398" y="347"/>
+ <point x="565" y="341"/>
+ </stroke>
+ <stroke>
+ <point x="413" y="455"/>
+ <point x="555" y="453"/>
+ </stroke>
+ <stroke>
<point x="730" y="235"/>
<point x="870" y="233"/>
<point x="868" y="489"/>
</stroke>
<stroke>
- <point x="398" y="347"/>
- <point x="565" y="341"/>
- </stroke>
- <stroke>
<point x="708" y="351"/>
<point x="865" y="345"/>
</stroke>
<stroke>
- <point x="413" y="455"/>
- <point x="555" y="453"/>
- </stroke>
- <stroke>
<point x="718" y="453"/>
<point x="868" y="444"/>
</stroke>
@@ -85763,23 +85755,23 @@
<point x="205" y="338"/>
</stroke>
<stroke>
+ <point x="203" y="228"/>
+ <point x="333" y="226"/>
+ </stroke>
+ <stroke>
+ <point x="218" y="291"/>
+ <point x="325" y="293"/>
+ </stroke>
+ <stroke>
<point x="688" y="157"/>
<point x="795" y="159"/>
<point x="795" y="347"/>
</stroke>
<stroke>
- <point x="203" y="228"/>
- <point x="333" y="226"/>
- </stroke>
- <stroke>
<point x="673" y="231"/>
<point x="778" y="231"/>
</stroke>
<stroke>
- <point x="218" y="291"/>
- <point x="325" y="293"/>
- </stroke>
- <stroke>
<point x="670" y="293"/>
<point x="783" y="295"/>
</stroke>
@@ -98189,6 +98181,26 @@
<utf8>盥</utf8>
<strokes>
<stroke>
+ <point x="518" y="192"/>
+ <point x="530" y="571"/>
+ <point x="445" y="530"/>
+ </stroke>
+ <stroke>
+ <point x="340" y="304"/>
+ <point x="453" y="297"/>
+ <point x="405" y="407"/>
+ <point x="293" y="530"/>
+ </stroke>
+ <stroke>
+ <point x="683" y="267"/>
+ <point x="570" y="366"/>
+ </stroke>
+ <stroke>
+ <point x="528" y="261"/>
+ <point x="620" y="403"/>
+ <point x="713" y="515"/>
+ </stroke>
+ <stroke>
<point x="300" y="166"/>
<point x="150" y="231"/>
</stroke>
@@ -98197,47 +98209,27 @@
<point x="143" y="545"/>
</stroke>
<stroke>
- <point x="703" y="196"/>
- <point x="873" y="196"/>
- <point x="863" y="563"/>
- </stroke>
- <stroke>
<point x="180" y="332"/>
<point x="280" y="328"/>
</stroke>
<stroke>
- <point x="750" y="325"/>
- <point x="850" y="321"/>
- </stroke>
- <stroke>
<point x="170" y="455"/>
<point x="283" y="450"/>
</stroke>
<stroke>
- <point x="755" y="455"/>
- <point x="903" y="457"/>
+ <point x="703" y="196"/>
+ <point x="873" y="196"/>
+ <point x="863" y="563"/>
</stroke>
<stroke>
- <point x="518" y="192"/>
- <point x="530" y="571"/>
- <point x="445" y="530"/>
+ <point x="750" y="325"/>
+ <point x="850" y="321"/>
</stroke>
<stroke>
- <point x="340" y="304"/>
- <point x="453" y="297"/>
- <point x="405" y="407"/>
- <point x="293" y="530"/>
+ <point x="755" y="455"/>
+ <point x="903" y="457"/>
</stroke>
<stroke>
- <point x="683" y="267"/>
- <point x="570" y="366"/>
- </stroke>
- <stroke>
- <point x="528" y="261"/>
- <point x="620" y="403"/>
- <point x="713" y="515"/>
- </stroke>
- <stroke>
<point x="228" y="619"/>
<point x="225" y="808"/>
</stroke>
@@ -127107,301 +127099,3949 @@
<character>
<utf8>冐</utf8>
<strokes>
+ <stroke>
+ <point x="195" y="203"/>
+ <point x="200" y="418"/>
+ </stroke>
+ <stroke>
+ <point x="190" y="205"/>
+ <point x="818" y="203"/>
+ <point x="825" y="427"/>
+ </stroke>
+ <stroke>
+ <point x="300" y="287"/>
+ <point x="675" y="291"/>
+ </stroke>
+ <stroke>
+ <point x="303" y="397"/>
+ <point x="673" y="399"/>
+ </stroke>
+ <stroke>
+ <point x="255" y="496"/>
+ <point x="268" y="851"/>
+ </stroke>
+ <stroke>
+ <point x="263" y="511"/>
+ <point x="730" y="504"/>
+ <point x="730" y="841"/>
+ <point x="625" y="797"/>
+ </stroke>
+ <stroke>
+ <point x="270" y="573"/>
+ <point x="720" y="586"/>
+ </stroke>
+ <stroke>
+ <point x="263" y="681"/>
+ <point x="713" y="690"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>肬</utf8>
<strokes>
+ <stroke>
+ <point x="135" y="203"/>
+ <point x="145" y="584"/>
+ <point x="68" y="821"/>
+ </stroke>
+ <stroke>
+ <point x="130" y="200"/>
+ <point x="315" y="200"/>
+ <point x="315" y="830"/>
+ <point x="218" y="810"/>
+ </stroke>
+ <stroke>
+ <point x="150" y="375"/>
+ <point x="283" y="375"/>
+ </stroke>
+ <stroke>
+ <point x="155" y="550"/>
+ <point x="290" y="563"/>
+ </stroke>
+ <stroke>
+ <point x="390" y="381"/>
+ <point x="910" y="375"/>
+ </stroke>
+ <stroke>
+ <point x="608" y="183"/>
+ <point x="580" y="578"/>
+ <point x="405" y="825"/>
+ </stroke>
+ <stroke>
+ <point x="623" y="491"/>
+ <point x="685" y="806"/>
+ <point x="893" y="800"/>
+ <point x="888" y="696"/>
+ </stroke>
+ <stroke>
+ <point x="698" y="228"/>
+ <point x="788" y="313"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>胛</utf8>
<strokes>
+ <stroke>
+ <point x="148" y="198"/>
+ <point x="130" y="657"/>
+ <point x="60" y="804"/>
+ </stroke>
+ <stroke>
+ <point x="143" y="198"/>
+ <point x="323" y="196"/>
+ <point x="315" y="825"/>
+ <point x="243" y="797"/>
+ </stroke>
+ <stroke>
+ <point x="158" y="364"/>
+ <point x="303" y="362"/>
+ </stroke>
+ <stroke>
+ <point x="150" y="556"/>
+ <point x="285" y="554"/>
+ </stroke>
+ <stroke>
+ <point x="483" y="224"/>
+ <point x="493" y="597"/>
+ </stroke>
+ <stroke>
+ <point x="488" y="231"/>
+ <point x="855" y="224"/>
+ <point x="838" y="599"/>
+ </stroke>
+ <stroke>
+ <point x="490" y="414"/>
+ <point x="840" y="412"/>
+ </stroke>
+ <stroke>
+ <point x="495" y="591"/>
+ <point x="838" y="593"/>
+ </stroke>
+ <stroke>
+ <point x="670" y="235"/>
+ <point x="663" y="866"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>胥</utf8>
<strokes>
+ <stroke>
+ <point x="168" y="200"/>
+ <point x="858" y="192"/>
+ <point x="780" y="272"/>
+ </stroke>
+ <stroke>
+ <point x="530" y="196"/>
+ <point x="523" y="433"/>
+ </stroke>
+ <stroke>
+ <point x="535" y="321"/>
+ <point x="738" y="310"/>
+ </stroke>
+ <stroke>
+ <point x="310" y="246"/>
+ <point x="125" y="470"/>
+ </stroke>
+ <stroke>
+ <point x="265" y="321"/>
+ <point x="500" y="425"/>
+ <point x="888" y="444"/>
+ </stroke>
+ <stroke>
+ <point x="270" y="502"/>
+ <point x="265" y="849"/>
+ </stroke>
+ <stroke>
+ <point x="263" y="504"/>
+ <point x="715" y="509"/>
+ <point x="718" y="843"/>
+ <point x="643" y="808"/>
+ </stroke>
+ <stroke>
+ <point x="283" y="601"/>
+ <point x="700" y="601"/>
+ </stroke>
+ <stroke>
+ <point x="298" y="690"/>
+ <point x="703" y="690"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>胙</utf8>
<strokes>
+ <stroke>
+ <point x="153" y="198"/>
+ <point x="143" y="612"/>
+ <point x="65" y="819"/>
+ </stroke>
+ <stroke>
+ <point x="170" y="207"/>
+ <point x="328" y="198"/>
+ <point x="330" y="843"/>
+ <point x="248" y="804"/>
+ </stroke>
+ <stroke>
+ <point x="163" y="375"/>
+ <point x="330" y="375"/>
+ </stroke>
+ <stroke>
+ <point x="155" y="554"/>
+ <point x="323" y="558"/>
+ </stroke>
+ <stroke>
+ <point x="575" y="179"/>
+ <point x="408" y="517"/>
+ </stroke>
+ <stroke>
+ <point x="528" y="310"/>
+ <point x="875" y="300"/>
+ </stroke>
+ <stroke>
+ <point x="628" y="304"/>
+ <point x="623" y="825"/>
+ </stroke>
+ <stroke>
+ <point x="620" y="461"/>
+ <point x="853" y="457"/>
+ </stroke>
+ <stroke>
+ <point x="630" y="642"/>
+ <point x="863" y="638"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>胝</utf8>
<strokes>
+ <stroke>
+ <point x="153" y="198"/>
+ <point x="140" y="621"/>
+ <point x="73" y="836"/>
+ </stroke>
+ <stroke>
+ <point x="158" y="200"/>
+ <point x="315" y="203"/>
+ <point x="293" y="830"/>
+ <point x="243" y="808"/>
+ </stroke>
+ <stroke>
+ <point x="153" y="366"/>
+ <point x="308" y="366"/>
+ </stroke>
+ <stroke>
+ <point x="163" y="545"/>
+ <point x="303" y="547"/>
+ </stroke>
+ <stroke>
+ <point x="820" y="183"/>
+ <point x="495" y="250"/>
+ </stroke>
+ <stroke>
+ <point x="493" y="254"/>
+ <point x="480" y="716"/>
+ <point x="618" y="668"/>
+ </stroke>
+ <stroke>
+ <point x="495" y="444"/>
+ <point x="855" y="412"/>
+ </stroke>
+ <stroke>
+ <point x="698" y="231"/>
+ <point x="753" y="659"/>
+ <point x="878" y="806"/>
+ <point x="913" y="700"/>
+ </stroke>
+ <stroke>
+ <point x="480" y="808"/>
+ <point x="725" y="804"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>胄</utf8>
<strokes>
+ <stroke>
+ <point x="213" y="246"/>
+ <point x="225" y="450"/>
+ </stroke>
+ <stroke>
+ <point x="223" y="241"/>
+ <point x="790" y="246"/>
+ <point x="773" y="450"/>
+ </stroke>
+ <stroke>
+ <point x="483" y="153"/>
+ <point x="498" y="422"/>
+ </stroke>
+ <stroke>
+ <point x="233" y="338"/>
+ <point x="758" y="338"/>
+ </stroke>
+ <stroke>
+ <point x="265" y="438"/>
+ <point x="760" y="444"/>
+ </stroke>
+ <stroke>
+ <point x="275" y="502"/>
+ <point x="260" y="903"/>
+ </stroke>
+ <stroke>
+ <point x="278" y="511"/>
+ <point x="705" y="502"/>
+ <point x="710" y="892"/>
+ <point x="618" y="858"/>
+ </stroke>
+ <stroke>
+ <point x="283" y="616"/>
+ <point x="685" y="610"/>
+ </stroke>
+ <stroke>
+ <point x="275" y="722"/>
+ <point x="680" y="726"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>胚</utf8>
<strokes>
+ <stroke>
+ <point x="153" y="194"/>
+ <point x="143" y="608"/>
+ <point x="73" y="825"/>
+ </stroke>
+ <stroke>
+ <point x="165" y="207"/>
+ <point x="308" y="203"/>
+ <point x="313" y="810"/>
+ <point x="208" y="808"/>
+ </stroke>
+ <stroke>
+ <point x="180" y="369"/>
+ <point x="303" y="369"/>
+ </stroke>
+ <stroke>
+ <point x="158" y="560"/>
+ <point x="290" y="563"/>
+ </stroke>
+ <stroke>
+ <point x="413" y="235"/>
+ <point x="880" y="228"/>
+ </stroke>
+ <stroke>
+ <point x="685" y="244"/>
+ <point x="425" y="601"/>
+ </stroke>
+ <stroke>
+ <point x="643" y="323"/>
+ <point x="650" y="754"/>
+ </stroke>
+ <stroke>
+ <point x="683" y="362"/>
+ <point x="885" y="571"/>
+ </stroke>
+ <stroke>
+ <point x="388" y="797"/>
+ <point x="875" y="789"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>胖</utf8>
<strokes>
+ <stroke>
+ <point x="135" y="200"/>
+ <point x="138" y="588"/>
+ <point x="65" y="819"/>
+ </stroke>
+ <stroke>
+ <point x="148" y="194"/>
+ <point x="295" y="196"/>
+ <point x="300" y="838"/>
+ <point x="238" y="821"/>
+ </stroke>
+ <stroke>
+ <point x="145" y="375"/>
+ <point x="300" y="377"/>
+ </stroke>
+ <stroke>
+ <point x="133" y="554"/>
+ <point x="270" y="556"/>
+ </stroke>
+ <stroke>
+ <point x="525" y="256"/>
+ <point x="418" y="442"/>
+ </stroke>
+ <stroke>
+ <point x="765" y="250"/>
+ <point x="890" y="390"/>
+ </stroke>
+ <stroke>
+ <point x="513" y="438"/>
+ <point x="813" y="429"/>
+ </stroke>
+ <stroke>
+ <point x="398" y="601"/>
+ <point x="913" y="593"/>
+ </stroke>
+ <stroke>
+ <point x="645" y="151"/>
+ <point x="640" y="871"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>脉</utf8>
<strokes>
+ <stroke>
+ <point x="135" y="203"/>
+ <point x="133" y="636"/>
+ <point x="55" y="825"/>
+ </stroke>
+ <stroke>
+ <point x="143" y="203"/>
+ <point x="270" y="203"/>
+ <point x="285" y="819"/>
+ <point x="228" y="808"/>
+ </stroke>
+ <stroke>
+ <point x="138" y="366"/>
+ <point x="293" y="362"/>
+ </stroke>
+ <stroke>
+ <point x="138" y="543"/>
+ <point x="270" y="550"/>
+ </stroke>
+ <stroke>
+ <point x="558" y="147"/>
+ <point x="670" y="287"/>
+ </stroke>
+ <stroke>
+ <point x="460" y="332"/>
+ <point x="640" y="338"/>
+ <point x="653" y="841"/>
+ <point x="543" y="795"/>
+ </stroke>
+ <stroke>
+ <point x="363" y="478"/>
+ <point x="538" y="466"/>
+ <point x="393" y="756"/>
+ </stroke>
+ <stroke>
+ <point x="903" y="379"/>
+ <point x="753" y="537"/>
+ </stroke>
+ <stroke>
+ <point x="673" y="429"/>
+ <point x="775" y="634"/>
+ <point x="920" y="754"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>胯</utf8>
<strokes>
+ <stroke>
+ <point x="135" y="203"/>
+ <point x="133" y="666"/>
+ <point x="63" y="853"/>
+ </stroke>
+ <stroke>
+ <point x="133" y="209"/>
+ <point x="313" y="205"/>
+ <point x="315" y="836"/>
+ <point x="238" y="797"/>
+ </stroke>
+ <stroke>
+ <point x="150" y="362"/>
+ <point x="300" y="360"/>
+ </stroke>
+ <stroke>
+ <point x="160" y="541"/>
+ <point x="295" y="543"/>
+ </stroke>
+ <stroke>
+ <point x="418" y="267"/>
+ <point x="868" y="261"/>
+ </stroke>
+ <stroke>
+ <point x="638" y="157"/>
+ <point x="550" y="334"/>
+ <point x="395" y="470"/>
+ </stroke>
+ <stroke>
+ <point x="693" y="282"/>
+ <point x="915" y="463"/>
+ </stroke>
+ <stroke>
+ <point x="525" y="433"/>
+ <point x="733" y="440"/>
+ </stroke>
+ <stroke>
+ <point x="445" y="539"/>
+ <point x="850" y="528"/>
+ </stroke>
+ <stroke>
+ <point x="565" y="541"/>
+ <point x="513" y="642"/>
+ <point x="793" y="644"/>
+ <point x="718" y="838"/>
+ <point x="625" y="800"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>胱</utf8>
<strokes>
+ <stroke>
+ <point x="140" y="196"/>
+ <point x="143" y="573"/>
+ <point x="48" y="810"/>
+ </stroke>
+ <stroke>
+ <point x="148" y="198"/>
+ <point x="320" y="194"/>
+ <point x="300" y="832"/>
+ <point x="210" y="813"/>
+ </stroke>
+ <stroke>
+ <point x="160" y="366"/>
+ <point x="308" y="369"/>
+ </stroke>
+ <stroke>
+ <point x="153" y="552"/>
+ <point x="285" y="545"/>
+ </stroke>
+ <stroke>
+ <point x="655" y="164"/>
+ <point x="648" y="489"/>
+ </stroke>
+ <stroke>
+ <point x="450" y="263"/>
+ <point x="505" y="377"/>
+ </stroke>
+ <stroke>
+ <point x="835" y="244"/>
+ <point x="765" y="405"/>
+ </stroke>
+ <stroke>
+ <point x="375" y="489"/>
+ <point x="903" y="487"/>
+ </stroke>
+ <stroke>
+ <point x="563" y="487"/>
+ <point x="565" y="642"/>
+ <point x="430" y="800"/>
+ </stroke>
+ <stroke>
+ <point x="713" y="502"/>
+ <point x="718" y="797"/>
+ <point x="900" y="797"/>
+ <point x="900" y="683"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>脛</utf8>
<strokes>
+ <stroke>
+ <point x="145" y="207"/>
+ <point x="125" y="588"/>
+ <point x="43" y="808"/>
+ </stroke>
+ <stroke>
+ <point x="133" y="200"/>
+ <point x="318" y="198"/>
+ <point x="290" y="823"/>
+ <point x="193" y="791"/>
+ </stroke>
+ <stroke>
+ <point x="153" y="362"/>
+ <point x="298" y="366"/>
+ </stroke>
+ <stroke>
+ <point x="138" y="543"/>
+ <point x="298" y="547"/>
+ </stroke>
+ <stroke>
+ <point x="398" y="203"/>
+ <point x="858" y="196"/>
+ </stroke>
+ <stroke>
+ <point x="505" y="267"/>
+ <point x="418" y="386"/>
+ <point x="498" y="517"/>
+ </stroke>
+ <stroke>
+ <point x="648" y="278"/>
+ <point x="555" y="407"/>
+ <point x="660" y="511"/>
+ </stroke>
+ <stroke>
+ <point x="823" y="282"/>
+ <point x="723" y="414"/>
+ <point x="843" y="526"/>
+ </stroke>
+ <stroke>
+ <point x="435" y="606"/>
+ <point x="833" y="606"/>
+ </stroke>
+ <stroke>
+ <point x="645" y="619"/>
+ <point x="648" y="815"/>
+ </stroke>
+ <stroke>
+ <point x="395" y="810"/>
+ <point x="895" y="810"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>脩</utf8>
<strokes>
+ <stroke>
+ <point x="248" y="188"/>
+ <point x="50" y="547"/>
+ </stroke>
+ <stroke>
+ <point x="173" y="347"/>
+ <point x="160" y="851"/>
+ </stroke>
+ <stroke>
+ <point x="315" y="317"/>
+ <point x="313" y="731"/>
+ </stroke>
+ <stroke>
+ <point x="553" y="147"/>
+ <point x="468" y="310"/>
+ </stroke>
+ <stroke>
+ <point x="525" y="226"/>
+ <point x="858" y="222"/>
+ </stroke>
+ <stroke>
+ <point x="785" y="241"/>
+ <point x="688" y="351"/>
+ <point x="443" y="487"/>
+ </stroke>
+ <stroke>
+ <point x="530" y="250"/>
+ <point x="595" y="362"/>
+ <point x="818" y="450"/>
+ </stroke>
+ <stroke>
+ <point x="513" y="491"/>
+ <point x="503" y="849"/>
+ </stroke>
+ <stroke>
+ <point x="530" y="502"/>
+ <point x="793" y="498"/>
+ <point x="803" y="825"/>
+ <point x="710" y="817"/>
+ </stroke>
+ <stroke>
+ <point x="515" y="588"/>
+ <point x="798" y="593"/>
+ </stroke>
+ <stroke>
+ <point x="515" y="679"/>
+ <point x="788" y="681"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>脣</utf8>
<strokes>
+ <stroke>
+ <point x="195" y="194"/>
+ <point x="813" y="194"/>
+ </stroke>
+ <stroke>
+ <point x="205" y="200"/>
+ <point x="205" y="381"/>
+ <point x="83" y="599"/>
+ </stroke>
+ <stroke>
+ <point x="315" y="272"/>
+ <point x="720" y="265"/>
+ </stroke>
+ <stroke>
+ <point x="240" y="341"/>
+ <point x="763" y="334"/>
+ </stroke>
+ <stroke>
+ <point x="380" y="341"/>
+ <point x="363" y="504"/>
+ <point x="495" y="463"/>
+ </stroke>
+ <stroke>
+ <point x="758" y="353"/>
+ <point x="638" y="457"/>
+ </stroke>
+ <stroke>
+ <point x="538" y="343"/>
+ <point x="670" y="476"/>
+ <point x="793" y="498"/>
+ </stroke>
+ <stroke>
+ <point x="288" y="547"/>
+ <point x="270" y="853"/>
+ </stroke>
+ <stroke>
+ <point x="290" y="554"/>
+ <point x="665" y="541"/>
+ <point x="665" y="821"/>
+ <point x="598" y="815"/>
+ </stroke>
+ <stroke>
+ <point x="315" y="621"/>
+ <point x="648" y="619"/>
+ </stroke>
+ <stroke>
+ <point x="318" y="711"/>
+ <point x="653" y="711"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>脯</utf8>
<strokes>
+ <stroke>
+ <point x="143" y="205"/>
+ <point x="133" y="588"/>
+ <point x="63" y="817"/>
+ </stroke>
+ <stroke>
+ <point x="135" y="205"/>
+ <point x="278" y="200"/>
+ <point x="280" y="834"/>
+ <point x="190" y="808"/>
+ </stroke>
+ <stroke>
+ <point x="143" y="373"/>
+ <point x="265" y="369"/>
+ </stroke>
+ <stroke>
+ <point x="128" y="541"/>
+ <point x="265" y="550"/>
+ </stroke>
+ <stroke>
+ <point x="420" y="272"/>
+ <point x="868" y="265"/>
+ </stroke>
+ <stroke>
+ <point x="445" y="394"/>
+ <point x="455" y="830"/>
+ </stroke>
+ <stroke>
+ <point x="450" y="399"/>
+ <point x="845" y="388"/>
+ <point x="820" y="838"/>
+ <point x="755" y="795"/>
+ </stroke>
+ <stroke>
+ <point x="465" y="519"/>
+ <point x="853" y="515"/>
+ </stroke>
+ <stroke>
+ <point x="478" y="644"/>
+ <point x="820" y="649"/>
+ </stroke>
+ <stroke>
+ <point x="655" y="162"/>
+ <point x="653" y="800"/>
+ </stroke>
+ <stroke>
+ <point x="775" y="168"/>
+ <point x="838" y="231"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>腋</utf8>
<strokes>
+ <stroke>
+ <point x="153" y="188"/>
+ <point x="128" y="629"/>
+ <point x="28" y="849"/>
+ </stroke>
+ <stroke>
+ <point x="150" y="194"/>
+ <point x="300" y="188"/>
+ <point x="288" y="810"/>
+ <point x="210" y="804"/>
+ </stroke>
+ <stroke>
+ <point x="160" y="362"/>
+ <point x="305" y="364"/>
+ </stroke>
+ <stroke>
+ <point x="145" y="556"/>
+ <point x="268" y="552"/>
+ </stroke>
+ <stroke>
+ <point x="650" y="123"/>
+ <point x="655" y="261"/>
+ </stroke>
+ <stroke>
+ <point x="380" y="265"/>
+ <point x="888" y="250"/>
+ </stroke>
+ <stroke>
+ <point x="538" y="330"/>
+ <point x="373" y="571"/>
+ </stroke>
+ <stroke>
+ <point x="475" y="448"/>
+ <point x="463" y="845"/>
+ </stroke>
+ <stroke>
+ <point x="710" y="349"/>
+ <point x="565" y="593"/>
+ </stroke>
+ <stroke>
+ <point x="693" y="377"/>
+ <point x="865" y="371"/>
+ <point x="788" y="610"/>
+ <point x="558" y="825"/>
+ </stroke>
+ <stroke>
+ <point x="675" y="472"/>
+ <point x="760" y="545"/>
+ </stroke>
+ <stroke>
+ <point x="643" y="511"/>
+ <point x="723" y="657"/>
+ <point x="920" y="836"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>隋</utf8>
<strokes>
+ <stroke>
+ <point x="130" y="192"/>
+ <point x="283" y="194"/>
+ <point x="228" y="384"/>
+ </stroke>
+ <stroke>
+ <point x="225" y="399"/>
+ <point x="330" y="599"/>
+ <point x="250" y="705"/>
+ <point x="195" y="653"/>
+ </stroke>
+ <stroke>
+ <point x="128" y="190"/>
+ <point x="113" y="903"/>
+ </stroke>
+ <stroke>
+ <point x="390" y="246"/>
+ <point x="860" y="235"/>
+ </stroke>
+ <stroke>
+ <point x="605" y="157"/>
+ <point x="398" y="481"/>
+ </stroke>
+ <stroke>
+ <point x="503" y="330"/>
+ <point x="798" y="325"/>
+ </stroke>
+ <stroke>
+ <point x="615" y="332"/>
+ <point x="620" y="442"/>
+ </stroke>
+ <stroke>
+ <point x="455" y="457"/>
+ <point x="795" y="459"/>
+ </stroke>
+ <stroke>
+ <point x="505" y="511"/>
+ <point x="503" y="853"/>
+ </stroke>
+ <stroke>
+ <point x="500" y="506"/>
+ <point x="768" y="504"/>
+ <point x="765" y="871"/>
+ <point x="685" y="851"/>
+ </stroke>
+ <stroke>
+ <point x="515" y="591"/>
+ <point x="760" y="595"/>
+ </stroke>
+ <stroke>
+ <point x="533" y="692"/>
+ <point x="758" y="692"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>腆</utf8>
<strokes>
+ <stroke>
+ <point x="128" y="194"/>
+ <point x="138" y="599"/>
+ <point x="45" y="830"/>
+ </stroke>
+ <stroke>
+ <point x="125" y="200"/>
+ <point x="285" y="196"/>
+ <point x="290" y="821"/>
+ <point x="195" y="802"/>
+ </stroke>
+ <stroke>
+ <point x="135" y="371"/>
+ <point x="290" y="364"/>
+ </stroke>
+ <stroke>
+ <point x="155" y="554"/>
+ <point x="258" y="554"/>
+ </stroke>
+ <stroke>
+ <point x="428" y="291"/>
+ <point x="435" y="636"/>
+ </stroke>
+ <stroke>
+ <point x="435" y="293"/>
+ <point x="825" y="289"/>
+ <point x="818" y="616"/>
+ </stroke>
+ <stroke>
+ <point x="563" y="172"/>
+ <point x="560" y="621"/>
+ </stroke>
+ <stroke>
+ <point x="700" y="155"/>
+ <point x="705" y="629"/>
+ </stroke>
+ <stroke>
+ <point x="450" y="463"/>
+ <point x="793" y="457"/>
+ </stroke>
+ <stroke>
+ <point x="310" y="640"/>
+ <point x="938" y="627"/>
+ </stroke>
+ <stroke>
+ <point x="515" y="705"/>
+ <point x="415" y="838"/>
+ </stroke>
+ <stroke>
+ <point x="730" y="698"/>
+ <point x="855" y="819"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>脾</utf8>
<strokes>
+ <stroke>
+ <point x="145" y="205"/>
+ <point x="140" y="597"/>
+ <point x="50" y="823"/>
+ </stroke>
+ <stroke>
+ <point x="148" y="207"/>
+ <point x="290" y="200"/>
+ <point x="303" y="825"/>
+ <point x="230" y="789"/>
+ </stroke>
+ <stroke>
+ <point x="155" y="362"/>
+ <point x="310" y="364"/>
+ </stroke>
+ <stroke>
+ <point x="153" y="552"/>
+ <point x="300" y="545"/>
+ </stroke>
+ <stroke>
+ <point x="673" y="136"/>
+ <point x="583" y="237"/>
+ </stroke>
+ <stroke>
+ <point x="455" y="252"/>
+ <point x="468" y="502"/>
+ </stroke>
+ <stroke>
+ <point x="460" y="252"/>
+ <point x="808" y="241"/>
+ <point x="815" y="502"/>
+ </stroke>
+ <stroke>
+ <point x="498" y="366"/>
+ <point x="823" y="362"/>
+ </stroke>
+ <stroke>
+ <point x="485" y="491"/>
+ <point x="815" y="481"/>
+ </stroke>
+ <stroke>
+ <point x="630" y="254"/>
+ <point x="635" y="457"/>
+ <point x="498" y="621"/>
+ </stroke>
+ <stroke>
+ <point x="415" y="653"/>
+ <point x="883" y="655"/>
+ </stroke>
+ <stroke>
+ <point x="718" y="541"/>
+ <point x="725" y="881"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>腓</utf8>
<strokes>
+ <stroke>
+ <point x="158" y="205"/>
+ <point x="158" y="575"/>
+ <point x="75" y="800"/>
+ </stroke>
+ <stroke>
+ <point x="163" y="213"/>
+ <point x="325" y="203"/>
+ <point x="318" y="817"/>
+ <point x="223" y="787"/>
+ </stroke>
+ <stroke>
+ <point x="163" y="360"/>
+ <point x="293" y="373"/>
+ </stroke>
+ <stroke>
+ <point x="163" y="554"/>
+ <point x="310" y="552"/>
+ </stroke>
+ <stroke>
+ <point x="573" y="168"/>
+ <point x="575" y="541"/>
+ <point x="458" y="847"/>
+ </stroke>
+ <stroke>
+ <point x="418" y="315"/>
+ <point x="540" y="315"/>
+ </stroke>
+ <stroke>
+ <point x="383" y="453"/>
+ <point x="545" y="450"/>
+ </stroke>
+ <stroke>
+ <point x="415" y="634"/>
+ <point x="535" y="573"/>
+ </stroke>
+ <stroke>
+ <point x="720" y="164"/>
+ <point x="723" y="853"/>
+ </stroke>
+ <stroke>
+ <point x="743" y="313"/>
+ <point x="913" y="313"/>
+ </stroke>
+ <stroke>
+ <point x="743" y="455"/>
+ <point x="903" y="448"/>
+ </stroke>
+ <stroke>
+ <point x="733" y="627"/>
+ <point x="903" y="621"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>腑</utf8>
<strokes>
+ <stroke>
+ <point x="135" y="181"/>
+ <point x="130" y="565"/>
+ <point x="55" y="815"/>
+ </stroke>
+ <stroke>
+ <point x="143" y="192"/>
+ <point x="288" y="190"/>
+ <point x="270" y="832"/>
+ <point x="195" y="795"/>
+ </stroke>
+ <stroke>
+ <point x="135" y="358"/>
+ <point x="293" y="360"/>
+ </stroke>
+ <stroke>
+ <point x="145" y="550"/>
+ <point x="265" y="545"/>
+ </stroke>
+ <stroke>
+ <point x="668" y="144"/>
+ <point x="665" y="259"/>
+ </stroke>
+ <stroke>
+ <point x="435" y="276"/>
+ <point x="910" y="256"/>
+ </stroke>
+ <stroke>
+ <point x="430" y="274"/>
+ <point x="418" y="571"/>
+ <point x="325" y="841"/>
+ </stroke>
+ <stroke>
+ <point x="575" y="332"/>
+ <point x="445" y="647"/>
+ </stroke>
+ <stroke>
+ <point x="548" y="457"/>
+ <point x="533" y="817"/>
+ </stroke>
+ <stroke>
+ <point x="613" y="468"/>
+ <point x="915" y="448"/>
+ </stroke>
+ <stroke>
+ <point x="818" y="302"/>
+ <point x="803" y="847"/>
+ <point x="730" y="802"/>
+ </stroke>
+ <stroke>
+ <point x="670" y="578"/>
+ <point x="750" y="668"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>胼</utf8>
<strokes>
+ <stroke>
+ <point x="140" y="209"/>
+ <point x="135" y="588"/>
+ <point x="43" y="819"/>
+ </stroke>
+ <stroke>
+ <point x="135" y="209"/>
+ <point x="313" y="194"/>
+ <point x="308" y="838"/>
+ <point x="223" y="795"/>
+ </stroke>
+ <stroke>
+ <point x="143" y="373"/>
+ <point x="308" y="375"/>
+ </stroke>
+ <stroke>
+ <point x="160" y="547"/>
+ <point x="308" y="543"/>
+ </stroke>
+ <stroke>
+ <point x="485" y="183"/>
+ <point x="570" y="289"/>
+ </stroke>
+ <stroke>
+ <point x="753" y="162"/>
+ <point x="705" y="304"/>
+ </stroke>
+ <stroke>
+ <point x="400" y="345"/>
+ <point x="845" y="323"/>
+ </stroke>
+ <stroke>
+ <point x="405" y="545"/>
+ <point x="880" y="528"/>
+ </stroke>
+ <stroke>
+ <point x="528" y="343"/>
+ <point x="508" y="584"/>
+ <point x="368" y="830"/>
+ </stroke>
+ <stroke>
+ <point x="745" y="356"/>
+ <point x="755" y="847"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>腱</utf8>
<strokes>
+ <stroke>
+ <point x="140" y="216"/>
+ <point x="125" y="612"/>
+ <point x="33" y="843"/>
+ </stroke>
+ <stroke>
+ <point x="133" y="200"/>
+ <point x="255" y="200"/>
+ <point x="270" y="804"/>
+ <point x="190" y="787"/>
+ </stroke>
+ <stroke>
+ <point x="145" y="358"/>
+ <point x="255" y="362"/>
+ </stroke>
+ <stroke>
+ <point x="130" y="556"/>
+ <point x="220" y="550"/>
+ </stroke>
+ <stroke>
+ <point x="590" y="248"/>
+ <point x="848" y="237"/>
+ <point x="850" y="446"/>
+ </stroke>
+ <stroke>
+ <point x="523" y="336"/>
+ <point x="953" y="330"/>
+ </stroke>
+ <stroke>
+ <point x="590" y="425"/>
+ <point x="850" y="418"/>
+ </stroke>
+ <stroke>
+ <point x="558" y="541"/>
+ <point x="840" y="530"/>
+ </stroke>
+ <stroke>
+ <point x="533" y="636"/>
+ <point x="930" y="629"/>
+ </stroke>
+ <stroke>
+ <point x="693" y="157"/>
+ <point x="715" y="741"/>
+ </stroke>
+ <stroke>
+ <point x="348" y="233"/>
+ <point x="503" y="218"/>
+ <point x="390" y="461"/>
+ </stroke>
+ <stroke>
+ <point x="390" y="463"/>
+ <point x="493" y="459"/>
+ <point x="370" y="795"/>
+ </stroke>
+ <stroke>
+ <point x="375" y="567"/>
+ <point x="505" y="735"/>
+ <point x="755" y="800"/>
+ <point x="903" y="815"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>腮</utf8>
<strokes>
+ <stroke>
+ <point x="133" y="196"/>
+ <point x="150" y="541"/>
+ <point x="75" y="793"/>
+ </stroke>
+ <stroke>
+ <point x="133" y="190"/>
+ <point x="280" y="185"/>
+ <point x="290" y="832"/>
+ <point x="213" y="793"/>
+ </stroke>
+ <stroke>
+ <point x="143" y="371"/>
+ <point x="285" y="366"/>
+ </stroke>
+ <stroke>
+ <point x="158" y="550"/>
+ <point x="280" y="545"/>
+ </stroke>
+ <stroke>
+ <point x="470" y="224"/>
+ <point x="480" y="502"/>
+ </stroke>
+ <stroke>
+ <point x="470" y="226"/>
+ <point x="843" y="218"/>
+ <point x="808" y="500"/>
+ </stroke>
+ <stroke>
+ <point x="643" y="235"/>
+ <point x="653" y="494"/>
+ </stroke>
+ <stroke>
+ <point x="493" y="347"/>
+ <point x="805" y="353"/>
+ </stroke>
+ <stroke>
+ <point x="495" y="496"/>
+ <point x="798" y="500"/>
+ </stroke>
+ <stroke>
+ <point x="430" y="657"/>
+ <point x="433" y="787"/>
+ </stroke>
+ <stroke>
+ <point x="520" y="636"/>
+ <point x="553" y="791"/>
+ <point x="735" y="838"/>
+ <point x="758" y="744"/>
+ </stroke>
+ <stroke>
+ <point x="668" y="593"/>
+ <point x="690" y="748"/>
+ </stroke>
+ <stroke>
+ <point x="815" y="616"/>
+ <point x="900" y="774"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>腥</utf8>
<strokes>
+ <stroke>
+ <point x="145" y="194"/>
+ <point x="155" y="539"/>
+ <point x="50" y="800"/>
+ </stroke>
+ <stroke>
+ <point x="145" y="192"/>
+ <point x="323" y="188"/>
+ <point x="300" y="813"/>
+ <point x="210" y="806"/>
+ </stroke>
+ <stroke>
+ <point x="165" y="356"/>
+ <point x="300" y="356"/>
+ </stroke>
+ <stroke>
+ <point x="163" y="552"/>
+ <point x="303" y="545"/>
+ </stroke>
+ <stroke>
+ <point x="490" y="203"/>
+ <point x="520" y="418"/>
+ </stroke>
+ <stroke>
+ <point x="493" y="226"/>
+ <point x="843" y="207"/>
+ <point x="810" y="416"/>
+ </stroke>
+ <stroke>
+ <point x="505" y="308"/>
+ <point x="800" y="310"/>
+ </stroke>
+ <stroke>
+ <point x="538" y="414"/>
+ <point x="798" y="412"/>
+ </stroke>
+ <stroke>
+ <point x="510" y="481"/>
+ <point x="440" y="668"/>
+ </stroke>
+ <stroke>
+ <point x="480" y="578"/>
+ <point x="828" y="571"/>
+ </stroke>
+ <stroke>
+ <point x="488" y="685"/>
+ <point x="818" y="690"/>
+ </stroke>
+ <stroke>
+ <point x="653" y="476"/>
+ <point x="660" y="808"/>
+ </stroke>
+ <stroke>
+ <point x="445" y="823"/>
+ <point x="893" y="825"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>腦</utf8>
<strokes>
+ <stroke>
+ <point x="145" y="213"/>
+ <point x="143" y="552"/>
+ <point x="60" y="802"/>
+ </stroke>
+ <stroke>
+ <point x="155" y="211"/>
+ <point x="273" y="203"/>
+ <point x="293" y="845"/>
+ <point x="243" y="795"/>
+ </stroke>
+ <stroke>
+ <point x="155" y="360"/>
+ <point x="258" y="369"/>
+ </stroke>
+ <stroke>
+ <point x="150" y="558"/>
+ <point x="260" y="558"/>
+ </stroke>
+ <stroke>
+ <point x="508" y="181"/>
+ <point x="423" y="297"/>
+ <point x="493" y="427"/>
+ </stroke>
+ <stroke>
+ <point x="678" y="198"/>
+ <point x="575" y="291"/>
+ <point x="675" y="416"/>
+ </stroke>
+ <stroke>
+ <point x="843" y="203"/>
+ <point x="755" y="315"/>
+ <point x="855" y="407"/>
+ </stroke>
+ <stroke>
+ <point x="635" y="433"/>
+ <point x="568" y="528"/>
+ </stroke>
+ <stroke>
+ <point x="443" y="547"/>
+ <point x="468" y="808"/>
+ </stroke>
+ <stroke>
+ <point x="438" y="539"/>
+ <point x="855" y="543"/>
+ <point x="795" y="815"/>
+ </stroke>
+ <stroke>
+ <point x="738" y="580"/>
+ <point x="548" y="724"/>
+ </stroke>
+ <stroke>
+ <point x="548" y="595"/>
+ <point x="718" y="716"/>
+ </stroke>
+ <stroke>
+ <point x="473" y="793"/>
+ <point x="800" y="795"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>腴</utf8>
<strokes>
+ <stroke>
+ <point x="150" y="203"/>
+ <point x="150" y="550"/>
+ <point x="60" y="823"/>
+ </stroke>
+ <stroke>
+ <point x="158" y="203"/>
+ <point x="313" y="200"/>
+ <point x="288" y="797"/>
+ <point x="220" y="800"/>
+ </stroke>
+ <stroke>
+ <point x="155" y="371"/>
+ <point x="288" y="371"/>
+ </stroke>
+ <stroke>
+ <point x="165" y="547"/>
+ <point x="278" y="550"/>
+ </stroke>
+ <stroke>
+ <point x="575" y="222"/>
+ <point x="470" y="269"/>
+ </stroke>
+ <stroke>
+ <point x="453" y="274"/>
+ <point x="448" y="539"/>
+ </stroke>
+ <stroke>
+ <point x="743" y="261"/>
+ <point x="863" y="261"/>
+ <point x="868" y="571"/>
+ </stroke>
+ <stroke>
+ <point x="475" y="397"/>
+ <point x="545" y="401"/>
+ </stroke>
+ <stroke>
+ <point x="753" y="397"/>
+ <point x="868" y="397"/>
+ </stroke>
+ <stroke>
+ <point x="453" y="539"/>
+ <point x="568" y="539"/>
+ </stroke>
+ <stroke>
+ <point x="743" y="537"/>
+ <point x="865" y="545"/>
+ </stroke>
+ <stroke>
+ <point x="680" y="175"/>
+ <point x="640" y="567"/>
+ <point x="555" y="724"/>
+ <point x="393" y="821"/>
+ </stroke>
+ <stroke>
+ <point x="650" y="567"/>
+ <point x="743" y="692"/>
+ <point x="913" y="782"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>膃</utf8>
<strokes>
+ <stroke>
+ <point x="128" y="205"/>
+ <point x="143" y="582"/>
+ <point x="23" y="845"/>
+ </stroke>
+ <stroke>
+ <point x="130" y="203"/>
+ <point x="305" y="196"/>
+ <point x="295" y="838"/>
+ <point x="213" y="806"/>
+ </stroke>
+ <stroke>
+ <point x="158" y="375"/>
+ <point x="298" y="362"/>
+ </stroke>
+ <stroke>
+ <point x="153" y="563"/>
+ <point x="285" y="560"/>
+ </stroke>
+ <stroke>
+ <point x="470" y="211"/>
+ <point x="483" y="487"/>
+ </stroke>
+ <stroke>
+ <point x="470" y="196"/>
+ <point x="795" y="194"/>
+ <point x="783" y="476"/>
+ </stroke>
+ <stroke>
+ <point x="650" y="237"/>
+ <point x="558" y="425"/>
+ </stroke>
+ <stroke>
+ <point x="628" y="310"/>
+ <point x="743" y="412"/>
+ </stroke>
+ <stroke>
+ <point x="508" y="459"/>
+ <point x="780" y="446"/>
+ </stroke>
+ <stroke>
+ <point x="463" y="569"/>
+ <point x="465" y="806"/>
+ </stroke>
+ <stroke>
+ <point x="470" y="580"/>
+ <point x="833" y="569"/>
+ <point x="815" y="815"/>
+ </stroke>
+ <stroke>
+ <point x="578" y="584"/>
+ <point x="575" y="802"/>
+ </stroke>
+ <stroke>
+ <point x="705" y="573"/>
+ <point x="705" y="815"/>
+ </stroke>
+ <stroke>
+ <point x="383" y="808"/>
+ <point x="908" y="806"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>膈</utf8>
<strokes>
+ <stroke>
+ <point x="135" y="200"/>
+ <point x="133" y="591"/>
+ <point x="63" y="832"/>
+ </stroke>
+ <stroke>
+ <point x="128" y="205"/>
+ <point x="303" y="198"/>
+ <point x="300" y="832"/>
+ <point x="218" y="817"/>
+ </stroke>
+ <stroke>
+ <point x="145" y="373"/>
+ <point x="305" y="371"/>
+ </stroke>
+ <stroke>
+ <point x="148" y="558"/>
+ <point x="278" y="554"/>
+ </stroke>
+ <stroke>
+ <point x="438" y="209"/>
+ <point x="840" y="205"/>
+ </stroke>
+ <stroke>
+ <point x="490" y="263"/>
+ <point x="500" y="440"/>
+ </stroke>
+ <stroke>
+ <point x="495" y="267"/>
+ <point x="795" y="267"/>
+ <point x="763" y="414"/>
+ </stroke>
+ <stroke>
+ <point x="513" y="422"/>
+ <point x="783" y="420"/>
+ </stroke>
+ <stroke>
+ <point x="438" y="489"/>
+ <point x="433" y="828"/>
+ </stroke>
+ <stroke>
+ <point x="448" y="504"/>
+ <point x="858" y="504"/>
+ <point x="848" y="853"/>
+ <point x="780" y="813"/>
+ </stroke>
+ <stroke>
+ <point x="610" y="513"/>
+ <point x="528" y="644"/>
+ </stroke>
+ <stroke>
+ <point x="688" y="511"/>
+ <point x="690" y="625"/>
+ <point x="800" y="627"/>
+ <point x="800" y="565"/>
+ </stroke>
+ <stroke>
+ <point x="525" y="672"/>
+ <point x="750" y="670"/>
+ </stroke>
+ <stroke>
+ <point x="638" y="677"/>
+ <point x="645" y="817"/>
+ </stroke>
</strokes>
</character>
<character>
<utf8>膊</utf8>
<strokes>
+ <stroke>
+ <point x="158" y="203"/>
+ <point x="155" y="573"/>
+ <point x="60" y="825"/>
+ </stroke>
+ <stroke>
+ <point x="163" y="207"/>
+ <point x="315" y="203"/>
+ <point x="323" y="825"/>
+ <point x="230" y="795"/>
+ </stroke>
+ <stroke>
+ <point x="185" y="379"/>
+ <point x="308" y="375"/>
+ </stroke>
+ <stroke>
+ <point x="148" y="556"/>
+ <point x="290" y="554"/>
+ </stroke>
+ <stroke>
+ <point x="438" y="256"/>
+ <point x="843" y="2...
[truncated message content] |
|
From: <ik...@us...> - 2007-06-06 11:35:48
|
Revision: 1300
http://tomoe.svn.sourceforge.net/tomoe/?rev=1300&view=rev
Author: ikezoe
Date: 2007-06-06 04:34:49 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
use g_type_from_name().
Modified Paths:
--------------
tomoe/trunk/bindings/python/tomoe-dict.override
Modified: tomoe/trunk/bindings/python/tomoe-dict.override
===================================================================
--- tomoe/trunk/bindings/python/tomoe-dict.override 2007-06-06 11:34:09 UTC (rev 1299)
+++ tomoe/trunk/bindings/python/tomoe-dict.override 2007-06-06 11:34:49 UTC (rev 1300)
@@ -17,9 +17,9 @@
{
PyObject *first_arg;
TomoeModule *module;
- gchar *dict_name;
+ gchar *dict_name, *type_name;
GObjectClass *class;
- GType obj_type = pyg_type_from_object((PyObject *) self);
+ GType obj_type;
GParameter *params;
guint i, len, n;
int ret = 0;
@@ -39,9 +39,14 @@
dict_name = PyString_AsString(first_arg);
module = tomoe_dict_load_module(dict_name);
+ type_name = g_strconcat("TomoeDict", dict_name, NULL);
+ obj_type = g_type_from_name(type_name);
+ if (!obj_type)
+ return 0;
+
params = g_new0(GParameter, len / 2);
- class = G_OBJECT_GET_CLASS(self->obj);
+ class = g_type_class_ref(obj_type);
for (i = 1, n = 0; i < len; i+=2, n++) {
PyObject *py_property = PyTuple_GetItem(args, i);
PyObject *py_value = PyTuple_GetItem(args, i + 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 11:35:44
|
Revision: 1299
http://tomoe.svn.sourceforge.net/tomoe/?rev=1299&view=rev
Author: ikezoe
Date: 2007-06-06 04:34:09 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
fix indent.
Modified Paths:
--------------
tomoe/trunk/module/dict/tomoe-dict-mysql.c
Modified: tomoe/trunk/module/dict/tomoe-dict-mysql.c
===================================================================
--- tomoe/trunk/module/dict/tomoe-dict-mysql.c 2007-06-06 11:22:35 UTC (rev 1298)
+++ tomoe/trunk/module/dict/tomoe-dict-mysql.c 2007-06-06 11:34:09 UTC (rev 1299)
@@ -264,9 +264,9 @@
};
tomoe_type_dict_mysql = g_type_module_register_type (type_module,
- TOMOE_TYPE_DICT,
- "TomoeDictMySQL",
- &info, 0);
+ TOMOE_TYPE_DICT,
+ "TomoeDictMySQL",
+ &info, 0);
}
G_MODULE_EXPORT GList *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 11:22:40
|
Revision: 1298
http://tomoe.svn.sourceforge.net/tomoe/?rev=1298&view=rev
Author: ikezoe
Date: 2007-06-06 04:22:35 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
* bindings/python/tomoe-dict.override: Implement tomoe_dict_new().
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/bindings/python/tomoe-dict.override
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-06-06 10:00:46 UTC (rev 1297)
+++ tomoe/trunk/ChangeLog 2007-06-06 11:22:35 UTC (rev 1298)
@@ -9,6 +9,7 @@
bindings/python/tomoe-recognizer.override: Fix implementions. I did
not understand how to write Python bindings. Sorry.
* bindings/python/tomoe-module.c: Call tomoe_init() and tomoe_quit().
+ * bindings/python/tomoe-dict.override: Implement tomoe_dict_new().
2007-06-06 Kouhei Sutou <ko...@co...>
Modified: tomoe/trunk/bindings/python/tomoe-dict.override
===================================================================
--- tomoe/trunk/bindings/python/tomoe-dict.override 2007-06-06 10:00:46 UTC (rev 1297)
+++ tomoe/trunk/bindings/python/tomoe-dict.override 2007-06-06 11:22:35 UTC (rev 1298)
@@ -2,6 +2,7 @@
headers
#define NO_IMPORT_PYGOBJECT
#include "tomoe-python-utils.h"
+#include "tomoe-dict.h"
%%
new-constructor TOMOE_TYPE_DICT
%%
@@ -11,11 +12,77 @@
tomoe_dict_get_log_domains
%%
override tomoe_dict_new
-static PyObject *
+static int
_wrap_tomoe_dict_new(PyGObject *self, PyObject *args)
{
- /* NOT IMPLEMENTED YET */
- return NULL;
+ PyObject *first_arg;
+ TomoeModule *module;
+ gchar *dict_name;
+ GObjectClass *class;
+ GType obj_type = pyg_type_from_object((PyObject *) self);
+ GParameter *params;
+ guint i, len, n;
+ int ret = 0;
+
+ if ((len = PyTuple_Size(args)) < 1) {
+ PyErr_SetString(PyExc_TypeError, "requires at least one argument");
+ return 0;
+ }
+
+ first_arg = PyTuple_GetItem(args, 0);
+ if (!PyString_Check(first_arg)) {
+ PyErr_SetString(PyExc_TypeError,
+ "first argument should be a string");
+ return 0;
+ }
+
+ dict_name = PyString_AsString(first_arg);
+ module = tomoe_dict_load_module(dict_name);
+
+ params = g_new0(GParameter, len / 2);
+
+ class = G_OBJECT_GET_CLASS(self->obj);
+ for (i = 1, n = 0; i < len; i+=2, n++) {
+ PyObject *py_property = PyTuple_GetItem(args, i);
+ PyObject *py_value = PyTuple_GetItem(args, i + 1);
+ gchar *property_name;
+ GParamSpec *pspec;
+
+ if (!PyString_Check(py_property)) {
+ PyErr_SetString(PyExc_TypeError,
+ "Expected string argument for property.");
+ goto END;
+ }
+
+ property_name = PyString_AsString(py_property);
+
+ pspec = g_object_class_find_property(class, property_name);
+ if (!pspec) {
+ gchar buf[512];
+ g_snprintf(buf, sizeof(buf),
+ "%s does not support property `%s'",
+ g_type_name(obj_type),
+ property_name);
+ PyErr_SetString(PyExc_TypeError, buf);
+
+ goto END;
+ }
+
+ params[n].name = property_name;
+ params[n].value.g_type = 0;
+ g_value_init(¶ms[n].value, G_PARAM_SPEC_VALUE_TYPE(pspec));
+ pyg_value_from_pyobject(¶ms[n].value, (PyObject*)py_value);
+ }
+
+ ret = pygobject_constructv(self, n, params);
+
+END:
+ while (n--)
+ g_value_unset(¶ms[n].value);
+ g_free(params);
+ g_type_class_unref(class);
+
+ return ret;
}
%%
override tomoe_dict_search kwargs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 10:39:13
|
Revision: 1297
http://tomoe.svn.sourceforge.net/tomoe/?rev=1297&view=rev
Author: ikezoe
Date: 2007-06-06 03:00:46 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
support python2.4
Modified Paths:
--------------
tomoe/trunk/macros/python.m4
Modified: tomoe/trunk/macros/python.m4
===================================================================
--- tomoe/trunk/macros/python.m4 2007-06-06 07:35:27 UTC (rev 1296)
+++ tomoe/trunk/macros/python.m4 2007-06-06 10:00:46 UTC (rev 1297)
@@ -21,12 +21,12 @@
fi
if test "$python_available" = "yes"; then
- AC_PATH_PROG(PYTHON_CONFIG, python-config, no)
+ PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
+ PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
+ PYTHON_LIBS="-lpython$PYTHON_VERSION"
+ PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config"
+ PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
- PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
- PYTHON_LIBS=`$PYTHON_CONFIG --libs`
- PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-
PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0)
AC_SUBST(PYTHON_CFLAGS)
@@ -49,7 +49,7 @@
[$python_undef_package_macros])
CFLAGS=$_SAVE_CFLAGS
- AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, none)
+ AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, [python_avairable="no"])
fi
AM_CONDITIONAL([WITH_PYTHON], [test "$python_available" = "yes"])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-06-06 07:35:25
|
Revision: 1296
http://tomoe.svn.sourceforge.net/tomoe/?rev=1296&view=rev
Author: ktou
Date: 2007-06-06 00:35:27 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
* fixed a bug because ikezoe is VEEEEEEEEEEEEEEEEEEEEEEEERY angry!!!
Modified Paths:
--------------
tomoe/trunk/lib/tomoe.c
Modified: tomoe/trunk/lib/tomoe.c
===================================================================
--- tomoe/trunk/lib/tomoe.c 2007-06-06 07:32:03 UTC (rev 1295)
+++ tomoe/trunk/lib/tomoe.c 2007-06-06 07:35:27 UTC (rev 1296)
@@ -61,7 +61,7 @@
if (initialized) {
initialized = FALSE;
tomoe_dict_quit ();
- tomoe_dict_quit ();
+ tomoe_recognizer_quit ();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 07:32:03
|
Revision: 1295
http://tomoe.svn.sourceforge.net/tomoe/?rev=1295&view=rev
Author: ikezoe
Date: 2007-06-06 00:32:03 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
added.
Added Paths:
-----------
tomoe/trunk/test/test.py
Added: tomoe/trunk/test/test.py
===================================================================
--- tomoe/trunk/test/test.py (rev 0)
+++ tomoe/trunk/test/test.py 2007-06-06 07:32:03 UTC (rev 1295)
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# coding: UTF=8
+import tomoe
+
+c = tomoe.Context()
+c.load_config()
+
+q = tomoe.Query()
+q.set_utf8("池")
+
+l = c.search(q)
+
+print l[0].get_char().get_utf8()
Property changes on: tomoe/trunk/test/test.py
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 07:14:50
|
Revision: 1294
http://tomoe.svn.sourceforge.net/tomoe/?rev=1294&view=rev
Author: ikezoe
Date: 2007-06-06 00:14:50 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
* bindings/python/tomoe-module.c: Call tomoe_init() and tomoe_quit().
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/bindings/python/tomoe-module.c
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-06-06 06:34:51 UTC (rev 1293)
+++ tomoe/trunk/ChangeLog 2007-06-06 07:14:50 UTC (rev 1294)
@@ -8,6 +8,7 @@
bindings/python/tomoe-context.override,
bindings/python/tomoe-recognizer.override: Fix implementions. I did
not understand how to write Python bindings. Sorry.
+ * bindings/python/tomoe-module.c: Call tomoe_init() and tomoe_quit().
2007-06-06 Kouhei Sutou <ko...@co...>
Modified: tomoe/trunk/bindings/python/tomoe-module.c
===================================================================
--- tomoe/trunk/bindings/python/tomoe-module.c 2007-06-06 06:34:51 UTC (rev 1293)
+++ tomoe/trunk/bindings/python/tomoe-module.c 2007-06-06 07:14:50 UTC (rev 1294)
@@ -1,4 +1,5 @@
#include <pygobject.h>
+#include "tomoe.h"
void pytomoe_register_classes (PyObject *d);
@@ -20,6 +21,9 @@
{
Py_FatalError ("can't initialize module globalkeys");
}
+
+ tomoe_init ();
+ atexit(tomoe_quit);
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 06:34:48
|
Revision: 1293
http://tomoe.svn.sourceforge.net/tomoe/?rev=1293&view=rev
Author: ikezoe
Date: 2007-06-05 23:34:51 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
update ignore property.
Property Changed:
----------------
tomoe-gtk/trunk/src/
Property changes on: tomoe-gtk/trunk/src
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
config.h
config.h.in
stamp-h*
.deps
.libs
*.o
*.lo
*.la
*.bak
*~
*.rej
*.orig
tomoe
tomoe1
+ Makefile
Makefile.in
config.h
config.h.in
stamp-h*
.deps
.libs
*.o
*.lo
*.la
*.bak
*~
*.rej
*.orig
tomoe
tomoe1
tomoe-gtk-config.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 06:33:33
|
Revision: 1292
http://tomoe.svn.sourceforge.net/tomoe/?rev=1292&view=rev
Author: ikezoe
Date: 2007-06-05 23:33:32 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
update ignore property.
Property Changed:
----------------
tomoe-gtk/trunk/data/
tomoe-gtk/trunk/doc/
tomoe-gtk/trunk/test/
Property changes on: tomoe-gtk/trunk/data
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Property changes on: tomoe-gtk/trunk/doc
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Property changes on: tomoe-gtk/trunk/test
___________________________________________________________________
Name: svn:ignore
- testtomoegtk
+ Makefile
Makefile.in
.deps
.libs
testtomoegtk
testtomoegtkedit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 05:20:39
|
Revision: 1291
http://tomoe.svn.sourceforge.net/tomoe/?rev=1291&view=rev
Author: ikezoe
Date: 2007-06-05 22:20:39 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
extension -> binding.
Modified Paths:
--------------
tomoe/trunk/macros/python.m4
tomoe/trunk/macros/ruby.m4
Modified: tomoe/trunk/macros/python.m4
===================================================================
--- tomoe/trunk/macros/python.m4 2007-06-06 03:57:48 UTC (rev 1290)
+++ tomoe/trunk/macros/python.m4 2007-06-06 05:20:39 UTC (rev 1291)
@@ -17,12 +17,11 @@
else
AC_CHECK_FILE([$PYTHON],
[python_available="yes"],
- [AC_MSG_WARN([$PYTHON is not found. Disable PYTHON extension.])])
+ [AC_MSG_WARN([$PYTHON is not found. Disable PYTHON binding.])])
fi
if test "$python_available" = "yes"; then
AC_PATH_PROG(PYTHON_CONFIG, python-config, no)
- rbconfig="$RUBY -rrbconfig -e "
PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
PYTHON_LIBS=`$PYTHON_CONFIG --libs`
@@ -42,7 +41,7 @@
#undef PACKAGE_STRING
#undef PACKAGE_VERSION
"
- python_disable_message="Disable Python extension."
+ python_disable_message="Disable Python binding."
CFLAGS="$CFLAGS $PYTHON_CFLAGS"
AC_CHECK_HEADERS(Python.h, [],
[python_available="no"
Modified: tomoe/trunk/macros/ruby.m4
===================================================================
--- tomoe/trunk/macros/ruby.m4 2007-06-06 03:57:48 UTC (rev 1290)
+++ tomoe/trunk/macros/ruby.m4 2007-06-06 05:20:39 UTC (rev 1291)
@@ -20,7 +20,7 @@
else
AC_CHECK_FILE([$RUBY],
[ruby_available="yes"],
- [AC_MSG_WARN([$RUBY is not found. Disable Ruby extension.])])
+ [AC_MSG_WARN([$RUBY is not found. Disable Ruby binding.])])
fi
if test "$ruby_available" = "yes"; then
@@ -51,7 +51,7 @@
#undef PACKAGE_STRING
#undef PACKAGE_VERSION
"
- ruby_disable_message="Disable Ruby extension."
+ ruby_disable_message="Disable Ruby binding."
CFLAGS="$CFLAGS $RUBY_CFLAGS"
AC_CHECK_HEADERS(ruby.h, [],
[ruby_available="no"
@@ -66,7 +66,7 @@
fi
CFLAGS=$_SAVE_CFLAGS
- AC_MSG_CHECKING([where to install Ruby extensions])
+ AC_MSG_CHECKING([where to install Ruby binding])
AC_CACHE_VAL([cv_ruby_archdir],
[cv_ruby_archdir="$rbconfig_sitearchdir"])
AC_ARG_WITH([ruby-extdir],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 03:57:59
|
Revision: 1290
http://tomoe.svn.sourceforge.net/tomoe/?rev=1290&view=rev
Author: ikezoe
Date: 2007-06-05 20:57:48 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
pkgpyexec -> pyexec.
Modified Paths:
--------------
tomoe/trunk/bindings/python/Makefile.am
Modified: tomoe/trunk/bindings/python/Makefile.am
===================================================================
--- tomoe/trunk/bindings/python/Makefile.am 2007-06-06 03:49:22 UTC (rev 1289)
+++ tomoe/trunk/bindings/python/Makefile.am 2007-06-06 03:57:48 UTC (rev 1290)
@@ -1,4 +1,4 @@
-pkgpyexec_LTLIBRARIES = tomoe.la
+pyexec_LTLIBRARIES = tomoe.la
INCLUDES = \
$(PYTHON_CFLAGS) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 03:49:22
|
Revision: 1289
http://tomoe.svn.sourceforge.net/tomoe/?rev=1289&view=rev
Author: ikezoe
Date: 2007-06-05 20:49:22 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
fix typo.
Modified Paths:
--------------
tomoe/trunk/bindings/python/tomoe-context.override
Modified: tomoe/trunk/bindings/python/tomoe-context.override
===================================================================
--- tomoe/trunk/bindings/python/tomoe-context.override 2007-06-06 03:44:33 UTC (rev 1288)
+++ tomoe/trunk/bindings/python/tomoe-context.override 2007-06-06 03:49:22 UTC (rev 1289)
@@ -16,7 +16,7 @@
GList *candidates;
PyObject *py_cands;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:TomoeCointext.search", kwlist, &PyTomoeQuery_Type, &query))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:TomoeContext.search", kwlist, &PyTomoeQuery_Type, &query))
return NULL;
candidates = tomoe_context_search (TOMOE_CONTEXT(self->obj), TOMOE_QUERY(query->obj));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ik...@us...> - 2007-06-06 03:44:32
|
Revision: 1288
http://tomoe.svn.sourceforge.net/tomoe/?rev=1288&view=rev
Author: ikezoe
Date: 2007-06-05 20:44:33 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
* bindings/python/tomoe-dict.override,
bindings/python/tomoe-context.override,
bindings/python/tomoe-recognizer.override: Fix implementions. I did
not understand how to write Python bindings. Sorry.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/bindings/python/tomoe-context.override
tomoe/trunk/bindings/python/tomoe-dict.override
tomoe/trunk/bindings/python/tomoe-recognizer.override
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-06-06 03:01:55 UTC (rev 1287)
+++ tomoe/trunk/ChangeLog 2007-06-06 03:44:33 UTC (rev 1288)
@@ -4,6 +4,10 @@
pygtk-codegen-2.0 does not wrap XX_new() function.
* bindings/python/tomoe.defs: tomoe_config_new() and
tomoe_context_load_config() does not require arguments.
+ * bindings/python/tomoe-dict.override,
+ bindings/python/tomoe-context.override,
+ bindings/python/tomoe-recognizer.override: Fix implementions. I did
+ not understand how to write Python bindings. Sorry.
2007-06-06 Kouhei Sutou <ko...@co...>
Modified: tomoe/trunk/bindings/python/tomoe-context.override
===================================================================
--- tomoe/trunk/bindings/python/tomoe-context.override 2007-06-06 03:01:55 UTC (rev 1287)
+++ tomoe/trunk/bindings/python/tomoe-context.override 2007-06-06 03:44:33 UTC (rev 1288)
@@ -9,12 +9,17 @@
%%
override tomoe_context_search kwargs
static PyObject *
-_wrap_tomoe_context_search(PyGObject *self, TomoeQuery *query)
+_wrap_tomoe_context_search(PyGObject *self, PyObject *args, PyObject *kwargs)
{
+ static char *kwlist[] = { "query", NULL };
+ PyGObject *query;
GList *candidates;
PyObject *py_cands;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:TomoeCointext.search", kwlist, &PyTomoeQuery_Type, &query))
+ return NULL;
- candidates = tomoe_context_search (TOMOE_CONTEXT(self->obj), query);
+ candidates = tomoe_context_search (TOMOE_CONTEXT(self->obj), TOMOE_QUERY(query->obj));
CONVERT_LIST (py_cands, candidates);
Modified: tomoe/trunk/bindings/python/tomoe-dict.override
===================================================================
--- tomoe/trunk/bindings/python/tomoe-dict.override 2007-06-06 03:01:55 UTC (rev 1287)
+++ tomoe/trunk/bindings/python/tomoe-dict.override 2007-06-06 03:44:33 UTC (rev 1288)
@@ -20,13 +20,18 @@
%%
override tomoe_dict_search kwargs
static PyObject *
-_wrap_tomoe_dict_search(PyGObject *self, TomoeQuery *query)
+_wrap_tomoe_dict_search(PyGObject *self, PyObject *args, PyObject *kwargs)
{
+ static char *kwlist[] = { "query", NULL };
+ PyGObject *query;
GList *candidates;
PyObject *py_cands;
- candidates = tomoe_dict_search (TOMOE_DICT(self->obj), query);
-
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:TomoeDict.search", kwlist, &PyTomoeQuery_Type, &query))
+ return NULL;
+
+ candidates = tomoe_dict_search (TOMOE_DICT(self->obj), TOMOE_QUERY(query->obj));
+
CONVERT_LIST (py_cands, candidates);
g_list_free (candidates);
Modified: tomoe/trunk/bindings/python/tomoe-recognizer.override
===================================================================
--- tomoe/trunk/bindings/python/tomoe-recognizer.override 2007-06-06 03:01:55 UTC (rev 1287)
+++ tomoe/trunk/bindings/python/tomoe-recognizer.override 2007-06-06 03:44:33 UTC (rev 1288)
@@ -20,13 +20,18 @@
%%
override tomoe_recognizer_search kwargs
static PyObject *
-_wrap_tomoe_recognizer_search(PyGObject *self, TomoeWriting *writing)
+_wrap_tomoe_recognizer_search(PyGObject *self, PyObject *args, PyObject *kwargs)
{
+ static char *kwlist[] = { "writing", NULL };
+ PyGObject *writing;
GList *candidates;
PyObject *py_cands;
- candidates = tomoe_recognizer_search (TOMOE_RECOGNIZER(self->obj), writing);
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:TomoeRecognizer.search", kwlist, &PyTomoeWriting_Type, &writing))
+ return NULL;
+ candidates = tomoe_recognizer_search (TOMOE_RECOGNIZER(self->obj), TOMOE_WRITING(writing->obj));
+
CONVERT_LIST (py_cands, candidates);
g_list_free (candidates);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|